From b68ab0347bbe26db5e5a2eadd541123655d33480 Mon Sep 17 00:00:00 2001 From: wangfs <15029758498@163.com> Date: Sun, 14 Dec 2025 16:33:33 +0800 Subject: [PATCH] app养护计划明细提交 --- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanServiceImpl.java | 6 +++++- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanServiceImpl.java | 6 ++++++ urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanCommitMapper.xml | 2 ++ urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanDetailMapper.xml | 4 ---- urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanMapper.xml | 3 ++- urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanCommitMapper.xml | 1 + 6 files changed, 16 insertions(+), 6 deletions(-) diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanServiceImpl.java index 21d9ad3..eaa90f2 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanServiceImpl.java @@ -341,7 +341,11 @@ public class InspectionPlanServiceImpl implements InspectionPlanService { } /*1.查询登录用户角色*/ - Set batchNos = getBatchNosByLoginUserId(); + Set batchNos = this.getBatchNosByLoginUserId(); + if(CollectionUtils.isEmpty(batchNos)){ + return PageResult.empty(); + } + pageReqVO.setBatchNos(batchNos); pageReqVO.setLocalDate(LocalDate.now()); /*2.分页*/ diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanServiceImpl.java index b9d31f7..fddbdf3 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanServiceImpl.java @@ -347,6 +347,9 @@ public class MaintainPlanServiceImpl implements MaintainPlanService { /*1.查询登录用户计划编码列表*/ Set batchNos = this.getBatchNosByLoginUserId(); + if(CollectionUtils.isEmpty(batchNos)){ + return PageResult.empty(); + } pageReqVO.setBatchNos(batchNos); pageReqVO.setLocalDate(LocalDate.now()); /*2.分页*/ @@ -388,6 +391,9 @@ public class MaintainPlanServiceImpl implements MaintainPlanService { } /*1.查询登录用户计划编码列表*/ Set batchNos = this.getBatchNosByLoginUserId(); + if(CollectionUtils.isEmpty(batchNos)){ + return PageResult.empty(); + } pageReqVO.setBatchNos(batchNos); pageReqVO.setLocalDate(LocalDate.now()); /*2.分页*/ diff --git a/urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanCommitMapper.xml b/urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanCommitMapper.xml index cb73230..86131b6 100644 --- a/urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanCommitMapper.xml +++ b/urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanCommitMapper.xml @@ -38,6 +38,8 @@ FROM garden_inspection_plan_commit a, garden_inspection_plan b where a.batch_no=b.batch_no + AND a.deleted = b. deleted + AND a.deleted = 0 and a.plan_no = #{req.planNo} diff --git a/urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanDetailMapper.xml b/urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanDetailMapper.xml index 548d4aa..d069239 100644 --- a/urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanDetailMapper.xml +++ b/urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanDetailMapper.xml @@ -21,7 +21,6 @@ a.road_name, a.plan_type_id, a.level_id, - a.plan_type_id, a.rate, a.cycle_id, b.sort_num, @@ -35,9 +34,6 @@ garden_inspection_plan_detail b WHERE a.batch_no = b.batch_no - AND b.batch_no=c.batch_no - AND a.road_id=b.road_id - AND a.dept_id =b.dept_id AND a.deleted = b.deleted AND a.deleted = 0 AND a.batch_no = #{req.batchNo} diff --git a/urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanMapper.xml b/urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanMapper.xml index a439c56..ec6795d 100644 --- a/urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanMapper.xml +++ b/urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanMapper.xml @@ -18,6 +18,7 @@ a.batch_no, a.road_id, a.road_name, + a.busi_line, a.plan_type_id, a.level_id, a.finish_state, @@ -25,7 +26,7 @@ a.end_time FROM garden_inspection_plan a - WHERE a.deleted=0 + WHERE a.deleted = 0 AND a.road_name LIKE CONCAT('%',#{req.roadName},'%') diff --git a/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanCommitMapper.xml b/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanCommitMapper.xml index 5e3b4be..afd7769 100644 --- a/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanCommitMapper.xml +++ b/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanCommitMapper.xml @@ -108,6 +108,7 @@ WHERE a.batch_no = b.batch_no AND a.plan_no = c.plan_no + AND a.finish_state = 2 AND c.plan_no = #{req.planNo} \ No newline at end of file -- libgit2 0.21.4