Skip to content

A
api
Commit 3561ef41 by java-李谡
Options

添加三字码历史数据关联查询

parent ba01134b
Showing with 885 additions and 419 deletions
resources/mapper/modules/airlineVerify/AirlineVerifiedDao.xml
......@@ -39,21 +39,33 @@
<if test="verifNo != null and verifNo != ''">
AND b.verif_no LIKE CONCAT('%', #{verifNo}, '%')
</if>
<if test="depIata != null and depIata != ''">
<if test="depIataList != null ">
AND (b.id in (
SELECT id FROM foc_airline_verify where depIata = #{depIata} )
OR b.id IN
(SELECT verif_id FROM foc_airline_connect WHERE depIata = #{depIata} AND is_main != '0')
)
SELECT id FROM foc_airline_verify where depIata in
<foreach collection="depIataList" item="iata" index="index" open="(" close=")" separator=",">
#{iata}
</foreach>)
OR b.id IN
(SELECT verif_id FROM foc_airline_connect WHERE depIata in
<foreach collection="depIataList" item="iata" index="index" open="(" close=")" separator=",">
#{iata}
</foreach>
AND is_main != '0')
)
</if>
<if test="arrIata != null and arrIata != ''">
<if test="arrIataList != null">
AND (b.id in (
SELECT id FROM foc_airline_verify where arrIata = #{arrIata} )
OR b.id IN
(SELECT verif_id FROM foc_airline_connect WHERE arrIata = #{arrIata} AND is_main != '0')
)
SELECT id FROM foc_airline_verify where arrIata in
<foreach collection="arrIataList" item="iata" index="index" open="(" close=")" separator=",">
#{iata}
</foreach>)
OR b.id IN
(SELECT verif_id FROM foc_airline_connect WHERE arrIata in
<foreach collection="arrIataList" item="iata" index="index" open="(" close=")" separator=",">
#{iata}
</foreach>
AND is_main != '0')
)
</if>
<if test="priority != null and priority != ''">
AND b.priority = #{priority}
......
resources/mapper/modules/airport/AirportDao.xml
......@@ -21,7 +21,7 @@
SELECT
<include refid="airportColumns"/>
FROM foc_airports a
WHERE a.status=1
WHERE (a.status=1 or a.status=2)
<if test="keywords != null">
AND (a.airport_name LIKE #{keywords} OR a.airport_iata LIKE #{keywords} OR a.airport_name_pinyin LIKE #{keywords})
</if>
......
resources/mapper/modules/airport/StatisticalDao.xml
......@@ -56,22 +56,36 @@
<if test="verifType != null and verifType != ''">
AND a.verif_type = #{verifType}
</if>
<if test="depIata != null and depIata != ''">
<if test="depIataList != null ">
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')
)
SELECT id FROM foc_airline_verify where depIata in
<foreach collection="depIataList" item="iata" index="index" open="(" close=")" separator=",">
#{iata}
</foreach>)
OR a.id IN
(SELECT verif_id FROM foc_airline_connect WHERE depIata in
<foreach collection="depIataList" item="iata" index="index" open="(" close=")" separator=",">
#{iata}
</foreach>
AND is_main != '0')
)
</if>
<if test="arrIata != null and arrIata != ''">
<if test="arrIataList != null ">
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')
AND (a.id in (
SELECT id FROM foc_airline_verify where arrIata in
<foreach collection="arrIataList" item="iata" index="index" open="(" close=")" separator=",">
#{iata}
</foreach>)
OR a.id IN
(SELECT verif_id FROM foc_airline_connect WHERE arrIata in
<foreach collection="arrIataList" item="iata" index="index" open="(" close=")" separator=",">
#{iata}
</foreach>
AND is_main != '0')
)
)
</if>
</if>
<if test="aircraftType != null and aircraftType != ''">
AND a.aircraft_type = #{aircraftType}
</if>
......
resources/mapper/modules/assessment/AssessmentDao.xml
......@@ -48,22 +48,34 @@
<if test="verifNo != null and verifNo != ''">
AND v.verif_no like concat ('%',#{verifNo},'%')
</if>
<if test="depIata!=null and depIata!=''">
AND (v.id in (
SELECT id FROM foc_airline_verify where depIata = #{depIata} )
OR v.id IN
(SELECT verif_id FROM foc_airline_connect WHERE depIata = #{depIata} AND is_main != '0')
)
</if>
<if test="arrIata!=null and arrIata!=''">
AND (v.id in (
SELECT id FROM foc_airline_verify where arrIata = #{arrIata} )
OR v.id IN
(SELECT verif_id FROM foc_airline_connect WHERE arrIata = #{arrIata} AND is_main != '0')
)
<if test="depIataList!=null ">
AND (v.id in (
SELECT id FROM foc_airline_verify where depIata in
<foreach collection="depIataList" item="iata" index="index" open="(" close=")" separator=",">
#{iata}
</foreach>)
OR v.id IN
(SELECT verif_id FROM foc_airline_connect WHERE depIata in
<foreach collection="depIataList" item="iata" index="index" open="(" close=")" separator=",">
#{iata}
</foreach>
AND is_main != '0')
)
</if>
<if test="arrIataList!=null ">
AND (v.id in (
SELECT id FROM foc_airline_verify where arrIata in
<foreach collection="arrIataList" item="iata" index="index" open="(" close=")" separator=",">
#{iata}
</foreach>)
OR v.id IN
(SELECT verif_id FROM foc_airline_connect WHERE arrIata in
<foreach collection="arrIataList" item="iata" index="index" open="(" close=")" separator=",">
#{iata}
</foreach>
AND is_main != '0')
)
</if>
<if test="priority!=null and priority!=''">
AND v.priority = #{priority}
</if>
......
resources/mapper/modules/sailing/SailingCommandDao.xml
......@@ -25,31 +25,43 @@
LEFT JOIN foc_airline_verify b on a.verif_id =b.id
LEFT JOIN foc_airports p ON p.airport_iata = b.depIata
LEFT JOIN foc_airports r ON r.airport_iata = b.arrIata
LEFT JOIN foc_aircraft_type q ON q.id = b.aircraft_type
where 1=1
LEFT JOIN foc_aircraft_type q ON q.id = b.aircraft_type
where 1=1
<if test="verifStatus != null and verifStatus != ''">
AND b.verif_status =#{verifStatus}
</if>
AND a.command_status ='00'
AND b.verif_status ='00'
AND b.verif_status =#{verifStatus}
</if>
AND a.command_status ='00'
AND b.verif_status ='00'
<if test="verifNo != null and verifNo != ''">
AND b.verif_no LIKE CONCAT('%', #{verifNo}, '%')
</if>
<if test="depIata != null and depIata != ''">
<if test="depIataList != null ">
AND (b.id in (
SELECT id FROM foc_airline_verify where depIata = #{depIata} )
OR b.id IN
(SELECT verif_id FROM foc_airline_connect WHERE depIata = #{depIata} AND is_main != '0')
)
SELECT id FROM foc_airline_verify where depIata in
<foreach collection="depIataList" item="iata" index="index" open="(" close=")" separator=",">
#{iata}
</foreach>)
OR b.id IN
(SELECT verif_id FROM foc_airline_connect WHERE depIata in
<foreach collection="depIataList" item="iata" index="index" open="(" close=")" separator=",">
#{iata}
</foreach>
AND is_main != '0')
)
</if>
<if test="arrIata != null and arrIata != ''">
<if test="arrIataList != null">
AND (b.id in (
SELECT id FROM foc_airline_verify where arrIata = #{arrIata} )
OR b.id IN
(SELECT verif_id FROM foc_airline_connect WHERE arrIata = #{arrIata} AND is_main != '0')
)
SELECT id FROM foc_airline_verify where arrIata in
<foreach collection="arrIataList" item="iata" index="index" open="(" close=")" separator=",">
#{iata}
</foreach>)
OR b.id IN
(SELECT verif_id FROM foc_airline_connect WHERE arrIata in
<foreach collection="arrIataList" item="iata" index="index" open="(" close=")" separator=",">
#{iata}
</foreach>
AND is_main != '0')
)
</if>
<if test="priority != null and priority != ''">
AND b.priority = #{priority}
......
resources/mapper/modules/sailing/SailingConclusionDao.xml
......@@ -23,31 +23,44 @@
DATE_FORMAT(a.create_date, '%Y-%m-%d') AS createDate
FROM
foc_airline_verify a
LEFT JOIN foc_sailing_conclusion c ON a.id = c.verif_id
LEFT JOIN foc_airports d ON d.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
WHERE
a.del_flag = #{DEL_FLAG_NORMAL}
AND c.del_flag = #{DEL_FLAG_NORMAL}
<if test="verifNo != null and verifNo != ''">
AND a.verif_no LIKE CONCAT('%', #{verifNo}, '%')
</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="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>
LEFT JOIN foc_sailing_conclusion c ON a.id = c.verif_id
LEFT JOIN foc_airports d ON d.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
WHERE
a.del_flag = #{DEL_FLAG_NORMAL}
AND c.del_flag = #{DEL_FLAG_NORMAL}
<if test="verifNo != null and verifNo != ''">
AND a.verif_no LIKE CONCAT('%', #{verifNo}, '%')
</if>
<if test="depIataList != null ">
AND (a.id in (
SELECT id FROM foc_airline_verify where depIata in
<foreach collection="depIataList" item="iata" index="index" open="(" close=")" separator=",">
#{iata}
</foreach>)
OR a.id IN
(SELECT verif_id FROM foc_airline_connect WHERE depIata in
<foreach collection="depIataList" item="iata" index="index" open="(" close=")" separator=",">
#{iata}
</foreach>
AND is_main != '0')
)
</if>
<if test="arrIataList != null ">
AND (a.id in (
SELECT id FROM foc_airline_verify where arrIata in
<foreach collection="arrIataList" item="iata" index="index" open="(" close=")" separator=",">
#{iata}
</foreach>)
OR a.id IN
(SELECT verif_id FROM foc_airline_connect WHERE arrIata in
<foreach collection="arrIataList" item="iata" index="index" open="(" close=")" separator=",">
#{iata}
</foreach>
AND is_main != '0')
)
</if>
<if test="priority != null and priority != ''">
AND a.priority = #{priority}
</if>
......
resources/mapper/modules/verify/AirlineConclusionDao.xml
......@@ -24,30 +24,44 @@
FROM
foc_airline_conclusion c
LEFT JOIN foc_airline_verify a ON a.id = c.verif_id
LEFT JOIN foc_aircraft_type t ON a.aircraft_type = t.id
LEFT JOIN foc_airports d ON d.airport_iata = a.depIata
LEFT JOIN foc_airports r ON r.airport_iata = a.arrIata
WHERE
a.del_flag = #{DEL_FLAG_NORMAL}
AND c.del_flag = #{DEL_FLAG_NORMAL}
<!-- AND t.del_flag = #{DEL_FLAG_NORMAL} -->
<if test="verifNo != null and verifNo != ''">
AND a.verif_no LIKE CONCAT('%', #{verifNo}, '%')
</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="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>
LEFT JOIN foc_aircraft_type t ON a.aircraft_type = t.id
LEFT JOIN foc_airports d ON d.airport_iata = a.depIata
LEFT JOIN foc_airports r ON r.airport_iata = a.arrIata
WHERE
a.del_flag = #{DEL_FLAG_NORMAL}
AND c.del_flag = #{DEL_FLAG_NORMAL}
<!-- AND t.del_flag = #{DEL_FLAG_NORMAL} -->
<if test="verifNo != null and verifNo != ''">
AND a.verif_no LIKE CONCAT('%', #{verifNo}, '%')
</if>
<if test="depIataList != null ">
AND (a.id in (
SELECT id FROM foc_airline_verify where depIata in
<foreach collection="depIataList" item="iata" index="index" open="(" close=")" separator=",">
#{iata}
</foreach>)
OR a.id IN
(SELECT verif_id FROM foc_airline_connect WHERE depIata in
<foreach collection="depIataList" item="iata" index="index" open="(" close=")" separator=",">
#{iata}
</foreach>
AND is_main != '0')
)
</if>
<if test="arrIataList != null ">
AND (a.id in (
SELECT id FROM foc_airline_verify where arrIata in
<foreach collection="arrIataList" item="iata" index="index" open="(" close=")" separator=",">
#{iata}
</foreach>)
OR a.id IN
(SELECT verif_id FROM foc_airline_connect WHERE arrIata in
<foreach collection="arrIataList" item="iata" index="index" open="(" close=")" separator=",">
#{iata}
</foreach>
AND is_main != '0')
)
</if>
<if test="priority != null and priority != ''">
AND a.priority = #{priority}
</if>
......
resources/mapper/modules/verify/CondationDao.xml
......@@ -67,18 +67,32 @@
<if test="verifNo != null and verifNo != ''">
AND a.verif_no LIKE CONCAT('%', #{verifNo}, '%')
</if>
<if test="arrIata != null and arrIata != ''">
<if test="arrIataList != null ">
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')
SELECT id FROM foc_airline_verify where arrIata in
<foreach collection="arrIataList" item="iata" index="index" open="(" close=")" separator=",">
#{iata}
</foreach>)
OR a.id IN
(SELECT verif_id FROM foc_airline_connect WHERE arrIata in
<foreach collection="arrIataList" item="iata" index="index" open="(" close=")" separator=",">
#{iata}
</foreach>
AND is_main != '0')
)
</if>
<if test="depIata != null and depIata != ''">
<if test="depIataList != null ">
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')
SELECT id FROM foc_airline_verify where depIata in
<foreach collection="depIataList" item="iata" index="index" open="(" close=")" separator=",">
#{iata}
</foreach>)
OR a.id IN
(SELECT verif_id FROM foc_airline_connect WHERE depIata in
<foreach collection="depIataList" item="iata" index="index" open="(" close=")" separator=",">
#{iata}
</foreach>
AND is_main != '0')
)
</if>
<if test="priority != null and priority != ''">
......
resources/mapper/modules/verify/RecordChangeVerify.xml
......@@ -26,30 +26,44 @@
foc_airline_verify a
INNER JOIN foc_verify_record r ON a.id=r.verif_id AND r.del_flag=#{DEL_FLAG_NORMAL}
LEFT JOIN foc_airports d ON d.airport_iata = a.depIata
LEFT JOIN foc_airports p ON p.airport_iata = a.arrIata
LEFT JOIN foc_aircraft_type q ON q.id = a.aircraft_type
<!-- LEFT JOIN foc_aircraft_type f ON f.id=a.aircraft_type -->
WHERE
a.del_flag=#{DEL_FLAG_NORMAL}
AND r.record_type=#{recordType}
AND r.record_status='00' AND a.verif_status='00'
<if test="verifNo != null and verifNo != ''">
AND a.verif_no LIKE CONCAT('%', #{verifNo}, '%')
</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="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>
LEFT JOIN foc_airports p ON p.airport_iata = a.arrIata
LEFT JOIN foc_aircraft_type q ON q.id = a.aircraft_type
<!-- LEFT JOIN foc_aircraft_type f ON f.id=a.aircraft_type -->
WHERE
a.del_flag=#{DEL_FLAG_NORMAL}
AND r.record_type=#{recordType}
AND r.record_status='00' AND a.verif_status='00'
<if test="verifNo != null and verifNo != ''">
AND a.verif_no LIKE CONCAT('%', #{verifNo}, '%')
</if>
<if test="depIataList != null ">
AND (a.id in (
SELECT id FROM foc_airline_verify where depIata in
<foreach collection="depIataList" item="iata" index="index" open="(" close=")" separator=",">
#{iata}
</foreach>)
OR a.id IN
(SELECT verif_id FROM foc_airline_connect WHERE depIata in
<foreach collection="depIataList" item="iata" index="index" open="(" close=")" separator=",">
#{iata}
</foreach>
AND is_main != '0')
)
</if>
<if test="arrIataList != null ">
AND (a.id in (
SELECT id FROM foc_airline_verify where arrIata in
<foreach collection="arrIataList" item="iata" index="index" open="(" close=")" separator=",">
#{iata}
</foreach>)
OR a.id IN
(SELECT verif_id FROM foc_airline_connect WHERE arrIata in
<foreach collection="arrIataList" item="iata" index="index" open="(" close=")" separator=",">
#{iata}
</foreach>
AND is_main != '0')
)
</if>
<if test="priority != null and priority != ''">
AND a.priority=#{priority}
</if>
......
resources/mapper/modules/verify/VerifyFeedbackDao.xml
......@@ -164,18 +164,32 @@
<if test="departType != null and departType != ''">
AND a.departType = #{departType}
</if>
<if test="arrIata != null and arrIata != ''">
<if test="arrIataList != null ">
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')
SELECT id FROM foc_airline_verify where arrIata in
<foreach collection="arrIataList" item="iata" index="index" open="(" close=")" separator=",">
#{iata}
</foreach>)
OR a.id IN
(SELECT verif_id FROM foc_airline_connect WHERE arrIata in
<foreach collection="arrIataList" item="iata" index="index" open="(" close=")" separator=",">
#{iata}
</foreach>
AND is_main != '0')
)
</if>
<if test="depIata != null and depIata != ''">
<if test="depIataList != null">
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')
SELECT id FROM foc_airline_verify where depIata in
<foreach collection="depIataList" item="iata" index="index" open="(" close=")" separator=",">
#{iata}
</foreach>)
OR a.id IN
(SELECT verif_id FROM foc_airline_connect WHERE depIata in
<foreach collection="depIataList" item="iata" index="index" open="(" close=")" separator=",">
#{iata}
</foreach>
AND is_main != '0')
)
</if>
<if test="priority != null and priority != ''">
......@@ -230,18 +244,32 @@
<if test="departType != null and departType != ''">
AND a.departType = #{departType}
</if>
<if test="arrIata != null and arrIata != ''">
<if test="arrIataList != null ">
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')
SELECT id FROM foc_airline_verify where arrIata in
<foreach collection="arrIataList" item="iata" index="index" open="(" close=")" separator=",">
#{iata}
</foreach>)
OR a.id IN
(SELECT verif_id FROM foc_airline_connect WHERE arrIata in
<foreach collection="arrIataList" item="iata" index="index" open="(" close=")" separator=",">
#{iata}
</foreach>
AND is_main != '0')
)
</if>
<if test="depIata != null and depIata != ''">
<if test="depIataList != null">
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')
SELECT id FROM foc_airline_verify where depIata in
<foreach collection="depIataList" item="iata" index="index" open="(" close=")" separator=",">
#{iata}
</foreach>)
OR a.id IN
(SELECT verif_id FROM foc_airline_connect WHERE depIata in
<foreach collection="depIataList" item="iata" index="index" open="(" close=")" separator=",">
#{iata}
</foreach>
AND is_main != '0')
)
</if>
<if test="priority != null and priority != ''">
......
resources/mapper/modules/verify/VerifyManageDao.xml
......@@ -57,18 +57,32 @@
<if test="verifStatus != null and verifStatus != ''">
AND a.verif_status = #{verifStatus}
</if>
<if test="arrIata != null and arrIata != ''">
<if test="arrIataList != null ">
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')
SELECT id FROM foc_airline_verify where arrIata in
<foreach collection="arrIataList" item="iata" index="index" open="(" close=")" separator=",">
#{iata}
</foreach>)
OR a.id IN
(SELECT verif_id FROM foc_airline_connect WHERE arrIata in
<foreach collection="arrIataList" item="iata" index="index" open="(" close=")" separator=",">
#{iata}
</foreach>
AND is_main != '0')
)
</if>
<if test="depIata != null and depIata != ''">
<if test="depIataList">
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')
SELECT id FROM foc_airline_verify where depIata in
<foreach collection="depIataList" item="iata" index="index" open="(" close=")" separator=",">
#{iata}
</foreach>)
OR a.id IN
(SELECT verif_id FROM foc_airline_connect WHERE depIata in
<foreach collection="depIataList" item="iata" index="index" open="(" close=")" separator=",">
#{iata}
</foreach>
AND is_main != '0')
)
</if>
<if test="priority != null and priority != ''">
......
src/com/ejweb/core/base/AirportQueryBean.java 0 → 100644
package com.ejweb.core.base;
import java.util.List;
/**
* @author LEGION
*/
public class AirportQueryBean {
List arrIataList;
List depIataList;
public List getArrIataList() {
return arrIataList;
}
public void setArrIataList(List arrIataList) {
this.arrIataList = arrIataList;
}
public List getDepIataList() {
return depIataList;
}
public void setDepIataList(List depIataList) {
this.depIataList = depIataList;
}
}
src/com/ejweb/modules/airport/bean/StatisticalBean.java
......@@ -11,35 +11,57 @@ import com.ejweb.core.base.GenericBean;
import com.ejweb.core.conf.GConstants;
import com.fasterxml.jackson.annotation.JsonIgnore;
import java.util.List;
/**
*
* @team suzhou
* @author huhy
* @version 1.0
* @time 2016年9月7日
* @team suzhou
* @time 2016年9月7日
*/
public class StatisticalBean extends GenericBean{
public class StatisticalBean extends GenericBean {
private String routeNo;
private String verifNo;
private String depIata;
private String arrIata;
private String sort;
private String verifType;
@NotEmpty(message="userCode不能为空")
@NotEmpty(message = "userCode不能为空")
private String userCode;
@Min(value=1, message="pageNo必须大于等于1")
private int pageNo=1;//第几页
@Min(value=1, message="pageSize必须大于等于1")
private int pageSize=GConstants.PAGE_SIZE;//每页条数
@Min(value = 1, message = "pageNo必须大于等于1")
private int pageNo = 1;//第几页
@Min(value = 1, message = "pageSize必须大于等于1")
private int pageSize = GConstants.PAGE_SIZE;//每页条数
private String verifStatus = "02";
private String aircraftType;
List arrIataList;
List depIataList;
public List getArrIataList() {
return arrIataList;
}
public void setArrIataList(List arrIataList) {
this.arrIataList = arrIataList;
}
public List getDepIataList() {
return depIataList;
}
public void setDepIataList(List depIataList) {
this.depIataList = depIataList;
}
public String getAircraftType() {
return aircraftType;
}
public void setAircraftType(String aircraftType) {
this.aircraftType = aircraftType;
}
/**
* @return the routeNo
*/
......
src/com/ejweb/modules/airport/entity/AirportListEntity.java
......@@ -28,7 +28,7 @@ public class AirportListEntity extends BaseEntity implements Comparable<AirportL
private Integer landingTime; // 着地时间
private String airportNamePinyin; //航站名称（拼音）
private String airportNameLetter; //航站名称（首字母）
@JSONField(serialize=false)
// @JSONField(serialize=false)
private Short status = 2; // 状态： 1 显示 2 屏蔽 3 删除，默认为2
public String getAirportNamePinyin() {
......
src/com/ejweb/modules/airport/service/AirportService.java
package com.ejweb.modules.airport.service;
import java.util.Collections;
import java.util.List;
import org.springframework.stereotype.Service;
import com.ejweb.core.base.BaseService;
import com.ejweb.core.base.FindEntity;
import com.ejweb.core.base.PageEntity;
......@@ -12,69 +7,57 @@ import com.ejweb.modules.airport.bean.AirportListBean;
import com.ejweb.modules.airport.dao.AirportDao;
import com.ejweb.modules.airport.entity.AirportEntity;
import com.ejweb.modules.airport.entity.AirportListEntity;
import org.springframework.stereotype.Service;
import java.util.Collections;
import java.util.List;
/**
* 三字码
*
* @team IT Team
*
* @author renmb
* @version 1.0
* @time 2016年8月27日
* @team IT Team
* @time 2016年8月27日
*/
@Service
public class AirportService extends BaseService<AirportDao> {
/**
* 获取指定三字码的详情
*
* @author renmb
* @time 2016年8月30日
*
* @param iata
* @return
* @author renmb
* @time 2016年8月30日
*/
public AirportEntity getAirportByIata(String iata){
public AirportEntity getAirportByIata(String iata) {
FindEntity entity = new FindEntity(iata);
return dao.getAirportByIata(entity);
}
/**
* 获取所有的三字码列表，次接口不需要分页
*
* @author renmb
* @time 2016年8月30日
*
* @param bean
* @return
* @author renmb
* @time 2016年8月30日
*/
public PageEntity<AirportListEntity> getAirportList(AirportListBean bean){
// PageInfo<AirportListEntity> pageInfo = null;
// 必须紧贴dao的查询方法
// PageHelper.startPage(bean.getPageNo(), bean.getPageSize());
// pageInfo = new PageInfo<AirportListEntity>(dao.getAirportList(bean));
// if(pageInfo.getPages()<bean.getPageNo()){// 页码大于总页数，则返回NULL
//
// return null;
// }
List<AirportListEntity> list = dao.getAirportList(bean);//pageInfo.getList();
public PageEntity<AirportListEntity> getAirportList(AirportListBean bean) {
List<AirportListEntity> list = dao.getAirportList(bean);
Collections.sort(list);
if (list == null || list.size() == 0) {// 如果没有数据则返回NULL
// 如果没有数据则返回NULL
if (list == null || list.size() == 0) {
return null;
}
// PageEntity<AirportListEntity> page = new PageEntity<AirportListEntity>();
// page.setPageNo(pageInfo.getPageNum());
// page.setPageSize(pageInfo.getPageSize());
// page.setCount(pageInfo.getTotal());
// page.setTotalPage(pageInfo.getPages());
// page.setList(pageInfo.getList());
PageEntity<AirportListEntity> page = new PageEntity<AirportListEntity>();
page.setPageNo(1);
page.setPageSize(list.size());
page.setCount(list.size());
page.setTotalPage(1);
page.setList(list);
return page;
}
......
src/com/ejweb/modules/airport/service/StatisticalService.java
......@@ -38,6 +38,13 @@ public class StatisticalService extends BaseService<StatisticalDao> {
private AirlineVerifyDao verifdao;
public PageEntity<StatisticalEntity> getStatisticalList(StatisticalBean bean) {
//查询同一机场被屏蔽三字码数据（历史数据关联）
if (StringUtils.isNotEmpty(bean.getArrIata())) {
bean.setArrIataList(verifdao.getIataStr(bean.getArrIata()));
}
if (StringUtils.isNotEmpty(bean.getDepIata())) {
bean.setDepIataList(verifdao.getIataStr(bean.getDepIata()));
}
PageInfo<StatisticalEntity> pageInfo = null;
// 必须紧贴dao的查询方法
PageHelper.startPage(bean.getPageNo(), bean.getPageSize());
......
src/com/ejweb/modules/assessment/bean/AssessmentListBean.java
......@@ -5,6 +5,7 @@ import com.ejweb.core.conf.GConstants;
import org.hibernate.validator.constraints.NotEmpty;
import javax.validation.constraints.Min;
import java.util.List;
/**
* 未评估
......@@ -33,14 +34,33 @@ public class AssessmentListBean extends GenericBean {
@Min(value=1, message="pageSize必须大于等于1")
private int pageSize = GConstants.PAGE_SIZE; // 每页条数
@Min(value=1, message="pageNo必须大于等于1")
@Min(value = 1, message = "pageNo必须大于等于1")
private int pageNo = 1; // 当前页码
@NotEmpty(message="assessmentStatus字段不能为空")
@NotEmpty(message = "assessmentStatus字段不能为空")
private String assessmentStatus = "00"; // 值为"00"
private String sort; // 排序用
List arrIataList;
List depIataList;
public List getArrIataList() {
return arrIataList;
}
public void setArrIataList(List arrIataList) {
this.arrIataList = arrIataList;
}
public List getDepIataList() {
return depIataList;
}
public void setDepIataList(List depIataList) {
this.depIataList = depIataList;
}
public String getVerifId() {
return verifId;
}
......
src/com/ejweb/modules/assessment/service/AssessmentService.java
......@@ -52,32 +52,40 @@ public class AssessmentService extends BaseService<AssessmentDao> {
* @return
*/
public PageEntity<AssessmentListEntity> getAssessmentList(AssessmentListBean bean){
//查询同一机场被屏蔽三字码数据（历史数据关联）
if (StringUtils.isNotEmpty(bean.getArrIata())) {
bean.setArrIataList(verifyDao.getIataStr(bean.getArrIata()));
}
if (StringUtils.isNotEmpty(bean.getDepIata())) {
bean.setDepIataList(verifyDao.getIataStr(bean.getDepIata()));
}
PageInfo<AssessmentListEntity> pageInfo = null;
// 必须紧贴dao的查询方法
bean.setAssessmentStatus("00"); // 查询本部门assessmentStatus为"00"的数据
// 查询本部门assessmentStatus为"00"的数据
bean.setAssessmentStatus("00");
PageHelper.startPage(bean.getPageNo(), bean.getPageSize());
if(StringUtils.isEmpty(bean.getSort())){
if (StringUtils.isEmpty(bean.getSort())) {
PageHelper.orderBy(" verifNo DESC");
} else {
PageHelper.orderBy(bean.getSort());
}
else
PageHelper.orderBy(bean.getSort());
pageInfo = new PageInfo<AssessmentListEntity>(dao.getAssessmentList(bean));
if(pageInfo.getPages()<bean.getPageNo()){// 页码大于总页数，则返回NULL
// 页码大于总页数，则返回NULL
if (pageInfo.getPages() < bean.getPageNo()) {
return null;
}
List<AssessmentListEntity> products = pageInfo.getList();
if (products == null || products.size() == 0) {// 如果没有数据则返回NULL
// 如果没有数据则返回NULL
if (products == null || products.size() == 0) {
return null;
}
for(AssessmentListEntity entity: products){
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>();
for (AssessmentListEntity entity : products) {
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"));
......@@ -86,8 +94,6 @@ public class AssessmentService extends BaseService<AssessmentDao> {
}
entity.setConnect(list2);
entity.setTypeList(verifyDao.getTypeList(entity.getVerifId()));
// entity.setConnect(verifyDao.getConnectList(entity.getVerifId()));
}
PageEntity<AssessmentListEntity> page = new PageEntity<AssessmentListEntity>();
page.setPageNo(pageInfo.getPageNum());
......@@ -98,13 +104,14 @@ public class AssessmentService extends BaseService<AssessmentDao> {
return page;
}
public List<AssessmentListEntity> getAssessmentList2(AssessmentListBean bean){
bean.setAssessmentStatus("00"); // 查询本部门assessmentStatus为"00"的数据
public List<AssessmentListEntity> getAssessmentList2(AssessmentListBean bean) {
// 查询本部门assessmentStatus为"00"的数据
bean.setAssessmentStatus("00");
List<AssessmentListEntity> list = dao.getAssessmentList(bean);
for(AssessmentListEntity entity: list){
String typelist=verifyDao.getTypeList1(entity.getVerifId());
if(StringUtils.isNoneBlank(typelist))
entity.setAircraftName(entity.getAircraftName()+":"+typelist);
for (AssessmentListEntity entity : list) {
String typelist = verifyDao.getTypeList1(entity.getVerifId());
if (StringUtils.isNoneBlank(typelist))
entity.setAircraftName(entity.getAircraftName() + ":" + typelist);
}
return list;
}
......
src/com/ejweb/modules/route/bean/AirlineVerifyBean.java
......@@ -5,14 +5,16 @@ import javax.validation.constraints.Min;
import com.ejweb.core.base.GenericBean;
import com.ejweb.core.conf.GConstants;
public class AirlineVerifyBean extends GenericBean{
@Min(value=1, message="pageNo必须大于等于1")
private int pageNo=1;//第几页
@Min(value=1, message="pageSize必须大于等于1")
private int pageSize=GConstants.PAGE_SIZE;//每页条数
import java.util.List;
public class AirlineVerifyBean 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 id;
private String verifId;
......@@ -24,24 +26,43 @@ public class AirlineVerifyBean extends GenericBean{
private String priority;
private String aircraftType;
private String verifType;
private String verifyStatus; //论证状态00待论证 01 可行 02 不可行 03 条件可行 04 暂无意见 05最终不可行
private String verifStatus; //00论证中,01终止,02成功
private String userCode;
private String sort; //order_no排序
public String getId() {
return id;
}
List arrIataList;
List depIataList;
public void setId(String id) {
this.id = id;
}
public List getArrIataList() {
return arrIataList;
}
public void setArrIataList(List arrIataList) {
this.arrIataList = arrIataList;
}
public List getDepIataList() {
return depIataList;
}
public void setDepIataList(List depIataList) {
this.depIataList = depIataList;
}
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getVerifId() {
public String getVerifId() {
return verifId;
}
......
src/com/ejweb/modules/sailing/bean/SailingCommandBean.java
/**
*
*
*/
package com.ejweb.modules.sailing.bean;
......@@ -10,14 +10,15 @@ import org.hibernate.validator.constraints.NotEmpty;
import com.ejweb.core.base.GenericBean;
import com.ejweb.core.conf.GConstants;
import java.util.List;
/**
*
* @team suzhou
* @author huhy
* @version 1.0
* @time 2016年9月5日
* @team suzhou
* @time 2016年9月5日
*/
public class SailingCommandBean extends GenericBean{
public class SailingCommandBean extends GenericBean {
private String verifNo;
private String depIata;
......@@ -26,21 +27,42 @@ public class SailingCommandBean extends GenericBean{
private String verifType;
private String verifStatus;
private String aircraftType;
@NotEmpty(message="userCode不能为空")
@NotEmpty(message = "userCode不能为空")
private String userCode;
@Min(value=1, message="pageNo必须大于等于1")
private int pageNo=1;//第几页
@Min(value=1, message="pageSize必须大于等于1")
private int pageSize=GConstants.PAGE_SIZE;//每页条数
private String commandStatus ="00";
@Min(value = 1, message = "pageNo必须大于等于1")
private int pageNo = 1;//第几页
@Min(value = 1, message = "pageSize必须大于等于1")
private int pageSize = GConstants.PAGE_SIZE;//每页条数
private String commandStatus = "00";
private String sort;
List arrIataList;
List depIataList;
public List getArrIataList() {
return arrIataList;
}
public void setArrIataList(List arrIataList) {
this.arrIataList = arrIataList;
}
public List getDepIataList() {
return depIataList;
}
public void setDepIataList(List depIataList) {
this.depIataList = depIataList;
}
/**
* @return the verifNo
*/
public String getVerifNo() {
return verifNo;
}
/**
* @param verifNo the verifNo to set
*/
......
src/com/ejweb/modules/sailing/bean/SailingConclusionListBean.java
......@@ -7,11 +7,12 @@ import org.hibernate.validator.constraints.NotEmpty;
import com.ejweb.core.base.GenericBean;
import com.ejweb.core.conf.GConstants;
import java.util.List;
/**
* 获取开航总结列表参数bean
*
* @author wq
*
* @author wq
*/
public class SailingConclusionListBean extends GenericBean {
public static final String DEL_FLAG_NORMAL = "0";
......@@ -30,6 +31,26 @@ public class SailingConclusionListBean extends GenericBean {
private int pageNo = 1;
private String aircraftType;
private String conclusionStatus = "00";
List arrIataList;
List depIataList;
public List getArrIataList() {
return arrIataList;
}
public void setArrIataList(List arrIataList) {
this.arrIataList = arrIataList;
}
public List getDepIataList() {
return depIataList;
}
public void setDepIataList(List depIataList) {
this.depIataList = depIataList;
}
public String getSort() {
return sort;
}
......
src/com/ejweb/modules/sailing/service/SailingCommandService.java
......@@ -86,7 +86,13 @@ public class SailingCommandService extends CurdService<SailingCommandDao, Sailin
* @time 2016年9月6日
*/
public PageEntity<SailingCommandEntity> getCommandList(SailingCommandBean bean) {
//查询同一机场被屏蔽三字码数据（历史数据关联）
if (StringUtils.isNotEmpty(bean.getArrIata())) {
bean.setArrIataList(verifyDao.getIataStr(bean.getArrIata()));
}
if (StringUtils.isNotEmpty(bean.getDepIata())) {
bean.setDepIataList(verifyDao.getIataStr(bean.getDepIata()));
}
PageInfo<SailingCommandEntity> pageInfo = null;
// 必须紧贴dao的查询方法
PageHelper.startPage(bean.getPageNo(), bean.getPageSize());
......
src/com/ejweb/modules/sailing/service/SailingConclusionService.java
package com.ejweb.modules.sailing.service;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.ejweb.core.base.BaseService;
import com.ejweb.core.base.PageEntity;
import com.ejweb.core.util.IdWorker;
......@@ -31,8 +20,17 @@ import com.ejweb.modules.verify.dao.VerifyManageDao;
import com.ejweb.modules.verify.entity.MailEntity;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import freemarker.template.TemplateException;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
/**
* 开航总结表sevice
......@@ -50,19 +48,28 @@ public class SailingConclusionService extends BaseService<SailingConclusionDao>
VerifyManageDao manageDao;
public PageEntity<SailingConclusionListEntity> getList(SailingConclusionListBean bean) {
//查询同一机场被屏蔽三字码数据（历史数据关联）
if (StringUtils.isNotEmpty(bean.getArrIata())) {
bean.setArrIataList(verifyDao.getIataStr(bean.getArrIata()));
}
if (StringUtils.isNotEmpty(bean.getDepIata())) {
bean.setDepIataList(verifyDao.getIataStr(bean.getDepIata()));
}
PageInfo<SailingConclusionListEntity> pageInfo = null;
PageHelper.startPage(bean.getPageNo(), bean.getPageSize());
if (StringUtils.isEmpty(bean.getSort())) {
PageHelper.orderBy(" verifNo DESC");
} else
} else {
PageHelper.orderBy(bean.getSort());
}
pageInfo = new PageInfo<SailingConclusionListEntity>(dao.getList(bean));
if (pageInfo.getPages() < bean.getPageNo()) {// 页码大于总页数，则返回NULL
// 页码大于总页数，则返回NULL
if (pageInfo.getPages() < bean.getPageNo()) {
return null;
}
List<SailingConclusionListEntity> list = pageInfo.getList();
if (list == null || list.size() == 0) {// 如果没有数据则返回NULL
// 如果没有数据则返回NULL
if (list == null || list.size() == 0) {
return null;
}
for (SailingConclusionListEntity entity : list) {
......
src/com/ejweb/modules/verify/bean/AirlineConclusionListBean.java
......@@ -7,13 +7,15 @@ import org.hibernate.validator.constraints.NotEmpty;
import com.ejweb.core.base.GenericBean;
import com.ejweb.core.conf.GConstants;
import java.util.List;
/**
* 获取审核总结列表参数bean
* @author lyw
*
* @author lyw
*/
public class AirlineConclusionListBean extends GenericBean {
public static final String DEL_FLAG_NORMAL = "0";
private String aircraftType;
private String verifNo;
......@@ -24,34 +26,43 @@ public class AirlineConclusionListBean extends GenericBean {
private String verifStatus = "00";
@NotEmpty(message = "conclusionStatus不能为空")
private String conclusionStatus;
@NotEmpty(message="userCode不能为空")
@NotEmpty(message = "userCode不能为空")
private String userCode;
@Min(value=1, message="pageNo必须大于等于1")
private int pageNo=1;//第几页
@Min(value=1, message="pageSize必须大于等于1")
private int pageSize=GConstants.PAGE_SIZE;//每页条数
@Min(value = 1, message = "pageNo必须大于等于1")
private int pageNo = 1;//第几页
@Min(value = 1, message = "pageSize必须大于等于1")
private int pageSize = GConstants.PAGE_SIZE;//每页条数
private String sort;
List arrIataList;
List depIataList;
public List getArrIataList() {
return arrIataList;
}
public void setArrIataList(List arrIataList) {
this.arrIataList = arrIataList;
}
public List getDepIataList() {
return depIataList;
}
public void setDepIataList(List depIataList) {
this.depIataList = depIataList;
}
public String getVerifNo() {
return verifNo;
}
public void setVerifNo(String verifNo) {
this.verifNo = verifNo;
}
// public String getTakeoff() {
// return takeoff;
// }
// public void setTakeoff(String takeoff) {
// this.takeoff = takeoff;
// }
// public String getDestination() {
// return destination;
// }
// public void setDestination(String destination) {
// this.destination = destination;
// }
public String getPriority() {
return priority;
}
......
src/com/ejweb/modules/verify/bean/AirlineVerifiedBean.java
......@@ -7,11 +7,12 @@ import org.hibernate.validator.constraints.NotEmpty;
import com.ejweb.core.base.GenericBean;
import com.ejweb.core.conf.GConstants;
import java.util.List;
/**
* 航线论证审核bean
*
* @author huhy
*
* @author huhy
*/
public class AirlineVerifiedBean extends GenericBean {
......@@ -35,6 +36,25 @@ public class AirlineVerifiedBean extends GenericBean {
@Min(value = 1, message = "pageSize必须大于等于1")
private int pageSize = GConstants.PAGE_SIZE;// 每页条数
List arrIataList;
List depIataList;
public List getArrIataList() {
return arrIataList;
}
public void setArrIataList(List arrIataList) {
this.arrIataList = arrIataList;
}
public List getDepIataList() {
return depIataList;
}
public void setDepIataList(List depIataList) {
this.depIataList = depIataList;
}
public String getVerifNo() {
return verifNo;
}
......
src/com/ejweb/modules/verify/bean/AirlineVerifyBean.java
......@@ -7,14 +7,16 @@ import org.hibernate.validator.constraints.NotEmpty;
import com.ejweb.core.base.GenericBean;
import com.ejweb.core.conf.GConstants;
import java.util.List;
/**
* 航线论证bean
* @author lyw
*
* @author lyw
*/
public class AirlineVerifyBean extends GenericBean {
public static final String DEL_FLAG_NORMAL = "0";
public static final String DEL_FLAG_NORMAL = "0";
private String verifNo;
private String depIata;
......@@ -35,36 +37,39 @@ public class AirlineVerifyBean extends GenericBean {
/* private List<Map<String, String>> sort;
private String sortSql;*/
public String getVerifNo() {
return verifNo;
}
return verifNo;
}
public void setVerifNo(String verifNo) {
this.verifNo = verifNo;
}
public void setVerifNo(String verifNo) {
this.verifNo = verifNo;
}
// public String getTakeoff() {
// return takeoff;
// }
//
// public void setTakeoff(String takeoff) {
// this.takeoff = takeoff;
// }
//
// public String getDestination() {
// return destination;
// }
//
// public void setDestination(String destination) {
// this.destination = destination;
// }
public String getPriority() {
return priority;
}
List arrIataList;
List depIataList;
public List getArrIataList() {
return arrIataList;
}
public void setArrIataList(List arrIataList) {
this.arrIataList = arrIataList;
}
public List getDepIataList() {
return depIataList;
}
public void setDepIataList(List depIataList) {
this.depIataList = depIataList;
}
public String getPriority() {
return priority;
}
public String getDepIata() {
public String getDepIata() {
return depIata;
}
......
src/com/ejweb/modules/verify/bean/ConditionBean.java
......@@ -7,13 +7,15 @@ import org.hibernate.validator.constraints.NotEmpty;
import com.ejweb.core.base.GenericBean;
import com.ejweb.core.conf.GConstants;
import java.util.List;
/**
*
* 论证条件评估审核列表
* @team IT Team
*
* @author zhanglg
* @version 1.0
* @time 2016年9月12日
* @team IT Team
* @time 2016年9月12日
*/
public class ConditionBean extends GenericBean {
......@@ -26,16 +28,35 @@ public class ConditionBean extends GenericBean {
private String verifType;
private String aircraftType;
private String verifStatus = "00";
@NotEmpty(message="userCode不能为空")
@NotEmpty(message = "userCode不能为空")
private String userCode;
@Min(value=1, message="pageNo必须大于等于1")
private int pageNo=1;//第几页
@Min(value=1, message="pageSize必须大于等于1")
private int pageSize=GConstants.PAGE_SIZE;//每页条数
@Min(value = 1, message = "pageNo必须大于等于1")
private int pageNo = 1;//第几页
@Min(value = 1, message = "pageSize必须大于等于1")
private int pageSize = GConstants.PAGE_SIZE;//每页条数
private String sort;
List arrIataList;
List depIataList;
public List getArrIataList() {
return arrIataList;
}
public void setArrIataList(List arrIataList) {
this.arrIataList = arrIataList;
}
public List getDepIataList() {
return depIataList;
}
public void setDepIataList(List depIataList) {
this.depIataList = depIataList;
}
public String getVerifNo() {
return verifNo;
}
......
src/com/ejweb/modules/verify/bean/RecordChangeVerifyListBean.java
......@@ -7,35 +7,59 @@ import org.hibernate.validator.constraints.NotEmpty;
import com.ejweb.core.base.GenericBean;
import com.ejweb.core.conf.GConstants;
import java.util.List;
/**
* 获取论证列表Bean
* @author wq
*
* @author wq
*/
public class RecordChangeVerifyListBean extends GenericBean{
public static final String DEL_FLAG_NORMAL="0";
private String recordType="01";
private String recordStatus="00";
public class RecordChangeVerifyListBean extends GenericBean {
public static final String DEL_FLAG_NORMAL = "0";
private String recordType = "01";
private String recordStatus = "00";
private String verifNo;
private String depIata;
private String arrIata;
private String priority;
private String verifType;
private String verifStatus="00";
private String verifStatus = "00";
private String aircraftType;
@NotEmpty(message="userCode不能为空")
@NotEmpty(message = "userCode不能为空")
private String userCode;
@Min(value=1, message="pageNo必须大于等于1")
private int pageNo=1;//第几页
@Min(value=1, message="pageSize必须大于等于1")
private int pageSize=GConstants.PAGE_SIZE;//每页条数
@Min(value = 1, message = "pageNo必须大于等于1")
private int pageNo = 1;//第几页
@Min(value = 1, message = "pageSize必须大于等于1")
private int pageSize = GConstants.PAGE_SIZE;//每页条数
List arrIataList;
List depIataList;
public List getArrIataList() {
return arrIataList;
}
public void setArrIataList(List arrIataList) {
this.arrIataList = arrIataList;
}
public List getDepIataList() {
return depIataList;
}
public void setDepIataList(List depIataList) {
this.depIataList = depIataList;
}
private String sort;
public String getSort() {
return sort;
}
public void setSort(String sort) {
this.sort = sort;
}
public String getRecordType() {
return recordType;
}
......
src/com/ejweb/modules/verify/bean/VerifyFeedbackBean.java
......@@ -7,13 +7,15 @@ import org.hibernate.validator.constraints.NotEmpty;
import com.ejweb.core.base.GenericBean;
import com.ejweb.core.conf.GConstants;
import java.util.List;
/**
*
* 论证条件评估审核列表
* @team IT Team
*
* @author zhanglg
* @version 1.0
* @time 2016年9月12日
* @team IT Team
* @time 2016年9月12日
*/
public class VerifyFeedbackBean extends GenericBean {
......@@ -27,13 +29,32 @@ public class VerifyFeedbackBean extends GenericBean {
private String departType;
private String aircraftType;
private String verifStatus = "00";
@NotEmpty(message="userCode不能为空")
@NotEmpty(message = "userCode不能为空")
private String userCode;
@Min(value=1, message="pageNo必须大于等于1")
private int pageNo=1;//第几页
@Min(value = 1, message = "pageNo必须大于等于1")
private int pageNo = 1;//第几页
private String sort;
@Min(value=1, message="pageSize必须大于等于1")
private int pageSize=GConstants.PAGE_SIZE;//每页条数
@Min(value = 1, message = "pageSize必须大于等于1")
private int pageSize = GConstants.PAGE_SIZE;//每页条数
List arrIataList;
List depIataList;
public List getArrIataList() {
return arrIataList;
}
public void setArrIataList(List arrIataList) {
this.arrIataList = arrIataList;
}
public List getDepIataList() {
return depIataList;
}
public void setDepIataList(List depIataList) {
this.depIataList = depIataList;
}
public String getVerifNo() {
return verifNo;
......
src/com/ejweb/modules/verify/bean/VerifyManageBean.java
/**
*
*
*/
package com.ejweb.modules.verify.bean;
......@@ -10,15 +10,16 @@ import org.hibernate.validator.constraints.NotEmpty;
import com.ejweb.core.base.GenericBean;
import com.ejweb.core.conf.GConstants;
import java.util.List;
/**
*
* @team IT Team
* @author zhanglg
* @version 1.0
* @time 2016年9月17日
* @team IT Team
* @time 2016年9月17日
*/
public class VerifyManageBean extends GenericBean{
public class VerifyManageBean extends GenericBean {
public static final String DEL_FLAG_NORMAL = "0";
......@@ -31,13 +32,32 @@ public class VerifyManageBean extends GenericBean{
private String verifiedStatus;
private String manageStatus;
private String sort;
@NotEmpty(message="userCode不能为空")
@NotEmpty(message = "userCode不能为空")
private String userCode;
@Min(value=1, message="pageNo必须大于等于1")
private int pageNo=1;//第几页
@Min(value = 1, message = "pageNo必须大于等于1")
private int pageNo = 1;//第几页
private String aircraftType;
@Min(value=1, message="pageSize必须大于等于1")
private int pageSize=GConstants.PAGE_SIZE;//每页条数
@Min(value = 1, message = "pageSize必须大于等于1")
private int pageSize = GConstants.PAGE_SIZE;//每页条数
List arrIataList;
List depIataList;
public List getArrIataList() {
return arrIataList;
}
public void setArrIataList(List arrIataList) {
this.arrIataList = arrIataList;
}
public List getDepIataList() {
return depIataList;
}
public void setDepIataList(List depIataList) {
this.depIataList = depIataList;
}
public String getVerifNo() {
return verifNo;
......
src/com/ejweb/modules/verify/dao/AirlineVerifyDao.java
......@@ -34,23 +34,27 @@ public interface AirlineVerifyDao extends BaseDao {
AirlineVerifyEntity getEntityByVerify(AirlineVerifyDetailBean bean);
void insert(AirlineVerifyAddBean bean);
void insert(AirlineVerifyAddBean bean);
void insertFiles(AirlineVerifyAddBean bean);
void insertFiles(AirlineVerifyAddBean bean);
void updateByStatus(AirlineVerifyUpdateStatusBean bean);
void updateStartTime(VerifyProcessUpdateBean bean);
void delete(AirlineVerifyDeleteBean bean);
void updateByStatus(AirlineVerifyUpdateStatusBean bean);
String getDeptName(AirlineVerifyUpdateStatusBean bean);
void updateStartTime(VerifyProcessUpdateBean bean);
Integer getApplyNo(AirlineVerifyAddBean bean);
void delete(AirlineVerifyDeleteBean bean);
String getDepartId(AirlineVerifyAddBean bean);
String findVeirfyNo(AirlineVerifyEntity airlineVerifyEntity);
void updateVeirfyNo(AirlineVerifyEntity entity);
String getDeptName(AirlineVerifyUpdateStatusBean bean);
List<String> getIataStr(String iata);
Integer getApplyNo(AirlineVerifyAddBean bean);
String getDepartId(AirlineVerifyAddBean bean);
String findVeirfyNo(AirlineVerifyEntity airlineVerifyEntity);
void updateVeirfyNo(AirlineVerifyEntity entity);
List<Map<String, String>> getConnectList(String verifId);
......
src/com/ejweb/modules/verify/service/AirlineConclusionService.java
......@@ -68,27 +68,35 @@ public class AirlineConclusionService extends BaseService<AirlineConclusionDao>
@Autowired
RecordDao recordDao;
public PageEntity<AirlineConclusionListEntity> getList(AirlineConclusionListBean bean) {
//查询同一机场被屏蔽三字码数据（历史数据关联）
if (StringUtils.isNotEmpty(bean.getArrIata())) {
bean.setArrIataList(verifyDao.getIataStr(bean.getArrIata()));
}
if (StringUtils.isNotEmpty(bean.getDepIata())) {
bean.setDepIataList(verifyDao.getIataStr(bean.getDepIata()));
}
PageInfo<AirlineConclusionListEntity> pageInfo = null;
// 必须紧贴dao的查询方法
PageHelper.startPage(bean.getPageNo(), bean.getPageSize());
if(StringUtils.isEmpty(bean.getSort())){
if (StringUtils.isEmpty(bean.getSort())) {
PageHelper.orderBy(" verifNo DESC");
} else {
PageHelper.orderBy(bean.getSort());
}
else
PageHelper.orderBy(bean.getSort());
pageInfo = new PageInfo<AirlineConclusionListEntity>(dao.getList(bean));
if(pageInfo.getPages()<bean.getPageNo()){// 页码大于总页数，则返回NULL
// 页码大于总页数，则返回NULL
if (pageInfo.getPages() < bean.getPageNo()) {
return null;
}
List<AirlineConclusionListEntity> list = pageInfo.getList();
if (list == null || list.size() == 0) {// 如果没有数据则返回NULL
// 如果没有数据则返回NULL
if (list == null || list.size() == 0) {
return null;
}
for(AirlineConclusionListEntity entity: list){
for (AirlineConclusionListEntity entity : list) {
entity.setTypeList(verifyDao.getTypeList(entity.getVerifId()));
entity.setConnect(verifyDao.getConnectList(entity.getVerifId()));
}
PageEntity<AirlineConclusionListEntity> page = new PageEntity<AirlineConclusionListEntity>();
page.setPageNo(pageInfo.getPageNum());
......
src/com/ejweb/modules/verify/service/AirlineVerifiedService.java
......@@ -57,30 +57,39 @@ public class AirlineVerifiedService extends BaseService<AirlineVerifiedDao> {
DepartDao departDao;
@Autowired
RecordDao recordDao;
public PageEntity<AirlineVerifiedEntity> getAirlineVerifiedList(AirlineVerifiedBean bean) {
if (StringUtils.isNotEmpty(bean.getArrIata())) {
bean.setArrIataList(airlineVerifyDao.getIataStr(bean.getArrIata()));
}
if (StringUtils.isNotEmpty(bean.getDepIata())) {
bean.setDepIataList(airlineVerifyDao.getIataStr(bean.getDepIata()));
}
PageInfo<AirlineVerifiedEntity> pageInfo = null;
// 必须紧贴dao的查询方法
PageHelper.startPage(bean.getPageNo(), bean.getPageSize());
if(StringUtils.isEmpty(bean.getSort())){
if (StringUtils.isEmpty(bean.getSort())) {
PageHelper.orderBy(" applyNo DESC");
} else {
PageHelper.orderBy(bean.getSort());
}
else
PageHelper.orderBy(bean.getSort());
pageInfo = new PageInfo<AirlineVerifiedEntity>(dao.getList(bean));
if (pageInfo.getPages() < bean.getPageNo()) {// 页码大于总页数，则返回NULL
// 页码大于总页数，则返回NULL
if (pageInfo.getPages() < bean.getPageNo()) {
return null;
}
List<AirlineVerifiedEntity> products = pageInfo.getList();
if (products == null || products.size() == 0) {// 如果没有数据则返回NULL
// 如果没有数据则返回NULL
if (products == null || products.size() == 0) {
return null;
}
for(AirlineVerifiedEntity entity:products){
for (AirlineVerifiedEntity entity : products) {
entity.setTypeList(verifyDao.getTypeList(entity.getVerifId()));
entity.setConnect(verifyDao.getConnectList(entity.getVerifId()));
entity.setDepName(verifyDao.getConnetList(entity.getVerifId()));
String typelist=verifyDao.getTypeList1(entity.getVerifId());
if(StringUtils.isNoneBlank(typelist))
entity.setAircraftName(entity.getAircraftName()+":"+typelist);
String typelist = verifyDao.getTypeList1(entity.getVerifId());
if (StringUtils.isNoneBlank(typelist))
entity.setAircraftName(entity.getAircraftName() + ":" + typelist);
}
PageEntity<AirlineVerifiedEntity> page = new PageEntity<AirlineVerifiedEntity>();
page.setPageNo(pageInfo.getPageNum());
......
src/com/ejweb/modules/verify/service/ConditionService.java
......@@ -51,6 +51,13 @@ public class ConditionService extends BaseService<ConditionDao> {
DepartDao departDao;
public PageEntity<ConditionEntity> findList(ConditionBean bean) {
//查询同一机场被屏蔽三字码数据（历史数据关联）
if (StringUtils.isNotEmpty(bean.getArrIata())) {
bean.setArrIataList(verifyDao.getIataStr(bean.getArrIata()));
}
if (StringUtils.isNotEmpty(bean.getDepIata())) {
bean.setDepIataList(verifyDao.getIataStr(bean.getDepIata()));
}
PageInfo<ConditionEntity> pageInfo = null;
// 必须紧贴dao的查询方法
PageHelper.startPage(bean.getPageNo(), bean.getPageSize());
......
src/com/ejweb/modules/verify/service/RecordChangeVerifyService.java
......@@ -52,30 +52,37 @@ public class RecordChangeVerifyService extends BaseService<RecordChangeVerifyDao
@Autowired
private NotifyDao notifyDao;
public PageEntity<RecordChangeVerifyEntity> getList(RecordChangeVerifyListBean bean) {
//查询同一机场被屏蔽三字码数据（历史数据关联）
if (StringUtils.isNotEmpty(bean.getArrIata())) {
bean.setArrIataList(verifyDao.getIataStr(bean.getArrIata()));
}
if (StringUtils.isNotEmpty(bean.getDepIata())) {
bean.setDepIataList(verifyDao.getIataStr(bean.getDepIata()));
}
PageInfo<RecordChangeVerifyEntity> pageInfo = null;
PageHelper.startPage(bean.getPageNo(), bean.getPageSize());
if(StringUtils.isEmpty(bean.getSort())){
if (StringUtils.isEmpty(bean.getSort())) {
PageHelper.orderBy(" verifNo DESC");
} else {
PageHelper.orderBy(bean.getSort());
}
else
PageHelper.orderBy(bean.getSort());
pageInfo = new PageInfo<RecordChangeVerifyEntity>(dao.getList(bean));
if (pageInfo.getPages() < bean.getPageNo()) {// 页码大于总页数，则返回NULL
// 页码大于总页数，则返回NULL
if (pageInfo.getPages() < bean.getPageNo()) {
return null;
}
List<RecordChangeVerifyEntity> list = pageInfo.getList();
if (list == null || list.size() == 0) {// 如果没有数据则返回NULL
// 如果没有数据则返回NULL
if (list == null || list.size() == 0) {
return null;
}
for(RecordChangeVerifyEntity entity: list){
for (RecordChangeVerifyEntity entity : list) {
entity.setTypeList(verifyDao.getTypeList(entity.getVerifId()));
entity.setConnect(verifyDao.getConnectList(entity.getVerifId()));
entity.setDepIataLabel(verifyDao.getConnetList(entity.getVerifId()));
String typelist=verifyDao.getTypeList1(entity.getVerifId());
if(StringUtils.isNoneBlank(typelist))
entity.setAircraftName(entity.getAircraftName()+":"+typelist);
String typelist = verifyDao.getTypeList1(entity.getVerifId());
if (StringUtils.isNoneBlank(typelist))
entity.setAircraftName(entity.getAircraftName() + ":" + typelist);
}
PageEntity<RecordChangeVerifyEntity> page = new PageEntity<RecordChangeVerifyEntity>();
page.setPageNo(pageInfo.getPageNum());
......
src/com/ejweb/modules/verify/service/VerifyFeedbackService.java
......@@ -54,6 +54,12 @@ public class VerifyFeedbackService extends BaseService<VerifyFeedbackDao> {
RouteVerifyService routeVerifyService;
public PageEntity<VerifyFeedbackEntity> findList(VerifyFeedbackBean bean) {
if (StringUtils.isNotEmpty(bean.getArrIata())) {
bean.setArrIataList(verifyDao.getIataStr(bean.getArrIata()));
}
if (StringUtils.isNotEmpty(bean.getDepIata())) {
bean.setDepIataList(verifyDao.getIataStr(bean.getDepIata()));
}
PageInfo<VerifyFeedbackEntity> pageInfo;
// 必须紧贴dao的查询方法
PageHelper.startPage(bean.getPageNo(), bean.getPageSize());
......@@ -211,6 +217,12 @@ public class VerifyFeedbackService extends BaseService<VerifyFeedbackDao> {
public PageEntity<VerifyFeedbackEntity> verifyConditionList(VerifyFeedbackBean bean) {
if (StringUtils.isNotEmpty(bean.getArrIata())) {
bean.setArrIataList(verifyDao.getIataStr(bean.getArrIata()));
}
if (StringUtils.isNotEmpty(bean.getDepIata())) {
bean.setDepIataList(verifyDao.getIataStr(bean.getDepIata()));
}
// 必须紧贴dao的查询方法
PageHelper.startPage(bean.getPageNo(), bean.getPageSize());
if (StringUtils.isEmpty(bean.getSort())) {
......
src/com/ejweb/modules/verify/service/VerifyManageService.java
......@@ -81,14 +81,21 @@ public class VerifyManageService extends BaseService<VerifyManageDao> {
@Autowired
AirlineVerifiedDao verifiedDao ;
public PageEntity<VerifyManageEntity> findList(VerifyManageBean bean) {
//查询同一机场被屏蔽三字码数据（历史数据关联）
if (StringUtils.isNotEmpty(bean.getArrIata())) {
bean.setArrIataList(verifyDao.getIataStr(bean.getArrIata()));
}
if (StringUtils.isNotEmpty(bean.getDepIata())) {
bean.setDepIataList(verifyDao.getIataStr(bean.getDepIata()));
}
PageInfo<VerifyManageEntity> pageInfo = null;
// 必须紧贴dao的查询方法
PageHelper.startPage(bean.getPageNo(), bean.getPageSize());
if(StringUtils.isEmpty(bean.getSort())){
if (StringUtils.isEmpty(bean.getSort())) {
PageHelper.orderBy(" verifNo DESC");
} else {
PageHelper.orderBy(bean.getSort());
}
else
PageHelper.orderBy(bean.getSort());
pageInfo = new PageInfo<VerifyManageEntity>(dao.findList(bean));
if (pageInfo.getPages() < bean.getPageNo()) {// 页码大于总页数，则返回NULL
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment