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/entity/JgInstallationNotice.java

@@ -405,7 +405,7 @@ public class JgInstallationNotice extends BaseEntity {
     private String createUserCompanyName;
 
     //下一步任务ID
-    @TableField(value = "\"next_taskId\"")
+    @TableField(value = "\"next_task_id\"")
     private String nextTaskId;
 
     /**

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

@@ -302,7 +302,7 @@ public class JgTransferNotice extends BaseEntity {
     private String createUserCompanyName;
 
     //下一步任务ID
-    @TableField(value = "\"next_taskId\"")
+    @TableField(value = "\"next_task_id\"")
     private String nextTaskId;
 
 

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

@@ -30,6 +30,6 @@ public interface CommonMapper extends BaseMapper<EquipmentCategory> {
 
     String selectBusinessData(String tableName, String instanceId);
 
-    void updateBusinessData(String tableName,String assignee, String transferToUserIds, String instanceId);
+    void updateBusinessData(String tableName,String assignee, String transferToUserIds, String instanceId,String nextTaskId);
 }
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/vo/JgMaintenanceContractVo.java

@@ -153,4 +153,10 @@ import java.util.Map;
      */
     @ApiModelProperty("next_task_id")
     private String nextTaskId;
+
+    /**
+     * 安全管理员姓名联系方式
+     */
+    @ApiModelProperty("maintenance_manager_phone")
+    private String maintenanceManagerPhone;
 }

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

@@ -76,7 +76,8 @@
 <update id="updateBusinessData">
     update ${tableName}
     set transfer_to_user_ids  = #{transferToUserIds},
-        next_execute_user_ids = #{assignee}
+        next_execute_user_ids = #{assignee},
+        next_task_id = #{nextTaskId}
     where instance_id = #{instanceId}
     </update>
 </mapper>

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

@@ -26,6 +26,7 @@
         ur.apply_no as applyNo,
         ifnull(ur.next_executor_ids,'') as nextExecutorIds,
         ur.promoter,
+        ur.supervisory_code  as supervisoryCode,
         ur.next_execute_user_ids as nextExecuteUserIds,
         ur.next_task_id as nextTaskId
         from tzs_jg_change_registration_reform ur

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

@@ -14,5 +14,5 @@ public interface ICmWorkflowService {
 
     ProcessTaskDTO rollBack(String processInstanceId);
 
-    String assign(FlowTaskVo taskVo);
+    ProcessTaskDTO assign(FlowTaskVo taskVo);
 }

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

@@ -93,11 +93,11 @@ public class CmWorkflowServiceImpl implements ICmWorkflowService {
 
 
     @Override
-    public String assign(FlowTaskVo taskVo) {
-        String result;
+    public ProcessTaskDTO assign(FlowTaskVo taskVo) {
+        ProcessTaskDTO processTaskDTO = new ProcessTaskDTO();
         try {
             log.info("开始请求工作流转办任务接口:/assign/{taskVo},请求参数：{},{}", taskVo);
-             result = Workflow.taskV2Client.assign(taskVo).getResult();
+            processTaskDTO = Workflow.taskV2Client.assign(taskVo).getResult();
         } catch (InnerInvokException e) {
             //拦截无审核人异常信息
             String devMessage = e.getDevMessage();
@@ -108,6 +108,6 @@ public class CmWorkflowServiceImpl implements ICmWorkflowService {
             log.error("调用工作流转办任务接口失败", e);
             throw new RuntimeException("调用工作流转办任务接口失败");
         }
-        return result;
+        return 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/CommonServiceImpl.java

@@ -654,7 +654,7 @@ public class CommonServiceImpl implements ICommonService {
         FlowTaskVo flowTaskVo = new FlowTaskVo();
         flowTaskVo.setTaskId(taskId);
         flowTaskVo.setAssignee(assignee);
-        cmWorkflowService.assign(flowTaskVo);
+        ProcessTaskDTO processTaskDTO = cmWorkflowService.assign(flowTaskVo);
         //修改待办
         List<TaskV2Model> result = Systemctl.taskV2Client.selectListByRelationId(instanceId).getResult();
         List<TaskV2Model> collect = result.stream().sorted((r1, r2) -> r2.getSequenceNbr().compareTo(r1.getSequenceNbr())).collect(Collectors.toList());
@@ -672,7 +672,11 @@ public class CommonServiceImpl implements ICommonService {
         Systemctl.taskV2Client.update(taskV2Model, taskV2Model.getSequenceNbr());
         //创建新待办
         taskV2Model.setExecuteUserIds(assignee);
+        String nextTaskId = processTaskDTO.getNextTask().get(0).getId();
+        taskV2Model.setFlowCode(nextTaskId);
+        String routhPath1 = routhPath.replace("nextTaskId", "nextTask") + "&nextTaskId=" + nextTaskId;
         taskV2Model.setCreateDate(new Date());
+        taskV2Model.setRoutePath(routhPath1);
         taskV2Model.setTaskStatus(0);
         taskV2Model.setTaskStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
         taskV2Model.setEndUserId(null);
@@ -683,7 +687,7 @@ public class CommonServiceImpl implements ICommonService {
         String id = commonMapper.selectBusinessData(tableName, instanceId);
         id = ObjectUtils.isEmpty(id) ? assignee : id + "," + assignee;
         //修改业务数据
-        commonMapper.updateBusinessData(tableName, assignee, id, instanceId);
+        commonMapper.updateBusinessData(tableName, assignee, id, instanceId,nextTaskId);
         return Boolean.TRUE;
     }
 

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

@@ -25,6 +25,7 @@ import com.yeejoin.amos.boot.module.jg.api.mapper.JgMaintainNoticeMapper;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgInstallationNoticeService;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgMaintainNoticeService;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
+import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgRegisterInfoService;
 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.ymt.api.entity.RegistrationInfo;
@@ -105,6 +106,9 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
     @Autowired
     private CmWorkflowServiceImpl cmWorkflowService;
 
+    @Autowired
+    IIdxBizJgRegisterInfoService idxBizJgRegisterInfoService;
+
 
     /**
      * 根据sequenceNbr查询
@@ -137,9 +141,11 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
         String[] fields = {"productPhoto", "designDoc", "designStandard", "factoryStandard", "productQualityYieldProve",
                 "insUseMaintainExplain", "inspectReport", "proxyStatementAttachment", "installContractAttachment"};
         // 设备信息 "equCategory",  "equDefine",  "equRegisterCode",  "produceCountry",  "produceLicenseNum",
-
         JgMaintainNoticeEq jgMaintainNoticeEq = jgMaintainNoticeEqMapper.selectOne(new LambdaQueryWrapper<JgMaintainNoticeEq>().eq(JgMaintainNoticeEq::getEquipTransferId, sequenceNbr));
-        Map<String, Object> map = jgMaintainNoticeMapper.getEquipInfoByRecord(jgMaintainNoticeEq.getEquId());
+        Map<String, Object> map = idxBizJgRegisterInfoService.getDetailFieldCamelCaseByRecord(jgMaintainNoticeEq.getEquId());
+        map.put("uuseUnitCreditCode",map.get("useUnitCreditCode"));
+        map.remove("useUnitCreditCode");
+        map.remove("address");
 
         for (String s : fields) {
             if (maintainInfo.containsKey(s) && !ObjectUtils.isEmpty(map.get(s)))

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

@@ -239,6 +239,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         FlowStatusEnum flowStatusEnum = this.getTaskStatus(operate);
         taskV2Model.setTaskStatus(flowStatusEnum.getCode());
         taskV2Model.setTaskStatusLabel(flowStatusEnum.getName());
+        taskV2Model.setFlowCode(contract.getNextTaskId());
         taskV2Model.setFlowStatus(this.getTaskStatusByName(contract.getStatus()));
         taskV2Model.setFlowStatusLabel(contract.getStatus());
         taskV2Model.setTaskType(BusinessTypeEnum.JG_MAINTENANCE_RECORD.getCode());
@@ -553,6 +554,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
             taskModelDto.setFlowStatusLabel(contract.getStatus());
             taskModelDto.setStartUserId(contract.getCreateUserId());
             taskModelDto.setStartUser(contract.getCreateUserName());
+            taskModelDto.setFlowCode(contract.getNextTaskId());
             taskModelDto.setStartUserCompanyName(contract.getUseUnitName());
             taskModelDto.setNextExecuteUser(contract.getNextExecuteIds());
             taskModelDto.setStartDate(contract.getCreateDate());