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

@@ -137,4 +137,8 @@ public class JgChangeRegistrationTransferDto extends BaseDto {
     @ApiModelProperty(value = " 单位内部编号")
     private String innerCode;
 
+    @ApiModelProperty(value = " 转办后执行人的Id逗号分割")
+    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/dto/JgInstallationNoticeDto.java

@@ -264,4 +264,6 @@ public class JgInstallationNoticeDto extends BaseDto {
     @ApiModelProperty (value = "下一节点可执行人")
     private String nextExecuteUserIds;
 
+
+    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/dto/JgTransferNoticeDto.java

@@ -232,4 +232,6 @@ public class JgTransferNoticeDto extends BaseDto {
     private String equAddress;
 
 
+    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/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/entity/JgChangeRegistrationTransfer.java

@@ -245,5 +245,10 @@ public class JgChangeRegistrationTransfer extends BaseEntity {
     @TableField(value = "full_address")
     private String fullAddress;
 
+    /**
+     * 转办后执行人的Id逗号分割
+     */
+    @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/entity/JgInstallationNotice.java

@@ -426,4 +426,7 @@ public class JgInstallationNotice 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/entity/JgTransferNotice.java

@@ -323,4 +323,7 @@ public class JgTransferNotice extends BaseEntity {
     private String equAddress;
 
 
+    @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/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgChangeRegistrationTransferMapper.java

@@ -20,7 +20,7 @@ public interface JgChangeRegistrationTransferMapper extends BaseMapper<JgChangeR
 
     void updatePromoter(@Param ("id")Long id);
 
-    Page<Map<String, Object>> getListPage(@Param("page")Page<Map<String, Object>> page, @Param("dto") JgChangeRegistrationTransferDto dto , @Param("roleIds") List<String> roleIds, @Param("type") String type);
+    Page<Map<String, Object>> getListPage(@Param("page")Page<Map<String, Object>> page, @Param("dto") JgChangeRegistrationTransferDto dto , @Param("roleIds") List<String> roleIds, @Param("type") String type, @Param("currentUserId")String currentUserId);
 
     @Select("select name from tz_equipment_category  where code=#{code}")
     String getEquiplistNameByEquiplist(String code);

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

@@ -34,15 +34,15 @@
 
         <where>
             and ur.is_delete = 0
-<!--            <if test="dto.equCategory != null and dto.equCategory != ''">-->
-<!--                and jri.EQU_CATEGORY = #{dto.equCategory}-->
-<!--            </if>-->
+            <!--            <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},'%')
             </if>
@@ -57,6 +57,9 @@
             <if test="dto.dataType != null and dto.dataType == 'company' ">
                 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>
@@ -86,7 +89,6 @@
         where jri.RECORD = #{id}
 
 
-
     </select>
     <select id="getInspectDetail" resultType="java.util.Map">
         SELECT INSPECT_TYPE as inspectType,

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

@@ -62,6 +62,9 @@
             <if test="type == 'company'">
                 AND crt.use_unit_credit_code = #{dto.unitCode}
             </if>
+            <if test="currentUserId != null and currentUserId != '' ">
+                or ur.transfer_to_user_ids like concat('%',#{currentUserId},'%')
+            </if>
         </where>
         order by crt.rec_date desc
     </select>

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

@@ -27,6 +27,7 @@
         isn.equ_list AS equList,
         isn.notice_report_url AS noticeReportUrl,
         isn.create_user_id as createUserId,
+        isn.next_taskId AS nextTaskId,
         isn.next_execute_user_ids as nextExecuteUserIds,
         concat(ibjui."PROVINCE_NAME", '', ibjui."CITY_NAME", '', ibjui."COUNTY_NAME", '', ibjui."STREET_NAME", '', ibjui."ADDRESS") as equAddress
         FROM tzs_jg_installation_notice isn

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

@@ -28,6 +28,7 @@
         tjtn.create_user_id as createUserId,
         tjtn.next_execute_user_ids as nextExecuteUserIds,
         oi.SUPERVISORY_CODE as supervisoryCode,
+        tjtn.next_taskId AS nextTaskId,
         concat(ibjui."PROVINCE_NAME", '', ibjui."CITY_NAME", '', ibjui."COUNTY_NAME", '', ibjui."STREET_NAME", '', ibjui."ADDRESS") as equAddress
         FROM
             tzs_jg_transfer_notice tjtn

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
@@ -116,7 +116,9 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
      * @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;
     }
 
@@ -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)) {

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

@@ -624,7 +624,9 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
      * @return
      */
     public Page<Map<String, Object>> queryListForPage(Page<Map<String, Object>> page, JgChangeRegistrationTransferDto params, String type) {
-        Page<Map<String, Object>> listPage = this.baseMapper.getListPage(page, params, params.getRoleIds(), type);
+        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, params, params.getRoleIds(), type, currentUserId);
         return listPage;
     }
 

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

@@ -776,6 +776,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         // 执行工作流并返回组装好的工作流信息
         WorkflowResultDto workflowResultDto = getWorkflowResultDto(op, jgInstallationNotice);
         jgInstallationNotice.setPromoter(reginParams.getUserModel().getUserId());
+        jgInstallationNotice.setNextTaskId(workflowResultDto.getNextTaskId());
         TaskV2Model taskV2Model = new TaskV2Model();
         if ("0".equals(op)) {
             if (StringUtils.isEmpty(workflowResultDto.getNextExecutorRoleIds())) {
@@ -922,7 +923,6 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             taskModelDto.setModel(taskMessageDto);
             commonService.buildTaskModel(Collections.singletonList(taskModelDto));
         }
-        jgInstallationNotice.setNextTaskId(workflowResultDto.getNextTaskId());
         jgInstallationNotice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
         jgInstallationNotice.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
         this.updateById(jgInstallationNotice);

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

@@ -686,6 +686,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
         WorkflowResultDto workflowResultDto = getWorkflowResultDto(op, opinion, jgTransferNotice);
 
         jgTransferNotice.setPromoter(reginParams.getUserModel().getUserId());
+        jgTransferNotice.setNextTaskId(workflowResultDto.getNextTaskId());
         TaskV2Model taskV2Model = new TaskV2Model();
         if ("0".equals(op)) {
             if (StringUtils.isEmpty(workflowResultDto.getNextExecutorRoleIds())) {
@@ -769,7 +770,6 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             taskModelDto.setModel(taskMessageDto);
             commonService.buildTaskModel(Collections.singletonList(taskModelDto));
         }
-        jgTransferNotice.setNextTaskId(workflowResultDto.getNextTaskId());
         jgTransferNotice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
         jgTransferNotice.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
         jgTransferNoticeMapper.updateById(jgTransferNotice);

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/IdxBizJgInspectionDetectionInfo.java

@@ -50,6 +50,12 @@ public class IdxBizJgInspectionDetectionInfo extends TzsBaseEntity {
     /**
      *
      */
+    @TableField("\"INSPECT_ORG_CODE\"")
+    private String inspectOrgCode;
+
+    /**
+     *
+     */
 	@TableField("\"INSPECT_ORG_NAME\"")
     private String inspectOrgName;
 
@@ -101,6 +107,12 @@ public class IdxBizJgInspectionDetectionInfo extends TzsBaseEntity {
 	@TableField("\"SEQUENCE_CODE\"")
     private String sequenceCode;
 
+    /**
+     *
+     */
+    @TableField("\"INSPECT_REPORT_NO\"")
+    private String inspectReportNo;
+
     @TableField(exist = false)
     private String supervisoryCode;
 }