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-api/src/main/resources/mapper/JgChangeRegistrationReformMapper.xml

@@ -16,7 +16,7 @@
         ur.receive_org_name as receiveOrgName,
         DATE_FORMAT(ur.reg_date,'%Y-%m-%d') as regDate,
         DATE_FORMAT(ur.audit_pass_date,'%Y-%m-%d') as auditPassDate,
-        (SELECT name from tz_equipment_category  where  code = jri.EQU_CATEGORY) as equCategory,
+        (SELECT name from tz_equipment_category where code = jri.EQU_CATEGORY) as equCategory,
         jri.PRODUCT_NAME as productName,
         jri.EQU_CODE as equCode,
         use.USE_INNER_CODE as innerCode,
@@ -28,23 +28,23 @@
         ur.promoter,
         ur.next_execute_user_ids as nextExecuteUserIds
         from tzs_jg_change_registration_reform ur
-        LEFT JOIN tzs_jg_change_registration_reform_eq re  on ur.sequence_nbr = re.equip_transfer_id
-        LEFT JOIN idx_biz_jg_register_info jri  on re.equ_id = jri.RECORD
-        LEFT JOIN idx_biz_jg_use_info  use   on re.equ_id = use.RECORD
+        LEFT JOIN tzs_jg_change_registration_reform_eq re on ur.sequence_nbr = re.equip_transfer_id
+        LEFT JOIN idx_biz_jg_register_info jri on re.equ_id = jri.RECORD
+        LEFT JOIN idx_biz_jg_use_info use on re.equ_id = use.RECORD
 
         <where>
-            and  ur.is_delete = 0
-<!--            <if test="dto.equCategory != null and dto.equCategory != ''">-->
-<!--                and jri.EQU_CATEGORY = #{dto.equCategory}-->
-<!--            </if>-->
+            and ur.is_delete = 0
+            <!--            <if test="dto.equCategory != null and dto.equCategory != ''">-->
+            <!--                and jri.EQU_CATEGORY = #{dto.equCategory}-->
+            <!--            </if>-->
             <if test="dto.auditStatus != null and dto.auditStatus != ''">
                 and ur.audit_status = #{dto.auditStatus}
             </if>
-<!--            <if test="dto.equCode != null and dto.equCode != ''">-->
-<!--                and jri.EQU_CODE like concat('%',#{dto.equCode},'%')-->
-<!--            </if>-->
+            <!--            <if test="dto.equCode != null and dto.equCode != ''">-->
+            <!--                and jri.EQU_CODE like concat('%',#{dto.equCode},'%')-->
+            <!--            </if>-->
             <if test="dto.useUnitName != null and dto.useUnitName != ''">
-                and  ur.use_unit_name like concat('%',#{dto.useUnitName},'%')
+                and ur.use_unit_name like concat('%',#{dto.useUnitName},'%')
             </if>
             <if test="roleIds != null and dto.dataType == 'supervision'">
                 <foreach collection='roleIds' item='role' open='and (' close=')' separator='or'>
@@ -52,33 +52,36 @@
                 </foreach>
             </if>
             <if test="dto.dataType != null and dto.dataType == 'supervision' ">
-                and  ur.receive_org_code = #{dto.receiveOrgCode}
+                and ur.receive_org_code = #{dto.receiveOrgCode}
             </if>
             <if test="dto.dataType != null and dto.dataType == 'company' ">
-                and  ur.use_unit_credit_code = #{dto.useUnitCreditCode}
+                and ur.use_unit_credit_code = #{dto.useUnitCreditCode}
+            </if>
+            <if test="currentUserId != null and currentUserId != '' ">
+                or ur.transfer_to_user_ids like concat('%',#{currentUserId},'%')
             </if>
         </where>
         order by ur.rec_date desc
     </select>
     <select id="getDetail" resultType="java.util.Map">
-        SELECT jri.EQU_CODE                                                           as equCode,
-        --                      (SELECT name from tz_equipment_category where code = jri.EQU_CATEGORY) as equCategory,
-        --                      (SELECT name from tz_equipment_category where code = jri.EQU_LIST)     as equList,
-        --                      (SELECT name from tz_equipment_category where code = jri.EQU_DEFINE)   as equDefine,
-        jri.EQU_CATEGORY  as equCategory,
+        SELECT jri.EQU_CODE as equCode,
+        -- (SELECT name from tz_equipment_category where code = jri.EQU_CATEGORY) as equCategory,
+        -- (SELECT name from tz_equipment_category where code = jri.EQU_LIST) as equList,
+        -- (SELECT name from tz_equipment_category where code = jri.EQU_DEFINE) as equDefine,
+        jri.EQU_CATEGORY as equCategory,
         jri.EQU_LIST as equList,
         jri.EQU_DEFINE as equDefine,
-        jri.PRODUCT_NAME                                                       as productName,
-        jri.EQU_TYPE                                                           as equType,
-        jri.PRODUCT_PHOTO                                                      as proDuctPhoto,
-        jfi.FACTORY_NUM                                                        as factoryNum,
-        jfi.PRODUCE_UNIT_NAME                                                  as produceUnitName,
-        jfi.PRODUCE_DATE                                                       as produceDate,
-        jfi.FACTORY_STANDARD                                                   as factoryStandard,
-        jfi.PRODUCT_QUALITY_YIELD_PROVE                                        as productQualityYieldProve,
-        jfi.INS_USE_MAINTAIN_EXPLAIN                                           as insUseMaintainExplanin,
-        jci.USC_UNIT_NAME                                                      as uscUnitName,
-        jci.USC_UNIT_CREDIT_CODE                                               as uscUnitCreditCode
+        jri.PRODUCT_NAME as productName,
+        jri.EQU_TYPE as equType,
+        jri.PRODUCT_PHOTO as proDuctPhoto,
+        jfi.FACTORY_NUM as factoryNum,
+        jfi.PRODUCE_UNIT_NAME as produceUnitName,
+        jfi.PRODUCE_DATE as produceDate,
+        jfi.FACTORY_STANDARD as factoryStandard,
+        jfi.PRODUCT_QUALITY_YIELD_PROVE as productQualityYieldProve,
+        jfi.INS_USE_MAINTAIN_EXPLAIN as insUseMaintainExplanin,
+        jci.USC_UNIT_NAME as uscUnitName,
+        jci.USC_UNIT_CREDIT_CODE as uscUnitCreditCode
 
         from idx_biz_jg_register_info jri
         LEFT JOIN idx_biz_jg_factory_info jfi on jri.RECORD = jfi.RECORD
@@ -86,16 +89,15 @@
         where jri.RECORD = #{id}
 
 
-
     </select>
     <select id="getInspectDetail" resultType="java.util.Map">
-        SELECT INSPECT_TYPE       as inspectType,
-        INSPECT_STAFF      as inspctStaff,
+        SELECT INSPECT_TYPE as inspectType,
+        INSPECT_STAFF as inspctStaff,
         INSPECT_CONCLUSION as inspectConclusion,
-        INSPECT_ORG_NAME   as inspectOrgName,
-        INSPECT_DATE       as inspectDate,
-        NEXT_INSPECT_DATE  as nextInspectDate,
-        INSPECT_REPORT     as inspectReport
+        INSPECT_ORG_NAME as inspectOrgName,
+        INSPECT_DATE as inspectDate,
+        NEXT_INSPECT_DATE as nextInspectDate,
+        INSPECT_REPORT as inspectReport
         from idx_biz_jg_inspection_detection_info
         where RECORD = #{id}
         ORDER BY INSPECT_DATE desc LIMIT 1
@@ -113,11 +115,11 @@
         CITY as city,
         COUNTY as county,
         USE_INNER_CODE as useInnerCode
-        FROM "idx_biz_jg_use_info"  where RECORD = #{id}
+        FROM "idx_biz_jg_use_info" where RECORD = #{id}
     </select>
     <select id="getEquipListPage" resultType="java.util.Map">
         SELECT jri.EQU_CODE as equCode,
-        jri.RECORD  as id,
+        jri.RECORD as id,
         (SELECT name from tz_equipment_category where code = jri.EQU_CATEGORY) as equCategory,
         (SELECT name from tz_equipment_category where code = jri.EQU_LIST) as equList,
         jfi.FACTORY_NUM as factoryNum,
@@ -141,32 +143,32 @@
     </select>
 
 
-        <select id="getDetailById" resultType="java.util.Map">
-            select ur.sequence_nbr as sequenceNbr,
-            ur.audit_status as auditStatus,
-            ur.use_unit_name as useUnitName,
-            ur.use_registration_code as useRegistrationCode,
-            ur.status,
-            ur.receive_org_name as receiveOrgName,
-            DATE_FORMAT(ur.reg_date,'%Y-%m-%d') as regDate,
-            DATE_FORMAT(ur.audit_pass_date,'%Y-%m-%d') as auditPassDate,
-            (SELECT name from tz_equipment_category  where  code = jri.EQU_CATEGORY) as equCategory,
-            jri.PRODUCT_NAME as productName,
-            jri.EQU_CODE as equCode,
-            use.USE_INNER_CODE as innerCode,
-            concat(use.PROVINCE_NAME,use.CITY_NAME,use.COUNTY_NAME,use.STREET_NAME,use.ADDRESS) as place,
-            ifnull(ur.instance_id, '') as instanceId,
-            re.equ_id as equipId,
-            ur.apply_no as applyNo,
-            ifnull(ur.next_executor_ids,'') as nextExecutorIds,
-            ur.promoter,
-            ur.next_execute_user_ids as nextExecuteUserIds
-            from tzs_jg_change_registration_reform ur
-            LEFT JOIN tzs_jg_change_registration_reform_eq re  on ur.sequence_nbr = re.equip_transfer_id
-            LEFT JOIN idx_biz_jg_register_info jri  on re.equ_id = jri.RECORD
-            LEFT JOIN idx_biz_jg_use_info  use   on re.equ_id = use.RECORD
-            LEFT JOIN idx_biz_jg_other_info other on re.equ_id = other.RECORD
-            where ur.sequence_nbr = #{id}
-        </select>
+    <select id="getDetailById" resultType="java.util.Map">
+        select ur.sequence_nbr as sequenceNbr,
+        ur.audit_status as auditStatus,
+        ur.use_unit_name as useUnitName,
+        ur.use_registration_code as useRegistrationCode,
+        ur.status,
+        ur.receive_org_name as receiveOrgName,
+        DATE_FORMAT(ur.reg_date,'%Y-%m-%d') as regDate,
+        DATE_FORMAT(ur.audit_pass_date,'%Y-%m-%d') as auditPassDate,
+        (SELECT name from tz_equipment_category where code = jri.EQU_CATEGORY) as equCategory,
+        jri.PRODUCT_NAME as productName,
+        jri.EQU_CODE as equCode,
+        use.USE_INNER_CODE as innerCode,
+        concat(use.PROVINCE_NAME,use.CITY_NAME,use.COUNTY_NAME,use.STREET_NAME,use.ADDRESS) as place,
+        ifnull(ur.instance_id, '') as instanceId,
+        re.equ_id as equipId,
+        ur.apply_no as applyNo,
+        ifnull(ur.next_executor_ids,'') as nextExecutorIds,
+        ur.promoter,
+        ur.next_execute_user_ids as nextExecuteUserIds
+        from tzs_jg_change_registration_reform ur
+        LEFT JOIN tzs_jg_change_registration_reform_eq re on ur.sequence_nbr = re.equip_transfer_id
+        LEFT JOIN idx_biz_jg_register_info jri on re.equ_id = jri.RECORD
+        LEFT JOIN idx_biz_jg_use_info use on re.equ_id = use.RECORD
+        LEFT JOIN idx_biz_jg_other_info other on re.equ_id = other.RECORD
+        where ur.sequence_nbr = #{id}
+    </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/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)) {