Commit b68ab0347bbe26db5e5a2eadd541123655d33480
1 parent
9f40ae38
app养护计划明细提交
Showing
6 changed files
with
16 additions
and
6 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanServiceImpl.java
| ... | ... | @@ -341,7 +341,11 @@ public class InspectionPlanServiceImpl implements InspectionPlanService { |
| 341 | 341 | } |
| 342 | 342 | |
| 343 | 343 | /*1.查询登录用户角色*/ |
| 344 | - Set<String> batchNos = getBatchNosByLoginUserId(); | |
| 344 | + Set<String> batchNos = this.getBatchNosByLoginUserId(); | |
| 345 | + if(CollectionUtils.isEmpty(batchNos)){ | |
| 346 | + return PageResult.empty(); | |
| 347 | + } | |
| 348 | + | |
| 345 | 349 | pageReqVO.setBatchNos(batchNos); |
| 346 | 350 | pageReqVO.setLocalDate(LocalDate.now()); |
| 347 | 351 | /*2.分页*/ | ... | ... |
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanServiceImpl.java
| ... | ... | @@ -347,6 +347,9 @@ public class MaintainPlanServiceImpl implements MaintainPlanService { |
| 347 | 347 | |
| 348 | 348 | /*1.查询登录用户计划编码列表*/ |
| 349 | 349 | Set<String> batchNos = this.getBatchNosByLoginUserId(); |
| 350 | + if(CollectionUtils.isEmpty(batchNos)){ | |
| 351 | + return PageResult.empty(); | |
| 352 | + } | |
| 350 | 353 | pageReqVO.setBatchNos(batchNos); |
| 351 | 354 | pageReqVO.setLocalDate(LocalDate.now()); |
| 352 | 355 | /*2.分页*/ |
| ... | ... | @@ -388,6 +391,9 @@ public class MaintainPlanServiceImpl implements MaintainPlanService { |
| 388 | 391 | } |
| 389 | 392 | /*1.查询登录用户计划编码列表*/ |
| 390 | 393 | Set<String> batchNos = this.getBatchNosByLoginUserId(); |
| 394 | + if(CollectionUtils.isEmpty(batchNos)){ | |
| 395 | + return PageResult.empty(); | |
| 396 | + } | |
| 391 | 397 | pageReqVO.setBatchNos(batchNos); |
| 392 | 398 | pageReqVO.setLocalDate(LocalDate.now()); |
| 393 | 399 | /*2.分页*/ | ... | ... |
urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanCommitMapper.xml
| ... | ... | @@ -38,6 +38,8 @@ |
| 38 | 38 | FROM |
| 39 | 39 | garden_inspection_plan_commit a, garden_inspection_plan b |
| 40 | 40 | where a.batch_no=b.batch_no |
| 41 | + AND a.deleted = b. deleted | |
| 42 | + AND a.deleted = 0 | |
| 41 | 43 | <if test="req.planNo != null and req.planNo !=''"> |
| 42 | 44 | and a.plan_no = #{req.planNo} |
| 43 | 45 | </if> | ... | ... |
urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanDetailMapper.xml
| ... | ... | @@ -21,7 +21,6 @@ |
| 21 | 21 | a.road_name, |
| 22 | 22 | a.plan_type_id, |
| 23 | 23 | a.level_id, |
| 24 | - a.plan_type_id, | |
| 25 | 24 | a.rate, |
| 26 | 25 | a.cycle_id, |
| 27 | 26 | b.sort_num, |
| ... | ... | @@ -35,9 +34,6 @@ |
| 35 | 34 | garden_inspection_plan_detail b |
| 36 | 35 | WHERE |
| 37 | 36 | a.batch_no = b.batch_no |
| 38 | - AND b.batch_no=c.batch_no | |
| 39 | - AND a.road_id=b.road_id | |
| 40 | - AND a.dept_id =b.dept_id | |
| 41 | 37 | AND a.deleted = b.deleted |
| 42 | 38 | AND a.deleted = 0 |
| 43 | 39 | AND a.batch_no = #{req.batchNo} | ... | ... |
urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanMapper.xml
| ... | ... | @@ -18,6 +18,7 @@ |
| 18 | 18 | a.batch_no, |
| 19 | 19 | a.road_id, |
| 20 | 20 | a.road_name, |
| 21 | + a.busi_line, | |
| 21 | 22 | a.plan_type_id, |
| 22 | 23 | a.level_id, |
| 23 | 24 | a.finish_state, |
| ... | ... | @@ -25,7 +26,7 @@ |
| 25 | 26 | a.end_time |
| 26 | 27 | FROM |
| 27 | 28 | garden_inspection_plan a |
| 28 | - WHERE a.deleted=0 | |
| 29 | + WHERE a.deleted = 0 | |
| 29 | 30 | <if test="req.roadName != null and req.roadName !=''"> |
| 30 | 31 | AND a.road_name LIKE CONCAT('%',#{req.roadName},'%') |
| 31 | 32 | </if> | ... | ... |
urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanCommitMapper.xml