临时提交

王彪总
1 parent bbdc1308
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
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanCommitSaveReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanCommitServiceImpl.java
urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanDetailMapper.xml
urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanMapper.xml
urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanCommitMapper.xml
urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanDetailMapper.xml
urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanMapper.xml
urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/api/dept/DeptApi.java
@@ -92,4 +92,4 @@ public class BpmFlowableConfiguration {
         return new BpmProcessInstanceEventPublisher(publisher);
     }
-}
 \ No newline at end of file
+}
@@ -48,4 +48,4 @@ public class AppMaintainPlanCommitSaveReqVO {
-}
 \ No newline at end of file
+}
@@ -96,7 +96,7 @@ public class MaintainPlanCommitServiceImpl implements MaintainPlanCommitService 
         int sortNum = maintainPlanDetailDO.getPlanFinishNum() +1;
         /*3.查询已完成比例*/
-        int finishPercent = maintainPlanCommitMapper.selectFinishPercent(createReqVO.getPlanNo(), sortNum);
+//        int finishPercent = maintainPlanCommitMapper.selectFinishPercent(createReqVO.getPlanNo(), sortNum);
         MaintainPlanCommitDO commitDO = new MaintainPlanCommitDO();
         commitDO.setBatchNo(maintainPlanDO.getBatchNo());
@@ -108,7 +108,7 @@ public class MaintainPlanCommitServiceImpl implements MaintainPlanCommitService 
         commitDO.setCompanyId(maintainPlanDO.getCompanyId());
         commitDO.setDeptId(maintainPlanDO.getDeptId());
         commitDO.setRoadId(maintainPlanDO.getRoadId());
-        commitDO.setFinishPercent(createReqVO.getTotalFinishPercent() - finishPercent);
+        commitDO.setFinishPercent(createReqVO.getTotalFinishPercent());
         commitDO.setImgHost(createReqVO.getImgHost());
         commitDO.setBeginImg(JSONObject.toJSONString(createReqVO.getBeginImg()));
         commitDO.setProcessImg("[]");
@@ -316,4 +316,4 @@ public class MaintainPlanCommitServiceImpl implements MaintainPlanCommitService 
         });
     }
-}
 \ No newline at end of file
+}
@@ -46,6 +46,7 @@
         </if>
         <!--状态 1:未完成;2:已完成;3:已失效-->
         <if test="req.finishState == 3">
+            and b.finish_state = #{req.finishState}
             <![CDATA[and b.end_time < #{req.localDateTime}]]>
         </if>
         <if test="req.finishState == 2">
@@ -60,4 +61,4 @@
     </select>
-</mapper>
 \ No newline at end of file
+</mapper>
@@ -54,7 +54,6 @@
         </if>
         <if test="req.finishState == 1">
             and b.finish_state = #{req.finishState}
-            <![CDATA[and a.end_time >= #{req.localDate}]]>
             <![CDATA[and b.end_time >= #{req.localDate}]]>
             <![CDATA[and b.begin_time <= #{req.localDate}]]>
         </if>
@@ -104,7 +104,7 @@
        a.company_id,
        a.finish_state,
        a.dept_id,
-       c.finish_percent,
+<!--       c.finish_percent,-->
        c.begin_img,
        c.img_host,
        c.finish_time,
@@ -123,7 +123,7 @@
     <select id="selectFinishPercent" resultType="java.lang.Integer">
         SELECT
-         sum(a.finish_percent) as finishPercent,
+         sum(a.finish_percent) as finishPercent
         FROM
         garden_maintain_plan_commit a
         WHERE
@@ -23,6 +23,7 @@
         a.cycle_id,
         c.plan_num,
         c.plan_finish_num,
+<!--        c.finish_percent,-->
         c.finish_state,
         c.begin_time,
         c.end_time,
@@ -33,8 +34,6 @@
         WHERE a.batch_no=c.batch_no
         AND a.deleted=0
         AND a.road_id = #{req.roadId}
-        <!--状态 1:未完成;2:已完成;3:已失效-->
-        AND a.finish_state = #{req.finishState}
         <if test="req.planName != null and req.planName !=''">
             AND a.plan_name LIKE CONCAT('%',#{req.planName},'%')
         </if>
@@ -50,6 +49,20 @@
                 #{batchNo}
             </foreach>
         </if>
+        <!--状态 1:未完成;2:已完成;3:已失效-->
+        <if test="req.finishState == 3">
+            and a.finish_state = #{req.finishState}
+            <![CDATA[and c.end_time < #{req.localDateTime}]]>
+        </if>
+        <if test="req.finishState == 2">
+            and c.finish_state = #{req.finishState}
+        </if>
+        <if test="req.finishState == 1">
+            and c.finish_state = #{req.finishState}
+            <![CDATA[and c.end_time >= #{req.localDateTime}]]>
+            <![CDATA[and c.begin_time <= #{req.localDateTime}]]>
+
+        </if>
     </select>
     <select id="getMaintainNotFinishPlanCommitDetail" resultType="com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainNotFinishPlanDetailRespVO">
@@ -30,7 +30,6 @@
         garden_maintain_plan_detail b ON a.batch_no = b.batch_no
         AND a.deleted = b.deleted
         WHERE a.deleted = 0
-        and b.finish_state = #{req.finishState}
          <if test="req.roadName != null and req.roadName !=''">
             AND a.road_name LIKE CONCAT('%',#{req.roadName},'%')
         </if>
@@ -46,6 +45,19 @@
                 #{busiLine}
             </foreach>
         </if>
+        <!--状态 1:未完成;2:已完成;3:已失效-->
+        <if test="req.finishState == 3">
+            and b.finish_state = #{req.finishState}
+            <![CDATA[and a.end_time < #{req.localDate}]]>
+        </if>
+        <if test="req.finishState == 2">
+            and b.finish_state = #{req.finishState}
+        </if>
+        <if test="req.finishState == 1">
+            and b.finish_state = #{req.finishState}
+            <![CDATA[and b.end_time >= #{req.localDate}]]>
+            <![CDATA[and b.begin_time <= #{req.localDate}]]>
+        </if>
     </select>
     <select id="appMaintainPlanPlanTypePage" resultType="com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanPagePlanTypeRespVO">
@@ -69,8 +81,6 @@
         AND a.deleted=c.deleted
           AND a.deleted=0
           AND a.plan_type_id = #{req.planTypeId}
-        <!--状态 1:未完成;2:已完成;3:已失效-->
-         AND c.finish_state = #{req.finishState}
         <if test="req.planName != null and req.planName !=''">
             AND a.plan_type_id LIKE CONCAT('%',#{req.planName},'%')
         </if>
@@ -86,6 +96,20 @@
                 #{busiLine}
             </foreach>
         </if>
+        <!--状态 1:未完成;2:已完成;3:已失效-->
+        <if test="req.finishState == 3">
+            and c.finish_state = #{req.finishState}
+            <![CDATA[and c.end_time < #{req.localDateTime}]]>
+        </if>
+        <if test="req.finishState == 2">
+            and c.finish_state = #{req.finishState}
+        </if>
+        <if test="req.finishState == 1">
+            and c.finish_state = #{req.finishState}
+            <![CDATA[and c.end_time >= #{req.localDateTime}]]>
+            <![CDATA[and c.begin_time <= #{req.localDateTime}]]>
+
+        </if>
     </select>
 </mapper>
@@ -3,7 +3,6 @@ package com.zteits.urbanops.module.system.api.dept;
 import com.zteits.urbanops.framework.common.util.collection.CollectionUtils;
 import com.zteits.urbanops.module.system.api.dept.dto.DeptRespDTO;
 import com.zteits.urbanops.module.system.controller.admin.dept.vo.dept.DeptRespVO;
-import com.zteits.urbanops.module.system.dal.dataobject.dept.DeptDO;
 import java.util.Collection;
 import java.util.List;