From 73dd960684ad4169096279996057aa5a3ebd4465 Mon Sep 17 00:00:00 2001 From: wangfs <15029758498@163.com> Date: Sat, 20 Dec 2025 16:47:29 +0800 Subject: [PATCH] 优化 --- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/inspectionplan/vo/AppInspectionPlanDetailReqVO.java | 4 ++++ urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanDetailListByRoadPageReqVO.java | 3 +++ urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanDetailServiceImpl.java | 1 + urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanDetailServiceImpl.java | 8 +------- urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanDetailMapper.xml | 26 +++++++++++++++++++------- urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanDetailMapper.xml | 24 +++++++++++++++++++----- urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanMapper.xml | 4 ++-- 7 files changed, 49 insertions(+), 21 deletions(-) diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/inspectionplan/vo/AppInspectionPlanDetailReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/inspectionplan/vo/AppInspectionPlanDetailReqVO.java index dcfbe23..e9849bc 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/inspectionplan/vo/AppInspectionPlanDetailReqVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/inspectionplan/vo/AppInspectionPlanDetailReqVO.java @@ -38,5 +38,9 @@ public class AppInspectionPlanDetailReqVO { @Hidden private Long deptId; + @Schema(description = "开始时间") + @Hidden + private LocalDateTime localDateTime; + } diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanDetailListByRoadPageReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanDetailListByRoadPageReqVO.java index 29dae3f..76df5d1 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanDetailListByRoadPageReqVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanDetailListByRoadPageReqVO.java @@ -37,4 +37,7 @@ public class AppMaintainPlanDetailListByRoadPageReqVO extends PageParam { @Hidden private List busiLineList; + @Schema(description = "开始时间") + private LocalDateTime localDateTime; + } diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanDetailServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanDetailServiceImpl.java index e305b2d..38dc40d 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanDetailServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanDetailServiceImpl.java @@ -101,6 +101,7 @@ public class InspectionPlanDetailServiceImpl implements InspectionPlanDetailServ } pageReqVO.setCompanyId(companyId); pageReqVO.setDeptId(SecurityFrameworkUtils.getDeptId()); + pageReqVO.setLocalDateTime(LocalDateTime.now()); /*2.明细*/ return inspectionPlanDetailMapper.getInspectionPlanDetailForApp(pageReqVO); diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanDetailServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanDetailServiceImpl.java index 4e72842..6a58e59 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanDetailServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanDetailServiceImpl.java @@ -114,11 +114,7 @@ public class MaintainPlanDetailServiceImpl implements MaintainPlanDetailService if (StringUtils.isNotEmpty(busiLine)) { pageReqVO.setBusiLineList(Arrays.asList(busiLine.split(","))); } - - /*1.查询登录用户角色*/ -// Set batchNos = this.getBatchNosByLoginUserId(); -// pageReqVO.setLocalDateTime(LocalDateTime.now()); -// pageReqVO.setBatchNos(batchNos); + pageReqVO.setLocalDateTime(LocalDateTime.now()); /*2.分页*/ IPage mpPage = MyBatisUtils.buildPage(pageReqVO); IPage page = maintainPlanDetailMapper.appMaintainPlanDetailListByRoadPage(mpPage, pageReqVO); @@ -128,8 +124,6 @@ public class MaintainPlanDetailServiceImpl implements MaintainPlanDetailService @Override public List getMaintainNotFinishPlanCommitDetail(AppMaintainNotFinishPlanDetailReqVO reqVO) { - //完成状态 1:未完成;2:已完成;3:已失效 -// reqVO.setFinishState(1); reqVO.setLocalDateTime(LocalDateTime.now()); return maintainPlanDetailMapper.getMaintainNotFinishPlanCommitDetail(reqVO); } 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 b36aeba..616855d 100644 --- a/urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanDetailMapper.xml +++ b/urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanDetailMapper.xml @@ -30,12 +30,9 @@ b.begin_time, b.end_time FROM - garden_inspection_plan a, - garden_inspection_plan_detail b - WHERE - a.batch_no = b.batch_no - AND a.deleted = b.deleted - AND a.deleted = 0 + garden_inspection_plan a + INNER JOIN garden_inspection_plan_detail b ON a.batch_no = b.batch_no AND a.deleted = b.deleted + WHERE a.deleted = 0 AND a.batch_no = #{req.batchNo} AND a.company_id = #{req.companyId} AND a.dept_id = #{req.deptId} @@ -46,7 +43,22 @@ - and b.finish_state = #{req.finishState} + + + AND b.finish_state = 1 + = #{req.localDateTime}]]> + + + AND b.finish_state = 2 + + + AND b.finish_state = 3 + + + AND b.finish_state = 4 + + diff --git a/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanDetailMapper.xml b/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanDetailMapper.xml index 77e0fef..2a06f81 100644 --- a/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanDetailMapper.xml +++ b/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanDetailMapper.xml @@ -28,10 +28,9 @@ c.end_time, c.sort_num FROM - garden_maintain_plan a, - garden_maintain_plan_detail c - WHERE a.batch_no=c.batch_no - AND a.deleted=0 + garden_maintain_plan a + INNER JOIN garden_maintain_plan_detail c on a.batch_no=c.batch_no + WHERE a.deleted=0 AND a.road_id = #{req.roadId} AND a.plan_name LIKE CONCAT('%',#{req.planName},'%') @@ -46,7 +45,22 @@ AND a.batch_no= #{req.batchNo} - and a.finish_state = #{req.finishState} + + + AND c.finish_state = 1 + = #{req.localDateTime}]]> + + + AND c.finish_state = 2 + + + AND c.finish_state = 3 + + + AND c.finish_state = 4 + +