修改条件评估论证bug

resources/mapper/modules/route/RouteVerifyDao.xml

@@ -29,7 +29,7 @@
   </resultMap>
   <sql id="Base_Column_List" >
     id, verif_id, verify_status, report, form_id, form_text, depart_id, `condition`, create_by, 
-    create_date, update_by, update_date, remarks, del_flag, is_verify, status, start_time,back_status,
+    create_date, update_by, update_date, remarks, del_flag, is_verify, status, start_time,end_time,back_status,
     back_time,back_remarks,back_by,summary
   </sql>
 
@@ -108,19 +108,19 @@
 		</if> 
     </select>
     
-    <select id="findByVerifIdUserCode" resultMap="BaseResultMap">             
-        SELECT 
-        	<include refid="Base_Column_List" />      	
-        FROM foc_route_verify frv   
+    <select id="findByVerifIdUserCode" resultMap="BaseResultMap">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM foc_route_verify frv
         WHERE 1 = 1
-        <if test="verifId != null and verifId != ''" >
-          AND frv.verif_id = #{verifId}   
-        </if>  
-       	  AND frv.depart_id in (
-		  	select depart_id from sys_user_profiles 
-		  		where user_id = #{userCode})  
-    </select>        
-    
+        <if test="verifId != null and verifId != ''">
+            AND frv.verif_id = #{verifId}
+        </if>
+        AND frv.depart_id in (
+        select depart_id from sys_user_profiles
+        where user_id = #{userCode})
+    </select>
+
     <!-- 根据id获取foc_route_verify数据，userCode获取depart_id与本数据的depart_id比较 -->
     <select id="checkDepartIdWithUserCodeAndId" resultType="Long">             
         SELECT 

resources/mapper/modules/verify/CondationDao.xml

@@ -142,6 +142,7 @@
         select id as conditionId,
         `condition`,
         review_type,
+        route_id,
         is_feed as feedStatus
         from foc_verify_condition
         where id=#{conditionId}
@@ -326,7 +327,7 @@
         delete from foc_verify_condition
         where id in
         <foreach collection="list" item="item" index="index" open="(" close=")" separator=",">
-            ${item}
+            #{item}
         </foreach>
     </delete>
 
@@ -334,7 +335,7 @@
         DELETE FROM foc_condition_feedback
         WHERE condition_id in
         <foreach collection="list" item="item" index="index" open="(" close=")" separator=",">
-            ${item}
+            #{item}
         </foreach>
     </delete>
 

resources/mapper/modules/verify/VerifyFeedbackDao.xml

@@ -320,7 +320,7 @@
                 AND a.verif_id = #{verifId}
                 AND f.depart_id = #{userDepartId}
                 AND a.depart_id= #{departId}
-                -- group by a.verif_id,f.depart_id
+                group by a.verif_id,a.depart_id
             </when>
             <otherwise>
                 WHERE

src/com/ejweb/core/fetcher/HttpClientUtil.java

 package com.ejweb.core.fetcher;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.ejweb.core.conf.GConstants;
-import com.ejweb.core.security.GlobalUtil;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
 import org.apache.http.NameValuePair;
@@ -14,7 +10,10 @@ import org.apache.http.impl.client.HttpClients;
 import org.apache.http.message.BasicNameValuePair;
 import org.apache.http.util.EntityUtils;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
 import java.util.Map.Entry;
 
 /**
@@ -54,37 +53,4 @@ public class HttpClientUtil {
         }
         return result;
     }
-
-    public static void main(String[] args) {
+}
\ No newline at end of file
-
-        try {
-//            StringBuilder url = new StringBuilder("https://ewatch.okayapps.com/faq/api/user/login");
-            StringBuilder url = new StringBuilder("https://ewatch.okayapps.com/faq/api/ask/detail");
-
-            String loginName = "root";
-            String password = "1";
-            JSONObject content = new JSONObject();
-            content.put("appCode", "10001");
-            content.put("versionName", "1.0");
-            content.put("platform", "Android");
-            content.put("language", "zh_CN");
-            content.put("appCode", "10001");
-
-            content.put("loginName", "root");
-            content.put("password", "admin");
-            content.put("userCode", "userId");
-            content.put("id", "93648376039909180225");
-            Map<String, String> params = new HashMap<String, String>();
-            params.put("content", JSON.toJSONString(content));
-
-            String sign = GlobalUtil.getParamsSignStr(GConstants.SIGN_PRIVATE_KEY, params.get("content"));
-            params.put("sign", sign);
-            String res = HttpClientUtil.doPost(url.toString(), params, "UTF-8");
-//            JSONObject object = JSON.parseObject(res);
-            System.out.println(res);
-        } catch (Exception e) {
-            // TODO: handle exception
-            e.printStackTrace();
-        }
-    }
-}  
\ No newline at end of file

src/com/ejweb/modules/route/service/RouteVerifyService.java

@@ -406,7 +406,7 @@ public class RouteVerifyService extends BaseService<RouteVerifyDao> {
         return verifyConditionEntities;
     }
 
-    private void insertAirlineConclusion(RouteVerifyBean routeVerifyBean, String userCode) {
+    public void insertAirlineConclusion(RouteVerifyBean routeVerifyBean, String userCode) {
 
         // 查询foc_route_verify所有与传参verifId相同的数据的verifyStatus均为01时，foc_airline_conclusion插入一条数据
         // 判断是否全部论证部门完成论证

src/com/ejweb/modules/verify/api/VerifyFeedbackController.java

@@ -180,11 +180,11 @@ public class VerifyFeedbackController {
                 bean.setUpdateDate(new Date());
                 feedbackService.updateFeedback(bean);
                 // 提示有新的反馈
-                VerifyFeedbackStatusBean statusBean = new VerifyFeedbackStatusBean();
-                statusBean.setVerifId(bean.getVerifId());
-                statusBean.setStatus("1");
-                statusBean.setConditionId(bean.getConditionId());
-                feedbackService.updateStatus(statusBean);
+//                VerifyFeedbackStatusBean statusBean = new VerifyFeedbackStatusBean();
+//                statusBean.setVerifId(bean.getVerifId());
+//                statusBean.setStatus("1");
+//                statusBean.setConditionId(bean.getConditionId());
+//                feedbackService.updateStatus(statusBean);
                 return responseBean;
             }
         }

src/com/ejweb/modules/verify/data/ConditionDetailData.java

@@ -10,6 +10,7 @@ import java.util.Map;
  */
 public class ConditionDetailData {
     private String conditionId;
+    private String routeId;
     private String condition;
     private String conditionDate;
     private int feedStatus;
@@ -63,4 +64,12 @@ public class ConditionDetailData {
     public void setReviewType(String reviewType) {
         this.reviewType = reviewType;
     }
+
+    public String getRouteId() {
+        return routeId;
+    }
+
+    public void setRouteId(String routeId) {
+        this.routeId = routeId;
+    }
 }

src/com/ejweb/modules/verify/service/VerifyFeedbackService.java

@@ -8,8 +8,10 @@ import com.ejweb.core.base.PageEntity;
 import com.ejweb.core.exception.RecordNotExistException;
 import com.ejweb.modules.depart.dao.DepartDao;
 import com.ejweb.modules.depart.entity.DepartEntity;
+import com.ejweb.modules.route.bean.RouteVerifyBean;
 import com.ejweb.modules.route.dao.RouteVerifyDao;
 import com.ejweb.modules.route.entity.FullRouteVerifyEntity;
+import com.ejweb.modules.route.service.RouteVerifyService;
 import com.ejweb.modules.verify.bean.*;
 import com.ejweb.modules.verify.dao.AirlineVerifyDao;
 import com.ejweb.modules.verify.dao.ConditionDao;
@@ -48,6 +50,8 @@ public class VerifyFeedbackService extends BaseService<VerifyFeedbackDao> {
     DepartDao departDao;
     @Autowired
     RouteVerifyDao routeVerifyDao;
+    @Autowired
+    RouteVerifyService routeVerifyService;
 
     public PageEntity<VerifyFeedbackEntity> findList(VerifyFeedbackBean bean) {
         PageInfo<VerifyFeedbackEntity> pageInfo;
@@ -154,7 +158,26 @@ public class VerifyFeedbackService extends BaseService<VerifyFeedbackDao> {
                 ConditionUpdateBean updateBean = new ConditionUpdateBean();
                 updateBean.setReviewType(data.getReviewType());
                 updateBean.setConditionId(data.getConditionId());
+                //设置该条件完成
                 conditionDao.updateConditionComplete(updateBean);
+                //判断该条件提出部门提出的所有条件是否都完成，如果完成，设置部门由条件可行变为条件满足
+                //判断是否所有部门已经反馈完
+                FullRouteVerifyEntity fullRouteVerifyEntity = routeVerifyDao.selectByPrimaryKey(data.getRouteId());
+                int count = conditionDao.getUndoneCondition(fullRouteVerifyEntity.getId());
+                if (count != 0) {
+                    return true;
+                }
+                //条件可行变为条件满足
+                fullRouteVerifyEntity.setVerifyStatus("04");
+                //填写论证条件总结
+                fullRouteVerifyEntity.setSummary("各条件均无需复核，系统默认条件满足");
+                routeVerifyDao.updateByPrimaryKey(fullRouteVerifyEntity);
+                conditionDao.updateCompleteByRouteId(fullRouteVerifyEntity.getId());
+
+                //判断论证单所有部门论证是否完成，如果完成，进入论证总结阶段
+                RouteVerifyBean routeVerifyBean = new RouteVerifyBean();
+                routeVerifyBean.setVerifId(fullRouteVerifyEntity.getVerifId());
+                routeVerifyService.insertAirlineConclusion(routeVerifyBean, bean.getUserCode());
             } else {
                 dao.updateCondition(bean);
             }
@@ -243,7 +266,7 @@ public class VerifyFeedbackService extends BaseService<VerifyFeedbackDao> {
     }
 
     private List<ConditionDetailData> getConditionDetailData(VerifyFeedbackDetailBean verifyFeedbackBean) {
-         List<ConditionDetailData> conditions = dao.findByVerifyIdAndDepartId(verifyFeedbackBean);
+        List<ConditionDetailData> conditions = dao.findByVerifyIdAndDepartId(verifyFeedbackBean);
         List<ConditionDetailData> conditionList = new ArrayList<>();
         if (!CollectionUtils.isEmpty(conditions)) {
             for (ConditionDetailData data : conditions) {