2022-03-24 罗胜

1.油量分析修改
2.航班执行期监控修改
3.航线论证修改

resources/mapper/modules/airport/LeftOverOilDao.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ejweb.modules.airport.dao.LeftOverOilDao">
+
+    <select id="getLeftOverOilData" resultType="com.ejweb.modules.airport.entity.LeftOverOilEntity">
+        select * from foc_avg_left_over_oil
+        where
+        1=1
+        <if test="year !=null and year!=''">
+            and year =#{year}
+        </if>
+
+        <if test="month !=null and month!=''">
+            and month = #{month}
+        </if>
+
+        <if test="acType !=null and acType!=''">
+            and ac_type= #{acType}
+        </if>
+
+        <if test="airport !=null and airport!=''">
+            and airport = #{airport}
+        </if>
+
+    </select>
+
+    <select id="selectOilByAcTyoeAndIataId" resultType="double">
+        select avg_left_over_oil from foc_avg_left_over_oil where ac_type=#{acType} and airport=#{airport} and `year`=#{year} and `month`=#{month} limit 1
+    </select>
+
+    <select id="selectOilByAirport" resultType="double">
+        select avg_left_over_oil from foc_avg_left_over_oil where airport=#{acType}  and `year`=#{year} and `month`=#{month} limit 1
+    </select>
+</mapper>
\ No newline at end of file

resources/mapper/modules/depart/DepartDao.xml

@@ -69,4 +69,8 @@
         FROM foc_user_depart a
         WHERE a.del_flag = '0'
     </select>
+
+    <select id="getDepartIdByUserId" resultType="java.lang.String">
+        select depart_id from sys_user_profiles where user_id = #{userId}
+    </select>
 </mapper>
\ No newline at end of file

resources/mapper/modules/verify/VerifyFeedbackDao.xml

@@ -460,7 +460,7 @@
           SELECT 
             id,
             verif_id,
-            verify_status,
+            verify_status,feedbackStatus
             report, form_id, 
             form_text, 
             depart_id, 
@@ -548,6 +548,18 @@
         </if>
         ORDER BY apply_no DESC
     </select>
+
+    <select id="getConditionFeedbackStatus" resultType="java.lang.Integer">
+        select count(1) FROM   foc_condition_feedback WHERE del_flag =0 and remarks is not null and LENGTH(remarks)>0 AND  depart_id=#{departId} and condition_id in
+        <foreach collection="conditionIds" item="conditionId" open="(" close=")" separator=",">
+            #{conditionId}
+        </foreach>
+    </select>
+
+    <select id="getConditionsByVerifyId" resultType="java.lang.String">
+        select c.id from foc_verify_condition c left join foc_airline_verify v on v.id=c.verif_id where  v.id =#{verifId}
+    </select>
+
     <update id="updateStatus">
      update foc_verify_condition
       SET status = #{status}

resources/mapper/modules/verify/VerifyManageDao.xml

@@ -676,19 +676,30 @@
 									AND t.verif_status = '00'
 								) menu8,
 								(
-								SELECT
-									COUNT( 1 )
-								FROM
-									foc_airline_verify a
-									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
-								WHERE
-									a.del_flag = '0'
-									AND s.condition_status='03'
-									AND s.complete = '0'
-									AND is_feed = '0'
-									AND a.verif_status = '00'
+                                   SELECT
+                                        count( 1 )
+                                    FROM
+                                        (
+                                        SELECT
+                                            count( 1 )
+                                        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 = 0
+                                            AND rf.STATUS = 1
+                                            AND rf.verify_status = '03'
+                                            AND s.complete = '0'
+                                            AND is_feed = '0'
+                                            AND a.verif_status = '00'
+                                        GROUP BY
+                                            s.verif_id,
+                                        s.depart_id
+                                        ) temp
 								) menu9,
 								(
 								SELECT
@@ -740,6 +751,23 @@
 DUAL
      </select>
 
+    <sql id="menu9">
+--原菜单9
+        SELECT
+									COUNT( 1 )
+								FROM
+									foc_airline_verify a
+									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
+								WHERE
+									a.del_flag = '0'
+									AND s.condition_status='03'
+									AND s.complete = '0'
+									AND is_feed = '0'
+									AND a.verif_status = '00'
+    </sql>
+
     <update id="updateByPrimaryKey">
     update foc_airline_verify
     set 

src/com/ejweb/modules/airport/api/OilAnalysisController.java

@@ -3,19 +3,21 @@ package com.ejweb.modules.airport.api;
 
 import com.ejweb.core.api.RequestBean;
 import com.ejweb.core.api.ResponseBean;
+import com.ejweb.core.base.GenericBean;
 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.airport.bean.ExtraOilReasonBean;
 import com.ejweb.modules.airport.bean.OilAnalysisBean;
+import com.ejweb.modules.airport.bean.OilAnalysisIdBean;
+import com.ejweb.modules.airport.bean.OilAnalysisUpdateBean;
 import com.ejweb.modules.airport.entity.OilAnalysisEntity;
 import com.ejweb.modules.airport.service.OilAnalysisService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
@@ -74,5 +76,49 @@ public class OilAnalysisController {
         return responseBean;
     }
 
+    @RequestMapping(value = "/selectAnalysisIolById")
+    public ResponseBean selectAnalysisIolById(RequestBean requestBean) {
+        ResponseBean responseBean = new ResponseBean();
+        OilAnalysisIdBean bean = requestBean.getObjectBean(OilAnalysisIdBean.class);
+        OilAnalysisEntity oilAnalysis = oilAnalysisService.selectById(bean.getId());
+        if (oilAnalysis == null) {
+            responseBean.setMessage(GConstants.EMPTY);
+            responseBean.setStatus(ErrorCode.STATUS_CODE_2001);
+            return responseBean;
+        } else {
+            responseBean.setData(oilAnalysis);
+            responseBean.setMessage(GConstants.OK);
+            responseBean.setStatus(ErrorCode.STATUS_CODE_2000);
+        }
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/update")
+    @ResponseBody
+    public ResponseBean update(RequestBean requestBean) {
+        ResponseBean responseBean = new ResponseBean();
+        OilAnalysisUpdateBean bean = requestBean.getObjectBean(OilAnalysisUpdateBean.class);
+        oilAnalysisService.update(bean);
+
+        responseBean.setMessage(GConstants.OK);
+        responseBean.setStatus(ErrorCode.STATUS_CODE_2000);
+
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/getOilReason")
+    @ResponseBody
+    public ResponseBean getOilReason(RequestBean requestBean) {
+        ResponseBean responseBean = new ResponseBean();
+        ExtraOilReasonBean bean = requestBean.getObjectBean(ExtraOilReasonBean.class);
+        List<String> reasons=oilAnalysisService.getOilReason(bean);
+        responseBean.setMessage(GConstants.OK);
+        responseBean.setStatus(ErrorCode.STATUS_CODE_2000);
+        responseBean.setData(reasons);
+
+        return responseBean;
+    }
+
+
 
 }

src/com/ejweb/modules/airport/api/StatisticalController.java

@@ -157,9 +157,10 @@ public class StatisticalController {
                     //机型状态自定义
                     List<TypeBean> typeBeans = JSON.parseArray(s.getAirlineJson(),TypeBean.class);
                     s.setTypeOne(typeInfo(typeBeans.get(0),s.getAirlineStatus()));
-                    s.setTypeTwo(typeInfo(typeBeans.get(typeBeans.size()-3),s.getAirlineStatus()));
-                    s.setTypeThree(typeInfo(typeBeans.get(typeBeans.size()-2),s.getAirlineStatus()));
-                    s.setTypeFour(typeInfo(typeBeans.get(typeBeans.size()-1),s.getAirlineStatus()));
+                    s.setTypeTwo(typeInfo(typeBeans.get(typeBeans.size()-4),s.getAirlineStatus()));
+                    s.setTypeThree(typeInfo(typeBeans.get(typeBeans.size()-3),s.getAirlineStatus()));
+                    s.setTypeFour(typeInfo(typeBeans.get(typeBeans.size()-2),s.getAirlineStatus()));
+                    s.setTypeFive(typeInfo(typeBeans.get(typeBeans.size()-1),s.getAirlineStatus()));
                 }
                 String fileName = "航线执行期监控统计.xlsx";
                 try {

src/com/ejweb/modules/airport/bean/ExtraOilReasonBean.java

+package com.ejweb.modules.airport.bean;
+
+/**
+ * 额外油原因串时间参数
+ */
+public class ExtraOilReasonBean {
+
+    private String startTime;
+
+    private String endTime;
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+}

src/com/ejweb/modules/airport/bean/LeftOverOilListBean.java

+package com.ejweb.modules.airport.bean;
+
+import com.ejweb.core.base.GenericBean;
+import com.ejweb.core.conf.GConstants;
+
+import javax.validation.constraints.Min;
+
+public class LeftOverOilListBean extends GenericBean {
+
+    @Min(value = 1, message = "pageNo必须大于等于1")
+    private int pageNo = 1;//第几页
+
+    @Min(value = 1, message = "pageSize必须大于等于1")
+    private int pageSize = GConstants.PAGE_SIZE;//每页条数
+
+    private int year;
+
+    private int month;
+
+    private String acType;
+
+    private String airport;
+
+    public String getAirport() {
+        return airport;
+    }
+
+    public void setAirport(String airport) {
+        this.airport = airport;
+    }
+
+    public int getPageNo() {
+        return pageNo;
+    }
+
+    public void setPageNo(int pageNo) {
+        this.pageNo = pageNo;
+    }
+
+    public int getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(int pageSize) {
+        this.pageSize = pageSize;
+    }
+
+    public int getYear() {
+        return year;
+    }
+
+    public void setYear(int year) {
+        this.year = year;
+    }
+
+    public int getMonth() {
+        return month;
+    }
+
+    public void setMonth(int month) {
+        this.month = month;
+    }
+
+    public String getAcType() {
+        return acType;
+    }
+
+    public void setAcType(String acType) {
+        this.acType = acType;
+    }
+
+}

src/com/ejweb/modules/airport/bean/OilAnalysisBean.java

@@ -3,6 +3,7 @@ package com.ejweb.modules.airport.bean;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.ejweb.core.base.GenericBean;
 import com.ejweb.core.conf.GConstants;
+import com.lowagie.text.PageSize;
 
 import javax.validation.constraints.Min;
 
@@ -15,7 +16,11 @@ import javax.validation.constraints.Min;
  * @time 2020年12月10日
  */
 public class OilAnalysisBean extends GenericBean {
+    @Min(value=1, message="pageNo必须大于等于1")
+    private int pageNo=1;//第几页
 
+    @Min(value=1, message="pageSize必须大于等于1")
+    private int pageSize= GConstants.PAGE_SIZE;//每页条数
 
     //最低起飞时间
     private String minDepTime;
@@ -33,16 +38,68 @@ public class OilAnalysisBean extends GenericBean {
     private String dispatcherENG;
     //签派员中文名
     private String dispatcherZH;
-    //最低总油量
-    private Integer mintotalOil;
-    //最高总油量
-    private Integer maxtotalOil;
+    //最低剩油量
+    private Integer minLeftOverOil;
+    //最高剩油量
+    private Integer maxLeftOverOil;
+    //额外油原因
+    private String extraOilReason;
+    //机型
+    private String acType;
+    //最低额外油
+    private Integer minExtraOil;
+    //最高额外油
+    private Integer maxExtraOil;
+
+    public Integer getMinLeftOverOil() {
+        return minLeftOverOil;
+    }
+
+    public void setMinLeftOverOil(Integer minLeftOverOil) {
+        this.minLeftOverOil = minLeftOverOil;
+    }
+
+    public Integer getMaxLeftOverOil() {
+        return maxLeftOverOil;
+    }
+
+    public void setMaxLeftOverOil(Integer maxLeftOverOil) {
+        this.maxLeftOverOil = maxLeftOverOil;
+    }
+
+    public String getExtraOilReason() {
+        return extraOilReason;
+    }
+
+    public void setExtraOilReason(String extraOilReason) {
+        this.extraOilReason = extraOilReason;
+    }
+
+    public String getAcType() {
+        return acType;
+    }
+
+    public void setAcType(String acType) {
+        this.acType = acType;
+    }
+
+    public Integer getMinExtraOil() {
+        return minExtraOil;
+    }
+
+    public void setMinExtraOil(Integer minExtraOil) {
+        this.minExtraOil = minExtraOil;
+    }
+
+    public Integer getMaxExtraOil() {
+        return maxExtraOil;
+    }
+
+    public void setMaxExtraOil(Integer maxExtraOil) {
+        this.maxExtraOil = maxExtraOil;
+    }
 
-    @Min(value=1, message="pageNo必须大于等于1")
-    private int pageNo=1;//第几页
 
-    @Min(value=1, message="pageSize必须大于等于1")
-    private int pageSize= GConstants.PAGE_SIZE;//每页条数
 
     public String getMinDepTime() {
         return minDepTime;
@@ -92,22 +149,6 @@ public class OilAnalysisBean extends GenericBean {
         this.dispatcher = dispatcher;
     }
 
-    public Integer getMintotalOil() {
-        return mintotalOil;
-    }
-
-    public void setMintotalOil(Integer mintotalOil) {
-        this.mintotalOil = mintotalOil;
-    }
-
-    public Integer getMaxtotalOil() {
-        return maxtotalOil;
-    }
-
-    public void setMaxtotalOil(Integer maxtotalOil) {
-        this.maxtotalOil = maxtotalOil;
-    }
-
     public int getPageNo() {
         return pageNo;
     }

src/com/ejweb/modules/airport/bean/OilAnalysisIdBean.java

+package com.ejweb.modules.airport.bean;
+
+import com.ejweb.core.base.GenericBean;
+import org.hibernate.validator.constraints.NotEmpty;
+
+/**
+ * 油量分析根据id查询数据
+ *
+ * @author luos
+ * @version 1.0
+ * @team suzhou
+ * @time 2022年3月1日
+ */
+public class OilAnalysisIdBean extends GenericBean {
+
+    @NotEmpty(message = "油量分析id不能为空")
+    private Integer id;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+}

src/com/ejweb/modules/airport/bean/OilAnalysisUpdateBean.java

+package com.ejweb.modules.airport.bean;
+
+import com.ejweb.core.base.GenericBean;
+import org.hibernate.validator.constraints.NotEmpty;
+
+/**
+ * 油量分析根据id查询数据
+ *
+ * @author luos
+ * @version 1.0
+ * @team suzhou
+ * @time 2022年3月1日
+ */
+public class OilAnalysisUpdateBean extends GenericBean {
+
+    @NotEmpty(message = "油量分析id不能为空")
+    private Integer id;
+
+
+    private String extraOilConclusion;
+
+    private String remark;
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getExtraOilConclusion() {
+        return extraOilConclusion;
+    }
+
+    public void setExtraOilConclusion(String extraOilConclusion) {
+        this.extraOilConclusion = extraOilConclusion;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+}

src/com/ejweb/modules/airport/dao/LeftOverOilDao.java

+package com.ejweb.modules.airport.dao;
+
+import com.ejweb.core.base.BaseDao;
+import com.ejweb.modules.airport.bean.LeftOverOilListBean;
+import com.ejweb.modules.airport.bean.OilAnalysisBean;
+import com.ejweb.modules.airport.entity.LeftOverOilEntity;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface LeftOverOilDao extends BaseDao {
+
+    List<LeftOverOilEntity> getLeftOverOilData(LeftOverOilListBean bean);
+
+    Double selectOilByAcTyoeAndIataId(@Param("acType") String acType,@Param("airport") String airport, @Param("year") Integer year,@Param("month") Integer month);
+
+    Double selectOilByAirport(@Param("acType")String acType,@Param("year")  int year, @Param("month") int month);
+
+}

src/com/ejweb/modules/airport/dao/OilAnalysisDao.java

@@ -2,9 +2,12 @@ package com.ejweb.modules.airport.dao;
 
 import com.ejweb.core.base.BaseDao;
 import com.ejweb.modules.airport.bean.AirportListBean;
+import com.ejweb.modules.airport.bean.ExtraOilReasonBean;
 import com.ejweb.modules.airport.bean.OilAnalysisBean;
+import com.ejweb.modules.airport.bean.OilAnalysisUpdateBean;
 import com.ejweb.modules.airport.entity.AirportListEntity;
 import com.ejweb.modules.airport.entity.OilAnalysisEntity;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -15,4 +18,13 @@ public interface OilAnalysisDao extends BaseDao {
     // 导出查询油量分析数据
     List<OilAnalysisEntity> getExcelOilAnalysisData(OilAnalysisBean bean);
 
+    //根据id查询油量信息数据
+    OilAnalysisEntity getById(@Param("id") Integer id);
+
+    //更新额外油论证
+    void update(OilAnalysisUpdateBean bean);
+
+    //获取近一个月的理由
+    List<String> getOilReasons(@Param("startTime") String startTime,@Param("endTime") String endTime);
+
 }

src/com/ejweb/modules/airport/entity/LeftOverOilEntity.java

+package com.ejweb.modules.airport.entity;
+
+import com.ejweb.core.base.BaseEntity;
+
+/**
+ * 历史平均落地剩油数据字典表
+ *
+ * @author luos
+ * @version 1.0
+ * @team suzhou
+ * @time 2022年3月1日
+ */
+public class LeftOverOilEntity extends BaseEntity {
+
+    private static final long serialVersionUID = -1L;
+
+    private Integer year;
+
+    private String acType;
+
+    private Integer month;
+
+    private String arrAirport;
+
+    private String arrIataId;
+
+    private String arrIcaoId;
+
+    private Integer avgLeftOverOil;
+}

src/com/ejweb/modules/airport/entity/StatisticalListEntity.java

@@ -17,19 +17,29 @@ public class StatisticalListEntity extends BaseEntity {
     private String airlineJson;
     @ExcelField(title="航线状态", type=0, align=1, sort=26 )
     private String status;
-    @ExcelField(title="A319/A320", type=0, align=1, sort=21 )
+    @ExcelField(title="A319/A320", type=0, align=1, sort=20 )
     private String typeOne;
-    @ExcelField(title="A321", type=0, align=1, sort=22 )
+    @ExcelField(title="A320neo", type=0, align=1, sort=21 )
     private String typeTwo;
-    @ExcelField(title="A320neo", type=0, align=1, sort=23 )
+    @ExcelField(title="A321", type=0, align=1, sort=22 )
     private String typeThree;
-    @ExcelField(title="A330", type=0, align=1, sort=24 )
+    @ExcelField(title="A321neo", type=0, align=1, sort=23 )
     private String typeFour;
-    @ExcelField(title="航线", type=0, align=1, sort=20 )
+    @ExcelField(title="A330", type=0, align=1, sort=24 )
+    private String typeFive;
+    @ExcelField(title="航线", type=0, align=1, sort=19 )
     private String depIataLabel;
-    @ExcelField(title="序号", type=0, align=1, sort=19 )
+    @ExcelField(title="序号", type=0, align=1, sort=18 )
     private int no;
 
+    public String getTypeFive() {
+        return typeFive;
+    }
+
+    public void setTypeFive(String typeFive) {
+        this.typeFive = typeFive;
+    }
+
     public String getArrIata() {
         return arrIata;
     }

src/com/ejweb/modules/airport/service/LeftOverOilService.java

+package com.ejweb.modules.airport.service;
+
+
+import com.ejweb.core.base.BaseService;
+import com.ejweb.core.base.PageEntity;
+import com.ejweb.modules.airport.bean.LeftOverOilListBean;
+import com.ejweb.modules.airport.bean.OilAnalysisBean;
+import com.ejweb.modules.airport.dao.LeftOverOilDao;
+import com.ejweb.modules.airport.entity.LeftOverOilEntity;
+import com.ejweb.modules.airport.entity.OilAnalysisEntity;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+import java.util.List;
+
+@Service
+public class LeftOverOilService extends BaseService<LeftOverOilDao> {
+
+    @Autowired
+    private LeftOverOilDao leftOverOilDao;
+
+    public PageEntity<LeftOverOilEntity> getAnalysisData(LeftOverOilListBean bean) {
+        PageHelper.startPage(bean.getPageNo(), bean.getPageSize());
+        PageInfo<LeftOverOilEntity> pageInfo = null;
+        List<LeftOverOilEntity> list = null;
+        list = leftOverOilDao.getLeftOverOilData(bean);
+        if (list == null || list.size() == 0) {
+            return null;
+        }
+        pageInfo = new PageInfo<LeftOverOilEntity>(list);
+        if (pageInfo.getPages() < bean.getPageNo()) {// 页码大于总页数，则返回NULL
+            return null;
+        }
+        PageEntity<LeftOverOilEntity> page = new PageEntity<LeftOverOilEntity>();
+        page.setPageNo(pageInfo.getPageNum());
+        page.setPageSize(pageInfo.getPageSize());
+        page.setCount(pageInfo.getTotal());
+        page.setTotalPage(pageInfo.getPages());
+        page.setList(pageInfo.getList());
+        return page;
+    }
+}

src/com/ejweb/modules/airport/service/StatisticalService.java

@@ -3,6 +3,8 @@
  */
 package com.ejweb.modules.airport.service;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.ejweb.core.base.BaseService;
 import com.ejweb.core.base.PageEntity;
 import com.ejweb.modules.airport.bean.StatiscalCheckBean;
@@ -170,6 +172,7 @@ public class StatisticalService extends BaseService<StatisticalDao> {
 
         //筛选foc_check_iata中 不需要的航班 add by luoh
         Iterator<StatisticalListEntity> iterCheck = lists.iterator();
+        String a321neoStr="{\"status\":\"3\",\"type\":\"321neo\"}";
         while (iterCheck.hasNext()) {
             StatisticalListEntity entity = iterCheck.next();
             String iataStr = entity.getDepIata() + "-" + entity.getArrIata();
@@ -179,6 +182,18 @@ public class StatisticalService extends BaseService<StatisticalDao> {
                     break;
                 }
             }
+            List<String> list = JSON.parseArray(entity.getAirlineJson(), String.class);
+            List<String> newList=new ArrayList<>();
+            if(list.size()==4&&list.get(1).contains("A321")){
+                newList.add(list.get(0));
+                newList.add(list.get(2));
+                newList.add(a321neoStr);
+                newList.add(list.get(1));
+                newList.add(list.get(3));
+            }else{
+                newList=list;
+            }
+            entity.setAirlineJson(newList.toString());
         }
         //创建Page类
         Page page = new Page(statisticalListBean.getPageNo(), statisticalListBean.getPageSize());

src/com/ejweb/modules/depart/dao/DepartDao.java

@@ -21,4 +21,6 @@ public interface DepartDao extends BaseDao{
     public List<DepartEntity> findRiskList(DepartBean bean);
     public List<DepartEntity> findDepartByList(@Param(value="type") String type, @Param(value = "isVerif") String isVerif);
     public List<DepartTypeEntity> findDepartAllList();
+
+    public String getDepartIdByUserId(@Param("userId") String userId);
 }
\ No newline at end of file

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

@@ -36,10 +36,18 @@ public class VerifyFeedbackBean extends GenericBean {
     private String sort;
     @Min(value = 1, message = "pageSize必须大于等于1")
     private int pageSize = GConstants.PAGE_SIZE;//每页条数
-
+    private String departId;
     List arrIataList;
     List depIataList;
 
+    public String getDepartId() {
+        return departId;
+    }
+
+    public void setDepartId(String departId) {
+        this.departId = departId;
+    }
+
     public List getArrIataList() {
         return arrIataList;
     }

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

@@ -77,4 +77,8 @@ public interface VerifyFeedbackDao extends BaseDao {
     List<VerifyFeedbackEntity> findlist3(VerifyFeedbackBean bean);
 
     List<VerifyFeedbackEntity> findList4(VerifyFeedbackBean bean);
+
+    int getConditionFeedbackStatus(@Param("departId") String departId, @Param("conditionIds") List<String> conditionIds);
+
+    List<String> getConditionsByVerifyId(@Param("verifId") String verifId);
 }

src/com/ejweb/modules/verify/entity/VerifyFeedbackEntity.java

@@ -54,7 +54,18 @@ public class VerifyFeedbackEntity extends BaseEntity {
     private String status;
     private String feedbackStatus;
     private String roundtripType;
-    
+
+    private String conditionFeedbackStatus;
+
+
+    public String getConditionFeedbackStatus() {
+        return conditionFeedbackStatus;
+    }
+
+    public void setConditionFeedbackStatus(String conditionFeedbackStatus) {
+        this.conditionFeedbackStatus = conditionFeedbackStatus;
+    }
+
     public String getRoundtripType() {
         return roundtripType;
     }

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

@@ -54,6 +54,7 @@ public class VerifyFeedbackService extends BaseService<VerifyFeedbackDao> {
     RouteVerifyService routeVerifyService;
 
     public PageEntity<VerifyFeedbackEntity> findList(VerifyFeedbackBean bean) {
+        String departId= departDao.getDepartIdByUserId(bean.getUserCode());
         if (StringUtils.isNotEmpty(bean.getArrIata())) {
             bean.setArrIataList(verifyDao.getIataStr(bean.getArrIata()));
         }
@@ -82,6 +83,13 @@ public class VerifyFeedbackService extends BaseService<VerifyFeedbackDao> {
             return null;
         }
         for (VerifyFeedbackEntity entity : list) {
+            List<String> conditions=dao.getConditionsByVerifyId(entity.getVerifId());
+            int count = dao.getConditionFeedbackStatus(departId, conditions);
+            if(count>0){
+                entity.setConditionFeedbackStatus("01");
+            }else{
+                entity.setConditionFeedbackStatus("00");
+            }
             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) {