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

@@ -56,6 +56,9 @@ public class JgChangeRegistrationReformDto extends BaseDto {
     @ApiModelProperty(value = "注册登记日期")
     private Date regDate;
 
+    @ApiModelProperty(value = "列表搜索，申请日期")
+    private String applicationDate;
+
     @ApiModelProperty(value = "注册登记人员ID")
     private String regPersonId;
 
@@ -129,4 +132,19 @@ public class JgChangeRegistrationReformDto extends BaseDto {
     @ApiModelProperty (value = "其他附件")
     private String otherAccessories;
 
+    @ApiModelProperty (value = "设备种类")
+    private String equList;
+
+    @ApiModelProperty (value = "设备类别")
+    private String equCategory;
+
+    @ApiModelProperty (value = "设备品种")
+    private String equDefine;
+
+    @ApiModelProperty (value = "设备代码")
+    private String equCode;
+
+    @ApiModelProperty (value = "code96333")
+    private String code96333;
+
 }

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

@@ -5,6 +5,7 @@ import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationReformDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationReform;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
@@ -19,7 +20,11 @@ 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,@Param("currentUserId")String currentUserId);
+    Page<Map<String, Object>> getListPage(@Param("page")Page<Map<String, Object>> page,
+                                          @Param("sort") SortVo sortMap,
+                                          @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/service/IJgChangeRegistrationReformService.java

@@ -25,7 +25,7 @@ public interface IJgChangeRegistrationReformService {
      * @param roleIds
      * @return
      */
-    Page<Map<String, Object>> getList(JgChangeRegistrationReformDto dto, Page<Map<String, Object>> page, List<String> roleIds);
+    Page<Map<String, Object>> getList(JgChangeRegistrationReformDto dto,String sort, Page<Map<String, Object>> page, List<String> roleIds);
 
     /**
      * @deprecated 保存数据-根据入参判断是暂存还是执行流程

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

@@ -21,6 +21,7 @@
         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,
+        use."ADDRESS" as detailedAddress,
         ifnull(ur.instance_id, '') as instanceId,
         re.equ_id as equipId,
         ur.apply_no as applyNo,
@@ -29,20 +30,55 @@
         ur.supervisory_code  as supervisoryCode,
         ur.next_execute_user_ids as nextExecuteUserIds,
         ur.next_task_id as nextTaskId,
-        ur.create_user_id as createUserId
+        ur.create_user_id as createUserId,
+        oi.CODE96333 as code96333,
+        (SELECT name from tz_equipment_category ec WHERE ec.code = jri.EQU_LIST) AS equList,
+        (select name from tz_equipment_category ec WHERE ec.code = jri.EQU_DEFINE) AS equDefine
         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_register_info jri on jri.RECORD = re.equ_id
+        LEFT JOIN idx_biz_jg_use_info use on use.RECORD = re.equ_id
+        LEFT JOIN idx_biz_jg_other_info oi ON  oi.RECORD = re.equ_id
         <where>
             and ur.is_delete = 0
             <if test="dto.auditStatus != null and dto.auditStatus != ''">
                 and ur.audit_status = #{dto.auditStatus}
             </if>
+            <if test="dto.supervisoryCode != null and dto.supervisoryCode != ''">
+                and ur.supervisory_code like concat('%',#{dto.supervisoryCode},'%')
+            </if>
+            <if test="dto.receiveCompanyCode != null and dto.receiveCompanyCode != ''">
+                and ur.receive_company_code = #{dto.receiveCompanyCode}
+            </if>
             <if test="dto.useUnitName != null and dto.useUnitName != ''">
                 and ur.use_unit_name like concat('%',#{dto.useUnitName},'%')
             </if>
+            <if test="dto.applicationDate != null and dto.applicationDate != ''">
+                and ur.ur.reg_date like concat('%',DATE_FORMAT(#{dto.applicationDate},'%Y-%m-%d'),'%')
+            </if>
+            <if test="dto.equListCode != null and dto.equListCode != ''">
+                AND jri."EQU_LIST" = #{dto.equList}
+            </if>
+            <if test="dto.equCategory != null and dto.equCategory != ''">
+                AND jri."equ_category" = #{dto.equCategory}
+            </if>
+            <if test="dto.equDefine != null and dto.equDefine != ''">
+                AND jri."EQU_DEFINE" = #{dto.equDefine}
+            </if>
+            <if test="dto.equCode != null and dto.equCode != ''">
+                AND jri."EQU_CODE" like concat('%',#{dto.equCode},'%')
+            </if>
+            <if test="dto.code96333 != null and dto.code96333 != ''">
+                AND oi.CODE96333 like concat('%',#{dto.code96333},'%')
+            </if>
+            <if test="dto.address != null and dto.address != ''">
+                AND (
+                ibjui."PROVINCE_NAME" LIKE CONCAT('%', #{dto.address}, '%')
+                OR ibjui."CITY_NAME" LIKE CONCAT('%', #{dto.address}, '%')
+                OR ibjui."COUNTY_NAME" LIKE CONCAT('%', #{dto.address}, '%')
+                OR ibjui."STREET_NAME" LIKE CONCAT('%', #{dto.address}, '%')
+                )
+            </if>
             <if test="roleIds != null and dto.dataType == 'supervision'">
                 <foreach collection='roleIds' item='role' open='and (' close=')' separator='or'>
                     instance_status like concat('%',#{role},'%')

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgChangeRegistrationReformController.java

@@ -8,6 +8,7 @@ import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationReformDto;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgChangeRegistrationReformServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
@@ -88,6 +89,7 @@ public class JgChangeRegistrationReformController extends BaseController {
 	@ApiOperation(httpMethod = "GET", value = "列表全部数据查询", notes = "列表全部数据查询")
 	@GetMapping(value = "/getList")
 	public ResponseModel<Page<Map<String, Object>>> getList(JgChangeRegistrationReformDto dto,
+															@RequestParam(value = "sort",required = false) String sort,
 															@RequestParam(value = "current") int current,
 															@RequestParam(value = "size") int size) {
 		Page<Map<String, Object>> page = new Page<>(current, size);
@@ -99,7 +101,7 @@ public class JgChangeRegistrationReformController extends BaseController {
 			dto.setDataType(COMPANY_TYPE_SUPERVISION);
 			dto.setReceiveOrgCode(reginParams.getCompany().getCompanyCode());
 		}
-		Page<Map<String, Object>> list = jgChangeRegistrationReformServiceImpl.getList(dto, page, dto.getRoleIds());
+		Page<Map<String, Object>> list = jgChangeRegistrationReformServiceImpl.getList(dto,sort, page, dto.getRoleIds());
 		list.getRecords().forEach(x-> x.put("companyType",reginParams.getCompany().getCompanyType()));
 		return ResponseHelper.buildResponse(list);
 	}

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

@@ -18,6 +18,7 @@ import com.yeejoin.amos.boot.module.jg.api.enums.EquipTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.WorkFlowStatusEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.*;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgChangeRegistrationReformService;
+import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.jg.biz.service.*;
 import com.yeejoin.amos.boot.module.ymt.api.entity.*;
@@ -127,8 +128,9 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
      * @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, RequestContext.getExeUserId());
+    public Page<Map<String, Object>> getList(JgChangeRegistrationReformDto dto,String sort, Page<Map<String, Object>> page, List<String> roleIds) {
+        SortVo sortMap = commonServiceImpl.sortFieldConversion(sort);
+        Page<Map<String, Object>> listPage = this.baseMapper.getListPage(page,sortMap, dto, roleIds, RequestContext.getExeUserId());
         return listPage;
     }