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

@@ -47,6 +47,9 @@ public class JgChangeRegistrationNameDto extends BaseDto {
     @ApiModelProperty(value = "终审通过时间")
     private Date auditPassDate;
 
+    @ApiModelProperty(value = "申请日期，接收查询参数")
+    private String applicationDate;
+
     @ApiModelProperty(value = "备注")
     private String remark;
 

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationNameDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationName;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -23,5 +24,10 @@ public interface JgChangeRegistrationNameMapper extends BaseMapper<JgChangeRegis
 
     void deleteHistoryInfoById(@Param("code") String code);
 
-    Page<Map<String, Object>> getListPage(@Param("page") Page<Map<String, Object>> page, @Param("dto") JgChangeRegistrationNameDto dto, @Param("roleIds") List<String> roleIds, @Param("companyCode") String companyCode, @Param("currentUserId") String exeUserId);
+    Page<Map<String, Object>> getListPage(@Param("page") Page<Map<String, Object>> page,
+                                          @Param("sort") SortVo sortMap,
+                                          @Param("dto") JgChangeRegistrationNameDto dto,
+                                          @Param("roleIds") List<String> roleIds,
+                                          @Param("companyCode") String companyCode,
+                                          @Param("currentUserId") String exeUserId);
 }

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

@@ -43,11 +43,17 @@
         <if test="dto.auditStatus != null and dto.auditStatus != ''">
             and ur.audit_status = #{dto.auditStatus}
         </if>
+        <if test="dto.useUnitName != null and dto.useUnitName != ''">
+            and ur.use_unit_name = #{dto.useUnitName}
+        </if>
+        <if test="dto.newUseUnitName != null and dto.newUseUnitName != ''">
+            and ur.new_use_unit_name = #{dto.newUseUnitName}
+        </if>
         <if test="dto.applyNo != null and dto.applyNo != ''">
             and ur.apply_no like concat('%',#{dto.applyNo},'%')
         </if>
-        <if test="dto.createDate != null">
-            AND ur.create_date >= #{dto.createDate}
+        <if test="dto.applicationDate != null">
+            AND ur.create_date like concat('%',DATE_FORMAT(#{dto.applicationDate},'%Y-%m-%d'),'%')
         </if>
         <if test="dto.receiveOrgCode != null and dto.receiveOrgCode != ''">
             AND ur.receive_org_code = #{dto.receiveOrgCode}
@@ -65,7 +71,11 @@
             and (ur.use_unit_credit_code = #{dto.useUnitCreditCode} or ur.transfer_to_user_ids LIKE concat ('%', #{currentUserId}, '%'))
         </if>
     </where>
-    order by ur.rec_date desc
+    order by
+    <if test="sort != null">
+        ur.${sort.field} ${sort.sortType},
+    </if>
+        ur.rec_date desc
     </select>
 
 <delete id="deleteHistoryInfoById">

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

@@ -104,6 +104,7 @@ public class JgChangeRegistrationNameController extends BaseController {
     @ApiOperation(httpMethod = "POST", value = "列表全部数据查询", notes = "列表全部数据查询")
     @PostMapping(value = "/getList")
     public ResponseModel<Page<Map<String, Object>>> getList(JgChangeRegistrationNameDto 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);
@@ -114,7 +115,7 @@ public class JgChangeRegistrationNameController extends BaseController {
         } else {
             dto.setType(COMPANY_TYPE_SUPERVISION);
         }
-        return ResponseHelper.buildResponse(jgChangeRegistrationNameService.getList(dto, page, dto.getRoleIds(),reginParams.getCompany().getCompanyCode()));
+        return ResponseHelper.buildResponse(jgChangeRegistrationNameService.getList(dto,sort, page, dto.getRoleIds(),reginParams.getCompany().getCompanyCode()));
     }
 
 

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

@@ -17,6 +17,7 @@ import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
 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.IJgChangeRegistrationNameService;
+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.ICmWorkflowService;
 import com.yeejoin.amos.boot.module.jg.flc.api.fegin.WorkFlowFeignService;
@@ -781,7 +782,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
     }
 
 
-    public Page<Map<String, Object>> getList(JgChangeRegistrationNameDto dto, Page<Map<String, Object>> page, List<String> roleIds, String companyCode) {
+    public Page<Map<String, Object>> getList(JgChangeRegistrationNameDto dto,String sort, Page<Map<String, Object>> page, List<String> roleIds, String companyCode) {
         if (org.apache.commons.lang3.StringUtils.isNotBlank(dto.getReceiveOrgCode())) {
             String[] receiveOrgIdList = dto.getReceiveOrgCode().split("_");
             if (receiveOrgIdList.length > 1) {
@@ -789,6 +790,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
                 dto.setReceiveCompanyCode(receiveOrgIdList[0]);
             }
         }
-        return this.baseMapper.getListPage(page, dto, roleIds, companyCode, RequestContext.getExeUserId());
+        SortVo sortMap = commonService.sortFieldConversion(sort);
+        return this.baseMapper.getListPage(page,sortMap, dto, roleIds, companyCode, RequestContext.getExeUserId());
     }
 }
\ No newline at end of file