fix(更名)：列表查询条件

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

 package com.yeejoin.amos.boot.module.jg.api.dto;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
@@ -53,6 +54,7 @@ public class JgChangeRegistrationNameDto extends BaseDto {
     private String createUserId;
 
     @ApiModelProperty(value = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date createDate;
 
     @ApiModelProperty(value = "创建人")

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

@@ -43,6 +43,12 @@
         <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>
+        <if test="dto.receiveOrgCode != null and dto.receiveOrgCode != ''">
+            AND ur.receive_org_code = #{dto.receiveOrgCode}
+        </if>
         <if test="roleIds != null and dto.type == 'supervision'">
             <foreach collection='roleIds' item='role' open='and (' close=')' separator='or'>
                 ur.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/service/impl/JgChangeRegistrationNameServiceImpl.java

@@ -586,6 +586,12 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
     public Page<Map<String, Object>> getList(JgChangeRegistrationNameDto dto, Page<Map<String, Object>> page, List<String> roleIds) {
         ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         String orgCode = reginParams.getCompany().getCompanyCode();
+        if (org.apache.commons.lang3.StringUtils.isNotBlank(dto.getReceiveOrgCode())) {
+            String[] receiveOrgIdList = dto.getReceiveOrgCode().split("_");
+            if (receiveOrgIdList.length > 1) {
+                dto.setReceiveOrgCode(receiveOrgIdList[0]);
+            }
+        }
         Page<Map<String, Object>> listPage = this.baseMapper.getListPage(page, dto, roleIds, orgCode);
         return listPage;
     }