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

@@ -136,4 +136,7 @@ public class JgEquipTransferDto  extends BaseDto {
      */
     @ApiModelProperty(value = "下一节点可执行人逗号分割-数据隔离使用")
     private String nextExecuteUserIds;
+
+    @ApiModelProperty(value = "转办人")
+    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/JgReformNoticeDto.java

@@ -222,4 +222,7 @@ public class JgReformNoticeDto extends BaseDto {
      */
     @ApiModelProperty(value = "下一节点可执行人逗号分割-数据隔离使用")
     private String nextExecuteUserIds;
+
+    @ApiModelProperty(value = "转办人")
+    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/JgEquipTransfer.java

@@ -219,4 +219,7 @@ public class JgEquipTransfer extends BaseEntity {
      */
     @TableField(value = "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/JgReformNotice.java

@@ -342,4 +342,7 @@ public class JgReformNotice extends BaseEntity {
      */
     @TableField(exist = false)
     private String fullAddress;
+
+    @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/JgEquipTransferMapper.java

@@ -15,7 +15,7 @@ import java.util.Map;
  * @date 2023-12-20
  */
 public interface JgEquipTransferMapper extends CustomBaseMapper<JgEquipTransfer> {
-    Page<JgEquipTransferDto> queryForPage(Page<JgEquipTransferDto> page, @Param("param") JgEquipTransferDto model);
+    Page<JgEquipTransferDto> queryForPage(Page<JgEquipTransferDto> page, @Param("param") JgEquipTransferDto model, @Param("currentUserId") String currentUserId);
 
     @MapKey("sequenceNbr")
     List<Map<String, Object>> queryEquipInformation(Long sequenceNbr);

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

@@ -24,7 +24,9 @@ public interface JgReformNoticeMapper extends CustomBaseMapper<JgReformNotice> {
      * @param type  类型：enterprise-企业端、supervision-监管端
      * @return 改造告知列表
      */
-    Page<JgReformNotice> queryForPage(Page<JgReformNotice> page, @Param ("param") JgReformNoticeDto model, @Param("type") String type, @Param("orgCode") String orgCode);
+    Page<JgReformNotice> queryForPage(Page<JgReformNotice> page, @Param ("param") JgReformNoticeDto model,
+                                      @Param("type") String type, @Param("orgCode") String orgCode,
+                                      @Param("currentUserId") String currentUserId);
 
     /**
      * 根据改造告知编号查询设备、设计、制造等信息

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

@@ -56,7 +56,8 @@
             tec.name AS equDefine,
             jet.create_date AS createDate,
             jet.next_execute_user_ids as nextExecuteUserIds,
-            jet.create_user_id as createUserId
+            jet.create_user_id as createUserId,
+            jet.next_task_id as nextTaskId
         FROM
             tzs_jg_equip_transfer jet
             LEFT JOIN tzs_jg_equip_transfer_eq ete ON ete.equip_transfer_id = jet.sequence_nbr
@@ -105,6 +106,7 @@
                     </if>
                 </otherwise>
             </choose>
+            and (1=1 or jet.transfer_to_user_ids like concat('%',#{currentUserId},'%'))
         </where>
         ORDER BY jet.apply_date DESC
     </select>

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

@@ -32,7 +32,8 @@
         isn.equ_category,
         isn.create_user_id,
         isn.next_execute_user_ids,
-        oi.SUPERVISORY_CODE AS supervisoryCode
+        oi.SUPERVISORY_CODE AS supervisoryCode,
+        isn.next_task_id as nextTaskId
         FROM
         tzs_jg_reform_notice isn
         LEFT JOIN tzs_jg_reform_notice_eq re ON re.equip_transfer_id = isn.sequence_nbr
@@ -67,6 +68,7 @@
             <if test="type == 'company'">
                 AND isn.install_unit_credit_code = #{orgCode}
             </if>
+            and (1=1 or isn.transfer_to_user_ids like concat('%',#{currentUserId},'%'))
         </where>
         ORDER BY
         isn.apply_no DESC

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

@@ -450,7 +450,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
                 dto.setInstallUnitCodeFilter(company.getCompanyCode());
             }
         }
-        Page<JgEquipTransferDto> equipTransferPage = this.baseMapper.queryForPage(page, dto);
+        Page<JgEquipTransferDto> equipTransferPage = this.baseMapper.queryForPage(page, dto, reginParams.getUserModel().getUserId());
         Page<JgEquipTransferDto> equipTransferDtoPage = new Page<>();
         BeanUtils.copyProperties(equipTransferPage, equipTransferDtoPage, "records");
         List<JgEquipTransferDto> records = equipTransferPage.getRecords().stream().map(transfer -> {

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

@@ -245,7 +245,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
     public Page<JgReformNoticeDto> queryForJgReformNoticePage(Page<JgReformNotice> page, JgReformNoticeDto model, String type, ReginParams reginParams) {
 
         String orgCode = reginParams.getCompany().getCompanyCode();
-        Page<JgReformNotice> noticePage = jgReformNoticeMapper.queryForPage(page, model, type, orgCode);
+        Page<JgReformNotice> noticePage = jgReformNoticeMapper.queryForPage(page, model, type, orgCode, reginParams.getUserModel().getUserId());
 
         // 将Page<JgReformNotice>转化为Page<JgReformNoticeDto>
         Page<JgReformNoticeDto> noticeDtoPage = new Page<>();