Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgChangeRegistrationTransferDto.java

@@ -127,4 +127,14 @@ public class JgChangeRegistrationTransferDto extends BaseDto {
 
     @ApiModelProperty(value = "设备移装完整详细地址")
     private String fullAddress;
+
+    @ApiModelProperty(value = "设备名称")
+    private String productName;
+
+    @ApiModelProperty(value = "设备移装完整详细地址")
+    private String allAddress;
+
+    @ApiModelProperty(value = " 单位内部编号")
+    private String innerCode;
+
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgTransferNoticeDto.java

@@ -228,4 +228,8 @@ public class JgTransferNoticeDto extends BaseDto {
     @ApiModelProperty (value = "下一节点可执行人")
     private String nextExecuteUserIds;
 
+    @TableField(exist = false)
+    private String equAddress;
+
+
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgReformNotice.java

@@ -336,4 +336,10 @@ public class JgReformNotice extends BaseEntity {
      */
     @TableField(value = "next_execute_user_ids")
     private String nextExecuteUserIds;
+
+    /**
+     * 地址
+     */
+    @TableField(exist = false)
+    private String fullAddress;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgScrapCancel.java

@@ -96,7 +96,7 @@ public class JgScrapCancel extends BaseEntity {
     private String receiveOrgName;
 
     /**
-     * 接收机构公司代码
+     * 接收机构公司代码--暂时未用到
      */
     @TableField("receive_company_code")
     private String receiveCompanyCode;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgTransferNotice.java

@@ -319,5 +319,8 @@ public class JgTransferNotice extends BaseEntity {
     @TableField("\"next_execute_user_ids\"")
     private String nextExecuteUserIds;
 
+    @TableField(exist = false)
+    private String equAddress;
+
 
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgScrapCancelEqMapper.java

 package com.yeejoin.amos.boot.module.jg.api.mapper;
 
-import com.yeejoin.amos.boot.module.jg.api.entity.JgScrapCancelEq;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgScrapCancelEq;
 
 /**
  * 报废注销设备关系表 Mapper 接口

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/service/IJgChangeRegistrationTransferService.java

@@ -21,9 +21,9 @@ import java.util.Map;
  */
 public interface IJgChangeRegistrationTransferService extends IService<JgChangeRegistrationTransfer> {
 
-    List<JgChangeRegistrationTransfer> updateTransfer(String submitType, JSONObject map, ReginParams reginParams);
+    List<JgChangeRegistrationTransferDto> updateTransfer(String submitType, JSONObject map, ReginParams reginParams);
 
-    List<JgChangeRegistrationTransfer> createTransfer(String submitType, JSONObject map, ReginParams reginParams);
+    List<JgChangeRegistrationTransferDto> createTransfer(String submitType, JSONObject map, ReginParams reginParams);
 
     boolean deleteBatchBySequenceNbrs(Long[] sequenceNbrs);
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgInstallationNoticeMapper.xml

@@ -22,14 +22,16 @@
         isn.promoter,
         isn.next_execute_ids AS nextExecuteIds,
         isn.instance_status AS instanceStatus,
-        isn.equ_address AS equAddress,
+<!--        isn.equ_address AS equAddress,-->
         isn.handle_date AS handleDate,
         isn.equ_list AS equList,
         isn.notice_report_url AS noticeReportUrl,
         isn.create_user_id as createUserId,
-        isn.next_execute_user_ids as nextExecuteUserIds
-        FROM
-        tzs_jg_installation_notice isn
+        isn.next_execute_user_ids as nextExecuteUserIds,
+        concat(ibjui."PROVINCE_NAME", '', ibjui."CITY_NAME", '', ibjui."COUNTY_NAME", '', ibjui."STREET_NAME", '', ibjui."ADDRESS") as equAddress
+        FROM tzs_jg_installation_notice isn
+        LEFT JOIN tzs_jg_installation_notice_eq insEq on insEq.equip_transfer_id = isn.sequence_nbr
+        LEFT JOIN idx_biz_jg_use_info ibjui on insEq.equ_id = ibjui.RECORD
         <where>
             isn.is_delete = false
             <if test="param != null ">

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgMaintainNoticeMapper.xml

@@ -10,10 +10,12 @@
     <select id="queryForPage" resultType="com.yeejoin.amos.boot.module.jg.api.entity.JgMaintainNotice">
         select
         isn.*,
-        concat(use."PROVINCE_NAME", '', use."CITY_NAME", '', use."COUNTY_NAME", '', use."STREET_NAME", '', use."ADDRESS") as fullAddress
+        concat(ibjui."PROVINCE_NAME", '', ibjui."CITY_NAME", '', ibjui."COUNTY_NAME", '', ibjui."STREET_NAME", '', ibjui."ADDRESS") as fullAddress,
+        ibjoi.SUPERVISORY_CODE as  supervisoryCode
         FROM tzs_jg_maintain_notice isn
         left join tzs_jg_maintain_notice_eq isneq on isn.sequence_nbr = isneq.equip_transfer_id
-        LEFT JOIN idx_biz_jg_use_info use on isneq.equ_id = use.RECORD
+        LEFT JOIN idx_biz_jg_use_info ibjui on isneq.equ_id = ibjui.RECORD
+        LEFT JOIN idx_biz_jg_other_info ibjoi on isneq.equ_id = ibjoi.RECORD
         <where>
             isn.is_delete = 0
             <if test="param != null ">

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgTransferNoticeMapper.xml

@@ -26,12 +26,16 @@
         ec."name" AS equipCateName,
         tjtn.handle_date AS handleDate,
         tjtn.create_user_id as createUserId,
-        tjtn.next_execute_user_ids as nextExecuteUserIds
+        tjtn.next_execute_user_ids as nextExecuteUserIds,
+        oi.SUPERVISORY_CODE as supervisoryCode,
+        concat(ibjui."PROVINCE_NAME", '', ibjui."CITY_NAME", '', ibjui."COUNTY_NAME", '', ibjui."STREET_NAME", '', ibjui."ADDRESS") as equAddress
         FROM
             tzs_jg_transfer_notice tjtn
             LEFT JOIN tzs_jg_transfer_notice_eq re ON re.equip_transfer_id = tjtn.sequence_nbr
             LEFT JOIN idx_biz_jg_register_info ri ON ri.record = re.equ_id
             LEFT JOIN tz_equipment_category ec ON ec.code = ri.equ_category
+            LEFT JOIN idx_biz_jg_use_info ibjui on re.equ_id = ibjui.RECORD
+            left join idx_biz_jg_other_info oi on oi.RECORD = re.equ_id
         <where>
             tjtn.is_delete = false
             <if test="param != null ">

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationMapper.xml

@@ -192,7 +192,8 @@
                ur.use_registration_code                                               as useRegistrationCode,
                date_format(ur.audit_pass_date, '%Y-%m-%d')                            as auditPassDate,
                ur.receive_org_name                                                    as receiveOrgName,
-               ur.next_execute_user_ids                                               as nextExecuteUserIds
+               ur.next_execute_user_ids                                               as nextExecuteUserIds,
+               ur.is_xixian                                               as isXixian
         from tzs_jg_use_registration ur
                  LEFT JOIN tzs_jg_use_registration_eq re on ur.sequence_nbr = re.equip_transfer_id
                  LEFT JOIN idx_biz_jg_register_info jri on re.equ_id = jri.RECORD

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/CommonController.java

@@ -192,15 +192,18 @@ public class CommonController extends BaseController {
 		Object result = commonService.invokeBusinessProcess(submitType, map, reginParams);
 		return ResponseHelper.buildResponse(result);
 	}
+
+
+
+
 	/**
-	 * 根据公司id获取公司下人员
-	 *
+	 * 获取当前登录人企业类型
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PostMapping(value = "/getCompanyUser")
-	@ApiOperation(httpMethod = "POST", value = "根据公司id获取公司下人员", notes = "根据公司id获取公司下人员")
-	public ResponseModel<Object> getCompanyUser(@RequestParam(value = "companyId") Long companyId) {
-		Object result = commonService.getCompanyUser(companyId);
-		return ResponseHelper.buildResponse(result);
+	@GetMapping(value = "/getCompanyType")
+	@ApiOperation(httpMethod = "GET", value = "获取当前登录人企业类型", notes = "获取当前登录人企业类型")
+	public ResponseModel<Object> getCompanyType() {
+		return ResponseHelper.buildResponse(iJgInstallationNoticeService.getCompanyType());
 	}
+
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/ICmWorkflowService.java

@@ -10,7 +10,7 @@ import java.util.List;
 public interface ICmWorkflowService {
     List<ProcessTaskDTO> startBatch(ActWorkflowBatchDTO params);
 
-    ProcessTaskDTO complete(String taskId, TaskResultDTO data);
+    ProcessTaskDTO completeOrReject(String taskId, TaskResultDTO data, String operate);
 
     ProcessTaskDTO rollBack(String processInstanceId);
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/CmWorkflowServiceImpl.java

@@ -12,7 +12,6 @@ import com.yeejoin.amos.feign.workflow.model.ProcessTaskDTO;
 import com.yeejoin.amos.feign.workflow.model.TaskResultDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
-import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
 import java.util.List;
 
@@ -23,6 +22,18 @@ import java.util.List;
 @Slf4j
 public class CmWorkflowServiceImpl implements ICmWorkflowService {
 
+    /**
+     * 通过
+     */
+    public static String PASS_OPERATE = "0";
+
+    /**
+     * 驳回
+     */
+    public static String REJECT_OPERATE = "1";
+
+
+
     @Override
     public List<ProcessTaskDTO> startBatch(ActWorkflowBatchDTO params) {
         List<ProcessTaskDTO> processTasks;
@@ -43,11 +54,23 @@ public class CmWorkflowServiceImpl implements ICmWorkflowService {
     }
 
     @Override
-    public ProcessTaskDTO complete(String taskId, TaskResultDTO data) {
-        ProcessTaskDTO processTaskDTO;
+    public ProcessTaskDTO completeOrReject(String taskId, TaskResultDTO data, String operate) {
+        ProcessTaskDTO processTaskDTO = null;
         try {
+            if(PASS_OPERATE.equals(operate)){
+                // 通过操作
                 log.info("开始请求工作流完成任务接口:/complete/standard/{taskId},请求参数：{},{}", taskId, JSONObject.toJSONString(data));
                 processTaskDTO = Workflow.taskV2Client.completeByTaskFroStandard(taskId, data).getResult();
+            } else if(REJECT_OPERATE.equals(operate)) {
+                // 驳回操作
+               // todo 需要工作流适配调整后 进行切换 Workflow.taskV2Client.reject(taskId, data);
+                log.info("开始请求工作流驳回任务接口:/reject/{taskId},请求参数：{},{}", taskId, JSONObject.toJSONString(data));
+                processTaskDTO = Workflow.taskV2Client.completeByTaskFroStandard(taskId, data).getResult();
+            } else {
+                // 执行普通节点（提交）
+                log.info("开始请求工作流完成任务接口:/complete/standard/{taskId},请求参数：{},{}", taskId, JSONObject.toJSONString(data));
+                processTaskDTO = Workflow.taskV2Client.completeByTaskFroStandard(taskId, data).getResult();
+            }
         } catch (InnerInvokException e) {
             //拦截无审核人异常信息
             String devMessage = e.getDevMessage();

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/IdxBizJgRegisterInfoServiceImpl.java

@@ -402,6 +402,10 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                     useInfoMap.put("fullAddress", fullAddress);
                 }
                 useInfoMap.put("useinfoSeq", useInfo.getSequenceNbr());
+                if(!ValidationUtil.isEmpty(useInfo.getLongitudeLatitude())){
+                    useInfoMap.put("longitudeLatitude", JSON.parseObject(useInfo.getLongitudeLatitude()));
+                }
+
             } else {
                 useInfoMap = convertCamelToUnderscore(useInfo, null);
                 if (!ValidationUtil.isEmpty(province)) {
@@ -420,6 +424,9 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                     useInfoMap.put("FULLADDRESS", fullAddress);
                 }
                 useInfoMap.put("USEINFO_SEQ", useInfo.getSequenceNbr());
+                if(!ValidationUtil.isEmpty(useInfo.getLongitudeLatitude())) {
+                    useInfoMap.put("LONGITUDE_LATITUDE", JSON.parseObject(useInfo.getLongitudeLatitude()));
+                }
             }
             if (!useInfoMap.isEmpty()) {
                 Map<String, Object> filterMap = useInfoMap.entrySet()
@@ -1078,6 +1085,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             if(!ValidationUtil.isEmpty(list)){
                 equIds = list.stream().map(item -> item.get("SEQUENCE_NBR").toString()).collect(Collectors.toList());
             }
+            if(!ValidationUtil.isEmpty(equIds)){
                 //查询设备是否正在使用
                 //设备的使用标识是，安装告知和使用登记中有使用记录。
                 List<JgInstallationNoticeEq> installationNoticeEqList = jgInstallationNoticeEqServiceImpl.getListByEquIds(equIds);
@@ -1113,7 +1121,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                     item.put("IS_USE", !ValidationUtil.isEmpty(isUse) ? isUse ? isUse : false : false);
                     item.put("ADDRESS", !ValidationUtil.isEmpty(fullAddress) ? fullAddress : "");
                 }
-
+            }
             totle = response.getInternalResponse().hits().getTotalHits().value;
             result.setRecords(list);
             result.setTotal(totle);

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgChangeRegistrationNameServiceImpl.java

@@ -408,7 +408,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
         HashMap<String, Object> map = new HashMap<>();
         map.put("approvalStatus", operate);
         dto.setVariable(map);
-        return cmWorkflowService.complete(jgChangeRegistrationName.getNextTaskId(), dto);
+        return cmWorkflowService.completeOrReject(jgChangeRegistrationName.getNextTaskId(), dto, operate);
     }
 
     private void convertField(JgChangeRegistrationNameDto model) {
@@ -514,7 +514,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
         }
         dto.setVariable(map);
         //执行流程
-        ProcessTaskDTO processTaskDTO = cmWorkflowService.complete(taskId, dto);
+        ProcessTaskDTO processTaskDTO = cmWorkflowService.completeOrReject(taskId, dto, operate);
         // 更新下一步执行人、创建待办
         updateExecuteIds(instanceId, id, operate, processTaskDTO);
     }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgChangeRegistrationReformServiceImpl.java

@@ -373,7 +373,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         dto.setVariable(map);
         dto.setNextExecuteUserCompanyCode(getNextUserOrgCode(operate, jgChangeRegistrationReform));
         //执行流程
-        processTaskDTO = iCmWorkflowService.complete(taskId, dto);
+        processTaskDTO = iCmWorkflowService.completeOrReject(taskId, dto, operate);
         // 更新下一步执行人
         updateExecuteIds(instanceId, jgChangeRegistrationReform, operate, processTaskDTO);
 
@@ -792,7 +792,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
      */
     public String getSummaryInfo(JgChangeRegistrationReform jgChangeRegistrationReform) {
         String result = "来自%s【%s】的业务办理，【申请单号：%s】";
-        return String.format(result, Optional.ofNullable(jgChangeRegistrationReform.getEquipListName()).orElse("无"), jgChangeRegistrationReform.getSupervisoryCode(), jgChangeRegistrationReform.getApplyNo());
+        return String.format(result, Optional.ofNullable(jgChangeRegistrationReform.getEquipListName()).orElse("无"), Optional.ofNullable(jgChangeRegistrationReform.getSupervisoryCode()).orElse("无"), jgChangeRegistrationReform.getApplyNo());
     }
 
     /**

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgChangeRegistrationTransferServiceImpl.java

@@ -51,8 +51,6 @@ import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.search.builder.SearchSourceBuilder;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.core.io.Resource;
 import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.Bean;
@@ -143,7 +141,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
      * @param map
      * @return
      */
-    public List<JgChangeRegistrationTransfer> createTransfer(String submitType, JSONObject map, ReginParams reginParams) {
+    public List<JgChangeRegistrationTransferDto> createTransfer(String submitType, JSONObject map, ReginParams reginParams) {
 
         Map<String, Object> tableData = (Map<String, Object>) map.get(TABLE_PAGE_ID);
         if (ValidationUtil.isEmpty(tableData)) {
@@ -366,7 +364,16 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
             modelDtos.add(dto);
             commonService.buildTaskModel(modelDtos);
         }
-        return  Collections.singletonList(oldTransfer);
+
+        JgChangeRegistrationTransferDto resultDto = new JgChangeRegistrationTransferDto();
+        Bean.copyExistPropertis(oldTransfer,resultDto);
+        //组装返回信息，添加设备信息的展示
+        resultDto.setEquCategory((String) tableData.get("equCategoryDesc"));
+        resultDto.setProductName((String) tableData.get("productName"));
+        resultDto.setAllAddress(oldTransfer.getFullAddress());
+        resultDto.setEquCode((String) tableData.get("equCode"));
+        resultDto.setInnerCode((String) tableData.get("useInnerCode"));
+        return  Collections.singletonList(resultDto);
     }
 
     /**
@@ -375,7 +382,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
      * @param map
      * @return
      */
-    public List<JgChangeRegistrationTransfer> updateTransfer(String submitType, JSONObject map, ReginParams reginParams) {
+    public List<JgChangeRegistrationTransferDto> updateTransfer(String submitType, JSONObject map, ReginParams reginParams) {
         return this.createTransfer(submitType, map, reginParams);
     }
 
@@ -406,7 +413,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
             map.put("approvalStatus", "提交");
         }
         //执行流程
-        ProcessTaskDTO complete = icmWorkflowService.complete(taskId, dto);
+        ProcessTaskDTO complete = icmWorkflowService.completeOrReject(taskId, dto, operate);
         workflowResult = commonService.buildWorkFlowInfo(Collections.singletonList(complete)).get(0);
         // 更新下一步执行人
         this.updateExecuteIds(instanceId, transfer, operate, workflowResult);
@@ -1140,7 +1147,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
      */
     public String getSummaryInfo(JgChangeRegistrationTransfer transfer) {
         String result = "来自%s【%s】的业务办理，【申请单号：%s】";
-        return String.format(result, Optional.ofNullable(transfer.getEquipListName()).orElse("无"), transfer.getSupervisoryCode(), transfer.getApplyNo());
+        return String.format(result, Optional.ofNullable(transfer.getEquipListName()).orElse("无"), Optional.ofNullable(transfer.getSupervisoryCode()).orElse("无"), Optional.ofNullable(transfer.getApplyNo()).orElse("无"));
     }
 
     public String getNextUserOrgCode(String operate, JgChangeRegistrationTransfer contract) {

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgChangeRegistrationUnitServiceImpl.java

 package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.map.MapUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.aspose.words.SaveFormat;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
@@ -21,8 +18,6 @@ import com.yeejoin.amos.boot.module.jg.api.mapper.*;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgChangeRegistrationUnitService;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.jg.biz.service.ICommonService;
-import com.yeejoin.amos.boot.module.jg.biz.utils.ImageUtils;
-import com.yeejoin.amos.boot.module.jg.biz.utils.WordTemplateUtils;
 import com.yeejoin.amos.boot.module.jg.flc.api.fegin.WorkFlowFeignService;
 import com.yeejoin.amos.boot.module.ymt.api.entity.*;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
@@ -30,21 +25,16 @@ import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentClassifityEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.*;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
-import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
-import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.TaskV2Model;
 import com.yeejoin.amos.feign.workflow.Workflow;
 import com.yeejoin.amos.feign.workflow.model.*;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
-import org.springframework.web.multipart.MultipartFile;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
-import org.typroject.tyboot.core.foundation.exception.BaseException;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
@@ -55,11 +45,8 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.IOException;
-import java.nio.file.Files;
 import java.time.LocalDate;
 import java.util.*;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -279,7 +266,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                 task.setVariable(map);
                 //执行流程
                 task.setNextExecuteUserCompanyCode(noticeDto.getReceiveOrgCode());
-                ProcessTaskDTO processTaskDTO = cmWorkflowService.complete(taskId, task);
+                ProcessTaskDTO processTaskDTO = cmWorkflowService.completeOrReject(taskId, task, op);
                 JgChangeRegistrationUnit bean = new JgChangeRegistrationUnit();
                 BeanUtils.copyProperties(noticeDto, bean);
                 String taskCode = FlowStatusEnum.TO_BE_FINISHED.getName();
@@ -776,7 +763,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         }
         task.setVariable(map);
         //执行流程
-        ProcessTaskDTO processTaskDTO = cmWorkflowService.complete(taskId, task);
+        ProcessTaskDTO processTaskDTO = cmWorkflowService.completeOrReject(taskId, task, op);
         String taskCode = FlowStatusEnum.TO_BE_FINISHED.getName();
         String taskName1 = "";
         String nextTaskId = "";

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgEnableDisableServiceImpl.java

 package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 
-import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
-import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.jg.api.dto.TaskMessageDto;
@@ -24,7 +22,6 @@ import com.yeejoin.amos.boot.module.jg.api.dto.JgEnableDisableDto;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.jg.biz.service.ICmWorkflowService;
 import com.yeejoin.amos.boot.module.jg.flc.api.fegin.WorkFlowFeignService;
-import com.yeejoin.amos.boot.module.ymt.api.entity.RegistrationInfo;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.RegistrationInfoMapper;
@@ -44,7 +41,6 @@ import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import java.text.ParseException;
 import java.util.*;
 
 /**
@@ -135,7 +131,7 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
                 }
 
                 dto.setVariable(commMap);
-                ProcessTaskDTO processTaskDTO = iCmWorkflowService.complete(jgEnableDisable.getNextTaskId(), dto);
+                ProcessTaskDTO processTaskDTO = iCmWorkflowService.completeOrReject(jgEnableDisable.getNextTaskId(), dto, submit);
                 processTaskDTOS.add(processTaskDTO);
                 // 提取节点等信息
                 workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);
@@ -500,7 +496,7 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
         workDto.setVariable(commMap);
         workDto.setComment(opinion);
         workDto.setNextExecuteUserCompanyCode("1".equals(op) ? jgEnableDisable.getUseUnitCreditCode() : jgEnableDisable.getReceiveCompanyCode());
-        processTaskDTO = iCmWorkflowService.complete(jgEnableDisable.getNextTaskId(), workDto);
+        processTaskDTO = iCmWorkflowService.completeOrReject(jgEnableDisable.getNextTaskId(), workDto, op);
         // 提取节点等信息
         workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);
         return workflowResultDto;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgEquipTransferServiceImpl.java

@@ -96,14 +96,15 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
             JgEquipTransferEq jgEquipTransferEq = buildJgEquipTransferEq(obj, applyNo);
             JgEquipTransfer transfer = buildJgEquipTransfer(model, applyNo, reginParams, submitType, workflowResultList, i);
             transfer.setSupervisoryCode(String.valueOf(obj.get("SUPERVISORY_CODE")));
-            transfer.setEquList(String.valueOf(obj.get("EQU_LIST")));
-            transfer.setEquDefine(String.valueOf(obj.get("EQU_DEFINE")));
-            transfer.setEquCategory(String.valueOf(obj.get("EQU_CATEGORY")));
-            transfer.setProductName(String.valueOf(obj.get("PRODUCT_NAME")));
-            transfer.setUseRegistCode(String.valueOf(obj.get("USE_ORG_CODE")));
-            transfer.setUseInnerCode(String.valueOf(obj.get("USE_INNER_CODE")));
-            transfer.setEquAddress(String.valueOf(obj.get("ADDRESS")));
-            transfer.setEquCode(String.valueOf(obj.get("EQU_CODE")));
+            transfer.setEquList(Objects.toString(obj.get("EQU_LIST"),""));
+            transfer.setEquDefine(Objects.toString(obj.get("EQU_DEFINE"),""));
+            transfer.setEquCategory(Objects.toString(obj.get("EQU_CATEGORY"),""));
+            transfer.setProductName(Objects.toString(obj.get("PRODUCT_NAME"),""));
+            transfer.setUseRegistCode(Objects.toString(obj.get("USE_ORG_CODE"),""));
+            transfer.setUseRegistCode(Objects.toString(obj.get("USE_ORG_CODE"), ""));
+            transfer.setUseInnerCode(Objects.toString(obj.get("USE_INNER_CODE"),""));
+            transfer.setEquAddress(Objects.toString(obj.get("ADDRESS"),""));
+            transfer.setEquCode(Objects.toString(obj.get("EQU_CODE"),""));
             transferList.add(transfer);
             equipTransferEqList.add(jgEquipTransferEq);
         });
@@ -137,7 +138,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
     private TaskModelDto buildTempTaskModelDto(JgEquipTransfer item) {
         return TaskModelDto.builder()
                 .model(item)
-                .taskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", item.getEquList(), item.getSupervisoryCode(), item.getApplyNo()))
+                .taskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", item.getEquList(), Objects.toString(item.getSupervisoryCode(), ""), item.getApplyNo()))
                 .taskCode(item.getApplyNo())
                 .taskType(BusinessTypeEnum.JG_EQUIPMENT_HANDOVER.getCode())
                 .relationId(item.getSequenceNbr()+"")
@@ -183,8 +184,8 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
                 .taskStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName())
                 .flowStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode())
                 .flowStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName())
-                .taskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", item.getEquList(), item.getSupervisoryCode(), item.getApplyNo()))
-                .taskDesc(String.format("来自%s【%s】的业务办理，【申请单号：%s】", item.getEquList(), item.getSupervisoryCode(), item.getApplyNo()))
+                .taskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", item.getEquList(), Objects.toString(item.getSupervisoryCode(), ""), item.getApplyNo()))
+                .taskDesc(String.format("来自%s【%s】的业务办理，【申请单号：%s】", item.getEquList(), Objects.toString(item.getSupervisoryCode(), ""), item.getApplyNo()))
                 .startUserId(item.getCreateUserId())
                 .startUser(item.getCreateUserName())
                 .startUserCompanyName(item.getCreateUserCompanyName())
@@ -292,7 +293,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
                 }
                 dto.setVariable(commMap);
                 dto.setNextExecuteUserCompanyCode(transfer.getInstallUnitCreditCode());
-                ProcessTaskDTO processTaskDTO = cmWorkflowService.complete(transfer.getNextTaskId(), dto);
+                ProcessTaskDTO processTaskDTO = cmWorkflowService.completeOrReject(transfer.getNextTaskId(), dto, op);
                 // 提取节点等信息
                 WorkflowResultDto workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);
                 BeanUtils.copyProperties(equipTransferDto, transfer);
@@ -345,7 +346,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
         workDto.setNextExecuteUserCompanyCode("1".equals(op) ? jgEquipTransfer.getUseUnitCreditCode() : jgEquipTransfer.getInstallUnitCreditCode());
         workDto.setVariable(commMap);
         workDto.setComment(jgEquipTransferDto.getProcessAdvice());
-        ProcessTaskDTO processTaskDTO = cmWorkflowService.complete(jgEquipTransfer.getNextTaskId(), workDto);
+        ProcessTaskDTO processTaskDTO = cmWorkflowService.completeOrReject(jgEquipTransfer.getNextTaskId(), workDto, op);
         // 提取节点等信息
         WorkflowResultDto workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);
         jgEquipTransfer.setPromoter(reginParams.getUserModel().getUserId());

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgInstallationNoticeServiceImpl.java

@@ -5,7 +5,6 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.dao.mapper.DataDictionaryMapper;
@@ -274,7 +273,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                 dto.setVariable(commMap);
                 //下一节点执行人单位（下节点接收机构code）
                 dto.setNextExecuteUserCompanyCode(notice.getReceiveOrgCreditCode());
-                processTaskDTO = iCmWorkflowService.complete(notice.getNextTaskId(), dto);
+                processTaskDTO = iCmWorkflowService.completeOrReject(notice.getNextTaskId(), dto, op);
                 // 提取节点等信息
                 workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);
                 BeanUtils.copyProperties(noticeDto, notice);
@@ -954,7 +953,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         workDto.setVariable(commMap);
         workDto.setComment(jgTransferNotice.getProcessAdvice());
         workDto.setNextExecuteUserCompanyCode("1".equals(op) ? jgTransferNotice.getInstallUnitCreditCode() : jgTransferNotice.getReceiveOrgCreditCode());
-        processTaskDTO = iCmWorkflowService.complete(jgTransferNotice.getNextTaskId(), workDto);
+        processTaskDTO = iCmWorkflowService.completeOrReject(jgTransferNotice.getNextTaskId(), workDto, op);
         // 提取节点等信息
         workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);
         return workflowResultDto;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgMaintainNoticeServiceImpl.java

@@ -17,7 +17,6 @@ import com.yeejoin.amos.boot.module.jg.api.dto.JgMaintainNoticeDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.TaskMessageDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.TaskModelDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.WorkflowResultDto;
-import com.yeejoin.amos.boot.module.jg.api.entity.JgEnableDisableEq;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintainNotice;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintainNoticeEq;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
@@ -219,7 +218,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
                 //下一节点执行人单位（下节点接收机构code）
                 dto.setNextExecuteUserCompanyCode(notice.getReceiveCompanyCode());
                 dto.setVariable(commMap);
-                processTaskDTO = cmWorkflowService.complete(notice.getNextTaskId(), dto);
+                processTaskDTO = cmWorkflowService.completeOrReject(notice.getNextTaskId(), dto, op);
                 // 提取节点等信息
                 workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);
                 BeanUtils.copyProperties(noticeDto, notice);
@@ -295,7 +294,6 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
             if (Objects.nonNull(notice.getMaintainType())) {
                 noticeDto.setMaintainTypeDesc(dictionaries.stream().filter(d -> notice.getMaintainType().equals(d.getCode())).map(DataDictionary::getName).collect(Collectors.joining()));
             }
-            noticeDto.setFullAddress(notice.getProvinceName() + notice.getCityName() + notice.getCountyName() + notice.getStreetName() + notice.getAddress());
             return noticeDto;
         }).collect(java.util.stream.Collectors.toList());
         noticeDtoPage.setRecords(records);
@@ -745,7 +743,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
         }
         //组装信息
         TaskResultDTO taskResultDTO = assembleData(jgMaintainNotice, op, opinion);
-        ProcessTaskDTO processTaskDTO = cmWorkflowService.complete(jgMaintainNotice.getNextTaskId(), taskResultDTO);
+        ProcessTaskDTO processTaskDTO = cmWorkflowService.completeOrReject(jgMaintainNotice.getNextTaskId(), taskResultDTO, op);
 
         // 提取节点等信息
         WorkflowResultDto workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgMaintenanceContractServiceImpl.java

@@ -177,7 +177,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         dto.setVariable(map);
         //下一节点执行人单位（下节点接收机构code）
         dto.setNextExecuteUserCompanyCode(getNextUserOrgCode(operate, contract));
-        ProcessTaskDTO complete = workflowService.complete(taskId, dto);
+        ProcessTaskDTO complete = workflowService.completeOrReject(taskId, dto, operate);
         // 更新下一步执行人、创建待办
         updateExecuteIds(instanceId, id, operate, complete);
     }
@@ -450,7 +450,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         HashMap<String, Object> map = new HashMap<>();
         map.put("approvalStatus", op);
         dto.setVariable(map);
-        return workflowService.complete(contract.getNextTaskId(), dto);
+        return workflowService.completeOrReject(contract.getNextTaskId(), dto, op);
     }
 
     private void buildRoleList(List<ProcessTaskDTO> processTasks, List<String> roleListNext, List<String> roleListAll) {

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgReformNoticeServiceImpl.java

@@ -202,7 +202,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
                 }
                 dto.setNextExecuteUserCompanyCode(notice.getReceiveCompanyCode());
                 dto.setVariable(commMap);
-                ProcessTaskDTO processTaskDTO = cmWorkflowService.complete(notice.getNextTaskId(), dto);
+                ProcessTaskDTO processTaskDTO = cmWorkflowService.completeOrReject(notice.getNextTaskId(), dto, op);
                 // 提取节点等信息
                 WorkflowResultDto workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);
                 BeanUtils.copyProperties(noticeDto, notice);
@@ -420,10 +420,11 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
             dto.setCreateUserName(reginParams.getUserModel().getRealName());
             dto.setCreateUserId(reginParams.getUserModel().getUserId());
             dto.setCreateUserCompanyName(reginParams.getCompany().getCompanyName());
-            dto.setEquCategory(String.valueOf(obj.get("EQU_CATEGORY")));
-            dto.setEquListCode(String.valueOf(obj.get("EQU_DEFINE")));
-            dto.setSupervisoryCode(String.valueOf(obj.get("SUPERVISORY_CODE")));
-            dto.setEquList(String.valueOf(obj.get("EQU_LIST")));
+            dto.setEquCategory(Objects.toString(obj.get("EQU_CATEGORY"),""));
+            dto.setEquListCode(Objects.toString(obj.get("EQU_DEFINE"),""));
+            dto.setSupervisoryCode(Objects.toString(obj.get("SUPERVISORY_CODE"),""));
+            dto.setEquList(Objects.toString(obj.get("EQU_LIST"),""));
+            dto.setFullAddress(Objects.toString(obj.get("ADDRESS"),""));
 
             if (SUBMIT_TYPE_FLOW.equals(submitType)) {
                 WorkflowResultDto workflowResult = workflowResultList.get(i);
@@ -487,7 +488,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
     private TaskModelDto buildTempTaskModelDto(JgReformNotice item) {
         return TaskModelDto.builder()
                 .model(item)
-                .taskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", item.getEquList(), item.getSupervisoryCode(), item.getApplyNo()))
+                .taskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", item.getEquList(), Objects.toString(item.getSupervisoryCode(), ""), item.getApplyNo()))
                 .taskCode(item.getApplyNo())
                 .taskType(BusinessTypeEnum.JG_MODIFICATION_NOTIFICATION.getCode())
                 .relationId(item.getSequenceNbr()+"")
@@ -722,7 +723,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
         workDto.setNextExecuteUserCompanyCode("1".equals(op) ? jgReformNotice.getInstallUnitCreditCode() : jgReformNotice.getReceiveOrgCode());
         workDto.setVariable(commMap);
         workDto.setComment(dto.getRemark());
-        ProcessTaskDTO processTaskDTO = cmWorkflowService.complete(jgReformNotice.getNextTaskId(), workDto);
+        ProcessTaskDTO processTaskDTO = cmWorkflowService.completeOrReject(jgReformNotice.getNextTaskId(), workDto, op);
         WorkflowResultDto workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);
         jgReformNotice.setPromoter(reginParams.getUserModel().getUserId());
         jgReformNotice.setRemark(dto.getRemark());
@@ -812,8 +813,8 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
                 .taskStatusLabel(statusEnum.getName())
                 .flowStatus(statusEnum.getCode())
                 .flowStatusLabel(statusEnum.getName())
-                .taskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", transfer.getEquList(), transfer.getSupervisoryCode(), transfer.getApplyNo()))
-                .taskDesc(String.format("来自%s【%s】的业务办理，【申请单号：%s】", transfer.getEquList(), transfer.getSupervisoryCode(), transfer.getApplyNo()))
+                .taskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", transfer.getEquList(), Objects.toString(transfer.getSupervisoryCode(), ""), transfer.getApplyNo()))
+                .taskDesc(String.format("来自%s【%s】的业务办理，【申请单号：%s】", transfer.getEquList(), Objects.toString(transfer.getSupervisoryCode(), ""), transfer.getApplyNo()))
                 .startUserCompanyName(transfer.getCreateUserCompanyName())
                 .startUserId(taskV2Model.getStartUserId())
                 .startUser(taskV2Model.getStartUser())

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgScrapCancelServiceImpl.java

@@ -193,7 +193,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
             dto.setProcessDefinitionKey("scrapCancelNew");
             dto.setBusinessKey(applyNoList.get(0));
             dto.setCompleteFirstTask(Boolean.TRUE);
-            //下一节点执行人单位（下节点接收机构code）
+            // 下一节点执行人单位（下节点接收机构code）
             dto.setNextExecuteUserCompanyCode(model.getReceiveOrgCode());
             list.add(dto);
 
@@ -314,9 +314,9 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
                 LambdaQueryWrapper<JgScrapCancel> lambda = new QueryWrapper<JgScrapCancel>().lambda();
                 lambda.eq(JgScrapCancel::getSequenceNbr, id);
                 JgScrapCancel jgScrapCancel = this.baseMapper.selectOne(lambda);
-                //删除代办消息
+                // 删除代办消息
                 commonService.deleteTaskModel(String.valueOf(jgScrapCancel.getSequenceNbr()));
-                //更新jgScrapCancel数据
+                // 更新jgScrapCancel数据
                 jgScrapCancel.setIsDelete(true);
                 this.updateById(jgScrapCancel);
             }
@@ -324,6 +324,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
     }
 
     public JgScrapCancelDto updateInfo(String submitType, JgScrapCancelDto jgScrapCancelDto, String op) {
+
         if (Objects.isNull(jgScrapCancelDto) || StringUtils.isEmpty(submitType)) {
             throw new IllegalArgumentException("参数不能为空");
         }
@@ -335,7 +336,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
             // 更新并提交
             // 发起流程
             if (!StringUtils.hasText(jgScrapCancelDto.getInstanceId())) {
-                //未进流程直接发起并执行
+                // 未进流程直接发起并执行
 
                 List<ProcessTaskDTO> processTasks;
                 ActWorkflowBatchDTO actWorkflowBatchDTO = new ActWorkflowBatchDTO();
@@ -367,7 +368,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
                 createTaskModel(bean, taskName, "1", nextUserIds);
             } else {
                 // 已经在流程中，执行一步
-                ProcessTaskDTO processTaskDTO = submit(jgScrapCancelDto.getNextTaskId());
+                ProcessTaskDTO processTaskDTO = submit(jgScrapCancelDto);
                 String nextTaskId = processTaskDTO.getNextTask().get(0).getId();
                 String taskName = processTaskDTO.getNextTask().get(0).getName();
                 this.buildRoleList(Collections.singletonList(processTaskDTO), roleListNext, roleListAll);
@@ -408,7 +409,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
                 String supervisoryCode = otherInfo.getSupervisoryCode();
                 jgScrapCancelDto.setSupervisoryCode(supervisoryCode);
             }
-            //更新操作
+            // 更新操作
             JgScrapCancel bean = new JgScrapCancel();
             BeanUtils.copyProperties(jgScrapCancelDto, bean);
             bean.setCancelCertificate(JSON.toJSONString(jgScrapCancelDto.getCancelCertificateList()));
@@ -428,9 +429,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         taskV2Model.setTaskDesc("");
         taskV2Model.setTaskContent(this.buildTaskContent(jgScrapCancelDto.getEquList(), jgScrapCancelDto.getSupervisoryCode(), jgScrapCancelDto.getCancelType(), jgScrapCancelDto.getApplyNo()));
         taskV2Model.setTaskName(taskName);
-        taskV2Model.setTaskDesc("");
         taskV2Model.setTaskCode(jgScrapCancelDto.getApplyNo());
-        taskV2Model.setExecuteUserIds(nextUserIds);
         taskV2Model.setRelationId(jgScrapCancelDto.getInstanceId());
         FlowStatusEnum flowStatusEnum = this.getTaskStatus(operate);
         taskV2Model.setTaskStatus(flowStatusEnum.getCode());
@@ -490,15 +489,18 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         }
     }
 
-    public ProcessTaskDTO submit(String taskId) {
-        //组装信息
+    public ProcessTaskDTO submit(JgScrapCancelDto jgScrapCancelDto) {
+        JgScrapCancel model = this.getById(jgScrapCancelDto.getSequenceNbr());
+        // 组装信息
+        String op = "提交";
         TaskResultDTO dto = new TaskResultDTO();
         dto.setResultCode("approvalStatus");
-        dto.setTaskId(taskId);
+        dto.setTaskId(jgScrapCancelDto.getNextTaskId());
         HashMap<String, Object> map = new HashMap<>();
-        map.put("approvalStatus", "提交");
+        map.put("approvalStatus", op);
+        dto.setNextExecuteUserCompanyCode(model.getReceiveOrgCode());
         dto.setVariable(map);
-        return cmWorkflowService.complete(taskId, dto);
+        return cmWorkflowService.completeOrReject(jgScrapCancelDto.getNextTaskId(), dto, op);
     }
 
     public Map<String, Object> queryBySequenceNbr(Long sequenceNbr) {
@@ -585,7 +587,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
     public void flowExecute(String equList, Long id, String instanceId, String operate, String comment) {
         JgScrapCancel jgScrapCancel = this.getBaseMapper().selectById(id);
         String taskId = jgScrapCancel.getNextTaskId();
-        //组装信息
+        // 组装信息
         TaskResultDTO dto = new TaskResultDTO();
         dto.setResultCode("approvalStatus");
         dto.setTaskId(taskId);
@@ -596,10 +598,10 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
             map.put("approvalStatus", "提交");
         }
         dto.setVariable(map);
-        //下一节点执行人单位（下节点接收机构code）
+        // 下一节点执行人单位（下节点接收机构code）
         dto.setNextExecuteUserCompanyCode(this.getNextUserOrgCode(operate, jgScrapCancel));
-        //执行流程
-        ProcessTaskDTO processTaskDTO = cmWorkflowService.complete(taskId, dto);
+        // 执行流程
+        ProcessTaskDTO processTaskDTO = cmWorkflowService.completeOrReject(taskId, dto, operate);
         // 更新下一步执行人、创建待办
         updateExecuteIds(equList, instanceId, id, operate, processTaskDTO);
     }
@@ -701,8 +703,10 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         if ("0".equals(operate)) {
             code = jgScrapCancel.getReceiveOrgCode();
         } else {
-            //驳回
-            if (WorkFlowStatusEnum.CANCEL_RECEIVE.getPass().equals(jgScrapCancel.getAuditStatus()) || WorkFlowStatusEnum.CANCEL_RECEIVE.getReject().equals(jgScrapCancel.getAuditStatus()) || WorkFlowStatusEnum.CANCEL_RECEIVE.getRollBack().equals(jgScrapCancel.getAuditStatus())) {
+            // 驳回
+            if (WorkFlowStatusEnum.CANCEL_RECEIVE.getPass().equals(jgScrapCancel.getAuditStatus()) ||
+                    WorkFlowStatusEnum.CANCEL_RECEIVE.getReject().equals(jgScrapCancel.getAuditStatus()) ||
+                    WorkFlowStatusEnum.CANCEL_RECEIVE.getRollBack().equals(jgScrapCancel.getAuditStatus())) {
                 code = jgScrapCancel.getUseUnitCode();
             }
         }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgTransferNoticeServiceImpl.java

@@ -5,7 +5,6 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
@@ -15,7 +14,6 @@ import com.yeejoin.amos.boot.module.jg.api.dto.JgTransferNoticeDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.TaskMessageDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.TaskModelDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.WorkflowResultDto;
-import com.yeejoin.amos.boot.module.jg.api.entity.JgInstallationNoticeEq;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgTransferNotice;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgTransferNoticeEq;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
@@ -319,7 +317,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                 }
                 dto.setVariable(commMap);
                 dto.setNextExecuteUserCompanyCode(notice.getReceiveOrgCode());
-                processTaskDTO = iCmWorkflowService.complete(notice.getNextTaskId(), dto);
+                processTaskDTO = iCmWorkflowService.completeOrReject(notice.getNextTaskId(), dto, op);
                 // 提取节点等信息
                 workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);
                 BeanUtils.copyProperties(noticeDto, notice);
@@ -485,6 +483,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             } else {
                 dto.setNextExecuteUserIds(reginParams.getUserModel().getUserId());
             }
+            dto.setEquipCateName(obj.getOrDefault("EQU_CATEGORY", "").toString());
             dto.setEquList(String.valueOf(obj.get("EQU_LIST")));
             dto.setSupervisoryCode(String.valueOf(obj.get("SUPERVISORY_CODE")));
             dto.setInstallUnitName(reginParams.getCompany().getCompanyName());
@@ -499,6 +498,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             }
             dto.setCreateUserName(reginParams.getUserModel().getRealName());
             dto.setCreateUserId(reginParams.getUserModel().getUserId());
+            dto.setEquAddress(obj.getOrDefault("ADDRESS", "").toString());
             list.add(dto);
             equipList.add(jgRelationEquip);
         });
@@ -802,7 +802,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
         workDto.setNextExecuteUserCompanyCode("1".equals(op) ? jgTransferNotice.getInstallUnitCreditCode() : jgTransferNotice.getReceiveOrgCode());
         workDto.setVariable(commMap);
         workDto.setComment(opinion);
-        processTaskDTO = iCmWorkflowService.complete(jgTransferNotice.getNextTaskId(), workDto);
+        processTaskDTO = iCmWorkflowService.completeOrReject(jgTransferNotice.getNextTaskId(), workDto, op);
         // 提取节点等信息
         workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);
         return workflowResultDto;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgUseRegistrationServiceImpl.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationDto;
@@ -47,6 +48,7 @@ import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.servlet.http.HttpServletResponse;
+import java.text.ParseException;
 import java.time.LocalDate;
 import java.util.*;
 
@@ -113,6 +115,10 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.getBaseMapper().selectOne(lambdaSelect);
         JSONObject map = JSONObject.parseObject(jgRegistrationHistory.getChangeData());
         map.remove("status");
+        // 安全管理员
+        if (map.containsKey("safetyManagerName")){
+            map.put("safetyManager", map.get("safetyManagerName"));
+        }
         IdxBizJgUseInfo useInfo = new IdxBizJgUseInfo();
         BeanUtil.copyProperties(map, useInfo);
         // 城市
@@ -195,12 +201,17 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         jgUseRegistration.setUseUnitCreditCode(String.valueOf(map.get("useUnitCreditCode")));
         String equType = this.baseMapper.getEquType(String.valueOf(map.get("equipId")));
         if (map.containsKey("receiveOrgCode")) {
-            //维保单位信息
+            // 接收单位信息
             String[] splitMaintenanceUnitCode = String.valueOf(map.getString("receiveOrgCode")).split("_");
             jgUseRegistration.setReceiveCompanyCode(splitMaintenanceUnitCode[0]);
             jgUseRegistration.setReceiveOrgName(splitMaintenanceUnitCode[1]);
 
         }
+        // 安全管理员
+        if (map.containsKey("safetyManager")) {
+            String[] data = String.valueOf(map.getString("safetyManager")).split("_");
+            map.put("safetyManagerName", data[1]);
+        }
         // 使用单位提交
         jgUseRegistration.setUseUnitCreditCode(reginParams.getCompany().getCompanyCode());
         jgUseRegistration.setCreateUserId(reginParams.getUserModel().getUserId());
@@ -479,9 +490,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             // 驳回到使用单位
             dto.setNextExecuteUserCompanyCode(jgUseRegistration.getUseUnitCreditCode());
         } else {
-            dto.setNextExecuteUserCompanyCode(jgUseRegistration.getReceiveOrgCode());
+            dto.setNextExecuteUserCompanyCode(jgUseRegistration.getReceiveCompanyCode());
         }
-        ProcessTaskDTO complete = cmWorkflowService.complete(jgUseRegistration.getNextTaskId(), dto);
+        ProcessTaskDTO complete = cmWorkflowService.completeOrReject(jgUseRegistration.getNextTaskId(), dto, operate);
         ArrayList<ProcessTaskDTO> processTaskDTOS = new ArrayList<>();
         processTaskDTOS.add(complete);
         List<WorkflowResultDto> resultDto = commonServiceImpl.buildWorkFlowInfo(processTaskDTOS);
@@ -726,7 +737,6 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         LambdaQueryWrapper<IdxBizJgOtherInfo> lambdaOth = new QueryWrapper<IdxBizJgOtherInfo>().lambda();
         lambdaOth.eq(IdxBizJgOtherInfo::getRecord, record);
         IdxBizJgOtherInfo otherInfo = otherInfoMapper.selectOne(lambdaOth);
-        if (ObjectUtils.isEmpty(otherInfo.getSupervisoryCode())) {
         // 使用信息
         LambdaQueryWrapper<IdxBizJgUseInfo> lambda = new QueryWrapper<IdxBizJgUseInfo>().lambda();
         lambda.eq(IdxBizJgUseInfo::getRecord, record);
@@ -735,6 +745,24 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         LambdaQueryWrapper<IdxBizJgRegisterInfo> lambdaReg = new QueryWrapper<IdxBizJgRegisterInfo>().lambda();
         lambdaReg.eq(IdxBizJgRegisterInfo::getRecord, record);
         IdxBizJgRegisterInfo registerInfo = idxBizJgRegisterInfoMapper.selectOne(lambdaReg);
+        if (ObjectUtils.isEmpty(registerInfo.getEquCode())) {
+            //生成设备注册代码
+            StringBuffer stringBuffer = new StringBuffer();
+            String ym = null;
+            try {
+                ym = DateUtils.dateFormat(new Date(), DateUtils.DATE_PATTERN_MM);
+            } catch (ParseException e) {
+                log.error("日期转换失败：{}", e);
+            }
+            stringBuffer.append(registerInfo.getEquCategory()).append(useInfo.getCity()).append(ym);
+            ResponseModel<String> responseModel = tzsServiceFeignClient.deviceRegistrationCode(stringBuffer.toString());
+            String deviceRegistrationCode = responseModel.getResult();
+            if (!ObjectUtils.isEmpty(deviceRegistrationCode)) {
+                registerInfo.setEquCode(deviceRegistrationCode);
+                idxBizJgRegisterInfoMapper.updateById(registerInfo);
+            }
+        }
+        if (ObjectUtils.isEmpty(otherInfo.getSupervisoryCode())) {
             // 生成监管码、96333码
             Map<String, Object> map = new HashMap<>();
             map.put("cityCode", useInfo.getCity());

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/entity/JyjcInspectionResult.java

@@ -182,4 +182,17 @@ public class JyjcInspectionResult extends BaseEntity {
      */
     @TableField("trace_id")
     private String traceId;
+
+
+    /**
+     * 检验检测单位名称(冗余)
+     */
+    @TableField(value = "inspection_unit_name")
+    private String inspectionUnitName;
+
+    /**
+     * 报检单位名称(冗余)
+     */
+    @TableField(value = "application_unit_name")
+    private String applicationUnitName;
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/enums/DocumentEnum.java

@@ -41,6 +41,8 @@ public enum DocumentEnum {
     AGGLRY("aqglry", "安全管理人员证"),
     ZYRYZ("zyry", "作业人员证"),
     WBHT("wbht", "维保合同"),
+    AQBHZZ("aqbhzz", "安全保护装置的型式试验证书"),
+    ZJHG("zjhg", "自检合格证明"),
     AZJY("azjy", "安装监检报告");
 
     private String code;

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/model/JyjcInspectionResultModel.java

@@ -95,7 +95,9 @@ public class JyjcInspectionResultModel extends BaseModel {
     @ApiModelProperty(value = "检验检测类型名称（冗余）")
     private String inspectionTypeName;
 
+
     @ApiModelProperty(value = "报检日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date applicationDate;
 
     @ApiModelProperty("检验结果方式")
@@ -143,10 +145,10 @@ public class JyjcInspectionResultModel extends BaseModel {
     @ApiModelProperty(value = "设备使用地址")
     private String equUseAddress;
 
-    @ApiModelProperty(value = "检验检测单")
+    @ApiModelProperty(value = "检验检测单位名称(冗余)")
     private String inspectionUnitName;
 
-    @ApiModelProperty(value = "报检单位")
+    @ApiModelProperty(value = "报检单位名称(冗余)")
     private String applicationUnitName;
 
     @ApiModelProperty(value = "监管码")

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcInspectionResultMapper.xml

@@ -61,23 +61,54 @@
 
     <select id="selectForPage"
             resultType="com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionResultModel">
-        select res.sequence_nbr, res.inspection_unit_code, res.application_no, res.application_unit_code,
-        res.equip_unicode, res.result_status, res.license_number, res.result_no, res.inspector, res.inner_person_code,
-        res.inspection_conclusion, res.inspection_date, res.next_inspection_date, res.inspection_start_date,
-        res.inspection_end_date, res.inspection_result_summary, res.non_conformance, res.remark,
-        res.rec_user_id, res.rec_date, res.biz_type,res.equ_category, res.inspection_type, res.inspection_type_name,
-        res.application_date,use_unit_name, use_unit_credit_code, province_name, city_name, county_name, street_name, equ_code, use_inner_code, ibjri.equ_list,
-        tec1.name equ_list_name, ibjri.equ_category , ibjoi.SUPERVISORY_CODE supervisoryCode
-        , use_org_code, res.equ_define, ibjui.ADDRESS equUseAddress, bei.use_unit inspectionUnitName, bei1.use_unit applicationUnitName, cdb.name inspectionTypeName
-        from tz_jyjc_inspection_result res
-        left join idx_biz_jg_other_info ibjoi on res.equip_unicode = ibjoi.record
-        left join idx_biz_jg_use_info ibjui on ibjui.record = res.equip_unicode
-        left join idx_biz_jg_register_info ibjri on ibjui.record = ibjri.record
-        left join tz_equipment_category tec on ibjri.equ_category = tec.code
-        left join tz_equipment_category tec1 on ibjri.equ_list = tec1.code
-        left join tz_base_enterprise_info bei on res.inspection_unit_code = bei.use_code
-        left join tz_base_enterprise_info bei1 on res.application_unit_code = bei1.use_code
-        left join cb_data_dictionary cdb on res.inspection_type = cdb.code
+        SELECT
+            res.sequence_nbr,
+            res.inspection_unit_code,
+            res.application_no,
+            res.application_unit_code,
+            res.equip_unicode,
+            res.result_status,
+            res.license_number,
+            res.result_no,
+            res.inspector,
+            res.inner_person_code,
+            res.inspection_conclusion,
+            res.inspection_date,
+            res.next_inspection_date,
+            res.inspection_start_date,
+            res.inspection_end_date,
+            res.inspection_result_summary,
+            res.non_conformance,
+            res.remark,
+            res.rec_user_id,
+            res.rec_date,
+            res.biz_type,
+            res.equ_category,
+            res.inspection_type,
+            res.inspection_type_name,
+            res.application_date,
+            res.inspection_unit_name,
+            res.application_unit_name,
+            res.inspection_type_name,
+            ibjui.use_unit_name,
+            ibjui.use_unit_credit_code,
+            ibjui.province_name,
+            ibjui.city_name,
+            ibjui.county_name,
+            ibjui.street_name,
+            ibjri.equ_code,
+            ibjui.use_inner_code,
+            ibjri.equ_list,
+            (SELECT NAME FROM tz_equipment_category WHERE code = res.equ_list) AS equ_list_name,
+            ibjoi.SUPERVISORY_CODE supervisoryCode,
+            ibjri.use_org_code,
+            res.equ_define,
+            ibjui.ADDRESS equUseAddress
+        FROM
+            tz_jyjc_inspection_result res
+            LEFT JOIN idx_biz_jg_other_info ibjoi ON res.equip_unicode = ibjoi.record
+            LEFT JOIN idx_biz_jg_use_info ibjui ON ibjui.record = res.equip_unicode
+            LEFT JOIN idx_biz_jg_register_info ibjri ON ibjui.record = ibjri.record
         <where>
             <if test="jyjcInspectionResultModel.applicationNo != '' and jyjcInspectionResultModel.applicationNo != null">
                 and res.application_no like concat('%',#{jyjcInspectionResultModel.applicationNo},'%')
@@ -86,19 +117,19 @@
                 and res.application_unit_code = #{jyjcInspectionResultModel.applicationUnitCode}
             </if>
             <if test="jyjcInspectionResultModel.useOrgCode != '' and jyjcInspectionResultModel.useOrgCode != null">
-                and use_org_code like concat('%',#{jyjcInspectionResultModel.useOrgCode},'%')
+                and ibjri.use_org_code like concat('%',#{jyjcInspectionResultModel.useOrgCode},'%')
             </if>
             <if test="jyjcInspectionResultModel.useInnerCode != '' and jyjcInspectionResultModel.useInnerCode != null">
-                and use_inner_code like concat('%',#{jyjcInspectionResultModel.useInnerCode},'%')
+                and ibjui.use_inner_code like concat('%',#{jyjcInspectionResultModel.useInnerCode},'%')
             </if>
             <if test="jyjcInspectionResultModel.equCode != '' and jyjcInspectionResultModel.equCode != null">
-                and equ_code like concat('%',#{jyjcInspectionResultModel.equCode},'%')
+                and ibjri.equ_code like concat('%',#{jyjcInspectionResultModel.equCode},'%')
             </if>
             <if test="jyjcInspectionResultModel.equipUnicode != '' and jyjcInspectionResultModel.equipUnicode != null">
                 and res.equip_unicode like concat('%',#{jyjcInspectionResultModel.equipUnicode},'%')
             </if>
-            <if test="jyjcInspectionResultModel.equCategory != '' and jyjcInspectionResultModel.equCategory != null">
-                and ibjri.equ_category = #{jyjcInspectionResultModel.equCategory}
+            <if test="jyjcInspectionResultModel.equList != '' and jyjcInspectionResultModel.equList != null">
+                and ibjri.equ_list = #{jyjcInspectionResultModel.equList}
             </if>
             <if test="jyjcInspectionResultModel.inspectionType != '' and jyjcInspectionResultModel.inspectionType != null">
                 and res.inspection_type = #{jyjcInspectionResultModel.inspectionType}
@@ -107,7 +138,7 @@
                 AND TO_DAYS(res.application_date) = TO_DAYS(#{jyjcInspectionResultModel.applicationDate})
             </if>
             <if test="jyjcInspectionResultModel.useUnitCreditCode != '' and jyjcInspectionResultModel.useUnitCreditCode != null">
-                and use_unit_credit_code like concat('%',#{jyjcInspectionResultModel.useUnitCreditCode},'%')
+                and ibjui.use_unit_credit_code like concat('%',#{jyjcInspectionResultModel.useUnitCreditCode},'%')
             </if>
             <if test="jyjcInspectionResultModel.inspectionUnitCode != '' and jyjcInspectionResultModel.inspectionUnitCode != null">
                 and res.inspection_unit_code = #{jyjcInspectionResultModel.inspectionUnitCode}
@@ -130,6 +161,6 @@
                 </otherwise>
             </choose>
         </where>
-        ORDER BY application_date DESC
+        ORDER BY res.application_date DESC
     </select>
 </mapper>

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcInspectionApplicationServiceImpl.java

@@ -12,7 +12,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.sun.org.apache.bcel.internal.generic.NEW;
+import com.sun.org.apache.regexp.internal.RE;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
+import com.yeejoin.amos.boot.biz.common.service.IDataDictionaryService;
+import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.biz.common.workflow.feign.WorkflowFeignService;
@@ -113,6 +117,9 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
     @Autowired
     TaskModelServiceImpl taskModelService;
 
+    @Autowired
+    DataDictionaryServiceImpl dataDictionaryService;
+
     public JyjcInspectionApplicationModel save(@RequestBody JSONObject obj) {
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
 
@@ -353,6 +360,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
     }
 
 
+    @Override
     public Boolean deleteBatchData(List<Long> sequenceNbr) {
 
 //        List<JyjcInspectionApplication> jyjcInspectionApplications = this.getBaseMapper().selectBatchIds(sequenceNbr);
@@ -398,6 +406,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
 
     }
 
+    @Override
     public Page<JyjcInspectionApplicationModel> queryForPageList(Page<JyjcInspectionApplication> page, JyjcInspectionApplicationModel model) {
         ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(),
                 RequestContext.getToken())).toString(), ReginParams.class);
@@ -520,7 +529,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
         TaskResultDTO task = new TaskResultDTO();
         task.setResultCode("approvalStatus");
         task.setTaskId(taskId);
-        task.setComment("");
+        task.setComment(params.getOrDefault("comments","").toString());
         HashMap<String, Object> map = new HashMap<>();
         map.put("approvalStatus", "0");
         task.setVariable(map);
@@ -581,17 +590,21 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
         for (int i = 0; i < applicationEquipModels.size(); i++) {
             JyjcInspectionResult resultModel = new JyjcInspectionResult();
             resultModel.setInspectionUnitCode(inspectionApplicationModel.getInspectionUnitCode());
+            resultModel.setInspectionUnitName(inspectionApplicationModel.getInspectionUnitName());
             resultModel.setApplicationNo(inspectionApplicationModel.getApplicationNo());
             resultModel.setApplicationUnitCode(inspectionApplicationModel.getApplicationUnitCode());
+            resultModel.setApplicationUnitName(inspectionApplicationModel.getApplicationUnitName());
             resultModel.setResultStatus(ResultStatusEnum.NO_RESULT.getCode());
             resultModel.setApplicationDate(inspectionApplicationModel.getApplicationDate());
             resultModel.setResultType(inspectionApplicationModel.getResultType());
             //resultModel.setResultType("input");
             resultModel.setInspectionType(inspectionApplicationModel.getInspectionType());
+            resultModel.setInspectionTypeName(this.getDictNameByCode(inspectionApplicationModel.getInspectionType()));
             // 解析设备
             resultModel.setBizType(inspectionApplicationModel.getBizType());
             resultModel.setResultNo(codes.get(i));
-            resultModel.setEquipUnicode(applicationEquipModels.get(i).getEquipUnicode());//设备唯一标识
+            //设备唯一标识
+            resultModel.setEquipUnicode(applicationEquipModels.get(i).getEquipUnicode());
             resultModel.setEquDefine(applicationEquipModels.get(i).getEquDefine());
             resultModel.setEquCategory(applicationEquipModels.get(i).getEquCategory());
             resultModel.setEquList(applicationEquipModels.get(i).getEquList());
@@ -603,6 +616,11 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
         JyjcInspectionApplicationHandlerFactory.apply(type).notifyInspectionUnit(thiryPartParams);
     }
 
+    private String getDictNameByCode(String code) {
+        DataDictionary dataDictionary = dataDictionaryService.getByCode(code,"JYJC");
+        return dataDictionary != null ? dataDictionary.getName() : "";
+    }
+
     /**
      * 退回
      *
@@ -626,8 +644,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
         TaskResultDTO task = new TaskResultDTO();
         task.setResultCode("approvalStatus");
         task.setTaskId(taskId);
-        task.setComment("");
-        HashMap<String, Object> map = new HashMap<>();
+        task.setComment(params.getOrDefault("comments","").toString());        HashMap<String, Object> map = new HashMap<>();
         map.put("approvalStatus", "1");
         task.setVariable(map);
         //执行流程

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-biz/src/main/java/com/yeejoin/amos/boot/module/ymt/biz/service/impl/GenerateCodeServiceImpl.java

@@ -143,7 +143,7 @@ public class GenerateCodeServiceImpl implements IGenerateCodeService {
         categoryOtherInfoMapper.selectSupervisorCodeMaxValue().forEach(vo ->
                 stringRedisTemplate.opsForValue().set(vo.getName(), String.valueOf(vo.getValue())));
 
-        return Long.parseLong(Objects.requireNonNull(redisTemplate.opsForValue().get(sequenceKey)));
+        return Long.parseLong(redisTemplate.opsForValue().get(sequenceKey) == null ? "0" : redisTemplate.opsForValue().get(sequenceKey));
     }
 
     /**

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-biz/src/main/resources/json/equipCategory.json

@@ -24,7 +24,7 @@
       "type": "lifting"
     },
     {
-      "name": "场内机动车辆",
+      "name": "场（厂）内专用机动车辆",
       "code": "5000",
       "image": "upload/tzs/common/image/总览厂车.png",
       "imageUrl": "upload/tzs/common/image/监管厂车.png",
@@ -105,7 +105,7 @@
       "imageUrl": "upload/tzs/common/image/监管起重机械.png"
     },
     {
-      "name": "场内机动车辆",
+      "name": "场（厂）内专用机动车辆",
       "code": "5000",
       "image": "upload/tzs/common/image/总览厂车.png",
       "imageUrl": "upload/tzs/common/image/监管厂车.png"
@@ -156,7 +156,7 @@
       "imageUrl": "upload/tzs/common/image/监管起重机械.png"
     },
     {
-      "name": "场内机动车辆",
+      "name": "场（厂）内专用机动车辆",
       "code": "5000",
       "image": "upload/tzs/common/image/总览厂车.png",
       "imageUrl": "upload/tzs/common/image/监管厂车.png"
@@ -264,7 +264,7 @@
       "type": "lifting"
     },
     {
-      "name": "场内机动车辆",
+      "name": "场（厂）内专用机动车辆",
       "code": "5000",
       "image": "upload/tzs/common/image/总览厂车.png",
       "imageUrl": "upload/tzs/common/image/监管厂车.png",
@@ -300,7 +300,7 @@
       "type": "lifting"
     },
     {
-      "name": "场内机动车辆",
+      "name": "场（厂）内专用机动车辆",
       "code": "5000",
       "image": "upload/tzs/common/image/总览厂车.png",
       "imageUrl": "upload/tzs/common/image/监管厂车.png",