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

@@ -219,4 +219,19 @@ public class JgChangeRegistrationUnitDto extends BaseDto {
 
     @ApiModelProperty(value = "属地监管部门")
     private String orgBranchName;
+
+    @ApiModelProperty(value = "设备类别代码")
+    private String equCategoryCode;
+
+    @ApiModelProperty(value = "安全管理员")
+    private String safetyManager;
+
+    @ApiModelProperty(value = "安全管理员电话")
+    private String phone;
+
+    @ApiModelProperty(value = "产权单位seq")
+    private String estateUnitSeq;
+
+    @ApiModelProperty(value = "投用日期")
+    private String useDate;
 }

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

@@ -331,4 +331,34 @@ public class JgChangeRegistrationUnit extends BaseEntity {
      */
     @TableField(value = "org_branch_name")
     private String orgBranchName;
+
+    /**
+     * 设备类别编码
+     */
+    @TableField("equ_category_code")
+    private String equCategoryCode;
+
+    /**
+     * 安全管理员
+     */
+    @TableField("safety_manager")
+    private String safetyManager;
+
+    /**
+     * 安全管理员电话
+     */
+    @TableField("phone")
+    private String phone;
+
+    /**
+     * 产权单位seq
+     */
+    @TableField("estate_unit_seq")
+    private String estateUnitSeq;
+
+    /**
+     * 投用日期
+     */
+    @TableField("use_date")
+    private String useDate;
 }

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

@@ -147,6 +147,7 @@ public interface JgUseRegistrationMapper extends BaseMapper<JgUseRegistration> {
     Page<JgNoticeToBeSubmitDto> queryRegistrationToBeSubmitPage(@Param("page") Page<JgNoticeToBeSubmitDto> page, @Param("companyCode")String companyCode);
 
     List<XianElevatorVo> queryXianElevatorData(@Param("beginDate")String beginDate, @Param("endDate") String endDate);
+
     List<JgUseRegistrationEq> selectListForInstallNoticeDiscard(@Param("records") List<String> records);
 
     List<JgUseRegistrationEq> selectListForSelfDiscard(@Param("records") List<String> records);

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

@@ -50,7 +50,15 @@
             FROM tzs_jg_maintenance_contract_eq ede
                      LEFT JOIN idx_biz_jg_supervision_info si ON si."RECORD" = ede.equ_id
             WHERE ede.equip_transfer_id = tjmc.sequence_nbr
-        ) AS orgBranchCodes
+        ) AS orgBranchCodes,
+        (
+            SELECT mri.ME_MASTER1_PHONE AS phone
+            FROM tzs_jg_maintenance_contract_eq ede
+            LEFT JOIN idx_biz_jg_maintenance_record_info mri
+            ON mri."RECORD" = ede.equ_id
+            WHERE ede.equip_transfer_id = tjmc.sequence_nbr
+            order by mri.REC_DATE limit 1
+        ) AS phone
         FROM
             tzs_jg_maintenance_contract tjmc
     </sql>

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

@@ -662,6 +662,9 @@
             <if test="dto.whetherVehicleCylinder != null and dto.whetherVehicleCylinder == 1 ">
                 AND tjurm.reg_type = '车用气瓶登记'
             </if>
+            <if test="dto.whetherVehicleCylinder != null and dto.whetherVehicleCylinder == 0 ">
+                AND tjurm.reg_type != '车用气瓶登记'
+            </if>
             <if test="dto.isScrap != null and dto.isScrap != ''">
                 and tjurm.is_scrap = #{dto.isScrap}
             </if>

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

@@ -1982,8 +1982,8 @@
             tjur.SUPERVISION_ORG_CODE as supervisionOrgCode,
             ibjui.DATA_SOURCE as dataSource
         FROM
-            tzs_jg_use_registration_eq tjure
-            LEFT JOIN tzs_jg_use_registration tjur ON tjur.sequence_nbr = tjure.equip_transfer_id
+            tzs_jg_use_registration_manage tjurm
+            LEFT JOIN idx_biz_jg_register_info ibjri on ibjri."RECORD" = tjurm.equ_id
             LEFT JOIN idx_biz_jg_use_info ibjui ON tjure.equ_id = ibjui."RECORD"
             LEFT JOIN idx_biz_jg_register_info ibjri on ibjri."RECORD" = tjure.equ_id
             LEFT JOIN idx_biz_jg_factory_info ibjfi on ibjfi."RECORD" = tjure.equ_id

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

@@ -246,12 +246,12 @@ public class IdxBizJqEquipmentRegisterController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/equip/page")
     @ApiOperation(httpMethod = "GET", value = "单位办理设备列表查询", notes = "单位办理设备列表查询")
+    @FieldMapping({@FieldMapping.FieldMap(sourceField = "useUnitSeq", targetField = "useUnitCreditCode", serviceClass = CommonServiceImpl.class, queryMethod = "queryUnitCreditInfoBySeq"),})
     public ResponseModel<Page<JSONObject>> queryEquipPage(@RequestParam Map<String, Object> queryMap) {
         JSONObject jsonObject = new JSONObject(queryMap);
         return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.queryForUnitEquipmentPage(jsonObject));
     }
 
-
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/equipCanUsedByVessel/page")
     @ApiOperation(httpMethod = "GET", value = "查询车用气瓶可进行选择的设备列表", notes = "查询车用气瓶可进行选择的设备列表")

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

@@ -20,7 +20,6 @@ import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
-
 import javax.servlet.http.HttpServletResponse;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -53,7 +52,6 @@ public class JgChangeRegistrationUnitController extends BaseController {
     @ApiOperation(httpMethod = "POST", value = "新增单位变更", notes = "新增单位变更")
     public ResponseModel<String> save(@RequestParam String submitType, @RequestBody JSONObject model) {
         ReginParams reginParams = getSelectedOrgInfo();
-
         jgChangeRegistrationUnitServiceImpl.saveNotice(submitType, model, reginParams);
         return ResponseHelper.buildResponse("");
     }
@@ -115,12 +113,10 @@ public class JgChangeRegistrationUnitController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/details")
     @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个单位变更", notes = "根据sequenceNbr查询单个单位变更")
-    public ResponseModel<Map<String,
-            Map<String, Object>>> selectOne(@RequestParam("sequenceNbr") Long sequenceNbr) {
+    public ResponseModel<Map<String, Map<String, Object>>> selectOne(@RequestParam("sequenceNbr") Long sequenceNbr) {
         return ResponseHelper.buildResponse(jgChangeRegistrationUnitServiceImpl.queryBySequenceNbr(sequenceNbr, getSelectedOrgInfo()));
     }
 
-
     /**
      * 根据sequenceNbr查询详情
      *

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

@@ -23,7 +23,6 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
-
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.Map;
@@ -132,11 +131,11 @@ public class JgChangeVehicleRegistrationUnitController extends BaseController {
 			@RequestParam(value = "useUnitCreditCode", required = false) String useUnitCreditCode,
 			@RequestParam(value = "whetherVehicleCylinder") String whetherVehicleCylinder,
 			@RequestParam(value = "certificateStatus", required = false) String certificateStatus,
+			@RequestParam(value = "equCategoryCode", required = false) String equCategoryCode,
 			@RequestParam(value = "useRegistrationCode", required = false) String useRegistrationCode) {
-		if (ValidationUtil.isEmpty(useUnitCreditCode))
-			throw new BadRequest("请先选择原使用单位");
+		if (ValidationUtil.isEmpty(useUnitCreditCode)) throw new BadRequest("请先选择原使用单位");
 		JgUseRegistrationManageDto dto = new JgUseRegistrationManageDto();
-		Page<JgUseRegistrationManageDto> page = new Page<JgUseRegistrationManageDto>();
+		Page<JgUseRegistrationManageDto> page = new Page<>();
 		page.setCurrent(current);
 		page.setSize(size);
 		if (!ValidationUtil.isEmpty(useUnitCreditCode)){
@@ -149,6 +148,9 @@ public class JgChangeVehicleRegistrationUnitController extends BaseController {
 		if (!ValidationUtil.isEmpty(certificateStatus)){
 			dto.setCertificateStatus(certificateStatus);
 		}
+        if (!ValidationUtil.isEmpty(equCategoryCode)){
+            dto.setEquCategoryCode(equCategoryCode);
+        }
 		if (!ObjectUtils.isEmpty(useRegistrationCode)){
 			dto.setUseRegistrationCode(useRegistrationCode);
 		}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/equip/CommonEquipDataProcessService.java

@@ -824,7 +824,7 @@ public class CommonEquipDataProcessService {
         // 设备来源，前端无法判断，故后端进行判断，分为新设备(new)、历史有证设备(his)、历史无证设备(black)
         result.put("dataSourceClassify", this.genDataSource(useInfo.getDataSource()));
         // 获取已登记设备的登记证对应接收机构
-        if (registerInfo.getUseOrgCode() != null) {
+        if (!ValidationUtil.isEmpty(registerInfo.getUseOrgCode())) {
             JgUseRegistrationManage jgUseRegistrationManage = jgUseRegistrationManageService.lambdaQuery()
                     .eq(JgUseRegistrationManage::getUseRegistrationCode, registerInfo.getUseOrgCode())
                     .select(JgUseRegistrationManage::getSequenceNbr, JgUseRegistrationManage::getReceiveCompanyCode).one();

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

@@ -163,6 +163,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
     public static final String PROJECT_CONTRAPTION = "PROJECT_CONTRAPTION";// 工程装置名称
     public static final String CREATE_DATE_RANGE = "CREATE_DATE_RANGE";// 创建时间范围查询
     public static final String CREATE_DATE = "CREATE_DATE";// 创建时间范围查询
+    public static final String USE_UNIT_CREDIT_CODE = "useUnitCreditCode";// 创建时间范围查询
     /**
      * 业务类型 0：单个新增 1:批量导入
      */
@@ -4075,13 +4076,21 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
 
     @Override
     public Page<JSONObject> queryForUnitEquipmentPage(JSONObject jsonObject) {
-        ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
-        String useUnitCreditCode = reginParams.getCompany().getCompanyCode();
-        // 使用单位为个人时候 特殊处理
-        if (useUnitCreditCode.split("_").length > 1) {
-            useUnitCreditCode = useUnitCreditCode.split("_")[1];
+        String useUnitCreditCode = Objects.toString(jsonObject.get(USE_UNIT_CREDIT_CODE), "");
+        if (ValidationUtil.isEmpty(useUnitCreditCode)) {
+            String redisVal = String.valueOf(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())));
+            if (StringUtils.isNotEmpty(redisVal)) {
+                ReginParams params = JSON.parseObject(redisVal, ReginParams.class);
+                useUnitCreditCode = Optional.ofNullable(params)
+                        .map(ReginParams::getCompany)
+                        .map(CompanyBo::getCompanyCode)
+                        .orElse("");
+                useUnitCreditCode = useUnitCreditCode.contains("_") ? useUnitCreditCode.split("_")[1] : useUnitCreditCode;
+            }
+        } else {
+            useUnitCreditCode = useUnitCreditCode.contains("_") ? useUnitCreditCode.split("_")[0] : useUnitCreditCode;
         }
-        jsonObject.put("useUnitCreditCode", useUnitCreditCode);
+        jsonObject.put(USE_UNIT_CREDIT_CODE, useUnitCreditCode);
         Page<JSONObject> page = new Page<>(jsonObject.getLong("number"), jsonObject.getLong("size"));
         Set<String> records = EquipUsedCheckStrategyContext.getUsedStrategy("useRegistration").getEquipInFlow(useUnitCreditCode);
         String[] recordList = ValidationUtil.isEmpty(records) ? null : records.toArray(new String[records.size()]);

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

@@ -118,45 +118,58 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
      * 分页查询
      */
     public Page<JgMaintenanceContractVo> queryForPage(Page<JgMaintenanceContract> page, String sort, JgMaintenanceContractDto dto, ReginParams reginParams, String client) {
-        if (ObjectUtils.isEmpty(dto)) {
-            dto = new JgMaintenanceContractDto();
-        }
-        Page<JgMaintenanceContractDto> contractList;
-        Page<JgMaintenanceContractVo> result = new Page<>();
-        CompanyBo company = reginParams.getCompany();
-        SortVo sortMap = commonService.sortFieldConversion(sort);
-        Map<String, Object> companyTypeMap = jrmInstallationNoticeService.getCompanyType();
-        String companyLevel = "";
-        String companyType = "";
-        if (companyTypeMap.containsKey("companyLevel")) {
-            companyLevel = companyTypeMap.get("companyLevel").toString();
-        }
-        if (companyTypeMap.containsKey("companyType")) {
-            companyType = companyTypeMap.get("companyType").toString();
-        }
-        if ("supervision".equals(companyLevel)) {
-            // 监管单位查询
-            if (client.equals("jgLook")) {
-                dto.setOrgBranchCode(company.getOrgCode());
-            } else { // 接收机构查询
-                dto.setReceiveOrgCodeFilter(company.getCompanyCode());
+        try {
+            if (ObjectUtils.isEmpty(dto)) {
+                dto = new JgMaintenanceContractDto();
             }
-        } else if ("company".equals(companyLevel)) {
-            if (companyType.contains(CompanyTypeEnum.USE.getCode()) || companyType.contains(CompanyTypeEnum.INDIVIDUAL.getCode())) {
-                // 使用单位用"使用单位统一信用代码"匹配数据
-                dto.setUseUnitCodeFilter(company.getCompanyCode());
-                dto.setRoleIds(null);
+            Page<JgMaintenanceContractDto> contractList;
+            Page<JgMaintenanceContractVo> result = new Page<>();
+            CompanyBo company = reginParams.getCompany();
+            SortVo sortMap = commonService.sortFieldConversion(sort);
+            Map<String, Object> companyTypeMap = jrmInstallationNoticeService.getCompanyType();
+            String companyLevel = "";
+            String companyType = "";
+            if (companyTypeMap.containsKey("companyLevel")) {
+                companyLevel = companyTypeMap.get("companyLevel").toString();
+            }
+            if (companyTypeMap.containsKey("companyType")) {
+                companyType = companyTypeMap.get("companyType").toString();
+            }
+            if ("supervision".equals(companyLevel)) {
+                // 监管单位查询
+                if (client.equals("jgLook")) {
+                    dto.setOrgBranchCode(company.getOrgCode());
+                } else { // 接收机构查询
+                    dto.setReceiveOrgCodeFilter(company.getCompanyCode());
+                }
+            } else if ("company".equals(companyLevel)) {
+                if (companyType.contains(CompanyTypeEnum.USE.getCode()) || companyType.contains(CompanyTypeEnum.INDIVIDUAL.getCode())) {
+                    // 使用单位用"使用单位统一信用代码"匹配数据
+                    dto.setUseUnitCodeFilter(company.getCompanyCode());
+                    dto.setRoleIds(null);
+                }
+                if (companyType.contains(CompanyTypeEnum.CONSTRUCTION.getCode())) {
+                    // 维保单位用"维保单位统一信用代码"匹配数据
+                    dto.setMaintenanceUnitCodeFilter(company.getCompanyCode());
+                }
             }
-            if (companyType.contains(CompanyTypeEnum.CONSTRUCTION.getCode())) {
-                // 维保单位用"维保单位统一信用代码"匹配数据
-                dto.setMaintenanceUnitCodeFilter(company.getCompanyCode());
+            contractList = maintenanceContractMapper.getContractList(page, sortMap, dto, reginParams.getUserModel().getUserId(), client);
+            List<JgMaintenanceContractDto> records = contractList.getRecords().stream().peek(x -> x.setUnitType(company.getCompanyType())).collect(Collectors.toList());
+            contractList.setRecords(records);
+            BeanUtils.copyProperties(contractList, result);
+            return result;
+        } catch (Exception ex) {
+            String msg = ex.getMessage() == null ? "" : ex.getMessage();
+            if (msg.contains("eyibc decrypt error")
+                    || msg.contains("EYIBCException")
+                    || msg.contains("olym jdbc error")
+                    || msg.contains("数据非法")
+                    || msg.contains("Code: 100023:sql parse error")
+                    || msg.contains("decrypt error, code: -65")) {
+                throw new BadRequest("数据完整性被破坏（解密失败），请联系管理员。");
             }
+            throw new BadRequest("系统内部错误，请联系管理员。");
         }
-        contractList = maintenanceContractMapper.getContractList(page, sortMap, dto, reginParams.getUserModel().getUserId(), client);
-        List<JgMaintenanceContractDto> records = contractList.getRecords().stream().peek(x -> x.setUnitType(company.getCompanyType())).collect(Collectors.toList());
-        contractList.setRecords(records);
-        BeanUtils.copyProperties(contractList, result);
-        return result;
     }
 
     /**

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

@@ -330,7 +330,7 @@ public class SafetyProblemTracingServiceImpl extends BaseService<SafetyProblemTr
             log.error("Other表更新失败，设备record：{}，错误原因：{}", records, e.getMessage(), e);
         }
 
-        // 更新ES状态
+        // 更新ES状态（添加异常处理）
         try {
             Iterable<ESEquipmentCategoryDto> esEquipmentIter = esEquipmentCategory.findAllById(records);
             esEquipmentIter.forEach(dto ->

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/ComprehensiveStatisticalAnalysisServiceImpl.java

@@ -322,7 +322,7 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
             }
             // 组装人员过滤条件
             String orgCode = filter.getString("orgCode");
-            personOrgCodeBoolMust(orgCode, boolMust);
+            personOrgCodeBoolMust(orgCode, boolMust, StatisticalAnalysisEnum.person.getCode());
             this.getPersonBoolQueryBuilder(filterParams, boolMust, filterType);
             if ("custom".equals(filterType)) {
                 JSONArray leftGroup = filterParams.getJSONArray("group1");
@@ -403,15 +403,16 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
         return result;
     }
 
-    private void personOrgCodeBoolMust(String orgCode, BoolQueryBuilder boolMust) {
+    private void personOrgCodeBoolMust(String orgCode, BoolQueryBuilder boolMust, String type) {
+        String superviseOrgCodeKey = type.equals(StatisticalAnalysisEnum.person.getCode()) ? "superviseOrgCode" : "superviseOrgCode.keyword";
         String officeRegion = commonMapper.getCompanyCodeByOrgCode(orgCode);
         BoolQueryBuilder queryBuilder1 = QueryBuilders.boolQuery();
         BoolQueryBuilder queryBuilder2 = QueryBuilders.boolQuery();
         EnhancedDynamicQueryBuilder enhancedDynamicQueryBuilder = new EnhancedDynamicQueryBuilder();
-        queryBuilder1.must(QueryBuilders.termQuery("superviseOrgCode", "50"))
+        queryBuilder1.must(QueryBuilders.termQuery(superviseOrgCodeKey, "50"))
                 .must(QueryBuilders.wildcardQuery("officeRegion", "*" + officeRegion + "*"));
-        queryBuilder2.mustNot(QueryBuilders.termQuery("superviseOrgCode", "50"))
-                .must(QueryBuilders.prefixQuery("superviseOrgCode", orgCode));
+        queryBuilder2.mustNot(QueryBuilders.termQuery(superviseOrgCodeKey, "50"))
+                .must(QueryBuilders.prefixQuery(superviseOrgCodeKey, orgCode));
         enhancedDynamicQueryBuilder.add(queryBuilder1, or);
         enhancedDynamicQueryBuilder.add(queryBuilder2, or);
         boolMust.must(enhancedDynamicQueryBuilder.build());
@@ -497,14 +498,18 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
                             boolMust.must(licencesQueryBuilder.build());
                         } else if (k.equals("issueDate")) {
                             JSONArray issueDates = (JSONArray) v;
-                            String startDate = DateUtils.convertDateToString(issueDates.getDate(0), DateUtils.DATE_PATTERN);
-                            String endDate = DateUtils.convertDateToString(issueDates.getDate(1), DateUtils.DATE_PATTERN);
-                            NestedQueryBuilder nestedQuery = QueryBuilders.nestedQuery(
-                                    "licenses",
-                                    QueryBuilders.rangeQuery("licenses." + k).gte(startDate).lte(endDate),
-                                    ScoreMode.None
-                            );
-                            boolMust.filter(nestedQuery);
+                            Date startDate = issueDates.getDate(0);
+                            Date endDate = issueDates.getDate(1);
+                            if (!"".equals(startDate) && !"".equals(endDate) && !ObjectUtils.isEmpty(startDate) && !ObjectUtils.isEmpty(endDate)) {
+                                String startDateString = DateUtils.convertDateToString(startDate, DateUtils.DATE_PATTERN);
+                                String endDateString = DateUtils.convertDateToString(endDate, DateUtils.DATE_PATTERN);
+                                NestedQueryBuilder nestedQuery = QueryBuilders.nestedQuery(
+                                        "licenses",
+                                        QueryBuilders.rangeQuery("licenses." + k).gte(startDateString).lte(endDateString),
+                                        ScoreMode.None
+                                );
+                                boolMust.filter(nestedQuery);
+                            }
                         }
                     }
                 } else if (v instanceof String) {
@@ -570,7 +575,7 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
         BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
 
         String orgCode = filter.getString("orgCode");
-        boolMust.must(QueryBuilders.prefixQuery("superviseOrgCode.keyword", orgCode));
+        personOrgCodeBoolMust(orgCode, boolMust, StatisticalAnalysisEnum.company.getCode());
 
         JSONObject filterParams = JSONObject.parseObject(JSONObject.toJSONString(filter.get("filterParams")));
         String filterType = filter.getString("filterType");
@@ -1152,7 +1157,7 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
                                 JSONArray dates = (JSONArray) v;
                                 String startDate = dates.getString(0);
                                 String endDate = dates.getString(1);
-                                if (!"".equals(startDate) && !"".equals(endDate)) {
+                                if (!"".equals(startDate) && !"".equals(endDate) && !ObjectUtils.isEmpty(startDate) && !ObjectUtils.isEmpty(endDate)) {
                                     boolMust.filter(QueryBuilders.rangeQuery(field).gte(startDate).lte(endDate));
                                 }
                             } else if (k.equals("EQU_LIST") || k.equals("EQU_CATEGORY") || k.equals("EQU_DEFINE") || k.equals("DATA_QUALITY_SCORE")) {
@@ -3142,16 +3147,16 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
             boolMust.must(QueryBuilders.prefixQuery("ORG_BRANCH_CODE", orgCode));
             data = queryDpEquipStatistics(filter, request, builder, boolMust, tabTotalMap);
         } else if (StatisticalAnalysisEnum.company.getCode().equals(businessType)) {
-            boolMust.must(QueryBuilders.prefixQuery("superviseOrgCode.keyword", orgCode));
+            personOrgCodeBoolMust(orgCode, boolMust,StatisticalAnalysisEnum.company.getCode());
             data = queryDpCompanyStatistics(filter, request, builder, boolMust, tabTotalMap);
         } else if (StatisticalAnalysisEnum.person.getCode().equals(businessType)) {
-            personOrgCodeBoolMust(orgCode, boolMust);
+            personOrgCodeBoolMust(orgCode, boolMust,StatisticalAnalysisEnum.person.getCode());
             data = queryDpPersonStatistics(filter, request, builder, boolMust, tabTotalMap);
         } else if (StatisticalAnalysisEnum.inspectionCompany.getCode().equals(businessType)) {
-            boolMust.must(QueryBuilders.prefixQuery("superviseOrgCode.keyword", orgCode));
+            personOrgCodeBoolMust(orgCode, boolMust,StatisticalAnalysisEnum.company.getCode());
             data = queryDpInspectionCompanyStatistics(filter, request, builder, boolMust, tabTotalMap);
         } else {
-            personOrgCodeBoolMust(orgCode, boolMust);
+            personOrgCodeBoolMust(orgCode, boolMust,StatisticalAnalysisEnum.person.getCode());
             data = queryDpInspectionPersonStatistics(filter, request, builder, boolMust, tabTotalMap);
         }
 
@@ -3256,7 +3261,7 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
         companyBoolMust.must(companyUnitTypeBoolMust);
 
         BoolQueryBuilder personBoolMust = QueryBuilders.boolQuery();
-        personOrgCodeBoolMust(orgCode, personBoolMust);
+        personOrgCodeBoolMust(orgCode, personBoolMust, StatisticalAnalysisEnum.person.getCode());
         personBoolMust.must(companyUnitTypeBoolMust);
 
         BoolQueryBuilder inspectionCompanyBoolMust = QueryBuilders.boolQuery();
@@ -3266,7 +3271,7 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
 
 
         BoolQueryBuilder inspectionPersonBoolMust = QueryBuilders.boolQuery();
-        personOrgCodeBoolMust(orgCode, inspectionPersonBoolMust);
+        personOrgCodeBoolMust(orgCode, personBoolMust, StatisticalAnalysisEnum.person.getCode());
         inspectionPersonBoolMust.must(inspectionUnitTypeBoolMust);
         inspectionPersonBoolMust.mustNot(QueryBuilders.wildcardQuery("unitType.keyword", "*检验检测机构*"));
 
@@ -4034,7 +4039,7 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
         JSONObject filterParams = JSONObject.parseObject(JSONObject.toJSONString(filter.get("filterParams")));
         String filterType = "advanced";
         // 组装人员过滤条件
-        personOrgCodeBoolMust(orgCode, boolQuery);
+        personOrgCodeBoolMust(orgCode, boolQuery, StatisticalAnalysisEnum.person.getCode());
         this.getPersonBoolQueryBuilder(filterParams, boolQuery, filterType);
         // 查询
         JSONObject expiryDateStatus = this.getExpiryDateStatusGroupStatistics(boolQuery);

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/service/impl/TzBaseEnterpriseInfoServiceImpl.java

@@ -232,12 +232,18 @@ public class TzBaseEnterpriseInfoServiceImpl
 //				}
 //			}
 			SortVo sortMap = userInfoService.sortFieldConversion(sort);
+			// 密评专用（查tz_flc_reg_unit_info表中的admin_login_pwd字段，以用于验证密评数据完整性）
+
+			List<RegUnitInfo> regUnitInfoList = regUnitInfoService.lambdaQuery().select(RegUnitInfo::getUnitCode, RegUnitInfo::getAdminLoginPwd)
+					.eq(RegUnitInfo::getName, tzBaseEnterpriseInfoDto.getUseUnit()).list();
+			regUnitInfoList.forEach(info -> System.out.println("unitCode=" + info.getUnitCode() + ", adminLoginPwd=" + info.getAdminLoginPwd()));
 			return this.baseMapper.pageList(page, tzBaseEnterpriseInfoDto, orgCode, sortMap, officeRegion);
 		} catch (Exception ex) {
 			String msg = ex.getMessage() == null ? "" : ex.getMessage();
 			if (msg.contains("eyibc decrypt error")
 					|| msg.contains("EYIBCException")
 					|| msg.contains("olym jdbc error")
+					|| msg.contains("100022:")
 					|| msg.contains("数据非法")
 					|| msg.contains("decrypt error, code: -65")) {
 				throw new BadRequest("数据完整性被破坏（解密失败），请联系管理员。");