Merge branch 'develop_tzs_register' of…

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

+package com.yeejoin.amos.boot.module.jg.api.dto;
+
+import lombok.Data;
+
+@Data
+public class TaskMessageDto {
+
+    /**
+     * 流程实例id
+     */
+    String instanceId;
+
+    /**
+     * 流程状态
+     */
+    String status;
+
+    /**
+     * 上一步操作人id
+     */
+    String promoter;
+
+    /**
+     * 下个节点可操作人ids
+     */
+    String nextExecuteUserIds;
+
+    /**
+     * 业务数据id
+     */
+    String sequenceNbr;
+
+    /**
+     * 下个节点可操作角色ids
+     */
+    String nextExecuteIds;
+
+    /**
+     * 移装/安装 告知状态
+     */
+    String noticeStatus;
+}

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

@@ -55,10 +55,22 @@
                     AND tjtn.transfer_type = '跨区移装'
                 </if>
             </if>
+<!--            <if test="type == 'supervision'">-->
+<!--                AND tjtn.receive_org_code = #{orgCode} AND tjtn.instance_id IS NOT NULL-->
+<!--            </if>-->
+<!--            <if test="type == 'enterprise'">-->
+<!--                AND tjtn.install_unit_credit_code = #{orgCode}-->
+<!--            </if>-->
+
+            <if test="roleIds != null and type == 'supervision'">
+                <foreach collection='roleIds' item='role' open='and (' close=')' separator='or'>
+                    tjtn.instance_status like concat('%',#{role},'%')
+                </foreach>
+            </if>
             <if test="type == 'supervision'">
-                AND tjtn.receive_org_code = #{orgCode} AND tjtn.instance_id IS NOT NULL
+                AND tjtn.receive_org_code = #{orgCode}
             </if>
-            <if test="type == 'enterprise'">
+            <if test="type == 'company'">
                 AND tjtn.install_unit_credit_code = #{orgCode}
             </if>
         </where>

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

@@ -50,12 +50,12 @@
             <if test="dto.useUnitName != null and dto.useUnitName != ''">
                 and  ur.use_unit_name like concat('%',#{dto.useUnitName},'%')
             </if>
-            <if test="roleIds != null and dto.dataType == 'jg'">
+            <if test="roleIds != null and dto.dataType == 'supervision'">
                 <foreach collection='roleIds' item='role' open='and (' close=')' separator='or'>
                     instance_status like concat('%',#{role},'%')
                 </foreach>
             </if>
-            <if test="dto.dataType == 'jg' ">
+            <if test="dto.dataType == 'supervision' ">
                 and  ur.receive_company_code = #{dto.unitCode}
             </if>
             <if test="dto.dataType == 'company' ">

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

@@ -145,6 +145,11 @@ public class JgTransferNoticeController extends BaseController {
     ) {
         Page<JgTransferNotice> page = new Page<>(current, size);
         ReginParams reginParams = getSelectedOrgInfo();
+        if (reginParams.getCompany().getLevel().equals(BaseController.COMPANY_TYPE_COMPANY)){
+            type = BaseController.COMPANY_TYPE_COMPANY;
+        }else {
+            type = BaseController.COMPANY_TYPE_SUPERVISION;
+        }
         return ResponseHelper.buildResponse(jgTransferNoticeService.queryForJgTransferNoticePage(page, model, type, reginParams));
     }
 

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

@@ -87,6 +87,12 @@ public class JgUseRegistrationController extends BaseController {
                                                             @RequestParam(value = "current") int current,
                                                             @RequestParam(value = "size") int size) {
         Page<Map<String, Object>> page = new Page<>(current, size);
+        ReginParams info = getSelectedOrgInfo();
+        if (info.getCompany().getLevel().equals(BaseController.COMPANY_TYPE_COMPANY)){
+            dto.setDataType(BaseController.COMPANY_TYPE_COMPANY);
+        }else {
+            dto.setDataType(BaseController.COMPANY_TYPE_SUPERVISION);
+        }
         return ResponseHelper.buildResponse(jgUseRegistrationServiceImpl.getList(dto, page,  dto.getRoleIds()));
     }
 

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

@@ -149,6 +149,8 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
                 dto.setProcessDefinitionKey("unitRename");
                 dto.setBusinessKey(applyNo);
                 dto.setCompleteFirstTask(true);
+                // 启动并执行下一步人单位传接收单位的code
+                dto.setNextExecuteUserCompanyCode(this.getReceiveCompanyCode(model));
                 list.add(dto);
                 actWorkflowBatchDTO.setProcess(list);
                 processTasks = cmWorkflowService.startBatch(actWorkflowBatchDTO);
@@ -189,6 +191,17 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
         this.createTaskModel(dto, taskName[0], submitType, nextUserIds);
     }
 
+    private String getReceiveCompanyCode(JgChangeRegistrationNameDto model) {
+        String receiveOrgId = model.getReceiveOrgCode();
+        if (!ObjectUtils.isEmpty(receiveOrgId)) {
+            String[] receiveOrgIdList = receiveOrgId.split("_");
+            if (receiveOrgIdList.length > 1) {
+                return receiveOrgIdList[0];
+            }
+        }
+        return null;
+    }
+
     private void buildRoleList(List<ProcessTaskDTO> processTasks, List<String> roleListNext, List<String> roleListAll) {
         processTasks.forEach(p -> {
             p.getNextCandidateGroups().values().forEach(e -> {
@@ -264,6 +277,8 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
                     dto.setProcessDefinitionKey("unitRename");
                     dto.setBusinessKey(jgChangeRegistrationName.getApplyNo());
                     dto.setCompleteFirstTask(true);
+                    // 启动并执行下一步人单位传接收单位的code
+                    dto.setNextExecuteUserCompanyCode(jgChangeRegistrationName.getReceiveOrgCode());
                     list.add(dto);
                     actWorkflowBatchDTO.setProcess(list);
                     processTasks = cmWorkflowService.startBatch(actWorkflowBatchDTO);
@@ -287,7 +302,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
                 }
             } else {
                 // 执行一步
-                ProcessTaskDTO processTaskDTO = submit(op, jgChangeRegistrationName.getNextTaskId());
+                ProcessTaskDTO processTaskDTO = submit(op, jgChangeRegistrationName);
                 String nextTaskId = processTaskDTO.getNextTask().get(0).getId();
                 String taskName = processTaskDTO.getNextTask().get(0).getName();
                 this.buildRoleList(Collections.singletonList(processTaskDTO), roleListNext, roleListAll);
@@ -345,16 +360,17 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
     }
 
 
-    public ProcessTaskDTO submit(String op, String taskId) {
+    public ProcessTaskDTO submit(String operate, JgChangeRegistrationName jgChangeRegistrationName) {
         //组装信息
         TaskResultDTO dto = new TaskResultDTO();
         dto.setResultCode("approvalStatus");
-        dto.setTaskId(taskId);
+        dto.setTaskId(jgChangeRegistrationName.getNextTaskId());
         dto.setComment("提交流程");
+        dto.setNextExecuteUserCompanyCode(this.getNextUserOrgCode(operate,jgChangeRegistrationName));
         HashMap<String, Object> map = new HashMap<>();
-        map.put("approvalStatus", op);
+        map.put("approvalStatus", operate);
         dto.setVariable(map);
-        return cmWorkflowService.complete(taskId, dto);
+        return cmWorkflowService.complete(jgChangeRegistrationName.getNextTaskId(), dto);
     }
 
     private void convertField(JgChangeRegistrationNameDto model) {
@@ -426,6 +442,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
             dto.setResultCode("approvalStatus");
             dto.setTaskId(taskId);
             dto.setComment(comment);
+            dto.setNextExecuteUserCompanyCode(this.getNextUserOrgCode(operate,jgChangeRegistrationName));
             HashMap<String, Object> map = new HashMap<>();
             map.put("approvalStatus", operate);
             if (!ObjectUtils.isEmpty(jgChangeRegistrationName.getInstanceStatus()) &&
@@ -443,6 +460,21 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
         }
     }
 
+    private String getNextUserOrgCode(String operate, JgChangeRegistrationName jgChangeRegistrationName) {
+        if("0".equals(operate)){
+            // 执行通过节点，单位code为接收机构单位信息
+            return jgChangeRegistrationName.getReceiveOrgCode();
+        }
+        if(jgChangeRegistrationName.getAuditStatus().equals(WorkFlowStatusEnum.UNIT_RENAME_RECEIVE.getPass())
+            || jgChangeRegistrationName.getAuditStatus().equals(WorkFlowStatusEnum.UNIT_RENAME_RECEIVE.getReject())
+                || jgChangeRegistrationName.getAuditStatus().equals(WorkFlowStatusEnum.UNIT_RENAME_RECEIVE.getRollBack())){
+            // 驳回且当前节点为一键节点时，单位code为发起人单位信息
+            return jgChangeRegistrationName.getUseUnitCreditCode();
+        }
+        // 2、3级驳回时，单位code为接收单位code
+        return  jgChangeRegistrationName.getReceiveOrgCode();
+    }
+
     public void updateExecuteIds(String instanceId, Long sequenceNbr, String operate, ProcessTaskDTO processTaskDTO) {
         List<String> roleListNext = new ArrayList<>();
         List<String> roleListAll = new ArrayList<>();

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

@@ -410,16 +410,21 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         }
         Map<String, Object> detail = JSONObject.parseObject(JSONObject.toJSONString(jgChangeRegistrationReform), Map.class);
         Map<String, Object> originalData = new HashMap<>();
+        Map<String, Object> originalDataOther = new HashMap<>();
 
         if ((detail.get("status").equals("已完成") || detail.get("status").equals("流程结束"))) {
             originalData = idxBizJgRegisterInfoService.getDetailByRecord(equipId);
+            originalDataOther = idxBizJgRegisterInfoService.getDetailFieldCamelCaseByRecord(equipId);
             originalData.remove("sequenceNbr");
+            originalDataOther.remove("sequenceNbr");
             if (!ObjectUtils.isEmpty(detail.get("transformationQualityCertificate"))) {
                 detail.put("transformationQualityCertificate", JSONObject.parse(detail.get("transformationQualityCertificate").toString()));
             }
             if (!ObjectUtils.isEmpty(detail.get("renovationSupervisioninspectionCertificate"))) {
                 detail.put("renovationSupervisioninspectionCertificate", JSONObject.parse(detail.get("renovationSupervisioninspectionCertificate").toString()));
             }
+            detail.putAll(originalDataOther);
+            detail.put("techInfo",originalData);
         } else {
             JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryMapper.selectOne(new QueryWrapper<JgRegistrationHistory>()
                     .eq("equ_id", equipId)
@@ -427,8 +432,8 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
                     .eq("registration_class", "改造登记"));
             originalData = JSONObject.parseObject(jgRegistrationHistory.getChangeData(), Map.class);
             originalData.remove("sequenceNbr");
-        }
             detail.putAll(originalData);
+        }
         return detail;
     }
 

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

 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.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -8,6 +9,7 @@ import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 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;
 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.*;
@@ -309,7 +311,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
                 oldTransfer.setCreateUserName(reginParams.getUserModel().getRealName());
                 oldTransfer.setCreateUserCompanyName(reginParams.getCompany().getCompanyName());
                 //启动流程
-                WorkflowResultDto workflowResult = this.startWorkFlork();
+                WorkflowResultDto workflowResult = this.startWorkFlork(oldTransfer.getReceiveOrgCode());
 
                 this.updateExecuteIds(instanceId, oldTransfer, "startWorkfow", workflowResult);
                 //生成代办
@@ -350,6 +352,8 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
             HashMap<String, Object> map = new HashMap<>();
             map.put("approvalStatus", operate);
             dto.setVariable(map);
+            //下一节点执行人单位（下节点接收机构code）
+            dto.setNextExecuteUserCompanyCode(this.getNextUserOrgCode(operate, transfer));
             if (!ObjectUtils.isEmpty(transfer) && (transfer.getStatus().equals(WorkFlowStatusEnum.TRANSFER_SUBMIT.getRollBack()) || transfer.getStatus().equals(WorkFlowStatusEnum.TRANSFER_SUBMIT.getReject()))) {
                 map.put("approvalStatus", "提交");
             }
@@ -394,7 +398,6 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
         jgTransfer.setNextExecutorIds(role);
         this.update(jgTransfer, lambda);
         //待办 撤回
-//        JgChangeRegistrationTransfer data = this.baseMapper.selectOne(lambda);
         JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(jgTransfer));
         jsonObject.put("flowStatus", commonService.getDictionaryCodeByName(jgTransfer.getAuditStatus()));
         jsonObject.put("flowStatusLabel", jgTransfer.getAuditStatus());
@@ -670,7 +673,6 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
                     TaskModelDto taskModelDto = new TaskModelDto();
                     BeanUtils.copyProperties(taskV2Model, taskModelDto);
                     // 创建新的代办
-                    taskModelDto.setModel(jgChangeRegistrationTransfer);
                     taskModelDto.setTaskName(workflowResult.getNextTaskName());
                     taskModelDto.setExecuteUserIds(workflowResult.getNextExecutorUserIds());
                     taskModelDto.setTaskStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode());
@@ -679,6 +681,9 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
                     taskModelDto.setTaskType(BusinessTypeEnum.JG_CHANGE_REGISTRATION.getCode());
                     taskModelDto.setTaskTypeLabel(BusinessTypeEnum.JG_CHANGE_REGISTRATION.getName());
                     taskModelDto.setRelationId(instanceId);
+                    TaskMessageDto taskMessageDto = new TaskMessageDto();
+                    BeanUtil.copyProperties(jgChangeRegistrationTransfer, taskMessageDto);
+                    taskModelDto.setModel(taskMessageDto);
                     commonService.buildTaskModel(Collections.singletonList(taskModelDto));
                 }
             }
@@ -1013,7 +1018,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
     /**
      * 启动工作流
      */
-    private WorkflowResultDto startWorkFlork() {
+    private WorkflowResultDto startWorkFlork(String receiveOrgCreditCode) {
         try {
             ActWorkflowBatchDTO workflowBatchParams = new ActWorkflowBatchDTO();
             List<ActWorkflowStartDTO> workflowList = new ArrayList<>();
@@ -1021,6 +1026,8 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
             workflow.setProcessDefinitionKey(PROCESS_DEFINITION_KEY);
             workflow.setBusinessKey("submit");
             workflow.setCompleteFirstTask(Boolean.TRUE);
+            //下一节点执行人单位（下节点接收机构code）
+            workflow.setNextExecuteUserCompanyCode(receiveOrgCreditCode);
             workflowList.add(workflow);
             workflowBatchParams.setProcess(workflowList);
             List<ProcessTaskDTO> processTasks = icmWorkflowService.startBatch(workflowBatchParams);
@@ -1055,12 +1062,14 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
                 toDoTask.setFlowStatus(commonService.getDictionaryCodeByName(transfer.getStatus()));
                 toDoTask.setFlowStatusLabel(transfer.getStatus());
                 toDoTask.setFlowCode(transfer.getNextTaskId());
-                toDoTask.setModel(transfer);
                 toDoTask.setStartUserId(transfer.getCreateUserId());
                 toDoTask.setStartUser(transfer.getCreateUserName());
                 toDoTask.setStartUserCompanyName(transfer.getCreateUserCompanyName());
                 toDoTask.setStartDate(new Date());
                 toDoTask.setNextExecuteUser(transfer.getNextExecutorIds());
+                TaskMessageDto taskMessageDto = new TaskMessageDto();
+                BeanUtil.copyProperties(sorkflow, taskMessageDto);
+                toDoTask.setModel(taskMessageDto);
                 toDoTasklist.add(toDoTask);
             }
             commonService.buildTaskModel(toDoTasklist);
@@ -1083,4 +1092,19 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
         String result = "来自%s【%s】的业务办理，【申请单号：%s】";
         return String.format(result, transfer.getEquipListName(), transfer.getSupervisoryCode(), transfer.getApplyNo());
     }
+
+    public String getNextUserOrgCode(String operate, JgChangeRegistrationTransfer contract) {
+        String code = null;
+        if ("0".equals(operate)) {
+            code = contract.getReceiveOrgCode();
+        } else {
+            //驳回
+            if (WorkFlowStatusEnum.TRANSFER_RECEIVE.getPass().equals(contract.getAuditStatus()) ||
+                    WorkFlowStatusEnum.TRANSFER_RECEIVE.getReject().equals(contract.getAuditStatus()) ||
+                    WorkFlowStatusEnum.TRANSFER_RECEIVE.getRollBack().equals(contract.getAuditStatus())) {
+                code = contract.getUseUnitCreditCode();
+            }
+        }
+        return code == null ? contract.getReceiveOrgCode() : code;
+    }
 }
\ No newline at end of file

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

@@ -13,6 +13,7 @@ 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.JgInstallationNoticeDto;
+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.JgInstallationNotice;
@@ -300,13 +301,15 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                     TaskModelDto taskModelDto = new TaskModelDto();
                     BeanUtils.copyProperties(taskV2Model, taskModelDto);
                     // 创建新的代办
-                    taskModelDto.setModel(notice);
                     taskModelDto.setTaskName(workflowResultDto.getNextTaskName());
                     taskModelDto.setExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
                     taskModelDto.setFlowStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode());
                     taskModelDto.setFlowStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
                     taskModelDto.setFlowCode(notice.getNextTaskId());
                     taskModelDto.setNextExecuteUser(workflowResultDto.getNextExecutorRoleIds());
+                    TaskMessageDto taskMessageDto = new TaskMessageDto();
+                    BeanUtils.copyProperties(notice, taskMessageDto);
+                    taskModelDto.setModel(taskMessageDto);
                     commonService.buildTaskModel(Collections.singletonList(taskModelDto));
                 }
             }
@@ -531,9 +534,11 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             taskModelDto.setStartUser(item.getCreateUserName());
             taskModelDto.setStartUserCompanyName(item.getCreateUserCompanyName()); // 任务发起人所在单位
             taskModelDto.setStartDate(item.getCreateDate());
-            taskModelDto.setModel(item);
             taskModelDto.setNextExecuteUser(item.getNextExecuteIds());
             taskModelDto.setTaskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", item.getEquList(), StringUtils.isEmpty(item.getFactoryNum()) ? "" : item.getFactoryNum(), item.getApplyNo()));
+            TaskMessageDto taskMessageDto = new TaskMessageDto();
+            BeanUtils.copyProperties(item, taskMessageDto);
+            taskModelDto.setModel(taskMessageDto);
             taskModelDtoList.add(taskModelDto);
         });
         commonService.buildTaskModel(taskModelDtoList);
@@ -807,8 +812,12 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                 taskMap.put("relationId", jgInstallationNotice.getInstanceId());
                 taskMap.put("flowStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
                 taskMap.put("flowStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
-                taskMap.put("model", jgInstallationNotice);
+
+                TaskMessageDto taskMessageDto = new TaskMessageDto();
+                BeanUtils.copyProperties(jgInstallationNotice, taskMessageDto);
+                taskMap.put("model", taskMessageDto);
                 taskV2Model = commonService.updateTaskModel(taskMap);
+
             } else {
                 jgInstallationNotice.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
                 if (!ObjectUtils.isEmpty(jgInstallationNotice.getInstanceStatus())) {
@@ -828,7 +837,6 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                 TaskModelDto taskModelDto = new TaskModelDto();
                 BeanUtils.copyProperties(taskV2Model, taskModelDto);
                 // 创建新的代办
-                taskModelDto.setModel(jgInstallationNotice);
                 taskModelDto.setTaskName(workflowResultDto.getNextTaskName());
                 taskModelDto.setExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
                 taskModelDto.setFlowStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode());
@@ -836,6 +844,9 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                 taskModelDto.setFlowCode(workflowResultDto.getNextTaskId());
                 taskModelDto.setTaskStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
                 taskModelDto.setNextExecuteUser(workflowResultDto.getNextExecutorRoleIds());
+                TaskMessageDto taskMessageDto = new TaskMessageDto();
+                BeanUtils.copyProperties(jgInstallationNotice, taskMessageDto);
+                taskModelDto.setModel(taskMessageDto);
                 commonService.buildTaskModel(Collections.singletonList(taskModelDto));
             }
         } else {
@@ -852,13 +863,15 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             TaskModelDto taskModelDto = new TaskModelDto();
             BeanUtils.copyProperties(taskV2Model, taskModelDto);
             // 创建新的代办
-            taskModelDto.setModel(jgInstallationNotice);
             taskModelDto.setTaskName(workflowResultDto.getNextTaskName());
             taskModelDto.setExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
             taskModelDto.setFlowStatus(FlowStatusEnum.REJECTED.getCode());
             taskModelDto.setFlowStatusLabel(FlowStatusEnum.REJECTED.getName());
             taskModelDto.setFlowCode(workflowResultDto.getNextTaskId());
             taskModelDto.setNextExecuteUser(workflowResultDto.getNextExecutorRoleIds());
+            TaskMessageDto taskMessageDto = new TaskMessageDto();
+            BeanUtils.copyProperties(jgInstallationNotice, taskMessageDto);
+            taskModelDto.setModel(taskMessageDto);
             commonService.buildTaskModel(Collections.singletonList(taskModelDto));
         }
         jgInstallationNotice.setNextTaskId(workflowResultDto.getNextTaskId());

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

@@ -10,6 +10,7 @@ import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgMaintenanceContractDto;
+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.JgMaintenanceContract;
@@ -193,20 +194,18 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         String code = null;
         if ("0".equals(operate)) {
             //通过
-            if (WorkFlowStatusEnum.MAIN_SUBMIT.getName().equals(contract.getStatus()) ||
+            if (WorkFlowStatusEnum.MAIN_SUBMIT.getPass().equals(contract.getStatus()) ||
                     WorkFlowStatusEnum.MAIN_SUBMIT.getReject().equals(contract.getStatus()) ||
                     WorkFlowStatusEnum.MAIN_SUBMIT.getRollBack().equals(contract.getStatus())) {
                 code = contract.getMaintenanceUnitCode();
-            } else if (WorkFlowStatusEnum.MAIN_RECEIVE.getName().equals(contract.getStatus()) ||
+            } else if (WorkFlowStatusEnum.MAIN_RECEIVE.getPass().equals(contract.getStatus()) ||
                     WorkFlowStatusEnum.MAIN_RECEIVE.getReject().equals(contract.getStatus()) ||
                     WorkFlowStatusEnum.MAIN_RECEIVE.getRollBack().equals(contract.getStatus())) {
                 code = contract.getReceiveOrgCode();
             }
         } else {
             //驳回
-            if (WorkFlowStatusEnum.MAIN_RECEIVE.getName().equals(contract.getStatus()) ||
-                    WorkFlowStatusEnum.MAIN_RECEIVE.getReject().equals(contract.getStatus()) ||
-                    WorkFlowStatusEnum.MAIN_RECEIVE.getRollBack().equals(contract.getStatus())) {
+            if (WorkFlowStatusEnum.MAIN_PRELIMINARY.getPass().equals(contract.getStatus())) {
                 code = contract.getMaintenanceUnitCode();
             }
         }
@@ -258,7 +257,9 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         TaskModelDto modelDto = new TaskModelDto();
         BeanUtil.copyProperties(taskV2Model, modelDto);
         modelDto.setNextExecuteUser(contract.getNextExecuteIds());
-        modelDto.setModel(contract);
+        TaskMessageDto taskMessageDto = new TaskMessageDto();
+        BeanUtil.copyProperties(contract, taskMessageDto);
+        modelDto.setModel(taskMessageDto);
         // 再插入新代办、数据待定
         commonService.buildTaskModel(Collections.singletonList(modelDto));
     }
@@ -529,29 +530,31 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         return commonService.getDictionaryCodeByName(auditStatus);
     }
 
-    private void createTaskModel(JgMaintenanceContract dto, String taskName, String submitType, String nextUserIds) {
+    private void createTaskModel(JgMaintenanceContract contract, String taskName, String submitType, String nextUserIds) {
         if ("1".equals(submitType)) {
             TaskModelDto taskModelDto = new TaskModelDto();
-            taskModelDto.setFlowCreateDate(dto.getApplyDate());
+            taskModelDto.setFlowCreateDate(contract.getApplyDate());
             taskModelDto.setTaskName(taskName);
-            taskModelDto.setTaskCode(dto.getApplyNo());
-            taskModelDto.setTaskContent(this.buildTaskContent(dto));
+            taskModelDto.setTaskCode(contract.getApplyNo());
+            taskModelDto.setTaskContent(this.buildTaskContent(contract));
             taskModelDto.setTaskDesc("");
             taskModelDto.setTaskType(BusinessTypeEnum.JG_MAINTENANCE_RECORD.getCode());
             taskModelDto.setTaskTypeLabel(BusinessTypeEnum.JG_MAINTENANCE_RECORD.getName());
-            taskModelDto.setRelationId(dto.getInstanceId());
+            taskModelDto.setRelationId(contract.getInstanceId());
             taskModelDto.setExecuteUserIds(nextUserIds);
             FlowStatusEnum flowStatusEnum = this.getTaskStatus(submitType);
             taskModelDto.setTaskStatus(flowStatusEnum.getCode());
             taskModelDto.setTaskStatusLabel(flowStatusEnum.getName());
-            taskModelDto.setFlowStatus(this.getTaskStatusByName(dto.getStatus()));
-            taskModelDto.setFlowStatusLabel(dto.getStatus());
-            taskModelDto.setStartUserId(dto.getCreateUserId());
-            taskModelDto.setStartUser(dto.getCreateUserName());
-            taskModelDto.setStartUserCompanyName(dto.getUseUnitName());
-            taskModelDto.setNextExecuteUser(dto.getNextExecuteIds());
-            taskModelDto.setStartDate(dto.getCreateDate());
-            taskModelDto.setModel(dto);
+            taskModelDto.setFlowStatus(this.getTaskStatusByName(contract.getStatus()));
+            taskModelDto.setFlowStatusLabel(contract.getStatus());
+            taskModelDto.setStartUserId(contract.getCreateUserId());
+            taskModelDto.setStartUser(contract.getCreateUserName());
+            taskModelDto.setStartUserCompanyName(contract.getUseUnitName());
+            taskModelDto.setNextExecuteUser(contract.getNextExecuteIds());
+            taskModelDto.setStartDate(contract.getCreateDate());
+            TaskMessageDto taskMessageDto = new TaskMessageDto();
+            BeanUtil.copyProperties(contract, taskMessageDto);
+            taskModelDto.setModel(taskMessageDto);
             commonService.buildTaskModel(Collections.singletonList(taskModelDto));
         }
     }

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

@@ -10,6 +10,7 @@ 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.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.JgTransferNotice;
@@ -265,6 +266,8 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                 dto.setProcessDefinitionKey(PROCESS_DEFINITION_KEY);
                 dto.setBusinessKey(noticeDto.getSequenceNbr().toString());
                 dto.setCompleteFirstTask(Boolean.TRUE);
+                //下一节点执行人单位（下节点接收机构code）
+                dto.setNextExecuteUserCompanyCode(notice.getReceiveOrgCode());
                 list.add(dto);
                 actWorkflowBatchDTO.setProcess(list);
                 processTaskDTO = iCmWorkflowService.startBatch(actWorkflowBatchDTO).get(0);
@@ -298,6 +301,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                     commMap.put("approvalStatus", op);
                 }
                 dto.setVariable(commMap);
+                dto.setNextExecuteUserCompanyCode(notice.getReceiveOrgCode());
                 processTaskDTO = iCmWorkflowService.complete(notice.getNextTaskId(), dto);
                 // 提取节点等信息
                 workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);
@@ -327,13 +331,15 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                     TaskModelDto taskModelDto = new TaskModelDto();
                     BeanUtils.copyProperties(taskV2Model, taskModelDto);
                     // 创建新的代办
-                    taskModelDto.setModel(notice);
                     taskModelDto.setTaskName(workflowResultDto.getNextTaskName());
                     taskModelDto.setExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
                     taskModelDto.setFlowStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode());
                     taskModelDto.setFlowStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
                     taskModelDto.setFlowCode(notice.getNextTaskId());
                     taskModelDto.setNextExecuteUser(workflowResultDto.getNextExecutorRoleIds());
+                    TaskMessageDto taskMessageDto = new TaskMessageDto();
+                    BeanUtils.copyProperties(notice, taskMessageDto);
+                    taskModelDto.setModel(taskMessageDto);
                     commonService.buildTaskModel(Collections.singletonList(taskModelDto));
                 }
             }
@@ -389,7 +395,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             return;
         }
         // 启动工作流并返回信息
-        List<WorkflowResultDto> workflowResultList = workFlowInfo(submitType, deviceList);
+        List<WorkflowResultDto> workflowResultList = workFlowInfo(submitType, deviceList, model.getReceiveOrgCode());
         List<JgTransferNotice> list = new ArrayList<>();
         List<JgTransferNoticeEq> equipList = new ArrayList<>();
         //业务数据组装等
@@ -471,9 +477,11 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             taskModelDto.setStartUser(item.getCreateUserName());
             taskModelDto.setStartUserCompanyName(item.getCreateUserCompanyName()); // 任务发起人所在单位
             taskModelDto.setStartDate(item.getCreateDate());
-            taskModelDto.setModel(item);
             taskModelDto.setNextExecuteUser(item.getNextExecuteIds());
             taskModelDto.setTaskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", item.getEquList(), item.getSupervisoryCode(), item.getApplyNo()));
+            TaskMessageDto taskMessageDto = new TaskMessageDto();
+            BeanUtils.copyProperties(item, taskMessageDto);
+            taskModelDto.setModel(taskMessageDto);
             taskModelDtoList.add(taskModelDto);
         });
         commonService.buildTaskModel(taskModelDtoList);
@@ -485,7 +493,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
      * @param deviceList 设备信息
      * @return 工作流返回相关数据
      */
-    private List<WorkflowResultDto> workFlowInfo(String submitType, List<Map<String, Object>> deviceList) {
+    private List<WorkflowResultDto> workFlowInfo(String submitType, List<Map<String, Object>> deviceList, String receiveOrgCode) {
         if (SUBMIT_TYPE_FLOW.equals(submitType)) {
             ActWorkflowBatchDTO actWorkflowBatchDTO = new ActWorkflowBatchDTO();
             List<ActWorkflowStartDTO> list = new ArrayList<>();
@@ -494,6 +502,8 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                 dto.setProcessDefinitionKey(PROCESS_DEFINITION_KEY);
                 dto.setBusinessKey(item.get("SEQUENCE_NBR").toString());
                 dto.setCompleteFirstTask(Boolean.TRUE);
+                //下一节点执行人单位（下节点接收机构code）
+                dto.setNextExecuteUserCompanyCode(receiveOrgCode);
                 list.add(dto);
             });
             actWorkflowBatchDTO.setProcess(list);
@@ -633,7 +643,9 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                 taskMap.put("relationId", jgTransferNotice.getInstanceId());
                 taskMap.put("flowStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
                 taskMap.put("flowStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
-                taskMap.put("model", jgTransferNotice);
+                TaskMessageDto taskMessageDto = new TaskMessageDto();
+                BeanUtils.copyProperties(jgTransferNotice, taskMessageDto);
+                taskMap.put("model", taskMessageDto);
                 taskV2Model = commonService.updateTaskModel(taskMap);
             } else {
                 jgTransferNotice.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
@@ -654,7 +666,6 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                 TaskModelDto taskModelDto = new TaskModelDto();
                 BeanUtils.copyProperties(taskV2Model, taskModelDto);
                 // 创建新的代办
-                taskModelDto.setModel(jgTransferNotice);
                 taskModelDto.setTaskName(workflowResultDto.getNextTaskName());
                 taskModelDto.setExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
                 taskModelDto.setFlowStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode());
@@ -662,6 +673,9 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                 taskModelDto.setFlowCode(workflowResultDto.getNextTaskId());
                 taskModelDto.setTaskStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
                 taskModelDto.setNextExecuteUser(workflowResultDto.getNextExecutorRoleIds());
+                TaskMessageDto taskMessageDto = new TaskMessageDto();
+                BeanUtils.copyProperties(jgTransferNotice, taskMessageDto);
+                taskModelDto.setModel(taskMessageDto);
                 commonService.buildTaskModel(Collections.singletonList(taskModelDto));
             }
         } else {
@@ -678,13 +692,15 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             TaskModelDto taskModelDto = new TaskModelDto();
             BeanUtils.copyProperties(taskV2Model, taskModelDto);
             // 创建新的代办
-            taskModelDto.setModel(jgTransferNotice);
             taskModelDto.setTaskName(workflowResultDto.getNextTaskName());
             taskModelDto.setExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
             taskModelDto.setFlowStatus(FlowStatusEnum.REJECTED.getCode());
             taskModelDto.setFlowStatusLabel(FlowStatusEnum.REJECTED.getName());
             taskModelDto.setFlowCode(workflowResultDto.getNextTaskId());
             taskModelDto.setNextExecuteUser(workflowResultDto.getNextExecutorRoleIds());
+            TaskMessageDto taskMessageDto = new TaskMessageDto();
+            BeanUtils.copyProperties(jgTransferNotice, taskMessageDto);
+            taskModelDto.setModel(taskMessageDto);
             commonService.buildTaskModel(Collections.singletonList(taskModelDto));
         }
         jgTransferNotice.setNextTaskId(workflowResultDto.getNextTaskId());
@@ -713,6 +729,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
         } else {
             commMap.put("approvalStatus", op);
         }
+        workDto.setNextExecuteUserCompanyCode(jgTransferNotice.getReceiveOrgCode());
         workDto.setVariable(commMap);
         workDto.setComment(opinion);
         processTaskDTO = iCmWorkflowService.complete(jgTransferNotice.getNextTaskId(), workDto);

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

@@ -11,6 +11,7 @@ import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 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;
+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.JgRegistrationHistory;
@@ -171,8 +172,6 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             jgUseRegistration.setReceiveCompanyCode(splitMaintenanceUnitCode[0]);
             jgUseRegistration.setReceiveOrgName(splitMaintenanceUnitCode[1]);
 
-        } else {
-            jgUseRegistration.setReceiveCompanyCode("610000");
         }
         // 使用单位提交
         jgUseRegistration.setUseUnitCreditCode(reginParams.getCompany().getCompanyCode());
@@ -231,14 +230,11 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                     updateData(jgUseRegistration.getSequenceNbr(), "0", workflowResultDto, Boolean.TRUE);
                 }
 
-//                updateExecuteIds(instanceId, jgUseRegistration.getSequenceNbr(), "0");
             }
 
             if (!ObjectUtils.isEmpty(instanceId)) {
                 // 执行流程
                 flowExecute(jgUseRegistration.getSequenceNbr(), instanceId, "0", "");
-                // 更新数据信息
-//                updateExecuteIds(instanceId, jgUseRegistration.getSequenceNbr(), "0");
             }
         }
     }
@@ -276,28 +272,30 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 jgUseRegistration.setStatus(WorkFlowStatusEnum.getMessage(taskCode).getReject());
                 jgUseRegistration.setPromoter("");
             }
-            if (isFirst){
+            if (isFirst) {
                 buildTask(jgUseRegistration, workflowResultDto);
-            }else {
+            } else {
                 // 更新代办状态
                 HashMap<String, Object> params = new HashMap<>();
                 params.put("relationId", jgUseRegistration.getInstanceId());
                 params.put("flowStatus", commonServiceImpl.getDictionaryCodeByName(jgUseRegistration.getStatus()));
                 params.put("flowStatusLabel", jgUseRegistration.getStatus());
                 params.put("taskStatus", commonServiceImpl.getDictionaryCodeByName(jgUseRegistration.getStatus()));
-                params.put("taskStatusLabel",jgUseRegistration.getStatus());
+                params.put("taskStatusLabel", jgUseRegistration.getStatus());
                 TaskV2Model taskV2Model = commonServiceImpl.updateTaskModel(params);
                 // 创建新的代办
-                if (!ObjectUtils.isEmpty(taskV2Model)){
+                if (!ObjectUtils.isEmpty(taskV2Model)) {
                     TaskModelDto taskModelDto = new TaskModelDto();
                     BeanUtils.copyProperties(taskV2Model, taskModelDto);
-                    taskModelDto.setModel(jgUseRegistration);
+                    TaskMessageDto taskMessageDto = new TaskMessageDto();
+                    BeanUtil.copyProperties(jgUseRegistration, taskMessageDto);
+                    taskModelDto.setModel(taskMessageDto);
                     taskModelDto.setTaskName(workflowResultDto.getNextTaskName());
                     taskModelDto.setExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
                     taskModelDto.setTaskStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
                     taskModelDto.setNextExecuteUser(workflowResultDto.getNextExecutorRoleIds());
                     commonServiceImpl.buildTaskModel(Collections.singletonList(taskModelDto));
-                }else {
+                } else {
                     workflowResultDto.setInstanceId(jgUseRegistration.getInstanceId());
                     buildTask(jgUseRegistration, workflowResultDto);
                 }
@@ -322,7 +320,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             params.put("flowStatusLabel", jgUseRegistration.getStatus());
             params.put("taskStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
             params.put("taskStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
-            params.put("model", jgUseRegistration);
+            TaskMessageDto taskMessageDto = new TaskMessageDto();
+            BeanUtil.copyProperties(jgUseRegistration, taskMessageDto);
+            params.put("model", taskMessageDto);
             commonServiceImpl.updateTaskModel(params);
         }
         this.getBaseMapper().updateById(jgUseRegistration);
@@ -354,92 +354,15 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         dto.setStartDate(new Date());
         jgUseRegistration.setInstanceId(workflowResultDto.getInstanceId());
         jgUseRegistration.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
-        dto.setModel(jgUseRegistration);
+        TaskMessageDto taskMessageDto = new TaskMessageDto();
+        BeanUtil.copyProperties(jgUseRegistration, taskMessageDto);
+        dto.setModel(taskMessageDto);
         dto.setNextExecuteUser(workflowResultDto.getNextExecutorRoleIds());
         list.add(dto);
         commonServiceImpl.buildTaskModel(list);
     }
 
 
-
-    public String startByVariable() {
-        String instanceId = "";
-        //启动流程
-        try {
-            ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
-            dto.setProcessDefinitionKey("useRegistration");
-            dto.setBusinessKey("submit");
-            AjaxResult ajaxResult = Workflow.taskClient.startByVariable(dto);
-            instanceId = ((Map) ajaxResult.get("data")).get("id").toString();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return instanceId;
-    }
-
-    public void updateExecuteIds(String instanceId, Long sequenceNbr, String operate) {
-        ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
-        String role = "";
-        String taskCode = FlowStatusEnum.TO_BE_FINISHED.getName();
-        ArrayList<String> roleList = new ArrayList<>();
-        JgUseRegistration jgUseRegistration = this.getBaseMapper().selectById(sequenceNbr);
-        try {
-            // 查询下节点任务
-
-            JSONObject taskNoAuth = workFlowFeginService.getTaskNoAuth(instanceId);
-            if (!ObjectUtils.isEmpty(taskNoAuth.get("data"))) {
-                JSONObject nextTask = JSON.parseObject(JSON.toJSONString(taskNoAuth.get("data")));
-                String nextTaskId = nextTask.getString("id");
-                FeignClientResult<JSONObject> nodeInfo = workFlowFeginService.getNodeInfo(nextTaskId);
-                JSONObject result = nodeInfo.getResult();
-                Map<String, Object> taskInfo = (Map<String, Object>) result.get("taskInfo");
-                taskCode = String.valueOf(taskInfo.get("taskDefinitionKey"));
-                AjaxResult taskGroupName = Workflow.taskClient.getTaskGroupName(nextTaskId);
-                JSONArray data = JSON.parseArray(JSON.toJSONString(taskGroupName.get("data")));
-                for (Object datum : data) {
-                    if (((Map) datum).containsKey("groupId")) {
-                        roleList.add(((Map) datum).get("groupId").toString());
-                    }
-                }
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        if (!FlowStatusEnum.TO_BE_FINISHED.getName().equals(taskCode)) {
-            role = String.join(",", roleList);
-            jgUseRegistration.setNextExecuteIds(role);
-            jgUseRegistration.setPromoter(reginParams.getUserModel().getUserId());
-            jgUseRegistration.setInstanceId(instanceId);
-            if (!ObjectUtils.isEmpty(jgUseRegistration.getInstanceStatus())) {
-                jgUseRegistration.setInstanceStatus(jgUseRegistration.getInstanceStatus() + "," + role);
-            } else {
-                jgUseRegistration.setInstanceStatus(role);
-            }
-            if ("0".equals(operate)) {
-                // 通过操作
-                jgUseRegistration.setStatus(WorkFlowStatusEnum.getMessage(taskCode).getPass());
-            } else {
-                // 驳回操作
-                jgUseRegistration.setStatus(WorkFlowStatusEnum.getMessage(taskCode).getReject());
-                jgUseRegistration.setPromoter(null);
-            }
-
-        } else {
-            // 流程结束
-            jgUseRegistration.setStatus(taskCode);
-            jgUseRegistration.setNextExecuteUserIds(null);
-            if (!ObjectUtils.isEmpty(jgUseRegistration.getSupervisoryCode())) {
-                // 生成使用登记证编号
-                jgUseRegistration.setUseRegistrationCode(getCode(jgUseRegistration.getSupervisoryCode()));
-                jgUseRegistration.setAuditPassDate(new Date());
-            }
-            // 更新设备信息
-            updateEquipMessage(String.valueOf(sequenceNbr), jgUseRegistration.getUseRegistrationCode());
-        }
-        this.getBaseMapper().updateById(jgUseRegistration);
-
-    }
-
     public void flowExecute(Long id, String instanceId, String operate, String comment) {
         JgUseRegistration jgUseRegistration = this.getBaseMapper().selectById(id);
         //组装信息

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/IdxBizJgTechParamsElevator.java

@@ -453,7 +453,12 @@ public class IdxBizJgTechParamsElevator extends TzsBaseEntity {
     /**
      * 轿门位置
      */
-    @TableField("\"JMWZ\"")
-    private String jmwz;
+    @TableField("\"DOOR_POSITION\"")
+    private String doorPosition;
 
+    /**
+     * 额定字段
+     */
+    @TableField("\"RATED_SPEED\"")
+    private String ratedSpeed;
 }

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/EquipmentCategoryServiceImpl.java

@@ -2500,10 +2500,12 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
                     esEquipmentCategory.deleteById(record);
                     //整合新旧数据
                     Bean.copyExistPropertis(newData, oldData);
-                    //处理施工单位信息
+                    //处理施工单位信息[去重]
+                    if(!oldUscUnitCreditCode.contains(newUscUnitCreditCode)){
                         oldData.setUSC_UNIT_CREDIT_CODE(oldUscUnitCreditCode+","+newUscUnitCreditCode);
                         oldData.setUSC_UNIT_NAME(oldUscUnitName+","+newUscUnitName);
                     }
+                }
                 if (!ObjectUtils.isEmpty(oldData)) {
                     oldData.setREC_DATE(System.currentTimeMillis());
                     ESEquipmentCategoryDto saveData = esEquipmentCategory.save(oldData);