fix(JG)：改造告知,设备移交代码提交,删除添加删除代办

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/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-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/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/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());
 
             // 上个代办改为驳回