Skip to content

A
api
Commit 391f3fe5 by Lenovo
Options

调机修改

parent 1704adc1
Showing with 358 additions and 274 deletions
resources/mapper/modules/verify/VerifyFeedbackDao.xml
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
DATE_FORMAT(a.create_date, '%Y-%m-%d') AS createDate DATE_FORMAT(a.create_date, '%Y-%m-%d') AS createDate
</sql> </sql>
<sql id="FeedbackList"> <sql id="FeedbackList">
a.id, a.id,
a.priority, a.priority,
...@@ -52,204 +52,215 @@ ...@@ -52,204 +52,215 @@
<!-- 参与部门论证条件评估列表 --> <!-- 参与部门论证条件评估列表 -->
<select id="findList2" resultType="com.ejweb.modules.verify.entity.VerifyFeedbackEntity"> <select id="findList2" resultType="com.ejweb.modules.verify.entity.VerifyFeedbackEntity">
SELECT SELECT
'02' AS departType, '02' AS departType,
'0' AS status, '0' AS status,
t.depart_id, t.depart_id,
s.condition_id AS conditionId, s.condition_id AS conditionId,
<include refid="FeedbackColumns"/> <include refid="FeedbackColumns"/>
FROM FROM
foc_airline_verify a foc_airline_verify a
LEFT JOIN foc_verify_condition t ON a.id=t.verif_id LEFT JOIN foc_verify_condition t ON a.id=t.verif_id
LEFT JOIN foc_condition_feedback s ON t.id=s.condition_id LEFT JOIN foc_condition_feedback s ON t.id=s.condition_id
WHERE WHERE
a.del_flag = #{DEL_FLAG_NORMAL} a.del_flag = #{DEL_FLAG_NORMAL}
AND t.complete='0' AND t.complete='0'
<!-- AND s.feedback_status='00' --> <!-- AND s.feedback_status='00' -->
<if test="verifNo != null and verifNo != ''"> <if test="verifNo != null and verifNo != ''">
AND a.verif_no LIKE CONCAT('%', #{verifNo}, '%') AND a.verif_no LIKE CONCAT('%', #{verifNo}, '%')
</if> </if>
<if test="arrIata != null and arrIata != ''"> <if test="arrIata != null and arrIata != ''">
AND a.arrIata LIKE AND a.arrIata LIKE
<if test="dbName == 'oracle'">'%'||#{arrIata}||'%')</if> <if test="dbName == 'oracle'">'%'||#{arrIata}||'%')</if>
<if test="dbName == 'mssql'">'%'+#{arrIata}+'%')</if> <if test="dbName == 'mssql'">'%'+#{arrIata}+'%')</if>
<if test="dbName == 'mysql'">CONCAT('%', #{arrIata}, '%')</if> <if test="dbName == 'mysql'">CONCAT('%', #{arrIata}, '%')</if>
</if> </if>
<if test="depIata != null and depIata != ''"> <if test="depIata != null and depIata != ''">
AND a.depIata LIKE AND a.depIata LIKE
<if test="dbName == 'oracle'">'%'||#{depIata}||'%')</if> <if test="dbName == 'oracle'">'%'||#{depIata}||'%')</if>
<if test="dbName == 'mssql'">'%'+#{depIata}+'%')</if> <if test="dbName == 'mssql'">'%'+#{depIata}+'%')</if>
<if test="dbName == 'mysql'">CONCAT('%', #{depIata}, '%')</if> <if test="dbName == 'mysql'">CONCAT('%', #{depIata}, '%')</if>
</if> </if>
<if test="priority != null and priority != ''"> <if test="priority != null and priority != ''">
AND a.priority = #{priority} AND a.priority = #{priority}
</if> </if>
<if test="verifType != null and verifType != ''"> <if test="verifType != null and verifType != ''">
AND a.verif_type = #{verifType} AND a.verif_type = #{verifType}
</if> </if>
<if test="verifStatus != null and verifStatus != ''"> <if test="verifStatus != null and verifStatus != ''">
AND a.verif_status = #{verifStatus} AND a.verif_status = #{verifStatus}
</if> </if>
<if test="aircraftType != null and aircraftType != ''"> <if test="aircraftType != null and aircraftType != ''">
AND a.aircraft_type = #{aircraftType} AND a.aircraft_type = #{aircraftType}
</if> </if>
AND s.depart_id = (SELECT depart_id FROM sys_user_profiles WHERE user_id = #{userCode}) AND s.depart_id = (SELECT depart_id FROM sys_user_profiles WHERE user_id = #{userCode})
</select> </select>
<select id="findlist3" resultType="com.ejweb.modules.verify.entity.VerifyFeedbackEntity"> <select id="findlist3" resultType="com.ejweb.modules.verify.entity.VerifyFeedbackEntity">
SELECT SELECT
departType, departType,
a.status, a.status,
roundtrip_type, roundtrip_type,
conditionId, conditionId,
feedbackStatus, feedbackStatus,
departId, departId,
q.type_name AS aircraftName, q.type_name AS aircraftName,
CASE WHEN verif_type='01' OR verif_type='02' CASE WHEN verif_type='01' OR verif_type='02'
OR verif_type='03' OR verif_type='04' OR verif_type='05' OR verif_type='03' OR verif_type='04' OR verif_type='05'
THEN p.city_name THEN p.city_name
ELSE p.airport_name ELSE p.airport_name
END depName, END depName,
depart_name, depart_name,
r.city_name AS arrName, r.city_name AS arrName,
<include refid="FeedbackColumns"/> <include refid="FeedbackColumns"/>
FROM (SELECT FROM (SELECT
'01' AS departType, '01' AS departType,
s.status, s.status,
roundtrip_type, roundtrip_type,
null AS feedbackStatus, null AS feedbackStatus,
s.id AS conditionId, s.id AS conditionId,
s.depart_id AS departId, s.depart_id AS departId,
r.depart_name, r.depart_name,
<include refid="FeedbackList"/> <include refid="FeedbackList"/>
FROM FROM
foc_airline_verify a foc_airline_verify a
LEFT JOIN foc_verify_condition s ON a.id=s.verif_id LEFT JOIN foc_verify_condition s ON a.id=s.verif_id
LEFT JOIN foc_user_depart r ON s.depart_id=r.id LEFT JOIN foc_user_depart r ON s.depart_id=r.id
WHERE WHERE
a.del_flag = #{DEL_FLAG_NORMAL} a.del_flag = #{DEL_FLAG_NORMAL}
AND (s.is_feed='1' OR s.is_feed='2') AND s.complete='0' AND (s.is_feed='1' OR s.is_feed='2') AND s.complete='0'
AND s.depart_id = (SELECT depart_id FROM sys_user_profiles WHERE user_id = #{userCode}) AND s.depart_id = (SELECT depart_id FROM sys_user_profiles WHERE user_id = #{userCode})
UNION ALL UNION ALL
SELECT SELECT
'02' AS departType, '02' AS departType,
'0' AS status, '0' AS status,
roundtrip_type, roundtrip_type,
s.feedback_status AS feedbackStatus, s.feedback_status AS feedbackStatus,
s.condition_id AS conditionId, s.condition_id AS conditionId,
t.depart_id AS departId, t.depart_id AS departId,
r.depart_name, r.depart_name,
<include refid="FeedbackList"/> <include refid="FeedbackList"/>
FROM FROM
foc_airline_verify a foc_airline_verify a
LEFT JOIN foc_verify_condition t ON a.id=t.verif_id LEFT JOIN foc_verify_condition t ON a.id=t.verif_id
LEFT JOIN foc_condition_feedback s ON t.id=s.condition_id LEFT JOIN foc_condition_feedback s ON t.id=s.condition_id
LEFT JOIN foc_user_depart r ON t.depart_id=r.id LEFT JOIN foc_user_depart r ON t.depart_id=r.id
WHERE WHERE
a.del_flag = #{DEL_FLAG_NORMAL} a.del_flag = #{DEL_FLAG_NORMAL}
AND t.complete='0' AND t.complete='0'
AND s.depart_id !=t.depart_id AND s.depart_id !=t.depart_id
AND s.depart_id = (SELECT depart_id FROM sys_user_profiles WHERE user_id = #{userCode}) AND s.depart_id = (SELECT depart_id FROM sys_user_profiles WHERE user_id = #{userCode})
) a ) a
LEFT JOIN foc_airports p ON p.airport_iata = a.depIata LEFT JOIN foc_airports p ON p.airport_iata = a.depIata
LEFT JOIN foc_airports r ON r.airport_iata = a.arrIata LEFT JOIN foc_airports r ON r.airport_iata = a.arrIata
LEFT JOIN foc_aircraft_type q ON q.id = a.aircraft_type LEFT JOIN foc_aircraft_type q ON q.id = a.aircraft_type
WHERE 1=1 WHERE 1=1
<if test="verifNo != null and verifNo != ''"> <if test="verifNo != null and verifNo != ''">
AND a.verif_no LIKE CONCAT('%', #{verifNo}, '%') AND a.verif_no LIKE CONCAT('%', #{verifNo}, '%')
</if> </if>
<if test="departType != null and departType != ''"> <if test="departType != null and departType != ''">
AND a.departType = #{departType} AND a.departType = #{departType}
</if> </if>
<if test="arrIata != null and arrIata != ''"> <if test="arrIata != null and arrIata != ''">
AND (a.id in ( AND (a.id in (
SELECT id FROM foc_airline_verify where arrIata = #{arrIata} ) OR 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 verif_id FROM foc_airline_connect WHERE arrIata = #{arrIata} AND is_main != '0')
) )
</if> </if>
<if test="depIata != null and depIata != ''"> <if test="depIata != null and depIata != ''">
AND (a.id in ( AND (a.id in (
SELECT id FROM foc_airline_verify where depIata = #{depIata} ) OR 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 verif_id FROM foc_airline_connect WHERE depIata = #{depIata} AND is_main != '0')
) )
</if> </if>
<if test="priority != null and priority != ''"> <if test="priority != null and priority != ''">
AND a.priority = #{priority} AND a.priority = #{priority}
</if> </if>
<if test="verifType != null and verifType != ''"> <if test="verifType != null and verifType != ''">
AND a.verif_type = #{verifType} AND a.verif_type = #{verifType}
</if> </if>
<if test="verifStatus != null and verifStatus != ''"> <if test="verifStatus != null and verifStatus != ''">
AND a.verif_status = #{verifStatus} AND a.verif_status = #{verifStatus}
</if> </if>
<if test="aircraftType != null and aircraftType != ''"> <if test="aircraftType != null and aircraftType != ''">
AND a.aircraft_type = #{aircraftType} AND a.aircraft_type = #{aircraftType}
</if> </if>
group by a.id
</select> </select>
<!-- 本部门论证条件评估列表 --> <!-- 本部门论证条件评估列表 -->
<select id="findList1" resultType="com.ejweb.modules.verify.entity.VerifyFeedbackEntity"> <select id="findList1" resultType="com.ejweb.modules.verify.entity.VerifyFeedbackEntity">
SELECT SELECT
'01' AS departType, '01' AS departType,
s.status, s.status,
s.id AS conditionId, s.id AS conditionId,
s.depart_id, s.depart_id,
<include refid="FeedbackColumns"/> <include refid="FeedbackColumns"/>
FROM FROM
foc_airline_verify a foc_airline_verify a
LEFT JOIN foc_verify_condition s ON a.id=s.verif_id LEFT JOIN foc_verify_condition s ON a.id=s.verif_id
WHERE WHERE
a.del_flag = #{DEL_FLAG_NORMAL} a.del_flag = #{DEL_FLAG_NORMAL}
AND (s.is_feed='1' OR s.is_feed='2') AND s.complete='0' AND (s.is_feed='1' OR s.is_feed='2') AND s.complete='0'
<if test="verifNo != null and verifNo != ''"> <if test="verifNo != null and verifNo != ''">
AND a.verif_no LIKE CONCAT('%', #{verifNo}, '%') AND a.verif_no LIKE CONCAT('%', #{verifNo}, '%')
</if> </if>
<if test="arrIata != null and arrIata != ''"> <if test="arrIata != null and arrIata != ''">
AND a.arrIata LIKE AND a.arrIata LIKE
<if test="dbName == 'oracle'">'%'||#{arrIata}||'%')</if> <if test="dbName == 'oracle'">'%'||#{arrIata}||'%')</if>
<if test="dbName == 'mssql'">'%'+#{arrIata}+'%')</if> <if test="dbName == 'mssql'">'%'+#{arrIata}+'%')</if>
<if test="dbName == 'mysql'">CONCAT('%', #{arrIata}, '%')</if> <if test="dbName == 'mysql'">CONCAT('%', #{arrIata}, '%')</if>
</if> </if>
<if test="depIata != null and depIata != ''"> <if test="depIata != null and depIata != ''">
AND a.depIata LIKE AND a.depIata LIKE
<if test="dbName == 'oracle'">'%'||#{depIata}||'%')</if> <if test="dbName == 'oracle'">'%'||#{depIata}||'%')</if>
<if test="dbName == 'mssql'">'%'+#{depIata}+'%')</if> <if test="dbName == 'mssql'">'%'+#{depIata}+'%')</if>
<if test="dbName == 'mysql'">CONCAT('%', #{depIata}, '%')</if> <if test="dbName == 'mysql'">CONCAT('%', #{depIata}, '%')</if>
</if> </if>
<if test="priority != null and priority != ''"> <if test="priority != null and priority != ''">
AND a.priority = #{priority} AND a.priority = #{priority}
</if> </if>
<if test="verifType != null and verifType != ''"> <if test="verifType != null and verifType != ''">
AND a.verif_type = #{verifType} AND a.verif_type = #{verifType}
</if> </if>
<if test="verifStatus != null and verifStatus != ''"> <if test="verifStatus != null and verifStatus != ''">
AND a.verif_status = #{verifStatus} AND a.verif_status = #{verifStatus}
</if> </if>
AND s.depart_id = (SELECT depart_id FROM sys_user_profiles WHERE user_id = #{userCode}) AND s.depart_id = (SELECT depart_id FROM sys_user_profiles WHERE user_id = #{userCode})
</select> </select>
<select id="getDetail1" resultType="com.ejweb.modules.verify.entity.VerifyFeedbackDetailEntity"> <select id="getDetail1" resultType="com.ejweb.modules.verify.entity.VerifyFeedbackDetailEntity">
SELECT SELECT
'01' AS departType, '01' AS departType,
a.condition, a.verif_id AS verifId,
a.verif_id AS verifId, a.verify_status AS verifyStatus,
a.verify_status AS verifyStatus, s.verif_no AS verifNo,
s.verif_no AS verifNo, a.depart_id AS departId
a.depart_id AS departId
FROM foc_route_verify a FROM foc_route_verify a
LEFT JOIN foc_airline_verify s ON a.verif_id=s.id LEFT JOIN foc_airline_verify s ON a.verif_id=s.id
LEFT JOIN foc_verify_condition t ON a.id=t.route_id <choose>
WHERE <when test="userDepartId !=null">
a.del_flag = #{DEL_FLAG_NORMAL} LEFT JOIN foc_verify_condition t ON a.id=t.route_id
AND t.id = #{conditionId} LEFT JOIN foc_condition_feedback f ON t.id=f.condition_id
WHERE
a.del_flag = #{DEL_FLAG_NORMAL}
AND a.verif_id = #{verifId}
AND f.depart_id = #{userDepartId}
group by a.verif_id,f.depart_id
</when>
<otherwise>
WHERE
a.del_flag = #{DEL_FLAG_NORMAL}
AND a.verif_id = #{verifId}
AND a.depart_id = #{departId}
</otherwise>
</choose>
</select> </select>
<select id="getDetail2" resultType="com.ejweb.modules.verify.entity.VerifyFeedbackDetailEntity"> <select id="getDetail2" resultType="com.ejweb.modules.verify.entity.VerifyFeedbackDetailEntity">
SELECT SELECT
'02' AS departType, '02' AS departType,
a.condition, a.condition,
...@@ -277,6 +288,28 @@ ...@@ -277,6 +288,28 @@
AND q.condition_id = #{conditionId} AND q.condition_id = #{conditionId}
</select> </select>
<select id="findByVerifyIdAndDepartId" resultType="com.ejweb.modules.verify.data.ConditionDetailData">
select v.id as conditionId,
v.`condition`,
v.is_feed as feedStatus,
case WHEN v.is_feed!='0' THEN DATE_FORMAT(v.update_date, '%Y-%m-%d')
else '' end conditionDate
from foc_verify_condition v
<choose>
<when test="userDepartId !=null">
left join foc_condition_feedback f on v.id=f.condition_id
where f.depart_id=#{userDepartId}
and v.verif_id=#{verifId}
group by v.id
</when>
<otherwise>
WHERE v.verif_id = #{verifId}
AND v.depart_id = #{departId}
</otherwise>
</choose>
</select>
<!-- 论证条件评估-修改各部门的反馈信息 --> <!-- 论证条件评估-修改各部门的反馈信息 -->
<update id="updateFeedback"> <update id="updateFeedback">
UPDATE foc_condition_feedback UPDATE foc_condition_feedback
...@@ -314,8 +347,8 @@ ...@@ -314,8 +347,8 @@
) )
AND a.feedback_status = '00' AND a.feedback_status = '00'
</select> </select>
<select id="checkRouteVerifyExist" resultType="com.ejweb.modules.route.entity.FullRouteVerifyEntity" > <select id="checkRouteVerifyExist" resultType="com.ejweb.modules.route.entity.FullRouteVerifyEntity">
SELECT SELECT
id, id,
verif_id, verif_id,
...@@ -336,78 +369,78 @@ ...@@ -336,78 +369,78 @@
AND del_flag = #{DEL_FLAG_NORMAL} AND del_flag = #{DEL_FLAG_NORMAL}
AND depart_id = (SELECT depart_id FROM sys_user_profiles WHERE user_id = #{userCode}) AND depart_id = (SELECT depart_id FROM sys_user_profiles WHERE user_id = #{userCode})
</select> </select>
<select id="findAllList" resultType="com.ejweb.modules.verify.entity.VerifyFeedbackEntity"> <select id="findAllList" resultType="com.ejweb.modules.verify.entity.VerifyFeedbackEntity">
SELECT SELECT
a.priority AS priority, a.priority AS priority,
a.apply_no AS applyNo, a.apply_no AS applyNo,
a.verif_no AS verifNo, a.verif_no AS verifNo,
a.flight_no AS flightNo, a.flight_no AS flightNo,
q.type_name AS aircraftType, q.type_name AS aircraftType,
CASE WHEN a.verif_type='01' OR a.verif_type='02' CASE WHEN a.verif_type='01' OR a.verif_type='02'
OR a.verif_type='03' OR a.verif_type='04' OR a.verif_type='05' OR a.verif_type='03' OR a.verif_type='04' OR a.verif_type='05'
THEN p.city_name THEN p.city_name
ELSE p.airport_name ELSE p.airport_name
END depIata, END depIata,
r.city_name AS arrIata, r.city_name AS arrIata,
a.verif_status AS verifStatus, a.verif_status AS verifStatus,
a.verif_type AS verifType, a.verif_type AS verifType,
DATE(a.sailing_date) AS sailingDate, DATE(a.sailing_date) AS sailingDate,
DATE(a.create_date) AS createDate DATE(a.create_date) AS createDate
FROM ( FROM (
(SELECT (SELECT
<include refid="exportColumns"/> <include refid="exportColumns"/>
FROM FROM
foc_airline_verify a foc_airline_verify a
LEFT JOIN foc_verify_condition s ON a.id=s.verif_id LEFT JOIN foc_verify_condition s ON a.id=s.verif_id
WHERE WHERE
a.del_flag = #{DEL_FLAG_NORMAL} a.del_flag = #{DEL_FLAG_NORMAL}
AND s.is_feed='2' AND s.complete='0' AND s.is_feed='2' AND s.complete='0'
AND s.depart_id = (SELECT depart_id FROM sys_user_profiles WHERE user_id = #{userCode}) AND s.depart_id = (SELECT depart_id FROM sys_user_profiles WHERE user_id = #{userCode})
) )
UNION ( UNION (
SELECT SELECT
<include refid="exportColumns"/> <include refid="exportColumns"/>
FROM FROM
foc_airline_verify a foc_airline_verify a
LEFT JOIN foc_condition_feedback s ON a.id=s.verif_id LEFT JOIN foc_condition_feedback s ON a.id=s.verif_id
WHERE WHERE
a.del_flag = #{DEL_FLAG_NORMAL} a.del_flag = #{DEL_FLAG_NORMAL}
AND s.feedback_status='00' AND s.feedback_status='00'
AND s.depart_id = (SELECT depart_id FROM sys_user_profiles WHERE user_id = #{userCode}) AND s.depart_id = (SELECT depart_id FROM sys_user_profiles WHERE user_id = #{userCode})
)) a )) a
LEFT JOIN foc_airports p ON p.airport_iata = a.depIata LEFT JOIN foc_airports p ON p.airport_iata = a.depIata
LEFT JOIN foc_airports r ON r.airport_iata = a.arrIata LEFT JOIN foc_airports r ON r.airport_iata = a.arrIata
LEFT JOIN foc_aircraft_type q ON q.id = a.aircraft_type LEFT JOIN foc_aircraft_type q ON q.id = a.aircraft_type
WHERE 1=1 WHERE 1=1
<if test="verifNo != null and verifNo != ''"> <if test="verifNo != null and verifNo != ''">
AND a.verif_no = #{verifNo} AND a.verif_no = #{verifNo}
</if> </if>
<if test="arrIata != null and arrIata != ''"> <if test="arrIata != null and arrIata != ''">
AND a.arrIata LIKE AND a.arrIata LIKE
<if test="dbName == 'oracle'">'%'||#{arrIata}||'%')</if> <if test="dbName == 'oracle'">'%'||#{arrIata}||'%')</if>
<if test="dbName == 'mssql'">'%'+#{arrIata}+'%')</if> <if test="dbName == 'mssql'">'%'+#{arrIata}+'%')</if>
<if test="dbName == 'mysql'">CONCAT('%', #{arrIata}, '%')</if> <if test="dbName == 'mysql'">CONCAT('%', #{arrIata}, '%')</if>
</if> </if>
<if test="depIata != null and depIata != ''"> <if test="depIata != null and depIata != ''">
AND a.depIata LIKE AND a.depIata LIKE
<if test="dbName == 'oracle'">'%'||#{depIata}||'%')</if> <if test="dbName == 'oracle'">'%'||#{depIata}||'%')</if>
<if test="dbName == 'mssql'">'%'+#{depIata}+'%')</if> <if test="dbName == 'mssql'">'%'+#{depIata}+'%')</if>
<if test="dbName == 'mysql'">CONCAT('%', #{depIata}, '%')</if> <if test="dbName == 'mysql'">CONCAT('%', #{depIata}, '%')</if>
</if> </if>
<if test="priority != null and priority != ''"> <if test="priority != null and priority != ''">
AND a.priority = #{priority} AND a.priority = #{priority}
</if> </if>
<if test="verifType != null and verifType != ''"> <if test="verifType != null and verifType != ''">
AND a.verif_type = #{verifType} AND a.verif_type = #{verifType}
</if> </if>
<if test="verifStatus != null and verifStatus != ''"> <if test="verifStatus != null and verifStatus != ''">
AND a.verif_status = #{verifStatus} AND a.verif_status = #{verifStatus}
</if> </if>
ORDER BY apply_no DESC ORDER BY apply_no DESC
</select> </select>
<update id="updateStatus"> <update id="updateStatus">
update foc_verify_condition update foc_verify_condition
SET status = #{status} SET status = #{status}
WHERE id = #{conditionId} WHERE id = #{conditionId}
......
src/com/ejweb/modules/route/bean/RouteVerifyDetailBean.java
...@@ -17,7 +17,7 @@ public class RouteVerifyDetailBean extends GenericBean{ ...@@ -17,7 +17,7 @@ public class RouteVerifyDetailBean extends GenericBean{
@NotEmpty(message="verifId字段不能为空") @NotEmpty(message="verifId字段不能为空")
private String verifId; //论证单id private String verifId; //论证单id
private String departId; //用户id private String departId;
private String userCode; //用户id private String userCode; //用户id
public String getVerifId() { public String getVerifId() {
......
src/com/ejweb/modules/route/service/RouteVerifyService.java
...@@ -274,8 +274,6 @@ public class RouteVerifyService extends BaseService<RouteVerifyDao> { ...@@ -274,8 +274,6 @@ public class RouteVerifyService extends BaseService<RouteVerifyDao> {
// 论证意见为条件可行或不可行 // 论证意见为条件可行或不可行
if ("02".equals(verifyStatus) || "03".equals(verifyStatus)) { if ("02".equals(verifyStatus) || "03".equals(verifyStatus)) {
for (FullVerifyConditionEntity condition : bean.getConditions()) { for (FullVerifyConditionEntity condition : bean.getConditions()) {
String cid = IdWorker.getNextId();
condition.setId(cid);
this.addVerifyCondition(fullRouteVerifyEntity, verifyStatus, bean.getUserCode(), condition); this.addVerifyCondition(fullRouteVerifyEntity, verifyStatus, bean.getUserCode(), condition);
} }
NotifyAddBean addbean = new NotifyAddBean(); NotifyAddBean addbean = new NotifyAddBean();
...@@ -316,8 +314,6 @@ public class RouteVerifyService extends BaseService<RouteVerifyDao> { ...@@ -316,8 +314,6 @@ public class RouteVerifyService extends BaseService<RouteVerifyDao> {
routeFileBean.setId(IdWorker.getNextId()); routeFileBean.setId(IdWorker.getNextId());
routeFileBean.setFileName(m.get("fileName")); routeFileBean.setFileName(m.get("fileName"));
routeFileBean.setFilePath(m.get("filePath")); routeFileBean.setFilePath(m.get("filePath"));
routeFileBean.setFileSize(String.valueOf(m.get("fileSize"))); routeFileBean.setFileSize(String.valueOf(m.get("fileSize")));
routeFileBean.setRouteId(fullRouteVerifyEntity.getId()); routeFileBean.setRouteId(fullRouteVerifyEntity.getId());
...@@ -469,7 +465,6 @@ public class RouteVerifyService extends BaseService<RouteVerifyDao> { ...@@ -469,7 +465,6 @@ public class RouteVerifyService extends BaseService<RouteVerifyDao> {
} }
private void addVerifyCondition(FullRouteVerifyEntity routeVerifyEntity, String verifuStatus, String userCode, FullVerifyConditionEntity conditionEntity) { private void addVerifyCondition(FullRouteVerifyEntity routeVerifyEntity, String verifuStatus, String userCode, FullVerifyConditionEntity conditionEntity) {
conditionEntity.setId(conditionEntity.getId());
conditionEntity.setConditionStatus(verifuStatus); conditionEntity.setConditionStatus(verifuStatus);
conditionEntity.setVerifId(routeVerifyEntity.getVerifId()); conditionEntity.setVerifId(routeVerifyEntity.getVerifId());
conditionEntity.setCreateBy(userCode); conditionEntity.setCreateBy(userCode);
...@@ -480,7 +475,13 @@ public class RouteVerifyService extends BaseService<RouteVerifyDao> { ...@@ -480,7 +475,13 @@ public class RouteVerifyService extends BaseService<RouteVerifyDao> {
conditionEntity.setIsFeed("0"); conditionEntity.setIsFeed("0");
conditionEntity.setRouteId(routeVerifyEntity.getId()); conditionEntity.setRouteId(routeVerifyEntity.getId());
conditionEntity.setDepartId(dao.getDepartId(userCode)); conditionEntity.setDepartId(dao.getDepartId(userCode));
verifyConditionDao.insert(conditionEntity); if (conditionEntity.getId() == null) {
String cid = IdWorker.getNextId();
conditionEntity.setId(cid);
verifyConditionDao.insert(conditionEntity);
} else {
verifyConditionDao.updateByPrimaryKeySelective(conditionEntity);
}
} }
...@@ -530,8 +531,6 @@ public class RouteVerifyService extends BaseService<RouteVerifyDao> { ...@@ -530,8 +531,6 @@ public class RouteVerifyService extends BaseService<RouteVerifyDao> {
// 论证意见为条件可行或不可行 // 论证意见为条件可行或不可行
if ("02".equals(verifyStatus) || "03".equals(verifyStatus)) { if ("02".equals(verifyStatus) || "03".equals(verifyStatus)) {
for (FullVerifyConditionEntity condition : bean.getConditions()) { for (FullVerifyConditionEntity condition : bean.getConditions()) {
String cid = IdWorker.getNextId();
condition.setId(cid);
this.addVerifyCondition(fullRouteVerifyEntity, verifyStatus, bean.getUserCode(), condition); this.addVerifyCondition(fullRouteVerifyEntity, verifyStatus, bean.getUserCode(), condition);
} }
// String cid = IdWorker.getNextId(); // String cid = IdWorker.getNextId();
......
src/com/ejweb/modules/verify/bean/VerifyFeedbackDetailBean.java
...@@ -19,8 +19,10 @@ public class VerifyFeedbackDetailBean extends GenericBean { ...@@ -19,8 +19,10 @@ public class VerifyFeedbackDetailBean extends GenericBean {
private String departType; private String departType;
@NotEmpty(message="userCode不能为空") @NotEmpty(message="userCode不能为空")
private String userCode; private String userCode;
@NotEmpty(message="conditionId不能为空") @NotEmpty(message = "departId不能为空")
private String departId;
private String conditionId; private String conditionId;
private String userDepartId;
public String getVerifId() { public String getVerifId() {
return verifId; return verifId;
} }
...@@ -39,12 +41,28 @@ public class VerifyFeedbackDetailBean extends GenericBean { ...@@ -39,12 +41,28 @@ public class VerifyFeedbackDetailBean extends GenericBean {
public void setUserCode(String userCode) { public void setUserCode(String userCode) {
this.userCode = userCode; this.userCode = userCode;
} }
public String getDepartId() {
return departId;
}
public void setDepartId(String departId) {
this.departId = departId;
}
public String getConditionId() { public String getConditionId() {
return conditionId; return conditionId;
} }
public void setConditionId(String conditionId) { public void setConditionId(String conditionId) {
this.conditionId = conditionId; this.conditionId = conditionId;
} }
public String getUserDepartId() {
return userDepartId;
}
public void setUserDepartId(String userDepartId) {
this.userDepartId = userDepartId;
}
} }
src/com/ejweb/modules/verify/dao/VerifyFeedbackDao.java
...@@ -12,8 +12,10 @@ import com.ejweb.modules.verify.bean.VerifyFeedbackBean; ...@@ -12,8 +12,10 @@ import com.ejweb.modules.verify.bean.VerifyFeedbackBean;
import com.ejweb.modules.verify.bean.VerifyFeedbackDetailBean; import com.ejweb.modules.verify.bean.VerifyFeedbackDetailBean;
import com.ejweb.modules.verify.bean.VerifyFeedbackStatusBean; import com.ejweb.modules.verify.bean.VerifyFeedbackStatusBean;
import com.ejweb.modules.verify.bean.VerifyFeedbackUpdateBean; import com.ejweb.modules.verify.bean.VerifyFeedbackUpdateBean;
import com.ejweb.modules.verify.data.ConditionDetailData;
import com.ejweb.modules.verify.entity.VerifyFeedbackDetailEntity; import com.ejweb.modules.verify.entity.VerifyFeedbackDetailEntity;
import com.ejweb.modules.verify.entity.VerifyFeedbackEntity; import com.ejweb.modules.verify.entity.VerifyFeedbackEntity;
import org.apache.ibatis.annotations.Param;
/** /**
* *
...@@ -34,6 +36,9 @@ public interface VerifyFeedbackDao extends BaseDao{ ...@@ -34,6 +36,9 @@ public interface VerifyFeedbackDao extends BaseDao{
VerifyFeedbackDetailEntity getDetail2(VerifyFeedbackDetailBean bean); VerifyFeedbackDetailEntity getDetail2(VerifyFeedbackDetailBean bean);
List<Map<String,String>> getDetailList(VerifyFeedbackDetailBean bean); List<Map<String,String>> getDetailList(VerifyFeedbackDetailBean bean);
List<ConditionDetailData> findByVerifyIdAndDepartId(VerifyFeedbackDetailBean bean);
// 更新反馈信息 // 更新反馈信息
int updateFeedback(VerifyFeedbackUpdateBean bean); int updateFeedback(VerifyFeedbackUpdateBean bean);
// 全部反馈后，更新反馈状态 // 全部反馈后，更新反馈状态
......
src/com/ejweb/modules/verify/service/VerifyFeedbackService.java
...@@ -6,13 +6,17 @@ package com.ejweb.modules.verify.service; ...@@ -6,13 +6,17 @@ package com.ejweb.modules.verify.service;
import com.ejweb.core.base.BaseService; import com.ejweb.core.base.BaseService;
import com.ejweb.core.base.PageEntity; import com.ejweb.core.base.PageEntity;
import com.ejweb.core.exception.RecordNotExistException; import com.ejweb.core.exception.RecordNotExistException;
import com.ejweb.modules.depart.dao.DepartDao;
import com.ejweb.modules.depart.entity.DepartEntity;
import com.ejweb.modules.route.entity.FullRouteVerifyEntity; import com.ejweb.modules.route.entity.FullRouteVerifyEntity;
import com.ejweb.modules.verify.bean.VerifyFeedbackBean; import com.ejweb.modules.verify.bean.VerifyFeedbackBean;
import com.ejweb.modules.verify.bean.VerifyFeedbackDetailBean; import com.ejweb.modules.verify.bean.VerifyFeedbackDetailBean;
import com.ejweb.modules.verify.bean.VerifyFeedbackStatusBean; import com.ejweb.modules.verify.bean.VerifyFeedbackStatusBean;
import com.ejweb.modules.verify.bean.VerifyFeedbackUpdateBean; import com.ejweb.modules.verify.bean.VerifyFeedbackUpdateBean;
import com.ejweb.modules.verify.dao.AirlineVerifyDao; import com.ejweb.modules.verify.dao.AirlineVerifyDao;
import com.ejweb.modules.verify.dao.ConditionDao;
import com.ejweb.modules.verify.dao.VerifyFeedbackDao; import com.ejweb.modules.verify.dao.VerifyFeedbackDao;
import com.ejweb.modules.verify.data.ConditionDetailData;
import com.ejweb.modules.verify.entity.VerifyFeedbackDetailEntity; import com.ejweb.modules.verify.entity.VerifyFeedbackDetailEntity;
import com.ejweb.modules.verify.entity.VerifyFeedbackEntity; import com.ejweb.modules.verify.entity.VerifyFeedbackEntity;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
...@@ -21,6 +25,7 @@ import org.apache.commons.lang3.StringUtils; ...@@ -21,6 +25,7 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
...@@ -39,25 +44,31 @@ import java.util.Map; ...@@ -39,25 +44,31 @@ import java.util.Map;
public class VerifyFeedbackService extends BaseService<VerifyFeedbackDao> { public class VerifyFeedbackService extends BaseService<VerifyFeedbackDao> {
@Autowired @Autowired
AirlineVerifyDao verifyDao; AirlineVerifyDao verifyDao;
@Autowired
ConditionDao conditionDao;
@Autowired
DepartDao departDao;
public PageEntity<VerifyFeedbackEntity> findList(VerifyFeedbackBean bean) { public PageEntity<VerifyFeedbackEntity> findList(VerifyFeedbackBean bean) {
PageInfo<VerifyFeedbackEntity> pageInfo = null; PageInfo<VerifyFeedbackEntity> pageInfo;
// 必须紧贴dao的查询方法 // 必须紧贴dao的查询方法
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"); PageHelper.orderBy(" verifNo DESC");
} else } else {
PageHelper.orderBy(bean.getSort()); PageHelper.orderBy(bean.getSort());
}
List<VerifyFeedbackEntity> list = dao.findlist3(bean); List<VerifyFeedbackEntity> list = dao.findlist3(bean);
pageInfo = new PageInfo<VerifyFeedbackEntity>(list); pageInfo = new PageInfo<>(list);
// 页码大于总页数，则返回NULL
if (pageInfo.getPages() < bean.getPageNo()) {// 页码大于总页数，则返回NULL if (pageInfo.getPages() < bean.getPageNo()) {
return null; return null;
} }
list = pageInfo.getList(); list = pageInfo.getList();
if (list == null || list.size() == 0) {// 如果没有数据则返回NULL // 如果没有数据则返回NULL
if (list == null || list.size() == 0) {
return null; return null;
} }
for (VerifyFeedbackEntity entity : list) { for (VerifyFeedbackEntity entity : list) {
...@@ -75,9 +86,9 @@ public class VerifyFeedbackService extends BaseService<VerifyFeedbackDao> { ...@@ -75,9 +86,9 @@ public class VerifyFeedbackService extends BaseService<VerifyFeedbackDao> {
entity.setTypeList(verifyDao.getTypeList(entity.getVerifId())); entity.setTypeList(verifyDao.getTypeList(entity.getVerifId()));
entity.setDepName(verifyDao.getConnetList(entity.getVerifId())); entity.setDepName(verifyDao.getConnetList(entity.getVerifId()));
String typelist = verifyDao.getTypeList1(entity.getVerifId()); String typelist = verifyDao.getTypeList1(entity.getVerifId());
if (StringUtils.isNoneBlank(typelist)) if (StringUtils.isNoneBlank(typelist)) {
entity.setAircraftName(entity.getAircraftName() + ":" + typelist); entity.setAircraftName(entity.getAircraftName() + ":" + typelist);
}
} }
PageEntity<VerifyFeedbackEntity> page = new PageEntity<VerifyFeedbackEntity>(); PageEntity<VerifyFeedbackEntity> page = new PageEntity<VerifyFeedbackEntity>();
page.setPageNo(pageInfo.getPageNum()); page.setPageNo(pageInfo.getPageNum());
...@@ -99,11 +110,30 @@ public class VerifyFeedbackService extends BaseService<VerifyFeedbackDao> { ...@@ -99,11 +110,30 @@ public class VerifyFeedbackService extends BaseService<VerifyFeedbackDao> {
} }
public VerifyFeedbackDetailEntity getDetailList(VerifyFeedbackDetailBean bean) { public VerifyFeedbackDetailEntity getDetailList(VerifyFeedbackDetailBean bean) {
VerifyFeedbackDetailEntity feed = dao.getDetail1(bean); DepartEntity departEntity = departDao.getByUserCode(bean.getUserCode());
VerifyFeedbackDetailEntity feed;
if (departEntity == null) {
return null;
}
//如果userCode所在部门为条件的发起部门，返回departId部门发起的条件,如果不相等，返回departId部门发起的条件中userCode参与评估的条件
if (!departEntity.getId().equals(bean.getDepartId())) {
bean.setUserDepartId(departEntity.getId());
}
feed = dao.getDetail1(bean);
if (feed == null) { if (feed == null) {
return null; return null;
} }
feed.setDepartIds(dao.getDetailList(bean)); List<ConditionDetailData> conditions = dao.findByVerifyIdAndDepartId(bean);
List<ConditionDetailData> conditionList = new ArrayList<>();
if (!CollectionUtils.isEmpty(conditions)) {
for (ConditionDetailData data : conditions) {
VerifyFeedbackDetailBean verifyFeedbackDetailBean = new VerifyFeedbackDetailBean();
verifyFeedbackDetailBean.setConditionId(data.getConditionId());
data.setDepartIds(dao.getDetailList(verifyFeedbackDetailBean));
conditionList.add(data);
}
}
feed.setConditions(conditionList);
return feed; return feed;
} }
...@@ -148,9 +178,8 @@ public class VerifyFeedbackService extends BaseService<VerifyFeedbackDao> { ...@@ -148,9 +178,8 @@ public class VerifyFeedbackService extends BaseService<VerifyFeedbackDao> {
* @time 2016年10月7日 * @time 2016年10月7日
* @param bean * @param bean
*/ */
@Transactional(readOnly = false) @Transactional()
public void updateStatus(VerifyFeedbackStatusBean bean) { public void updateStatus(VerifyFeedbackStatusBean bean) {
dao.updateStatus(bean); dao.updateStatus(bean);
} }
} }
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