1.申请单批量删除

2.市场部不参与调机开航总结

resources/mapper/modules/sailing/SailingConclusionDao.xml

@@ -70,9 +70,6 @@
 		<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/AirlineVerifyDao.xml

@@ -104,7 +104,6 @@
         WHERE
         a.del_flag = #{DEL_FLAG_NORMAL}
         AND a.id = #{verifId}
-        <!-- AND a.depart_id = (SELECT depart_id FROM sys_user_profiles  WHERE user_id = #{userCode}) -->
     </select>
 
     <select id="getConnectList" resultType="Map">

resources/mapper/modules/verify/VerifyManageDao.xml

@@ -114,7 +114,7 @@
             </when>
         </choose>
         AND a.depart_id = (SELECT depart_id FROM sys_user_profiles WHERE user_id = #{userCode})
-
+        order by a.update_date desc
     </select>
     <select id="detail" resultType="com.ejweb.modules.verify.entity.VerifyManageDetailEntity">
         SELECT

src/com/ejweb/modules/sailing/service/SailingCommandService.java

@@ -98,9 +98,10 @@ public class SailingCommandService extends CurdService<SailingCommandDao, Sailin
         PageHelper.startPage(bean.getPageNo(), bean.getPageSize());
         if (StringUtils.isEmpty(bean.getSort())) {
             PageHelper.orderBy(" verifNo DESC");
-        } else
+        } else {
             PageHelper.orderBy(bean.getSort());
-        pageInfo = new PageInfo<SailingCommandEntity>(dao.getList(bean));
+        }
+        pageInfo = new PageInfo<>(dao.getList(bean));
 
         if (pageInfo.getPages() < bean.getPageNo()) {// 页码大于总页数，则返回NULL
             return null;

src/com/ejweb/modules/sailing/service/SailingConclusionService.java

@@ -49,19 +49,6 @@ public class SailingConclusionService extends BaseService<SailingConclusionDao>
     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()));
@@ -76,8 +63,7 @@ public class SailingConclusionService extends BaseService<SailingConclusionDao>
         } else {
             PageHelper.orderBy(bean.getSort());
         }
-        //如果userCode为市场部，查询不包含调机类型的开航总结
-        pageInfo = new PageInfo<SailingConclusionListEntity>(dao.getList(bean));
+        pageInfo = new PageInfo<>(dao.getList(bean));
         // 页码大于总页数，则返回NULL
         if (pageInfo.getPages() < bean.getPageNo()) {
             return null;
@@ -211,10 +197,8 @@ public class SailingConclusionService extends BaseService<SailingConclusionDao>
             String title = "首都航空关于" + flight;
             VerifyEmailHandler.getInstance().sendEmail(title + "的市场部开航总结完成提示（智能首航论证系统提示）", 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();
         }
 

src/com/ejweb/modules/verify/api/AirlineConclusionController.java

@@ -110,7 +110,7 @@ public class AirlineConclusionController {
     /**
      * 更新评估总结状态
      *
-     * @param requestBean
+     * @param request
      * @return
      */
     @ResponseBody
@@ -120,14 +120,14 @@ public class AirlineConclusionController {
         RequestBean requestBean = new RequestBean();
         String content = request.getParameter("content");
         String sign = request.getParameter("sign");
-        //  String formText=request.getParameter("formText");
 
         requestBean.setContent(content);
         requestBean.setSign(sign);
         AirlineConclusionUpdateBean bean = requestBean.getObjectBean(AirlineConclusionUpdateBean.class);
-        //   bean.setFormText(formText);
         String message = airlineConclusionService.validate(bean);
-        if (message == null) {// 通过参数校验
+        Date date = new Date();
+        // 通过参数校验
+        if (message == null) {
             airlineConclusionService.update(bean);
             if ("1".equals(bean.getStatus()) && "02".equals(bean.getConclusionStatus())) {
                 VerifyProcessAddBean bean1 = new VerifyProcessAddBean();
@@ -135,8 +135,8 @@ public class AirlineConclusionController {
                 bean1.setProcessValue("airline_conclusion");
                 bean1.setVerifId(bean.getVerifId());
                 SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
-                bean1.setNodeDate(format.format(new Date()));
-                bean1.setProcessDate(format.format(new Date()));
+                bean1.setNodeDate(format.format(date));
+                bean1.setProcessDate(format.format(date));
                 bean1.setNodeName("论证总结");
                 bean1.setNodeSort(7);
                 verifyProcessService.add(bean1);

src/com/ejweb/modules/verify/api/VerifyManageController.java

@@ -69,9 +69,11 @@ public class VerifyManageController {
         ResponseBean responseBean = new ResponseBean();
         VerifyManageBean bean = requestBean.getObjectBean(VerifyManageBean.class);
         String message = manageService.validate(bean);
-        if (message == null) {// 通过参数校验
+        // 通过参数校验
+        if (message == null) {
             PageEntity<VerifyManageEntity> list = manageService.findList(bean);
-            if (list == null) {// 查询结果为空
+            // 查询结果为空
+            if (list == null) {
                 responseBean.setMessage(GConstants.EMPTY);
                 responseBean.setStatus(ErrorCode.STATUS_CODE_2001);
                 return responseBean;

src/com/ejweb/modules/verify/dao/VerifyManageDao.java

@@ -3,56 +3,68 @@
  */
 package com.ejweb.modules.verify.dao;
 
-import java.util.List;
-import java.util.Map;
-
 import com.ejweb.core.base.BaseDao;
-import com.ejweb.modules.verify.bean.ManageUpdateBean;
-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.*;
 import com.ejweb.modules.verify.entity.VerifyCountEntity;
 import com.ejweb.modules.verify.entity.VerifyManageDetailEntity;
 import com.ejweb.modules.verify.entity.VerifyManageEntity;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
 
 /**
- * 
- * @team IT Team
  * @author zhanglg
  * @version 1.0
+ * @team IT Team
  * @time 2016年9月17日
  */
 
-public interface VerifyManageDao  extends BaseDao{
+public interface VerifyManageDao extends BaseDao {
 
     List<VerifyManageEntity> findList(VerifyManageBean bean);
 
     VerifyManageDetailEntity detail(VerifyManageDetailEntity bean);
 
     void insert(List<VerifyManageAddBean> list);
+
     List<VerifyManageEntity> findAllList(VerifyManageBean bean);
 
 
-    List<Map<String,String>> getConnectList(VerifyManageDetailEntity bean);
-   // void delete(VerifyManageDeleteBean bean);
+    List<Map<String, String>> getConnectList(VerifyManageDetailEntity bean);
+
     void delete_change_extend(VerifyManageDeleteBean bean);
+
     void delete_verify_record(VerifyManageDeleteBean bean);
+
     void delete_production_feedback(VerifyManageDeleteBean bean);
+
     void delete_production_command(VerifyManageDeleteBean bean);
+
     void delete_sailing_file(VerifyManageDeleteBean bean);
+
     void delete_sailing_command(VerifyManageDeleteBean bean);
+
     void delete_sailingcc_file(VerifyManageDeleteBean bean);
+
     void delete_sailing_conclusion(VerifyManageDeleteBean bean);
+
     void delete_conclusion_file(VerifyManageDeleteBean bean);
+
     void delete_airline_conclusion(VerifyManageDeleteBean bean);
+
     void delete_condition_feedback(VerifyManageDeleteBean bean);
+
     void delete_verify_condition(VerifyManageDeleteBean bean);
+
     void update_risk_assessment(VerifyManageDeleteBean bean);
+
     void delete_verify_file(VerifyManageDeleteBean bean);
+
     void delete_airline_connect(VerifyManageDeleteBean bean);
+
     void delete_airline_verify2type(VerifyManageDeleteBean bean);
+
     void delete_airline_verified(VerifyManageDeleteBean bean);
 
     void updateDelFlag(List<String> verifyIds);
@@ -66,6 +78,7 @@ public interface VerifyManageDao  extends BaseDao{
     void deleteRiskFile(String verifId);
 
     void deleteRouteFile(String verifId);
+
     VerifyCountEntity getCount(String userCode);
 
     void deleteChange(String verifId);
@@ -87,21 +100,22 @@ public interface VerifyManageDao  extends BaseDao{
 
     // void updateCheck(ManageUpdateBean bean);
     void update_verify_file(ManageUpdateBean bean);
+
     void update_airline_connect(ManageUpdateBean bean);
+
     void update_airline_verify2type(ManageUpdateBean bean);
+
     void updateByPrimaryKey(VerifyManageDetailEntity bean);
 
     /**
      * 删除未审核记录
+     *
+     * @param verifId
      * @author zhanglg
      * @time 2017年1月10日
-     * @param verifId
      */
 
     void deleteRecordNew(String verifId);
 
 
-
-    
-
 }

src/com/ejweb/modules/verify/service/AirlineConclusionService.java

 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.List;
-import java.util.Map;
-import java.util.Optional;
-
-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;
-import com.ejweb.core.util.VerifyEmailHandler;
 import com.ejweb.core.util.PlanUtil;
+import com.ejweb.core.util.VerifyEmailHandler;
 import com.ejweb.modules.notify.bean.NotifyAddBean;
 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.route.entity.RouteVerifyEntity;
-import com.ejweb.modules.verify.bean.AirlineConclusionDetailBean;
-import com.ejweb.modules.verify.bean.AirlineConclusionListBean;
-import com.ejweb.modules.verify.bean.AirlineConclusionUpdateBean;
-import com.ejweb.modules.verify.bean.AirlineVerifyDetailBean;
-import com.ejweb.modules.verify.bean.ConclusionBackBean;
-import com.ejweb.modules.verify.bean.ConclusionFileBean;
-import com.ejweb.modules.verify.bean.RecordAddBean;
-import com.ejweb.modules.verify.bean.VerifyManageDeleteBean;
-import com.ejweb.modules.verify.bean.VerifyProcessDeleteBean;
-import com.ejweb.modules.verify.dao.AirlineConclusionDao;
-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.sailing.bean.SailingConclusionUpdateBean;
+import com.ejweb.modules.sailing.service.SailingConclusionService;
+import com.ejweb.modules.verify.bean.*;
+import com.ejweb.modules.verify.dao.*;
 import com.ejweb.modules.verify.entity.AirlineConclusionDetailEntity;
 import com.ejweb.modules.verify.entity.AirlineConclusionListEntity;
+import com.ejweb.modules.verify.entity.AirlineVerifyDetailEntity;
 import com.ejweb.modules.verify.entity.MailEntity;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-
 import freemarker.template.TemplateException;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 /**
  * 论证总结service
- * @author lyw
  *
+ * @author lyw
  */
 @Service
 public class AirlineConclusionService extends BaseService<AirlineConclusionDao> {
@@ -59,14 +43,18 @@ public class AirlineConclusionService extends BaseService<AirlineConclusionDao>
     @Autowired
     private AirlineVerifyDao verifyDao;
     @Autowired
-    AirlineVerifiedDao verifiedDao ;
+    AirlineVerifiedDao verifiedDao;
     @Autowired
     RouteVerifyDao routeDao;
     @Autowired
     VerifyManageDao manageDao;
-    
+    @Autowired
+    private SailingConclusionService sailingConclusionService;
+    @Autowired
+    private VerifyProcessService verifyProcessService;
     @Autowired
     RecordDao recordDao;
+
     public PageEntity<AirlineConclusionListEntity> getList(AirlineConclusionListBean bean) {
         //查询同一机场被屏蔽三字码数据（历史数据关联）
         if (StringUtils.isNotEmpty(bean.getArrIata())) {
@@ -108,113 +96,45 @@ public class AirlineConclusionService extends BaseService<AirlineConclusionDao>
     }
 
     public List<AirlineConclusionListEntity> getListAll(AirlineConclusionListBean bean) {
-        List<AirlineConclusionListEntity>  list= dao.getList(bean);
-        for(AirlineConclusionListEntity entity: list){
+        List<AirlineConclusionListEntity> list = dao.getList(bean);
+        for (AirlineConclusionListEntity entity : list) {
 
             entity.setDepIataLabel(verifyDao.getConnetList(entity.getVerifId()));
-            String typelist=verifyDao.getTypeList1(entity.getVerifId());
-            if(StringUtils.isNoneBlank(typelist))
-                entity.setAircraftLabel(entity.getAircraftLabel()+":"+typelist);
+            String typelist = verifyDao.getTypeList1(entity.getVerifId());
+            if (StringUtils.isNoneBlank(typelist)) {
+                entity.setAircraftLabel(entity.getAircraftLabel() + ":" + typelist);
+            }
             entity.setDepIataLabel(verifyDao.getConnetList(entity.getVerifId()));
         }
         return list;
     }
 
     public AirlineConclusionDetailEntity get(AirlineConclusionDetailBean bean) {
-        AirlineConclusionDetailEntity entity= dao.get(bean);
-        if(entity!=null){
+        AirlineConclusionDetailEntity entity = dao.get(bean);
+        if (entity != null) {
             entity.setHistory(verifyDao.getHistoryList(entity.getId()));
             entity.setVerifList(routeDao.veriflist(bean.getVerifId()));
-/*            if(entity.getFormText()==null||"".equals(entity.getFormText())){
-                VerifyFormBean detailbean=new VerifyFormBean();
-                detailbean.setVerifId(bean.getVerifId());
-                detailbean.setFormType("04");
-                detailbean.setUserCode(bean.getUserCode());
-                List<VerifyFormEntity> lists=verifyDao.getVerifyForm(detailbean);
-                if(lists.size() == 0){
-                  return null;   
-                }else {
-                    VerifyFormEntity airlineVerifiedEntity = lists.get(0);
-                    entity.setFormId(airlineVerifiedEntity.getFormId());
-                    entity.setFormText(airlineVerifiedEntity.getFormText());
         }
-            }*/
-        }
-      
-       
         return entity;
     }
 
-    @Transactional
+    //    @Transactional(rollbackFor = Exception.class)
     public void update(AirlineConclusionUpdateBean bean) {
         bean.setSailingConclusionId(IdWorker.getNextId());
-       // int update = dao.update(bean);
-      //  if (update == 1) { // 更新了相关数据
-        // 提交时生成生成论证总结单
-            if("1".equals(bean.getStatus())){
-          /*      //生成论证总结单
-                if(bean.getFormText()!=null&&!"".equals(bean.getFormText())){
-                     
-                           try {
-                               //String formtext= bean.getFormText();
-                              // List<Map<String,String>> list=routeDao.veriflist(bean.getVerifId());
-                             StringBuffer sb=new StringBuffer();
-                             sb.append(bean.getFormText());
-                             sb.append("<br>");
-                             sb.append("<table width=\"60%\" border=\"0\" cellpadding=\"2\" cellspacing=\"1\">");
-                             sb.append("<tr>").append("<th>部门名称</th>").append("<th>论证意见</th>").append("<th>论证条件总结</th>").append("</tr>");
-                               for(Map<String,String> map:routeDao.veriflist(bean.getVerifId())){
-                                   sb.append("<tr>");
-                                   sb.append("<td>").append(map.get("departName")).append("</td>");
-                                   sb.append("<td>").append(map.get("label")).append("</td>");
-                                   if("04".equals(map.get("verifyStatus"))){
-                                       sb.append("<td>").append(map.get("condition")).append("</td>");
-                                   }else{
-                                       sb.append("<td></td>");
-                                   }
-                                   
-                                   sb.append("</tr>");
-                               }
-                               sb.append("</table>");
-                               UploadFileBean uploadFileBean = Html2File.convertHtml2Word(sb.toString());
-                               ConclusionFileBean conclusionBean=new ConclusionFileBean();
-                               conclusionBean.setId(IdWorker.getNextId());
-                               conclusionBean.setFileName("论证总结单.doc");
-                               conclusionBean.setExtesion(uploadFileBean.getExtesion());
-                               conclusionBean.setMd5(uploadFileBean.getMd5());
-                               conclusionBean.setFilePath(uploadFileBean.getPath());
-                               conclusionBean.setFileSize(String.valueOf(uploadFileBean.getSize()) );
-                               conclusionBean.setVerifId(bean.getVerifId());
-                               conclusionBean.setCreateBy(bean.getUserCode());
-                               //dao.deleteRouteFile(routeFileBean);
-                               dao.insertConclusionFile(conclusionBean);
-                           } catch (Exception e) {
-                               // TODO Auto-generated catch block
-                               e.printStackTrace();
-                           }
-                          
-             
-                 }*/
-            }
         // 总结通过
-            if ("02".equals(bean.getConclusionStatus())&&"1".equals(bean.getStatus())) {
-               
-                AirlineVerifyDetailBean verifybean=new AirlineVerifyDetailBean();
+        if ("02".equals(bean.getConclusionStatus()) && "1".equals(bean.getStatus())) {
+            AirlineVerifyDetailBean verifybean = new AirlineVerifyDetailBean();
             verifybean.setVerifId(bean.getVerifId());
-               // AirlineVerifyDetailEntity VerifyDetailEntity=verifyDao.get(verifybean);
-
-      
             //发送开航总结提醒
-
-                NotifyAddBean addbean=new NotifyAddBean();
-                StringBuffer sb=new StringBuffer();
-                Map<String, String> map=verifyDao.getDetail(bean.getVerifId());
-                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.getVerifId());
+            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("verifNo"))
                     .append(map.get("verifType")).append(map.get("depName"))
                     .append("的航线进入到开航总结阶段，请尽快填写。");
-                StringBuffer url=new StringBuffer();
+            StringBuffer url = new StringBuffer();
             url.append("<<<a href='sail-sum-details.htm?verifId=").append(bean.getVerifId());
             url.append("&verifNo=").append(map.get("verifNo"));
             url.append("'>点击查看</a>");
@@ -230,10 +150,9 @@ public class AirlineConclusionService extends BaseService<AirlineConclusionDao>
             addbean.setVerifId(bean.getVerifId());
             addbean.setConId(bean.getVerifId());
             addbean.setDepartId("6e70812e4c874f298da21be2a12aa674");//市场部
-               
             notifyDao.saveNotify(addbean);
             // 完成审核通知置灰
-                NotifyAddBean addbean1=new NotifyAddBean();
+            NotifyAddBean addbean1 = new NotifyAddBean();
             addbean1.setVerifId(bean.getVerifId());
             addbean1.setType("8");
             notifyDao.NotifyComplete(addbean1);
@@ -242,154 +161,175 @@ public class AirlineConclusionService extends BaseService<AirlineConclusionDao>
             // 开始下发开航指令阶段
             int num = dao.getSailingConclusionCountByVerifId(bean);
             if (num == 0) { // 如果已经存在数据
-              
                 dao.insertSailingConclusion(bean);
             }
-            } else if (bean.getConclusionStatus().equals("03")&&"1".equals(bean.getStatus())) {
+        } else if (bean.getConclusionStatus().equals("03") && "1".equals(bean.getStatus())) {
             dao.updateAirlineVerify(bean);
-                if(StringUtils.isEmpty(bean.getLimitCondition())&&StringUtils.isEmpty(bean.getRouteType())&&StringUtils.isEmpty(bean.getPeopleCount())){
+            if (StringUtils.isEmpty(bean.getLimitCondition()) && StringUtils.isEmpty(bean.getRouteType()) && StringUtils.isEmpty(bean.getPeopleCount())) {
 
-                }else{
+            } else {
                 dao.updateXZRS(bean);
             }
-               
         }
-            Boolean b=true;
-            List<Map<String,String>> list = bean.getConclusionFile();
-            for (Map<String,String> m : list) {
-                ConclusionFileBean conclusionBean=new ConclusionFileBean();
 
+        Boolean b = true;
+        List<Map<String, String>> list = bean.getConclusionFile();
+        for (Map<String, String> m : list) {
+            ConclusionFileBean conclusionBean = new ConclusionFileBean();
             conclusionBean.setId(IdWorker.getNextId());
             conclusionBean.setFileName(m.get("fileName"));
-               
-             
             conclusionBean.setFilePath(m.get("filePath"));
-                conclusionBean.setFileSize(String.valueOf(m.get("fileSize")) );
+            conclusionBean.setFileSize(String.valueOf(m.get("fileSize")));
             conclusionBean.setVerifId(bean.getVerifId());
             conclusionBean.setCreateBy(bean.getUserCode());
-                if(b){
+            if (b) {
                 dao.deleteConclusionFile(conclusionBean);
-                    b=false;
+                b = false;
             }
-                
             dao.insertConclusionFile(conclusionBean);
         }
         //更新论证状态及表单
-
         dao.updateSailingConclusion(bean);
-
+        //如果论证类型是05（调机），那么直接到生成开航指令
+        AirlineVerifyDetailBean detailBean = new AirlineVerifyDetailBean();
+        detailBean.setVerifId(bean.getVerifId());
+        AirlineVerifyDetailEntity detailEntity = verifyDao.get(detailBean);
+        if (Objects.isNull(detailEntity)) {
+            return;
+        }
+        if ("05".equals(detailEntity.getVerifType())) {
+            SailingConclusionUpdateBean updateBean = new SailingConclusionUpdateBean();
+            updateBean.setConclusionStatus("01");
+            updateBean.setRouteType("01");
+            updateBean.setVerifId(bean.getVerifId());
+            updateBean.setUserCode(bean.getUserCode());
+            sailingConclusionService.update(updateBean);
+            //开航总结后，则记录时间节点
+            if (bean.getConclusionStatus().equals("01")) {
+                VerifyProcessAddBean bean1 = new VerifyProcessAddBean();
+                bean1.setUserCode(bean.getUserCode());
+                bean1.setProcessValue("sailing_conclusion");
+                bean1.setVerifId(bean.getVerifId());
+                SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+                bean1.setNodeDate(format.format(new Date()));
+                bean1.setProcessDate(format.format(new Date()));
+                bean1.setNodeName("开航总结时间");
+                bean1.setNodeSort(8);
+                verifyProcessService.add(bean1);
+            }
+        }
 
     }
 
 
     public List<Map<String, String>> getVerifyFile(AirlineConclusionDetailBean bean) {
 
-        return dao.getVerifyFile( bean);
+        return dao.getVerifyFile(bean);
     }
 
     /**
-     * 
+     * @param verifId
      * @author zhanglg
      * @time 2016年10月26日
-     * @param verifId
      */
 
     public void sendMail(String verifId) {
-       List<String> ccmails=  verifyDao.getmail("8_1");
-        MailEntity entity1=new MailEntity();
+        List<String> ccmails = verifyDao.getmail("8_1");
+        MailEntity entity1 = new MailEntity();
         entity1.setType("8_1");
-        List<String> ls=new ArrayList<String>();
+        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;
+        List<String> mails = verifyDao.getmailNew1(entity1);
+        if (mails == null || mails.size() == 0) {
+            return;
+        }
         String templateName = "template_8_1.ftl";
-        Map<String, String> map=verifyDao.getDetail(verifId);
-        String flight =PlanUtil.flightContent(map);
-        String line =PlanUtil.lineContent(map);
+        Map<String, String> map = verifyDao.getDetail(verifId);
+        String flight = PlanUtil.flightContent(map);
+        String line = PlanUtil.lineContent(map);
         map.put("line", line);
-        map.put("depName", PlanUtil.GetLine(map.get("depName"),map.get("arrName"),map.get("roundtripType"),map.get("vertype")));
-        map.put("depIata", PlanUtil.GetLine(map.get("depIata"),map.get("arrIata"),map.get("roundtripType"),map.get("vertype")));
+        map.put("depName", PlanUtil.GetLine(map.get("depName"), map.get("arrName"), map.get("roundtripType"), map.get("vertype")));
+        map.put("depIata", PlanUtil.GetLine(map.get("depIata"), map.get("arrIata"), map.get("roundtripType"), map.get("vertype")));
         map.put("url", "https://ifos.jdair.net/im/login");
         try {
-            String  title="首都航空关于"+flight;
-            VerifyEmailHandler.getInstance().sendEmail(title+"的论证总结完成提示（智能首航论证系统提示）", com.ejweb.core.util.TemplateFactory.generateHtmlFromFtl(templateName, map), mails,ccmails);
+            String title = "首都航空关于" + flight;
+            VerifyEmailHandler.getInstance().sendEmail(title + "的论证总结完成提示（智能首航论证系统提示）", 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 void sendMailCancel(String verifId) {
-       List<String> ccmails=  verifyDao.getmail("5");
-        MailEntity entity1=new MailEntity();
+        List<String> ccmails = verifyDao.getmail("5");
+        MailEntity entity1 = new MailEntity();
         entity1.setType("5");
         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_5.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");
         try {
-            String en="";
+            String en = "";
             try {
-                 en=com.ejweb.core.util.TemplateFactory.generateHtmlFromFtl("template_en_5.ftl", map); 
+                en = com.ejweb.core.util.TemplateFactory.generateHtmlFromFtl("template_en_5.ftl", map);
             } catch (Exception e) {
-                // TODO: handle exception
             }
-            
-            String  title="首都航空关于使用"+map.get("aircraftLabel")+"机型"
-                    +map.get("verifType")+map.get("depName")+"航线";
-            VerifyEmailHandler.getInstance().sendEmail(title+"的论证取消信息提示（S-FOC论证系统提示）", en+com.ejweb.core.util.TemplateFactory.generateHtmlFromFtl(templateName, map), mails,ccmails);
+            String title = "首都航空关于使用" + map.get("aircraftLabel") + "机型"
+                    + map.get("verifType") + map.get("depName") + "航线";
+            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();
         }
 
     }
 
     /**
-     * 
+     * @param verifId
      * @author zhanglg
      * @time 2017年2月22日
-     * @param verifId
      */
 
     public String getFromText(String verifId) {
-        RouteVerifyBean routebean=new RouteVerifyBean();
+        RouteVerifyBean routebean = new RouteVerifyBean();
         routebean.setVerifId(verifId);
-        List<RouteVerifyEntity> list= routeDao.findlist(routebean);
-        StringBuffer sb=new StringBuffer();
+        List<RouteVerifyEntity> list = routeDao.findlist(routebean);
+        StringBuffer sb = new StringBuffer();
 
-        for(RouteVerifyEntity route : list){
-            String text=route.getFormText().replaceAll("<table","<table width=\"80%\" ");
-             text=text.replaceAll("100%","80%");
+        for (RouteVerifyEntity route : list) {
+            String text = route.getFormText().replaceAll("<table", "<table width=\"80%\" ");
+            text = text.replaceAll("100%", "80%");
             sb.append(text);
 
             sb.append("<table width=\"80%\"><tr>");
             sb.append("<td height=\"104\" width=\"197\">论证意见</td>");
             sb.append("<td>");
-            switch(route.getVerifyStatus()){
-            case "00": sb.append("无意见");
+            switch (route.getVerifyStatus()) {
+                case "00":
+                    sb.append("无意见");
                     break;
-            case "01": sb.append("可行");
+                case "01":
+                    sb.append("可行");
                     break;
-            case "02": sb.append("不可行");
+                case "02":
+                    sb.append("不可行");
                     break;
-            case "03": sb.append("条件可行");
+                case "03":
+                    sb.append("条件可行");
                     break;
-            case "04": sb.append("条件满足");
+                case "04":
+                    sb.append("条件满足");
                     break;
             }
             // sb.append(route.getVerifyStatus());
@@ -405,26 +345,25 @@ public class AirlineConclusionService extends BaseService<AirlineConclusionDao>
     }
 
     /**
-     * 
-     * @author zhanglg
-     * @time  2017年3月6日
      * @param verifId
      * @return
+     * @author zhanglg
+     * @time 2017年3月6日
      */
 
     public String getFileName(String 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("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")));
 
 
-        StringBuffer sb=new StringBuffer();
+        StringBuffer sb = new StringBuffer();
         sb.append("首都航空使用");
         sb.append(map.get("aircraftLabel"));
         sb.append("机型");
         sb.append(map.get("typeName"));
         sb.append("开");
-        sb.append( map.get("depName"));
+        sb.append(map.get("depName"));
         sb.append("航线");
         sb.append(map.get("verifNo"));
         sb.append("单号论证单");
@@ -435,21 +374,21 @@ public class AirlineConclusionService extends BaseService<AirlineConclusionDao>
 
     public void updateBack(ConclusionBackBean bean) {
         // 删除节点
-        VerifyProcessDeleteBean pbean=new VerifyProcessDeleteBean();
+        VerifyProcessDeleteBean pbean = new VerifyProcessDeleteBean();
         pbean.setVerifId(bean.getVerifId());
         pbean.setNodeSort(7);
         manageDao.deleteProcessByNodeSort(pbean);
         // 退回部门论证
-        RouteVerifyBean beans=new RouteVerifyBean();
+        RouteVerifyBean beans = new RouteVerifyBean();
         beans.setVerifId(bean.getVerifId());
-        List<FullRouteVerifyEntity> list= routeDao.fullList( beans);
-        Date date=new Date();
-        StringBuilder departNames=new StringBuilder();
-        Map<String,String> map1= bean.getDepartIds().get(0);
-        String departId=map1.get("departId");
-        Optional<FullRouteVerifyEntity> ee =list.stream()
+        List<FullRouteVerifyEntity> list = routeDao.fullList(beans);
+        Date date = new Date();
+        StringBuilder departNames = new StringBuilder();
+        Map<String, String> map1 = bean.getDepartIds().get(0);
+        String departId = map1.get("departId");
+        Optional<FullRouteVerifyEntity> ee = list.stream()
                 .filter(e -> e.getDepartId().equals(departId)).findFirst();
-        bean.getDepartIds().forEach(map->{
+        bean.getDepartIds().forEach(map -> {
             FullRouteVerifyEntity entity = list.stream()
                     .filter(e -> e.getDepartId().equals(map.get("departId")))
                     .findFirst().get();
@@ -463,17 +402,17 @@ public class AirlineConclusionService extends BaseService<AirlineConclusionDao>
             routeDao.updateByPrimaryKey(entity);
         });
         // 删除论证总结
-        VerifyManageDeleteBean delbean=new VerifyManageDeleteBean();
+        VerifyManageDeleteBean delbean = new VerifyManageDeleteBean();
         delbean.setVerifId(bean.getVerifId());
         manageDao.delete_airline_conclusion(delbean);
 
-        StringBuilder sb =new StringBuilder();
+        StringBuilder sb = new StringBuilder();
         SimpleDateFormat dateTimeformat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         String strBeginDate = dateTimeformat.format(date);
         sb.append(strBeginDate).append(" 发起论证回退<br/>");
         sb.append(" 回退部门:");
         sb.append(departNames).append("<br/>");
-        if(StringUtils.isNoneBlank(bean.getBackRemarks())){
+        if (StringUtils.isNoneBlank(bean.getBackRemarks())) {
             sb.append("回退信息如下：").append(bean.getBackRemarks());
         }
         RecordAddBean addbean = new RecordAddBean();

src/com/ejweb/modules/verify/service/VerifyManageService.java

@@ -8,6 +8,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.route.bean.RouteVerifyBean;
@@ -55,6 +57,8 @@ public class VerifyManageService extends BaseService<VerifyManageDao> {
     RecordDao recordDao;
     @Autowired
     AirlineVerifiedDao verifiedDao;
+    @Autowired
+    DepartDao departDao;
 
     public PageEntity<VerifyManageEntity> findList(VerifyManageBean bean) {
         //查询同一机场被屏蔽三字码数据（历史数据关联）
@@ -72,13 +76,14 @@ public class VerifyManageService extends BaseService<VerifyManageDao> {
         } else {
             PageHelper.orderBy(bean.getSort());
         }
-        pageInfo = new PageInfo<VerifyManageEntity>(dao.findList(bean));
-
-        if (pageInfo.getPages() < bean.getPageNo()) {// 页码大于总页数，则返回NULL
+        pageInfo = new PageInfo<>(dao.findList(bean));
+        // 页码大于总页数，则返回NULL
+        if (pageInfo.getPages() < bean.getPageNo()) {
             return null;
         }
         List<VerifyManageEntity> list = pageInfo.getList();
-        if (list == null || list.size() == 0) {// 如果没有数据则返回NULL
+        // 如果没有数据则返回NULL
+        if (list == null || list.size() == 0) {
             return null;
         }
         for (VerifyManageEntity entity : list) {
@@ -86,9 +91,10 @@ public class VerifyManageService extends BaseService<VerifyManageDao> {
             entity.setConnect(verifyDao.getConnectList(entity.getVerifId()));
             entity.setDepName(verifyDao.getConnetList(entity.getVerifId()));
             String typelist = verifyDao.getTypeList1(entity.getVerifId());
-            if (StringUtils.isNoneBlank(typelist))
+            if (StringUtils.isNoneBlank(typelist)) {
                 entity.setAircraftName(entity.getAircraftName() + ":" + typelist);
             }
+        }
         PageEntity<VerifyManageEntity> page = new PageEntity<VerifyManageEntity>();
         page.setPageNo(pageInfo.getPageNum());
         page.setPageSize(pageInfo.getPageSize());
@@ -98,7 +104,7 @@ public class VerifyManageService extends BaseService<VerifyManageDao> {
         return page;
     }
 
-    @Transactional(readOnly = false)
+    @Transactional(rollbackFor = Exception.class)
     public void insert(List<VerifyManageAddBean> list) {
         dao.insert(list);
     }
@@ -115,23 +121,23 @@ public class VerifyManageService extends BaseService<VerifyManageDao> {
         return dao.verifiedStatus(verifid);
     }
 
-    // 删除之前未审核记录
+    /**
+     * 删除之前未审核记录
+     */
     public void deleteChange(String verifId) {
         dao.deleteChange(verifId);
     }
 
     public List<Map<String, String>> getConnect(VerifyManageDetailEntity bean) {
-        // TODO Auto-generated method stub
         return dao.getConnectList(bean);
     }
 
-    @Transactional(readOnly = false)
+    @Transactional(rollbackFor = Exception.class)
     public void delete(String VerifId) {
 
         VerifyManageDeleteBean bean = new VerifyManageDeleteBean();
         bean.setVerifId(VerifId);
         dao.delete_change_extend(bean);
-        // dao.delete_verify_record(bean);
         dao.delete_production_feedback(bean);
         dao.delete_production_command(bean);
         dao.delete_sailing_file(bean);
@@ -145,7 +151,7 @@ public class VerifyManageService extends BaseService<VerifyManageDao> {
 
     }
 
-    @Transactional(readOnly = false)
+    @Transactional(rollbackFor = Exception.class)
     public void delete_verify_file(String verifId, String tableName, String delFlag) {
 
 
@@ -157,7 +163,7 @@ public class VerifyManageService extends BaseService<VerifyManageDao> {
 
     }
 
-    @Transactional(readOnly = false)
+    @Transactional(rollbackFor = Exception.class)
     public void delete_airline_connect(String verifId, String tableName, String delFlag) {
 
 
@@ -169,7 +175,7 @@ public class VerifyManageService extends BaseService<VerifyManageDao> {
 
     }
 
-    @Transactional(readOnly = false)
+    @Transactional(rollbackFor = Exception.class)
     public void delete_airline_verify2type(String verifId, String tableName, String delFlag) {
 
 
@@ -181,7 +187,7 @@ public class VerifyManageService extends BaseService<VerifyManageDao> {
 
     }
 
-    @Transactional(readOnly = false)
+    @Transactional(rollbackFor = Exception.class)
     public void update_verify_file(String verifId, String tableName, String delFlagFrom, String delFlagTo) {
         ManageUpdateBean bean = new ManageUpdateBean();
         bean.setDelFlagFrom(delFlagFrom);
@@ -191,7 +197,7 @@ public class VerifyManageService extends BaseService<VerifyManageDao> {
         dao.update_verify_file(bean);
     }
 
-    @Transactional(readOnly = false)
+    @Transactional(rollbackFor = Exception.class)
     public void update_airline_connect(String verifId, String tableName, String delFlagFrom, String delFlagTo) {
         ManageUpdateBean bean = new ManageUpdateBean();
         bean.setDelFlagFrom(delFlagFrom);
@@ -201,7 +207,7 @@ public class VerifyManageService extends BaseService<VerifyManageDao> {
         dao.update_airline_connect(bean);
     }
 
-    @Transactional(readOnly = false)
+    @Transactional(rollbackFor = Exception.class)
     public void update_airline_verify2type(String verifId, String tableName, String delFlagFrom, String delFlagTo) {
         ManageUpdateBean bean = new ManageUpdateBean();
         bean.setDelFlagFrom(delFlagFrom);
@@ -218,7 +224,7 @@ public class VerifyManageService extends BaseService<VerifyManageDao> {
 
     }
 
-    @Transactional(readOnly = false)
+    @Transactional(rollbackFor = Exception.class)
     public void deleteProcess(String verifId, int i) {
         VerifyProcessDeleteBean bean = new VerifyProcessDeleteBean();
         bean.setVerifId(verifId);
@@ -233,13 +239,13 @@ public class VerifyManageService extends BaseService<VerifyManageDao> {
      * @time 2016年9月25日
      * @param bean
      */
-    @Transactional(readOnly = false)
+    @Transactional(rollbackFor = Exception.class)
     public void updateVerifed(VerifiedUpdateBean bean) {
         dao.updateVerifed(bean);
 
     }
 
-    @Transactional(readOnly = false)
+    @Transactional(rollbackFor = Exception.class)
     public void updateRoute(String verifId, String verifyStatus) {
         RouteVerifyBean bean = new RouteVerifyBean();
         bean.setVerifId(verifId);
@@ -259,7 +265,7 @@ public class VerifyManageService extends BaseService<VerifyManageDao> {
     }
 
 
-    @Transactional(readOnly = false)
+    @Transactional(rollbackFor = Exception.class)
     public void sendnotify(VerifyManageDetailEntity bean, String type) {
         //发送审核
         AirlineVerifyDetailBean verifybean = new AirlineVerifyDetailBean();
@@ -305,7 +311,7 @@ public class VerifyManageService extends BaseService<VerifyManageDao> {
         return dao.getCount(userCode);
     }
 
-    @Transactional(readOnly = false)
+    @Transactional(rollbackFor = Exception.class)
     public void updateRecord(VerifyManageDetailEntity bean) {
         dao.updateRecord(bean);
     }
@@ -319,7 +325,7 @@ public class VerifyManageService extends BaseService<VerifyManageDao> {
      * @author zhanglg
      * @time 2016年10月11日
      */
-    @Transactional(readOnly = false)
+    @Transactional(rollbackFor = Exception.class)
     public VerifyManageAddBean typeChange(VerifyManageDetailEntity entity, String type2, String type1) {
         List<AirType> list = entity.getAirTypes();
         if (list == null) list = new ArrayList<AirType>();
@@ -344,15 +350,12 @@ public class VerifyManageService extends BaseService<VerifyManageDao> {
                         b = true;
                         break;
                     }
-
                 }
                 if (!b) {
                     change = true;
                     break;
                 }
             }
-
-
         }
         // 新文件暂存，通过后替换全文件
         if (entity.getAirTypes() != null && entity.getAirTypes().size() > 0) {
@@ -387,12 +390,11 @@ public class VerifyManageService extends BaseService<VerifyManageDao> {
      * @param entity
      * @param type
      * @param type1
-     * @param bean
      * @return
      * @author zhanglg
      * @time 2016年10月11日
      */
-    @Transactional(readOnly = false)
+    @Transactional(rollbackFor = Exception.class)
     public VerifyManageAddBean ConnectChange(VerifyManageDetailEntity entity, String type, String type1) {
         List<Map<String, String>> listconnect = dao.getConnectList(entity);
         List<Connect> listconnectbean = entity.getConnect();
@@ -419,7 +421,6 @@ public class VerifyManageService extends BaseService<VerifyManageDao> {
                 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());
@@ -489,14 +490,11 @@ public class VerifyManageService extends BaseService<VerifyManageDao> {
                 }
             }
             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>();
         }
@@ -514,7 +512,6 @@ public class VerifyManageService extends BaseService<VerifyManageDao> {
                         b = true;
                         break;
                     }
-
                 }
                 if (!b) {
                     change = true;
@@ -530,10 +527,8 @@ public class VerifyManageService extends BaseService<VerifyManageDao> {
                 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())) {
@@ -568,12 +563,14 @@ public class VerifyManageService extends BaseService<VerifyManageDao> {
      * @author zhanglg
      * @time 2016年10月11日
      */
-    @Transactional(readOnly = false)
+    @Transactional(rollbackFor = Exception.class)
     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>();
+        if (list == null) {
+            list = new ArrayList<>();
+        }
         AirlineVerifyDetailBean bean = new AirlineVerifyDetailBean();
         bean.setVerifId(entity.getId());
         List<Map<String, String>> listd = verifyDao.getverifyFileList(bean);
@@ -600,7 +597,6 @@ public class VerifyManageService extends BaseService<VerifyManageDao> {
                         b = true;
                         break;
                     }
-
                 }
                 if (!b) {
                     change = true;
@@ -613,7 +609,6 @@ public class VerifyManageService extends BaseService<VerifyManageDao> {
             delete_verify_file(entity.getId(), "foc_verify_file", type1);
             dao.insertFiles(entity);
         }
-
         if (change) {
             VerifyManageAddBean add = new VerifyManageAddBean();
             add.setId(IdWorker.getNextId());
@@ -635,7 +630,6 @@ public class VerifyManageService extends BaseService<VerifyManageDao> {
 
     public void delete_airline_verified(String verifId, String string) {
         VerifyManageDeleteBean bean = new VerifyManageDeleteBean();
-
         bean.setTableName(string);
         bean.setVerifId(verifId);
         dao.delete_airline_verified(bean);
@@ -651,9 +645,10 @@ public class VerifyManageService extends BaseService<VerifyManageDao> {
 
     public void updateProcess(VerifyManageDetailEntity bean, Boolean b) {
         VerifyProcessUpdateBean beans = recordChDao.getNodeId(bean.getId());
-        if (beans == null) return;
+        if (beans == null) {
+            return;
+        }
         beans.setNodeDate(bean.getStartTime());
-
         processDao.update(beans);
         if (b) {
             verifyDao.updateStartTime(beans);
@@ -667,7 +662,9 @@ public class VerifyManageService extends BaseService<VerifyManageDao> {
         entity1.setType("4");
         entity1.setList(verifyDao.getdepartList(verifId));
         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";
         Map<String, String> map = verifyDao.getDetail(verifId);
         map.put("depName", PlanUtil.GetLine(map.get("depName"), map.get("arrName"), map.get("roundtripType"), map.get("vertype")));
@@ -687,7 +684,6 @@ public class VerifyManageService extends BaseService<VerifyManageDao> {
                 map.put("refen", ",will postpone at " + sailTimeTo);
 
             }
-
         }
         try {
 
@@ -699,23 +695,13 @@ public class VerifyManageService extends BaseService<VerifyManageDao> {
             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 VerifiedDetailEntity getVerifed(String verifId) {
         AirlineVerifiedDetailBean vbean = new AirlineVerifiedDetailBean();
         vbean.setVerifId(verifId);
@@ -724,37 +710,15 @@ public class VerifyManageService extends BaseService<VerifyManageDao> {
     }
 
 
-    @Transactional(readOnly = false)
+    @Transactional(rollbackFor = Exception.class)
     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/>");
-   /* // 记录操作履历
-    if(!bean.getStartTime().equals(entity.getStartTime())){
-        sb.append("初始反馈时间由").append(entity.getStartTime()).append("修改为")
-        .append(bean.getStartTime()).append("<br/>");
-
-    }
-    if(StringUtils.isNoneBlank(bean.getMaterial())&&StringUtils.isNoneBlank(entity.getMaterial())
-            &&!bean.getMaterial().equals(entity.getMaterial())){
-        sb.append("提交局方材料时间由").append(entity.getMaterial()).append("修改为")
-        .append(bean.getMaterial()).append("<br/>");
-    }else if(bean.getMaterial()==null&&entity.getMaterial()!=null){
-        sb.append("提交局方材料时间由").append(entity.getMaterial()).append("修改为 无")
-        .append("<br/>");
-    }else if(bean.getMaterial()!=null&&entity.getMaterial()==null){
-        sb.append("提交局方材料时间由 无 ").append("修改为")
-        .append(bean.getMaterial()).append("<br/>");
-    }
-    if(!bean.getEndTime().equals(entity.getEndTime())){
-        sb.append("截止反馈时间由").append(entity.getEndTime()).append("修改为")
-        .append(bean.getEndTime()).append("<br/>");
-    }*/
         if (!bean.getSailingDate().equals(entity.getSailingDate())) {
             sb.append("开航时间由").append(entity.getSailingDate()).append("修改为")
                     .append(bean.getSailingDate()).append("<br/>");
-
         }
         if (StringUtils.isNoneBlank(bean.getRemarks())) {
             sb.append("回退信息如下：").append(bean.getRemarks());
@@ -778,7 +742,6 @@ public class VerifyManageService extends BaseService<VerifyManageDao> {
 
     public void deleteRecordNew(VerifyManageDetailEntity bean) {
         dao.deleteRecordNew(bean.getId());
-
     }