JX.Li 1 rok pred
rodič
commit
e19a08aea0

+ 1 - 0
ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GPatrolTeamServiceImpl.java

@@ -72,6 +72,7 @@ public class GPatrolTeamServiceImpl extends ServicePlusImpl<GPatrolTeamMapper, G
         lqw.eq(StringUtils.isNotBlank(bo.getUploadLocation()), GPatrolTeam::getUploadLocation, bo.getUploadLocation());
         lqw.eq(StringUtils.isNotBlank(bo.getIsNormalInspection()), GPatrolTeam::getIsNormalInspection, bo.getIsNormalInspection());
         lqw.in(StringUtils.isNotEmpty(bo.getRanks()), GPatrolTeam::getCreateBy, !ObjectUtils.isEmpty(bo.getUids()) && bo.getUids().size() > 0 ? bo.getUids() : Arrays.asList(0L));
+        lqw.eq(StringUtils.isNotBlank(bo.getCreateBy()), GPatrolTeam::getCreateBy, bo.getCreateBy());
         lqw.orderByDesc(GPatrolTeam::getCreateTime);
         return lqw;
     }

+ 3 - 1
ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GRegulatingBoxMaintenanceServiceImpl.java

@@ -83,9 +83,11 @@ public class GRegulatingBoxMaintenanceServiceImpl extends ServicePlusImpl<GRegul
         lqw.like(StringUtils.isNotBlank(bo.getName()), GRegulatingBoxMaintenance::getName, bo.getName());
         lqw.eq(StringUtils.isNotBlank(bo.getNumber()), GRegulatingBoxMaintenance::getNumber, bo.getNumber());
         lqw.eq(StringUtils.isNotBlank(bo.getAdministrativeOffice()), GRegulatingBoxMaintenance::getAdministrativeOffice, bo.getAdministrativeOffice());
-        lqw.eq(StringUtils.isNotBlank(bo.getMaintenanceItem()), GRegulatingBoxMaintenance::getMaintenanceItem, bo.getMaintenanceItem());
+        lqw.like(StringUtils.isNotBlank(bo.getMaintenanceItem()), GRegulatingBoxMaintenance::getMaintenanceItem, bo.getMaintenanceItem());
         lqw.eq(StringUtils.isNotBlank(bo.getRemarks()), GRegulatingBoxMaintenance::getRemarks, bo.getRemarks());
         lqw.in(StringUtils.isNotEmpty(bo.getRanks()), GRegulatingBoxMaintenance::getCreateBy, !ObjectUtils.isEmpty(bo.getUids()) && bo.getUids().size() > 0 ? bo.getUids() : Arrays.asList(0L));
+//        lqw.like(StringUtils.isNotBlank(bo.getMaintenanceItem()), GRegulatingBoxMaintenance::getMaintenanceItem, bo.getMaintenanceItem());
+        lqw.eq(StringUtils.isNotBlank(bo.getCreateBy()), GRegulatingBoxMaintenance::getCreateBy, bo.getCreateBy());
         lqw.orderByDesc(GRegulatingBoxMaintenance::getCreateTime);
         return lqw;
     }

+ 1 - 0
ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GRoadSectionInspectionServiceImpl.java

@@ -74,6 +74,7 @@ public class GRoadSectionInspectionServiceImpl extends ServicePlusImpl<GRoadSect
         lqw.eq(StringUtils.isNotBlank(bo.getFindProblem()), GRoadSectionInspection::getFindProblem, bo.getFindProblem());
         lqw.eq(bo.getFindTime() != null, GRoadSectionInspection::getFindTime, bo.getFindTime());
         lqw.in(StringUtils.isNotEmpty(bo.getRanks()), GRoadSectionInspection::getCreateBy, !ObjectUtils.isEmpty(bo.getUids()) && bo.getUids().size() > 0 ? bo.getUids() : Arrays.asList(0L));
+        lqw.eq(StringUtils.isNotBlank(bo.getCreateBy()), GRoadSectionInspection::getCreateBy, bo.getCreateBy());
         lqw.orderByDesc(GRoadSectionInspection::getCreateTime);
         return lqw;
     }

+ 3 - 0
ruoyi-gas/src/main/resources/mapper/GValveWellInspectionMapper.xml

@@ -45,6 +45,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="p.discoverProblems != null and p.discoverProblems != ''">
             AND vwi.discover_problems = #{p.discoverProblems}
         </if>
+        <if test="p.createBy != null and p.createBy != ''">
+            AND vwi.create_by = #{p.createBy}
+        </if>
         ORDER BY
         vwi.create_time DESC
     </select>