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

@@ -241,5 +241,9 @@ public class JgChangeRegistrationReform extends BaseEntity {
      */
     @TableField("next_execute_user_ids")
     private String nextExecuteUserIds;
-
+    /*
+     * 历史转办人
+     */
+    @TableField(value = "transfer_to_user_ids")
+    private String transferToUserIds;
 }

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

@@ -19,7 +19,7 @@ import java.util.Map;
  * @date 2023-12-20
  */
 public interface JgChangeRegistrationReformMapper extends BaseMapper<JgChangeRegistrationReform> {
-    Page<Map<String, Object>> getListPage(@Param("page")Page<Map<String, Object>> page, @Param("dto") JgChangeRegistrationReformDto dto , @Param("roleIds") List<String> roleIds);
+    Page<Map<String, Object>> getListPage(@Param("page")Page<Map<String, Object>> page, @Param("dto") JgChangeRegistrationReformDto dto , @Param("roleIds") List<String> roleIds,@Param("currentUserId")String currentUserId);
 
     Map<String, Object> getDetail(@Param("id")String id);
 

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

@@ -53,7 +53,7 @@ import java.util.stream.Collectors;
 @Service
 public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeRegistrationReformDto, JgChangeRegistrationReform, JgChangeRegistrationReformMapper> implements IJgChangeRegistrationReformService {
 
-    private final static String bussinessType= "改造登记";
+    private final static String bussinessType = "改造登记";
     @Autowired
     TzsServiceFeignClient tzsServiceFeignClient;
     @Autowired
@@ -109,14 +109,16 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
     private JgChangeRegistrationNameEqMapper jgChangeRegistrationNameEqMapper;
 
     /***
-     * @deprecated  根据查询调教获取分页对象
+     * @deprecated 根据查询调教获取分页对象
      * @param dto 查询的dto对象
      * @param page 分页对象
      * @param roleIds 当前登陆人的角色id值
      * @return
      */
     public Page<Map<String, Object>> getList(JgChangeRegistrationReformDto dto, Page<Map<String, Object>> page, List<String> roleIds) {
-        Page<Map<String, Object>> listPage = this.baseMapper.getListPage(page, dto, roleIds);
+        ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+        String currentUserId = reginParams.getUserModel().getUserId();
+        Page<Map<String, Object>> listPage = this.baseMapper.getListPage(page, dto, roleIds, currentUserId);
         return listPage;
     }
 
@@ -196,28 +198,28 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             jgRegistrationHistory.setSequenceNbr(jgRegistrationHistoryMapper.getSequenceNbrByRegistratioClassAndDocumentId(bussinessType, String.valueOf(map.get("applyNo"))));
             jgRegistrationHistoryMapper.updateById(jgRegistrationHistory);
         } else {
-                //暂存处理
-                // 业务管理设备信息保存
-                JgChangeRegistrationReformEq jgChangeRegistrationReformEq = new JgChangeRegistrationReformEq();
-                jgChangeRegistrationReformEq.setEquId(equipId);
-                ResponseModel<List<String>> result = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.GZBG.getCode(), 1);
-                if (!result.getResult().isEmpty()) {
-                    jgChangeRegistrationReform.setApplyNo(result.getResult().get(0));
-                } else {
-                    throw new BadRequest("申请单编号生成失败,请稍后重试!");
-                }
-                jgChangeRegistrationReform.setRegDate(new Date());
-                jgChangeRegistrationReform.setStatus(WorkFlowStatusEnum.CHANGE_SUBMIT.getPass());
-                jgChangeRegistrationReform.setAuditStatus(WorkFlowStatusEnum.CHANGE_SUBMIT.getPass());
-                this.save(jgChangeRegistrationReform);
-                jgChangeRegistrationReformEq.setEquipTransferId(jgChangeRegistrationReform.getSequenceNbr().toString());
-                jgChangeRegistrationReformEqMapper.insert(jgChangeRegistrationReformEq);
-                //当前单据id
-                jgRegistrationHistory.setCurrentDocumentId(jgChangeRegistrationReform.getApplyNo());
-                jgRegistrationHistoryMapper.insert(jgRegistrationHistory);
-                //暂存时生成待办数据
-                List<TaskModelDto> taskModelDtoList = Arrays.asList(getTaskModelDtoList(jgChangeRegistrationReform, null));
-                commonServiceImpl.buildTaskModel(taskModelDtoList);
+            //暂存处理
+            // 业务管理设备信息保存
+            JgChangeRegistrationReformEq jgChangeRegistrationReformEq = new JgChangeRegistrationReformEq();
+            jgChangeRegistrationReformEq.setEquId(equipId);
+            ResponseModel<List<String>> result = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.GZBG.getCode(), 1);
+            if (!result.getResult().isEmpty()) {
+                jgChangeRegistrationReform.setApplyNo(result.getResult().get(0));
+            } else {
+                throw new BadRequest("申请单编号生成失败,请稍后重试!");
+            }
+            jgChangeRegistrationReform.setRegDate(new Date());
+            jgChangeRegistrationReform.setStatus(WorkFlowStatusEnum.CHANGE_SUBMIT.getPass());
+            jgChangeRegistrationReform.setAuditStatus(WorkFlowStatusEnum.CHANGE_SUBMIT.getPass());
+            this.save(jgChangeRegistrationReform);
+            jgChangeRegistrationReformEq.setEquipTransferId(jgChangeRegistrationReform.getSequenceNbr().toString());
+            jgChangeRegistrationReformEqMapper.insert(jgChangeRegistrationReformEq);
+            //当前单据id
+            jgRegistrationHistory.setCurrentDocumentId(jgChangeRegistrationReform.getApplyNo());
+            jgRegistrationHistoryMapper.insert(jgRegistrationHistory);
+            //暂存时生成待办数据
+            List<TaskModelDto> taskModelDtoList = Arrays.asList(getTaskModelDtoList(jgChangeRegistrationReform, null));
+            commonServiceImpl.buildTaskModel(taskModelDtoList);
 
         }
 
@@ -654,9 +656,9 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
     }
 
     /**
-     * @deprecated 根据监管码或者新的使用登记编码
      * @param supervisoryCode
      * @return
+     * @deprecated 根据监管码或者新的使用登记编码
      */
     public String getCode(String supervisoryCode) {
         if (!ObjectUtils.isEmpty(supervisoryCode) && supervisoryCode.length() > 5) {
@@ -896,14 +898,16 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         taskMessageDto.setSequenceNbr(jgChangeRegistrationReform.getSequenceNbr());
         //设置流程下一步执行人角色
         taskMessageDto.setNextExecuteIds(jgChangeRegistrationReform.getNextExecutorIds());
+        //设置nextTaskid
+        taskMessageDto.setNextTaskId(jgChangeRegistrationReform.getNextTaskId());
         return taskMessageDto;
     }
 
     /**
-     * @deprecated 根据流程执行情况获取下一步执行公司code用于工作流过滤人员
      * @param operate
      * @param jgChangeRegistrationReform
      * @return
+     * @deprecated 根据流程执行情况获取下一步执行公司code用于工作流过滤人员
      */
     private String getNextUserOrgCode(String operate, JgChangeRegistrationReform jgChangeRegistrationReform) {
         if ("0".equals(operate)) {