BJ_FS / urbanops

Commit c12cb98233f9b062958809322cb291af3f376b69

Authored by 王富生
1 parent b68ab034

修复sql错误

Inline Side-by-side
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
  View file @c12cb98
... ... @@ -2,7 +2,7 @@ package com.zteits.urbanops.module.garden.controller.app.maintainplan.vo;
2 2  
3 3 import com.zteits.urbanops.framework.common.pojo.PageParam;
4 4 import io.swagger.v3.oas.annotations.media.Schema;
5   -import jakarta.validation.constraints.NotBlank;
  5 +import jakarta.validation.constraints.NotEmpty;
6 6 import lombok.Data;
7 7  
8 8 @Schema(description = "管理后台 - 未完成养护计划明细 Request VO")
... ... @@ -10,7 +10,7 @@ import lombok.Data;
10 10 public class AppMaintainPlanCommitPageReqVO extends PageParam {
11 11  
12 12 @Schema(description = "计划编码")
13   - @NotBlank(message = "计划编码不能为空")
  13 + @NotEmpty(message = "计划编码不能为空")
14 14 private String planNo;
15 15  
16 16 }
... ...
urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanCommitMapper.xml
  View file @c12cb98
... ... @@ -29,14 +29,13 @@
29 29 a.finish_time as finishTime,
30 30 a.user_id,
31 31 a.user_name,
32   - a.role_id,
33   - a.role_name,
34 32 a.remark,
35 33 a.creator,
36 34 a.creator_name,
37 35 a.create_time
38 36 FROM
39   - garden_inspection_plan_commit a, garden_inspection_plan b
  37 + garden_inspection_plan_commit a,
  38 + garden_inspection_plan b
40 39 where a.batch_no=b.batch_no
41 40 AND a.deleted = b. deleted
42 41 AND a.deleted = 0
... ...
urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanCommitMapper.xml
  View file @c12cb98
... ... @@ -98,7 +98,8 @@
98 98 a.company_id,
99 99 a.dept_id,
100 100 a.finish_percent,
101   - c.role_name,
  101 + c.begin_img,
  102 + c.img_host
102 103 c.finish_time,
103 104 c.user_name
104 105 FROM
... ... @@ -107,6 +108,7 @@
107 108 garden_maintain_plan_commit c
108 109 WHERE
109 110 a.batch_no = b.batch_no
  111 + AND a.batch_no = c.batch_no
110 112 AND a.plan_no = c.plan_no
111 113 AND a.finish_state = 2
112 114 AND c.plan_no = #{req.planNo}
... ...