航线论证excel导出

resources/mapper/modules/verify/VerifyConditionDao.xml

@@ -193,6 +193,8 @@
     where id = #{id,jdbcType=VARCHAR}
   </update>
     
-    
+  <delete id="deleteConditionByVerifyId">
+    delete from foc_verify_condition where verif_id=#{verifyId}
+  </delete>
   
 </mapper>
\ No newline at end of file

src/com/ejweb/core/utils/excel/ExportExcel.java

@@ -231,15 +231,15 @@ public class ExportExcel {
      * @param title 表格标题，传“空值”，表示无标题
      * @param headerList 表头列表
      */
-    public void initialize(String title, List<String> headerList,int colnum) {
+    public void initialize(String title, List<String> headerList,int column) {
         rownum=0;
         if (StringUtils.isNotBlank(title)){
         Row titleRow = getRow(rownum++);
-        Cell titleCell = titleRow.createCell(colnum);
+        Cell titleCell = titleRow.createCell(column);
         titleCell.setCellStyle(styles.get("title"));
         titleCell.setCellValue(title);
         sheet.addMergedRegion(new CellRangeAddress(titleRow.getRowNum(),
-                titleRow.getRowNum(), colnum, colnum+headerList.size()-1));
+                titleRow.getRowNum(), column, column+headerList.size()-1));
         }
         // Create header
         if (headerList == null){
@@ -247,7 +247,7 @@ public class ExportExcel {
         }
         Row headerRow = getRow(rownum++);
         for (int i = 0; i < headerList.size(); i++) {
-            Cell cell = headerRow.createCell(i+colnum);
+            Cell cell = headerRow.createCell(i+column);
             cell.setCellStyle(styles.get("header"));
             String[] ss = StringUtils.split(headerList.get(i), "**", 2);
             if (ss.length==2){
@@ -262,8 +262,8 @@ public class ExportExcel {
            // sheet.autoSizeColumn(i);
         }
         for (int i = 0; i < headerList.size(); i++) {  
-            int colWidth = (int) (sheet.getColumnWidth(i+colnum)*1.2);
-            sheet.setColumnWidth(i+colnum, colWidth < 3000 ? 3000 : colWidth);  
+            int colWidth = (int) (sheet.getColumnWidth(i+column)*1.2);
+            sheet.setColumnWidth(i+column, colWidth < 3000 ? 3000 : colWidth);
         }
         log.debug("Initialize success.");
     }
@@ -515,7 +515,7 @@ public class ExportExcel {
     
     /**
      * 输出到文件
-     * @param fileName 输出文件名
+     * @param name 输出文件名
      */
     public ExportExcel writeFile(String name) throws FileNotFoundException, IOException{
         FileOutputStream os = new FileOutputStream(name);
@@ -531,7 +531,11 @@ public class ExportExcel {
         return this;
     }
 
-//    /**
+    public List<Object[]> getAnnotationList() {
+        return annotationList;
+    }
+
+    //    /**
 //     * 导出测试
 //     */
 //    public static void main(String[] args) throws Throwable {

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

@@ -24,6 +24,7 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.core.io.DefaultResourceLoader;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
@@ -58,8 +59,8 @@ import com.ejweb.modules.verify.service.VerifyProcessService;
 
 /**
  * 航线论证申请
- * @author lyw
  *
+ * @author lyw
  */
 @Controller
 @RequestMapping("/api/verify")
@@ -69,8 +70,10 @@ public class AirlineVerifyController {
     private AirlineVerifyService airLineVerifyService;
     @Autowired
     private VerifyProcessService verifyProcessService;
+
     /**
      * 获取论证列表
+     *
      * @param requestBean
      * @return
      */
@@ -80,9 +83,9 @@ public class AirlineVerifyController {
         ResponseBean responseBean = new ResponseBean();
         AirlineVerifyBean bean = requestBean.getObjectBean(AirlineVerifyBean.class);
         String message = airLineVerifyService.validate(bean);
-        if(message == null){// 通过参数校验
+        if (message == null) {// 通过参数校验
             PageEntity<AirlineVerifyEntity> list = airLineVerifyService.getAirlineVerifyList(bean);
-            if(list == null){// 查询结果为空
+            if (list == null) {// 查询结果为空
                 responseBean.setMessage(GConstants.EMPTY);
                 responseBean.setStatus(ErrorCode.STATUS_CODE_2001);
                 return responseBean;
@@ -98,6 +101,7 @@ public class AirlineVerifyController {
 
     /**
      * 获取论证详情
+     *
      * @param requestBean
      * @return
      */
@@ -107,9 +111,9 @@ public class AirlineVerifyController {
         ResponseBean responseBean = new ResponseBean();
         AirlineVerifyDetailBean bean = requestBean.getObjectBean(AirlineVerifyDetailBean.class);
         String message = airLineVerifyService.validate(bean);
-		if(message == null){// 通过参数校验
+        if (message == null) {// 通过参数校验
             AirlineVerifyDetailEntity airlineVerifyDetailEntity = airLineVerifyService.get(bean);
-			if(airlineVerifyDetailEntity == null){// 查询结果为空
+            if (airlineVerifyDetailEntity == null) {// 查询结果为空
                 responseBean.setMessage(GConstants.EMPTY);
                 responseBean.setStatus(ErrorCode.STATUS_CODE_2001);
                 return responseBean;
@@ -129,15 +133,15 @@ public class AirlineVerifyController {
         ResponseBean responseBean = new ResponseBean();
         AssessmentDetailBean bean = requestBean.getObjectBean(AssessmentDetailBean.class);
         String message = airLineVerifyService.validate(bean);
-	     if(message == null){// 通过参数校验
-	         Map<String,String> map=   airLineVerifyService.getplanFileNew(bean.getVerifId());
-    	         if(map==null){
+        if (message == null) {// 通过参数校验
+            Map<String, String> map = airLineVerifyService.getplanFileNew(bean.getVerifId());
+            if (map == null) {
                 responseBean.setMessage(GConstants.EMPTY);
                 responseBean.setStatus(ErrorCode.STATUS_CODE_2001);
                 return responseBean;
             }
-	            List<ConnectionPlan> lst= airLineVerifyService.planlist( map.get("fileName"), map.get("filePath"));
-	            if(lst == null){// 查询结果为空
+            List<ConnectionPlan> lst = airLineVerifyService.planlist(map.get("fileName"), map.get("filePath"));
+            if (lst == null) {// 查询结果为空
                 responseBean.setMessage(GConstants.EMPTY);
                 responseBean.setStatus(ErrorCode.STATUS_CODE_2001);
                 return responseBean;
@@ -151,16 +155,17 @@ public class AirlineVerifyController {
         return responseBean;
 
     }
+
     @ResponseBody
     @RequestMapping("planview")
     public ResponseBean planview(RequestBean requestBean) {
         ResponseBean responseBean = new ResponseBean();
         FileBean bean = requestBean.getObjectBean(FileBean.class);
         String message = airLineVerifyService.validate(bean);
-        if(message == null){// 通过参数校验
+        if (message == null) {// 通过参数校验
 
-            List<ConnectionPlan> lst= airLineVerifyService.planlist( bean.getFileName(), bean.getFilePath());
-            if(lst == null){// 查询结果为空
+            List<ConnectionPlan> lst = airLineVerifyService.planlist(bean.getFileName(), bean.getFilePath());
+            if (lst == null) {// 查询结果为空
                 responseBean.setMessage(GConstants.EMPTY);
                 responseBean.setStatus(ErrorCode.STATUS_CODE_2001);
                 return responseBean;
@@ -173,8 +178,10 @@ public class AirlineVerifyController {
         responseBean.setStatus(ErrorCode.STATUS_CODE_4001);
         return responseBean;
     }
+
     /**
      * 论证申请
+     *
      * @param requestBean
      * @return
      */
@@ -184,7 +191,7 @@ public class AirlineVerifyController {
         ResponseBean responseBean = new ResponseBean();
         AirlineVerifyAddBean bean = requestBean.getObjectBean(AirlineVerifyAddBean.class);
         String message = airLineVerifyService.validate(bean);
-        String verifId=bean.getId();
+        String verifId = bean.getId();
 /*		//为重开的情况时
         if("1".equals(bean.getType())){
             if(verifId==null||"".equals(verifId)){
@@ -192,18 +199,18 @@ public class AirlineVerifyController {
             }
             
         }*/
-        if (bean.getVerifyFile() != null&& bean.getVerifyFile().size() > 0 ) {
-            if( bean.getVerifyFile().size() != 1){
+        if (bean.getVerifyFile() != null && bean.getVerifyFile().size() > 0) {
+            if (bean.getVerifyFile().size() != 1) {
                 responseBean.setMessage("编排航班计划只支持传单个文件");
                 responseBean.setStatus(ErrorCode.STATUS_CODE_4001);
                 return responseBean;
-            }else{
-                if (StringUtils.isBlank(bean.getVerifyFile().get(0).getFileName())){
+            } else {
+                if (StringUtils.isBlank(bean.getVerifyFile().get(0).getFileName())) {
                     responseBean.setMessage("导入文档为空");
                     responseBean.setStatus(ErrorCode.STATUS_CODE_4001);
                     return responseBean;
 
-                }else if(!bean.getVerifyFile().get(0).getFileName().toLowerCase().endsWith("xls")&&!bean.getVerifyFile().get(0).getFileName().toLowerCase().endsWith("xlsx")){    
+                } else if (!bean.getVerifyFile().get(0).getFileName().toLowerCase().endsWith("xls") && !bean.getVerifyFile().get(0).getFileName().toLowerCase().endsWith("xlsx")) {
                     responseBean.setMessage("编排航班计划只支持xls,xlsx");
                     responseBean.setStatus(ErrorCode.STATUS_CODE_4001);
                     return responseBean;
@@ -211,7 +218,7 @@ public class AirlineVerifyController {
             }
 
         }
-		if(message == null){// 通过参数校验
+        if (message == null) {// 通过参数校验
 
 
             bean.setId(IdWorker.getNextId());
@@ -239,7 +246,7 @@ public class AirlineVerifyController {
             bean2.setNodeName("开航时间");
             bean2.setNodeSort(10);
             verifyProcessService.add(bean2);
-            if("1".equals(bean.getType())){
+            if ("1".equals(bean.getType())) {
                 airLineVerifyService.updateByState(verifId);
             }
 
@@ -255,6 +262,7 @@ public class AirlineVerifyController {
 
     /**
      * 更新论证状态
+     *
      * @param requestBean
      * @return
      */
@@ -264,7 +272,7 @@ public class AirlineVerifyController {
         ResponseBean responseBean = new ResponseBean();
         AirlineVerifyUpdateStatusBean bean = requestBean.getObjectBean(AirlineVerifyUpdateStatusBean.class);
         String message = airLineVerifyService.validate(bean);
-		if(message == null){// 通过参数校验
+        if (message == null) {// 通过参数校验
             int result = airLineVerifyService.updateByStatus(bean);
             if (result == 0) {
                 airLineVerifyService.sendMailCancel(bean.getVerifId());
@@ -283,6 +291,7 @@ public class AirlineVerifyController {
 
     /**
      * 删除论证申请
+     *
      * @param requestBean
      * @return
      */
@@ -292,7 +301,7 @@ public class AirlineVerifyController {
         ResponseBean responseBean = new ResponseBean();
         AirlineVerifyDeleteBean bean = requestBean.getObjectBean(AirlineVerifyDeleteBean.class);
         String message = airLineVerifyService.validate(bean);
-		if(message == null){// 通过参数校验
+        if (message == null) {// 通过参数校验
             airLineVerifyService.delete(bean);
             return responseBean;
         }
@@ -304,6 +313,7 @@ public class AirlineVerifyController {
 
     /**
      * 导出excel
+     *
      * @author liuyw
      * @time 2016年9月19日
      */
@@ -311,13 +321,13 @@ public class AirlineVerifyController {
     public void export(RequestBean requestBean, HttpServletRequest request, HttpServletResponse response) {
         AirlineVerifyBean bean = requestBean.getObjectBean(AirlineVerifyBean.class);
         String message = airLineVerifyService.validate(bean);
-        if(message == null){// 通过参数校验
+        if (message == null) {// 通过参数校验
             List<AirlineVerifyEntity> list = airLineVerifyService.getListAll(bean);
             if (list != null && list.size() > 0) {
                 for (AirlineVerifyEntity airlineVerifyEntity : list) {
                     airlineVerifyEntity.setVerifyList(airLineVerifyService.getVerifyOpinionList(airlineVerifyEntity.getVerifId()));
                     airlineVerifyEntity.setRiskList(airLineVerifyService.getRiskOpinionList(airlineVerifyEntity.getVerifId()));
-                    switch(airlineVerifyEntity.getVerifType()) {
+                    switch (airlineVerifyEntity.getVerifType()) {
                         case "01":
                         case "02":
                         case "03":
@@ -340,14 +350,19 @@ public class AirlineVerifyController {
                     }
                 }
             }
-            String fileName = "航线论证数据"+ new SimpleDateFormat("yyyyMMddHHmmss").format(new Date())+".xlsx";
+            String fileName = "航线论证数据" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + ".xlsx";
             try {
-                ExportExcel  ex= new ExportExcel("航线论证数据", AirlineVerifyEntity.class);
-                List<String> verlist=airLineVerifyService.departNameList("verify");
-               ex.initialize("反馈结论", verlist,10);
-               List<String> risklist=airLineVerifyService.departNameList("risk");
-               ex.initialize("风险评估结论", risklist,9+verlist.size());
-                ex.setDataList(list,"verifyList","riskList").write(response, fileName).dispose();
+                ExportExcel ex = new ExportExcel("航线论证数据", AirlineVerifyEntity.class);
+                List<String> verifyList = airLineVerifyService.departNameList("verify");
+                //反馈结论开始的列数
+                int column = 0;
+                if(!CollectionUtils.isEmpty(ex.getAnnotationList())){
+                    column = ex.getAnnotationList().size();
+                }
+                ex.initialize("反馈结论", verifyList, column);
+                List<String> riskList = airLineVerifyService.departNameList("risk");
+                ex.initialize("风险评估结论", riskList, column + verifyList.size());
+                ex.setDataList(list, "verifyList", "riskList").write(response, fileName).dispose();
                 //  new ExportExcel("航线论证数据", AirlineVerifyEntity.class).setDataList(list).write(response, fileName).dispose();
             } catch (IOException e) {
                 e.printStackTrace();
@@ -356,8 +371,10 @@ public class AirlineVerifyController {
             throw new RuntimeException(message);
         }
     }
+
     /**
      * 检查能否回退论证模式
+     *
      * @param requestBean
      * @return
      */
@@ -367,10 +384,10 @@ public class AirlineVerifyController {
         ResponseBean responseBean = new ResponseBean();
         AssessmentDetailBean bean = requestBean.getObjectBean(AssessmentDetailBean.class);
         String message = airLineVerifyService.validate(bean);
-        if(message == null){// 通过参数校验
+        if (message == null) {// 通过参数校验
             JSONObject data = airLineVerifyService.check(bean);
 
-            if(data == null){// 数据为空
+            if (data == null) {// 数据为空
                 responseBean.setMessage(GConstants.EMPTY);
                 responseBean.setStatus(ErrorCode.STATUS_CODE_2001);
                 return responseBean;
@@ -384,8 +401,10 @@ public class AirlineVerifyController {
         responseBean.setStatus(ErrorCode.STATUS_CODE_4001);
         return responseBean;
     }
+
     /**
      * 判断是否能终止论证
+     *
      * @param requestBean
      * @return
      */
@@ -395,10 +414,10 @@ public class AirlineVerifyController {
         ResponseBean responseBean = new ResponseBean();
         AssessmentDetailBean bean = requestBean.getObjectBean(AssessmentDetailBean.class);
         String message = airLineVerifyService.validate(bean);
-        if(message == null){// 通过参数校验
+        if (message == null) {// 通过参数校验
             JSONObject data = airLineVerifyService.checkVerif(bean);
 
-            if(data == null){// 数据为空
+            if (data == null) {// 数据为空
                 responseBean.setMessage(GConstants.EMPTY);
                 responseBean.setStatus(ErrorCode.STATUS_CODE_2001);
                 return responseBean;
@@ -419,13 +438,13 @@ public class AirlineVerifyController {
         ResponseBean responseBean = new ResponseBean();
         AssessmentDetailBean bean = requestBean.getObjectBean(AssessmentDetailBean.class);
         String message = airLineVerifyService.validate(bean);
-        if(message == null){// 通过参数校验
-            JSONObject data=new JSONObject();
+        if (message == null) {// 通过参数校验
+            JSONObject data = new JSONObject();
 
             int lock = airLineVerifyService.IsLock(bean.getVerifId());
-            if(lock==0){
+            if (lock == 0) {
                 data.put("isLock", "0");
-            }else{
+            } else {
                 data.put("isLock", "1");
             }
 
@@ -441,6 +460,7 @@ public class AirlineVerifyController {
 
     /**
      * 发送邮件
+     *
      * @param requestBean
      * @return
      */
@@ -450,7 +470,7 @@ public class AirlineVerifyController {
         ResponseBean responseBean = new ResponseBean();
         AssessmentDetailBean bean = requestBean.getObjectBean(AssessmentDetailBean.class);
         String message = airLineVerifyService.validate(bean);
-        if(message == null){// 通过参数校验
+        if (message == null) {// 通过参数校验
             airLineVerifyService.sendMail(bean.getVerifId());
 
 
@@ -462,6 +482,7 @@ public class AirlineVerifyController {
         responseBean.setStatus(ErrorCode.STATUS_CODE_4001);
         return responseBean;
     }
+
     /**
      * 获取自定义表单
      */
@@ -471,9 +492,9 @@ public class AirlineVerifyController {
         ResponseBean responseBean = new ResponseBean();
         VerifyFormBean bean = requestBean.getObjectBean(VerifyFormBean.class);
         String message = airLineVerifyService.validate(bean);
-        if(message == null){// 通过参数校验
+        if (message == null) {// 通过参数校验
             List<VerifyFormEntity> list = airLineVerifyService.getVerifyForm(bean);
-            if(list == null){// 查询结果为空
+            if (list == null) {// 查询结果为空
                 responseBean.setMessage(GConstants.EMPTY);
                 responseBean.setStatus(ErrorCode.STATUS_CODE_2001);
                 return responseBean;
@@ -488,44 +509,37 @@ public class AirlineVerifyController {
     }
 
     @RequestMapping("exportpdf1")
-    public String exportpdf1(Model model,RequestBean requestBean, HttpServletRequest request, HttpServletResponse response) throws JRException, IOException, SQLException {
+    public String exportpdf1(Model model, RequestBean requestBean, HttpServletRequest request, HttpServletResponse response) throws JRException, IOException, SQLException {
         AirlineVerifyDetailBean bean = requestBean.getObjectBean(AirlineVerifyDetailBean.class);
         String message = airLineVerifyService.validate(bean);
-         if(message!=null)return null;
+        if (message != null) return null;
         AirlineVerifyDetailEntity airlineVerifyDetailEntity = airLineVerifyService.get(bean);
         File file = new DefaultResourceLoader().getResource("").getFile();
-          File jasperFileName = new File( file.getPath()+"/jasper/verify.jasper");
-          if("01".equals(airlineVerifyDetailEntity.getVerifType())){
+        File jasperFileName = new File(file.getPath() + "/jasper/verify.jasper");
+        if ("01".equals(airlineVerifyDetailEntity.getVerifType())) {
             model.addAttribute("exportFileName", "新开国内申请单.pdf");
-          }
-          else if("02".equals(airlineVerifyDetailEntity.getVerifType())){
+        } else if ("02".equals(airlineVerifyDetailEntity.getVerifType())) {
             model.addAttribute("exportFileName", "新开国际申请单.pdf");
-          }
-          else if("03".equals(airlineVerifyDetailEntity.getVerifType())){
+        } else if ("03".equals(airlineVerifyDetailEntity.getVerifType())) {
             model.addAttribute("exportFileName", "重开国内申请单.pdf");
-          }
-          else if("04".equals(airlineVerifyDetailEntity.getVerifType())){
+        } else if ("04".equals(airlineVerifyDetailEntity.getVerifType())) {
             model.addAttribute("exportFileName", "重开国际申请单.pdf");
-          }
-          else if("05".equals(airlineVerifyDetailEntity.getVerifType())){
+        } else if ("05".equals(airlineVerifyDetailEntity.getVerifType())) {
             model.addAttribute("exportFileName", "调机申请单.pdf");
-              jasperFileName=new File( file.getPath()+"/jasper/transfer.jasper"); 
-          }
-          else if("06".equals(airlineVerifyDetailEntity.getVerifType())){
+            jasperFileName = new File(file.getPath() + "/jasper/transfer.jasper");
+        } else if ("06".equals(airlineVerifyDetailEntity.getVerifType())) {
             model.addAttribute("exportFileName", "备降场申请单.pdf");
-              jasperFileName=new File( file.getPath()+"/jasper/landing.jasper");
-          }
-          else if("07".equals(airlineVerifyDetailEntity.getVerifType())){
+            jasperFileName = new File(file.getPath() + "/jasper/landing.jasper");
+        } else if ("07".equals(airlineVerifyDetailEntity.getVerifType())) {
             model.addAttribute("exportFileName", "过夜机场申请单.pdf");
-              jasperFileName=new File( file.getPath()+"/jasper/night.jasper");
-          }
-          else if("08".equals(airlineVerifyDetailEntity.getVerifType())){
+            jasperFileName = new File(file.getPath() + "/jasper/night.jasper");
+        } else if ("08".equals(airlineVerifyDetailEntity.getVerifType())) {
             model.addAttribute("exportFileName", "训练场申请单.pdf");
-              jasperFileName=new File( file.getPath()+"/jasper/traning.jasper");
+            jasperFileName = new File(file.getPath() + "/jasper/traning.jasper");
         }
 
-          ApplicationContext ctx=   com.ejweb.core.util.SpringContextHolder.getApplicationContext();
-          com.alibaba.druid.pool.DruidDataSource ds = (  com.alibaba.druid.pool.DruidDataSource) ctx.getBean("defaultDataSource");
+        ApplicationContext ctx = com.ejweb.core.util.SpringContextHolder.getApplicationContext();
+        com.alibaba.druid.pool.DruidDataSource ds = (com.alibaba.druid.pool.DruidDataSource) ctx.getBean("defaultDataSource");
 
         //model.addAttribute("Content-Disposition","attachment;filename=hxlz.pdf");
         model.addAttribute("url", jasperFileName.getPath());
@@ -540,51 +554,44 @@ public class AirlineVerifyController {
 
     @ResponseBody
     @RequestMapping("exportpdf")
-    public void download(RequestBean requestBean,HttpServletResponse response,HttpServletRequest request){
+    public void download(RequestBean requestBean, HttpServletResponse response, HttpServletRequest request) {
         AirlineVerifyDetailBean bean = requestBean.getObjectBean(AirlineVerifyDetailBean.class);
-       String name="";
-      StringBuilder sb =new StringBuilder();
+        String name = "";
+        StringBuilder sb = new StringBuilder();
         AirlineVerifyDetailEntity airlineVerifyDetailEntity = airLineVerifyService.get(bean);
 
-       if("01".equals(airlineVerifyDetailEntity.getVerifType())){
-           name= "新开国内申请单";
+        if ("01".equals(airlineVerifyDetailEntity.getVerifType())) {
+            name = "新开国内申请单";
 
-       }
-       else if("02".equals(airlineVerifyDetailEntity.getVerifType())){
-           name= "新开国际申请单"; 
+        } else if ("02".equals(airlineVerifyDetailEntity.getVerifType())) {
+            name = "新开国际申请单";
 
-       }
-       else if("03".equals(airlineVerifyDetailEntity.getVerifType())){
-           name= "重开国内申请单";
+        } else if ("03".equals(airlineVerifyDetailEntity.getVerifType())) {
+            name = "重开国内申请单";
 
-       }
-       else if("04".equals(airlineVerifyDetailEntity.getVerifType())){
-           name= "重开国际申请单";
+        } else if ("04".equals(airlineVerifyDetailEntity.getVerifType())) {
+            name = "重开国际申请单";
 
-       }
-       else if("05".equals(airlineVerifyDetailEntity.getVerifType())){
-           name= "调机申请单";
+        } else if ("05".equals(airlineVerifyDetailEntity.getVerifType())) {
+            name = "调机申请单";
 
-       }
-       else if("06".equals(airlineVerifyDetailEntity.getVerifType())){
-           name= "备降场申请单";
+        } else if ("06".equals(airlineVerifyDetailEntity.getVerifType())) {
+            name = "备降场申请单";
 
 
-       }
-       else if("07".equals(airlineVerifyDetailEntity.getVerifType())){
-           name= "过夜机场申请单";
+        } else if ("07".equals(airlineVerifyDetailEntity.getVerifType())) {
+            name = "过夜机场申请单";
 
+        } else if ("08".equals(airlineVerifyDetailEntity.getVerifType())) {
+            name = "训练场申请单";
         }
-       else if("08".equals(airlineVerifyDetailEntity.getVerifType())){
-           name= "训练场申请单";
-       }
-       Map<String, String> maps=airLineVerifyService.getDetail(bean.getVerifId());
-       maps.put("depName", PlanUtil.GetLine(maps.get("depName"),maps.get("arrName"),maps.get("roundtripType"),maps.get("vertype")));
-       maps.put("depIata", PlanUtil.GetLine(maps.get("depIata"),maps.get("arrIata"),maps.get("roundtripType"),maps.get("vertype")));
-       int col=1;
-       String type=maps.get("aircraftLabel");
-       if(maps.get("typeNames")!=null){
-           type=type+":"+maps.get("typeNames");
+        Map<String, String> maps = airLineVerifyService.getDetail(bean.getVerifId());
+        maps.put("depName", PlanUtil.GetLine(maps.get("depName"), maps.get("arrName"), maps.get("roundtripType"), maps.get("vertype")));
+        maps.put("depIata", PlanUtil.GetLine(maps.get("depIata"), maps.get("arrIata"), maps.get("roundtripType"), maps.get("vertype")));
+        int col = 1;
+        String type = maps.get("aircraftLabel");
+        if (maps.get("typeNames") != null) {
+            type = type + ":" + maps.get("typeNames");
         }
         sb.append("<h2>").append(name).append("</h2>");
         sb.append("<table border=\"1\" width=\"100%\" style=\"text-align:center\"><tbody>");
@@ -593,55 +600,55 @@ public class AirlineVerifyController {
             case "02":
             case "03":
             case "04":
-            col=6;
+                col = 6;
                 sb.append("<tr><td> 航班号</td> <td>执飞航线起飞地</td> <td>执飞航线目的地</td> <td>拟用机型</td> <td>执行开始时间</td>  <td>执行结束时间</td></tr>");
-            for(Map<String,String> map:airlineVerifyDetailEntity.getConnect()){
+                for (Map<String, String> map : airlineVerifyDetailEntity.getConnect()) {
                     sb.append("<tr>");
                     sb.append("<td>").append(map.get("flightNo")).append("</td>");
                     sb.append("<td>").append(map.get("depName")).append("</td>");
                     sb.append("<td>").append(map.get("arrName")).append("</td>");
                     sb.append("<td>").append(type).append("</td>");
                     sb.append("<td>").append(maps.get("startTime")).append("</td>");
-                sb.append("<td>").append(maps.get("endTime1")==null?"":maps.get("endTime1")).append("</td>");
+                    sb.append("<td>").append(maps.get("endTime1") == null ? "" : maps.get("endTime1")).append("</td>");
                     sb.append("</tr>");
                 }
-            sb.append("<tr><td>项目</td><td colspan=\"").append(col-1).append("\">");
+                sb.append("<tr><td>项目</td><td colspan=\"").append(col - 1).append("\">");
                 sb.append("计划内容");
                 sb.append("</td></tr>");
-            sb.append("<tr><td>申请原因</td><td colspan=\"").append(col-1).append("\">");
-            sb.append(airlineVerifyDetailEntity.getApplyReason()==null?"":airlineVerifyDetailEntity.getApplyReason());
+                sb.append("<tr><td>申请原因</td><td colspan=\"").append(col - 1).append("\">");
+                sb.append(airlineVerifyDetailEntity.getApplyReason() == null ? "" : airlineVerifyDetailEntity.getApplyReason());
                 sb.append("</td></tr>");
-            sb.append(airLineVerifyService.getPlanHtml(airlineVerifyDetailEntity.getVerifyFile(),col));
-            sb.append(getLast(airlineVerifyDetailEntity,col));
+                sb.append(airLineVerifyService.getPlanHtml(airlineVerifyDetailEntity.getVerifyFile(), col));
+                sb.append(getLast(airlineVerifyDetailEntity, col));
                 break;
             case "05":
-            col=7;
+                col = 7;
                 sb.append("<tr><td> 航班号</td> <td>执飞航线起飞地</td> <td>执飞航线目的地</td> <td>往返类型</td><td>拟用机型</td> <td>执行开始时间</td>  <td>执行结束时间</td></tr>");
 
-            for(Map<String,String> map:airlineVerifyDetailEntity.getConnect()){
+                for (Map<String, String> map : airlineVerifyDetailEntity.getConnect()) {
                     sb.append("<tr>");
                     sb.append("<td>").append(map.get("flightNo")).append("</td>");
                     sb.append("<td>").append(map.get("depName")).append("</td>");
                     sb.append("<td>").append(map.get("arrName")).append("</td>");
-                if("01".equals(maps.get("roundtripType"))){
+                    if ("01".equals(maps.get("roundtripType"))) {
                         sb.append("<td>单程</td>");
-                }else{
+                    } else {
                         sb.append("<td>往返</td>");
                     }
                     sb.append("<td>").append(type).append("</td>");
                     sb.append("<td>").append(maps.get("startTime")).append("</td>");
-                sb.append("<td>").append(maps.get("endTime1")==null?"":maps.get("endTime1")).append("</td>");
+                    sb.append("<td>").append(maps.get("endTime1") == null ? "" : maps.get("endTime1")).append("</td>");
 
                     sb.append("</tr>");
                 }
-            sb.append("<tr><td>项目</td><td colspan=\"").append(col-1).append("\">");
+                sb.append("<tr><td>项目</td><td colspan=\"").append(col - 1).append("\">");
                 sb.append("计划内容");
                 sb.append("</td></tr>");
-            sb.append("<tr><td>申请原因</td><td colspan=\"").append(col-1).append("\">");
-            sb.append(airlineVerifyDetailEntity.getApplyReason()==null?"":airlineVerifyDetailEntity.getApplyReason());
+                sb.append("<tr><td>申请原因</td><td colspan=\"").append(col - 1).append("\">");
+                sb.append(airlineVerifyDetailEntity.getApplyReason() == null ? "" : airlineVerifyDetailEntity.getApplyReason());
                 sb.append("</td></tr>");
-            sb.append(airLineVerifyService.getPlanHtml(airlineVerifyDetailEntity.getVerifyFile(),col));
-            sb.append(getLast(airlineVerifyDetailEntity,col));
+                sb.append(airLineVerifyService.getPlanHtml(airlineVerifyDetailEntity.getVerifyFile(), col));
+                sb.append(getLast(airlineVerifyDetailEntity, col));
                 break;
             case "06":
 
@@ -651,15 +658,15 @@ public class AirlineVerifyController {
                 sb.append("<td>").append(maps.get("startTime")).append("</td>");
 
                 sb.append("</tr>");
-            col=3;
-            sb.append("<tr><td>项目</td><td colspan=\"").append(col-1).append("\">");
+                col = 3;
+                sb.append("<tr><td>项目</td><td colspan=\"").append(col - 1).append("\">");
                 sb.append("计划内容");
                 sb.append("</td></tr>");
-            sb.append("<tr><td>申请原因</td><td colspan=\"").append(col-1).append("\">");
-            sb.append(airlineVerifyDetailEntity.getApplyReason()==null?"":airlineVerifyDetailEntity.getApplyReason());
+                sb.append("<tr><td>申请原因</td><td colspan=\"").append(col - 1).append("\">");
+                sb.append(airlineVerifyDetailEntity.getApplyReason() == null ? "" : airlineVerifyDetailEntity.getApplyReason());
                 sb.append("</td></tr>");
-            sb.append("<tr><td>其他特殊说明</td><td colspan=\"").append(col-1).append("\">");
-            sb.append(airlineVerifyDetailEntity.getOtherReason()==null?"":airlineVerifyDetailEntity.getOtherReason());
+                sb.append("<tr><td>其他特殊说明</td><td colspan=\"").append(col - 1).append("\">");
+                sb.append(airlineVerifyDetailEntity.getOtherReason() == null ? "" : airlineVerifyDetailEntity.getOtherReason());
                 sb.append("</td></tr>");
 
                 break;
@@ -672,17 +679,17 @@ public class AirlineVerifyController {
                 sb.append("<td>").append(maps.get("startTime")).append("</td>");
 
                 sb.append("</tr>");
-             col=3;
-             sb.append("<tr><td>项目</td><td colspan=\"").append(col-1).append("\">");
+                col = 3;
+                sb.append("<tr><td>项目</td><td colspan=\"").append(col - 1).append("\">");
                 sb.append("计划内容");
                 sb.append("</td></tr>");
-             sb.append("<tr><td>申请原因</td><td colspan=\"").append(col-1).append("\">");
-             sb.append(airlineVerifyDetailEntity.getApplyReason()==null?"":airlineVerifyDetailEntity.getApplyReason());
+                sb.append("<tr><td>申请原因</td><td colspan=\"").append(col - 1).append("\">");
+                sb.append(airlineVerifyDetailEntity.getApplyReason() == null ? "" : airlineVerifyDetailEntity.getApplyReason());
                 sb.append("</td></tr>");
 
-             sb.append(airLineVerifyService.getPlanHtml(airlineVerifyDetailEntity.getVerifyFile(),col));
-             sb.append("<tr><td>其他特殊说明</td><td colspan=\"").append(col-1).append("\">");
-             sb.append(airlineVerifyDetailEntity.getOtherReason()==null?"":airlineVerifyDetailEntity.getOtherReason());
+                sb.append(airLineVerifyService.getPlanHtml(airlineVerifyDetailEntity.getVerifyFile(), col));
+                sb.append("<tr><td>其他特殊说明</td><td colspan=\"").append(col - 1).append("\">");
+                sb.append(airlineVerifyDetailEntity.getOtherReason() == null ? "" : airlineVerifyDetailEntity.getOtherReason());
                 sb.append("</td></tr>");
                 break;
             case "08":
@@ -694,25 +701,25 @@ public class AirlineVerifyController {
                 sb.append("<td>").append(maps.get("startTime")).append("</td>");
 
                 sb.append("</tr>");
-            col=4;
-            sb.append("<tr><td>项目</td><td colspan=\"").append(col-1).append("\">");
+                col = 4;
+                sb.append("<tr><td>项目</td><td colspan=\"").append(col - 1).append("\">");
                 sb.append("计划内容");
                 sb.append("</td></tr>");
-            sb.append("<tr><td>航班性质</td><td colspan=\"").append(col-1).append("\">");
-           if("01".equals(airlineVerifyDetailEntity.getFlightType())){
+                sb.append("<tr><td>航班性质</td><td colspan=\"").append(col - 1).append("\">");
+                if ("01".equals(airlineVerifyDetailEntity.getFlightType())) {
                     sb.append("训练 ");
-           }else  if("02".equals(airlineVerifyDetailEntity.getFlightType())){
+                } else if ("02".equals(airlineVerifyDetailEntity.getFlightType())) {
                     sb.append("调机+训练 ");
                 }
 
 
                 sb.append("</td></tr>");
-            sb.append("<tr><td>申请原因</td><td colspan=\"").append(col-1).append("\">");
-            sb.append(airlineVerifyDetailEntity.getApplyReason()==null?"":airlineVerifyDetailEntity.getApplyReason());
+                sb.append("<tr><td>申请原因</td><td colspan=\"").append(col - 1).append("\">");
+                sb.append(airlineVerifyDetailEntity.getApplyReason() == null ? "" : airlineVerifyDetailEntity.getApplyReason());
                 sb.append("</td></tr>");
-            sb.append(airLineVerifyService.getPlanHtml(airlineVerifyDetailEntity.getVerifyFile(),col));
-            sb.append("<tr><td>其他特殊说明</td><td colspan=\"").append(col-1).append("\">");
-            sb.append(airlineVerifyDetailEntity.getOtherReason()==null?"":airlineVerifyDetailEntity.getOtherReason());
+                sb.append(airLineVerifyService.getPlanHtml(airlineVerifyDetailEntity.getVerifyFile(), col));
+                sb.append("<tr><td>其他特殊说明</td><td colspan=\"").append(col - 1).append("\">");
+                sb.append(airlineVerifyDetailEntity.getOtherReason() == null ? "" : airlineVerifyDetailEntity.getOtherReason());
                 sb.append("</td></tr>");
                 break;
         }
@@ -720,7 +727,7 @@ public class AirlineVerifyController {
 
         sb.append("</tbody></table>");
 
-           UploadFileBean uploadFileBean=Html2File.convertHtml2Word(sb.toString());
+        UploadFileBean uploadFileBean = Html2File.convertHtml2Word(sb.toString());
 
         InputStream in = null;
         OutputStream out = null;
@@ -728,17 +735,16 @@ public class AirlineVerifyController {
 
             //设置文件MIME类型
             response.setContentType("application/form-data;charset=utf-8");
-          String filename=name+".doc";
-           String downloadFileName=new String( filename.getBytes("gbk"),"ISO8859-1");
-           String agent = (String)request.getHeader("USER-AGENT");  
-           if(agent != null && agent.toLowerCase().indexOf("firefox") > 0)
-           {
+            String filename = name + ".doc";
+            String downloadFileName = new String(filename.getBytes("gbk"), "ISO8859-1");
+            String agent = (String) request.getHeader("USER-AGENT");
+            if (agent != null && agent.toLowerCase().indexOf("firefox") > 0) {
                 downloadFileName = "=?UTF-8?B?" + (new String(Base64.encodeBase64(filename.getBytes("UTF-8")))) + "?=";
             }
             //设置Content-Disposition
-           response.setHeader("Content-Disposition", "attachment; filename="+downloadFileName);
+            response.setHeader("Content-Disposition", "attachment; filename=" + downloadFileName);
             //获取目标文件的绝对路径
-           String fullFileName = GConstants.FILE_UPLOAD_DIR+uploadFileBean.getPath();   
+            String fullFileName = GConstants.FILE_UPLOAD_DIR + uploadFileBean.getPath();
 
             //读取文件
             in = new FileInputStream(fullFileName);
@@ -746,13 +752,12 @@ public class AirlineVerifyController {
 
             //写文件
             int b;
-           while((b=in.read())!= -1)  
-           {  
+            while ((b = in.read()) != -1) {
                 out.write(b);
             }
         } catch (Exception e) {
             // TODO: handle exception
-           }  finally{
+        } finally {
             IOUtils.closeQuietly(in);
             IOUtils.closeQuietly(out);
         }
@@ -761,45 +766,43 @@ public class AirlineVerifyController {
     }
 
 
-    
-    
-    private String getLast(AirlineVerifyDetailEntity airlineVerifyDetailEntity,int col) {
-        StringBuffer sb =new StringBuffer();
-        sb.append("<tr><td>经营性质</td><td colspan=\"").append(col-1).append("\">");
-       if("01".equals(airlineVerifyDetailEntity.getIndustry())){
+    private String getLast(AirlineVerifyDetailEntity airlineVerifyDetailEntity, int col) {
+        StringBuffer sb = new StringBuffer();
+        sb.append("<tr><td>经营性质</td><td colspan=\"").append(col - 1).append("\">");
+        if ("01".equals(airlineVerifyDetailEntity.getIndustry())) {
             sb.append("自营");
-       }else  if("02".equals(airlineVerifyDetailEntity.getIndustry())){
+        } else if ("02".equals(airlineVerifyDetailEntity.getIndustry())) {
             sb.append("保底  ");
-       }else  if("03".equals(airlineVerifyDetailEntity.getIndustry())){
+        } else if ("03".equals(airlineVerifyDetailEntity.getIndustry())) {
             sb.append("包机 ");
         }
         sb.append("</td></tr>");
-        sb.append("<tr><td>航班性质</td><td colspan=\"").append(col-1).append("\">");
-       if("01".equals(airlineVerifyDetailEntity.getFlightType())){
+        sb.append("<tr><td>航班性质</td><td colspan=\"").append(col - 1).append("\">");
+        if ("01".equals(airlineVerifyDetailEntity.getFlightType())) {
             sb.append("正班 ");
-       }else  if("02".equals(airlineVerifyDetailEntity.getFlightType())){
+        } else if ("02".equals(airlineVerifyDetailEntity.getFlightType())) {
             sb.append("加班 ");
-       }else  if("03".equals(airlineVerifyDetailEntity.getFlightType())){
+        } else if ("03".equals(airlineVerifyDetailEntity.getFlightType())) {
             sb.append("临时包机 ");
-       } else  if("04".equals(airlineVerifyDetailEntity.getFlightType())){
+        } else if ("04".equals(airlineVerifyDetailEntity.getFlightType())) {
             sb.append("调机");
         }
         sb.append("</td></tr>");
-        sb.append("<tr><td>航路类型</td><td colspan=\"").append(col-1).append("\">");
-       if("01".equals(airlineVerifyDetailEntity.getRouteType())){
+        sb.append("<tr><td>航路类型</td><td colspan=\"").append(col - 1).append("\">");
+        if ("01".equals(airlineVerifyDetailEntity.getRouteType())) {
             sb.append("依照飞行管制一号规定 ");
-       }else  if("02".equals(airlineVerifyDetailEntity.getRouteType())){
+        } else if ("02".equals(airlineVerifyDetailEntity.getRouteType())) {
             sb.append("需拟定航路及高度");
         }
         sb.append("</td></tr>");
 
-        sb.append("<tr><td>货运要求</td><td colspan=\"").append(col-1).append("\">");
-        sb.append(airlineVerifyDetailEntity.getCargoDemand()==null?"":airlineVerifyDetailEntity.getCargoDemand());
+        sb.append("<tr><td>货运要求</td><td colspan=\"").append(col - 1).append("\">");
+        sb.append(airlineVerifyDetailEntity.getCargoDemand() == null ? "" : airlineVerifyDetailEntity.getCargoDemand());
         sb.append("</td></tr>");
-        sb.append("<tr><td>其他特殊说明</td><td colspan=\"").append(col-1).append("\">");
-        sb.append(airlineVerifyDetailEntity.getOtherReason()==null?"":airlineVerifyDetailEntity.getOtherReason());
+        sb.append("<tr><td>其他特殊说明</td><td colspan=\"").append(col - 1).append("\">");
+        sb.append(airlineVerifyDetailEntity.getOtherReason() == null ? "" : airlineVerifyDetailEntity.getOtherReason());
         sb.append("</td></tr>");
-        return(sb.toString());
+        return (sb.toString());
     }
 
     //论证终止
@@ -809,9 +812,9 @@ public class AirlineVerifyController {
         ResponseBean responseBean = new ResponseBean();
         AssessmentDetailBean bean = requestBean.getObjectBean(AssessmentDetailBean.class);
         String message = airLineVerifyService.validate(bean);
-        if(message == null){// 通过参数校验
+        if (message == null) {// 通过参数校验
             String Status = airLineVerifyService.getVerifStatus(bean);
-            JSONObject data=new JSONObject();
+            JSONObject data = new JSONObject();
             data.put("verifStatus", Status);
 
             responseBean.setData(data);
@@ -826,13 +829,13 @@ public class AirlineVerifyController {
 
     @ResponseBody
     @RequestMapping("getdepartName")
-    public ResponseBean   getDepartName(RequestBean requestBean){
+    public ResponseBean getDepartName(RequestBean requestBean) {
         ResponseBean responseBean = new ResponseBean();
         AssessmentDetailBean bean = requestBean.getObjectBean(AssessmentDetailBean.class);
         String message = airLineVerifyService.validate(bean);
-        if(message == null){// 通过参数校验
+        if (message == null) {// 通过参数校验
             String DepartName = airLineVerifyService.getDepartName(bean);
-            JSONObject data=new JSONObject();
+            JSONObject data = new JSONObject();
             data.put("departName", DepartName);
 
             responseBean.setData(data);
@@ -847,21 +850,22 @@ public class AirlineVerifyController {
 
     @ResponseBody
     @RequestMapping("testMail")
-    public ResponseBean   testMail(RequestBean requestBean){
+    public ResponseBean testMail(RequestBean requestBean) {
         ResponseBean responseBean = new ResponseBean();
         airLineVerifyService.testMail();
         // responseBean.setData(content);
         return responseBean;
     }
+
     @ResponseBody
     @RequestMapping("airline")
-    public ResponseBean   airline(RequestBean requestBean){
+    public ResponseBean airline(RequestBean requestBean) {
         ResponseBean responseBean = new ResponseBean();
         AssessmentDetailBean bean = requestBean.getObjectBean(AssessmentDetailBean.class);
         String message = airLineVerifyService.validate(bean);
-        if(message == null){// 通过参数校验
-            Map<String,String> map = airLineVerifyService.airline(bean.getVerifId());
-            JSONObject data=new JSONObject();
+        if (message == null) {// 通过参数校验
+            Map<String, String> map = airLineVerifyService.airline(bean.getVerifId());
+            JSONObject data = new JSONObject();
             data.put("applyNo", map.get("applyNo"));
             data.put("verifNo", map.get("verifNo"));
             data.put("routeNo", map.get("routeNo"));
@@ -880,8 +884,10 @@ public class AirlineVerifyController {
         responseBean.setStatus(ErrorCode.STATUS_CODE_4001);
         return responseBean;
     }
+
     /**
      * 获取全附件信息
+     *
      * @param requestBean
      * @return
      */
@@ -891,9 +897,9 @@ public class AirlineVerifyController {
         ResponseBean responseBean = new ResponseBean();
         AirlineVerifyDetailBean bean = requestBean.getObjectBean(AirlineVerifyDetailBean.class);
         String message = airLineVerifyService.validate(bean);
-        if(message == null){// 通过参数校验
+        if (message == null) {// 通过参数校验
             VerifyFileEntity entity = airLineVerifyService.filelist(bean);
-            if(entity == null){// 查询结果为空
+            if (entity == null) {// 查询结果为空
                 responseBean.setMessage(GConstants.EMPTY);
                 responseBean.setStatus(ErrorCode.STATUS_CODE_2001);
                 return responseBean;

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

@@ -16,5 +16,7 @@ public interface VerifyConditionDao extends BaseDao {
 
     int updateByPrimaryKey(FullVerifyConditionEntity record);
 
+    void deleteConditionByVerifyId(String verifyId);
+    
     List<FullVerifyConditionEntity> fullList(FullVerifyConditionBean bean);
 }

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

@@ -14,6 +14,7 @@ import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import com.ejweb.modules.verify.dao.*;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -45,10 +46,6 @@ import com.ejweb.modules.verify.bean.AirlineVerifyDetailBean;
 import com.ejweb.modules.verify.bean.AirlineVerifyUpdateStatusBean;
 import com.ejweb.modules.verify.bean.RecordAddBean;
 import com.ejweb.modules.verify.bean.VerifyFormBean;
-import com.ejweb.modules.verify.dao.AirlineConclusionDao;
-import com.ejweb.modules.verify.dao.AirlineVerifiedDao;
-import com.ejweb.modules.verify.dao.AirlineVerifyDao;
-import com.ejweb.modules.verify.dao.RecordDao;
 import com.ejweb.modules.verify.entity.AirlineVerifyDetailEntity;
 import com.ejweb.modules.verify.entity.AirlineVerifyEntity;
 import com.ejweb.modules.verify.entity.ConnectionPlan;
@@ -86,6 +83,8 @@ public class AirlineVerifyService extends BaseService<AirlineVerifyDao>{
     AirlineVerifiedDao verifiedDao;
     @Autowired
     AssessmentDao riskDao;
+    @Autowired
+    VerifyConditionDao verifyConditionDao;
 	public PageEntity<AirlineVerifyEntity> getAirlineVerifyList(AirlineVerifyBean bean) {
 		PageInfo<AirlineVerifyEntity> pageInfo = null;
         // 必须紧贴dao的查询方法
@@ -450,6 +449,7 @@ public List<com.ejweb.modules.route.entity.AirlineVerifyEntity> getRiskAssessmen
 		dao.updateByStatus(bean);
 		if("00".equals(bean.getVerifStatus())){
 			verifiedDao.updateStatus(bean);//将
+            verifyConditionDao.deleteConditionByVerifyId(bean.getVerifId());
 			routeDao.deleteRouteByVerifId(bean);//删除各部门论证
 		}
 		// 论证终止时，将所有涉及到的系统消息置灰