查询调整

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/dal/mysql/equipmentreturnrecord/EquipmentReturnRecordMapper.java

@@ -74,12 +74,14 @@ public interface EquipmentReturnRecordMapper extends BaseMapperX<EquipmentReturn
                 .eqIfPresent(EquipmentReturnRecordDO::getUnitCode, reqVO.getUnitCode())
                 .likeIfPresent(EquipmentReturnRecordDO::getUnitName, reqVO.getUnitName())
                 .eqIfPresent(EquipmentReturnRecordDO::getStatus, reqVO.getStatus())
+                .eqIfPresent(EquipmentReturnRecordDO::getEquipStatusName, reqVO.getEquipStatusName())
                 .eqIfPresent(EquipmentReturnRecordDO::getRemark, reqVO.getRemark())
                 .eqIfPresent(EquipmentReturnRecordDO::getProcessInstanceId, reqVO.getProcessInstanceId())
                 .inIfPresent(EquipmentReturnRecordDO::getSubmitId, reqVO.getSubmitIds())
                 .betweenIfPresent(EquipmentReturnRecordDO::getSubmitTime, reqVO.getSubmitTime())
                 .eqIfPresent(EquipmentReturnRecordDO::getOrderNo, reqVO.getOrderNo())
                 .eqIfPresent(EquipmentReturnRecordDO::getCheckType, reqVO.getCheckType())
+                .eqIfPresent(EquipmentReturnRecordDO::getCheckTypeName, reqVO.getCheckTypeName())
                 .eqIfPresent(EquipmentReturnRecordDO::getAuditReason, reqVO.getAuditReason())
                 .betweenIfPresent(EquipmentReturnRecordDO::getCheckDate, reqVO.getCheckDate())
                 .eqIfPresent(EquipmentReturnRecordDO::getReportCityStatus, reqVO.getReportCityStatus())
@@ -105,6 +107,15 @@ public interface EquipmentReturnRecordMapper extends BaseMapperX<EquipmentReturn
                 .betweenIfPresent(EquipmentReturnRecordDO::getNextCheckDate, reqVO.getNextCheckDate())
                 .eqIfPresent(EquipmentReturnRecordDO::getEquipCode, reqVO.getEquipCode())
                 .eqIfPresent(EquipmentReturnRecordDO::getEquipMainType, reqVO.getEquipMainType());
+
+        if (reqVO.getSubmitTimeStart() != null && reqVO.getSubmitTimeEnd() != null) {
+            wrapper.between(EquipmentReturnRecordDO::getSubmitTime, reqVO.getSubmitTimeStart(), reqVO.getSubmitTimeEnd());
+        }
+
+        if (reqVO.getReturnTimeStart() != null && reqVO.getReturnTimeEnd() != null) {
+            wrapper.between(EquipmentReturnRecordDO::getReturnTime, reqVO.getReturnTimeStart(), reqVO.getReturnTimeEnd());
+        }
+
         wrapper.orderByDesc(EquipmentReturnRecordDO::getCreateTime);
         return selectJoinPage(reqVO, EquipmentReturnRecordRespVO.class, wrapper);
     }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/dal/mysql/reportcityrecord/ReportCityRecordMapper.java

@@ -28,6 +28,7 @@ public interface ReportCityRecordMapper extends BaseMapperX<ReportCityRecordDO>
                 .eqIfPresent(ReportCityRecordDO::getEquipType, reqVO.getEquipType())
                 .eqIfPresent(ReportCityRecordDO::getEquipCategory, reqVO.getEquipCategory())
                 .eqIfPresent(ReportCityRecordDO::getCheckType, reqVO.getCheckType())
+                .eqIfPresent(ReportCityRecordDO::getCheckTypeName, reqVO.getCheckTypeName())
                 .eqIfPresent(ReportCityRecordDO::getProductNo, reqVO.getProductNo())
                 .betweenIfPresent(ReportCityRecordDO::getCheckDate, reqVO.getCheckDate())
                 .eqIfPresent(ReportCityRecordDO::getStatus, reqVO.getStatus())
@@ -67,6 +68,7 @@ public interface ReportCityRecordMapper extends BaseMapperX<ReportCityRecordDO>
                 .eqIfPresent(ReportCityRecordDO::getContactPhone, reqVO.getContactPhone())
                 .eqIfPresent(ReportCityRecordDO::getEquipAddress, reqVO.getEquipAddress())
                 .eqIfPresent(ReportCityRecordDO::getEquipStatus, reqVO.getEquipStatus())
+                .eqIfPresent(ReportCityRecordDO::getEquipStatusName, reqVO.getEquipStatusName())
                 .betweenIfPresent(ReportCityRecordDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(ReportCityRecordDO::getCurrentAuditorId, reqVO.getCurrentAuditorId())
                 .eqIfPresent(ReportCityRecordDO::getEquipMainType, reqVO.getEquipMainType())