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

@@ -260,4 +260,8 @@ public class JgInstallationNoticeDto extends BaseDto {
 
     private String factoryNum;
 
+
+    @ApiModelProperty (value = "下一节点可执行人")
+    private String nextExecuteUserIds;
+
 }

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

@@ -216,4 +216,10 @@ public class JgReformNoticeDto extends BaseDto {
      */
     @ApiModelProperty(value = "设备类型")
     private String equList;
+
+    /**
+     * 下一节点可执行人逗号分割
+     */
+    @ApiModelProperty(value = "下一节点可执行人逗号分割-数据隔离使用")
+    private String nextExecuteUserIds;
 }

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

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

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

@@ -417,11 +417,13 @@ public class JgInstallationNotice extends BaseEntity {
     /**
      * 设备出场编号
      */
-//    @TableField("\"factory_num\"")
-            @TableField(exist = false)
+    @TableField(exist = false)
     private String factoryNum;
 
-//    @TableField("\"create_user_name\"")
-//    private String nextExecuteUserIds;
+    /**
+     * 下一节点可执行人
+     */
+    @TableField("\"next_execute_user_ids\"")
+    private String nextExecuteUserIds;
 
 }

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

@@ -330,4 +330,10 @@ public class JgReformNotice extends BaseEntity {
      */
     @TableField(exist = false)
     private String equList;
+
+    /**
+     * 下一节点可执行人逗号分割
+     */
+    @TableField(value = "next_execute_user_ids")
+    private String nextExecuteUserIds;
 }

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

@@ -313,4 +313,11 @@ public class JgTransferNotice extends BaseEntity {
     @TableField(exist = false)
     private String equList;
 
+    /**
+     * 下一节点可执行人
+     */
+    @TableField("\"next_execute_user_ids\"")
+    private String nextExecuteUserIds;
+
+
 }

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

@@ -14,4 +14,7 @@ import org.apache.ibatis.annotations.Select;
 public interface JgRegistrationHistoryMapper extends BaseMapper<JgRegistrationHistory> {
     @Select("select sequence_nbr from tzs_jg_registration_history where equ_id = #{equid} and current_document_id = #{documentId}")
     Long getSequenceNbrByEquidAndDocumentId(@Param("equid") String equid, @Param("documentId") String documentId);
+
+    @Select("select sequence_nbr from tzs_jg_registration_history where registration_class = #{registratioClass} and current_document_id = #{documentId}")
+    Long getSequenceNbrByRegistratioClassAndDocumentId(@Param("registratioClass") String registratioClass, @Param("documentId") String documentId);
 }

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

@@ -32,4 +32,6 @@ public interface JgUseRegistrationMapper extends BaseMapper<JgUseRegistration> {
     void updatePromoter(@Param("id")Long id);
 
     List<Map<String, Object>> getDetailById(@Param("id") Long id);
+
+    String getEquType(@Param("record") String record);
 }

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

@@ -26,7 +26,8 @@
         isn.handle_date AS handleDate,
         isn.equ_list AS equList,
         isn.notice_report_url AS noticeReportUrl,
-        isn.create_user_id as createUserId
+        isn.create_user_id as createUserId,
+        isn.next_execute_user_ids as nextExecuteUserIds
         FROM
         tzs_jg_installation_notice isn
         <where>

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

@@ -25,7 +25,8 @@
         tjtn.notice_report_url AS noticeReportUrl,
         ec."name" AS equipCateName,
         tjtn.handle_date AS handleDate,
-        tjtn.create_user_id as createUserId
+        tjtn.create_user_id as createUserId,
+        tjtn.next_execute_user_ids as nextExecuteUserIds
         FROM
             tzs_jg_transfer_notice tjtn
             LEFT JOIN tzs_jg_transfer_notice_eq re ON re.equip_transfer_id = tjtn.sequence_nbr

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

@@ -192,5 +192,12 @@
         where ur.sequence_nbr = #{id}
 
     </select>
+    <select id="getEquType" resultType="java.lang.String">
+        SELECT ec.name
+        from idx_biz_jg_register_info jri
+                 LEFT JOIN tz_equipment_category ec
+                           on ec.code = jri.EQU_LIST
+        where jri.RECORD = #{record}
+    </select>
 
 </mapper>

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

@@ -80,11 +80,11 @@ public class JgEquipTransferController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @DeleteMapping(value = "/deleteBatch")
     @ApiOperation(httpMethod = "DELETE", value = "批量删除设备移交", notes = "批量删除设备移交")
-    public ResponseModel<Object> deleteBySequenceNbr(@RequestParam("ids") String ids) {
-        if (StringUtils.isEmpty(ids)) {
-            throw new RuntimeException("请选择需要删除的行！");
+    public ResponseModel<Object> deleteBySequenceNbr(@RequestParam("ids") Long[] ids) {
+        if (ids == null || ids.length == 0) {
+            throw new IllegalArgumentException("请选择需要删除的行！");
         }
-        return ResponseHelper.buildResponse(jgEquipTransferServiceImpl.removeByIds(Arrays.asList(ids.split(","))));
+        return ResponseHelper.buildResponse(jgEquipTransferServiceImpl.deleteForBatch(ids));
     }
 
     /**

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

@@ -9,6 +9,7 @@ import com.yeejoin.amos.boot.module.common.biz.utils.CommonResponseUtil;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgInstallationNoticeDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgInstallationNotice;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgInstallationNoticeService;
+import com.yeejoin.amos.boot.module.jg.biz.service.impl.CommonServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -39,6 +40,10 @@ public class JgInstallationNoticeController extends BaseController {
     @Autowired
     private IJgInstallationNoticeService iJgInstallationNoticeService;
 
+
+    @Autowired
+    private CommonServiceImpl commonService;
+
     /**
      * 新增
      *
@@ -83,6 +88,8 @@ public class JgInstallationNoticeController extends BaseController {
     @DeleteMapping(value = "/delete")
     @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除安装告知", notes = "根据sequenceNbr删除安装告知")
     public ResponseModel<Boolean> deleteBySequenceNbr(@RequestParam(value = "sequenceNbr") Long sequenceNbr) {
+        // 删除暂存的待办
+        commonService.deleteTaskModel(String.valueOf(sequenceNbr));
         return ResponseHelper.buildResponse(iJgInstallationNoticeService.removeById(sequenceNbr));
     }
 

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

@@ -9,6 +9,7 @@ import com.yeejoin.amos.boot.module.jg.api.dto.JgTransferNoticeDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgTransferNotice;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgTransferNoticeService;
 import com.yeejoin.amos.boot.module.jg.biz.service.ICommonService;
+import com.yeejoin.amos.boot.module.jg.biz.service.impl.CommonServiceImpl;
 import com.yeejoin.amos.boot.module.jg.biz.utils.ImageUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -44,6 +45,10 @@ public class JgTransferNoticeController extends BaseController {
     @Autowired
     private ICommonService commonService;
 
+
+    @Autowired
+    private CommonServiceImpl commonServiceImpl;
+
     /**
      * 新增移装造告知
      *
@@ -93,6 +98,8 @@ public class JgTransferNoticeController extends BaseController {
     @DeleteMapping(value = "/delete")
     @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除移装造告知", notes = "根据sequenceNbr删除移装造告知")
     public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @RequestParam(value = "sequenceNbr") Long sequenceNbr) {
+        // 删除暂存的待办
+        commonServiceImpl.deleteTaskModel(String.valueOf(sequenceNbr));
         return ResponseHelper.buildResponse(jgTransferNoticeService.removeById(sequenceNbr));
     }
 

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

@@ -52,6 +52,8 @@ import java.util.stream.Collectors;
  */
 @Service
 public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeRegistrationReformDto, JgChangeRegistrationReform, JgChangeRegistrationReformMapper> implements IJgChangeRegistrationReformService {
+
+    private final static String bussinessType= "改造登记";
     @Autowired
     TzsServiceFeignClient tzsServiceFeignClient;
     @Autowired
@@ -166,7 +168,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         //使用登记编号
         jgRegistrationHistory.setUseRegistrationCode(idxBizJgRegisterInfoMapper.getUseOrgCodeByEquip(equipId));
         //登记类别
-        jgRegistrationHistory.setRegistrationClass("改造登记");
+        jgRegistrationHistory.setRegistrationClass(bussinessType);
         //设备id
         jgRegistrationHistory.setEquId(equipId);
         //修改数据
@@ -188,7 +190,10 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             jgChangeRegistrationReform.setSequenceNbr(Long.valueOf(String.valueOf(map.get("sequenceNbr"))));
             this.getBaseMapper().updateById(jgChangeRegistrationReform);
             jgChangeRegistrationReform = this.getBaseMapper().selectById(jgChangeRegistrationReform.getSequenceNbr());
-            jgRegistrationHistory.setSequenceNbr(jgRegistrationHistoryMapper.getSequenceNbrByEquidAndDocumentId(equipId, String.valueOf(map.get("applyNo"))));
+            JgChangeRegistrationReformEq jgChangeRegistrationReformEq = jgChangeRegistrationReformEqMapper.selectOne(new QueryWrapper<JgChangeRegistrationReformEq>().eq("equip_transfer_id", jgChangeRegistrationReform.getSequenceNbr()));
+            jgChangeRegistrationReformEq.setEquId(equipId);
+            jgChangeRegistrationReformEqMapper.updateById(jgChangeRegistrationReformEq);
+            jgRegistrationHistory.setSequenceNbr(jgRegistrationHistoryMapper.getSequenceNbrByRegistratioClassAndDocumentId(bussinessType, String.valueOf(map.get("applyNo"))));
             jgRegistrationHistoryMapper.updateById(jgRegistrationHistory);
         } else {
                 //暂存处理
@@ -442,7 +447,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryMapper.selectOne(new QueryWrapper<JgRegistrationHistory>()
                     .eq("equ_id", equipId)
                     .eq("current_document_id", jgChangeRegistrationReform.getApplyNo())
-                    .eq("registration_class", "改造登记"));
+                    .eq("registration_class", bussinessType));
             originalData = JSONObject.parseObject(jgRegistrationHistory.getChangeData(), Map.class);
             detail.putAll(originalData);
         }
@@ -487,7 +492,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryMapper.selectOne(new QueryWrapper<JgRegistrationHistory>()
                 .eq("equ_id", equipId)
                 .eq("current_document_id", applyNo)
-                .eq("registration_class", "改造登记"));
+                .eq("registration_class", bussinessType));
 
         if (!ObjectUtils.isEmpty(idxBizJgTechParamsElevator) && !ObjectUtils.isEmpty(jgRegistrationHistory)) {
             //历史数据

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

@@ -605,4 +605,14 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
         equipTransferInfo.put("installUnitCreditCode", equipTransfer.getInstallUnitCreditCode() + "_" + equipTransfer.getInstallUnitName());
         return equipTransferInfo;
     }
+
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean deleteForBatch(Long[] ids) {
+        Collection<JgEquipTransfer> jgEquipTransfers = this.listByIds(Arrays.asList(ids));
+        for (JgEquipTransfer notice : jgEquipTransfers) {
+            notice.setIsDelete(true);
+            commonService.deleteTaskModel(String.valueOf(notice.getSequenceNbr()));
+        }
+        return this.updateBatchById(jgEquipTransfers);
+    }
 }
\ 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

@@ -251,6 +251,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                 }
                 notice.setPromoter(RequestContext.getExeUserId());
                 notice.setNextExecuteIds(String.join(",", workflowResultDto.getNextExecutorRoleIds()));
+                notice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
                 notice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
                 notice.setNextTaskId(workflowResultDto.getNextTaskId());
                 notice.setInstanceId(workflowResultDto.getInstanceId());
@@ -285,6 +286,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                 }
                 notice.setPromoter(RequestContext.getExeUserId());
                 notice.setNextExecuteIds(String.join(",", workflowResultDto.getNextExecutorRoleIds()));
+                notice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
                 notice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
                 notice.setNextTaskId(workflowResultDto.getNextTaskId());
                 this.updateById(notice);
@@ -385,6 +387,8 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             }
             notice.setIsDelete(true);
         });
+        // 删除暂存的待办
+        jgInstallationNotices.forEach(id -> commonService.deleteTaskModel(String.valueOf(id.getSequenceNbr())));
         return this.updateBatchById(jgInstallationNotices);
     }
 
@@ -590,9 +594,12 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             dto.setNoticeDate(new Date());
             if(SUBMIT_TYPE_FLOW.equals(submitType)) {
                 dto.setNextExecuteIds(workflowResultList.get(i).getNextExecutorRoleIds());
+                dto.setNextExecuteUserIds(workflowResultList.get(i).getNextExecutorUserIds());
                 dto.setInstanceStatus(workflowResultList.get(i).getNextExecutorRoleIds() + "," + workflowResultList.get(i).getExecutorRoleIds());
                 dto.setPromoter(reginParams.getUserModel().getUserId());
                 dto.setNextTaskId(workflowResultList.get(i).getNextTaskId());
+            } else {
+                dto.setNextExecuteUserIds(reginParams.getUserModel().getUserId());
             }
             dto.setInstallUnitName(reginParams.getCompany().getCompanyName());
             dto.setInstallUnitCreditCode(reginParams.getCompany().getCompanyCode());
@@ -739,14 +746,18 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         WorkflowResultDto workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);
         jgInstallationNotice.setPromoter("");
         jgInstallationNotice.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
+        jgInstallationNotice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
         jgInstallationNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.ROLLBACK.getCode()));
         jgInstallationNotice.setNextTaskId(workflowResultDto.getNextTaskId());
         this.updateById(jgInstallationNotice);
-        JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(jgInstallationNotice));
+        TaskMessageDto taskMessageDto = new TaskMessageDto();
+        BeanUtils.copyProperties(jgInstallationNotice, taskMessageDto);
+        JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(taskMessageDto));
         jsonObject.put("taskType", BusinessTypeEnum.JG_INSTALLATION_NOTIFICATION.getCode());
         jsonObject.put("nextExecuteUser", jgInstallationNotice.getNextExecuteIds());
         jsonObject.put("flowStatusLabel", FlowStatusEnum.ROLLBACK.getName());
         jsonObject.put("flowStatus", FlowStatusEnum.ROLLBACK.getCode());
+        jsonObject.put("nextTaskId", jgInstallationNotice.getNextTaskId());
         commonService.rollbackTask(jgInstallationNotice.getInstanceId(), jsonObject);
     }
 
@@ -856,6 +867,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
 
             } else {
                 jgInstallationNotice.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
+                jgInstallationNotice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
                 if (!ObjectUtils.isEmpty(jgInstallationNotice.getInstanceStatus())) {
                     jgInstallationNotice.setInstanceStatus(jgInstallationNotice.getInstanceStatus() + "," + workflowResultDto.getNextExecutorRoleIds());
                 } else {

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

@@ -182,6 +182,8 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
                 notice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
                 notice.setInstanceId(workflowResultDto.getInstanceId());
                 notice.setNextTaskId(workflowResultDto.getNextTaskId());
+                notice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
+
                 jgReformNoticeMapper.updateById(notice);
                 //删除暂存
                 commonService.deleteTaskModel(notice.getSequenceNbr()+"");
@@ -213,6 +215,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
                 notice.setNextExecuteIds(String.join(",", workflowResultDto.getNextExecutorRoleIds()));
                 notice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
                 notice.setNextTaskId(workflowResultDto.getNextTaskId());
+                notice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
 
                 updateById(notice);
                 // 上个代办改为已办
@@ -285,7 +288,9 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
             //     throw new IllegalStateException("所选数据已存在流程，不能删除！");
             // }
             notice.setIsDelete(true);
+            commonService.deleteTaskModel(String.valueOf(notice.getSequenceNbr()));
         });
+
         return this.updateBatchById(JgReformNotices);
     }
 
@@ -425,6 +430,9 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
                 dto.setInstanceStatus(workflowResult.getNextExecutorRoleIds() + "," + workflowResult.getExecutorRoleIds());
                 dto.setPromoter(reginParams.getUserModel().getUserId());
                 dto.setNextTaskId(workflowResult.getNextTaskId());
+                dto.setNextExecuteUserIds(workflowResult.getNextExecutorUserIds());
+            }else{
+                dto.setNextExecuteUserIds(RequestContext.getExeUserId());
             }
             dto.setInstallUnitName(reginParams.getCompany().getCompanyName());
             dto.setInstallUnitCreditCode(reginParams.getCompany().getCompanyCode());
@@ -668,6 +676,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
             notice.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
             notice.setNoticeStatus(String.valueOf(FlowStatusEnum.ROLLBACK.getCode()));
             notice.setNextTaskId(workflowResultDto.getNextTaskId());
+            notice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
             baseMapper.updateById(notice);
 
             JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(notice));
@@ -752,6 +761,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
             jgReformNotice.setSupervisoryCode(dto.getSupervisoryCode());
             jgReformNotice.setEquList(dto.getEquList());
             jgReformNotice.setNextTaskId(workflowResultDto.getNextTaskId());
+            jgReformNotice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
             //jgReformNotice.setInstanceId(workflowResultDto.getInstanceId());
 
             // 上个代办改为驳回

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

@@ -157,6 +157,8 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             }
             notice.setIsDelete(true);
         });
+        // 删除暂存的待办
+        jgTransferNotices.forEach(id -> commonService.deleteTaskModel(String.valueOf(id.getSequenceNbr())));
         return this.updateBatchById(jgTransferNotices);
     }
 
@@ -283,6 +285,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                 }
                 notice.setPromoter(RequestContext.getExeUserId());
                 notice.setNextExecuteIds(String.join(",", workflowResultDto.getNextExecutorRoleIds()));
+                notice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
                 notice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
                 notice.setNextTaskId(workflowResultDto.getNextTaskId());
                 notice.setInstanceId(workflowResultDto.getInstanceId());
@@ -316,6 +319,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                 }
                 notice.setPromoter(RequestContext.getExeUserId());
                 notice.setNextExecuteIds(String.join(",", workflowResultDto.getNextExecutorRoleIds()));
+                notice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
                 notice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
                 notice.setNextTaskId(workflowResultDto.getNextTaskId());
                 jgTransferNoticeMapper.updateById(notice);
@@ -463,9 +467,12 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             dto.setNoticeDate(new Date());
             if (SUBMIT_TYPE_FLOW.equals(submitType)) {
                 dto.setNextExecuteIds(workflowResultList.get(i).getNextExecutorRoleIds());
+                dto.setNextExecuteUserIds(workflowResultList.get(i).getNextExecutorUserIds());
                 dto.setInstanceStatus(workflowResultList.get(i).getNextExecutorRoleIds() + "," + workflowResultList.get(i).getExecutorRoleIds());
                 dto.setPromoter(reginParams.getUserModel().getUserId());
                 dto.setNextTaskId(workflowResultList.get(i).getNextTaskId());
+            } else {
+                dto.setNextExecuteUserIds(reginParams.getUserModel().getUserId());
             }
             dto.setEquList(String.valueOf(obj.get("EQU_LIST")));
             dto.setSupervisoryCode(String.valueOf(obj.get("SUPERVISORY_CODE")));
@@ -636,14 +643,18 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
         WorkflowResultDto workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);
         jgInstallationNotice.setPromoter("");
         jgInstallationNotice.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
+        jgInstallationNotice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
         jgInstallationNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.ROLLBACK.getCode()));
         jgInstallationNotice.setNextTaskId(workflowResultDto.getNextTaskId());
         jgTransferNoticeMapper.updateById(jgInstallationNotice);
-        JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(jgInstallationNotice));
+        TaskMessageDto taskMessageDto = new TaskMessageDto();
+        BeanUtils.copyProperties(jgInstallationNotice, taskMessageDto);
+        JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(taskMessageDto));
         jsonObject.put("taskType", BusinessTypeEnum.JG_ADVICE_REMOVAL.getCode());
         jsonObject.put("nextExecuteUser", jgInstallationNotice.getNextExecuteIds());
         jsonObject.put("flowStatusLabel", FlowStatusEnum.ROLLBACK.getName());
         jsonObject.put("flowStatus", FlowStatusEnum.ROLLBACK.getCode());
+        jsonObject.put("nextTaskId", jgInstallationNotice.getNextTaskId());
         commonService.rollbackTask(jgInstallationNotice.getInstanceId(), jsonObject);
     }
 
@@ -691,6 +702,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                 taskV2Model = commonService.updateTaskModel(taskMap);
             } else {
                 jgTransferNotice.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
+                jgTransferNotice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
                 if (!ObjectUtils.isEmpty(jgTransferNotice.getInstanceStatus())) {
                     jgTransferNotice.setInstanceStatus(jgTransferNotice.getInstanceStatus() + "," + workflowResultDto.getNextExecutorRoleIds());
                 } else {

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

@@ -2,7 +2,6 @@ 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;
@@ -29,18 +28,21 @@ 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;
 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.boot.module.ymt.api.mapper.IdxBizJgOtherInfoMapper;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgRegisterInfoMapper;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.InspectionDetectionInfoMapper;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.UseInfoMapper;
 import com.yeejoin.amos.feign.systemctl.model.TaskV2Model;
-import com.yeejoin.amos.feign.workflow.Workflow;
-import com.yeejoin.amos.feign.workflow.model.*;
+import com.yeejoin.amos.feign.workflow.model.ActWorkflowBatchDTO;
+import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
+import com.yeejoin.amos.feign.workflow.model.ProcessTaskDTO;
+import com.yeejoin.amos.feign.workflow.model.TaskResultDTO;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
-import org.springframework.util.StopWatch;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
@@ -91,6 +93,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
     @Autowired
     CmWorkflowServiceImpl cmWorkflowService;
 
+    private static final String DEFINITION_KEY = "useRegistration";
+
     public Page<Map<String, Object>> getList(JgUseRegistrationDto dto, Page<Map<String, Object>> page, List<String> roleIds) {
         Page<Map<String, Object>> listPage = this.baseMapper.getListPage(page, dto, roleIds);
         return listPage;
@@ -159,6 +163,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         jgUseRegistration.setSupervisoryCode(supervisoryCode);
         jgUseRegistration.setUseUnitName(String.valueOf(map.get("useUnitName")));
         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("_");
@@ -217,8 +222,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 ActWorkflowBatchDTO actWorkflowBatchDTO = new ActWorkflowBatchDTO();
                 ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
                 ArrayList<ActWorkflowStartDTO> list = new ArrayList<>();
-                dto.setProcessDefinitionKey("useRegistration");
-                dto.setBusinessKey("test");
+                dto.setProcessDefinitionKey(DEFINITION_KEY);
+                dto.setBusinessKey("1");
                 dto.setCompleteFirstTask(Boolean.TRUE);
                 // 接受机构
                 dto.setNextExecuteUserCompanyCode(jgUseRegistration.getReceiveCompanyCode());
@@ -246,7 +251,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             // 数据参数
             dto.setModel(taskMessageDto);
             // 摘要
-            dto.setTaskContent("来自" + "电梯" + "【" + (ObjectUtils.isEmpty(jgUseRegistration.getSupervisoryCode()) ? "无" : jgUseRegistration.getSupervisoryCode()) + "】的业务办理," + "【申请单号：" + jgUseRegistration.getApplyNo() + "】");
+            dto.setTaskContent("来自" + equType + "【" + (ObjectUtils.isEmpty(jgUseRegistration.getSupervisoryCode()) ? "无" : jgUseRegistration.getSupervisoryCode()) + "】的业务办理," + "【申请单号：" + jgUseRegistration.getApplyNo() + "】");
             // 申请单号
             dto.setTaskCode(jgUseRegistration.getApplyNo());
             // 业务类型
@@ -366,8 +371,6 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         dto.setFlowCreateDate(jgUseRegistration.getCreateDate());
         dto.setTaskName(workflowResultDto.getNextTaskName());
         dto.setTaskCode(workflowResultDto.getNextTaskCode());
-        dto.setTaskDesc("来自" + "电梯" + "【" + (ObjectUtils.isEmpty(jgUseRegistration.getSupervisoryCode()) ? "无" : jgUseRegistration.getSupervisoryCode()) + "】的业务办理," + "【申请单号：" + jgUseRegistration.getApplyNo() + "】");
-        dto.setTaskContent("来自" + "电梯" + "【" + (ObjectUtils.isEmpty(jgUseRegistration.getSupervisoryCode()) ? "无" : jgUseRegistration.getSupervisoryCode()) + "】的业务办理," + "【申请单号：" + jgUseRegistration.getApplyNo() + "】");
         dto.setRelationId(workflowResultDto.getInstanceId());
         dto.setExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
         dto.setTaskStatus(commonServiceImpl.getDictionaryCodeByName(WorkFlowStatusEnum.getMessage(workflowResultDto.getNextTaskCode()).getPass()));
@@ -389,6 +392,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         taskMessageDto.setEquipId(jgUseRegistrationEq.getEquId());
         dto.setModel(taskMessageDto);
         dto.setNextExecuteUser(workflowResultDto.getNextExecutorRoleIds());
+        dto.setTaskContent("来自" + this.getBaseMapper().getEquType(jgUseRegistrationEq.getEquId()) + "【" + (ObjectUtils.isEmpty(jgUseRegistration.getSupervisoryCode()) ? "无" : jgUseRegistration.getSupervisoryCode()) + "】的业务办理," + "【申请单号：" + jgUseRegistration.getApplyNo() + "】");
         list.add(dto);
         commonServiceImpl.buildTaskModel(list);
     }
@@ -474,6 +478,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         jgUseRegistration.setIsDelete(true);
         LambdaQueryWrapper<JgUseRegistration> lambda = new QueryWrapper<JgUseRegistration>().lambda();
         lambda.in(JgUseRegistration::getSequenceNbr, ids);
+        // 删除暂存的待办
+        ids.forEach(id -> commonServiceImpl.deleteTaskModel(String.valueOf(id)));
         this.update(jgUseRegistration, lambda);
     }
 
@@ -656,7 +662,7 @@ 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.getCode96333()) || ObjectUtils.isEmpty(otherInfo.getSupervisoryCode())) {
+        if (ObjectUtils.isEmpty(otherInfo.getSupervisoryCode())) {
             // 使用信息
             LambdaQueryWrapper<UseInfo> lambda = new QueryWrapper<UseInfo>().lambda();
             lambda.eq(UseInfo::getRecord, record);

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/application-dev.properties

@@ -54,4 +54,6 @@ process-definition-key.jyjc.openapplication=inspectionBusinessOpened
 tzsJg.feign.name=TZS-JG
 
 # rule config
-rule.definition.local-ip=172.16.10.243
+rule.definition.local-ip=172.16.10.243
\ No newline at end of file
+
+equip-hint=0 0 15 21 1 *
\ No newline at end of file