BJ_FS / urbanops

Commit a5cfb23ddb80bd98afcf76dfbe256fa8b9dfdb02

Authored by 王彪总
1 parent bbdc1308

临时提交

Inline Side-by-side
Showing 9 changed files with 51 additions and 15 deletions
urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/framework/flowable/config/BpmFlowableConfiguration.java
  View file @a5cfb23
... ... @@ -92,4 +92,4 @@ public class BpmFlowableConfiguration {
92 92 return new BpmProcessInstanceEventPublisher(publisher);
93 93 }
94 94  
95   -}
96 95 \ No newline at end of file
  96 +}
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanCommitSaveReqVO.java
  View file @a5cfb23
... ... @@ -48,4 +48,4 @@ public class AppMaintainPlanCommitSaveReqVO {
48 48  
49 49  
50 50  
51   -}
52 51 \ No newline at end of file
  52 +}
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanCommitServiceImpl.java
  View file @a5cfb23
... ... @@ -96,7 +96,7 @@ public class MaintainPlanCommitServiceImpl implements MaintainPlanCommitService
96 96  
97 97 int sortNum = maintainPlanDetailDO.getPlanFinishNum() +1;
98 98 /*3.查询已完成比例*/
99   - int finishPercent = maintainPlanCommitMapper.selectFinishPercent(createReqVO.getPlanNo(), sortNum);
  99 +// int finishPercent = maintainPlanCommitMapper.selectFinishPercent(createReqVO.getPlanNo(), sortNum);
100 100  
101 101 MaintainPlanCommitDO commitDO = new MaintainPlanCommitDO();
102 102 commitDO.setBatchNo(maintainPlanDO.getBatchNo());
... ... @@ -108,7 +108,7 @@ public class MaintainPlanCommitServiceImpl implements MaintainPlanCommitService
108 108 commitDO.setCompanyId(maintainPlanDO.getCompanyId());
109 109 commitDO.setDeptId(maintainPlanDO.getDeptId());
110 110 commitDO.setRoadId(maintainPlanDO.getRoadId());
111   - commitDO.setFinishPercent(createReqVO.getTotalFinishPercent() - finishPercent);
  111 + commitDO.setFinishPercent(createReqVO.getTotalFinishPercent());
112 112 commitDO.setImgHost(createReqVO.getImgHost());
113 113 commitDO.setBeginImg(JSONObject.toJSONString(createReqVO.getBeginImg()));
114 114 commitDO.setProcessImg("[]");
... ... @@ -316,4 +316,4 @@ public class MaintainPlanCommitServiceImpl implements MaintainPlanCommitService
316 316 });
317 317 }
318 318  
319   -}
320 319 \ No newline at end of file
  320 +}
... ...
urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanDetailMapper.xml
  View file @a5cfb23
... ... @@ -46,6 +46,7 @@
46 46 </if>
47 47 <!--状态 1:未完成;2:已完成;3:已失效-->
48 48 <if test="req.finishState == 3">
  49 + and b.finish_state = #{req.finishState}
49 50 <![CDATA[and b.end_time < #{req.localDateTime}]]>
50 51 </if>
51 52 <if test="req.finishState == 2">
... ... @@ -60,4 +61,4 @@
60 61 </select>
61 62  
62 63  
63   -</mapper>
64 64 \ No newline at end of file
  65 +</mapper>
... ...
urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanMapper.xml
  View file @a5cfb23
... ... @@ -54,7 +54,6 @@
54 54 </if>
55 55 <if test="req.finishState == 1">
56 56 and b.finish_state = #{req.finishState}
57   - <![CDATA[and a.end_time >= #{req.localDate}]]>
58 57 <![CDATA[and b.end_time >= #{req.localDate}]]>
59 58 <![CDATA[and b.begin_time <= #{req.localDate}]]>
60 59 </if>
... ...
urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanCommitMapper.xml
  View file @a5cfb23
... ... @@ -104,7 +104,7 @@
104 104 a.company_id,
105 105 a.finish_state,
106 106 a.dept_id,
107   - c.finish_percent,
  107 +<!-- c.finish_percent,-->
108 108 c.begin_img,
109 109 c.img_host,
110 110 c.finish_time,
... ... @@ -123,7 +123,7 @@
123 123  
124 124 <select id="selectFinishPercent" resultType="java.lang.Integer">
125 125 SELECT
126   - sum(a.finish_percent) as finishPercent,
  126 + sum(a.finish_percent) as finishPercent
127 127 FROM
128 128 garden_maintain_plan_commit a
129 129 WHERE
... ...
urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanDetailMapper.xml
  View file @a5cfb23
... ... @@ -23,6 +23,7 @@
23 23 a.cycle_id,
24 24 c.plan_num,
25 25 c.plan_finish_num,
  26 +<!-- c.finish_percent,-->
26 27 c.finish_state,
27 28 c.begin_time,
28 29 c.end_time,
... ... @@ -33,8 +34,6 @@
33 34 WHERE a.batch_no=c.batch_no
34 35 AND a.deleted=0
35 36 AND a.road_id = #{req.roadId}
36   - <!--状态 1:未完成;2:已完成;3:已失效-->
37   - AND a.finish_state = #{req.finishState}
38 37 <if test="req.planName != null and req.planName !=''">
39 38 AND a.plan_name LIKE CONCAT('%',#{req.planName},'%')
40 39 </if>
... ... @@ -50,6 +49,20 @@
50 49 #{batchNo}
51 50 </foreach>
52 51 </if>
  52 + <!--状态 1:未完成;2:已完成;3:已失效-->
  53 + <if test="req.finishState == 3">
  54 + and a.finish_state = #{req.finishState}
  55 + <![CDATA[and c.end_time < #{req.localDateTime}]]>
  56 + </if>
  57 + <if test="req.finishState == 2">
  58 + and c.finish_state = #{req.finishState}
  59 + </if>
  60 + <if test="req.finishState == 1">
  61 + and c.finish_state = #{req.finishState}
  62 + <![CDATA[and c.end_time >= #{req.localDateTime}]]>
  63 + <![CDATA[and c.begin_time <= #{req.localDateTime}]]>
  64 +
  65 + </if>
53 66 </select>
54 67  
55 68 <select id="getMaintainNotFinishPlanCommitDetail" resultType="com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainNotFinishPlanDetailRespVO">
... ...
urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanMapper.xml
  View file @a5cfb23
... ... @@ -30,7 +30,6 @@
30 30 garden_maintain_plan_detail b ON a.batch_no = b.batch_no
31 31 AND a.deleted = b.deleted
32 32 WHERE a.deleted = 0
33   - and b.finish_state = #{req.finishState}
34 33 <if test="req.roadName != null and req.roadName !=''">
35 34 AND a.road_name LIKE CONCAT('%',#{req.roadName},'%')
36 35 </if>
... ... @@ -46,6 +45,19 @@
46 45 #{busiLine}
47 46 </foreach>
48 47 </if>
  48 + <!--状态 1:未完成;2:已完成;3:已失效-->
  49 + <if test="req.finishState == 3">
  50 + and b.finish_state = #{req.finishState}
  51 + <![CDATA[and a.end_time < #{req.localDate}]]>
  52 + </if>
  53 + <if test="req.finishState == 2">
  54 + and b.finish_state = #{req.finishState}
  55 + </if>
  56 + <if test="req.finishState == 1">
  57 + and b.finish_state = #{req.finishState}
  58 + <![CDATA[and b.end_time >= #{req.localDate}]]>
  59 + <![CDATA[and b.begin_time <= #{req.localDate}]]>
  60 + </if>
49 61 </select>
50 62  
51 63 <select id="appMaintainPlanPlanTypePage" resultType="com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanPagePlanTypeRespVO">
... ... @@ -69,8 +81,6 @@
69 81 AND a.deleted=c.deleted
70 82 AND a.deleted=0
71 83 AND a.plan_type_id = #{req.planTypeId}
72   - <!--状态 1:未完成;2:已完成;3:已失效-->
73   - AND c.finish_state = #{req.finishState}
74 84 <if test="req.planName != null and req.planName !=''">
75 85 AND a.plan_type_id LIKE CONCAT('%',#{req.planName},'%')
76 86 </if>
... ... @@ -86,6 +96,20 @@
86 96 #{busiLine}
87 97 </foreach>
88 98 </if>
  99 + <!--状态 1:未完成;2:已完成;3:已失效-->
  100 + <if test="req.finishState == 3">
  101 + and c.finish_state = #{req.finishState}
  102 + <![CDATA[and c.end_time < #{req.localDateTime}]]>
  103 + </if>
  104 + <if test="req.finishState == 2">
  105 + and c.finish_state = #{req.finishState}
  106 + </if>
  107 + <if test="req.finishState == 1">
  108 + and c.finish_state = #{req.finishState}
  109 + <![CDATA[and c.end_time >= #{req.localDateTime}]]>
  110 + <![CDATA[and c.begin_time <= #{req.localDateTime}]]>
  111 +
  112 + </if>
89 113 </select>
90 114  
91 115 </mapper>
... ...
urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/api/dept/DeptApi.java
  View file @a5cfb23
... ... @@ -3,7 +3,6 @@ package com.zteits.urbanops.module.system.api.dept;
3 3 import com.zteits.urbanops.framework.common.util.collection.CollectionUtils;
4 4 import com.zteits.urbanops.module.system.api.dept.dto.DeptRespDTO;
5 5 import com.zteits.urbanops.module.system.controller.admin.dept.vo.dept.DeptRespVO;
6   -import com.zteits.urbanops.module.system.dal.dataobject.dept.DeptDO;
7 6  
8 7 import java.util.Collection;
9 8 import java.util.List;
... ...