报告管理查询条件修改

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/boilertaskorder/vo/BoilerTaskOrderPageReqVO.java

@@ -399,6 +399,14 @@ public class BoilerTaskOrderPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime ratifyTimeEnd;
 
+    @Schema(description = "受理开始时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime schedulingTimeStart;
+
+    @Schema(description = "受理结束时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime schedulingTimeEnd;
+
     @Schema(description ="整改状态 (0=待确认,1=待整改,2=已提交,3=材料有误,4=整改通过)")
     private List<Integer> rectificationStatusList;
 

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/pipetaskorder/vo/PipeTaskOrderPageReqVO.java

@@ -402,6 +402,13 @@ public class PipeTaskOrderPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime ratifyTimeEnd;
 
+    @Schema(description = "受理开始时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime schedulingTimeStart;
+
+    @Schema(description = "受理结束时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime schedulingTimeEnd;
 
     @Schema(description ="整改状态 (0=待确认,1=待整改,2=已提交,3=材料有误,4=整改通过)")
     private List<Integer> rectificationStatusList;

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/dal/mysql/boilertaskorder/BoilerTaskOrderMapper.java

@@ -61,7 +61,7 @@ public interface BoilerTaskOrderMapper extends BaseMapperX<BoilerTaskOrderDO> {
                 .eqIfPresent(BoilerTaskOrderDO::getEquipType, reqVO.getEquipType())
                 .eqIfPresent(BoilerTaskOrderDO::getEquipStreet, reqVO.getEquipStreet())
                 .eqIfPresent(BoilerTaskOrderDO::getEquipDistrict, reqVO.getEquipDistrict())
-                .betweenIfPresent(BoilerTaskOrderDO::getCheckDate, new List[]{reqVO.getCheckDate()})
+                .betweenIfPresent(BoilerTaskOrderDO::getCheckDate, reqVO.getCheckDate() != null?reqVO.getCheckDate().toArray():null)
                 .eqIfPresent(BoilerTaskOrderDO::getWarningDay, reqVO.getWarningDay())
                 .eqIfPresent(BoilerTaskOrderDO::getUnitContact, reqVO.getUnitContact())
                 .eqIfPresent(BoilerTaskOrderDO::getUnitPhone, reqVO.getUnitPhone())
@@ -90,7 +90,7 @@ public interface BoilerTaskOrderMapper extends BaseMapperX<BoilerTaskOrderDO> {
                 .eqIfPresent(BoilerTaskOrderDO::getProcessInstanceId, reqVO.getProcessInstanceId())
                 .eqIfPresent(BoilerTaskOrderDO::getContractNo, reqVO.getContractNo())
                 .eqIfPresent(BoilerTaskOrderDO::getSubmitId, reqVO.getSubmitId())
-                .betweenIfPresent(BoilerTaskOrderDO::getSubmitTime, new List[]{reqVO.getSubmitTime()})
+                .betweenIfPresent(BoilerTaskOrderDO::getSubmitTime, reqVO.getSubmitTime() != null?reqVO.getSubmitTime().toArray():null)
                 .eqIfPresent(BoilerTaskOrderDO::getReturnReason, reqVO.getReturnReason())
                 .eqIfPresent(BoilerTaskOrderDO::getChangeReason, reqVO.getChangeReason())
                 .eqIfPresent(BoilerTaskOrderDO::getChangeType, reqVO.getChangeType())

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/dal/mysql/boilertaskorderitem/BoilerTaskOrderItemQueryMapper.java

@@ -81,33 +81,37 @@ public interface BoilerTaskOrderItemQueryMapper extends BaseMapperX<BoilerTaskOr
 //        }
         recordDOMPJLambdaWrapper.eq(BoilerTaskOrderDO::getTaskStatus, 800);
 
-        if (org.apache.commons.lang3.StringUtils.isNotEmpty(reqVO.getOrderNo())) {
+        if (StringUtils.isNotEmpty(reqVO.getOrderNo())) {
             recordDOMPJLambdaWrapper.like(BoilerTaskOrderDO::getOrderNo, reqVO.getOrderNo());
         }
 
-//        if (org.apache.commons.lang3.StringUtils.isNotEmpty(reqVO.getUseUnitName())) {
-//            recordDOMPJLambdaWrapper.like(BoilerTaskOrderDO::getUseUnitName, reqVO.getUseUnitName());
-//        }
+        if (StringUtils.isNotEmpty(reqVO.getUseUnitName())) {
+            recordDOMPJLambdaWrapper.like(BoilerTaskOrderDO::getUseUnitName, reqVO.getUseUnitName());
+        }
 
-        if (org.apache.commons.lang3.StringUtils.isNotEmpty(reqVO.getReportNo())) {
+        if (StringUtils.isNotEmpty(reqVO.getReportNo())) {
             recordDOMPJLambdaWrapper.like(BoilerTaskOrderItemReportDO::getReportNo, reqVO.getReportNo());
         }
 
-        if (org.apache.commons.lang3.StringUtils.isNotEmpty(reqVO.getRatifyId())) {
+        if (StringUtils.isNotEmpty(reqVO.getRatifyId())) {
             recordDOMPJLambdaWrapper.eq(BoilerTaskOrderItemReportDO::getRatifyId, reqVO.getRatifyId());
         }
 
-//        if (org.apache.commons.lang3.StringUtils.isNotEmpty(reqVO.getRatifyName())) {
-//            recordDOMPJLambdaWrapper.like(BoilerTaskOrderItemReportDO::getRatifyName, reqVO.getRatifyName());
-//        }
-//
-//        if (reqVO.getRatifyTimeEnd() != null && reqVO.getRatifyTimeStart() != null) {
-//            recordDOMPJLambdaWrapper.between(BoilerTaskOrderItemReportDO::getRatifyTime, reqVO.getRatifyTimeStart(), reqVO.getRatifyTimeEnd());
-//        }
-//
-//        if (reqVO.getSchedulingTimeStart() != null && reqVO.getSchedulingTimeEnd() != null) {
-//            recordDOMPJLambdaWrapper.between(EquipBoilerSchedulingDO::getCreateTime, reqVO.getSchedulingTimeStart(), reqVO.getSchedulingTimeEnd());
-//        }
+        if (StringUtils.isNotEmpty(reqVO.getUseRegisterNo())) {
+            recordDOMPJLambdaWrapper.like(EquipBoilerDO::getUseRegisterNo, reqVO.getUseRegisterNo());
+        }
+
+        if (StringUtils.isNotEmpty(reqVO.getProductNo())) {
+            recordDOMPJLambdaWrapper.like(EquipBoilerDO::getProductCode, reqVO.getProductNo());
+        }
+
+        if (reqVO.getRatifyTimeEnd() != null && reqVO.getRatifyTimeStart() != null) {
+            recordDOMPJLambdaWrapper.between(BoilerTaskOrderItemReportDO::getRatifyTime, reqVO.getRatifyTimeStart(), reqVO.getRatifyTimeEnd());
+        }
+
+        if (reqVO.getSchedulingTimeStart() != null && reqVO.getSchedulingTimeEnd() != null) {
+            recordDOMPJLambdaWrapper.between(EquipBoilerSchedulingDO::getCreateTime, reqVO.getSchedulingTimeStart(), reqVO.getSchedulingTimeEnd());
+        }
 
         if (reqVO.getCheckType() != null) {
             recordDOMPJLambdaWrapper.eq(BoilerTaskOrderDO::getCheckType, reqVO.getCheckType());

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/dal/mysql/pipetaskorder/PipeTaskOrderMapper.java

@@ -66,7 +66,7 @@ public interface PipeTaskOrderMapper extends BaseMapperX<PipeTaskOrderDO> {
                 .eqIfPresent(PipeTaskOrderDO::getEquipType, reqVO.getEquipType())
                 .eqIfPresent(PipeTaskOrderDO::getEquipStreet, reqVO.getEquipStreet())
                 .eqIfPresent(PipeTaskOrderDO::getEquipDistrict, reqVO.getEquipDistrict())
-                .betweenIfPresent(PipeTaskOrderDO::getCheckDate, new List[]{reqVO.getCheckDate()})
+                .betweenIfPresent(PipeTaskOrderDO::getCheckDate, reqVO.getCheckDate() != null?reqVO.getCheckDate().toArray():null)
                 .eqIfPresent(PipeTaskOrderDO::getWarningDay, reqVO.getWarningDay())
                 .eqIfPresent(PipeTaskOrderDO::getUnitContact, reqVO.getUnitContact())
                 .eqIfPresent(PipeTaskOrderDO::getUnitPhone, reqVO.getUnitPhone())
@@ -95,7 +95,7 @@ public interface PipeTaskOrderMapper extends BaseMapperX<PipeTaskOrderDO> {
                 .eqIfPresent(PipeTaskOrderDO::getProcessInstanceId, reqVO.getProcessInstanceId())
                 .eqIfPresent(PipeTaskOrderDO::getContractNo, reqVO.getContractNo())
                 .eqIfPresent(PipeTaskOrderDO::getSubmitId, reqVO.getSubmitId())
-                .betweenIfPresent(PipeTaskOrderDO::getSubmitTime, new List[]{reqVO.getSubmitTime()})
+                .betweenIfPresent(PipeTaskOrderDO::getSubmitTime, reqVO.getSubmitTime() != null?reqVO.getSubmitTime().toArray():null)
                 .eqIfPresent(PipeTaskOrderDO::getReturnReason, reqVO.getReturnReason())
                 .eqIfPresent(PipeTaskOrderDO::getChangeReason, reqVO.getChangeReason())
                 .eqIfPresent(PipeTaskOrderDO::getChangeType, reqVO.getChangeType())

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/dal/mysql/pipetaskorderitem/PipeTaskOrderItemQueryMapper.java

@@ -12,6 +12,7 @@ import cn.start.tz.module.pressure2.controller.admin.boilertaskorder.vo.TaskOrde
 import cn.start.tz.module.pressure2.controller.admin.pipetaskorder.vo.PipeTaskOrderPageReqVO;
 import cn.start.tz.module.pressure2.controller.admin.pipetaskorder.vo.PipeTaskOrderRespVO;
 import cn.start.tz.module.pressure2.controller.admin.pipetaskorderitem.vo.PipeTaskOrderItemRespVO;
+import cn.start.tz.module.pressure2.dal.dataobject.equipboiler.EquipBoilerDO;
 import cn.start.tz.module.pressure2.dal.dataobject.equippipe.EquipPipeDO;
 import cn.start.tz.module.pressure2.dal.dataobject.equippipescheduling.EquipPipeSchedulingDO;
 import cn.start.tz.module.pressure2.dal.dataobject.pipetaskorder.PipeTaskOrderDO;
@@ -88,33 +89,33 @@ public interface PipeTaskOrderItemQueryMapper extends BaseMapperX<PipeTaskOrderI
 //        }
         recordDOMPJLambdaWrapper.eq(PipeTaskOrderDO::getTaskStatus, 800);
 
-        if (org.apache.commons.lang3.StringUtils.isNotEmpty(reqVO.getOrderNo())) {
+        if (StringUtils.isNotEmpty(reqVO.getOrderNo())) {
             recordDOMPJLambdaWrapper.like(PipeTaskOrderDO::getOrderNo, reqVO.getOrderNo());
         }
 
-//        if (org.apache.commons.lang3.StringUtils.isNotEmpty(reqVO.getUseUnitName())) {
-//            recordDOMPJLambdaWrapper.like(PipeTaskOrderDO::getUseUnitName, reqVO.getUseUnitName());
-//        }
+        if (StringUtils.isNotEmpty(reqVO.getUseUnitName())) {
+            recordDOMPJLambdaWrapper.like(PipeTaskOrderDO::getUseUnitName, reqVO.getUseUnitName());
+        }
 
-        if (org.apache.commons.lang3.StringUtils.isNotEmpty(reqVO.getReportNo())) {
+        if (StringUtils.isNotEmpty(reqVO.getReportNo())) {
             recordDOMPJLambdaWrapper.like(PipeTaskOrderItemReportDO::getReportNo, reqVO.getReportNo());
         }
 
-        if (org.apache.commons.lang3.StringUtils.isNotEmpty(reqVO.getRatifyId())) {
+        if (StringUtils.isNotEmpty(reqVO.getRatifyId())) {
             recordDOMPJLambdaWrapper.eq(PipeTaskOrderItemReportDO::getRatifyId, reqVO.getRatifyId());
         }
 
-//        if (org.apache.commons.lang3.StringUtils.isNotEmpty(reqVO.getRatifyName())) {
-//            recordDOMPJLambdaWrapper.like(PipeTaskOrderItemReportDO::getRatifyName, reqVO.getRatifyName());
-//        }
-//
-//        if (reqVO.getRatifyTimeEnd() != null && reqVO.getRatifyTimeStart() != null) {
-//            recordDOMPJLambdaWrapper.between(PipeTaskOrderItemReportDO::getRatifyTime, reqVO.getRatifyTimeStart(), reqVO.getRatifyTimeEnd());
-//        }
-//
-//        if (reqVO.getSchedulingTimeStart() != null && reqVO.getSchedulingTimeEnd() != null) {
-//            recordDOMPJLambdaWrapper.between(EquipPipeSchedulingDO::getCreateTime, reqVO.getSchedulingTimeStart(), reqVO.getSchedulingTimeEnd());
-//        }
+        if (StringUtils.isNotEmpty(reqVO.getUseRegisterNo())) {
+            recordDOMPJLambdaWrapper.like(EquipPipeDO::getCertificateNo, reqVO.getUseRegisterNo());
+        }
+
+        if (reqVO.getRatifyTimeEnd() != null && reqVO.getRatifyTimeStart() != null) {
+            recordDOMPJLambdaWrapper.between(PipeTaskOrderItemReportDO::getRatifyTime, reqVO.getRatifyTimeStart(), reqVO.getRatifyTimeEnd());
+        }
+
+        if (reqVO.getSchedulingTimeStart() != null && reqVO.getSchedulingTimeEnd() != null) {
+            recordDOMPJLambdaWrapper.between(EquipPipeSchedulingDO::getCreateTime, reqVO.getSchedulingTimeStart(), reqVO.getSchedulingTimeEnd());
+        }
 
         if (reqVO.getCheckType() != null) {
             recordDOMPJLambdaWrapper.eq(PipeTaskOrderDO::getCheckType, reqVO.getCheckType());

tz-module-pressure2/tz-module-pressure2-biz/src/main/resources/mapper/boilertaskorderitem/BoilerTaskOrderItemQueryMapper.xml

@@ -95,7 +95,7 @@
             </if>
 
             <if test="pageReqVO.checkDate != null and pageReqVO.checkDate.size >= 2">
-                AND t2.check_date BETWEEN #{pageReqVO.checkDate.get(0)} AND #{pageReqVO.checkDate.get(1)}
+                AND t2.check_date BETWEEN #{pageReqVO.checkDate[0]} AND #{pageReqVO.checkDate[1]}
             </if>
 
             <if test="pageReqVO.ratifyTimeStart != null and pageReqVO.ratifyTimeEnd != null">
@@ -182,7 +182,7 @@
             </if>
 
             <if test="pageReqVO.checkDate != null and pageReqVO.checkDate.size >= 2">
-                AND t2.check_date BETWEEN #{pageReqVO.checkDate.get(0)} AND #{pageReqVO.checkDate.get(1)}
+                AND t2.check_date BETWEEN #{pageReqVO.checkDate[0]} AND #{pageReqVO.checkDate[1]}
             </if>
 
             <if test="pageReqVO.ratifyTimeStart != null and pageReqVO.ratifyTimeEnd != null">

tz-module-pressure2/tz-module-pressure2-biz/src/main/resources/mapper/pipetaskorderitem/PipeTaskOrderItemQueryMapper.xml

@@ -94,7 +94,7 @@
             </if>
 
             <if test="pageReqVO.checkDate != null and pageReqVO.checkDate.size >= 2">
-                AND t2.check_date BETWEEN #{pageReqVO.checkDate.get(0)} AND #{pageReqVO.checkDate.get(1)}
+                AND t2.check_date BETWEEN #{pageReqVO.checkDate[0]} AND #{pageReqVO.checkDate[1]}
             </if>
 
             <if test="pageReqVO.ratifyTimeStart != null and pageReqVO.ratifyTimeEnd != null">
@@ -181,7 +181,7 @@
             </if>
 
             <if test="pageReqVO.checkDate != null and pageReqVO.checkDate.size >= 2">
-                AND t2.check_date BETWEEN #{pageReqVO.checkDate.get(0)} AND #{pageReqVO.checkDate.get(1)}
+                AND t2.check_date BETWEEN #{pageReqVO.checkDate[0]} AND #{pageReqVO.checkDate[1]}
             </if>
 
             <if test="pageReqVO.ratifyTimeStart != null and pageReqVO.ratifyTimeEnd != null">