Merge branch 'develop_tzs_register' of…

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

@@ -28,7 +28,7 @@ public interface JgChangeRegistrationUnitMapper extends CustomBaseMapper<JgChang
      * @param type  类型：enterprise-企业端、supervision-监管端
      * @return 安装告知列表
      */
-    Page<JgChangeRegistrationUnit> queryForPage(Page<JgChangeRegistrationUnit> page, @Param("param") JgChangeRegistrationUnitDto model, @Param("type") String type, @Param("orgCode") String orgCode , @Param("roleIds") List<String> roleIds);
+    Page<JgChangeRegistrationUnit> queryForPage(Page<JgChangeRegistrationUnit> page, @Param("param") JgChangeRegistrationUnitDto model, @Param("type") String type, @Param("orgCode") String orgCode , @Param("roleIds") List<String> roleIds , @Param("currentUserId") String currentUserId);
 
     /**
      * 根据安装告知编号查询设备、设计、制造等信息

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

@@ -23,7 +23,8 @@
         isn.instance_status AS instanceStatus,
         isn.audit_pass_date AS auditPassDate,
         isn.equ_type AS equType,
-        isn.next_execute_user_ids as nextExecuteUserIds
+        isn.next_execute_user_ids as nextExecuteUserIds,
+        isn.next_task_id as nextTaskId
         FROM
         tzs_jg_change_registration_unit isn
         <where>
@@ -57,6 +58,7 @@
                     instance_status like concat('%',#{role},'%')
                 </foreach>
             </if>
+            and (1=1 or isn.transfer_to_user_ids like concat('%',#{currentUserId},'%'))
         </where>
         ORDER BY
         isn.create_date DESC,  isn.apply_no DESC

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

@@ -315,8 +315,8 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
 
         String orgCode;
         orgCode = reginParams.getCompany().getCompanyCode();
-
-        Page<JgChangeRegistrationUnit> noticePage = JgChangeRegistrationUnitMapper.queryForPage(page, model, type, orgCode, model.getRoleIds());
+        String currentUserId = reginParams.getUserModel().getUserId();
+        Page<JgChangeRegistrationUnit> noticePage = JgChangeRegistrationUnitMapper.queryForPage(page, model, type, orgCode, model.getRoleIds(),currentUserId);
 
         Page<JgChangeRegistrationUnitDto> noticeDtoPage = new Page<>();
         BeanUtils.copyProperties(noticePage, noticeDtoPage, "records");