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

 /**
- * 
+ *
  */
 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
- * @time  2016年9月17日
+ * @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<VerifyManageEntity> findAllList(VerifyManageBean 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);
+    void updateDelFlag(List<String> verifyIds);
 
     void deleteProcess(VerifyProcessDeleteBean bean);
 
-    void  deleteProcessByNodeSort(VerifyProcessDeleteBean bean);
-    
+    void deleteProcessByNodeSort(VerifyProcessDeleteBean bean);
+
     void updateVerifed(VerifiedUpdateBean bean);
-    
+
     void deleteRiskFile(String verifId);
 
     void deleteRouteFile(String verifId);
+
     VerifyCountEntity getCount(String userCode);
 
     void deleteChange(String verifId);
-    
+
     void updateRecord(VerifyManageDetailEntity bean);
-    
+
     String getConnectName(String Iata);
 
 
     String getTypeName(List<String> list);
 
     String verifiedStatus(String verifid);
-    
+
     void insertAirTypes(VerifyManageDetailEntity entity);
-    
+
     void insertFiles(VerifyManageDetailEntity entity);
 
     void insertConnects(VerifyManageDetailEntity entity);
-    
-   // void updateCheck(ManageUpdateBean bean);
-    void  update_verify_file(ManageUpdateBean bean);
-    void  update_airline_connect(ManageUpdateBean bean);
-    void  update_airline_verify2type(ManageUpdateBean bean);
+
+    // 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);
 
     /**
      * 删除未审核记录
-     * @author zhanglg
-     * @time  2017年1月10日
+     *
      * @param verifId
+     * @author zhanglg
+     * @time 2017年1月10日
      */
-    
-    void deleteRecordNew(String verifId);
-
 
+    void deleteRecordNew(String verifId);
 
-    
 
 }