Skip to content

A
api
Commit c4911846 by java-李谡
Options

1.申请单批量删除 

2.市场部不参与调机开航总结
parent 5b8e8f22
Showing with 632 additions and 564 deletions
resources/jdbc.properties
...@@ -3,7 +3,6 @@ db.table.prefix=foc_ ...@@ -3,7 +3,6 @@ db.table.prefix=foc_
jdbc.type=mysql jdbc.type=mysql
jdbc.driver.class=com.mysql.jdbc.Driver jdbc.driver.class=com.mysql.jdbc.Driver
jdbc.url=jdbc:mysql://106.75.105.96:5508/jd_foc?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull jdbc.url=jdbc:mysql://106.75.105.96:5508/jd_foc?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull
#jdbc.url=jdbc:mysql://localhost:5508/jd_foc?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull
jdbc.username=sms_develop jdbc.username=sms_develop
jdbc.password=Develop2018!@# jdbc.password=Develop2018!@#
#\u521d\u59cb\u5316\u8fde\u63a5 #\u521d\u59cb\u5316\u8fde\u63a5
......
resources/mapper/modules/sailing/SailingConclusionDao.xml
...@@ -60,25 +60,28 @@ ...@@ -60,25 +60,28 @@
</foreach> </foreach>
AND is_main != '0') 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="aircraftType != null and aircraftType != ''"> <if test="aircraftType != null and aircraftType != ''">
AND a.aircraft_type = #{aircraftType} AND a.aircraft_type = #{aircraftType}
</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="includeTuneType != null and includeTuneType != ''">
AND a.verif_status = #{verifStatus} AND a.verif_type != '05'
</if> </if>
AND a.verif_status ='00' <if test="verifStatus != null and verifStatus != ''">
<choose> AND a.verif_status = #{verifStatus}
<when test="conclusionStatus != null and conclusionStatus != ''"> </if>
AND a.verif_status ='00'
<choose>
<when test="conclusionStatus != null and conclusionStatus != ''">
AND c.conclusion_status = #{conclusionStatus} AND c.conclusion_status = #{conclusionStatus}
</when> </when>
<otherwise> <otherwise>
AND c.conclusion_status ='00' AND c.conclusion_status ='00'
</otherwise> </otherwise>
</choose> </choose>
......
resources/mapper/modules/verify/VerifyManageDao.xml
...@@ -481,10 +481,13 @@ ...@@ -481,10 +481,13 @@
</insert> </insert>
<update id="updateDelFlag"> <update id="updateDelFlag">
UPDATE foc_airline_verify UPDATE foc_airline_verify
SET del_flag='1' SET del_flag='1'
WHERE id=#{verifId} WHERE id in
</update> <foreach collection="list" item="item" index="index" open="(" close=")" separator=",">
#{item}
</foreach>
</update>
<delete id="deleteProcess"> <delete id="deleteProcess">
DELETE FROM foc_verify_process DELETE FROM foc_verify_process
WHERE verif_id=#{verifId} AND node_sort <![CDATA[>]]> #{nodeSort} WHERE verif_id=#{verifId} AND node_sort <![CDATA[>]]> #{nodeSort}
......
src/com/ejweb/modules/sailing/bean/SailingConclusionListBean.java
...@@ -31,6 +31,10 @@ public class SailingConclusionListBean extends GenericBean { ...@@ -31,6 +31,10 @@ public class SailingConclusionListBean extends GenericBean {
private int pageNo = 1; private int pageNo = 1;
private String aircraftType; private String aircraftType;
private String conclusionStatus = "00"; private String conclusionStatus = "00";
/**
* 是否包含调机类型
*/
private String includeTuneType;
List arrIataList; List arrIataList;
List depIataList; List depIataList;
...@@ -147,4 +151,11 @@ public class SailingConclusionListBean extends GenericBean { ...@@ -147,4 +151,11 @@ public class SailingConclusionListBean extends GenericBean {
this.aircraftType = aircraftType; this.aircraftType = aircraftType;
} }
public String getIncludeTuneType() {
return includeTuneType;
}
public void setIncludeTuneType(String includeTuneType) {
this.includeTuneType = includeTuneType;
}
} }
src/com/ejweb/modules/sailing/service/SailingConclusionService.java
...@@ -5,6 +5,8 @@ import com.ejweb.core.base.PageEntity; ...@@ -5,6 +5,8 @@ import com.ejweb.core.base.PageEntity;
import com.ejweb.core.util.IdWorker; import com.ejweb.core.util.IdWorker;
import com.ejweb.core.util.PlanUtil; import com.ejweb.core.util.PlanUtil;
import com.ejweb.core.util.VerifyEmailHandler; import com.ejweb.core.util.VerifyEmailHandler;
import com.ejweb.modules.depart.dao.DepartDao;
import com.ejweb.modules.depart.entity.DepartEntity;
import com.ejweb.modules.notify.bean.NotifyAddBean; import com.ejweb.modules.notify.bean.NotifyAddBean;
import com.ejweb.modules.notify.dao.NotifyDao; import com.ejweb.modules.notify.dao.NotifyDao;
import com.ejweb.modules.sailing.bean.SailingConclusionDetailBean; import com.ejweb.modules.sailing.bean.SailingConclusionDetailBean;
...@@ -27,10 +29,7 @@ import org.springframework.stereotype.Service; ...@@ -27,10 +29,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.*;
import java.util.Date;
import java.util.List;
import java.util.Map;
/** /**
* 开航总结表sevice * 开航总结表sevice
...@@ -46,8 +45,23 @@ public class SailingConclusionService extends BaseService<SailingConclusionDao> ...@@ -46,8 +45,23 @@ public class SailingConclusionService extends BaseService<SailingConclusionDao>
AirlineVerifyDao verifyDao; AirlineVerifyDao verifyDao;
@Autowired @Autowired
VerifyManageDao manageDao; VerifyManageDao manageDao;
@Autowired
DepartDao departDao;
public PageEntity<SailingConclusionListEntity> getList(SailingConclusionListBean bean) { public PageEntity<SailingConclusionListEntity> getList(SailingConclusionListBean bean) {
//如果用户为市场部且论证类型为调机（verify_type=05），直接返回空（调机类型市场部不做开航总结）
DepartEntity departEntity = departDao.getByUserCode(bean.getUserCode());
if (Objects.isNull(departEntity)) {
return null;
}
if (("6e70812e4c874f298da21be2a12aa674").equals(departEntity.getId())) {
if ("05".equals(bean.getVerifType())) {
return null;
} else {
bean.setIncludeTuneType("2");
}
}
//查询同一机场被屏蔽三字码数据（历史数据关联） //查询同一机场被屏蔽三字码数据（历史数据关联）
if (StringUtils.isNotEmpty(bean.getArrIata())) { if (StringUtils.isNotEmpty(bean.getArrIata())) {
bean.setArrIataList(verifyDao.getIataStr(bean.getArrIata())); bean.setArrIataList(verifyDao.getIataStr(bean.getArrIata()));
...@@ -62,6 +76,7 @@ public class SailingConclusionService extends BaseService<SailingConclusionDao> ...@@ -62,6 +76,7 @@ public class SailingConclusionService extends BaseService<SailingConclusionDao>
} else { } else {
PageHelper.orderBy(bean.getSort()); PageHelper.orderBy(bean.getSort());
} }
//如果userCode为市场部，查询不包含调机类型的开航总结
pageInfo = new PageInfo<SailingConclusionListEntity>(dao.getList(bean)); pageInfo = new PageInfo<SailingConclusionListEntity>(dao.getList(bean));
// 页码大于总页数，则返回NULL // 页码大于总页数，则返回NULL
if (pageInfo.getPages() < bean.getPageNo()) { if (pageInfo.getPages() < bean.getPageNo()) {
...@@ -76,8 +91,9 @@ public class SailingConclusionService extends BaseService<SailingConclusionDao> ...@@ -76,8 +91,9 @@ public class SailingConclusionService extends BaseService<SailingConclusionDao>
entity.setTypeList(verifyDao.getTypeList(entity.getVerifId())); entity.setTypeList(verifyDao.getTypeList(entity.getVerifId()));
entity.setConnect(verifyDao.getConnectList(entity.getVerifId())); entity.setConnect(verifyDao.getConnectList(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<SailingConclusionListEntity> page = new PageEntity<SailingConclusionListEntity>(); PageEntity<SailingConclusionListEntity> page = new PageEntity<SailingConclusionListEntity>();
page.setPageNo(pageInfo.getPageNum()); page.setPageNo(pageInfo.getPageNum());
...@@ -93,8 +109,9 @@ public class SailingConclusionService extends BaseService<SailingConclusionDao> ...@@ -93,8 +109,9 @@ public class SailingConclusionService extends BaseService<SailingConclusionDao>
for (SailingConclusionListEntity entity : list) { for (SailingConclusionListEntity entity : list) {
entity.setDepIataLabel(verifyDao.getConnetList(entity.getVerifId())); entity.setDepIataLabel(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);
}
} }
return list; return list;
} }
...@@ -178,13 +195,10 @@ public class SailingConclusionService extends BaseService<SailingConclusionDao> ...@@ -178,13 +195,10 @@ public class SailingConclusionService extends BaseService<SailingConclusionDao>
ls.add("e4q231wdfdfkukjqe53457dgfdhdfhd"); ls.add("e4q231wdfdfkukjqe53457dgfdhdfhd");
entity1.setList(ls); entity1.setList(ls);
List<String> mails = verifyDao.getmailYK(entity1); List<String> mails = verifyDao.getmailYK(entity1);
/* List<String> ls=new ArrayList<String>(); if (mails == null || mails.size() == 0) {
ls.add("6e70812e4c874f298da21be2a12aa674"); return;
entity1.setList(ls); }
List<String> mails= verifyDao.getmailNew1(entity1);*/
if (mails == null || mails.size() == 0) return;
String templateName = "template_8_2.ftl"; String templateName = "template_8_2.ftl";
Map<String, String> map = verifyDao.getDetail(verifId); Map<String, String> map = verifyDao.getDetail(verifId);
String flight = PlanUtil.flightContent(map); String flight = PlanUtil.flightContent(map);
......
src/com/ejweb/modules/verify/api/VerifyManageController.java
...@@ -114,14 +114,14 @@ public class VerifyManageController { ...@@ -114,14 +114,14 @@ public class VerifyManageController {
@RequestMapping("delete") @RequestMapping("delete")
public ResponseBean delete(RequestBean requestBean) { public ResponseBean delete(RequestBean requestBean) {
ResponseBean responseBean = new ResponseBean(); ResponseBean responseBean = new ResponseBean();
VerifyManageUpdateBean bean = requestBean.getObjectBean(VerifyManageUpdateBean.class); VerifyManageUpdateBatchBean bean = requestBean.getObjectBean(VerifyManageUpdateBatchBean.class);
String message = null; String message = null;
if (bean.getVerifId() == null || "".equals(bean.getVerifId())) { if (bean.getVerifId() == null || "".equals(bean.getVerifId())) {
message = "VerifId 不能为空"; message = "VerifId 不能为空";
} }
if (message == null) {// 通过参数校验 if (message == null) {// 通过参数校验
manageService.updateDelFlag(bean.getVerifId()); manageService.updateDelFlag(bean);
// airLineVerifyService.delete(bean); // airLineVerifyService.delete(bean);
return responseBean; return responseBean;
} }
// 参数校验为通过 // 参数校验为通过
......
src/com/ejweb/modules/verify/bean/VerifyManageUpdateBatchBean.java 0 → 100644
package com.ejweb.modules.verify.bean;
import com.ejweb.core.base.GenericBean;
import org.hibernate.validator.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
/**
* @author LEGION
*/
public class VerifyManageUpdateBatchBean extends GenericBean {
public static final String DEL_FLAG_NORMAL = "0";
@NotNull(message = "verifId不能为空")
private String[] verifId;
@NotEmpty(message = "manageStatus不能为空")
private String manageStatus;
@NotEmpty(message = "userCode不能为空")
private String userCode;
public String[] getVerifId() {
return verifId;
}
public void setVerifId(String[] verifId) {
this.verifId = verifId;
}
public String getManageStatus() {
return manageStatus;
}
public void setManageStatus(String manageStatus) {
this.manageStatus = manageStatus;
}
public String getUserCode() {
return userCode;
}
public void setUserCode(String userCode) {
this.userCode = userCode;
}
}
src/com/ejweb/modules/verify/dao/VerifyManageDao.java
...@@ -54,7 +54,8 @@ public interface VerifyManageDao extends BaseDao{ ...@@ -54,7 +54,8 @@ public interface VerifyManageDao extends BaseDao{
void delete_airline_connect(VerifyManageDeleteBean bean); void delete_airline_connect(VerifyManageDeleteBean bean);
void delete_airline_verify2type(VerifyManageDeleteBean bean); void delete_airline_verify2type(VerifyManageDeleteBean bean);
void delete_airline_verified(VerifyManageDeleteBean bean); void delete_airline_verified(VerifyManageDeleteBean bean);
void updateDelFlag(String verifId);
void updateDelFlag(List<String> verifyIds);
void deleteProcess(VerifyProcessDeleteBean bean); void deleteProcess(VerifyProcessDeleteBean bean);
......
src/com/ejweb/modules/verify/service/AirlineVerifyService.java
...@@ -111,6 +111,12 @@ public class AirlineVerifyService extends BaseService<AirlineVerifyDao> { ...@@ -111,6 +111,12 @@ public class AirlineVerifyService extends BaseService<AirlineVerifyDao> {
public PageEntity<com.ejweb.modules.route.entity.AirlineVerifyEntity> getRiskAssessmentList(com.ejweb.modules.route.bean.AirlineVerifyBean bean) { public PageEntity<com.ejweb.modules.route.entity.AirlineVerifyEntity> getRiskAssessmentList(com.ejweb.modules.route.bean.AirlineVerifyBean bean) {
if (StringUtils.isNotEmpty(bean.getArrIata())) {
bean.setArrIataList(dao.getIataStr(bean.getArrIata()));
}
if (StringUtils.isNotEmpty(bean.getDepIata())) {
bean.setDepIataList(dao.getIataStr(bean.getDepIata()));
}
//如果论证状态没有传参，默认为00 00论证中,01终止,02成功 //如果论证状态没有传参，默认为00 00论证中,01终止,02成功
if (StringUtils.isBlank(bean.getVerifStatus())) { if (StringUtils.isBlank(bean.getVerifStatus())) {
bean.setVerifStatus("00"); bean.setVerifStatus("00");
......
src/com/ejweb/modules/verify/service/VerifyManageService.java
/** /**
* *
*/ */
package com.ejweb.modules.verify.service; package com.ejweb.modules.verify.service;
import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
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.BaseService;
import com.ejweb.core.base.PageEntity; import com.ejweb.core.base.PageEntity;
import com.ejweb.core.util.IdWorker; import com.ejweb.core.util.IdWorker;
...@@ -26,48 +13,36 @@ import com.ejweb.modules.notify.dao.NotifyDao; ...@@ -26,48 +13,36 @@ import com.ejweb.modules.notify.dao.NotifyDao;
import com.ejweb.modules.route.bean.RouteVerifyBean; import com.ejweb.modules.route.bean.RouteVerifyBean;
import com.ejweb.modules.route.dao.RouteVerifyDao; import com.ejweb.modules.route.dao.RouteVerifyDao;
import com.ejweb.modules.route.entity.FullRouteVerifyEntity; import com.ejweb.modules.route.entity.FullRouteVerifyEntity;
import com.ejweb.modules.verify.bean.AirlineVerifiedDetailBean; import com.ejweb.modules.verify.bean.*;
import com.ejweb.modules.verify.bean.AirlineVerifyDetailBean; import com.ejweb.modules.verify.dao.*;
import com.ejweb.modules.verify.bean.ManageUpdateBean; import com.ejweb.modules.verify.entity.*;
import com.ejweb.modules.verify.bean.RecordAddBean;
import com.ejweb.modules.verify.bean.VerifiedUpdateBean;
import com.ejweb.modules.verify.bean.VerifyManageAddBean;
import com.ejweb.modules.verify.bean.VerifyManageBean;
import com.ejweb.modules.verify.bean.VerifyManageDeleteBean;
import com.ejweb.modules.verify.bean.VerifyProcessDeleteBean;
import com.ejweb.modules.verify.bean.VerifyProcessUpdateBean;
import com.ejweb.modules.verify.dao.AirlineVerifiedDao;
import com.ejweb.modules.verify.dao.AirlineVerifyDao;
import com.ejweb.modules.verify.dao.RecordChangeVerifyDao;
import com.ejweb.modules.verify.dao.RecordDao;
import com.ejweb.modules.verify.dao.VerifyManageDao;
import com.ejweb.modules.verify.dao.VerifyProcessDao;
import com.ejweb.modules.verify.entity.MailEntity;
import com.ejweb.modules.verify.entity.VerifiedDetailEntity;
import com.ejweb.modules.verify.entity.VerifyCountEntity;
import com.ejweb.modules.verify.entity.VerifyManageDetailEntity;
import com.ejweb.modules.verify.entity.VerifyManageDetailEntity.AirType; import com.ejweb.modules.verify.entity.VerifyManageDetailEntity.AirType;
import com.ejweb.modules.verify.entity.VerifyManageDetailEntity.Connect; import com.ejweb.modules.verify.entity.VerifyManageDetailEntity.Connect;
import com.ejweb.modules.verify.entity.VerifyManageDetailEntity.VerifyFile; import com.ejweb.modules.verify.entity.VerifyManageDetailEntity.VerifyFile;
import com.ejweb.modules.verify.entity.VerifyManageEntity;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import freemarker.template.TemplateException; 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.text.SimpleDateFormat;
import java.util.*;
/** /**
*
* @team IT Team
* @author zhanglg * @author zhanglg
* @version 1.0 * @version 1.0
* @time 2016年9月17日 * @team IT Team
* @time 2016年9月17日
*/ */
@Service @Service
@Transactional(readOnly = true) @Transactional(readOnly = true)
public class VerifyManageService extends BaseService<VerifyManageDao> { public class VerifyManageService extends BaseService<VerifyManageDao> {
@Autowired @Autowired
private RouteVerifyDao routeDao; private RouteVerifyDao routeDao;
@Autowired @Autowired
NotifyDao notifyDao; NotifyDao notifyDao;
@Autowired @Autowired
...@@ -79,7 +54,8 @@ public class VerifyManageService extends BaseService<VerifyManageDao> { ...@@ -79,7 +54,8 @@ public class VerifyManageService extends BaseService<VerifyManageDao> {
@Autowired @Autowired
RecordDao recordDao; RecordDao recordDao;
@Autowired @Autowired
AirlineVerifiedDao verifiedDao ; AirlineVerifiedDao verifiedDao;
public PageEntity<VerifyManageEntity> findList(VerifyManageBean bean) { public PageEntity<VerifyManageEntity> findList(VerifyManageBean bean) {
//查询同一机场被屏蔽三字码数据（历史数据关联） //查询同一机场被屏蔽三字码数据（历史数据关联）
if (StringUtils.isNotEmpty(bean.getArrIata())) { if (StringUtils.isNotEmpty(bean.getArrIata())) {
...@@ -105,13 +81,13 @@ public class VerifyManageService extends BaseService<VerifyManageDao> { ...@@ -105,13 +81,13 @@ public class VerifyManageService extends BaseService<VerifyManageDao> {
if (list == null || list.size() == 0) {// 如果没有数据则返回NULL if (list == null || list.size() == 0) {// 如果没有数据则返回NULL
return null; return null;
} }
for(VerifyManageEntity entity: list){ for (VerifyManageEntity entity : list) {
entity.setTypeList(verifyDao.getTypeList(entity.getVerifId())); entity.setTypeList(verifyDao.getTypeList(entity.getVerifId()));
entity.setConnect(verifyDao.getConnectList(entity.getVerifId())); entity.setConnect(verifyDao.getConnectList(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<VerifyManageEntity> page = new PageEntity<VerifyManageEntity>(); PageEntity<VerifyManageEntity> page = new PageEntity<VerifyManageEntity>();
page.setPageNo(pageInfo.getPageNum()); page.setPageNo(pageInfo.getPageNum());
...@@ -134,131 +110,143 @@ public class VerifyManageService extends BaseService<VerifyManageDao> { ...@@ -134,131 +110,143 @@ public class VerifyManageService extends BaseService<VerifyManageDao> {
public List<VerifyManageEntity> findAllList(VerifyManageBean bean) { public List<VerifyManageEntity> findAllList(VerifyManageBean bean) {
return dao.findList(bean); return dao.findList(bean);
} }
public String verifiedStatus(String verifid){
return dao.verifiedStatus( verifid); public String verifiedStatus(String verifid) {
return dao.verifiedStatus(verifid);
} }
// 删除之前未审核记录
public void deleteChange(String verifId){ // 删除之前未审核记录
dao.deleteChange(verifId); public void deleteChange(String verifId) {
dao.deleteChange(verifId);
} }
public List<Map<String,String>> getConnect(VerifyManageDetailEntity bean) {
public List<Map<String, String>> getConnect(VerifyManageDetailEntity bean) {
// TODO Auto-generated method stub // TODO Auto-generated method stub
return dao.getConnectList(bean); return dao.getConnectList(bean);
} }
@Transactional(readOnly = false) @Transactional(readOnly = false)
public void delete(String VerifId){ public void delete(String VerifId) {
VerifyManageDeleteBean bean=new VerifyManageDeleteBean(); VerifyManageDeleteBean bean = new VerifyManageDeleteBean();
bean.setVerifId(VerifId); bean.setVerifId(VerifId);
dao.delete_change_extend(bean); dao.delete_change_extend(bean);
// dao.delete_verify_record(bean); // dao.delete_verify_record(bean);
dao.delete_production_feedback(bean); dao.delete_production_feedback(bean);
dao.delete_production_command(bean); dao.delete_production_command(bean);
dao.delete_sailing_file(bean); dao.delete_sailing_file(bean);
dao.delete_sailing_command(bean); dao.delete_sailing_command(bean);
dao.delete_sailingcc_file(bean); dao.delete_sailingcc_file(bean);
dao.delete_sailing_conclusion(bean); dao.delete_sailing_conclusion(bean);
dao.delete_conclusion_file(bean); dao.delete_conclusion_file(bean);
dao.delete_airline_conclusion(bean); dao.delete_airline_conclusion(bean);
dao.delete_condition_feedback(bean); dao.delete_condition_feedback(bean);
dao.delete_verify_condition(bean); dao.delete_verify_condition(bean);
} }
@Transactional(readOnly = false) @Transactional(readOnly = false)
public void delete_verify_file(String verifId, String tableName, String delFlag) { public void delete_verify_file(String verifId, String tableName, String delFlag) {
VerifyManageDeleteBean bean=new VerifyManageDeleteBean(); VerifyManageDeleteBean bean = new VerifyManageDeleteBean();
bean.setDelFlag(delFlag); bean.setDelFlag(delFlag);
bean.setTableName(tableName); bean.setTableName(tableName);
bean.setVerifId(verifId); bean.setVerifId(verifId);
dao.delete_verify_file(bean); dao.delete_verify_file(bean);
} }
@Transactional(readOnly = false) @Transactional(readOnly = false)
public void delete_airline_connect(String verifId, String tableName, String delFlag) { public void delete_airline_connect(String verifId, String tableName, String delFlag) {
VerifyManageDeleteBean bean=new VerifyManageDeleteBean(); VerifyManageDeleteBean bean = new VerifyManageDeleteBean();
bean.setDelFlag(delFlag); bean.setDelFlag(delFlag);
bean.setTableName(tableName); bean.setTableName(tableName);
bean.setVerifId(verifId); bean.setVerifId(verifId);
dao.delete_airline_connect(bean); dao.delete_airline_connect(bean);
} }
@Transactional(readOnly = false) @Transactional(readOnly = false)
public void delete_airline_verify2type(String verifId, String tableName, String delFlag) { public void delete_airline_verify2type(String verifId, String tableName, String delFlag) {
VerifyManageDeleteBean bean=new VerifyManageDeleteBean(); VerifyManageDeleteBean bean = new VerifyManageDeleteBean();
bean.setDelFlag(delFlag); bean.setDelFlag(delFlag);
bean.setTableName(tableName); bean.setTableName(tableName);
bean.setVerifId(verifId); bean.setVerifId(verifId);
dao.delete_airline_verify2type(bean); dao.delete_airline_verify2type(bean);
} }
@Transactional(readOnly = false) @Transactional(readOnly = false)
public void update_verify_file(String verifId, String tableName, String delFlagFrom, String delFlagTo) { public void update_verify_file(String verifId, String tableName, String delFlagFrom, String delFlagTo) {
ManageUpdateBean bean=new ManageUpdateBean(); ManageUpdateBean bean = new ManageUpdateBean();
bean.setDelFlagFrom(delFlagFrom); bean.setDelFlagFrom(delFlagFrom);
bean.setTableName(tableName); bean.setTableName(tableName);
bean.setVerifId(verifId); bean.setVerifId(verifId);
bean.setDelFlagTo(delFlagTo); bean.setDelFlagTo(delFlagTo);
dao.update_verify_file(bean); dao.update_verify_file(bean);
} }
@Transactional(readOnly = false) @Transactional(readOnly = false)
public void update_airline_connect(String verifId, String tableName, String delFlagFrom, String delFlagTo) { public void update_airline_connect(String verifId, String tableName, String delFlagFrom, String delFlagTo) {
ManageUpdateBean bean=new ManageUpdateBean(); ManageUpdateBean bean = new ManageUpdateBean();
bean.setDelFlagFrom(delFlagFrom); bean.setDelFlagFrom(delFlagFrom);
bean.setTableName(tableName); bean.setTableName(tableName);
bean.setVerifId(verifId); bean.setVerifId(verifId);
bean.setDelFlagTo(delFlagTo); bean.setDelFlagTo(delFlagTo);
dao.update_airline_connect(bean); dao.update_airline_connect(bean);
} }
@Transactional(readOnly = false) @Transactional(readOnly = false)
public void update_airline_verify2type(String verifId, String tableName, String delFlagFrom, String delFlagTo) { public void update_airline_verify2type(String verifId, String tableName, String delFlagFrom, String delFlagTo) {
ManageUpdateBean bean=new ManageUpdateBean(); ManageUpdateBean bean = new ManageUpdateBean();
bean.setDelFlagFrom(delFlagFrom); bean.setDelFlagFrom(delFlagFrom);
bean.setTableName(tableName); bean.setTableName(tableName);
bean.setVerifId(verifId); bean.setVerifId(verifId);
bean.setDelFlagTo(delFlagTo); bean.setDelFlagTo(delFlagTo);
dao.update_airline_verify2type(bean); dao.update_airline_verify2type(bean);
} }
@Transactional(readOnly = false)
public void updateDelFlag(String verifId) { @Transactional(rollbackFor = Exception.class)
dao.updateDelFlag( verifId); public void updateDelFlag(VerifyManageUpdateBatchBean bean) {
List<String> verifyIds = Arrays.asList(bean.getVerifId());
dao.updateDelFlag(verifyIds);
} }
@Transactional(readOnly = false) @Transactional(readOnly = false)
public void deleteProcess(String verifId, int i) { public void deleteProcess(String verifId, int i) {
VerifyProcessDeleteBean bean =new VerifyProcessDeleteBean(); VerifyProcessDeleteBean bean = new VerifyProcessDeleteBean();
bean.setVerifId(verifId); bean.setVerifId(verifId);
bean.setNodeSort(i); bean.setNodeSort(i);
dao.deleteProcess(bean) ; dao.deleteProcess(bean);
} }
/** /**
* *
* @author zhanglg * @author zhanglg
* @time 2016年9月25日 * @time 2016年9月25日
* @param bean * @param bean
*/ */
@Transactional(readOnly = false) @Transactional(readOnly = false)
public void updateVerifed(VerifiedUpdateBean bean) { public void updateVerifed(VerifiedUpdateBean bean) {
dao.updateVerifed( bean); dao.updateVerifed(bean);
} }
@Transactional(readOnly = false) @Transactional(readOnly = false)
public void updateRoute(String verifId,String verifyStatus) { public void updateRoute(String verifId, String verifyStatus) {
RouteVerifyBean bean=new RouteVerifyBean(); RouteVerifyBean bean = new RouteVerifyBean();
bean.setVerifId(verifId); bean.setVerifId(verifId);
List<FullRouteVerifyEntity> list= routeDao.fullList( bean); List<FullRouteVerifyEntity> list = routeDao.fullList(bean);
for(FullRouteVerifyEntity entity:list){ for (FullRouteVerifyEntity entity : list) {
//如果VerifyStatus传值了“00”，就说明清空 //如果VerifyStatus传值了“00”，就说明清空
entity.setVerifyStatus(verifyStatus); entity.setVerifyStatus(verifyStatus);
entity.setStatus("0"); entity.setStatus("0");
entity.setCreateDate(new Date()); entity.setCreateDate(new Date());
entity.setRemarks(""); entity.setRemarks("");
...@@ -267,34 +255,34 @@ public class VerifyManageService extends BaseService<VerifyManageDao> { ...@@ -267,34 +255,34 @@ public class VerifyManageService extends BaseService<VerifyManageDao> {
entity.setEndTime(null); entity.setEndTime(null);
routeDao.updateByPrimaryKey(entity); routeDao.updateByPrimaryKey(entity);
} }
} }
@Transactional(readOnly = false) @Transactional(readOnly = false)
public void sendnotify(VerifyManageDetailEntity bean, String type) { public void sendnotify(VerifyManageDetailEntity bean, String type) {
//发送审核 //发送审核
AirlineVerifyDetailBean verifybean=new AirlineVerifyDetailBean(); AirlineVerifyDetailBean verifybean = new AirlineVerifyDetailBean();
verifybean.setVerifId(bean.getId()); verifybean.setVerifId(bean.getId());
NotifyAddBean addbean=new NotifyAddBean(); NotifyAddBean addbean = new NotifyAddBean();
StringBuffer sb=new StringBuffer(); StringBuffer sb = new StringBuffer();
Map<String, String> map=verifyDao.getDetail(bean.getId()); Map<String, String> map = verifyDao.getDetail(bean.getId());
if(!map.get("depName").contains("=")){ if (!map.get("depName").contains("=")) {
map.put("depName", PlanUtil.GetLine(map.get("depName"),map.get("arrName"),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"))); map.put("depIata", PlanUtil.GetLine(map.get("depIata"), map.get("arrIata"), map.get("roundtripType"), map.get("vertype")));
} }
sb.append("申请单号为").append(map.get("applyNo")) sb.append("申请单号为").append(map.get("applyNo"))
.append(map.get("verifType")).append( PlanUtil.GetLine(map.get("depName"),map.get("arrName"),map.get("roundtripType"),map.get("vertype")) ) .append(map.get("verifType")).append(PlanUtil.GetLine(map.get("depName"), map.get("arrName"), map.get("roundtripType"), map.get("vertype")))
.append("的待审核航线已经被重新编辑，请尽快审核。"); .append("的待审核航线已经被重新编辑，请尽快审核。");
StringBuffer url=new StringBuffer(); StringBuffer url = new StringBuffer();
if("2".equals(type)){ if ("2".equals(type)) {
url.append("<<<a href='wait-review-airway-details.htm?verifId=").append(bean.getId()); url.append("<<<a href='wait-review-airway-details.htm?verifId=").append(bean.getId());
url.append("&applyNo=").append(map.get("applyNo")); url.append("&applyNo=").append(map.get("applyNo"));
}else{ } else {
url.append("<<<a href='message-change-check-details.htm?verifId=").append(bean.getId()); url.append("<<<a href='message-change-check-details.htm?verifId=").append(bean.getId());
url.append("&verifNo=").append(map.get("verifNo")); url.append("&verifNo=").append(map.get("verifNo"));
} }
url.append("&sailingDate=").append(map.get("startTime")); url.append("&sailingDate=").append(map.get("startTime"));
url.append("'>点击查看</a>"); url.append("'>点击查看</a>");
addbean.setUrl(url.toString()); addbean.setUrl(url.toString());
...@@ -310,176 +298,178 @@ public class VerifyManageService extends BaseService<VerifyManageDao> { ...@@ -310,176 +298,178 @@ public class VerifyManageService extends BaseService<VerifyManageDao> {
addbean.setVerifId(bean.getId()); addbean.setVerifId(bean.getId());
addbean.setConId(bean.getId()); addbean.setConId(bean.getId());
notifyDao.saveNotify(addbean); notifyDao.saveNotify(addbean);
} }
public VerifyCountEntity getCount(String userCode){
return dao.getCount(userCode);
}
@Transactional(readOnly = false) public VerifyCountEntity getCount(String userCode) {
public void updateRecord(VerifyManageDetailEntity bean) { return dao.getCount(userCode);
dao.updateRecord(bean); }
}
/** @Transactional(readOnly = false)
* 比较并记录子机型修改 public void updateRecord(VerifyManageDetailEntity bean) {
* @author zhanglg dao.updateRecord(bean);
* @time 2016年10月11日 }
* @param entity
* @param type2 /**
* @param type1 * 比较并记录子机型修改
*/ *
@Transactional(readOnly = false) * @param entity
public VerifyManageAddBean typeChange(VerifyManageDetailEntity entity, String type2, String type1) { * @param type2
List<AirType> list= entity.getAirTypes(); * @param type1
if(list==null)list=new ArrayList<AirType>(); * @author zhanglg
List<String> list1= verifyDao.getTypeList(entity.getId()); * @time 2016年10月11日
Boolean change=false; */
VerifyManageAddBean add = new VerifyManageAddBean(); @Transactional(readOnly = false)
public VerifyManageAddBean typeChange(VerifyManageDetailEntity entity, String type2, String type1) {
List<String> list2= new ArrayList<String>(); List<AirType> list = entity.getAirTypes();
for(AirType type :list){ if (list == null) list = new ArrayList<AirType>();
list2.add(type.getTypeId()); List<String> list1 = verifyDao.getTypeList(entity.getId());
} Boolean change = false;
if(list2.size()!=list1.size()){ VerifyManageAddBean add = new VerifyManageAddBean();
change=true;
}else if(list2.size()==0){
change=false;
}else{
for(String str:list1){
Boolean b=false;
for(String str2:list2){
if(str2.equals(str)){
b=true;
break;
}
} List<String> list2 = new ArrayList<String>();
if(!b){ for (AirType type : list) {
change=true; list2.add(type.getTypeId());
break; }
} if (list2.size() != list1.size()) {
} change = true;
} else if (list2.size() == 0) {
change = false;
} else {
for (String str : list1) {
Boolean b = false;
for (String str2 : list2) {
if (str2.equals(str)) {
b = true;
break;
}
}
if (!b) {
change = true;
break;
}
}
}
// 新文件暂存，通过后替换全文件
if (entity.getAirTypes() != null && entity.getAirTypes().size() > 0) {
delete_airline_verify2type(entity.getId(),"foc_airline_verify2type",type1);
dao.insertAirTypes(entity);
}
if(change){
if(list1.size()>0){
add.setEditFrom(dao.getTypeName(list1));
} }
if(list2.size()>0){ // 新文件暂存，通过后替换全文件
add.setEditTo(dao.getTypeName(list2)); if (entity.getAirTypes() != null && entity.getAirTypes().size() > 0) {
delete_airline_verify2type(entity.getId(), "foc_airline_verify2type", type1);
dao.insertAirTypes(entity);
} }
add.setId(IdWorker.getNextId()); if (change) {
add.setVerifId(entity.getId());
add.setFieldName("拟用子机型");
add.setUpdateBy(entity.getUserCode());
add.setUpdateDate(new Date());
add.setFieldValue("TypeList");
add.setDelFlag(type2);
return add;
}else{
return null;
}
}
/** if (list1.size() > 0) {
* 比较联程数据 add.setEditFrom(dao.getTypeName(list1));
* @author zhanglg }
* @time 2016年10月11日 if (list2.size() > 0) {
* @param entity add.setEditTo(dao.getTypeName(list2));
* @param type }
* @param type1 add.setId(IdWorker.getNextId());
* @param bean add.setVerifId(entity.getId());
* @return add.setFieldName("拟用子机型");
*/ add.setUpdateBy(entity.getUserCode());
@Transactional(readOnly = false) add.setUpdateDate(new Date());
public VerifyManageAddBean ConnectChange(VerifyManageDetailEntity entity, String type, String type1) { add.setFieldValue("TypeList");
List<Map<String,String>> listconnect=dao.getConnectList(entity); add.setDelFlag(type2);
List<Connect> listconnectbean=entity.getConnect(); return add;
Boolean change=false; } else {
// 修改联程 return null;
switch (entity.getVerifType()) {
case "01":
case "02":
case "03":
case "04":
case "09": {
List<Connect> connects = new ArrayList<>();
Connect connect = new Connect();
connect.setId(IdWorker.getNextId());
connect.setFlightNo(entity.getFlightNo());
connect.setDepIata(entity.getDepIata());
connect.setArrIata(entity.getArrIata());
connect.setIsMain("1");
Connect connect2 = new Connect();
connect2.setId(IdWorker.getNextId());
connect2.setFlightNo(entity.getFlightNo());
connect2.setDepIata(entity.getArrIata());
connect2.setArrIata(entity.getDepIata());
connect2.setIsMain("0");
connects.add(connect);
connects.add(connect2);
if (entity.getConnect() != null && entity.getConnect().size() > 0) {
for (Connect connectTmp : entity.getConnect()) {
connectTmp.setId(IdWorker.getNextId());
connectTmp.setIsMain("2");
Connect connect2Tmp = new Connect();
connect2Tmp.setId(IdWorker.getNextId());
connect2Tmp.setFlightNo(connectTmp.getFlightNo());
connect2Tmp.setDepIata(connectTmp.getArrIata());
connect2Tmp.setArrIata(connectTmp.getDepIata());
connect2Tmp.setIsMain("0");
connects.add(connectTmp);
connects.add(connect2Tmp);
}
} }
entity.setConnect(connects);
} }
break;
case "05": /**
{ * 比较联程数据
if ("02".equals(entity.getRoundtripType()) ) { *
* @param entity
* @param type
* @param type1
* @param bean
* @return
* @author zhanglg
* @time 2016年10月11日
*/
@Transactional(readOnly = false)
public VerifyManageAddBean ConnectChange(VerifyManageDetailEntity entity, String type, String type1) {
List<Map<String, String>> listconnect = dao.getConnectList(entity);
List<Connect> listconnectbean = entity.getConnect();
Boolean change = false;
// 修改联程
switch (entity.getVerifType()) {
case "01":
case "02":
case "03":
case "04":
case "09": {
List<Connect> connects = new ArrayList<>(); List<Connect> connects = new ArrayList<>();
Connect connect = new Connect(); Connect connect = new Connect();
connect.setId(IdWorker.getNextId()); connect.setId(IdWorker.getNextId());
connect.setFlightNo(entity.getFlightNo()); connect.setFlightNo(entity.getFlightNo());
connect.setIsMain("1");
connect.setArrIata(entity.getArrIata());
connect.setDepIata(entity.getDepIata()); connect.setDepIata(entity.getDepIata());
connect.setArrIata(entity.getArrIata());
connect.setIsMain("1");
Connect connect2 = new Connect(); Connect connect2 = new Connect();
connect2.setId(IdWorker.getNextId()); connect2.setId(IdWorker.getNextId());
connect2.setFlightNo(entity.getFlightNo()); connect2.setFlightNo(entity.getFlightNo());
connect2.setIsMain("0");
connect2.setDepIata(entity.getArrIata()); connect2.setDepIata(entity.getArrIata());
connect2.setArrIata(entity.getDepIata()); connect2.setArrIata(entity.getDepIata());
connect2.setIsMain("0");
connects.add(connect); connects.add(connect);
connects.add(connect2); connects.add(connect2);
if ((entity.getConnect() != null && entity.getConnect().size() > 0)) {
if (entity.getConnect() != null && entity.getConnect().size() > 0) {
for (Connect connectTmp : entity.getConnect()) { for (Connect connectTmp : entity.getConnect()) {
connectTmp.setId(IdWorker.getNextId()); connectTmp.setId(IdWorker.getNextId());
connectTmp.setIsMain("2"); connectTmp.setIsMain("2");
Connect connect2Tmp = new Connect(); Connect connect2Tmp = new Connect();
connect2Tmp.setId(IdWorker.getNextId()); connect2Tmp.setId(IdWorker.getNextId());
connect2Tmp.setFlightNo(connectTmp.getFlightNo()); connect2Tmp.setFlightNo(connectTmp.getFlightNo());
connect2Tmp.setDepIata(connectTmp.getArrIata()); connect2Tmp.setDepIata(connectTmp.getArrIata());
connect2Tmp.setArrIata(connectTmp.getDepIata()); connect2Tmp.setArrIata(connectTmp.getDepIata());
connect2Tmp.setIsMain("0"); connect2Tmp.setIsMain("0");
connects.add(connectTmp); connects.add(connectTmp);
connects.add(connect2Tmp); connects.add(connect2Tmp);
} }
} }
entity.setConnect(connects); entity.setConnect(connects);
} else if ("01".equals(entity.getRoundtripType())) { }
break;
case "05": {
if ("02".equals(entity.getRoundtripType())) {
List<Connect> connects = new ArrayList<>();
Connect connect = new Connect();
connect.setId(IdWorker.getNextId());
connect.setFlightNo(entity.getFlightNo());
connect.setIsMain("1");
connect.setArrIata(entity.getArrIata());
connect.setDepIata(entity.getDepIata());
Connect connect2 = new Connect();
connect2.setId(IdWorker.getNextId());
connect2.setFlightNo(entity.getFlightNo());
connect2.setIsMain("0");
connect2.setDepIata(entity.getArrIata());
connect2.setArrIata(entity.getDepIata());
connects.add(connect);
connects.add(connect2);
if ((entity.getConnect() != null && entity.getConnect().size() > 0)) {
for (Connect connectTmp : entity.getConnect()) {
connectTmp.setId(IdWorker.getNextId());
connectTmp.setIsMain("2");
Connect connect2Tmp = new Connect();
connect2Tmp.setId(IdWorker.getNextId());
connect2Tmp.setFlightNo(connectTmp.getFlightNo());
connect2Tmp.setDepIata(connectTmp.getArrIata());
connect2Tmp.setArrIata(connectTmp.getDepIata());
connect2Tmp.setIsMain("0");
connects.add(connectTmp);
connects.add(connect2Tmp);
}
}
entity.setConnect(connects);
} else if ("01".equals(entity.getRoundtripType())) {
Connect connect = new Connect(); Connect connect = new Connect();
connect.setId(IdWorker.getNextId()); connect.setId(IdWorker.getNextId());
connect.setFlightNo(entity.getFlightNo()); connect.setFlightNo(entity.getFlightNo());
...@@ -488,260 +478,258 @@ public VerifyManageAddBean ConnectChange(VerifyManageDetailEntity entity, String ...@@ -488,260 +478,258 @@ public VerifyManageAddBean ConnectChange(VerifyManageDetailEntity entity, String
connect.setIsMain("1"); connect.setIsMain("1");
List<Connect> connects = new ArrayList<>(); List<Connect> connects = new ArrayList<>();
connects.add(connect); connects.add(connect);
if (entity.getConnect() != null && entity.getConnect().size() > 0) { if (entity.getConnect() != null && entity.getConnect().size() > 0) {
for (Connect connectTmp : entity.getConnect()) { for (Connect connectTmp : entity.getConnect()) {
connectTmp.setId(IdWorker.getNextId()); connectTmp.setId(IdWorker.getNextId());
connectTmp.setIsMain("2"); connectTmp.setIsMain("2");
connects.add(connectTmp); connects.add(connectTmp);
} }
}
entity.setConnect(connects);
} }
entity.setConnect(connects);
} }
break;
}
if (entity.getConnect() != null && entity.getConnect().size() > 0) {
delete_airline_connect(entity.getId(), "foc_airline_connect", type1);
dao.insertConnects(entity);
} }
break;
}
if (entity.getConnect() != null && entity.getConnect().size() > 0) {
delete_airline_connect(entity.getId(),"foc_airline_connect",type1);
dao.insertConnects(entity);
}
if(listconnectbean==null){
listconnectbean=new ArrayList<Connect>();
}
if(listconnectbean.size()!=listconnect.size()){
change=true;
}
else if(listconnectbean.size()!=0){
for(Connect connect: listconnectbean){
Boolean b=false;
for(Map<String,String> map:listconnect){
if(connect.getFlightNo().equals(map.get("flightNo"))
&&connect.getArrIata().equals(map.get("arrIata"))
&&connect.getDepIata().equals(map.get("depIata"))){
b=true;
break;
}
}
if(!b){
change=true;
break;
}
}
}
if(change){
VerifyManageAddBean add = new VerifyManageAddBean();
StringBuffer to=new StringBuffer();
StringBuffer from=new StringBuffer();
for(Connect con:listconnectbean){
if(!"".equals(to.toString())){
to.append("、");
}
to.append("航班号").append(con.getFlightNo()).append(" ").append(dao.getConnectName(con.getDepIata()));
to.append("-").append(dao.getConnectName(con.getArrIata()));
}
for(Map<String,String> map:listconnect){
if(!"".equals(from.toString())){
from.append("、");
}
from.append("航班号").append(map.get("flightNo")).append(" ").append(dao.getConnectName(map.get("depIata")));
from.append("-").append(dao.getConnectName(map.get("arrIata")));
}
add.setId(IdWorker.getNextId());
add.setVerifId(entity.getId());
add.setEditFrom(from.toString());
add.setEditTo(to.toString());
add.setFieldName("联程");
add.setUpdateBy(entity.getUserCode());
add.setUpdateDate(new Date());
add.setFieldValue("connect");
add.setDelFlag(type);
return add;
}else{
return null;
}
}
/**
* 附件比较
* @author zhanglg
* @time 2016年10月11日
* @param entity
* @param type
* @param type1
* @return
*/
@Transactional(readOnly = false)
public VerifyManageAddBean fileChange(VerifyManageDetailEntity entity, String type, String type1) {
List<VerifyFile> list= entity.getVerifyFile();
String fileFrom=null;
String fileTo=null;
if(list==null)list= new ArrayList<VerifyFile>();
AirlineVerifyDetailBean bean=new AirlineVerifyDetailBean();
bean.setVerifId(entity.getId());
List<Map<String, String>> listd= verifyDao.getverifyFileList(bean);
List<String> list1=new ArrayList<String>();
List<String> list2=new ArrayList<String>();
for(VerifyFile file :list){
list1.add(file.getFileName());
fileTo= file.getFilePath();
}
for(Map<String, String> map:listd){
list2.add(map.get("fileName"));
fileFrom= map.get("filePath");
}
Boolean change=false;
if(list1.size()!=list2.size()){
change=true;
}else if(list1.size()==0){
change=false;
}else{
for(String str:list1){
Boolean b=false;
for(String str2:list2){
if(str2.equals(str)){
b=true;
break;
}
if (listconnectbean == null) {
listconnectbean = new ArrayList<Connect>();
}
if (listconnectbean.size() != listconnect.size()) {
change = true;
} else if (listconnectbean.size() != 0) {
for (Connect connect : listconnectbean) {
Boolean b = false;
for (Map<String, String> map : listconnect) {
if (connect.getFlightNo().equals(map.get("flightNo"))
&& connect.getArrIata().equals(map.get("arrIata"))
&& connect.getDepIata().equals(map.get("depIata"))) {
b = true;
break;
}
}
if (!b) {
change = true;
break;
}
} }
if(!b){ }
change=true; if (change) {
break; VerifyManageAddBean add = new VerifyManageAddBean();
StringBuffer to = new StringBuffer();
StringBuffer from = new StringBuffer();
for (Connect con : listconnectbean) {
if (!"".equals(to.toString())) {
to.append("、");
}
to.append("航班号").append(con.getFlightNo()).append(" ").append(dao.getConnectName(con.getDepIata()));
to.append("-").append(dao.getConnectName(con.getArrIata()));
} }
for (Map<String, String> map : listconnect) {
if (!"".equals(from.toString())) {
from.append("、");
}
from.append("航班号").append(map.get("flightNo")).append(" ").append(dao.getConnectName(map.get("depIata")));
from.append("-").append(dao.getConnectName(map.get("arrIata")));
}
add.setId(IdWorker.getNextId());
add.setVerifId(entity.getId());
add.setEditFrom(from.toString());
add.setEditTo(to.toString());
add.setFieldName("联程");
add.setUpdateBy(entity.getUserCode());
add.setUpdateDate(new Date());
add.setFieldValue("connect");
add.setDelFlag(type);
return add;
} else {
return null;
} }
} }
// 新文件暂存，通过后替换全文件
if(entity.getVerifyFile()!=null&& (entity.getVerifyFile().size()!=0)){ /**
delete_verify_file(entity.getId(),"foc_verify_file",type1); * 附件比较
dao.insertFiles(entity); *
* @param entity
* @param type
* @param type1
* @return
* @author zhanglg
* @time 2016年10月11日
*/
@Transactional(readOnly = false)
public VerifyManageAddBean fileChange(VerifyManageDetailEntity entity, String type, String type1) {
List<VerifyFile> list = entity.getVerifyFile();
String fileFrom = null;
String fileTo = null;
if (list == null) list = new ArrayList<VerifyFile>();
AirlineVerifyDetailBean bean = new AirlineVerifyDetailBean();
bean.setVerifId(entity.getId());
List<Map<String, String>> listd = verifyDao.getverifyFileList(bean);
List<String> list1 = new ArrayList<String>();
List<String> list2 = new ArrayList<String>();
for (VerifyFile file : list) {
list1.add(file.getFileName());
fileTo = file.getFilePath();
}
for (Map<String, String> map : listd) {
list2.add(map.get("fileName"));
fileFrom = map.get("filePath");
}
Boolean change = false;
if (list1.size() != list2.size()) {
change = true;
} else if (list1.size() == 0) {
change = false;
} else {
for (String str : list1) {
Boolean b = false;
for (String str2 : list2) {
if (str2.equals(str)) {
b = true;
break;
}
}
if (!b) {
change = true;
break;
}
}
}
// 新文件暂存，通过后替换全文件
if (entity.getVerifyFile() != null && (entity.getVerifyFile().size() != 0)) {
delete_verify_file(entity.getId(), "foc_verify_file", type1);
dao.insertFiles(entity);
}
if (change) {
VerifyManageAddBean add = new VerifyManageAddBean();
add.setId(IdWorker.getNextId());
add.setVerifId(entity.getId());
add.setEditFrom(list2.toString());
add.setEditTo(list1.toString());
add.setFieldName("编排航班衔接计划");
add.setUpdateBy(entity.getUserCode());
add.setUpdateDate(new Date());
add.setFieldValue("file");
add.setDelFlag(type);
add.setFileFrom(fileFrom);
add.setFileTo(fileTo);
return add;
}
return null;
} }
if(change){
VerifyManageAddBean add = new VerifyManageAddBean();
add.setId(IdWorker.getNextId());
add.setVerifId(entity.getId());
add.setEditFrom(list2.toString());
add.setEditTo(list1.toString());
add.setFieldName("编排航班衔接计划");
add.setUpdateBy(entity.getUserCode());
add.setUpdateDate(new Date());
add.setFieldValue("file");
add.setDelFlag(type);
add.setFileFrom(fileFrom);
add.setFileTo(fileTo);
return add;
}
return null;
}
public void delete_airline_verified(String verifId, String string) {
VerifyManageDeleteBean bean = new VerifyManageDeleteBean();
public void delete_airline_verified(String verifId, String string) { bean.setTableName(string);
VerifyManageDeleteBean bean=new VerifyManageDeleteBean(); bean.setVerifId(verifId);
dao.delete_airline_verified(bean);
bean.setTableName(string);
bean.setVerifId(verifId);
dao.delete_airline_verified(bean);
}
}
public void updateByPrimaryKey(VerifyManageDetailEntity bean) { public void updateByPrimaryKey(VerifyManageDetailEntity bean) {
dao.updateByPrimaryKey(bean); dao.updateByPrimaryKey(bean);
} }
public void updateProcess(VerifyManageDetailEntity bean, Boolean b) {
VerifyProcessUpdateBean beans = recordChDao.getNodeId(bean.getId());
if (beans == null) return;
beans.setNodeDate(bean.getStartTime());
public void updateProcess(VerifyManageDetailEntity bean,Boolean b) { processDao.update(beans);
VerifyProcessUpdateBean beans= recordChDao.getNodeId( bean.getId()); if (b) {
if(beans==null) return; verifyDao.updateStartTime(beans);
beans.setNodeDate(bean.getStartTime()); }
processDao.update(beans);
if(b){
verifyDao.updateStartTime(beans);
} }
}
public void sendMailChange(String verifId, String sailTime, String sailTimeTo) { public void sendMailChange(String verifId, String sailTime, String sailTimeTo) {
List<String> ccmails= verifyDao.getmail("4"); List<String> ccmails = verifyDao.getmail("4");
MailEntity entity1=new MailEntity(); MailEntity entity1 = new MailEntity();
entity1.setType("4"); entity1.setType("4");
entity1.setList(verifyDao.getdepartList(verifId)); entity1.setList(verifyDao.getdepartList(verifId));
List<String> mails= verifyDao.getmailNew(entity1); List<String> mails = verifyDao.getmailNew(entity1);
if(mails==null||mails.size()==0)return; if (mails == null || mails.size() == 0) return;
String templateName = "template_4.ftl"; String templateName = "template_4.ftl";
Map<String, String> map=verifyDao.getDetail(verifId); Map<String, String> map = verifyDao.getDetail(verifId);
map.put("depName", PlanUtil.GetLine(map.get("depName"),map.get("arrName"),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"))); map.put("depIata", PlanUtil.GetLine(map.get("depIata"), map.get("arrIata"), map.get("roundtripType"), map.get("vertype")));
map.put("url", "https://ifos.jdair.net/im/login"); map.put("url", "https://ifos.jdair.net/im/login");
map.put("ref",""); map.put("ref", "");
map.put("refen",""); map.put("refen", "");
if(!sailTime.equals(sailTimeTo)){ if (!sailTime.equals(sailTimeTo)) {
map.put("startTime",sailTime); map.put("startTime", sailTime);
int res=sailTime.compareTo(sailTimeTo); int res = sailTime.compareTo(sailTimeTo);
if(res>0){ if (res > 0) {
map.put("ref","，提前至"+sailTimeTo); map.put("ref", "，提前至" + sailTimeTo);
map.put("refen",",will advance at "+sailTimeTo); map.put("refen", ",will advance at " + sailTimeTo);
}else{ } else {
map.put("ref","，推迟至"+sailTimeTo); map.put("ref", "，推迟至" + sailTimeTo);
map.put("refen",",will postpone at "+sailTimeTo); map.put("refen", ",will postpone at " + sailTimeTo);
}
}
try {
String flight = PlanUtil.flightContent(map);
String line = PlanUtil.lineContent(map);
map.put("line", line);
map.put("lineEN", PlanUtil.lineENContent(map));
String en = com.ejweb.core.util.TemplateFactory.generateHtmlFromFtl("template_en_4.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();
} catch (TemplateException e) {
// TODO Auto-generated catch block
e.printStackTrace();
} }
} }
try {
String flight =PlanUtil.flightContent(map);
String line =PlanUtil.lineContent(map);
map.put("line", line);
map.put("lineEN", PlanUtil.lineENContent(map));
String en=com.ejweb.core.util.TemplateFactory.generateHtmlFromFtl("template_en_4.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();
} catch (TemplateException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
}
public static void main(String[] args) {
Map<String, String> map= new HashMap<String, String>();
map.put("s", "s");
map.put("s", "a");
System.out.println(map.get("s"));
}
public static void main(String[] args) {
Map<String, String> map = new HashMap<String, String>();
map.put("s", "s");
map.put("s", "a");
System.out.println(map.get("s"));
}
public VerifiedDetailEntity getVerifed(String verifId) {
AirlineVerifiedDetailBean vbean=new AirlineVerifiedDetailBean(); public VerifiedDetailEntity getVerifed(String verifId) {
vbean.setVerifId(verifId); AirlineVerifiedDetailBean vbean = new AirlineVerifiedDetailBean();
VerifiedDetailEntity entity = verifiedDao.get(vbean); vbean.setVerifId(verifId);
return entity; VerifiedDetailEntity entity = verifiedDao.get(vbean);
} return entity;
}
@Transactional(readOnly = false) @Transactional(readOnly = false)
public void saveRecord(VerifiedUpdateBean bean, VerifiedDetailEntity entity) { public void saveRecord(VerifiedUpdateBean bean, VerifiedDetailEntity entity) {
StringBuilder sb =new StringBuilder(); StringBuilder sb = new StringBuilder();
SimpleDateFormat dateTimeformat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat dateTimeformat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String strBeginDate = dateTimeformat.format(new Date()); String strBeginDate = dateTimeformat.format(new Date());
sb.append(strBeginDate).append(" 发起论证回退<br/>"); sb.append(strBeginDate).append(" 发起论证回退<br/>");
/* // 记录操作履历 /* // 记录操作履历
if(!bean.getStartTime().equals(entity.getStartTime())){ if(!bean.getStartTime().equals(entity.getStartTime())){
sb.append("初始反馈时间由").append(entity.getStartTime()).append("修改为") sb.append("初始反馈时间由").append(entity.getStartTime()).append("修改为")
...@@ -763,36 +751,35 @@ public void saveRecord(VerifiedUpdateBean bean, VerifiedDetailEntity entity) { ...@@ -763,36 +751,35 @@ public void saveRecord(VerifiedUpdateBean bean, VerifiedDetailEntity entity) {
sb.append("截止反馈时间由").append(entity.getEndTime()).append("修改为") sb.append("截止反馈时间由").append(entity.getEndTime()).append("修改为")
.append(bean.getEndTime()).append("<br/>"); .append(bean.getEndTime()).append("<br/>");
}*/ }*/
if(!bean.getSailingDate().equals(entity.getSailingDate())){ if (!bean.getSailingDate().equals(entity.getSailingDate())) {
sb.append("开航时间由").append(entity.getSailingDate()).append("修改为") sb.append("开航时间由").append(entity.getSailingDate()).append("修改为")
.append(bean.getSailingDate()).append("<br/>"); .append(bean.getSailingDate()).append("<br/>");
}
if (StringUtils.isNoneBlank(bean.getRemarks())) {
sb.append("回退信息如下：").append(bean.getRemarks());
}
RecordAddBean addbean = new RecordAddBean();
addbean.setId(IdWorker.getNextId());
addbean.setUserCode(bean.getUserCode());
addbean.setRecordType("05");
addbean.setVerifId(bean.getVerifId());
addbean.setRemarks(sb.toString());
recordDao.insert(addbean);
} }
if(StringUtils.isNoneBlank(bean.getRemarks())){
sb.append("回退信息如下：").append(bean.getRemarks());
}
RecordAddBean addbean = new RecordAddBean();
addbean.setId(IdWorker.getNextId());
addbean.setUserCode(bean.getUserCode());
addbean.setRecordType("05");
addbean.setVerifId(bean.getVerifId());
addbean.setRemarks(sb.toString());
recordDao.insert(addbean);
}
/**
* 将未处理的申请更新为不处理
* @author zhanglg
* @time 2017年1月10日
* @param bean
*/
public void deleteRecordNew(VerifyManageDetailEntity bean) { /**
dao.deleteRecordNew( bean.getId()); * 将未处理的申请更新为不处理
*
} * @param bean
* @author zhanglg
* @time 2017年1月10日
*/
public void deleteRecordNew(VerifyManageDetailEntity bean) {
dao.deleteRecordNew(bean.getId());
}
} }
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