Skip to content

A
api
Commit 3561ef41 by java-李谡
Options

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

parent ba01134b
Showing with 1031 additions and 540 deletions
resources/mapper/modules/airlineVerify/AirlineVerifiedDao.xml
......@@ -39,20 +39,32 @@
<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} )
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 = #{depIata} AND is_main != '0')
(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} )
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 = #{arrIata} AND is_main != '0')
(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 != ''">
......
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,19 +56,33 @@
<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')
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>
......
resources/mapper/modules/assessment/AssessmentDao.xml
......@@ -48,20 +48,32 @@
<if test="verifNo != null and verifNo != ''">
AND v.verif_no like concat ('%',#{verifNo},'%')
</if>
<if test="depIata!=null and depIata!=''">
<if test="depIataList!=null ">
AND (v.id in (
SELECT id FROM foc_airline_verify where depIata = #{depIata} )
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 = #{depIata} AND is_main != '0')
(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 (v.id in (
SELECT id FROM foc_airline_verify where arrIata = #{arrIata} )
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 = #{arrIata} AND is_main != '0')
(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!=''">
......
resources/mapper/modules/sailing/SailingCommandDao.xml
......@@ -35,20 +35,32 @@
<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} )
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 = #{depIata} AND is_main != '0')
(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} )
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 = #{arrIata} AND is_main != '0')
(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 != ''">
......
resources/mapper/modules/sailing/SailingConclusionDao.xml
......@@ -33,19 +33,32 @@
<if test="verifNo != null and verifNo != ''">
AND a.verif_no LIKE CONCAT('%', #{verifNo}, '%')
</if>
<if test="depIata != null and depIata != ''">
<if test="depIataList != null ">
AND (a.id in (
SELECT id FROM foc_airline_verify where depIata = #{depIata} )
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 = #{depIata} AND is_main != '0')
(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')
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 != ''">
......
resources/mapper/modules/verify/AirlineConclusionDao.xml
......@@ -34,18 +34,32 @@
<if test="verifNo != null and verifNo != ''">
AND a.verif_no LIKE CONCAT('%', #{verifNo}, '%')
</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')
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 != ''">
......
resources/mapper/modules/verify/AirlineVerifyDao.xml
......@@ -37,20 +37,33 @@
LEFT JOIN foc_airline_verified p ON p.verif_id = a.id
WHERE a.del_flag = #{DEL_FLAG_NORMAL}
<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}
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')
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>
......@@ -333,8 +346,9 @@ union (SELECT apply_no,create_time AS create_date
create_date,
del_flag
) values
<foreach collection="verifyFile" item="item" index="index" separator="," >
(#{item.id}, #{id},#{item.filePath},#{item.fileName},#{item.fileSize}, '01', #{id}, CURRENT_TIMESTAMP, #{DEL_FLAG_NORMAL})
<foreach collection="verifyFile" item="item" index="index" separator=",">
(#{item.id}, #{id},#{item.filePath},#{item.fileName},#{item.fileSize}, '01', #{id}, CURRENT_TIMESTAMP,
#{DEL_FLAG_NORMAL})
</foreach>
</insert>
......@@ -355,7 +369,7 @@ union (SELECT apply_no,create_time AS create_date
Is_main
) values
<foreach collection="connect" item="item" index="index" separator="," >
<foreach collection="connect" item="item" index="index" separator=",">
(#{item.id}, #{id},#{item.flightNo}, #{item.depIata}, #{item.arrIata}, #{DEL_FLAG_NORMAL}, #{item.IsMain})
</foreach>
......@@ -397,6 +411,16 @@ union (SELECT apply_no,create_time AS create_date
AND d.del_flag = #{DEL_FLAG_NORMAL}
</select>
<select id="getIataStr" resultType="string">
SELECT
b.airport_iata
FROM
foc_airports a
INNER JOIN foc_airports b on a.airport_name=b.airport_name
WHERE
a.airport_iata = #{iata}
</select>
<update id="updateByStatus">
UPDATE
foc_airline_verify
......@@ -426,7 +450,7 @@ union (SELECT apply_no,create_time AS create_date
<!-- 获取特定的airlineVerify -->
<select id="getAirlineVerify" resultType="com.ejweb.modules.verify.entity.AirlineVerifyEntity">
SELECT
<include refid="airlineVerifyColumns" />
<include refid="airlineVerifyColumns"/>
FROM foc_airline_verify a
WHERE a.del_flag = #{DEL_FLAG_NORMAL}
AND a.id = #{userCode}
......@@ -458,7 +482,7 @@ union (SELECT apply_no,create_time AS create_date
create_date,
del_flag
)VALUES
<foreach collection="airTypes" item="item" index="index" separator="," >
<foreach collection="airTypes" item="item" index="index" separator=",">
(#{item.id}, #{id},#{item.typeId}, #{userCode}, CURRENT_TIMESTAMP, #{DEL_FLAG_NORMAL})
</foreach>
</insert>
......@@ -498,32 +522,45 @@ union (SELECT apply_no,create_time AS create_date
LEFT JOIN foc_airports r ON r.airport_iata = fav.arrIata
LEFT JOIN foc_verify_process pro ON pro.verif_id = fav.id
WHERE fav.verif_status='00' AND s.conclusion_status is null
<if test="depIata != null and depIata != ''" >
<if test="depIataList != null ">
AND (fav.id in (
SELECT id FROM foc_airline_verify where depIata = #{depIata} ) OR
SELECT id FROM foc_airline_verify where depIata in
<foreach collection="depIataList" item="iata" index="index" open="(" close=")" separator=",">
#{iata}
</foreach>)
OR
fav.id IN
(SELECT verif_id FROM foc_airline_connect WHERE depIata = #{depIata} AND is_main != '0')
(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 (fav.id in (
SELECT id FROM foc_airline_verify where arrIata = #{arrIata} )
SELECT id FROM foc_airline_verify where arrIata in
<foreach collection="arrIataList" item="iata" index="index" open="(" close=")" separator=",">
#{iata}
</foreach>)
OR fav.id IN
(SELECT verif_id FROM foc_airline_connect WHERE arrIata = #{arrIata} AND is_main != '0')
(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 != ''" >
<if test="priority != null and priority != ''">
AND fav.priority = #{priority}
</if>
<if test="verifType != null and verifType != ''" >
<if test="verifType != null and verifType != ''">
AND fav.verif_type = #{verifType}
</if>
<if test="aircraftType != null and aircraftType != ''">
AND fav.aircraft_type = #{aircraftType}
</if>
<if test="verifStatus != null and verifStatus != ''" >
<if test="verifStatus != null and verifStatus != ''">
AND fav.verif_status = #{verifStatus}
</if>
<if test="verifNo != null and verifNo != ''">
......@@ -532,7 +569,7 @@ union (SELECT apply_no,create_time AS create_date
<if test="dbName == 'mssql'">'%'+#{verifNo}+'%')</if>
<if test="dbName == 'mysql'">CONCAT('%', #{verifNo}, '%')</if>
</if>
<if test="verifId != null and verifId != ''" >
<if test="verifId != null and verifId != ''">
AND frv.verif_id = #{verifId}
</if>
<!-- AND (frv.verify_status='00' or frv.verify_status='04' or frv.status='0') -->
......@@ -572,7 +609,7 @@ union (SELECT apply_no,create_time AS create_date
LEFT JOIN foc_airports p ON p.airport_iata = fav.depIata
LEFT JOIN foc_airports r ON r.airport_iata = fav.arrIata
WHERE 1 = 1
<if test="depIata != null and depIata != ''" >
<if test="depIata != null and depIata != ''">
AND (fav.id in (
SELECT id FROM foc_airline_verify where depIata = #{depIata} ) OR
fav.id IN
......@@ -580,7 +617,7 @@ union (SELECT apply_no,create_time AS create_date
)
</if>
<if test="arrIata != null and arrIata != ''" >
<if test="arrIata != null and arrIata != ''">
AND (fav.id in (
SELECT id FROM foc_airline_verify where arrIata = #{arrIata} )
OR fav.id IN
......@@ -588,17 +625,17 @@ union (SELECT apply_no,create_time AS create_date
)
</if>
<if test="priority != null and priority != ''" >
<if test="priority != null and priority != ''">
AND fav.priority = #{priority}
</if>
<if test="verifType != null and verifType != ''" >
<if test="verifType != null and verifType != ''">
AND fav.verif_type = #{verifType}
</if>
<if test="verifStatus != null and verifStatus != ''" >
<if test="verifStatus != null and verifStatus != ''">
AND fav.verif_status = #{verifStatus}
</if>
<if test="verifId != null and verifId != ''" >
<if test="verifId != null and verifId != ''">
AND frv.verif_id = #{verifId}
</if>
<if test="verifNo != null and verifNo != ''">
......@@ -677,7 +714,7 @@ union (SELECT apply_no,create_time AS create_date
id = (SELECT verif_id FROM foc_verify_process WHERE id = #{nodeId})
</update>
<select id="check" resultType="String" >
<select id="check" resultType="String">
SELECT CASE WHEN verif_status='00' AND (verified_status='01' OR verified_status='02') THEN '1'
ELSE '0' END isCheck FROM
(select verif_status ,verified_status ,verif_id,s.status from foc_airline_verify a LEFT JOIN foc_airline_verified s ON a.id=s.verif_id
......@@ -687,7 +724,7 @@ union (SELECT apply_no,create_time AS create_date
</select>
<!-- 判断是否能终止论证 -->
<select id="checkVerif" resultType="String" >
<select id="checkVerif" resultType="String">
SELECT
CASE WHEN verif_status = '00'
AND (
......@@ -708,7 +745,7 @@ union (SELECT apply_no,create_time AS create_date
foc_airline_verify a
WHERE a.id = #{verifId}
</select>
<select id="getConnetList" resultType="String" >
<select id="getConnetList" resultType="String">
SELECT GROUP_CONCAT(names SEPARATOR ' ') from
(SELECT CASE WHEN s.verif_type='06' OR s.verif_type='07' OR s.verif_type='08' THEN s1.airport_name
WHEN s.verif_type='05' AND roundtrip_type='01' then CONCAT(t1.city_name,'-',t2.city_name)
......@@ -744,24 +781,24 @@ LEFT JOIN foc_airports t2 on t.arrIata = t2.airport_iata where s.id=#{verifId} )
order by create_date desc
</select>
<!-- 获取论证状态-->
<select id="getVerifStatus" resultType="String" >
<select id="getVerifStatus" resultType="String">
SELECT verif_status
FROM
foc_airline_verify a
WHERE a.id = #{verifId}
</select>
<select id="getmail" resultType="String" >
<select id="getmail" resultType="String">
SELECT mail_address FROM foc_verify_mail WHERE dict_type=#{type}
</select>
<select id="getmailNew" resultType="String" >
<select id="getmailNew" resultType="String">
SELECT distinct(t.email) from sys_user_profiles s
LEFT JOIN sys_user t on s.user_id=t.id
where 1=1
AND t.email like '%.com%'
and depart_id in (SELECT id from foc_user_depart where del_flag='0' AND depart_name !='其他')
</select>
<select id="getmailNew1" resultType="String" >
<select id="getmailNew1" resultType="String">
SELECT distinct(t.email) from sys_user_profiles s
LEFT JOIN sys_user t on s.user_id=t.id
where 1=1
......@@ -772,15 +809,15 @@ LEFT JOIN foc_airports t2 on t.arrIata = t2.airport_iata where s.id=#{verifId} )
</foreach>
</select>
<select id="getmailYK" resultType="String" >
<select id="getmailYK" resultType="String">
SELECT DISTINCT(email) from sys_user where id in (SELECT user_id from sys_user2role where role_id in (SELECT id FROM `sys_role` s WHERE s.name='航线论证Web端论证组织' and del_flag='0') )
AND email like '%.com%'
</select>
<select id="getdepartList" resultType="String" >
<select id="getdepartList" resultType="String">
SELECT depart_id FROM foc_route_verify WHERE verif_id=#{verifId}
</select>
<select id="departNameList" resultType="String" >
<select id="departNameList" resultType="String">
SELECT depart_name FROM foc_user_depart
where del_flag='0'
<if test="type == 'verify'">
......@@ -793,7 +830,7 @@ LEFT JOIN foc_airports t2 on t.arrIata = t2.airport_iata where s.id=#{verifId} )
ORDER BY sort
</select>
<select id="getVerifyOpinionList" resultType="String" >
<select id="getVerifyOpinionList" resultType="String">
SELECT
CASE WHEN v.verify_status is null THEN '--'
WHEN v.verify_status ='00' AND v.status='0' THEN '暂无意见'
......@@ -812,7 +849,7 @@ LEFT JOIN foc_airports t2 on t.arrIata = t2.airport_iata where s.id=#{verifId} )
ORDER BY sort
</select>
<select id="getRiskOpinionList" resultType="String" >
<select id="getRiskOpinionList" resultType="String">
SELECT
CASE WHEN r.assessment_status is null THEN '--'
WHEN r.assessment_status ='00' THEN '暂无意见'
......@@ -833,7 +870,7 @@ LEFT JOIN foc_airports t2 on t.arrIata = t2.airport_iata where s.id=#{verifId} )
WHERE r.verif_id= #{verifId} AND r.record_type='01' AND r.record_status='00'
</select>
<select id="getDetail" resultType="Map" >
<select id="getDetail" resultType="Map">
SELECT
......
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
......@@ -36,18 +36,32 @@
<if test="verifNo != null and verifNo != ''">
AND a.verif_no LIKE CONCAT('%', #{verifNo}, '%')
</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')
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 != ''">
......
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
* @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,13 +7,17 @@ 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
* @team IT Team
* @time 2016年8月27日
*/
@Service
......@@ -27,54 +26,38 @@ 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
} 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,13 +5,15 @@ import javax.validation.constraints.Min;
import com.ejweb.core.base.GenericBean;
import com.ejweb.core.conf.GConstants;
public class AirlineVerifyBean extends GenericBean{
import java.util.List;
@Min(value=1, message="pageNo必须大于等于1")
private int pageNo=1;//第几页
public class AirlineVerifyBean extends GenericBean {
@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 id;
......@@ -33,6 +35,25 @@ public class AirlineVerifyBean extends GenericBean{
private String sort; //order_no排序
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 getId() {
return id;
}
......
src/com/ejweb/modules/sailing/bean/SailingCommandBean.java
......@@ -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
* @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
*
*/
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,10 +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 lyw
*
* @author lyw
*/
public class AirlineConclusionListBean extends GenericBean {
......@@ -25,33 +27,42 @@ public class AirlineConclusionListBean extends GenericBean {
@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
*
*/
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,10 +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 lyw
*
* @author lyw
*/
public class AirlineVerifyBean extends GenericBean {
......@@ -44,21 +46,24 @@ public class AirlineVerifyBean extends GenericBean {
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;
// }
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;
......
src/com/ejweb/modules/verify/bean/ConditionBean.java
......@@ -7,12 +7,14 @@ 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
* @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 = "pageNo必须大于等于1")
private int pageNo = 1;//第几页
@Min(value=1, message="pageSize必须大于等于1")
private int pageSize=GConstants.PAGE_SIZE;//每页条数
@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,12 +7,14 @@ 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
* @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
......@@ -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
* @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
......@@ -39,11 +39,15 @@ public interface AirlineVerifyDao extends BaseDao {
void insertFiles(AirlineVerifyAddBean bean);
void updateByStatus(AirlineVerifyUpdateStatusBean bean);
void updateStartTime(VerifyProcessUpdateBean bean);
void delete(AirlineVerifyDeleteBean bean);
String getDeptName(AirlineVerifyUpdateStatusBean bean);
List<String> getIataStr(String iata);
Integer getApplyNo(AirlineVerifyAddBean bean);
String getDepartId(AirlineVerifyAddBean bean);
......
src/com/ejweb/modules/verify/service/AirlineConclusionService.java
......@@ -68,24 +68,32 @@ 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
} 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()));
......
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
} 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/AirlineVerifyService.java
package com.ejweb.modules.verify.service;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import com.ejweb.modules.verify.dao.*;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.alibaba.fastjson.JSONObject;
import com.ejweb.core.base.BaseService;
import com.ejweb.core.base.PageEntity;
import com.ejweb.core.conf.GConstants;
import com.ejweb.core.util.IdWorker;
import com.ejweb.core.util.VerifyEmailHandler;
import com.ejweb.core.util.PlanUtil;
import com.ejweb.core.util.VerifyEmailHandler;
import com.ejweb.core.utils.excel.ImportExcel;
import com.ejweb.modules.assessment.bean.AssessmentDetailBean;
import com.ejweb.modules.assessment.dao.AssessmentDao;
......@@ -37,36 +16,36 @@ import com.ejweb.modules.route.dao.RouteVerifyDao;
import com.ejweb.modules.sailing.bean.SailingCmDetailBean;
import com.ejweb.modules.sailing.dao.SailingCommandDao;
import com.ejweb.modules.sailing.dao.SailingConclusionDao;
import com.ejweb.modules.verify.bean.AirlineConclusionDetailBean;
import com.ejweb.modules.verify.bean.AirlineVerifyAddBean;
import com.ejweb.modules.verify.bean.*;
import com.ejweb.modules.verify.bean.AirlineVerifyAddBean.Connect;
import com.ejweb.modules.verify.bean.AirlineVerifyBean;
import com.ejweb.modules.verify.bean.AirlineVerifyDeleteBean;
import com.ejweb.modules.verify.bean.AirlineVerifyDetailBean;
import com.ejweb.modules.verify.bean.AirlineVerifyUpdateStatusBean;
import com.ejweb.modules.verify.bean.RecordAddBean;
import com.ejweb.modules.verify.bean.VerifyFormBean;
import com.ejweb.modules.verify.entity.AirlineVerifyDetailEntity;
import com.ejweb.modules.verify.entity.AirlineVerifyEntity;
import com.ejweb.modules.verify.entity.ConnectionPlan;
import com.ejweb.modules.verify.entity.MailEntity;
import com.ejweb.modules.verify.entity.RecordEntity;
import com.ejweb.modules.verify.entity.VerifyFileEntity;
import com.ejweb.modules.verify.entity.VerifyFormEntity;
import com.ejweb.modules.verify.dao.*;
import com.ejweb.modules.verify.entity.*;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import freemarker.template.TemplateException;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
/**
* 航线论证service
* @author lyw
*
* @author lyw
*/
@Service
@Transactional(readOnly = true)
public class AirlineVerifyService extends BaseService<AirlineVerifyDao>{
public class AirlineVerifyService extends BaseService<AirlineVerifyDao> {
@Autowired
RecordDao recordDao;
@Autowired
......@@ -87,18 +66,25 @@ public class AirlineVerifyService extends BaseService<AirlineVerifyDao>{
VerifyConditionDao verifyConditionDao;
@Autowired
VerifyProcessDao processDao;
public PageEntity<AirlineVerifyEntity> getAirlineVerifyList(AirlineVerifyBean bean) {
if (StringUtils.isNotEmpty(bean.getArrIata())) {
bean.setArrIataList(dao.getIataStr(bean.getArrIata()));
}
if (StringUtils.isNotEmpty(bean.getDepIata())) {
bean.setDepIataList(dao.getIataStr(bean.getDepIata()));
}
PageInfo<AirlineVerifyEntity> pageInfo = null;
// 必须紧贴dao的查询方法
PageHelper.startPage(bean.getPageNo(), bean.getPageSize());
if(StringUtils.isEmpty(bean.getSort())){
if (StringUtils.isEmpty(bean.getSort())) {
PageHelper.orderBy(" verifNo DESC");
}
else
} else {
PageHelper.orderBy(bean.getSort());
List<AirlineVerifyEntity> list= dao.getList(bean);
}
List<AirlineVerifyEntity> list = dao.getList(bean);
list.forEach(entity->{
list.forEach(entity -> {
entity.setTypeList(dao.getTypeList(entity.getVerifId()));
entity.setConnect(dao.getConnectList(entity.getVerifId()));
entity.setDepIataLabel(dao.getConnetList(entity.getVerifId()));
......@@ -107,7 +93,7 @@ public class AirlineVerifyService extends BaseService<AirlineVerifyDao>{
pageInfo = new PageInfo<AirlineVerifyEntity>(list);
if(pageInfo.getPages()<bean.getPageNo()){// 页码大于总页数，则返回NULL
if (pageInfo.getPages() < bean.getPageNo()) {// 页码大于总页数，则返回NULL
return null;
}
List<AirlineVerifyEntity> products = pageInfo.getList();
......@@ -126,7 +112,7 @@ public class AirlineVerifyService extends BaseService<AirlineVerifyDao>{
public PageEntity<com.ejweb.modules.route.entity.AirlineVerifyEntity> getRiskAssessmentList(com.ejweb.modules.route.bean.AirlineVerifyBean bean) {
//如果论证状态没有传参，默认为00 00论证中,01终止,02成功
if(StringUtils.isBlank(bean.getVerifStatus())){
if (StringUtils.isBlank(bean.getVerifStatus())) {
bean.setVerifStatus("00");
}
......@@ -135,14 +121,14 @@ public class AirlineVerifyService extends BaseService<AirlineVerifyDao>{
PageHelper.startPage(bean.getPageNo(), bean.getPageSize());
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() + " ,depIata ASC");
}
else
PageHelper.orderBy(bean.getSort()+" ,depIata ASC");
pageInfo = new PageInfo<com.ejweb.modules.route.entity.AirlineVerifyEntity>(dao.getRiskAssessmentList(bean));
if(pageInfo.getPages()<bean.getPageNo()){// 页码大于总页数，则返回NULL
if (pageInfo.getPages() < bean.getPageNo()) {// 页码大于总页数，则返回NULL
new PageEntity<AirlineVerifyEntity>();
}
......@@ -150,11 +136,11 @@ public class AirlineVerifyService extends BaseService<AirlineVerifyDao>{
if (list == null || list.size() == 0) {// 如果没有数据则返回NULL
return null;
}
for(com.ejweb.modules.route.entity.AirlineVerifyEntity entity: list){
List<Map<String, String>> list1= dao.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 (com.ejweb.modules.route.entity.AirlineVerifyEntity entity : list) {
List<Map<String, String>> list1 = dao.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"));
......@@ -164,9 +150,9 @@ public class AirlineVerifyService extends BaseService<AirlineVerifyDao>{
entity.setConnect(list2);
entity.setDepName(dao.getConnetList(entity.getVerifId()));
entity.setTypeList(dao.getTypeList(entity.getVerifId()));
String typelist=dao.getTypeList1(entity.getVerifId());
if(StringUtils.isNoneBlank(typelist))
entity.setAircraftName(entity.getAircraftName()+":"+typelist);
String typelist = dao.getTypeList1(entity.getVerifId());
if (StringUtils.isNoneBlank(typelist))
entity.setAircraftName(entity.getAircraftName() + ":" + typelist);
}
PageEntity<com.ejweb.modules.route.entity.AirlineVerifyEntity> page = new PageEntity<com.ejweb.modules.route.entity.AirlineVerifyEntity>();
page.setPageNo(pageInfo.getPageNum());
......@@ -177,39 +163,38 @@ public class AirlineVerifyService extends BaseService<AirlineVerifyDao>{
return page;
}
public List<com.ejweb.modules.route.entity.AirlineVerifyEntity> getRiskAssessmentList1(com.ejweb.modules.route.bean.AirlineVerifyBean bean) {
public List<com.ejweb.modules.route.entity.AirlineVerifyEntity> getRiskAssessmentList1(com.ejweb.modules.route.bean.AirlineVerifyBean bean) {
//如果论证状态没有传参，默认为00 00论证中,01终止,02成功
if(StringUtils.isBlank(bean.getVerifStatus())){
if (StringUtils.isBlank(bean.getVerifStatus())) {
bean.setVerifStatus("00");
}
List<com.ejweb.modules.route.entity.AirlineVerifyEntity> list=dao.getRiskAssessmentListForExcel(bean);
List<com.ejweb.modules.route.entity.AirlineVerifyEntity> list = dao.getRiskAssessmentListForExcel(bean);
return list;
}
public List<ConnectionPlan> planlist(String fileName,String filePath){
public List<ConnectionPlan> planlist(String fileName, String filePath) {
//读取文件
try {
//获取目标文件的绝对路径
String fullFileName = GConstants.FILE_UPLOAD_DIR+filePath;
String fullFileName = GConstants.FILE_UPLOAD_DIR + filePath;
// String fullFileName ="D:\\论证计划.xlsx";
InputStream in = null;
in = new FileInputStream(fullFileName);
ImportExcel ei = new ImportExcel(fileName,in, 1, 0);
ImportExcel ei = new ImportExcel(fileName, in, 1, 0);
try {
List<ConnectionPlan> lst = ei.getDataList(ConnectionPlan.class);
List<ConnectionPlan> list=new ArrayList<ConnectionPlan>();
for(ConnectionPlan p:lst){
List<ConnectionPlan> list = new ArrayList<ConnectionPlan>();
for (ConnectionPlan p : lst) {
p.setField10(getTime(p.getField10()));
p.setField11(getTime(p.getField11()));
p.setField13(getTime(p.getField13()));
p.setField14(getTime(p.getField14()));
p.setField17(getTime(p.getField17()));
p.setField18(getTime(p.getField18()));
if(StringUtils.isNoneBlank(p.getField1())){
if (StringUtils.isNoneBlank(p.getField1())) {
list.add(p);
}
}
......@@ -233,49 +218,51 @@ public List<com.ejweb.modules.route.entity.AirlineVerifyEntity> getRiskAssessmen
}
return null;
}
private String getTime(String f){
private String getTime(String f) {
// Pattern pattern = Pattern.compile("-?[0-9].?[0-9]+");
Pattern pattern = Pattern.compile("\\d+\\.\\d+$|-\\d+\\.\\d+$");
Matcher isNum = pattern.matcher(f);
if( isNum.matches() ){
Double d18=Double.parseDouble(f);
if(d18<1){
int m=(int) (d18*24*60);
int h=m/60;
m=m%60;
Double hh=d18*24;
if(hh-h>0.999){
if (isNum.matches()) {
Double d18 = Double.parseDouble(f);
if (d18 < 1) {
int m = (int) (d18 * 24 * 60);
int h = m / 60;
m = m % 60;
Double hh = d18 * 24;
if (hh - h > 0.999) {
h++;
m=0;
m = 0;
}
return String.format("%02d", h)+":"+String.format("%02d", m);
}else if(f.length()<4){
f=String.format("%1$4s", f);
return String.format("%02d", h) + ":" + String.format("%02d", m);
} else if (f.length() < 4) {
f = String.format("%1$4s", f);
return f.replaceAll(" ", "0");
}
}else{
} else {
return f;
}
return f;
}
public AirlineVerifyDetailEntity get(AirlineVerifyDetailBean bean) {
AirlineVerifyDetailEntity airlineVerifyDetailEntity = dao.get(bean);
if (airlineVerifyDetailEntity != null) {
airlineVerifyDetailEntity.setConnect(dao.getConnectList(bean.getVerifId()));
airlineVerifyDetailEntity.setVerifyFile(dao.getverifyFileList(bean));
List<Map<String, String>> list= dao.getverifyFileList(bean);
if(list!=null&&list.size()>0){
Map<String, String> map=list.get(0);
List<Map<String, String>> list = dao.getverifyFileList(bean);
if (list != null && list.size() > 0) {
Map<String, String> map = list.get(0);
String fileName = map.get("fileName");
String filePath = map.get("filePath");
List<ConnectionPlan> lst= planlist( fileName, filePath);
List<ConnectionPlan> lst = planlist(fileName, filePath);
airlineVerifyDetailEntity.setConnectionPlan(lst);
}
RecordEntity recordEntity = recordDao.GetLastRecord(bean.getVerifId());
if(recordEntity!=null && "02".equals(recordEntity.getRecordStatus())){
if (recordEntity != null && "02".equals(recordEntity.getRecordStatus())) {
airlineVerifyDetailEntity.setRecordReason(recordEntity.getRemarks());
}
airlineVerifyDetailEntity.setVerify2type(dao.getVerify2typeList(bean));
......@@ -290,9 +277,9 @@ public List<com.ejweb.modules.route.entity.AirlineVerifyEntity> getRiskAssessmen
String applyNoPre = "SQ" + curYear;
String applyNo = null;
applyNo = dao.getStartNoApplyNo(applyNoPre);
if(applyNo != null ){
if (applyNo != null) {
int curNum = Integer.parseInt(applyNo.substring(6, applyNo.length())) + 1;
String appNo=String.format("%03d",curNum);
String appNo = String.format("%03d", curNum);
applyNo = applyNoPre + appNo;
} else {
......@@ -311,8 +298,7 @@ public List<com.ejweb.modules.route.entity.AirlineVerifyEntity> getRiskAssessmen
case "02":
case "03":
case "04":
case "09":
{
case "09": {
List<Connect> connects = new ArrayList<>();
Connect connect = new Connect();
connect.setId(IdWorker.getNextId());
......@@ -346,9 +332,8 @@ public List<com.ejweb.modules.route.entity.AirlineVerifyEntity> getRiskAssessmen
bean.setConnect(connects);
}
break;
case "05":
{
if ("02".equals(bean.getRoundtripType()) ) {
case "05": {
if ("02".equals(bean.getRoundtripType())) {
List<Connect> connects = new ArrayList<>();
Connect connect = new Connect();
connect.setId(IdWorker.getNextId());
......@@ -416,14 +401,14 @@ public List<com.ejweb.modules.route.entity.AirlineVerifyEntity> getRiskAssessmen
if (bean.getAirTypes() != null && bean.getAirTypes().size() > 0) {
dao.insertAirTypes(bean);
}
Map<String, String> map=dao.getDetail(bean.getId());
map.put("depName", PlanUtil.GetLine(map.get("depName"),map.get("arrName"),map.get("roundtripType"),map.get("vertype")));
map.put("depIata", PlanUtil.GetLine(map.get("depIata"),map.get("arrIata"),map.get("roundtripType"),map.get("vertype")));
NotifyAddBean addbean=new NotifyAddBean();
StringBuffer sb=new StringBuffer();
Map<String, String> map = dao.getDetail(bean.getId());
map.put("depName", PlanUtil.GetLine(map.get("depName"), map.get("arrName"), map.get("roundtripType"), map.get("vertype")));
map.put("depIata", PlanUtil.GetLine(map.get("depIata"), map.get("arrIata"), map.get("roundtripType"), map.get("vertype")));
NotifyAddBean addbean = new NotifyAddBean();
StringBuffer sb = new StringBuffer();
sb.append("申请单号为").append(applyNo).append("的")
.append(map.get("verifType")).append(map.get("depName")).append("航线待您审核，请尽快审核。");
StringBuffer sb1=new StringBuffer();
StringBuffer sb1 = new StringBuffer();
sb1.append("<<<a href='wait-review-airway-details.htm?verifId=").append(bean.getId());
sb1.append("&applyNo=").append(map.get("applyNo"));
sb1.append("&sailingDate=").append(map.get("startTime"));
......@@ -450,14 +435,14 @@ public List<com.ejweb.modules.route.entity.AirlineVerifyEntity> getRiskAssessmen
addbean1.setUserCode(bean.getUserCode());
addbean1.setVerifId(bean.getVerifId());
dao.updateByStatus(bean);
if("00".equals(bean.getVerifStatus())){
if ("00".equals(bean.getVerifStatus())) {
verifiedDao.updateStatus(bean);//将
verifyConditionDao.deleteConditionByVerifyId(bean.getVerifId());
routeDao.deleteRouteByVerifId(bean);//删除各部门论证
}
// 论证终止时，将所有涉及到的系统消息置灰
if("01".equals(bean.getVerifStatus())){
NotifyAddBean addbean=new NotifyAddBean();
if ("01".equals(bean.getVerifStatus())) {
NotifyAddBean addbean = new NotifyAddBean();
addbean.setConId(bean.getVerifId());
AirlineConclusionDetailBean detailBean = new AirlineConclusionDetailBean();
detailBean.setVerifId(bean.getVerifId());
......@@ -467,7 +452,7 @@ public List<com.ejweb.modules.route.entity.AirlineVerifyEntity> getRiskAssessmen
addbean1.setRecordType("06");
recordDao.insert(addbean1);
}else if("00".equals(bean.getVerifStatus())){
} else if ("00".equals(bean.getVerifStatus())) {
// 增加论证重开操作履历
addbean1.setRecordType("07");
......@@ -482,62 +467,61 @@ public List<com.ejweb.modules.route.entity.AirlineVerifyEntity> getRiskAssessmen
}
public List<AirlineVerifyEntity> getListAll(AirlineVerifyBean bean) {
List<AirlineVerifyEntity> list= dao.getList(bean);
for(AirlineVerifyEntity entity: list){
String typelist=dao.getTypeList1(entity.getVerifId());
if(StringUtils.isNoneBlank(typelist))
entity.setAircraftLabel(entity.getAircraftLabel()+":"+typelist);
List<AirlineVerifyEntity> list = dao.getList(bean);
for (AirlineVerifyEntity entity : list) {
String typelist = dao.getTypeList1(entity.getVerifId());
if (StringUtils.isNoneBlank(typelist)) {
entity.setAircraftLabel(entity.getAircraftLabel() + ":" + typelist);
}
}
return list;
}
public void updateByState(String verifId) {
dao.updateByState( verifId);
dao.updateByState(verifId);
}
/**
*
* @author zhanglg
* @time 2016年9月27日
* @param bean
* @return
* @author zhanglg
* @time 2016年9月27日
*/
public JSONObject check(AssessmentDetailBean bean) {
JSONObject obj=new JSONObject();
JSONObject obj = new JSONObject();
obj.put("isCheck", dao.check(bean));
return obj;
}
/**
*
* @author zhanglg
* @time 2016年9月28日
* @param bean
* @return
* @author zhanglg
* @time 2016年9月28日
*/
public List<VerifyFormEntity> getVerifyForm(VerifyFormBean bean) {
return dao.getVerifyForm( bean);
return dao.getVerifyForm(bean);
}
public List<Map<String, String>> getHistoryList(String parentId){
return dao.getHistoryList( parentId);
public List<Map<String, String>> getHistoryList(String parentId) {
return dao.getHistoryList(parentId);
}
public JSONObject checkVerif(AssessmentDetailBean bean) {
JSONObject obj=new JSONObject();
JSONObject obj = new JSONObject();
obj.put("isCheck", dao.checkVerif(bean));
return obj;
}
/**
*
* @author zhanglg
* @time 2016年10月5日
* @param bean
* @return
* @author zhanglg
* @time 2016年10月5日
*/
public String getVerifStatus(AssessmentDetailBean bean) {
......@@ -546,7 +530,6 @@ public List<com.ejweb.modules.route.entity.AirlineVerifyEntity> getRiskAssessmen
}
public String getDepartName(AssessmentDetailBean bean) {
// TODO Auto-generated method stub
return dao.getDepartName(bean.getVerifId());
......@@ -559,92 +542,94 @@ public List<com.ejweb.modules.route.entity.AirlineVerifyEntity> getRiskAssessmen
}
public String getConnetList(String verifId) {
return dao.getConnetList( verifId);
return dao.getConnetList(verifId);
}
public void sendMail(String verifId) {
List<String> ccmails= dao.getmail("1");
MailEntity entity1=new MailEntity();
List<String> ccmails = dao.getmail("1");
MailEntity entity1 = new MailEntity();
entity1.setType("1");
List<String> ls=new ArrayList<String>();
List<String> ls = new ArrayList<String>();
ls.add("e4q231wdfdfkukjqe53457dgfdhdfhd");
entity1.setList(ls);
List<String> mails= dao.getmailYK(entity1);
if(mails==null||mails.size()==0)return;
List<String> mails = dao.getmailYK(entity1);
if (mails == null || mails.size() == 0) {
return;
}
String templateName = "template_1.ftl";
Map<String, String> map=dao.getDetail(verifId);
Map<String, String> map = dao.getDetail(verifId);
map.put("url", "https://ifos.jdair.net/im/login");
map.put("depName", PlanUtil.GetLine(map.get("depName"),map.get("arrName"),map.get("roundtripType"),map.get("vertype")));
map.put("depIata", PlanUtil.GetLine(map.get("depIata"),map.get("arrIata"),map.get("roundtripType"),map.get("vertype")));
if(!map.containsKey("startTime")){
map.put("depName", PlanUtil.GetLine(map.get("depName"), map.get("arrName"), map.get("roundtripType"), map.get("vertype")));
map.put("depIata", PlanUtil.GetLine(map.get("depIata"), map.get("arrIata"), map.get("roundtripType"), map.get("vertype")));
if (!map.containsKey("startTime")) {
map.put("startTime", "");
}
String plan="";
String plan = "";
try {
List<Map<String,String>> list= dao.getConnectList(verifId);
AirlineVerifyDetailBean airBean=new AirlineVerifyDetailBean();
List<Map<String, String>> list = dao.getConnectList(verifId);
AirlineVerifyDetailBean airBean = new AirlineVerifyDetailBean();
airBean.setVerifId(verifId);
List<Map<String, String>> listm= dao.getverifyFileList(airBean);
plan=PlanUtil.GetPlan(verifId,map,list,listm);
List<Map<String, String>> listm = dao.getverifyFileList(airBean);
plan = PlanUtil.GetPlan(verifId, map, list, listm);
} catch (Exception e) {
// TODO: handle exception
}
String flight =PlanUtil.flightContent(map);
map.put("flight",flight);
String title="首都航空关于"+flight ;
String content= "";
String flight = PlanUtil.flightContent(map);
map.put("flight", flight);
String title = "首都航空关于" + flight;
String content = "";
try {
content= com.ejweb.core.util.TemplateFactory.generateHtmlFromFtl(templateName, map);
content = com.ejweb.core.util.TemplateFactory.generateHtmlFromFtl(templateName, map);
} catch (IOException e) {
// TODO Auto-generated catch block
content=e.getMessage();
content = e.getMessage();
} catch (TemplateException e) {
// TODO Auto-generated catch block
content=e.getMessage();
content = e.getMessage();
}
VerifyEmailHandler.getInstance().sendEmail(title+"的论证申请提示（智能首航论证系统提示）", content+plan, mails,ccmails);
VerifyEmailHandler.getInstance().sendEmail(title + "的论证申请提示（智能首航论证系统提示）", content + plan, mails, ccmails);
}
public Map<String, String> airline(String verifId) {
Map<String, String> map=dao.getDetail(verifId);
map.put("depName", PlanUtil.GetLine(map.get("depName"),map.get("arrName"),map.get("roundtripType"),map.get("vertype")));
map.put("depIata", PlanUtil.GetLine(map.get("depIata"),map.get("arrIata"),map.get("roundtripType"),map.get("vertype")));
Map<String, String> map = dao.getDetail(verifId);
map.put("depName", PlanUtil.GetLine(map.get("depName"), map.get("arrName"), map.get("roundtripType"), map.get("vertype")));
map.put("depIata", PlanUtil.GetLine(map.get("depIata"), map.get("arrIata"), map.get("roundtripType"), map.get("vertype")));
return map;
}
public void sendMailCancel(String verifId) {
List<String> ccmails= dao.getmail("5");
MailEntity entity1=new MailEntity();
List<String> ccmails = dao.getmail("5");
MailEntity entity1 = new MailEntity();
entity1.setType("5");
entity1.setList(dao.getdepartList(verifId));
List<String> mails= dao.getmailNew(entity1);
if(mails==null||mails.size()==0)return;
List<String> mails = dao.getmailNew(entity1);
if (mails == null || mails.size() == 0) {
return;
}
String templateName = "template_5.ftl";
Map<String, String> map=dao.getDetail(verifId);
String flight =PlanUtil.flightContent(map);
String line =PlanUtil.lineContent(map);
Map<String, String> map = dao.getDetail(verifId);
String flight = PlanUtil.flightContent(map);
String line = PlanUtil.lineContent(map);
map.put("line", line);
map.put("lineEN", PlanUtil.lineENContent(map));
map.put("url", "https://ifos.jdair.net/im/login");
map.put("depName", PlanUtil.GetLine(map.get("depName"),map.get("arrName"),map.get("roundtripType"),map.get("vertype")));
map.put("depIata", PlanUtil.GetLine(map.get("depIata"),map.get("arrIata"),map.get("roundtripType"),map.get("vertype")));
map.put("depName", PlanUtil.GetLine(map.get("depName"), map.get("arrName"), map.get("roundtripType"), map.get("vertype")));
map.put("depIata", PlanUtil.GetLine(map.get("depIata"), map.get("arrIata"), map.get("roundtripType"), map.get("vertype")));
try {
String en=com.ejweb.core.util.TemplateFactory.generateHtmlFromFtl("template_en_5.ftl", map);
String title="首都航空关于"+flight;
VerifyEmailHandler.getInstance().sendEmail(title+"的论证取消信息提示（S-FOC论证系统提示）", en+com.ejweb.core.util.TemplateFactory.generateHtmlFromFtl(templateName, map), mails,ccmails);
String en = com.ejweb.core.util.TemplateFactory.generateHtmlFromFtl("template_en_5.ftl", map);
String title = "首都航空关于" + flight;
VerifyEmailHandler.getInstance().sendEmail(title + "的论证取消信息提示（S-FOC论证系统提示）", en + com.ejweb.core.util.TemplateFactory.generateHtmlFromFtl(templateName, map), mails, ccmails);
} catch (IOException e) {
// TODO Auto-generated catch block
e.printStackTrace();
......@@ -655,10 +640,10 @@ public List<com.ejweb.modules.route.entity.AirlineVerifyEntity> getRiskAssessmen
}
public void testMail(){
List<String> mails= new ArrayList<String>();
public void testMail() {
List<String> mails = new ArrayList<String>();
mails.add("271288528@qq.com");
VerifyEmailHandler.getInstance().sendEmail("论证测试提示（S-FOC论证系统提示）","这是测试邮箱的方法", mails,null);
VerifyEmailHandler.getInstance().sendEmail("论证测试提示（S-FOC论证系统提示）", "这是测试邮箱的方法", mails, null);
}
......@@ -668,23 +653,22 @@ public List<com.ejweb.modules.route.entity.AirlineVerifyEntity> getRiskAssessmen
}
public String getPlanHtml(List<Map<String, String>> listm,int col) {
public String getPlanHtml(List<Map<String, String>> listm, int col) {
try {
StringBuffer sb =new StringBuffer();
if(listm!=null&&listm.size()>0){
Map<String, String> map=listm.get(0);
StringBuffer sb = new StringBuffer();
if (listm != null && listm.size() > 0) {
Map<String, String> map = listm.get(0);
String fileName = map.get("fileName");
String filePath = map.get("filePath");
List<ConnectionPlan> lst= planlist( fileName, filePath);
List<ConnectionPlan> lst = planlist(fileName, filePath);
sb.append("<tr><td>编排航班衔接计划</td><td colspan=\"").append(col-1).append("\">");
sb.append("<tr><td>编排航班衔接计划</td><td colspan=\"").append(col - 1).append("\">");
sb.append("<table border=\"1\" width=\"100%\" style=\"text-align:center\"><tbody><tr><th rowspan=\"2\">航班号</th><th colspan=\"7\">班期</th><th rowspan=\"2\">航站</th><th rowspan=\"2\">起飞</th><th rowspan=\"2\">落地</th><th rowspan=\"2\">航站</th><th rowspan=\"2\">起飞</th><th rowspan=\"2\">落地</th><th rowspan=\"2\">航站</th><th rowspan=\"2\">备注</th><th colspan=\"2\">计划时间</th></tr>");
sb.append("<tr><th>1</th><th>2</th><th>3</th><th>4</th><th>5</th><th>6</th><th>7</th><th>航段1</th><th>航段2</th></tr>");
for(ConnectionPlan pan:lst){
for (ConnectionPlan pan : lst) {
sb.append("<tr>");
sb.append("<td>").append(pan.getField1()).append("</td>");
sb.append("<td>").append(pan.getField2()).append("</td>");
......@@ -714,78 +698,82 @@ public List<com.ejweb.modules.route.entity.AirlineVerifyEntity> getRiskAssessmen
return "";
}
}
public int IsLock(String verifId){
public int IsLock(String verifId) {
return dao.IsLock(verifId);
}
public List<String> getmailNew(MailEntity entity){
public List<String> getmailNew(MailEntity entity) {
return dao.getmailNew(entity);
}
/**
*
* @author zhanglg
* @time 2017年1月19日
* @param bean
* @return
* @author zhanglg
* @time 2017年1月19日
*/
public VerifyFileEntity filelist(AirlineVerifyDetailBean bean) {
VerifyFileEntity entity=new VerifyFileEntity();
VerifyFileEntity entity = new VerifyFileEntity();
entity.setRouteFile(routeDao.getRouteFileByVrf(bean.getVerifId()));
entity.setSailconFile(sailingConclusionDao.getFileList(bean.getVerifId()));
AirlineConclusionDetailBean bean1=new AirlineConclusionDetailBean();
AirlineConclusionDetailBean bean1 = new AirlineConclusionDetailBean();
bean1.setVerifId(bean.getVerifId());
entity.setVerconFile(conclusionDao.getVerifyFile(bean1));
SailingCmDetailBean bean2=new SailingCmDetailBean();
SailingCmDetailBean bean2 = new SailingCmDetailBean();
bean2.setVerifId(bean.getVerifId());
List<Map<String, String>> list=commandDao.getCommandFile(bean2);
if(list.size()>0){
Map<String, String> map1=dao.getDetail(bean.getVerifId());
String depName= map1.get("depName");
if(StringUtils.isNoneBlank(depName)&&!depName.contains("=")&&!depName.contains("-")){
map1.put("depName", PlanUtil.GetLine(map1.get("depName"),map1.get("arrName"),map1.get("roundtripType"),map1.get("vertype")));
map1.put("depIata", PlanUtil.GetLine(map1.get("depIata"),map1.get("arrIata"),map1.get("roundtripType"),map1.get("vertype")));
}
Map<String, String> map=list.get(0);
map.put("fileName", "北京首都航空关于使用"+map1.get("aircraftLabel")+"机型执行"+map1.get("depName")+map1.get("verifType")+"航线的开航指令("+map1.get("routeNo")+").doc");
List<Map<String, String>> list = commandDao.getCommandFile(bean2);
if (list.size() > 0) {
Map<String, String> map1 = dao.getDetail(bean.getVerifId());
String depName = map1.get("depName");
if (StringUtils.isNoneBlank(depName) && !depName.contains("=") && !depName.contains("-")) {
map1.put("depName", PlanUtil.GetLine(map1.get("depName"), map1.get("arrName"), map1.get("roundtripType"), map1.get("vertype")));
map1.put("depIata", PlanUtil.GetLine(map1.get("depIata"), map1.get("arrIata"), map1.get("roundtripType"), map1.get("vertype")));
}
Map<String, String> map = list.get(0);
map.put("fileName", "北京首都航空关于使用" + map1.get("aircraftLabel") + "机型执行" + map1.get("depName") + map1.get("verifType") + "航线的开航指令(" + map1.get("routeNo") + ").doc");
entity.setSailFile(list);
}
entity.setRiskFile( riskDao.getRiskFile(bean.getVerifId(),bean.getUserCode()));
entity.setRiskFile(riskDao.getRiskFile(bean.getVerifId(), bean.getUserCode()));
return entity;
}
public Map<String,String> getplanFileNew(String verifId){
public Map<String, String> getplanFileNew(String verifId) {
return dao.getplanFileNew(verifId);
}
public List<String> departNameList(String type){
return dao.departNameList( type);
public List<String> departNameList(String type) {
return dao.departNameList(type);
}
/**
/**
* 获取部门论证意见
* @author zhanglg
* @time 2017年3月17日
*
* @param verifId
* @param string
* @return
* @author zhanglg
* @time 2017年3月17日
*/
public List<String> getVerifyOpinionList(String verifId) {
public List<String> getVerifyOpinionList(String verifId) {
// TODO Auto-generated method stub
return dao.getVerifyOpinionList( verifId);
}
return dao.getVerifyOpinionList(verifId);
}
/**
/**
* 获取部门风险评估意见
* @author zhanglg
* @time 2017年3月17日
*
* @param verifId
* @param string
* @return
* @author zhanglg
* @time 2017年3月17日
*/
public List<String> getRiskOpinionList(String verifId) {
public List<String> getRiskOpinionList(String verifId) {
// TODO Auto-generated method stub
return dao.getRiskOpinionList( verifId);
}
return dao.getRiskOpinionList(verifId);
}
}
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
} 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
} 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