调机修改

resources/mapper/modules/route/RouteVerifyDao.xml

@@ -328,7 +328,8 @@
       back_status = #{backStatus},
       back_time = #{backTime},
       back_by = #{backBy},
-      back_remarks= #{backRemarks}
+      back_remarks= #{backRemarks},
+      summary=#{summary}
     where id = #{id,jdbcType=VARCHAR}
   </update>
   <insert id="insertRouteFile">
@@ -392,9 +393,10 @@ LEFT JOIN foc_route_verify m on s.route_id=m.id
     </select>
 
     <select id="getAllDepart" resultType="com.ejweb.modules.verify.bean.DepartConditionBean">
-        select d.id as departId,d.depart_name
+        select d.id as departId,d.depart_name,v.verify_status
             from foc_route_verify v
             left join foc_user_depart d on v.depart_id=d.id
-        where v.verif_id=#{verifId} and v.del_flag=0
+        where v.verif_id=#{verifId} and v.del_flag=0 and
+        (v.verify_status='02' or v.verify_status='03' or v.verify_status='04')
     </select>
 </mapper>
\ No newline at end of file

resources/mapper/modules/verify/CondationDao.xml

@@ -54,12 +54,14 @@
         <include refid="CondationColumns"/>
         FROM
         foc_airline_verify a
+        LEFT JOIN foc_route_verify rf ON a.id=rf.verif_id
         LEFT JOIN foc_verify_condition s ON a.id=s.verif_id
         LEFT JOIN foc_airports p ON p.airport_iata = a.depIata
         LEFT JOIN foc_aircraft_type q ON q.id = a.aircraft_type
         LEFT JOIN foc_user_depart r ON s.depart_id=r.id
         WHERE
         a.del_flag = #{DEL_FLAG_NORMAL}
+        AND rf.status=1
         AND s.complete='0' AND is_feed='0'
         AND a.verif_status = '00'
         <if test="verifNo != null and verifNo != ''">
@@ -96,12 +98,6 @@
 
     </select>
 
-    <update id="updateByStatus">
-        UPDATE foc_verify_condition 
-        SET is_feed='1'
-        WHERE id= #{conditionId}
-    </update>
-
     <select id="getDetail" resultType="com.ejweb.modules.verify.entity.ConditionDetailEntity">
         SELECT 
          a.verif_id AS verifId,
@@ -127,6 +123,21 @@
         and verif_id=#{verifId}
     </select>
 
+    <select id="getConditionVerifyDetails" resultType="com.ejweb.modules.verify.data.ConditionVerifyDetailData">
+        select v.id as conditionId,
+        v.`condition`,
+        v.review_type,
+        v.is_feed as feedStatus,
+        case WHEN v.is_feed!='0' THEN DATE_FORMAT(v.update_date, '%Y-%m-%d')
+            else '' end conditionDate,
+        group_concat(f.depart_id) as departIds
+        from foc_verify_condition v
+        left join foc_condition_feedback f on v.id=f.condition_id
+        where v.depart_id=#{departId}
+        and v.verif_id=#{verifId}
+        group by v.id
+    </select>
+
     <select id="findById" resultType="com.ejweb.modules.verify.data.ConditionDetailData">
         select id as conditionId,
         `condition`,
@@ -193,10 +204,21 @@
        WHERE  condition_id= #{conditionId}
     </delete>
 
+    <delete id="deleteDepartFeedBack" parameterType="Map">
+        DELETE FROM foc_condition_feedback
+        WHERE condition_id= #{conditionId}
+        and depart_id in
+        <foreach collection="departIds" item="departId" separator="," open="(" close=")">
+            #{departId}
+        </foreach>
+
+    </delete>
+
 
-    <update id="updateFeedback">
+    <update id="updateFeedAndReviewType">
         UPDATE foc_verify_condition 
         SET is_feed='1',
+        review_type=#{reviewType},
          update_date=CURRENT_TIMESTAMP
         WHERE id= #{conditionId}
     </update>
@@ -339,4 +361,8 @@
         select id from foc_verify_condition
         where route_id=#{routeId}
     </select>
+
+    <select id="findDepartIdByCondition" resultType="java.lang.String">
+        select depart_id from foc_condition_feedback where condition_id=#{conditionId}
+    </select>
 </mapper>
\ No newline at end of file

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

@@ -261,6 +261,14 @@ public class RouteVerifyService extends BaseService<RouteVerifyDao> {
             LOG.info("记录为：" + recordAddBean.toString());
             recordDao.insert(recordAddBean);
         }
+
+        if ("0".equals(bean.getStatus())) {
+            fullRouteVerifyEntity.setEndTime(new Date());
+            if ("02".equals(verifyStatus) || "03".equals(verifyStatus)) {
+                saveOrCommitVerify(bean, verifyStatus, fullRouteVerifyEntity);
+            }
+        }
+
         if ("1".equals(bean.getStatus())) {
             fullRouteVerifyEntity.setEndTime(new Date());
             // 完成截止反馈通知置灰
@@ -278,19 +286,7 @@ public class RouteVerifyService extends BaseService<RouteVerifyDao> {
 
             // 论证意见为条件可行或不可行
             if ("02".equals(verifyStatus) || "03".equals(verifyStatus)) {
-                List<String> departConditions = conditionDao.getDepartConditions(bean);
-                for (FullVerifyConditionEntity condition : bean.getConditions()) {
-                    if (!StringUtils.isEmpty(condition.getId())) {
-                        if (departConditions.contains(condition.getId())) {
-                            departConditions.remove(condition.getId());
-                        }
-                    }
-                    this.addVerifyCondition(fullRouteVerifyEntity, verifyStatus, bean.getUserCode(), condition);
-                }
-                if (!CollectionUtils.isEmpty(departConditions)) {
-                    conditionDao.deleteConditionById(departConditions);
-                    conditionDao.deleteFeedbackBatch(departConditions);
-                }
+                saveOrCommitVerify(bean, verifyStatus, fullRouteVerifyEntity);
                 NotifyAddBean addbean = new NotifyAddBean();
                 StringBuffer sb = new StringBuffer();
 
@@ -347,6 +343,22 @@ public class RouteVerifyService extends BaseService<RouteVerifyDao> {
         return true;
     }
 
+    private void saveOrCommitVerify(VerifyStatusBean bean, String verifyStatus, FullRouteVerifyEntity fullRouteVerifyEntity) {
+        List<String> departConditions = conditionDao.getDepartConditions(bean);
+        for (FullVerifyConditionEntity condition : bean.getConditions()) {
+            if (!StringUtils.isEmpty(condition.getId())) {
+                if (departConditions.contains(condition.getId())) {
+                    departConditions.remove(condition.getId());
+                }
+            }
+            this.addVerifyCondition(fullRouteVerifyEntity, verifyStatus, bean.getUserCode(), condition);
+        }
+        if (!CollectionUtils.isEmpty(departConditions)) {
+            conditionDao.deleteConditionById(departConditions);
+            conditionDao.deleteFeedbackBatch(departConditions);
+        }
+    }
+
     @Transactional(readOnly = false)
     public void updateReport(VerifyStatusBean bean) throws Exception {
         dao.updateRouteVerifyReport(bean);
@@ -612,6 +624,7 @@ public class RouteVerifyService extends BaseService<RouteVerifyDao> {
         if (fullRouteVerifyEntity == null) {
             return "verifyId错误";
         }
+        fullRouteVerifyEntity.setEndTime(new Date());
         //论证状态可行
         String status1 = "01";
         //论证状态不可行

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

@@ -9,10 +9,7 @@ import com.ejweb.core.base.PageEntity;
 import com.ejweb.core.conf.ErrorCode;
 import com.ejweb.core.conf.GConstants;
 import com.ejweb.core.utils.excel.ExportExcel;
-import com.ejweb.modules.verify.bean.ConditionBean;
-import com.ejweb.modules.verify.bean.ConditionDetailBean;
-import com.ejweb.modules.verify.bean.ConditionUpdateBean;
-import com.ejweb.modules.verify.bean.VerifyFeedbackBean;
+import com.ejweb.modules.verify.bean.*;
 import com.ejweb.modules.verify.entity.ConditionDetailEntity;
 import com.ejweb.modules.verify.entity.ConditionEntity;
 import com.ejweb.modules.verify.entity.VerifyFeedbackEntity;
@@ -124,7 +121,7 @@ public class ConditionController {
         String message = conditionService.validate(bean);
         // 通过参数校验
         if (message == null) {
-            ConditionDetailEntity entity = conditionService.getDetail(bean);
+            ConditionVerifyDetailBean entity = conditionService.getDetail(bean);
             // 查询结果为空
             if (entity == null) {
                 responseBean.setMessage(GConstants.EMPTY);

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

 package com.ejweb.modules.verify.api;
 
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.ejweb.core.api.RequestBean;
 import com.ejweb.core.api.ResponseBean;
 import com.ejweb.core.conf.ErrorCode;
@@ -18,11 +11,17 @@ import com.ejweb.modules.verify.bean.VerifyProcessUpdateBean;
 import com.ejweb.modules.verify.entity.VerifyProcessGetlistEntity;
 import com.ejweb.modules.verify.entity.VerifyProcessListEntity;
 import com.ejweb.modules.verify.service.VerifyProcessService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
 
 /**
  * 时间节点Controller
- * @author lyw
  *
+ * @author lyw
  */
 @RestController
 @RequestMapping("/api/process")
@@ -33,6 +32,7 @@ public class VerifyProcessController {
 
     /**
      * 获取论证列表
+     *
      * @param requestBean
      * @return
      */
@@ -42,9 +42,11 @@ public class VerifyProcessController {
         ResponseBean responseBean = new ResponseBean();
         VerifyProcessListBean bean = requestBean.getObjectBean(VerifyProcessListBean.class);
         String message = verifyProcessService.validate(bean);
-        if(message == null){// 通过参数校验
+        // 通过参数校验
+        if (message == null) {
             VerifyProcessListEntity verifyProcessListEntity = verifyProcessService.getList(bean);
-            if(verifyProcessListEntity == null){// 查询结果为空
+            // 查询结果为空
+            if (verifyProcessListEntity == null) {
                 responseBean.setMessage(GConstants.EMPTY);
                 responseBean.setStatus(ErrorCode.STATUS_CODE_2001);
                 return responseBean;
@@ -60,6 +62,7 @@ public class VerifyProcessController {
 
     /**
      * 更新节点
+     *
      * @param requestBean
      * @return
      */
@@ -69,7 +72,8 @@ public class VerifyProcessController {
         ResponseBean responseBean = new ResponseBean();
         VerifyProcessUpdateBean bean = requestBean.getObjectBean(VerifyProcessUpdateBean.class);
         String message = verifyProcessService.validate(bean);
-        if(message == null){// 通过参数校验
+        // 通过参数校验
+        if (message == null) {
             verifyProcessService.update(bean);
             return responseBean;
         }
@@ -81,6 +85,7 @@ public class VerifyProcessController {
 
     /**
      * 新增节点
+     *
      * @param requestBean
      * @return
      */
@@ -90,7 +95,8 @@ public class VerifyProcessController {
         ResponseBean responseBean = new ResponseBean();
         VerifyProcessAddBean bean = requestBean.getObjectBean(VerifyProcessAddBean.class);
         String message = verifyProcessService.validate(bean);
-        if(message == null){// 通过参数校验
+        // 通过参数校验
+        if (message == null) {
             verifyProcessService.add(bean);
             return responseBean;
         }
@@ -102,6 +108,7 @@ public class VerifyProcessController {
 
     /**
      * 获取反馈信息
+     *
      * @param requestBean
      * @return
      */
@@ -111,9 +118,11 @@ public class VerifyProcessController {
         ResponseBean responseBean = new ResponseBean();
         VerifyProcessGetlistBean bean = requestBean.getObjectBean(VerifyProcessGetlistBean.class);
         String message = verifyProcessService.validate(bean);
-        if(message == null){// 通过参数校验
+        // 通过参数校验
+        if (message == null) {
             List<VerifyProcessGetlistEntity> list = verifyProcessService.getlist(bean);
-            if(list == null || list.size() == 0){// 查询结果为空
+            // 查询结果为空
+            if (list == null || list.size() == 0) {
                 responseBean.setMessage(GConstants.EMPTY);
                 responseBean.setStatus(ErrorCode.STATUS_CODE_2001);
                 return responseBean;

src/com/ejweb/modules/verify/bean/ConditionVerifyDetailBean.java

+/**
+ *
+ */
+package com.ejweb.modules.verify.bean;
+
+
+import com.ejweb.modules.verify.data.ConditionVerifyDetailData;
+
+import java.util.List;
+
+/**
+ * 审核详情页
+ * @team IT Team
+ * @author zhanglg
+ * @version 1.0
+ * @time 2016年9月12日
+ */
+
+public class ConditionVerifyDetailBean {
+    private String verifId;
+    private String routeId;
+    private String departId;
+    private String departName;
+    private String verifyStatus;
+    private List<ConditionVerifyDetailData> conditions;
+
+    public String getVerifId() {
+        return verifId;
+    }
+
+    public void setVerifId(String verifId) {
+        this.verifId = verifId;
+    }
+
+    public String getRouteId() {
+        return routeId;
+    }
+
+    public void setRouteId(String routeId) {
+        this.routeId = routeId;
+    }
+
+    public String getDepartId() {
+        return departId;
+    }
+
+    public void setDepartId(String departId) {
+        this.departId = departId;
+    }
+
+    public String getDepartName() {
+        return departName;
+    }
+
+    public void setDepartName(String departName) {
+        this.departName = departName;
+    }
+
+    public String getVerifyStatus() {
+        return verifyStatus;
+    }
+
+    public void setVerifyStatus(String verifyStatus) {
+        this.verifyStatus = verifyStatus;
+    }
+
+    public List<ConditionVerifyDetailData> getConditions() {
+        return conditions;
+    }
+
+    public void setConditions(List<ConditionVerifyDetailData> conditions) {
+        this.conditions = conditions;
+    }
+}

src/com/ejweb/modules/verify/bean/DepartConditionBean.java

@@ -13,6 +13,7 @@ import java.util.List;
 public class DepartConditionBean extends GenericBean {
     private String departId;
     private String departName;
+    private String verifyStatus;
     private List<ConditionDetailData> conditions;
 
     public String getDepartId() {
@@ -38,4 +39,12 @@ public class DepartConditionBean extends GenericBean {
     public void setConditions(List<ConditionDetailData> conditions) {
         this.conditions = conditions;
     }
+
+    public String getVerifyStatus() {
+        return verifyStatus;
+    }
+
+    public void setVerifyStatus(String verifyStatus) {
+        this.verifyStatus = verifyStatus;
+    }
 }

src/com/ejweb/modules/verify/dao/ConditionDao.java

@@ -10,6 +10,7 @@ import com.ejweb.modules.verify.bean.ConditionDetailBean;
 import com.ejweb.modules.verify.bean.ConditionUpdateBean;
 import com.ejweb.modules.verify.bean.FeedbackAddBean;
 import com.ejweb.modules.verify.data.ConditionDetailData;
+import com.ejweb.modules.verify.data.ConditionVerifyDetailData;
 import com.ejweb.modules.verify.entity.ConditionDetailEntity;
 import com.ejweb.modules.verify.entity.ConditionEntity;
 import com.ejweb.modules.verify.entity.FullVerifyConditionEntity;
@@ -33,11 +34,19 @@ public interface ConditionDao extends BaseDao {
 
     int insertfeedback(FeedbackAddBean feedbean);
 
-    int updateFeedback(ConditionUpdateBean bean);
+    int updateFeedAndReviewType(ConditionUpdateBean bean);
 
     int deleteFeedback(ConditionUpdateBean bean);
 
     /**
+     * 根据conditionID和部门id（集合）删除部门反馈
+     *
+     * @param map
+     * @return
+     */
+    int deleteDepartFeedBack(Map map);
+
+    /**
      * 根据条件ID删除所有部门反馈
      *
      * @param list
@@ -57,6 +66,8 @@ public interface ConditionDao extends BaseDao {
 
     List<ConditionDetailData> findByVerifyIdAndDepartId(@Param(value = "verifId") String verifId, @Param(value = "departId") String departId);
 
+    List<ConditionVerifyDetailData> getConditionVerifyDetails(@Param(value = "verifId") String verifId, @Param(value = "departId") String departId);
+
     List<VerifyManageEntity> findAllList(ConditionBean bean);
 
     Map<String, String> getCondition(String conditionId);
@@ -137,4 +148,12 @@ public interface ConditionDao extends BaseDao {
      * @return
      */
     List<String> getAllConditionIdByRouteId(String routeId);
+
+    /**
+     * 根据conditionId查询所有需要配合反馈部门ID
+     *
+     * @param conditionId
+     * @return
+     */
+    List<String> findDepartIdByCondition(String conditionId);
 }

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

+package com.ejweb.modules.verify.data;
+
+/**
+ * @Author: lisu
+ * @Date: 2020/4/1 17:31
+ * @Description: java类作用描述
+ */
+public class ConditionVerifyDetailData {
+    private String conditionId;
+    private String condition;
+    private String conditionDate;
+    private int feedStatus;
+    private String reviewType;
+    private String departIds;
+
+    public String getConditionId() {
+        return conditionId;
+    }
+
+    public void setConditionId(String conditionId) {
+        this.conditionId = conditionId;
+    }
+
+    public String getCondition() {
+        return condition;
+    }
+
+    public void setCondition(String condition) {
+        this.condition = condition;
+    }
+
+    public String getConditionDate() {
+        return conditionDate;
+    }
+
+    public void setConditionDate(String conditionDate) {
+        this.conditionDate = conditionDate;
+    }
+
+    public int getFeedStatus() {
+        return feedStatus;
+    }
+
+    public void setFeedStatus(int feedStatus) {
+        this.feedStatus = feedStatus;
+    }
+
+    public String getReviewType() {
+        return reviewType;
+    }
+
+    public void setReviewType(String reviewType) {
+        this.reviewType = reviewType;
+    }
+
+    public String getDepartIds() {
+        return departIds;
+    }
+
+    public void setDepartIds(String departIds) {
+        this.departIds = departIds;
+    }
+}

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

@@ -16,6 +16,7 @@ import com.ejweb.modules.verify.bean.ConditionUpdateBean.DepartIds;
 import com.ejweb.modules.verify.dao.AirlineVerifyDao;
 import com.ejweb.modules.verify.dao.ConditionDao;
 import com.ejweb.modules.verify.data.ConditionDetailData;
+import com.ejweb.modules.verify.data.ConditionVerifyDetailData;
 import com.ejweb.modules.verify.entity.AirlineVerifyDetailEntity;
 import com.ejweb.modules.verify.entity.ConditionDetailEntity;
 import com.ejweb.modules.verify.entity.ConditionEntity;
@@ -24,9 +25,11 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import freemarker.template.TemplateException;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import java.io.IOException;
 import java.util.*;
@@ -99,12 +102,16 @@ public class ConditionService extends BaseService<ConditionDao> {
     @Transactional(readOnly = false)
     public int updateAndAdd(ConditionUpdateBean bean) {
 
-        dao.updateFeedback(bean);
-        dao.deleteFeedback(bean);
+        dao.updateFeedAndReviewType(bean);
+        //根据conditionId查询条件配合反馈部门ID
+        List<String> departIds = dao.findDepartIdByCondition(bean.getConditionId());
         //更新condition是否需要复核字段0：不需要，1：需要
-        dao.updateReviewType(bean);
-        List<String> lst = new ArrayList<String>();
+        List<String> lst = new ArrayList<>();
         for (DepartIds departId : bean.getDepartIds()) {
+            if (departIds.contains(departId.getDepartId())) {
+                departIds.remove(departId.getDepartId());
+                continue;
+            }
             lst.add(departId.getDepartId());
             FeedbackAddBean feedbean = new FeedbackAddBean();
             feedbean.setConditionId(bean.getConditionId());
@@ -146,7 +153,13 @@ public class ConditionService extends BaseService<ConditionDao> {
             addbean.setConId(bean.getVerifId());
             notifyDao.saveNotify(addbean);
         }
-        sendmail(bean.getVerifId(), bean.getConditionId(), lst);
+        if (!CollectionUtils.isEmpty(departIds)) {
+            Map map = new HashMap(2);
+            map.put("conditionId", bean.getConditionId());
+            map.put("departIds", departIds);
+            dao.deleteDepartFeedBack(map);
+        }
+//        sendmail(bean.getVerifId(), bean.getConditionId(), lst);
         // 完成审核通知置灰
         NotifyAddBean addbean = new NotifyAddBean();
         addbean.setVerifId(bean.getConditionId());
@@ -179,13 +192,15 @@ public class ConditionService extends BaseService<ConditionDao> {
         return false;
     }
 
-    public ConditionDetailEntity getDetail(ConditionDetailBean bean) {
+    public ConditionVerifyDetailBean getDetail(ConditionDetailBean bean) {
         ConditionDetailEntity conditionDetailEntity = dao.getDetail(bean);
-        if (conditionDetailEntity != null) {
-            List<ConditionDetailData> conditionDetailData = dao.findByVerifyIdAndDepartId(bean.getVerifId(), bean.getDepartId());
-            conditionDetailEntity.setConditions(conditionDetailData);
+        ConditionVerifyDetailBean detailBean = new ConditionVerifyDetailBean();
+        BeanUtils.copyProperties(conditionDetailEntity, detailBean);
+        if (detailBean != null) {
+            List<ConditionVerifyDetailData> conditionDetailData = dao.getConditionVerifyDetails(bean.getVerifId(), bean.getDepartId());
+            detailBean.setConditions(conditionDetailData);
         }
-        return conditionDetailEntity;
+        return detailBean;
     }