修复sq当前时间格式

王富生
1 parent c12cb982
Showing 9 changed files with 22 additions and 14 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainNotFinishPlanDetailReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanDetailListByRoadPageReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanPagePlanTypeReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/maintainplan/MaintainPlanDetailMapper.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanDetailServiceImpl.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanServiceImpl.java
urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanCommitMapper.xml
urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanDetailMapper.xml
urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanMapper.xml
@@ -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;
 }
@@ -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;
 }
@@ -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
@@ -58,6 +58,6 @@ public interface MaintainPlanDetailMapper extends BaseMapperX&lt;MaintainPlanDetail
      * @param reqVO 入参数
      * @return 列表
      */
-    List<AppMaintainNotFinishPlanDetailRespVO> getMaintainNotFinishPlanCommitDetail(AppMaintainNotFinishPlanDetailReqVO reqVO);
+    List<AppMaintainNotFinishPlanDetailRespVO> getMaintainNotFinishPlanCommitDetail(@Param("req") AppMaintainNotFinishPlanDetailReqVO reqVO);
 }
 \ No newline at end of file
@@ -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<String> batchNos = this.getBatchNosByLoginUserId();
-        pageReqVO.setLocalDate(LocalDate.now());
+        pageReqVO.setLocalDateTime(LocalDateTime.now());
         pageReqVO.setBatchNos(batchNos);
         /*2.分页*/
         IPage<AppMaintainPlanDetailRespVO> mpPage = MyBatisUtils.buildPage(pageReqVO);
@@ -121,6 +121,7 @@ public class MaintainPlanDetailServiceImpl implements MaintainPlanDetailService 
     public List<AppMaintainNotFinishPlanDetailRespVO> getMaintainNotFinishPlanCommitDetail(AppMaintainNotFinishPlanDetailReqVO reqVO) {
         //完成状态 1:未完成;2:已完成;3:已失效
         reqVO.setFinishState(1);
+        reqVO.setLocalDateTime(LocalDateTime.now());
         return maintainPlanDetailMapper.getMaintainNotFinishPlanCommitDetail(reqVO);
     }
@@ -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<AppMaintainPlanPagePlanTypeRespVO> mpPage = MyBatisUtils.buildPage(pageReqVO);
         IPage<AppMaintainPlanPagePlanTypeRespVO> page = maintainPlanMapper.appMaintainPlanPlanTypePage(mpPage, pageReqVO);
@@ -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
@@ -57,7 +57,7 @@
         </if>
         <if test="req.finishState == 1">
             and c.finish_state = #{req.finishState}
-            <![CDATA[and c.end_time >= #{req.localDate}]]>
+            <![CDATA[and c.end_time >= #{req.localDateTime}]]>
         </if>
     </select>
@@ -84,6 +84,6 @@
         AND a.plan_type_id = #{req.planTypeId}
         <!--状态 1:未完成;2:已完成;3:已失效-->
         and c.finish_state = #{req.finishState}
-        <![CDATA[and c.end_time >= #{req.localDate}]]>
+        <![CDATA[and c.end_time >= #{req.localDateTime}]]>
     </select>
 </mapper>
 \ No newline at end of file
@@ -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}
         <if test="req.planName != null and req.planName !=''">
@@ -93,14 +93,14 @@
         </if>
         <!--状态 1:未完成;2:已完成;3:已失效-->
         <if test="req.finishState == 3">
-            <![CDATA[and c.end_time < #{req.localDate}]]>
+            <![CDATA[and c.end_time < #{req.localDateTime}]]>
         </if>
         <if test="req.finishState == 2">
             and c.finish_state = #{req.finishState}
         </if>
         <if test="req.finishState == 1">
             and c.finish_state = #{req.finishState}
-            <![CDATA[and c.end_time >= #{req.localDate}]]>
+            <![CDATA[and c.end_time >= #{req.localDateTime}]]>
         </if>
     </select>