Commit adc8eefc03f291009cd0aadedb084f9358ec562c

Authored by 王富生
1 parent c9a77016

app巡查汇总查询提交

urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/inspectionplan/vo/AppInspectionPlanDetailReqVO.java
@@ -20,14 +20,6 @@ public class AppInspectionPlanDetailReqVO { @@ -20,14 +20,6 @@ public class AppInspectionPlanDetailReqVO {
20 @NotBlank(message = "批次号不能为空") 20 @NotBlank(message = "批次号不能为空")
21 private String batchNo; 21 private String batchNo;
22 22
23 - @Schema(description = "道路id", requiredMode = Schema.RequiredMode.REQUIRED, example = "32704")  
24 - @NotNull(message = "道路id不能为空")  
25 - private Long roadId;  
26 -  
27 - @Schema(description = "养护类型:2001:浇水;2002:施肥;2003:有害生物防治;2004:修剪;2005:中耕除草;2006:打孔梳草;2007:绿地保洁;2008:园林废弃物收集运输 ;2009:补植;3001:绿地巡视;", requiredMode = Schema.RequiredMode.REQUIRED, example = "24742")  
28 - @NotNull(message = "养护类型不能为空")  
29 - private Integer planTypeId;  
30 -  
31 @Schema(description = "完成状态 1:未完成;2:已完成;3:已失效") 23 @Schema(description = "完成状态 1:未完成;2:已完成;3:已失效")
32 @NotNull(message = "完成状态不能为空") 24 @NotNull(message = "完成状态不能为空")
33 @Min(value = 1, message = "状态最小为1") 25 @Min(value = 1, message = "状态最小为1")
urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanDetailMapper.xml
@@ -41,8 +41,6 @@ @@ -41,8 +41,6 @@
41 AND a.deleted = b.deleted 41 AND a.deleted = b.deleted
42 AND a.deleted = 0 42 AND a.deleted = 0
43 AND a.batch_no = #{req.batchNo} 43 AND a.batch_no = #{req.batchNo}
44 - and a.road_id=#{req.roadId}  
45 - and a.plan_type_id=#{req.planTypeId}  
46 AND a.company_id = #{req.companyId} 44 AND a.company_id = #{req.companyId}
47 <if test="req.roleIds != null and req.roleIds.size() > 0"> 45 <if test="req.roleIds != null and req.roleIds.size() > 0">
48 AND c.role_id IN 46 AND c.role_id IN