调机修改

resources/mapper/modules/route/RouteVerifyDao.xml

@@ -390,4 +390,11 @@ LEFT JOIN foc_route_verify m on s.route_id=m.id
          <select id="getDepartId" resultType="String">
         SELECT depart_id FROM sys_user_profiles a WHERE a.user_id = #{userCode}
     </select>
+
+    <select id="getAllDepart" resultType="com.ejweb.modules.verify.bean.DepartConditionBean">
+        select d.id as departId,d.depart_name
+            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
+    </select>
 </mapper>
\ No newline at end of file

resources/mapper/modules/verify/CondationDao.xml

@@ -149,7 +149,7 @@
     </select>
 
     <update id="updateConditionComplete">
-        update foc_verify_condition set complete=1,
+        update foc_verify_condition set
         <choose>
             <when test="reviewType==1">
                 is_feed=3
@@ -331,7 +331,7 @@
 
     <update id="updateCompleteByRouteId">
         update foc_verify_condition
-        set complete=1
+        set complete=1,condition_status=4
         where route_id=#{routeId}
     </update>
 

resources/mapper/modules/verify/VerifyFeedbackDao.xml

@@ -193,6 +193,74 @@
         group by a.id
 
     </select>
+
+
+    <select id="findList4" resultType="com.ejweb.modules.verify.entity.VerifyFeedbackEntity">
+        select a.id AS verifId,
+        a.priority ,
+        a.apply_no,
+        a.verif_no as verifNo,
+        a.flight_no ,
+        a.aircraft_type ,
+        a.arrIata,
+        a.depIata,
+        a.verif_status ,
+        a.verif_type ,
+        a.start_time AS sailingDate,
+        DATE_FORMAT(a.create_date, '%Y-%m-%d') AS createDate,
+        q.type_name AS aircraftName,
+        CASE WHEN a.verif_type='01' OR a.verif_type='02'
+        OR a.verif_type='03' OR a.verif_type='04' OR a.verif_type='05'
+        THEN p.city_name
+        ELSE p.airport_name
+        END depName,
+        depart_name,
+        r.city_name AS arrName
+        from
+        foc_airline_verify a
+        LEFT JOIN foc_route_verify s ON a.id=s.verif_id
+        LEFT JOIN foc_airports p ON p.airport_iata = a.depIata
+        LEFT JOIN foc_airports r ON r.airport_iata = a.arrIata
+        LEFT JOIN foc_aircraft_type q ON q.id = a.aircraft_type
+        LEFT JOIN foc_user_depart d ON s.depart_id=d.id
+        WHERE (s.verify_status='03' or s.verify_status='04')
+        <if test="verifNo != null and verifNo != ''">
+            AND a.verif_no LIKE CONCAT('%', #{verifNo}, '%')
+        </if>
+        <if test="departType != null and departType != ''">
+            AND a.departType = #{departType}
+        </if>
+        <if test="arrIata != null and arrIata != ''">
+            AND (a.id in (
+            SELECT id FROM foc_airline_verify where arrIata = #{arrIata} ) OR a.id IN
+            (SELECT verif_id FROM foc_airline_connect WHERE arrIata = #{arrIata} AND is_main != '0')
+
+            )
+        </if>
+        <if test="depIata != null and depIata != ''">
+            AND (a.id in (
+            SELECT id FROM foc_airline_verify where depIata = #{depIata} ) OR a.id IN
+            (SELECT verif_id FROM foc_airline_connect WHERE depIata = #{depIata} AND is_main != '0')
+
+            )
+        </if>
+        <if test="priority != null and priority != ''">
+            AND a.priority = #{priority}
+        </if>
+        <if test="verifType != null and verifType != ''">
+            AND a.verif_type = #{verifType}
+        </if>
+        <if test="verifStatus != null and verifStatus != ''">
+            AND a.verif_status = #{verifStatus}
+        </if>
+        <if test="aircraftType != null and aircraftType != ''">
+            AND a.aircraft_type = #{aircraftType}
+        </if>
+        group by a.id
+
+
+    </select>
+
     <!-- 本部门论证条件评估列表 -->
     <select id="findList1" resultType="com.ejweb.modules.verify.entity.VerifyFeedbackEntity">
         SELECT
@@ -325,6 +393,7 @@
           AND del_flag = #{DEL_FLAG_NORMAL}
           AND depart_id = #{departId}
     </update>
+
     <!-- 修改反已经评估的馈状态 -->
     <update id="updateCondition">
         UPDATE foc_verify_condition 
@@ -337,7 +406,7 @@
         select count(id)
         from foc_verify_condition
         where verif_id=#{verifyId}
-        and complete=0
+        and ((is_feed!=2 and review_type=0) or (is_feed!=3 and review_type=1))
         and del_flag=0
     </select>
     <!-- 查询未反馈论证条件评估的数量 -->

src/com/ejweb/modules/route/dao/RouteVerifyDao.java

@@ -13,6 +13,8 @@ import com.ejweb.modules.route.entity.FullRouteVerifyEntity;
 import com.ejweb.modules.route.entity.RouteVerifyDetailEntity;
 import com.ejweb.modules.route.entity.RouteVerifyEntity;
 import com.ejweb.modules.verify.bean.AirlineVerifyUpdateStatusBean;
+import com.ejweb.modules.verify.bean.DepartConditionBean;
+import com.ejweb.modules.verify.bean.VerifyFeedbackDetailBean;
 import com.ejweb.modules.verify.entity.RouteverifyEntity;
 
 public interface RouteVerifyDao extends BaseDao{
@@ -52,4 +54,12 @@ public interface RouteVerifyDao extends BaseDao{
 
 	void updateRouteVerifyReport(VerifyStatusBean bean);
 	void deleteRouteByVerifId(AirlineVerifyUpdateStatusBean bean);
+
+	/**
+	 * 根据论证单ID获取所有论证部门
+	 *
+	 * @param verifyId
+	 * @return
+	 */
+	List<DepartConditionBean> getAllDepart(String verifyId);
 }
\ No newline at end of file

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

@@ -12,8 +12,10 @@ 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.entity.ConditionDetailEntity;
 import com.ejweb.modules.verify.entity.ConditionEntity;
+import com.ejweb.modules.verify.entity.VerifyFeedbackEntity;
 import com.ejweb.modules.verify.service.AirlineVerifyService;
 import com.ejweb.modules.verify.service.ConditionService;
 import org.apache.commons.lang3.StringUtils;
@@ -148,8 +150,9 @@ public class ConditionController {
         if (message == null) {
             PageEntity<ConditionEntity> page = conditionService.findList(bean);
             List<ConditionEntity> list = new ArrayList<ConditionEntity>();
-            if (page != null && page.getList() != null)
+            if (page != null && page.getList() != null) {
                 list = page.getList();
+            }
             if (list == null) {
                 list = new ArrayList<>();
             }

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

@@ -14,10 +14,7 @@ import com.ejweb.modules.depart.service.DepartService;
 import com.ejweb.modules.route.bean.VerifyStatusBean;
 import com.ejweb.modules.route.entity.FullRouteVerifyEntity;
 import com.ejweb.modules.route.service.RouteVerifyService;
-import com.ejweb.modules.verify.bean.VerifyFeedbackBean;
-import com.ejweb.modules.verify.bean.VerifyFeedbackDetailBean;
-import com.ejweb.modules.verify.bean.VerifyFeedbackStatusBean;
-import com.ejweb.modules.verify.bean.VerifyFeedbackUpdateBean;
+import com.ejweb.modules.verify.bean.*;
 import com.ejweb.modules.verify.entity.VerifyFeedbackDetailEntity;
 import com.ejweb.modules.verify.entity.VerifyFeedbackEntity;
 import com.ejweb.modules.verify.service.VerifyFeedbackService;
@@ -182,11 +179,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;
             }
         }
@@ -221,6 +218,30 @@ public class VerifyFeedbackController {
         return responseBean;
     }
 
+    /**
+     * 查询所有条件可行、条件
+     *
+     * @param requestBean
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping("verifyConditionDetail")
+    public ResponseBean verifyConditionDetail(RequestBean requestBean) {
+        ResponseBean responseBean = new ResponseBean();
+        RecordBean bean = requestBean.getObjectBean(RecordBean.class);
+        String message = feedbackService.validate(bean);
+        // 通过参数校验
+        if (message == null) {
+            List<DepartConditionBean> list = feedbackService.verifyConditionDetail(bean);
+            responseBean.setData(list);
+            return responseBean;
+        }
+        // 参数校验不通过
+        responseBean.setMessage(message);
+        responseBean.setStatus(ErrorCode.STATUS_CODE_4001);
+        return responseBean;
+    }
+
     @RequestMapping("export")
     public void export(RequestBean requestBean, HttpServletResponse response) {
         VerifyFeedbackBean bean = requestBean.getObjectBean(VerifyFeedbackBean.class);
@@ -243,4 +264,27 @@ public class VerifyFeedbackController {
         }
 
     }
+
+    @ResponseBody
+    @RequestMapping("verifyConditionList")
+    /**
+     * 查询所有条件可行、条件
+     * @param requestBean
+     * @return
+     */
+    public ResponseBean verifyConditionList(RequestBean requestBean) {
+        ResponseBean responseBean = new ResponseBean();
+        VerifyFeedbackBean bean = requestBean.getObjectBean(VerifyFeedbackBean.class);
+        String message = feedbackService.validate(bean);
+        // 通过参数校验
+        if (message == null) {
+            PageEntity<VerifyFeedbackEntity> list = feedbackService.verifyConditionList(bean);
+            responseBean.setData(list);
+            return responseBean;
+        }
+        // 参数校验不通过
+        responseBean.setMessage(message);
+        responseBean.setStatus(ErrorCode.STATUS_CODE_4001);
+        return responseBean;
+    }
 }

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

+package com.ejweb.modules.verify.bean;
+
+import com.ejweb.core.base.GenericBean;
+import com.ejweb.modules.verify.data.ConditionDetailData;
+
+import java.util.List;
+
+/**
+ * @Author: lisu
+ * @Date: 2020/3/31 19:16
+ * @Description: java类作用描述
+ */
+public class DepartConditionBean extends GenericBean {
+    private String departId;
+    private String departName;
+    private List<ConditionDetailData> conditions;
+
+    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 List<ConditionDetailData> getConditions() {
+        return conditions;
+    }
+
+    public void setConditions(List<ConditionDetailData> conditions) {
+        this.conditions = conditions;
+    }
+}

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

@@ -13,6 +13,7 @@ import com.ejweb.modules.verify.data.ConditionDetailData;
 import com.ejweb.modules.verify.entity.ConditionDetailEntity;
 import com.ejweb.modules.verify.entity.ConditionEntity;
 import com.ejweb.modules.verify.entity.FullVerifyConditionEntity;
+import com.ejweb.modules.verify.entity.VerifyManageEntity;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -56,7 +57,7 @@ public interface ConditionDao extends BaseDao {
 
     List<ConditionDetailData> findByVerifyIdAndDepartId(@Param(value = "verifId") String verifId, @Param(value = "departId") String departId);
 
-    List<ConditionEntity> findAllList(ConditionBean bean);
+    List<VerifyManageEntity> findAllList(ConditionBean bean);
 
     Map<String, String> getCondition(String conditionId);
 
@@ -84,10 +85,26 @@ public interface ConditionDao extends BaseDao {
      */
     ConditionDetailData findById(String conditionId);
 
+    /**
+     * 根据主键ID获取条件
+     *
+     * @param conditionId
+     * @return
+     */
     FullVerifyConditionEntity findByPrimaryKey(String conditionId);
 
+    /**
+     * 根据主键ID更新条件
+     * @param record
+     * @return
+     */
     int updateByPrimaryKey(FullVerifyConditionEntity record);
 
+    /**
+     * 根据verifyId和departId获取所有条件ID
+     * @param bean
+     * @return
+     */
     List<String> getDepartConditions(VerifyStatusBean bean);
 
     /**

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

@@ -3,9 +3,6 @@
  */
 package com.ejweb.modules.verify.dao;
 
-import java.util.List;
-import java.util.Map;
-
 import com.ejweb.core.base.BaseDao;
 import com.ejweb.modules.route.entity.FullRouteVerifyEntity;
 import com.ejweb.modules.verify.bean.VerifyFeedbackBean;
@@ -15,7 +12,9 @@ import com.ejweb.modules.verify.bean.VerifyFeedbackUpdateBean;
 import com.ejweb.modules.verify.data.ConditionDetailData;
 import com.ejweb.modules.verify.entity.VerifyFeedbackDetailEntity;
 import com.ejweb.modules.verify.entity.VerifyFeedbackEntity;
-import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  *
@@ -25,9 +24,10 @@ import org.apache.ibatis.annotations.Param;
  * @time 2016年9月12日
  */
 
-public interface VerifyFeedbackDao extends BaseDao{
+public interface VerifyFeedbackDao extends BaseDao {
     // 自己部门需评估
     List<VerifyFeedbackEntity> findList1(VerifyFeedbackBean bean);
+
     // 评估其他部门
     List<VerifyFeedbackEntity> findList2(VerifyFeedbackBean bean);
 
@@ -35,23 +35,45 @@ public interface VerifyFeedbackDao extends BaseDao{
 
     VerifyFeedbackDetailEntity getDetail2(VerifyFeedbackDetailBean bean);
 
-   List<Map<String,String>> getDetailList(VerifyFeedbackDetailBean bean);
+    List<Map<String, String>> getDetailList(VerifyFeedbackDetailBean bean);
 
+    /**
+     * 根据verifId和DepartId查询详情
+     *
+     * @param bean
+     * @return
+     */
     List<ConditionDetailData> findByVerifyIdAndDepartId(VerifyFeedbackDetailBean bean);
 
     int getUnfinishCount(String verifyId);
 
     // 更新反馈信息
     int updateFeedback(VerifyFeedbackUpdateBean bean);
+
     // 全部反馈后，更新反馈状态
     int updateCondition(VerifyFeedbackUpdateBean bean);
-   // 查询是否全部反馈
+
+    /**
+     * 查询是否全部反馈
+     *
+     * @param bean
+     * @return
+     */
     int getFeedbackStatus(VerifyFeedbackUpdateBean bean);
-   //查找初始论证内容
+
+    /**
+     * 查找初始论证内容
+     *
+     * @param bean
+     * @return
+     */
     FullRouteVerifyEntity checkRouteVerifyExist(VerifyFeedbackUpdateBean bean);
 
     List<VerifyFeedbackEntity> findAllList(VerifyFeedbackBean bean);
 
     void updateStatus(VerifyFeedbackStatusBean bean);
-List<VerifyFeedbackEntity> findlist3(VerifyFeedbackBean bean);
+
+    List<VerifyFeedbackEntity> findlist3(VerifyFeedbackBean bean);
+
+    List<VerifyFeedbackEntity> findList4(VerifyFeedbackBean bean);
 }

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

@@ -188,16 +188,6 @@ public class ConditionService extends BaseService<ConditionDao> {
         return conditionDetailEntity;
     }
 
-    /**
-     * @param bean
-     * @return
-     * @author zhanglg
-     * @time 2016年9月20日
-     */
-
-    public List<ConditionEntity> findAllList(ConditionBean bean) {
-        return dao.findAllList(bean);
-    }
 
     public void sendmail(String verifId, String conditionId, List<String> lst) {
 
@@ -240,4 +230,5 @@ public class ConditionService extends BaseService<ConditionDao> {
         }
     }
 
+
 }

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

@@ -8,6 +8,7 @@ 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.dao.RouteVerifyDao;
 import com.ejweb.modules.route.entity.FullRouteVerifyEntity;
 import com.ejweb.modules.verify.bean.*;
 import com.ejweb.modules.verify.dao.AirlineVerifyDao;
@@ -45,6 +46,8 @@ public class VerifyFeedbackService extends BaseService<VerifyFeedbackDao> {
     ConditionDao conditionDao;
     @Autowired
     DepartDao departDao;
+    @Autowired
+    RouteVerifyDao routeVerifyDao;
 
     public PageEntity<VerifyFeedbackEntity> findList(VerifyFeedbackBean bean) {
         PageInfo<VerifyFeedbackEntity> pageInfo;
@@ -125,16 +128,7 @@ public class VerifyFeedbackService extends BaseService<VerifyFeedbackDao> {
         if (count == 0) {
             feed.setConditionComplete(1);
         }
-        List<ConditionDetailData> conditions = dao.findByVerifyIdAndDepartId(bean);
-        List<ConditionDetailData> conditionList = new ArrayList<>();
-        if (!CollectionUtils.isEmpty(conditions)) {
-            for (ConditionDetailData data : conditions) {
-                VerifyFeedbackDetailBean verifyFeedbackDetailBean = new VerifyFeedbackDetailBean();
-                verifyFeedbackDetailBean.setConditionId(data.getConditionId());
-                data.setDepartIds(dao.getDetailList(verifyFeedbackDetailBean));
-                conditionList.add(data);
-            }
-        }
+        List<ConditionDetailData> conditionList = getConditionDetailData(bean);
         feed.setConditions(conditionList);
         return feed;
     }
@@ -191,4 +185,74 @@ public class VerifyFeedbackService extends BaseService<VerifyFeedbackDao> {
     public void updateStatus(VerifyFeedbackStatusBean bean) {
         dao.updateStatus(bean);
     }
+
+
+    public PageEntity<VerifyFeedbackEntity> verifyConditionList(VerifyFeedbackBean bean) {
+        // 必须紧贴dao的查询方法
+        PageHelper.startPage(bean.getPageNo(), bean.getPageSize());
+        if (StringUtils.isEmpty(bean.getSort())) {
+            PageHelper.orderBy(" verifNo DESC");
+        } else {
+            PageHelper.orderBy(bean.getSort());
+        }
+        List<VerifyFeedbackEntity> list = dao.findList4(bean);
+        PageInfo<VerifyFeedbackEntity> pageInfo = new PageInfo<>(list);
+        list = pageInfo.getList();
+        // 如果没有数据则返回NULL
+        if (CollectionUtils.isEmpty(list)) {
+            return null;
+        }
+        for (VerifyFeedbackEntity entity : list) {
+            List<Map<String, String>> list1 = verifyDao.getConnectList(entity.getVerifId());
+            List<Map<String, String>> list2 = new ArrayList<Map<String, String>>();
+            for (Map<String, String> map : list1) {
+                Map<String, String> map2 = new HashMap<String, String>();
+                map2.put("flightNo", map.get("flightNo"));
+                map2.put("depIata", map.get("depIata"));
+                map2.put("arrIata", map.get("arrIata"));
+                map2.put("IsMain", map.get("IsMain"));
+                list2.add(map2);
+            }
+            entity.setConnect(list2);
+            entity.setTypeList(verifyDao.getTypeList(entity.getVerifId()));
+            entity.setDepName(verifyDao.getConnetList(entity.getVerifId()));
+            String typelist = verifyDao.getTypeList1(entity.getVerifId());
+            if (StringUtils.isNoneBlank(typelist)) {
+                entity.setAircraftName(entity.getAircraftName() + ":" + typelist);
+            }
+        }
+        PageEntity<VerifyFeedbackEntity> page = new PageEntity<VerifyFeedbackEntity>();
+        page.setPageNo(pageInfo.getPageNum());
+        page.setPageSize(pageInfo.getPageSize());
+        page.setCount(pageInfo.getTotal());
+        page.setTotalPage(pageInfo.getPages());
+        page.setList(list);
+        return page;
+    }
+
+    public List<DepartConditionBean> verifyConditionDetail(RecordBean recordBean) {
+        List<DepartConditionBean> list = routeVerifyDao.getAllDepart(recordBean.getVerifId());
+        for (DepartConditionBean departCondition : list) {
+            VerifyFeedbackDetailBean verifyFeedbackBean = new VerifyFeedbackDetailBean();
+            verifyFeedbackBean.setVerifId(recordBean.getVerifId());
+            verifyFeedbackBean.setDepartId(departCondition.getDepartId());
+            List<ConditionDetailData> conditionList = getConditionDetailData(verifyFeedbackBean);
+            departCondition.setConditions(conditionList);
+        }
+        return list;
+    }
+
+    private List<ConditionDetailData> getConditionDetailData(VerifyFeedbackDetailBean verifyFeedbackBean) {
+        List<ConditionDetailData> conditions = dao.findByVerifyIdAndDepartId(verifyFeedbackBean);
+        List<ConditionDetailData> conditionList = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(conditions)) {
+            for (ConditionDetailData data : conditions) {
+                VerifyFeedbackDetailBean verifyFeedbackDetailBean = new VerifyFeedbackDetailBean();
+                verifyFeedbackDetailBean.setConditionId(data.getConditionId());
+                data.setDepartIds(dao.getDetailList(verifyFeedbackDetailBean));
+                conditionList.add(data);
+            }
+        }
+        return conditionList;
+    }
 }