1.申请单批量删除

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

resources/jdbc.properties

@@ -3,7 +3,6 @@ db.table.prefix=foc_
 jdbc.type=mysql
 jdbc.driver.class=com.mysql.jdbc.Driver
 jdbc.url=jdbc:mysql://106.75.105.96:5508/jd_foc?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull
-#jdbc.url=jdbc:mysql://localhost:5508/jd_foc?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull
 jdbc.username=sms_develop
 jdbc.password=Develop2018!@#
 #\u521d\u59cb\u5316\u8fde\u63a5

resources/mapper/modules/sailing/SailingConclusionDao.xml

@@ -60,25 +60,28 @@
             </foreach>
             AND is_main != '0')
             )
-        </if>
-	        <if test="priority != null and priority != ''">
-	        	AND a.priority = #{priority}
-	        </if>
-	          <if test="aircraftType != null and aircraftType != ''">
-	        	AND a.aircraft_type = #{aircraftType}
-	        </if>
-	        <if test="verifType != null and verifType != ''">
-	        	AND a.verif_type = #{verifType}
-	        </if>
-	         <if test="verifStatus != null and verifStatus != ''">
-	        	AND a.verif_status = #{verifStatus}
-	        </if>
-                  AND a.verif_status ='00'
-	        	<choose>
-	        	<when test="conclusionStatus != null and conclusionStatus != ''">
+		</if>
+		<if test="priority != null and priority != ''">
+			AND a.priority = #{priority}
+		</if>
+		<if test="aircraftType != null and aircraftType != ''">
+			AND a.aircraft_type = #{aircraftType}
+		</if>
+		<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>
+		AND a.verif_status ='00'
+		<choose>
+			<when test="conclusionStatus != null and conclusionStatus != ''">
 				AND c.conclusion_status = #{conclusionStatus}
-				</when>
-				<otherwise>
+			</when>
+			<otherwise>
 				AND c.conclusion_status ='00'
 				</otherwise>
 				</choose>

resources/mapper/modules/verify/VerifyManageDao.xml

@@ -481,10 +481,13 @@
 
     </insert>
     <update id="updateDelFlag">
-      UPDATE foc_airline_verify
-      SET del_flag='1'
-      WHERE id=#{verifId}
-     </update>
+        UPDATE foc_airline_verify
+        SET del_flag='1'
+        WHERE id in
+        <foreach collection="list" item="item" index="index" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+    </update>
     <delete id="deleteProcess">
       DELETE FROM foc_verify_process
       WHERE verif_id=#{verifId} AND node_sort <![CDATA[>]]> #{nodeSort}

src/com/ejweb/modules/sailing/bean/SailingConclusionListBean.java

@@ -31,6 +31,10 @@ public class SailingConclusionListBean extends GenericBean {
     private int pageNo = 1;
     private String aircraftType;
     private String conclusionStatus = "00";
+    /**
+     * 是否包含调机类型
+     */
+    private String includeTuneType;
 
     List arrIataList;
     List depIataList;
@@ -147,4 +151,11 @@ public class SailingConclusionListBean extends GenericBean {
         this.aircraftType = aircraftType;
     }
 
+    public String getIncludeTuneType() {
+        return includeTuneType;
+    }
+
+    public void setIncludeTuneType(String includeTuneType) {
+        this.includeTuneType = includeTuneType;
+    }
 }

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

@@ -5,6 +5,8 @@ import com.ejweb.core.base.PageEntity;
 import com.ejweb.core.util.IdWorker;
 import com.ejweb.core.util.PlanUtil;
 import com.ejweb.core.util.VerifyEmailHandler;
+import com.ejweb.modules.depart.dao.DepartDao;
+import com.ejweb.modules.depart.entity.DepartEntity;
 import com.ejweb.modules.notify.bean.NotifyAddBean;
 import com.ejweb.modules.notify.dao.NotifyDao;
 import com.ejweb.modules.sailing.bean.SailingConclusionDetailBean;
@@ -27,10 +29,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 开航总结表sevice
@@ -46,8 +45,23 @@ public class SailingConclusionService extends BaseService<SailingConclusionDao>
     AirlineVerifyDao verifyDao;
     @Autowired
     VerifyManageDao manageDao;
+    @Autowired
+    DepartDao departDao;
 
     public PageEntity<SailingConclusionListEntity> getList(SailingConclusionListBean bean) {
+        //如果用户为市场部且论证类型为调机（verify_type=05），直接返回空（调机类型市场部不做开航总结）
+        DepartEntity departEntity = departDao.getByUserCode(bean.getUserCode());
+        if (Objects.isNull(departEntity)) {
+            return null;
+        }
+        if (("6e70812e4c874f298da21be2a12aa674").equals(departEntity.getId())) {
+            if ("05".equals(bean.getVerifType())) {
+                return null;
+            } else {
+                bean.setIncludeTuneType("2");
+            }
+        }
+
         //查询同一机场被屏蔽三字码数据（历史数据关联）
         if (StringUtils.isNotEmpty(bean.getArrIata())) {
             bean.setArrIataList(verifyDao.getIataStr(bean.getArrIata()));
@@ -62,6 +76,7 @@ public class SailingConclusionService extends BaseService<SailingConclusionDao>
         } else {
             PageHelper.orderBy(bean.getSort());
         }
+        //如果userCode为市场部，查询不包含调机类型的开航总结
         pageInfo = new PageInfo<SailingConclusionListEntity>(dao.getList(bean));
         // 页码大于总页数，则返回NULL
         if (pageInfo.getPages() < bean.getPageNo()) {
@@ -76,8 +91,9 @@ public class SailingConclusionService extends BaseService<SailingConclusionDao>
             entity.setTypeList(verifyDao.getTypeList(entity.getVerifId()));
             entity.setConnect(verifyDao.getConnectList(entity.getVerifId()));
             String typelist = verifyDao.getTypeList1(entity.getVerifId());
-            if (StringUtils.isNoneBlank(typelist))
+            if (StringUtils.isNoneBlank(typelist)) {
                 entity.setAircraftName(entity.getAircraftName() + ":" + typelist);
+            }
         }
         PageEntity<SailingConclusionListEntity> page = new PageEntity<SailingConclusionListEntity>();
         page.setPageNo(pageInfo.getPageNum());
@@ -93,8 +109,9 @@ public class SailingConclusionService extends BaseService<SailingConclusionDao>
         for (SailingConclusionListEntity entity : list) {
             entity.setDepIataLabel(verifyDao.getConnetList(entity.getVerifId()));
             String typelist = verifyDao.getTypeList1(entity.getVerifId());
-            if (StringUtils.isNoneBlank(typelist))
+            if (StringUtils.isNoneBlank(typelist)) {
                 entity.setAircraftName(entity.getAircraftName() + ":" + typelist);
+            }
         }
         return list;
     }
@@ -178,13 +195,10 @@ public class SailingConclusionService extends BaseService<SailingConclusionDao>
         ls.add("e4q231wdfdfkukjqe53457dgfdhdfhd");
         entity1.setList(ls);
         List<String> mails = verifyDao.getmailYK(entity1);
-        
 
-     /*   List<String> ls=new ArrayList<String>();
-        ls.add("6e70812e4c874f298da21be2a12aa674");
-        entity1.setList(ls);
-        List<String> mails=  verifyDao.getmailNew1(entity1);*/
-        if (mails == null || mails.size() == 0) return;
+        if (mails == null || mails.size() == 0) {
+            return;
+        }
         String templateName = "template_8_2.ftl";
         Map<String, String> map = verifyDao.getDetail(verifId);
         String flight = PlanUtil.flightContent(map);

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

@@ -114,14 +114,14 @@ public class VerifyManageController {
     @RequestMapping("delete")
     public ResponseBean delete(RequestBean requestBean) {
         ResponseBean responseBean = new ResponseBean();
-        VerifyManageUpdateBean bean = requestBean.getObjectBean(VerifyManageUpdateBean.class);
+        VerifyManageUpdateBatchBean bean = requestBean.getObjectBean(VerifyManageUpdateBatchBean.class);
         String message = null;
         if (bean.getVerifId() == null || "".equals(bean.getVerifId())) {
             message = "VerifId 不能为空";
         }
         if (message == null) {// 通过参数校验
-            manageService.updateDelFlag(bean.getVerifId());
-            // airLineVerifyService.delete(bean);
+            manageService.updateDelFlag(bean);
+//             airLineVerifyService.delete(bean);
             return responseBean;
         }
         // 参数校验为通过

src/com/ejweb/modules/verify/bean/VerifyManageUpdateBatchBean.java

+package com.ejweb.modules.verify.bean;
+
+import com.ejweb.core.base.GenericBean;
+import org.hibernate.validator.constraints.NotEmpty;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author LEGION
+ */
+public class VerifyManageUpdateBatchBean extends GenericBean {
+    public static final String DEL_FLAG_NORMAL = "0";
+
+    @NotNull(message = "verifId不能为空")
+    private String[] verifId;
+    @NotEmpty(message = "manageStatus不能为空")
+    private String manageStatus;
+    @NotEmpty(message = "userCode不能为空")
+    private String userCode;
+
+    public String[] getVerifId() {
+        return verifId;
+    }
+
+    public void setVerifId(String[] verifId) {
+        this.verifId = verifId;
+    }
+
+    public String getManageStatus() {
+        return manageStatus;
+    }
+
+    public void setManageStatus(String manageStatus) {
+        this.manageStatus = manageStatus;
+    }
+
+    public String getUserCode() {
+        return userCode;
+    }
+
+    public void setUserCode(String userCode) {
+        this.userCode = userCode;
+    }
+}

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

@@ -54,7 +54,8 @@ public interface VerifyManageDao  extends BaseDao{
     void delete_airline_connect(VerifyManageDeleteBean bean);
     void delete_airline_verify2type(VerifyManageDeleteBean bean);
     void delete_airline_verified(VerifyManageDeleteBean bean);
-    void updateDelFlag(String verifId);
+
+ void updateDelFlag(List<String> verifyIds);
 
     void deleteProcess(VerifyProcessDeleteBean bean);
 

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

@@ -111,6 +111,12 @@ public class AirlineVerifyService extends BaseService<AirlineVerifyDao> {
 
     public PageEntity<com.ejweb.modules.route.entity.AirlineVerifyEntity> getRiskAssessmentList(com.ejweb.modules.route.bean.AirlineVerifyBean bean) {
 
+        if (StringUtils.isNotEmpty(bean.getArrIata())) {
+            bean.setArrIataList(dao.getIataStr(bean.getArrIata()));
+        }
+        if (StringUtils.isNotEmpty(bean.getDepIata())) {
+            bean.setDepIataList(dao.getIataStr(bean.getDepIata()));
+        }
         //如果论证状态没有传参，默认为00  00论证中,01终止,02成功
         if (StringUtils.isBlank(bean.getVerifStatus())) {
             bean.setVerifStatus("00");