From 9e5481a8804b661ec3f31456f00a31ca955e5288 Mon Sep 17 00:00:00 2001 From: wangfs <15029758498@163.com> Date: Sun, 14 Dec 2025 17:38:19 +0800 Subject: [PATCH] 修复sq当前时间格式 --- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainNotFinishPlanDetailReqVO.java | 6 ++++++ urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanDetailListByRoadPageReqVO.java | 4 ++-- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanPagePlanTypeReqVO.java | 4 ++-- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/maintainplan/MaintainPlanDetailMapper.java | 2 +- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanDetailServiceImpl.java | 5 +++-- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanServiceImpl.java | 2 +- urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanCommitMapper.xml | 3 ++- urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanDetailMapper.xml | 4 ++-- urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanMapper.xml | 6 +++--- 9 files changed, 22 insertions(+), 14 deletions(-) diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainNotFinishPlanDetailReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainNotFinishPlanDetailReqVO.java index fd951dc..f12926f 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainNotFinishPlanDetailReqVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainNotFinishPlanDetailReqVO.java @@ -6,6 +6,8 @@ import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; import lombok.Data; +import java.time.LocalDateTime; + @Schema(description = "管理后台 - 未完成养护计划明细 Request VO") @Data public class AppMaintainNotFinishPlanDetailReqVO { @@ -21,4 +23,8 @@ public class AppMaintainNotFinishPlanDetailReqVO { @Schema(description = "完成状态 1:未完成;2:已完成;3:已失效") @Hidden private Integer finishState; + + @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 930fd20..ca75eba 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 @@ -8,7 +8,7 @@ import jakarta.validation.constraints.Min; import jakarta.validation.constraints.NotNull; import lombok.Data; -import java.time.LocalDate; +import java.time.LocalDateTime; import java.util.List; import java.util.Set; @@ -40,5 +40,5 @@ public class AppMaintainPlanDetailListByRoadPageReqVO extends PageParam { @Schema(description = "系统时间") @Hidden - private LocalDate localDate; + private LocalDateTime localDateTime; } diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanPagePlanTypeReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanPagePlanTypeReqVO.java index 41fbc78..7b612dd 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanPagePlanTypeReqVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanPagePlanTypeReqVO.java @@ -8,7 +8,7 @@ import jakarta.validation.constraints.Min; import jakarta.validation.constraints.NotNull; import lombok.Data; -import java.time.LocalDate; +import java.time.LocalDateTime; import java.util.List; import java.util.Set; @@ -40,6 +40,6 @@ public class AppMaintainPlanPagePlanTypeReqVO extends PageParam { @Schema(description = "系统时间") @Hidden - private LocalDate localDate; + private LocalDateTime localDateTime; } \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/maintainplan/MaintainPlanDetailMapper.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/maintainplan/MaintainPlanDetailMapper.java index 690912c..7b26f68 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/maintainplan/MaintainPlanDetailMapper.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/maintainplan/MaintainPlanDetailMapper.java @@ -58,6 +58,6 @@ public interface MaintainPlanDetailMapper extends BaseMapperX getMaintainNotFinishPlanCommitDetail(AppMaintainNotFinishPlanDetailReqVO reqVO); + List getMaintainNotFinishPlanCommitDetail(@Param("req") AppMaintainNotFinishPlanDetailReqVO reqVO); } \ No newline at end of file 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 16daa79..6077987 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 @@ -23,7 +23,7 @@ import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import org.springframework.validation.annotation.Validated; -import java.time.LocalDate; +import java.time.LocalDateTime; import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -108,7 +108,7 @@ public class MaintainPlanDetailServiceImpl implements MaintainPlanDetailService /*1.查询登录用户角色*/ Set batchNos = this.getBatchNosByLoginUserId(); - pageReqVO.setLocalDate(LocalDate.now()); + pageReqVO.setLocalDateTime(LocalDateTime.now()); pageReqVO.setBatchNos(batchNos); /*2.分页*/ IPage mpPage = MyBatisUtils.buildPage(pageReqVO); @@ -121,6 +121,7 @@ public class MaintainPlanDetailServiceImpl implements MaintainPlanDetailService 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/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 fddbdf3..40f8c72 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 @@ -395,7 +395,7 @@ public class MaintainPlanServiceImpl implements MaintainPlanService { return PageResult.empty(); } pageReqVO.setBatchNos(batchNos); - pageReqVO.setLocalDate(LocalDate.now()); + pageReqVO.setLocalDateTime(LocalDateTime.now()); /*2.分页*/ IPage mpPage = MyBatisUtils.buildPage(pageReqVO); IPage page = maintainPlanMapper.appMaintainPlanPlanTypePage(mpPage, pageReqVO); 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 891ef03..e0502ab 100644 --- a/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanCommitMapper.xml +++ b/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanCommitMapper.xml @@ -96,10 +96,11 @@ a.begin_time, a.end_time, a.company_id, + a.finish_state, a.dept_id, a.finish_percent, c.begin_img, - c.img_host + c.img_host, c.finish_time, c.user_name FROM 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 793d5eb..7323e5b 100644 --- a/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanDetailMapper.xml +++ b/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanDetailMapper.xml @@ -57,7 +57,7 @@ and c.finish_state = #{req.finishState} - = #{req.localDate}]]> + = #{req.localDateTime}]]> @@ -84,6 +84,6 @@ AND a.plan_type_id = #{req.planTypeId} and c.finish_state = #{req.finishState} - = #{req.localDate}]]> + = #{req.localDateTime}]]> \ No newline at end of file diff --git a/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanMapper.xml b/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanMapper.xml index 318cc07..b550a2b 100644 --- a/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanMapper.xml +++ b/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanMapper.xml @@ -73,7 +73,7 @@ garden_maintain_plan_detail c WHERE a.batch_no = c.batch_no - AND a.deleted=b.deleted + AND a.deleted=c.deleted AND a.deleted=0 AND a.plan_type_id = #{req.planTypeId} @@ -93,14 +93,14 @@ - + and c.finish_state = #{req.finishState} and c.finish_state = #{req.finishState} - = #{req.localDate}]]> + = #{req.localDateTime}]]> -- libgit2 0.21.4