检验方案审核增加单位查询条件

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

@@ -57,4 +57,6 @@ public class BoilerMajorIssuesPageReqVO extends PageParam {
 
     private String auditId;
 
+    private String unitName;
+
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/dal/mysql/boilertaskorderitemreport/BoilerTaskOrderItemReportMapper.java

@@ -23,6 +23,7 @@ import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorderitemreportuser
 import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorderreport.BoilerTaskOrderReportDO;
 import cn.start.tz.module.pressure2.dal.dataobject.dynamictb.DynamicTbDO;
 import cn.start.tz.module.pressure2.dal.dataobject.equipboiler.EquipBoilerDO;
+import cn.start.tz.module.pressure2.dal.dataobject.pipetaskorder.PipeTaskOrderDO;
 import cn.start.tz.module.pressure2.dal.dataobject.pipetaskorderitemreport.PipeTaskOrderItemReportDO;
 import jodd.util.StringUtil;
 import org.apache.commons.lang3.StringUtils;
@@ -172,6 +173,10 @@ public interface BoilerTaskOrderItemReportMapper extends BaseMapperX<BoilerTaskO
             recordDOMPJLambdaWrapper.eq(BoilerTaskOrderItemReportDO::getStatus, reqVO.getStatus());
         }
 
+        if(reqVO.getUnitName() != null){
+            recordDOMPJLambdaWrapper.like(BoilerTaskOrderDO::getUnitName, reqVO.getUnitName());
+        }
+
         if (StringUtils.isNotBlank(reqVO.getApproverId())){
             recordDOMPJLambdaWrapper.and(wrapper ->
                     wrapper.eq(BoilerTaskOrderReportDO::getApprovalId, reqVO.getApproverId())

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/dal/mysql/boilertaskorderreport/BoilerTaskOrderReportMapper.java

@@ -127,6 +127,10 @@ public interface BoilerTaskOrderReportMapper extends BaseMapperX<BoilerTaskOrder
             recordDOMPJLambdaWrapper.between(BoilerTaskOrderDO::getCheckDate, reqVO.getCheckDate().get(0),reqVO.getCheckDate().get(1));
         }
 
+        if(reqVO.getUnitName() != null){
+            recordDOMPJLambdaWrapper.like(BoilerTaskOrderDO::getUnitName, reqVO.getUnitName());
+        }
+
         if (!CollUtil.isEmpty(reqVO.getSubmitTime()) && reqVO.getSubmitTime().size() == 2) {
             recordDOMPJLambdaWrapper.between(BoilerTaskOrderDO::getSubmitTime, reqVO.getSubmitTime().get(0),reqVO.getSubmitTime().get(1));
         }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/dal/mysql/pipetaskorderitemreport/PipeTaskOrderItemReportMapper.java

@@ -167,6 +167,10 @@ public interface PipeTaskOrderItemReportMapper extends BaseMapperX<PipeTaskOrder
             recordDOMPJLambdaWrapper.eq(PipeTaskOrderItemReportDO::getStatus, reqVO.getStatus());
         }
 
+        if(reqVO.getUnitName() != null){
+            recordDOMPJLambdaWrapper.like(PipeTaskOrderDO::getUnitName, reqVO.getUnitName());
+        }
+
         if (StringUtils.isNotBlank(reqVO.getApproverId())){
             recordDOMPJLambdaWrapper.and(wrapper ->
                     wrapper.eq(BoilerTaskOrderReportDO::getApprovalId, reqVO.getApproverId())