Merge branch 'refs/heads/develop_tzs_bugfix' into develop_tzs_register

amos-boot-biz-common/pom.xml

@@ -128,7 +128,7 @@
         <dependency>
             <groupId>cn.com.vastdata</groupId>
             <artifactId>vastbase-jdbc</artifactId>
-            <version>2.10p</version>
+            <version>2.12p</version>
         </dependency>
         <dependency>
             <groupId>com.olym</groupId>

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/DPFilterParamForDetailDto.java

@@ -70,6 +70,11 @@ public class DPFilterParamForDetailDto {
     private String superviseUnitName;
 
     /**
+     * 监管单位名称（接收单位/管辖机构）
+     */
+    private String orgBranchCode;
+
+    /**
      * 企业单位名称（发起单位/使用单位）
      */
     private String companyName;

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/CustomBaseMapper.java

+package com.yeejoin.amos.boot.module.common.api.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
+
+/**
+ * @author LiuLin
+ */
+public interface CustomBaseMapper<T> extends BaseMapper<T> {
+    Integer insertBatchSomeColumn(List<T> entityList);
+    /**
+     * 分批批量插入
+     * @param entityList 数据集合
+     * @param batchSize 每批数量
+     * @return 插入总条数
+     */
+    default int insertBatchSomeColumn(List<T> entityList, int batchSize) {
+        if (entityList == null || entityList.isEmpty()) {
+            return 0;
+        }
+        int total = 0;
+        for (int i = 0; i < entityList.size(); i += batchSize) {
+            int endIndex = Math.min(i + batchSize, entityList.size());
+            List<T> subList = entityList.subList(i, endIndex);
+            total += insertBatchSomeColumn(subList);
+        }
+        return total;
+    }
+}

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

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.jg.api.dto;
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.format.DateTimeFormat;
+import com.alibaba.fastjson.annotation.JSONField;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import com.yeejoin.amos.boot.module.jg.api.converter.*;
 import io.swagger.annotations.ApiModel;
@@ -284,5 +285,5 @@ public class EquipInfoCylinderExcelDto extends BaseDto {
     private String informationManageCode;
 
     @ExcelIgnore
-    private List fileData;
+    private List<?> fileData;
 }
\ No newline at end of file

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

-package com.yeejoin.amos.boot.module.jg.api.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * @author DELL
- */
-public interface CustomBaseMapper<T> extends BaseMapper<T> {
-    Integer insertBatchSomeColumn(List<T> entityList);
-}

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

 package com.yeejoin.amos.boot.module.jg.api.mapper;
 
+import com.yeejoin.amos.boot.module.common.api.mapper.CustomBaseMapper;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationUnitEq;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Update;
 

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

 package com.yeejoin.amos.boot.module.jg.api.mapper;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.common.api.mapper.CustomBaseMapper;
 import com.yeejoin.amos.boot.module.jg.api.dto.CompanyEquipCountDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationUnitDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationUnit;

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

 package com.yeejoin.amos.boot.module.jg.api.mapper;
 
+import com.yeejoin.amos.boot.module.common.api.mapper.CustomBaseMapper;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgEquipTransferEq;
 
 /**

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

 package com.yeejoin.amos.boot.module.jg.api.mapper;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.common.api.mapper.CustomBaseMapper;
 import com.yeejoin.amos.boot.module.jg.api.dto.CompanyEquipCountDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgEquipTransferDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgEquipTransfer;

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

 package com.yeejoin.amos.boot.module.jg.api.mapper;
 
 
+import com.yeejoin.amos.boot.module.common.api.mapper.CustomBaseMapper;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgInstallationNoticeEqDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.PieLineEquipContraptionDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgInstallationNoticeEq;

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

 package com.yeejoin.amos.boot.module.jg.api.mapper;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.common.api.mapper.CustomBaseMapper;
 import com.yeejoin.amos.boot.module.jg.api.dto.CompanyEquipCountDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgInstallationNoticeDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgNoticeToBeSubmitDto;

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

 package com.yeejoin.amos.boot.module.jg.api.mapper;
 
+import com.yeejoin.amos.boot.module.common.api.mapper.CustomBaseMapper;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintainNoticeEq;
 
 /**

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

 package com.yeejoin.amos.boot.module.jg.api.mapper;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.common.api.mapper.CustomBaseMapper;
 import com.yeejoin.amos.boot.module.jg.api.dto.CompanyEquipCountDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgMaintainNoticeDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintainNotice;

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

 package com.yeejoin.amos.boot.module.jg.api.mapper;
 
+import com.yeejoin.amos.boot.module.common.api.mapper.CustomBaseMapper;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintenanceContractEq;
 import org.apache.ibatis.annotations.Param;
 

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

 package com.yeejoin.amos.boot.module.jg.api.mapper;
 
+import com.yeejoin.amos.boot.module.common.api.mapper.CustomBaseMapper;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgReformNoticeEq;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 

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

 package com.yeejoin.amos.boot.module.jg.api.mapper;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.common.api.mapper.CustomBaseMapper;
 import com.yeejoin.amos.boot.module.jg.api.dto.CompanyEquipCountDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgReformNoticeDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgReformNotice;

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

 package com.yeejoin.amos.boot.module.jg.api.mapper;
 
+import com.yeejoin.amos.boot.module.common.api.mapper.CustomBaseMapper;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgTransferNoticeEq;
 
 /**

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

 package com.yeejoin.amos.boot.module.jg.api.mapper;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.common.api.mapper.CustomBaseMapper;
 import com.yeejoin.amos.boot.module.jg.api.dto.CompanyEquipCountDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgTransferNoticeDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgTransferNotice;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/pom.xml

@@ -53,7 +53,7 @@
         <dependency>
             <groupId>cn.com.vastdata</groupId>
             <artifactId>vastbase-jdbc</artifactId>
-            <version>2.10p</version>
+            <version>2.12p</version>
         </dependency>
         <dependency>
             <groupId>io.seata</groupId>

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

@@ -285,7 +285,6 @@ public class IdxBizJqEquipmentRegisterController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/importData")
     @ApiOperation(httpMethod = "POST", value = "气瓶批量导入", notes = "气瓶批量导入")
-    @RestEventTrigger(value = "operateLogRestEventHandler")
     public ResponseModel<?> importPressureData(@RequestPart("file") MultipartFile multipartFile) throws Exception {
         return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.importPressureData(multipartFile));
     }

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

@@ -60,9 +60,10 @@ public class SingleProjectEquipChangeProcess implements IEquipChangeDataProcessS
         List<FieldChangeMeta> allChangeColumns = new ArrayList<>();
         List<PipelineChangeItemDto> items = insertOrEditPieLines.toJavaList(PipelineChangeItemDto.class);
         // 1.设备技术参数入库前校验，约束：同一个装置下的管道编号不能重复
-        if (items.size() != items.stream().map(TechParamsPipelineChangeFieldDto::getPipelineNumber).distinct().count()) {
-            throw new BadRequest("同一工程装置下管道编号不能重复！");
-        }
+        // 同一工程装置下管道编号不能重复校验
+//        if (items.size() != items.stream().map(TechParamsPipelineChangeFieldDto::getPipelineNumber).distinct().count()) {
+//            throw new BadRequest("同一工程装置下管道编号不能重复！");
+//        }
         List<PipelineChangeItemDto> newPipelines = new ArrayList<>();
         List<PipelineChangeItemDto> updatePipelines = new ArrayList<>();
         List<PipelineChangeItemDto> deletePipelines = new ArrayList<>();

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

@@ -53,9 +53,9 @@ import com.yeejoin.amos.boot.module.ymt.api.mapper.*;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Value;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -63,6 +63,7 @@ import org.springframework.util.ObjectUtils;
 import org.springframework.util.StopWatch;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+
 import java.lang.reflect.Method;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
@@ -75,6 +76,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Function;
 import java.util.stream.Collectors;
+
 import static com.alibaba.fastjson.JSON.toJSONString;
 import static com.yeejoin.amos.boot.module.jg.biz.service.impl.JgInstallationNoticeServiceImpl.CONSTRUCTION_TYPE;
 import static com.yeejoin.amos.boot.module.jg.biz.service.impl.JgInstallationNoticeServiceImpl.CONSTRUCTION_TYPE_NAME;
@@ -1536,7 +1538,6 @@ public class DataHandlerServiceImpl {
             return license;
         }).collect(Collectors.toList());
     }
-
     public Integer initEquipStatistData2EsBatch() {
         log.info("综合统计设备信息入库开始");
         StopWatch watch = new StopWatch();

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

@@ -1524,11 +1524,12 @@ public class EquipClaimServiceImpl {
         CompanyBo company = getSelectedOrgInfo().getCompany();
 
         // 管道校验
+        //同一工程装置下管道编号不能重复校验
         List<Map<String, Object>> pipelineList = (List<Map<String, Object>>) equipInfo.get(PIPELINE_LIST);
-        if (CollectionUtils.isEmpty(pipelineList) || pipelineList.size() != pipelineList.stream()
-                .map(v -> (String) v.get("pipelineNumber")).distinct().count()) {
-            throw new BadRequest(CollectionUtils.isEmpty(pipelineList) ? "请填写管道信息!" : "同一工程装置下管道编号不能重复！");
-        }
+//        if (CollectionUtils.isEmpty(pipelineList) || pipelineList.size() != pipelineList.stream()
+//                .map(v -> (String) v.get("pipelineNumber")).distinct().count()) {
+//            throw new BadRequest(CollectionUtils.isEmpty(pipelineList) ? "请填写管道信息!" : "同一工程装置下管道编号不能重复！");
+//        }
         // 需要融合的判断融合后的管道编号是否重复
         String proConNo = equipInfo.getString(PROJECT_CONTRAPTION_NO);
         IdxBizJgProjectContraption oldProCon = idxBizJgProjectContraptionService.getBaseMapper().selectOne(new LambdaQueryWrapper<IdxBizJgProjectContraption>()

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

@@ -251,7 +251,8 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
             String equSeq = !EquipmentClassifityEnum.YLGD.getCode().equals(notice.getEquListCode()) ? SEQUENCE_NBR : RECORD;
             List<Map<String, Object>> deviceList = noticeDto.getDeviceList();
             // 管道校验管道编号不重复
-            this.verifyThatThePipeNumberIsUnique(notice.getEquListCode(), deviceList);
+            //去掉同一工程装置下管道编号不能重复校验
+            //this.verifyThatThePipeNumberIsUnique(notice.getEquListCode(), deviceList);
             List<String> records = Optional.ofNullable(deviceList)
                     .orElse(Collections.emptyList())
                     .stream()
@@ -504,7 +505,8 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
             String equSeq = !EquipmentClassifityEnum.YLGD.getCode().equals(equListCode) ? SEQUENCE_NBR : RECORD;
 
             // 管道校验管道编号不重复
-            this.verifyThatThePipeNumberIsUnique(equListCode, deviceList);
+            //去掉同一工程装置下管道编号不能重复校验
+            //this.verifyThatThePipeNumberIsUnique(equListCode, deviceList);
             // 提交时对设备状态进行校验（处理并发问题，一个未被使用的设备同时被多个使用这打开，同时提交发起申请） todo 回滚异常未写
             if (SUBMIT_TYPE_FLOW.equals(submitType)) {
                 if (CollectionUtils.isEmpty(deviceList)) {

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

@@ -968,6 +968,14 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                         map.put("safetyManagerId", data[0]);
                         map.put("safetyManagerName", data[1]);
                     });
+            // 使用单位Code
+            Optional.ofNullable(map.getString("useUnitCreditCode"))
+                    .filter(unitCode -> unitCode.contains("_"))
+                    .map(unitCode -> unitCode.split("_"))
+                    .ifPresent(unitCode -> {
+                        map.put("useUnitCreditCode", unitCode[0]);
+                        map.put("useUnitName", unitCode[1]);
+                    });
 
             // 其他附件
             if (!ObjectUtils.isEmpty(map.get("otherAccessories"))) {
@@ -1322,6 +1330,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 jgProjectContraption.setUseRegistrationCode(jgUseRegistration.getUseRegistrationCode());
                 jgProjectContraption.setUscUnitCreditCode("");
                 jgProjectContraption.setUscUnitName("");
+                jgProjectContraption.setRecUserId(jgUseRegistration.getCreateUserId());
                 jgProjectContraptionService.updateById(jgProjectContraption);
             }
             // 取第一条设备的注册消息--用来获取这一批设备的设备种类/类别/品种
@@ -1586,6 +1595,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             JgUseRegistrationManage jgUseRegistrationManage = new JgUseRegistrationManage();
             jgUseRegistrationManage.setAuditPassDate(jgUseRegistration.getAuditPassDate());
             jgUseRegistrationManage.setSequenceNbr(useRegistrationManageSeq);
+            jgUseRegistrationManage.setRecUserId(jgUseRegistration.getCreateUserId());
             this.setSuperviseOrgInfo(jgUseRegistrationManage, jgUseRegistration);
             jgUseRegistrationManageMapper.updateById(jgUseRegistrationManage);
             return;

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

@@ -311,23 +311,27 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
             filterParams = JSONObject.parseObject(JSONObject.toJSONString(filter.get("filterParams")));
             // 组装人员过滤条件
             this.getPersonBoolQueryBuilder(filterParams, boolMust, filterType);
-            // 资质判断
-            if (filterParams.containsKey("expiryDate")) {
-                Object permitStatus = filterParams.get("expiryDate");
-                if (permitStatus instanceof JSONArray) {
-                    JSONArray jsonArray = (JSONArray) permitStatus;
-                    if (!ObjectUtils.isEmpty(jsonArray) && !jsonArray.contains("all") && jsonArray.size() == 1) {
-                        licensesStatusStr = jsonArray.get(0).toString();
+            if ("custom".equals(filterType)) {
+                JSONArray leftGroup = filterParams.getJSONArray("group1");
+                JSONArray rightGroup = filterParams.getJSONArray("group2");
+                licensesStatusStr = getFilterPermitStatusOrLicensesStatus(leftGroup, rightGroup, StatisticalAnalysisEnum.person.getCode());
+            } else {
+                // 资质判断
+                if (filterParams.containsKey("expiryDate")) {
+                    Object permitStatus = filterParams.get("expiryDate");
+                    if (permitStatus instanceof JSONArray) {
+                        JSONArray jsonArray = (JSONArray) permitStatus;
+                        if (!ObjectUtils.isEmpty(jsonArray) && !jsonArray.contains("all") && jsonArray.size() == 1) {
+                            licensesStatusStr = jsonArray.get(0).toString();
+                        }
                     }
                 }
+                if (filterParams.containsKey("certNo") && filterParams.getJSONArray("certNo").size() == 1 && "0".equals(filterParams.getJSONArray("certNo").get(0).toString())) {
+                    licensesStatusStr = noLicenseReq;
+                }
             }
         }
 
-        if ("custom".equals(filterType)) {
-            JSONArray leftGroup = filterParams.getJSONArray("group1");
-            JSONArray rightGroup = filterParams.getJSONArray("group2");
-            licensesStatusStr = getFilterPermitStatusOrLicensesStatus(leftGroup, rightGroup, StatisticalAnalysisEnum.person.getCode());
-        }
         // 组装人员排序条件
         this.getPersonBoolQuerySort(filter, builder);
 
@@ -808,6 +812,12 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
 
     private String getFilterPermitStatusOrLicensesStatus(JSONArray leftGroup, JSONArray rightGroup, String code) {
         String filed = code.equals(StatisticalAnalysisEnum.company.getCode()) ? "permitStatus" : "expiryDate";
+        List<Object> LeftNoLicenseList = leftGroup.stream().filter(e->"certNo".equals(((JSONObject) e).getString("field")) && ((JSONObject) e).containsKey("value") && ((JSONObject) e).getString("value").equals("0") && ((JSONObject) e).containsKey("itemCondition") && !((JSONObject) e).getString("itemCondition").equals("notIn") ).collect(Collectors.toList());
+        List<Object> rightNoLicenseList = rightGroup.stream().filter(e->"certNo".equals(((JSONObject) e).getString("field")) && ((JSONObject) e).containsKey("value") && ((JSONObject) e).getString("value").equals("0") && ((JSONObject) e).containsKey("itemCondition") && !((JSONObject) e).getString("itemCondition").equals("notIn") ).collect(Collectors.toList());
+        Boolean noLicense = false;
+        if (LeftNoLicenseList.size() > 0 || rightNoLicenseList.size() > 0) {
+            noLicense = true;
+        }
         List<Object> leftPermitList = leftGroup.stream().filter(e -> filed.equals(((JSONObject) e).getString("field")) && ((JSONObject) e).containsKey("value") && ((JSONObject) e).containsKey("itemCondition") && !((JSONObject) e).getString("itemCondition").equals("notIn")).collect(Collectors.toList());
         List<Object> rightPermitList = rightGroup.stream().filter(e -> filed.equals(((JSONObject) e).getString("field")) && ((JSONObject) e).containsKey("value") && ((JSONObject) e).containsKey("itemCondition") && !((JSONObject) e).getString("itemCondition").equals("notIn")).collect(Collectors.toList());
         int count = 0;
@@ -822,9 +832,9 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
             isRight = true;
         }
         String statusStr = "";
-        if (count == 1 && isLeft) {
+        if (count == 1 && isLeft && !noLicense) {
             statusStr = ((JSONObject) leftPermitList.get(0)).getString("value");
-        } else if (count == 1 && isRight) {
+        } else if (count == 1 && isRight && !noLicense) {
             statusStr = ((JSONObject) rightPermitList.get(0)).getString("value");
         }
         return statusStr;
@@ -1577,6 +1587,10 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
         for (int i = 0; i < group.size(); i++) {
             JSONObject itemObj = group.getJSONObject(i);
             String andOr = i == 0 ? null : itemObj.getString("andOr");
+            if (group.size() > 1 && i == 0) {
+                JSONObject nextItemObj = group.getJSONObject(i + 1);
+                andOr =  nextItemObj.getString("andOr").equals(or) ? or : and;
+            }
             String field = itemObj.getString("field");
             String itemCondition = itemObj.getString("itemCondition");
             Object value = itemObj.get("value");
@@ -1754,17 +1768,23 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
                         QueryBuilders.boolQuery().filter(QueryBuilders.rangeQuery(nestedField).lte(LocalDate.now().plusDays(30).format(formatter)).gte(LocalDate.now().format(formatter))),
                         ScoreMode.None
                 );
+                NestedQueryBuilder nestedQuery = QueryBuilders.nestedQuery(
+                        path,
+                        existsQuery(nestedField),
+                        ScoreMode.None
+                );
+                builder.add(nestedQuery, and);
                 if (value.equals(overdue)) {
                     if (itemCondition.equals("eq") || itemCondition.equals("in")) {
                         builder.add(QueryBuilders.boolQuery().must(overdueNestedQuery), isOr);
                     } else {
                         EnhancedDynamicQueryBuilder builders = new EnhancedDynamicQueryBuilder();
-                        NestedQueryBuilder nestedQuery = QueryBuilders.nestedQuery(
+                        NestedQueryBuilder otherQuery = QueryBuilders.nestedQuery(
                                 path,
                                 QueryBuilders.boolQuery().filter(QueryBuilders.rangeQuery(nestedField).gte(LocalDate.now().format(formatter))),
                                 ScoreMode.None
                         );
-                        builders.add(QueryBuilders.boolQuery().must(nestedQuery), or);
+                        builders.add(QueryBuilders.boolQuery().must(otherQuery), or);
                         builders.add(QueryBuilders.boolQuery().must(noneQuery), or);
                         builders.add(QueryBuilders.boolQuery().mustNot(overdueNestedQuery), and);
                         builder.add(builders.build(), isOr);
@@ -1785,12 +1805,12 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
                         builder.add(normalNestedQuery, isOr);
                     } else {
                         EnhancedDynamicQueryBuilder builders = new EnhancedDynamicQueryBuilder();
-                        NestedQueryBuilder nestedQuery = QueryBuilders.nestedQuery(
+                        NestedQueryBuilder otherQuery = QueryBuilders.nestedQuery(
                                 path,
                                 QueryBuilders.boolQuery().filter(QueryBuilders.rangeQuery(nestedField).lte(LocalDate.now().plusDays(30).format(formatter))),
                                 ScoreMode.None
                         );
-                        builders.add(QueryBuilders.boolQuery().must(nestedQuery), or);
+                        builders.add(QueryBuilders.boolQuery().must(otherQuery), or);
                         builders.add(QueryBuilders.boolQuery().must(noneQuery), or);
                         builders.add(QueryBuilders.boolQuery().mustNot(normalNestedQuery), and);
                         builder.add(builders.build(), isOr);

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

@@ -14,7 +14,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.lucene.queryparser.classic.QueryParser;
 import org.elasticsearch.action.search.SearchRequest;
 import org.elasticsearch.action.search.SearchResponse;
-import org.elasticsearch.action.search.ShardSearchFailure;
 import org.elasticsearch.client.RequestOptions;
 import org.elasticsearch.client.RestHighLevelClient;
 import org.elasticsearch.client.core.CountRequest;
@@ -28,13 +27,14 @@ import org.springframework.data.domain.PageRequest;
 import org.springframework.data.elasticsearch.core.query.NativeSearchQuery;
 import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder;
 import org.springframework.stereotype.Service;
-import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 
 import javax.annotation.Resource;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -51,6 +51,8 @@ public class EquipmentStaticsServiceImpl {
     private static final String EQUSTATE = "EQU_STATE";
     private static final String SUPERVISORYCODE = "SUPERVISORY_CODE";
 
+    DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+
     @Resource
     private SafetyProblemTracingMapper safetyProblemTracingMapper;
 
@@ -297,15 +299,21 @@ public class EquipmentStaticsServiceImpl {
     public Page<Map<String, Object>> normalPage(Integer current, Integer size, DPFilterParamForDetailDto dpFilterParamForDetailDto) {
 
         String orgCode = stCommonService.getAndSetOrgCode(dpFilterParamForDetailDto.getCityCode());
+        if(dpFilterParamForDetailDto.getOrgBranchCode() != null){
+            if(dpFilterParamForDetailDto.getOrgBranchCode().contains("_")){
+                String code = dpFilterParamForDetailDto.getOrgBranchCode().split("_")[0];
+                orgCode = stCommonService.getAndSetOrgCode(code);
+            }
+        }
         if(StringUtils.isEmpty(orgCode)){
             return new Page<>(current,size);
         }
         SearchRequest request = new SearchRequest();
-        request.indices("idx_biz_view_jg_all");
+        request.indices("idx_biz_equipment_info");
         SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
         BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
         // 按照管辖机构区域信息模糊查询
-        boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
+        boolMust.must(QueryBuilders.prefixQuery("ORG_BRANCH_CODE", orgCode ));
 
         if (StringUtils.isNotEmpty(dpFilterParamForDetailDto.getTreeValue())) {
             if ("2300".equals(dpFilterParamForDetailDto.getTreeValue())){
@@ -315,30 +323,22 @@ public class EquipmentStaticsServiceImpl {
             }
         }
         // 且8大类，目的去掉脏数据
-        boolMust.must(QueryBuilders.termsQuery("EQU_LIST_CODE", StCommonServiceImpl.getEquipmentCategory().stream().map(EquipmentCategoryDto::getCode).collect(Collectors.toList())));
+//        boolMust.must(QueryBuilders.termsQuery("EQU_LIST_CODE", StCommonServiceImpl.getEquipmentCategory().stream().map(EquipmentCategoryDto::getCode).collect(Collectors.toList())));
         String[] status = {"草稿","已拒领","待认领"};
         boolMust.mustNot(QueryBuilders.termsQuery("STATUS",Arrays.asList(status)));
         //检验状态0临期1超期
-        if(StringUtils.isNotEmpty(dpFilterParamForDetailDto.getInspectionStatus())){
-            if(StringUtils.equals("0",dpFilterParamForDetailDto.getInspectionStatus())){
-                // 且下次检验日期大于等于当天 且查询 下次检验日期 <= 当前天+30天 即为临期
-                long currentDayTime = DateUtil.parse(DateUtil.today(), "yyy-MM-dd").getTime();
-                long currentDayAfter30DayTime = DateUtil.offsetDay(DateUtil.parse(DateUtil.today(), "yyy-MM-dd"), 30).getTime();
-                boolMust.must(QueryBuilders.rangeQuery("NEXT_INSPECT_DATE").gte(currentDayTime).lte(currentDayAfter30DayTime));
-            }else{
-                // 查询下次检验日期小于当前天的设备，即为超期检验超期设备
-                List<String> typeList = new ArrayList<>();
-                typeList.add("维保超期");
-                typeList.add("检验超期");
-                List<String> sourceIds = safetyProblemTracingMapper.getSourceId(orgCode,typeList);
-                boolMust.must(QueryBuilders.termsQuery("SEQUENCE_NBR.keyword",sourceIds));
+        if (StringUtils.isNotEmpty(dpFilterParamForDetailDto.getInspectionStatus())) {
+            if (StringUtils.equals("0", dpFilterParamForDetailDto.getInspectionStatus())) {
+                boolMust.filter(QueryBuilders.rangeQuery("NEXT_INSPECT_DATE").gte(LocalDate.now().format(formatter)).lte(LocalDate.now().plusDays(30).format(formatter)));
+            } else {
+                boolMust.filter(QueryBuilders.rangeQuery("NEXT_INSPECT_DATE").lt(LocalDate.now().format(formatter)));
             }
         }
         /**
          * 使用单位
          */
         if(StringUtils.isNotEmpty(dpFilterParamForDetailDto.getUseUnitName())){
-            boolMust.must(QueryBuilders.matchPhraseQuery("USE_UNIT_NAME", "*" + dpFilterParamForDetailDto.getUseUnitName() + "*"));
+            boolMust.must(QueryBuilders.wildcardQuery("USE_UNIT_NAME", "*" + dpFilterParamForDetailDto.getUseUnitName() + "*"));
         }
         /**
          * 使用登记编号
@@ -350,50 +350,51 @@ public class EquipmentStaticsServiceImpl {
          * 96333
          */
         if(StringUtils.isNotEmpty(dpFilterParamForDetailDto.getCode96333())){
-            boolMust.must(QueryBuilders.matchPhraseQuery("CODE96333", "*" + dpFilterParamForDetailDto.getCode96333() + "*"));
+            boolMust.must(QueryBuilders.wildcardQuery("CODE96333", "*" + dpFilterParamForDetailDto.getCode96333() + "*"));
         }
         /**
          * 监管码
          */
         if(StringUtils.isNotEmpty(dpFilterParamForDetailDto.getSupervisoryCode())){
-            boolMust.must(QueryBuilders.matchPhraseQuery("SUPERVISORY_CODE", "*" + dpFilterParamForDetailDto.getSupervisoryCode() + "*"));
+            boolMust.must(QueryBuilders.wildcardQuery("SUPERVISORY_CODE", "*" + dpFilterParamForDetailDto.getSupervisoryCode() + "*"));
         }
         /**
          * 所属地区
          */
         if(StringUtils.isNotEmpty(dpFilterParamForDetailDto.getUsePlace())){
-            boolMust.must(QueryBuilders.matchPhraseQuery("USE_PLACE", "*" + dpFilterParamForDetailDto.getUsePlace() + "*"));
+            boolMust.must(QueryBuilders.wildcardQuery("USE_PLACE", "*" + dpFilterParamForDetailDto.getUsePlace() + "*"));
         }
         /**
          * 设备状态
          */
         if(StringUtils.isNotEmpty(dpFilterParamForDetailDto.getEquState())){
-            boolMust.must(QueryBuilders.matchPhraseQuery("EQU_STATE", dpFilterParamForDetailDto.getEquState()));
+            boolMust.must(QueryBuilders.matchPhraseQuery("EQU_STATE", EquimentEnum.getCode.get(dpFilterParamForDetailDto.getEquState())));
         }
         /**
          * 信息化
          */
         if(StringUtils.isNotEmpty(dpFilterParamForDetailDto.getInformationSituation())){
-            boolMust.must(QueryBuilders.matchPhraseQuery("INFORMATION_SITUATION","*" + dpFilterParamForDetailDto.getInformationSituation() + "*"));
+            boolMust.must(QueryBuilders.matchQuery("INFORMATION_SITUATION", dpFilterParamForDetailDto.getInformationSituation()));
         }
         /**
          * 设备类别
          */
         if(StrUtil.isNotEmpty(dpFilterParamForDetailDto.getEquCategory())){
-            boolMust.must(QueryBuilders.matchPhraseQuery("EQU_CATEGORY", "*" + dpFilterParamForDetailDto.getEquCategory() + "*"));
+            boolMust.must(QueryBuilders.wildcardQuery("EQU_CATEGORY", "*" + dpFilterParamForDetailDto.getEquCategory() + "*"));
         }
         //监管码状态0已赋码1未赋码
-        if (StringUtils.isNotEmpty(dpFilterParamForDetailDto.getSupervisionCodeStatus())){
-            if(StringUtils.equals("0",dpFilterParamForDetailDto.getSupervisionCodeStatus())){
+        if (StringUtils.isNotEmpty(dpFilterParamForDetailDto.getSupervisionCodeStatus())) {
+            if (StringUtils.equals("0", dpFilterParamForDetailDto.getSupervisionCodeStatus())) {
                 boolMust.must(QueryBuilders.existsQuery("SUPERVISORY_CODE"));
-                boolMust.mustNot(QueryBuilders.termQuery("SUPERVISORY_CODE","null"));
-            }else{
+                boolMust.mustNot(QueryBuilders.termQuery("SUPERVISORY_CODE", "null"));
+            } else {
                 boolMust.mustNot(QueryBuilders.existsQuery("SUPERVISORY_CODE"));
             }
         }
 
         if(StringUtils.isNotEmpty(dpFilterParamForDetailDto.getNextInspectionDate())){
-            boolMust.must(QueryBuilders.rangeQuery("NEXT_INSPECT_DATE").gte(DateUtil.parse(dpFilterParamForDetailDto.getNextInspectionDate()).getTime()));
+            String[] timeArray = dpFilterParamForDetailDto.getNextInspectionDate().split(",");
+            boolMust.filter(QueryBuilders.rangeQuery("NEXT_INSPECT_DATE").gte(timeArray[0]).lte(timeArray[1]));
         }
 
         searchSourceBuilder.query(boolMust);

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/IdxBizJgUseInfo.java

@@ -10,6 +10,7 @@ import com.yeejoin.amos.boot.module.common.api.dto.IBaseChangeData;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.apache.ibatis.type.JdbcType;
 
 import java.util.Date;
 

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/IdxBizJgConstructionInfoMapper.java

 package com.yeejoin.amos.boot.module.ymt.api.mapper;
 
+import com.yeejoin.amos.boot.module.common.api.mapper.CustomBaseMapper;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgConstructionInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * 施工信息表 Mapper 接口
@@ -9,6 +9,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author system_generator
  * @date 2023-08-17
  */
-public interface IdxBizJgConstructionInfoMapper extends BaseMapper<IdxBizJgConstructionInfo> {
+public interface IdxBizJgConstructionInfoMapper extends CustomBaseMapper<IdxBizJgConstructionInfo> {
 
 }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/IdxBizJgDesignInfoMapper.java

 package com.yeejoin.amos.boot.module.ymt.api.mapper;
 
+import com.yeejoin.amos.boot.module.common.api.mapper.CustomBaseMapper;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgDesignInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * 安全追溯-设计信息表 Mapper 接口
@@ -9,6 +9,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author system_generator
  * @date 2023-08-17
  */
-public interface IdxBizJgDesignInfoMapper extends BaseMapper<IdxBizJgDesignInfo> {
-
+public interface IdxBizJgDesignInfoMapper extends CustomBaseMapper<IdxBizJgDesignInfo> {
 }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/IdxBizJgFactoryInfoMapper.java

 package com.yeejoin.amos.boot.module.ymt.api.mapper;
 
+import com.yeejoin.amos.boot.module.common.api.mapper.CustomBaseMapper;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgFactoryInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * 安全追溯-制造信息 Mapper 接口
@@ -9,6 +9,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author system_generator
  * @date 2023-08-17
  */
-public interface IdxBizJgFactoryInfoMapper extends BaseMapper<IdxBizJgFactoryInfo> {
+public interface IdxBizJgFactoryInfoMapper extends CustomBaseMapper<IdxBizJgFactoryInfo> {
 
 }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/IdxBizJgInspectionDetectionInfoMapper.java

 package com.yeejoin.amos.boot.module.ymt.api.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.common.api.mapper.CustomBaseMapper;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgInspectionDetectionInfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -12,7 +12,7 @@ import java.util.List;
  * @author system_generator
  * @date 2023-08-17
  */
-public interface IdxBizJgInspectionDetectionInfoMapper extends BaseMapper<IdxBizJgInspectionDetectionInfo> {
+public interface IdxBizJgInspectionDetectionInfoMapper extends CustomBaseMapper<IdxBizJgInspectionDetectionInfo> {
 
     List<IdxBizJgInspectionDetectionInfo> selectLastedGroupByInspectType(@Param("record") String record);
 

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/IdxBizJgOtherInfoMapper.java

 package com.yeejoin.amos.boot.module.ymt.api.mapper;
 
+import com.yeejoin.amos.boot.module.common.api.mapper.CustomBaseMapper;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgOtherInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
@@ -11,7 +11,7 @@ import org.apache.ibatis.annotations.Select;
  * @author system_generator
  * @date 2023-08-17
  */
-public interface IdxBizJgOtherInfoMapper extends BaseMapper<IdxBizJgOtherInfo> {
+public interface IdxBizJgOtherInfoMapper extends CustomBaseMapper<IdxBizJgOtherInfo> {
     @Select("select SUPERVISORY_CODE from idx_biz_jg_other_info where record = #{equipmentCode}")
     String getSupervisoryCodeByEquipmentCode(@Param("equipmentCode") String equipmentCode);
 }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/IdxBizJgRegisterInfoMapper.java

 package com.yeejoin.amos.boot.module.ymt.api.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.common.api.mapper.CustomBaseMapper;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgRegisterInfo;
 import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
-import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import java.util.List;
@@ -15,7 +14,7 @@ import java.util.Map;
  * @author system_generator
  * @date 2023-08-17
  */
-public interface IdxBizJgRegisterInfoMapper extends BaseMapper<IdxBizJgRegisterInfo> {
+public interface IdxBizJgRegisterInfoMapper extends CustomBaseMapper<IdxBizJgRegisterInfo> {
 
     @Select("select \"USE_ORG_CODE\" from idx_biz_jg_register_info where \"RECORD\" = #{equipCode}")
     String getUseOrgCodeByEquip(@Param("equipCode") String equipCode);

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/IdxBizJgSupervisionInfoMapper.java

 package com.yeejoin.amos.boot.module.ymt.api.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.common.api.mapper.CustomBaseMapper;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgSupervisionInfo;
 
 /**
@@ -9,6 +9,6 @@ import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgSupervisionInfo;
  * @author system_generator
  * @date 2023-08-17
  */
-public interface IdxBizJgSupervisionInfoMapper extends BaseMapper<IdxBizJgSupervisionInfo> {
+public interface IdxBizJgSupervisionInfoMapper extends CustomBaseMapper<IdxBizJgSupervisionInfo> {
 
 }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/IdxBizJgTechParamsPipelineMapper.java

 package com.yeejoin.amos.boot.module.ymt.api.mapper;
 
+import com.yeejoin.amos.boot.module.common.api.mapper.CustomBaseMapper;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsPipeline;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * 安全追溯-压力管道 Mapper 接口
@@ -9,6 +9,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author system_generator
  * @date 2023-08-17
  */
-public interface IdxBizJgTechParamsPipelineMapper extends BaseMapper<IdxBizJgTechParamsPipeline> {
+public interface IdxBizJgTechParamsPipelineMapper extends CustomBaseMapper<IdxBizJgTechParamsPipeline> {
 
 }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/IdxBizJgTechParamsVesselMapper.java

 package com.yeejoin.amos.boot.module.ymt.api.mapper;
 
+import com.yeejoin.amos.boot.module.common.api.mapper.CustomBaseMapper;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsVessel;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * 安全追溯-压力容器 Mapper 接口
@@ -9,6 +9,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author system_generator
  * @date 2023-08-17
  */
-public interface IdxBizJgTechParamsVesselMapper extends BaseMapper<IdxBizJgTechParamsVessel> {
+public interface IdxBizJgTechParamsVesselMapper extends CustomBaseMapper<IdxBizJgTechParamsVessel> {
 
 }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/IdxBizJgUseInfoMapper.java

 package com.yeejoin.amos.boot.module.ymt.api.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.common.api.mapper.CustomBaseMapper;
 import com.yeejoin.amos.boot.module.ymt.api.dto.EquipWaitRefreshDataQualityScore;
 import com.yeejoin.amos.boot.module.ymt.api.dto.RefreshDataDto;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgUseInfo;
 import org.apache.ibatis.annotations.Param;
-
 import java.util.List;
 import java.util.Map;
 
@@ -16,7 +15,7 @@ import java.util.Map;
  * @author system_generator
  * @date 2023-08-16
  */
-public interface IdxBizJgUseInfoMapper extends BaseMapper<IdxBizJgUseInfo> {
+public interface IdxBizJgUseInfoMapper extends CustomBaseMapper<IdxBizJgUseInfo> {
     void batchUpdateUseInfo(@Param("records") List<String> records, Integer code);
 
     List<IdxBizJgUseInfo> selectXAList();