feat（设备注销）:新加转办人字段，修改列表查询接口

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgScrapCancelDto.java

@@ -86,35 +86,29 @@ public class JgScrapCancelDto extends BaseDto {
     @ApiModelProperty(value = "下一步任务ID")
     private String nextTaskId;
 
-
     private List<String> roleIds;
 
-
-    // 区分监管和企业
+    @ApiModelProperty(value = "区分监管和企业")
     private String type;
 
-    /**
-     * 使用单位编码
-     */
+    @ApiModelProperty(value = "使用单位编码")
     private String useUnitCode;
 
-
-    /**
-     * 使用单位名称
-     */
+    @ApiModelProperty(value = "使用单位名称")
     private String useUnitName;
 
     @ApiModelProperty(value = "设备监管码")
     private String supervisoryCode;
 
-    /**
-     * 设备ID
-     */
+    @ApiModelProperty(value = "设备ID")
     private String record;
 
     @ApiModelProperty(value = "下一节点可执行人")
     private String nextExecuteUserIds;
 
+    @ApiModelProperty(value = "转办后执行人的Id逗号分割")
+    private String transferToUserIds;
+
     @ApiModelProperty(value = "设备代号")
     private String equList;
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgScrapCancel.java

@@ -148,6 +148,12 @@ public class JgScrapCancel extends BaseEntity {
     @TableField("next_execute_user_ids")
     private String nextExecuteUserIds;
 
+    /**
+     * 转办后执行人的Id逗号分割
+     */
+    @TableField("transfer_to_user_ids")
+    private String transferToUserIds;
+
     @TableField(exist = false)
     private String equList;
 

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

 package com.yeejoin.amos.boot.module.jg.api.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgScrapCancelDto;
-import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgScrapCancel;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -19,17 +17,22 @@ import java.util.Map;
  */
 public interface JgScrapCancelMapper extends BaseMapper<JgScrapCancel> {
 
-    Page<Map<String, Object>> getListPage(@Param("page")Page<Map<String, Object>> page, @Param("dto") JgScrapCancelDto dto , @Param("roleIds") List<String> roleIds, @Param("orgCode") String orgCode);
+    Page<Map<String, Object>> getListPage(@Param("page") Page<Map<String, Object>> page,
+                                          @Param("dto") JgScrapCancelDto dto,
+                                          @Param("roleIds") List<String> roleIds,
+                                          @Param("orgCode") String orgCode,
+                                          @Param("currentUserId") String currentUserId
+    );
 
-    Map<String, Object> getDetail(@Param("id")String id);
+    Map<String, Object> getDetail(@Param("id") String id);
 
-    Map<String, Object> getInspectDetail(@Param("id")String id);
+    Map<String, Object> getInspectDetail(@Param("id") String id);
 
-    Map<String, Object> getUseDetail(@Param("id")String id);
+    Map<String, Object> getUseDetail(@Param("id") String id);
 
-    Page<Map<String, Object>> getEquipListPage(@Param("page")Page<Map<String, Object>> page,@Param("factoryNum") String factoryNum,@Param("equList")String equList,@Param("equCategory")String equCategory);
+    Page<Map<String, Object>> getEquipListPage(@Param("page") Page<Map<String, Object>> page, @Param("factoryNum") String factoryNum, @Param("equList") String equList, @Param("equCategory") String equCategory);
 
-    void updatePromoter(@Param("id")Long id);
+    void updatePromoter(@Param("id") Long id);
 
     /**
      * 根据安装告知编号查询设备、设计、制造等信息

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

@@ -48,9 +48,6 @@
         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>-->
             <if test="dto.auditStatus != null and dto.auditStatus != ''">
                 and ur.audit_status = #{dto.auditStatus}
             </if>
@@ -68,14 +65,11 @@
                 </foreach>
             </if>
             <if test="dto.type == 'supervision'">
-                AND ur.receive_org_code = #{orgCode}
+                and ( ur.receive_org_code = #{orgCode} or ur.transfer_to_user_ids like concat('%',#{currentUserId},'%'))
             </if>
             <if test="dto.type == 'company' ">
-                and ur.use_unit_code = #{orgCode}
+                and (ur.use_unit_code = #{orgCode} or ur.transfer_to_user_ids like concat('%',#{currentUserId},'%'))
             </if>
-            <!--            <if test="dto.type == 'enterprise'">-->
-            <!--                AND use.USE_UNIT_CREDIT_CODE = #{orgCode}-->
-            <!--            </if>-->
         </where>
         order by ur.rec_date desc
     </select>

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

@@ -107,7 +107,8 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         ReginParams reginParams = this.getSelectedOrgInfo();
         String orgCode = reginParams.getCompany().getCompanyCode();
         dto.setCreateUserId(reginParams.getUserModel().getUserId());
-        Page<Map<String, Object>> listPage = this.baseMapper.getListPage(page, dto, roleIds, orgCode);
+        String currentUserId = reginParams.getUserModel().getUserId();
+        Page<Map<String, Object>> listPage = this.baseMapper.getListPage(page, dto, roleIds, orgCode, currentUserId);
         listPage.getRecords().forEach(item -> {
             if (item.containsKey("auditStatus") && Objects.nonNull(item.get("auditStatus"))) {
                 item.put("auditStatusDesc", item.get("auditStatus").toString());