修复sql错误

王富生
1 parent b68ab034
Showing 3 changed files with 7 additions and 6 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanCommitPageReqVO.java
urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanCommitMapper.xml
urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanCommitMapper.xml
@@ -2,7 +2,7 @@ package com.zteits.urbanops.module.garden.controller.app.maintainplan.vo;
 import com.zteits.urbanops.framework.common.pojo.PageParam;
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotEmpty;
 import lombok.Data;
 @Schema(description = "管理后台 - 未完成养护计划明细 Request VO")
@@ -10,7 +10,7 @@ import lombok.Data;
 public class AppMaintainPlanCommitPageReqVO extends PageParam {
     @Schema(description = "计划编码")
-    @NotBlank(message = "计划编码不能为空")
+    @NotEmpty(message = "计划编码不能为空")
     private String planNo;
 }
@@ -29,14 +29,13 @@
             a.finish_time as finishTime,
             a.user_id,
             a.user_name,
-            a.role_id,
-            a.role_name,
             a.remark,
             a.creator,
             a.creator_name,
             a.create_time
         FROM
-            garden_inspection_plan_commit a, garden_inspection_plan b
+            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
@@ -98,7 +98,8 @@
        a.company_id,
        a.dept_id,
        a.finish_percent,
-       c.role_name,
+       c.begin_img,
+       c.img_host
        c.finish_time,
        c.user_name
        FROM
@@ -107,6 +108,7 @@
        garden_maintain_plan_commit c
        WHERE
        a.batch_no = b.batch_no
+       AND a.batch_no = c.batch_no
        AND a.plan_no = c.plan_no
        AND a.finish_state = 2
        AND c.plan_no = #{req.planNo}