Commit 49af8eafd9ce86ac7bcb14b0d3b8aae1138926be
1 parent
774910da
refactor(garden): 优化派单任务和维护计划相关代码
- 移除 AssignTasksMapper 中无用的 import 语句 - 精简 MaintainPlanCommitMapper.xml 查询字段,移除 role_name 相关逻辑 - 注释掉 MaintainPlanCommitMapper.xml 中 roleName 的查询条件 - 调整 SQL 查询结构以提高可读性和执行效率
Showing
2 changed files
with
10 additions
and
1 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanCommitDetailPageRespVO.java
| 1 | package com.zteits.urbanops.module.garden.controller.app.maintainplan.vo; | 1 | package com.zteits.urbanops.module.garden.controller.app.maintainplan.vo; |
| 2 | 2 | ||
| 3 | +import cn.idev.excel.annotation.ExcelProperty; | ||
| 3 | import io.swagger.v3.oas.annotations.media.Schema; | 4 | import io.swagger.v3.oas.annotations.media.Schema; |
| 4 | import lombok.Data; | 5 | import lombok.Data; |
| 5 | 6 | ||
| @@ -64,4 +65,10 @@ public class AppMaintainPlanCommitDetailPageRespVO { | @@ -64,4 +65,10 @@ public class AppMaintainPlanCommitDetailPageRespVO { | ||
| 64 | @Schema(description = "执行时间") | 65 | @Schema(description = "执行时间") |
| 65 | private LocalDateTime endTime; | 66 | private LocalDateTime endTime; |
| 66 | 67 | ||
| 68 | + @Schema(description = "提交人用户ID", example = "王五") | ||
| 69 | + private String userName; | ||
| 70 | + | ||
| 71 | + @Schema(description = "备注", example = "你猜") | ||
| 72 | + private String remark; | ||
| 73 | + | ||
| 67 | } | 74 | } |
urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanCommitMapper.xml
| @@ -92,6 +92,7 @@ | @@ -92,6 +92,7 @@ | ||
| 92 | b.plan_num, | 92 | b.plan_num, |
| 93 | b.busi_line, | 93 | b.busi_line, |
| 94 | b.plan_finish_num, | 94 | b.plan_finish_num, |
| 95 | + b.rate, | ||
| 95 | a.begin_time, | 96 | a.begin_time, |
| 96 | a.end_time, | 97 | a.end_time, |
| 97 | a.company_id, | 98 | a.company_id, |
| @@ -101,7 +102,8 @@ | @@ -101,7 +102,8 @@ | ||
| 101 | c.begin_img, | 102 | c.begin_img, |
| 102 | c.img_host, | 103 | c.img_host, |
| 103 | c.finish_time, | 104 | c.finish_time, |
| 104 | - c.user_name | 105 | + c.user_name, |
| 106 | + c.remark | ||
| 105 | FROM | 107 | FROM |
| 106 | garden_maintain_plan_detail a, | 108 | garden_maintain_plan_detail a, |
| 107 | garden_maintain_plan b, | 109 | garden_maintain_plan b, |