Skip to content

A
api
Commit c4911846 by java-李谡
Options

1.申请单批量删除 

2.市场部不参与调机开航总结
parent 5b8e8f22
Showing with 317 additions and 249 deletions
resources/jdbc.properties
......@@ -3,7 +3,6 @@ db.table.prefix=foc_
jdbc.type=mysql
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://localhost:5508/jd_foc?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull
jdbc.username=sms_develop
jdbc.password=Develop2018!@#
#\u521d\u59cb\u5316\u8fde\u63a5
......
resources/mapper/modules/sailing/SailingConclusionDao.xml
......@@ -70,6 +70,9 @@
<if test="verifType != null and verifType != ''">
AND a.verif_type = #{verifType}
</if>
<if test="includeTuneType != null and includeTuneType != ''">
AND a.verif_type != '05'
</if>
<if test="verifStatus != null and verifStatus != ''">
AND a.verif_status = #{verifStatus}
</if>
......
resources/mapper/modules/verify/VerifyManageDao.xml
......@@ -483,7 +483,10 @@
<update id="updateDelFlag">
UPDATE foc_airline_verify
SET del_flag='1'
WHERE id=#{verifId}
WHERE id in
<foreach collection="list" item="item" index="index" open="(" close=")" separator=",">
#{item}
</foreach>
</update>
<delete id="deleteProcess">
DELETE FROM foc_verify_process
......
src/com/ejweb/modules/sailing/bean/SailingConclusionListBean.java
......@@ -31,6 +31,10 @@ public class SailingConclusionListBean extends GenericBean {
private int pageNo = 1;
private String aircraftType;
private String conclusionStatus = "00";
/**
* 是否包含调机类型
*/
private String includeTuneType;
List arrIataList;
List depIataList;
......@@ -147,4 +151,11 @@ public class SailingConclusionListBean extends GenericBean {
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;
import com.ejweb.core.util.IdWorker;
import com.ejweb.core.util.PlanUtil;
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.dao.NotifyDao;
import com.ejweb.modules.sailing.bean.SailingConclusionDetailBean;
......@@ -27,10 +29,7 @@ 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;
import java.util.*;
/**
* 开航总结表sevice
......@@ -46,8 +45,23 @@ public class SailingConclusionService extends BaseService<SailingConclusionDao>
AirlineVerifyDao verifyDao;
@Autowired
VerifyManageDao manageDao;
@Autowired
DepartDao departDao;
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())) {
bean.setArrIataList(verifyDao.getIataStr(bean.getArrIata()));
......@@ -62,6 +76,7 @@ public class SailingConclusionService extends BaseService<SailingConclusionDao>
} else {
PageHelper.orderBy(bean.getSort());
}
//如果userCode为市场部，查询不包含调机类型的开航总结
pageInfo = new PageInfo<SailingConclusionListEntity>(dao.getList(bean));
// 页码大于总页数，则返回NULL
if (pageInfo.getPages() < bean.getPageNo()) {
......@@ -76,9 +91,10 @@ public class SailingConclusionService extends BaseService<SailingConclusionDao>
entity.setTypeList(verifyDao.getTypeList(entity.getVerifId()));
entity.setConnect(verifyDao.getConnectList(entity.getVerifId()));
String typelist = verifyDao.getTypeList1(entity.getVerifId());
if (StringUtils.isNoneBlank(typelist))
if (StringUtils.isNoneBlank(typelist)) {
entity.setAircraftName(entity.getAircraftName() + ":" + typelist);
}
}
PageEntity<SailingConclusionListEntity> page = new PageEntity<SailingConclusionListEntity>();
page.setPageNo(pageInfo.getPageNum());
page.setPageSize(pageInfo.getPageSize());
......@@ -93,9 +109,10 @@ public class SailingConclusionService extends BaseService<SailingConclusionDao>
for (SailingConclusionListEntity entity : list) {
entity.setDepIataLabel(verifyDao.getConnetList(entity.getVerifId()));
String typelist = verifyDao.getTypeList1(entity.getVerifId());
if (StringUtils.isNoneBlank(typelist))
if (StringUtils.isNoneBlank(typelist)) {
entity.setAircraftName(entity.getAircraftName() + ":" + typelist);
}
}
return list;
}
......@@ -179,12 +196,9 @@ public class SailingConclusionService extends BaseService<SailingConclusionDao>
entity1.setList(ls);
List<String> mails = verifyDao.getmailYK(entity1);
/* List<String> ls=new ArrayList<String>();
ls.add("6e70812e4c874f298da21be2a12aa674");
entity1.setList(ls);
List<String> mails= verifyDao.getmailNew1(entity1);*/
if (mails == null || mails.size() == 0) return;
if (mails == null || mails.size() == 0) {
return;
}
String templateName = "template_8_2.ftl";
Map<String, String> map = verifyDao.getDetail(verifId);
String flight = PlanUtil.flightContent(map);
......
src/com/ejweb/modules/verify/api/VerifyManageController.java
......@@ -114,14 +114,14 @@ public class VerifyManageController {
@RequestMapping("delete")
public ResponseBean delete(RequestBean requestBean) {
ResponseBean responseBean = new ResponseBean();
VerifyManageUpdateBean bean = requestBean.getObjectBean(VerifyManageUpdateBean.class);
VerifyManageUpdateBatchBean bean = requestBean.getObjectBean(VerifyManageUpdateBatchBean.class);
String message = null;
if (bean.getVerifId() == null || "".equals(bean.getVerifId())) {
message = "VerifId 不能为空";
}
if (message == null) {// 通过参数校验
manageService.updateDelFlag(bean.getVerifId());
// airLineVerifyService.delete(bean);
manageService.updateDelFlag(bean);
// airLineVerifyService.delete(bean);
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{
void delete_airline_connect(VerifyManageDeleteBean bean);
void delete_airline_verify2type(VerifyManageDeleteBean bean);
void delete_airline_verified(VerifyManageDeleteBean bean);
void updateDelFlag(String verifId);
void updateDelFlag(List<String> verifyIds);
void deleteProcess(VerifyProcessDeleteBean bean);
......
src/com/ejweb/modules/verify/service/AirlineVerifyService.java
......@@ -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) {
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成功
if (StringUtils.isBlank(bean.getVerifStatus())) {
bean.setVerifStatus("00");
......
src/com/ejweb/modules/verify/service/VerifyManageService.java
......@@ -3,19 +3,6 @@
*/
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.PageEntity;
import com.ejweb.core.util.IdWorker;
......@@ -26,40 +13,28 @@ import com.ejweb.modules.notify.dao.NotifyDao;
import com.ejweb.modules.route.bean.RouteVerifyBean;
import com.ejweb.modules.route.dao.RouteVerifyDao;
import com.ejweb.modules.route.entity.FullRouteVerifyEntity;
import com.ejweb.modules.verify.bean.AirlineVerifiedDetailBean;
import com.ejweb.modules.verify.bean.AirlineVerifyDetailBean;
import com.ejweb.modules.verify.bean.ManageUpdateBean;
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.bean.*;
import com.ejweb.modules.verify.dao.*;
import com.ejweb.modules.verify.entity.*;
import com.ejweb.modules.verify.entity.VerifyManageDetailEntity.AirType;
import com.ejweb.modules.verify.entity.VerifyManageDetailEntity.Connect;
import com.ejweb.modules.verify.entity.VerifyManageDetailEntity.VerifyFile;
import com.ejweb.modules.verify.entity.VerifyManageEntity;
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.text.SimpleDateFormat;
import java.util.*;
/**
*
* @team IT Team
* @author zhanglg
* @version 1.0
* @team IT Team
* @time 2016年9月17日
*/
@Service
......@@ -79,7 +54,8 @@ public class VerifyManageService extends BaseService<VerifyManageDao> {
@Autowired
RecordDao recordDao;
@Autowired
AirlineVerifiedDao verifiedDao ;
AirlineVerifiedDao verifiedDao;
public PageEntity<VerifyManageEntity> findList(VerifyManageBean bean) {
//查询同一机场被屏蔽三字码数据（历史数据关联）
if (StringUtils.isNotEmpty(bean.getArrIata())) {
......@@ -105,13 +81,13 @@ public class VerifyManageService extends BaseService<VerifyManageDao> {
if (list == null || list.size() == 0) {// 如果没有数据则返回NULL
return null;
}
for(VerifyManageEntity entity: list){
for (VerifyManageEntity entity : list) {
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<VerifyManageEntity> page = new PageEntity<VerifyManageEntity>();
page.setPageNo(pageInfo.getPageNum());
......@@ -134,21 +110,25 @@ public class VerifyManageService extends BaseService<VerifyManageDao> {
public List<VerifyManageEntity> findAllList(VerifyManageBean 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){
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
return dao.getConnectList(bean);
}
@Transactional(readOnly = false)
public void delete(String VerifId){
public void delete(String VerifId) {
VerifyManageDeleteBean bean=new VerifyManageDeleteBean();
VerifyManageDeleteBean bean = new VerifyManageDeleteBean();
bean.setVerifId(VerifId);
dao.delete_change_extend(bean);
// dao.delete_verify_record(bean);
......@@ -164,33 +144,36 @@ public class VerifyManageService extends BaseService<VerifyManageDao> {
dao.delete_verify_condition(bean);
}
@Transactional(readOnly = false)
public void delete_verify_file(String verifId, String tableName, String delFlag) {
VerifyManageDeleteBean bean=new VerifyManageDeleteBean();
VerifyManageDeleteBean bean = new VerifyManageDeleteBean();
bean.setDelFlag(delFlag);
bean.setTableName(tableName);
bean.setVerifId(verifId);
dao.delete_verify_file(bean);
}
@Transactional(readOnly = false)
public void delete_airline_connect(String verifId, String tableName, String delFlag) {
VerifyManageDeleteBean bean=new VerifyManageDeleteBean();
VerifyManageDeleteBean bean = new VerifyManageDeleteBean();
bean.setDelFlag(delFlag);
bean.setTableName(tableName);
bean.setVerifId(verifId);
dao.delete_airline_connect(bean);
}
@Transactional(readOnly = false)
public void delete_airline_verify2type(String verifId, String tableName, String delFlag) {
VerifyManageDeleteBean bean=new VerifyManageDeleteBean();
VerifyManageDeleteBean bean = new VerifyManageDeleteBean();
bean.setDelFlag(delFlag);
bean.setTableName(tableName);
bean.setVerifId(verifId);
......@@ -200,43 +183,47 @@ public class VerifyManageService extends BaseService<VerifyManageDao> {
@Transactional(readOnly = false)
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.setTableName(tableName);
bean.setVerifId(verifId);
bean.setDelFlagTo(delFlagTo);
dao.update_verify_file(bean);
}
@Transactional(readOnly = false)
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.setTableName(tableName);
bean.setVerifId(verifId);
bean.setDelFlagTo(delFlagTo);
dao.update_airline_connect(bean);
}
@Transactional(readOnly = false)
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.setTableName(tableName);
bean.setVerifId(verifId);
bean.setDelFlagTo(delFlagTo);
dao.update_airline_verify2type(bean);
}
@Transactional(readOnly = false)
public void updateDelFlag(String verifId) {
dao.updateDelFlag( verifId);
@Transactional(rollbackFor = Exception.class)
public void updateDelFlag(VerifyManageUpdateBatchBean bean) {
List<String> verifyIds = Arrays.asList(bean.getVerifId());
dao.updateDelFlag(verifyIds);
}
@Transactional(readOnly = false)
public void deleteProcess(String verifId, int i) {
VerifyProcessDeleteBean bean =new VerifyProcessDeleteBean();
VerifyProcessDeleteBean bean = new VerifyProcessDeleteBean();
bean.setVerifId(verifId);
bean.setNodeSort(i);
dao.deleteProcess(bean) ;
dao.deleteProcess(bean);
}
......@@ -248,15 +235,16 @@ public class VerifyManageService extends BaseService<VerifyManageDao> {
*/
@Transactional(readOnly = false)
public void updateVerifed(VerifiedUpdateBean bean) {
dao.updateVerifed( bean);
dao.updateVerifed(bean);
}
@Transactional(readOnly = false)
public void updateRoute(String verifId,String verifyStatus) {
RouteVerifyBean bean=new RouteVerifyBean();
public void updateRoute(String verifId, String verifyStatus) {
RouteVerifyBean bean = new RouteVerifyBean();
bean.setVerifId(verifId);
List<FullRouteVerifyEntity> list= routeDao.fullList( bean);
for(FullRouteVerifyEntity entity:list){
List<FullRouteVerifyEntity> list = routeDao.fullList(bean);
for (FullRouteVerifyEntity entity : list) {
//如果VerifyStatus传值了“00”，就说明清空
entity.setVerifyStatus(verifyStatus);
entity.setStatus("0");
......@@ -274,23 +262,23 @@ public class VerifyManageService extends BaseService<VerifyManageDao> {
@Transactional(readOnly = false)
public void sendnotify(VerifyManageDetailEntity bean, String type) {
//发送审核
AirlineVerifyDetailBean verifybean=new AirlineVerifyDetailBean();
AirlineVerifyDetailBean verifybean = new AirlineVerifyDetailBean();
verifybean.setVerifId(bean.getId());
NotifyAddBean addbean=new NotifyAddBean();
StringBuffer sb=new StringBuffer();
Map<String, String> map=verifyDao.getDetail(bean.getId());
if(!map.get("depName").contains("=")){
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 = verifyDao.getDetail(bean.getId());
if (!map.get("depName").contains("=")) {
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")));
}
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("的待审核航线已经被重新编辑，请尽快审核。");
StringBuffer url=new StringBuffer();
if("2".equals(type)){
StringBuffer url = new StringBuffer();
if ("2".equals(type)) {
url.append("<<<a href='wait-review-airway-details.htm?verifId=").append(bean.getId());
url.append("&applyNo=").append(map.get("applyNo"));
}else{
} else {
url.append("<<<a href='message-change-check-details.htm?verifId=").append(bean.getId());
url.append("&verifNo=").append(map.get("verifNo"));
}
......@@ -312,52 +300,54 @@ public class VerifyManageService extends BaseService<VerifyManageDao> {
notifyDao.saveNotify(addbean);
}
public VerifyCountEntity getCount(String userCode){
public VerifyCountEntity getCount(String userCode) {
return dao.getCount(userCode);
}
@Transactional(readOnly = false)
public void updateRecord(VerifyManageDetailEntity bean) {
public void updateRecord(VerifyManageDetailEntity bean) {
dao.updateRecord(bean);
}
/**
/**
* 比较并记录子机型修改
* @author zhanglg
* @time 2016年10月11日
*
* @param entity
* @param type2
* @param type1
* @author zhanglg
* @time 2016年10月11日
*/
@Transactional(readOnly = false)
public VerifyManageAddBean typeChange(VerifyManageDetailEntity entity, String type2, String type1) {
List<AirType> list= entity.getAirTypes();
if(list==null)list=new ArrayList<AirType>();
List<String> list1= verifyDao.getTypeList(entity.getId());
Boolean change=false;
List<AirType> list = entity.getAirTypes();
if (list == null) list = new ArrayList<AirType>();
List<String> list1 = verifyDao.getTypeList(entity.getId());
Boolean change = false;
VerifyManageAddBean add = new VerifyManageAddBean();
List<String> list2= new ArrayList<String>();
for(AirType type :list){
List<String> list2 = new ArrayList<String>();
for (AirType type : list) {
list2.add(type.getTypeId());
}
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;
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;
if (!b) {
change = true;
break;
}
}
......@@ -366,15 +356,15 @@ public void updateRecord(VerifyManageDetailEntity bean) {
}
// 新文件暂存，通过后替换全文件
if (entity.getAirTypes() != null && entity.getAirTypes().size() > 0) {
delete_airline_verify2type(entity.getId(),"foc_airline_verify2type",type1);
delete_airline_verify2type(entity.getId(), "foc_airline_verify2type", type1);
dao.insertAirTypes(entity);
}
if(change){
if (change) {
if(list1.size()>0){
if (list1.size() > 0) {
add.setEditFrom(dao.getTypeName(list1));
}
if(list2.size()>0){
if (list2.size() > 0) {
add.setEditTo(dao.getTypeName(list2));
}
add.setId(IdWorker.getNextId());
......@@ -385,27 +375,28 @@ public void updateRecord(VerifyManageDetailEntity bean) {
add.setFieldValue("TypeList");
add.setDelFlag(type2);
return add;
}else{
} else {
return null;
}
}
/**
/**
* 比较联程数据
* @author zhanglg
* @time 2016年10月11日
*
* @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;
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":
......@@ -446,9 +437,8 @@ public VerifyManageAddBean ConnectChange(VerifyManageDetailEntity entity, String
entity.setConnect(connects);
}
break;
case "05":
{
if ("02".equals(entity.getRoundtripType()) ) {
case "05": {
if ("02".equals(entity.getRoundtripType())) {
List<Connect> connects = new ArrayList<>();
Connect connect = new Connect();
connect.setId(IdWorker.getNextId());
......@@ -502,43 +492,42 @@ public VerifyManageAddBean ConnectChange(VerifyManageDetailEntity entity, String
}
if (entity.getConnect() != null && entity.getConnect().size() > 0) {
delete_airline_connect(entity.getId(),"foc_airline_connect",type1);
delete_airline_connect(entity.getId(), "foc_airline_connect", type1);
dao.insertConnects(entity);
}
if(listconnectbean==null){
listconnectbean=new ArrayList<Connect>();
if (listconnectbean == null) {
listconnectbean = new ArrayList<Connect>();
}
if(listconnectbean.size()!=listconnect.size()){
change=true;
}
else if(listconnectbean.size()!=0){
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){
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;
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;
if (!b) {
change = true;
break;
}
}
}
if(change){
if (change) {
VerifyManageAddBean add = new VerifyManageAddBean();
StringBuffer to=new StringBuffer();
StringBuffer from=new StringBuffer();
for(Connect con:listconnectbean){
if(!"".equals(to.toString())){
StringBuffer to = new StringBuffer();
StringBuffer from = new StringBuffer();
for (Connect con : listconnectbean) {
if (!"".equals(to.toString())) {
to.append("、");
}
......@@ -546,8 +535,8 @@ public VerifyManageAddBean ConnectChange(VerifyManageDetailEntity entity, String
to.append("-").append(dao.getConnectName(con.getArrIata()));
}
for(Map<String,String> map:listconnect){
if(!"".equals(from.toString())){
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")));
......@@ -564,67 +553,68 @@ public VerifyManageAddBean ConnectChange(VerifyManageDetailEntity entity, String
add.setFieldValue("connect");
add.setDelFlag(type);
return add;
}else{
} else {
return null;
}
}
}
/**
/**
* 附件比较
* @author zhanglg
* @time 2016年10月11日
*
* @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();
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){
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();
fileTo = file.getFilePath();
}
for(Map<String, String> map:listd){
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;
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;
if (!b) {
change = true;
break;
}
}
}
// 新文件暂存，通过后替换全文件
if(entity.getVerifyFile()!=null&& (entity.getVerifyFile().size()!=0)){
delete_verify_file(entity.getId(),"foc_verify_file",type1);
if (entity.getVerifyFile() != null && (entity.getVerifyFile().size() != 0)) {
delete_verify_file(entity.getId(), "foc_verify_file", type1);
dao.insertFiles(entity);
}
if(change){
if (change) {
VerifyManageAddBean add = new VerifyManageAddBean();
add.setId(IdWorker.getNextId());
add.setVerifId(entity.getId());
......@@ -640,77 +630,74 @@ public VerifyManageAddBean fileChange(VerifyManageDetailEntity entity, String ty
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) {
VerifyManageDeleteBean bean = new VerifyManageDeleteBean();
bean.setTableName(string);
bean.setVerifId(verifId);
dao.delete_airline_verified(bean);
}
}
public void updateByPrimaryKey(VerifyManageDetailEntity bean) {
public void updateByPrimaryKey(VerifyManageDetailEntity bean) {
dao.updateByPrimaryKey(bean);
}
}
public void updateProcess(VerifyManageDetailEntity bean,Boolean b) {
VerifyProcessUpdateBean beans= recordChDao.getNodeId( bean.getId());
if(beans==null) return;
public void updateProcess(VerifyManageDetailEntity bean, Boolean b) {
VerifyProcessUpdateBean beans = recordChDao.getNodeId(bean.getId());
if (beans == null) return;
beans.setNodeDate(bean.getStartTime());
processDao.update(beans);
if(b){
if (b) {
verifyDao.updateStartTime(beans);
}
}
}
public void sendMailChange(String verifId, String sailTime, String sailTimeTo) {
List<String> ccmails= verifyDao.getmail("4");
MailEntity entity1=new MailEntity();
public void sendMailChange(String verifId, String sailTime, String sailTimeTo) {
List<String> ccmails = verifyDao.getmail("4");
MailEntity entity1 = new MailEntity();
entity1.setType("4");
entity1.setList(verifyDao.getdepartList(verifId));
List<String> mails= verifyDao.getmailNew(entity1);
if(mails==null||mails.size()==0)return;
List<String> mails = verifyDao.getmailNew(entity1);
if (mails == null || mails.size() == 0) return;
String templateName = "template_4.ftl";
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("depIata", PlanUtil.GetLine(map.get("depIata"),map.get("arrIata"),map.get("roundtripType"),map.get("vertype")));
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("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("ref","");
map.put("refen","");
if(!sailTime.equals(sailTimeTo)){
map.put("startTime",sailTime);
int res=sailTime.compareTo(sailTimeTo);
if(res>0){
map.put("ref","，提前至"+sailTimeTo);
map.put("refen",",will advance at "+sailTimeTo);
}else{
map.put("ref","，推迟至"+sailTimeTo);
map.put("refen",",will postpone at "+sailTimeTo);
map.put("ref", "");
map.put("refen", "");
if (!sailTime.equals(sailTimeTo)) {
map.put("startTime", sailTime);
int res = sailTime.compareTo(sailTimeTo);
if (res > 0) {
map.put("ref", "，提前至" + sailTimeTo);
map.put("refen", ",will advance at " + sailTimeTo);
} else {
map.put("ref", "，推迟至" + sailTimeTo);
map.put("refen", ",will postpone at " + sailTimeTo);
}
}
try {
String flight =PlanUtil.flightContent(map);
String line =PlanUtil.lineContent(map);
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);
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();
......@@ -719,26 +706,27 @@ public void sendMailChange(String verifId, String sailTime, String sailTimeTo) {
e.printStackTrace();
}
}
public static void main(String[] args) {
Map<String, String> map= new HashMap<String, String>();
}
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) {
AirlineVerifiedDetailBean vbean = new AirlineVerifiedDetailBean();
vbean.setVerifId(verifId);
VerifiedDetailEntity entity = verifiedDao.get(vbean);
return entity;
}
}
@Transactional(readOnly = false)
public void saveRecord(VerifiedUpdateBean bean, VerifiedDetailEntity entity) {
StringBuilder sb =new StringBuilder();
@Transactional(readOnly = false)
public void saveRecord(VerifiedUpdateBean bean, VerifiedDetailEntity entity) {
StringBuilder sb = new StringBuilder();
SimpleDateFormat dateTimeformat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String strBeginDate = dateTimeformat.format(new Date());
sb.append(strBeginDate).append(" 发起论证回退<br/>");
......@@ -763,12 +751,12 @@ public void saveRecord(VerifiedUpdateBean bean, VerifiedDetailEntity entity) {
sb.append("截止反馈时间由").append(entity.getEndTime()).append("修改为")
.append(bean.getEndTime()).append("<br/>");
}*/
if(!bean.getSailingDate().equals(entity.getSailingDate())){
if (!bean.getSailingDate().equals(entity.getSailingDate())) {
sb.append("开航时间由").append(entity.getSailingDate()).append("修改为")
.append(bean.getSailingDate()).append("<br/>");
}
if(StringUtils.isNoneBlank(bean.getRemarks())){
if (StringUtils.isNoneBlank(bean.getRemarks())) {
sb.append("回退信息如下：").append(bean.getRemarks());
}
RecordAddBean addbean = new RecordAddBean();
......@@ -778,21 +766,20 @@ public void saveRecord(VerifiedUpdateBean bean, VerifiedDetailEntity entity) {
addbean.setVerifId(bean.getVerifId());
addbean.setRemarks(sb.toString());
recordDao.insert(addbean);
}
}
/**
/**
* 将未处理的申请更新为不处理
*
* @param bean
* @author zhanglg
* @time 2017年1月10日
* @param bean
*/
public void deleteRecordNew(VerifyManageDetailEntity bean) {
dao.deleteRecordNew( bean.getId());
}
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