Merge branch 'develop_tzs_register' of…

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

 package com.yeejoin.amos.boot.module.jg.api.dto;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
@@ -62,7 +61,7 @@ public class JgUseRegistrationDto extends BaseDto {
     private Date auditPassDate;
 
     @ApiModelProperty(value = "办理日期范围")
-    private String auditPassDateRange;
+    private List<String> auditPassDateRange;
 
     @ApiModelProperty(value = "办理日期起始日期")
     private Date auditPassDateStart;

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

@@ -125,16 +125,16 @@ public class JgUseRegistrationController extends BaseController {
             dto.setReceiveCompanyCode(info.getCompany().getCompanyCode());
             dto.setSupervisionOrgCode(info.getCompany().getOrgCode());
         }
-        if (dto.getAuditPassDateRange() != null && !dto.getAuditPassDateRange().isEmpty() && !dto.getAuditPassDateRange().equals("[, ]")) {
-            String dateRangeStr = dto.getAuditPassDateRange();
-            String[] dates = dateRangeStr.replace("[", "").replace("]", "").split(", ");
-
+        if (dto.getAuditPassDateRange() != null && !dto.getAuditPassDateRange().isEmpty()) {
+            String startDate = dto.getAuditPassDateRange().get(0).substring(1);
+            String endDate = dto.getAuditPassDateRange().get(1).substring(0, dto.getAuditPassDateRange().get(1).length() - 1);
+            if (!ValidationUtil.isEmpty(startDate) && !ValidationUtil.isEmpty(endDate)) {
                 SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
                 Date start = null;
                 Date end = null;
                 try {
-                start = dateFormat.parse(dates[0]);
-                end = dateFormat.parse(dates[1]);
+                    start = dateFormat.parse(startDate);
+                    end = dateFormat.parse(endDate);
                 } catch (ParseException e) {
                     throw new RuntimeException(e);
                 }
@@ -145,6 +145,7 @@ public class JgUseRegistrationController extends BaseController {
                 dto.setAuditPassDateStart(start);
                 dto.setAuditPassDateEnd(end);
             }
+        }
         Page<Map<String, Object>> list = jgUseRegistrationServiceImpl.getList(dto, sort, page, dto.getRoleIds(), client);
         list.getRecords().forEach(x -> {
             x.put("companyType", info.getCompany().getCompanyType());

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

@@ -34,6 +34,7 @@ import org.springframework.util.StringUtils;
 import org.springframework.web.multipart.MultipartFile;
 import org.typroject.tyboot.component.emq.EmqKeeper;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.servlet.http.HttpServletResponse;
@@ -414,16 +415,16 @@ public class JgTableDataExportServiceImpl implements IJgTableDataExportService {
      */
     @Override
     public void registration(HttpServletResponse response, JgUseRegistrationDto dto, String client) {
-        if (dto.getAuditPassDateRange() != null && !dto.getAuditPassDateRange().isEmpty() && !dto.getAuditPassDateRange().equals("[, ]")) {
-            String dateRangeStr = dto.getAuditPassDateRange();
-            String[] dates = dateRangeStr.replace("[", "").replace("]", "").split(", ");
-
+        if (dto.getAuditPassDateRange() != null && !dto.getAuditPassDateRange().isEmpty()) {
+            String startDate = dto.getAuditPassDateRange().get(0).substring(1);
+            String endDate = dto.getAuditPassDateRange().get(1).substring(0, dto.getAuditPassDateRange().get(1).length() - 1);
+            if (!ValidationUtil.isEmpty(startDate) && !ValidationUtil.isEmpty(endDate)) {
                 SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
                 Date start = null;
                 Date end = null;
                 try {
-                start = dateFormat.parse(dates[0]);
-                end = dateFormat.parse(dates[1]);
+                    start = dateFormat.parse(startDate);
+                    end = dateFormat.parse(endDate);
                 } catch (ParseException e) {
                     throw new RuntimeException(e);
                 }
@@ -434,6 +435,7 @@ public class JgTableDataExportServiceImpl implements IJgTableDataExportService {
                 dto.setAuditPassDateStart(start);
                 dto.setAuditPassDateEnd(end);
             }
+        }
         List<RegistrationVo> exportData = registrationMapper.queryRegistrationInIds(dto, client);
         for (RegistrationVo vo : exportData) {
             vo.setRegType(RegTypeEnum.getNameByCode(vo.getRegType()).orElse(RegTypeEnum.REGISTRATION_NEW.getName()));

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

@@ -5146,7 +5146,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
     }
 
     public IPage<JSONObject> queryESForPage(ReginParams selectedOrgInfo, String current, String size, String sort, String client, JgUseRegistrationDto dto) {
-        int pageNumber = ObjectUtils.isEmpty(current) ? 1 : Integer.parseInt(current);
+        int pageNumber = ObjectUtils.isEmpty(current) ? 1 : Math.max(Integer.parseInt(current), 1);
         int pageSize = ObjectUtils.isEmpty(size) ? 20 : Integer.parseInt(size);
 
         Page<JSONObject> result = new Page<>(pageNumber, pageSize);
@@ -5182,6 +5182,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
 
         try {
             request.source(builder);
+            log.info("使用登记列表es查询参数：{}", builder);
             response = restHighLevelClient.search(request, RequestOptions.DEFAULT);
 
             result.setTotal(Objects.requireNonNull(response.getHits().getTotalHits()).value);
@@ -5191,6 +5192,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 Map<String, Object> sourceMap = hit.getSourceAsMap();
                 JSONObject x = new JSONObject();
                 for (Map.Entry<String, Object> entry : sourceMap.entrySet()) {
+                    if (!UNDERSCORE_TO_CAMEL.containsKey(entry.getKey())) {
+                        continue;
+                    }
                     x.put(UNDERSCORE_TO_CAMEL.get(entry.getKey()), entry.getValue());
                 }
                 x.put("companyType", selectedOrgInfo.getCompany().getCompanyType());
@@ -5277,7 +5281,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         //  使用登记证号查询
         if (!ValidationUtil.isEmpty(dto.getUseRegistrationCode())) {
             BoolQueryBuilder meBuilder = QueryBuilders.boolQuery();
-            meBuilder.must(QueryBuilders.termQuery("use_registration_code.keyword", dto.getUseRegistrationCode()));
+            meBuilder.must(QueryBuilders.wildcardQuery("use_registration_code.keyword", "*" + dto.getUseRegistrationCode() + "*"));
             boolMust.must(meBuilder);
         }
 
@@ -5296,16 +5300,17 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         }
 
         // 办理日期筛选
-        if (!ValidationUtil.isEmpty(dto.getAuditPassDateRange()) && !dto.getAuditPassDateRange().equals("[, ]")) {
-            String dateRangeStr = dto.getAuditPassDateRange();
-            JSONArray jsonArray = JSONArray.parseArray(dateRangeStr);
-
+        if (!ValidationUtil.isEmpty(dto.getAuditPassDateRange()) && dto.getAuditPassDateRange().size() == 2) {
+            String startDate = dto.getAuditPassDateRange().get(0).substring(1);
+            String endDate = dto.getAuditPassDateRange().get(1).substring(0, dto.getAuditPassDateRange().get(1).length() - 1);
+            if (!ValidationUtil.isEmpty(startDate) && !ValidationUtil.isEmpty(endDate)) {
                 RangeQueryBuilder rangeQuery = QueryBuilders.rangeQuery("audit_pass_date")
-                    .gte(jsonArray.getString(0))
-                    .lte(jsonArray.getString(1))
+                        .gte(startDate)
+                        .lte(endDate)
                         .timeZone("+08:00");// 明确指定时区（东八区）查询
                 boolMust.must(rangeQuery);
             }
+        }
 
         // 创建日期筛选
         if (!ValidationUtil.isEmpty(dto.getApplicationDate())) {
@@ -5330,30 +5335,22 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
 
         // 设备品种筛选
         if (!ValidationUtil.isEmpty(dto.getEquDefine())) {
-            BoolQueryBuilder meBuilder = QueryBuilders.boolQuery();
-            meBuilder.must(QueryBuilders.termQuery("equ_define_code.keyword", dto.getEquDefine()));
-            boolMust.must(meBuilder);
+            boolMust.must(QueryBuilders.termQuery("equ_define_code.keyword", dto.getEquDefine()));
         }
 
         // 设备代码筛选
         if (!ValidationUtil.isEmpty(dto.getEquCode())) {
-            BoolQueryBuilder meBuilder = QueryBuilders.boolQuery();
-            meBuilder.must(QueryBuilders.wildcardQuery("equ_code", "*" + dto.getEquCode() + "*"));
-            boolMust.must(meBuilder);
+            boolMust.must(QueryBuilders.wildcardQuery("equ_code", "*" + dto.getEquCode().toLowerCase() + "*"));
         }
 
         // 设备96333码筛选
         if (!ValidationUtil.isEmpty(dto.getCode96333())) {
-            BoolQueryBuilder meBuilder = QueryBuilders.boolQuery();
-            meBuilder.must(QueryBuilders.wildcardQuery("code96333", "*" + dto.getCode96333() + "*"));
-            boolMust.must(meBuilder);
+            boolMust.must(QueryBuilders.wildcardQuery("code96333.keyword", "*" + dto.getCode96333() + "*"));
         }
 
-        // 设备监管码筛选
+        // 设备监管码筛选（使用supervisory_code_array字段匹配）
         if (!ValidationUtil.isEmpty(dto.getSupervisoryCode())) {
-            BoolQueryBuilder meBuilder = QueryBuilders.boolQuery();
-            meBuilder.must(QueryBuilders.wildcardQuery("supervisory_code", "*" + dto.getSupervisoryCode() + "*"));
-            boolMust.must(meBuilder);
+            boolMust.must(QueryBuilders.termQuery("supervisory_code_array", dto.getSupervisoryCode()));
         }
 
         BoolQueryBuilder meBuilder = QueryBuilders.boolQuery();