航线论证数据统计剩余天数修改

src/com/ejweb/modules/airport/service/StatisticalService.java

@@ -3,12 +3,6 @@
  */
 package com.ejweb.modules.airport.service;
 
-import java.util.List;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.ejweb.core.base.BaseService;
 import com.ejweb.core.base.PageEntity;
 import com.ejweb.modules.airport.bean.StatisticalBean;
@@ -19,12 +13,16 @@ import com.ejweb.modules.verify.dao.AirlineVerifiedDao;
 import com.ejweb.modules.verify.dao.AirlineVerifyDao;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 /**
- * 
- * @team suzhou
  * @author huhy
  * @version 1.0
+ * @team suzhou
  * @time 2016年9月8日
  */
 @Service
@@ -34,49 +32,56 @@ public class StatisticalService extends BaseService<StatisticalDao> {
     private AirlineVerifiedDao airlineVerifiedDao;
     @Autowired
     private AirlineVerifyDao verifdao;
+
     public PageEntity<StatisticalEntity> getStatisticalList(StatisticalBean bean) {
         PageInfo<StatisticalEntity> pageInfo = null;
         // 必须紧贴dao的查询方法
         PageHelper.startPage(bean.getPageNo(), bean.getPageSize());
         AirlineVerifiedAddBean abean = new AirlineVerifiedAddBean();
         abean.setUserCode(bean.getUserCode());
-        if(StringUtils.isEmpty(bean.getSort())){
+        if (StringUtils.isEmpty(bean.getSort())) {
             PageHelper.orderBy("source,routeNo DESC");
-        }
-        else
-        PageHelper.orderBy("source,"+bean.getSort());
+        } else
+            PageHelper.orderBy("source," + bean.getSort());
         List<StatisticalEntity> lists = dao.getStatisticalList(bean);
         String departId = airlineVerifiedDao.findDepartId(abean);
-        for(StatisticalEntity e : lists ){
-            String typelist=verifdao.getTypeList1(e.getVerifId());
-            if(StringUtils.isNoneBlank(typelist))
-               e.setTypeName(e.getTypeName()+":"+typelist);
+        for (StatisticalEntity e : lists) {
+            String typelist = verifdao.getTypeList1(e.getVerifId());
+            if (StringUtils.isNoneBlank(typelist))
+                e.setTypeName(e.getTypeName() + ":" + typelist);
             e.setTypeList(verifdao.getTypeList(e.getVerifId()));
-            if(departId.equals(e.getDepartId()))
+            if (departId.equals(e.getDepartId()))
                 e.setReStart(true);
             else
                 e.setReStart(false);
-            if("06".equals(e.getVerifType())||"07".equals(e.getVerifType())
-                    ||"08".equals(e.getVerifType())){
+            if ("06".equals(e.getVerifType()) || "07".equals(e.getVerifType())
+                    || "08".equals(e.getVerifType())) {
                 e.setExpiryDate("长期有效");
 
-            }else{
+            } else {
                 Integer day = dao.getDay(e);
-                if(day!=null){
-                    if(day<=0)day=0;
+                if (day != null) {
+                    if (day > 180) {
+                        day = 180 - day;
+                        e.setExpiryDate(day + "");
+                    } else {
+                        if (day <= 0) {
+                            day = 0;
+                        }
                         // day=180-day;
-                   Integer cha= Integer.parseInt(e.getExpiryDate()==null?"0":e.getExpiryDate()) ;
+                        Integer cha = Integer.parseInt(e.getExpiryDate() == null ? "0" : e.getExpiryDate());
 
-                   if(cha<day){
-                       day=cha;
+                        if (cha < day) {
+                            day = cha;
+                        }
+                        day = 180 - day;
+                        e.setExpiryDate(day + "");
                     }
-                   day=180-day;
-                   e.setExpiryDate(day+"");
-                }else if(StringUtils.isNoneBlank(e.getExpiryDate())){
+                } else if (StringUtils.isNoneBlank(e.getExpiryDate())) {
 
-                    day=Integer.parseInt(e.getExpiryDate()) ;
-                    day=180-day;
-                    e.setExpiryDate(day+"");
+                    day = Integer.parseInt(e.getExpiryDate());
+                    day = 180 - day;
+                    e.setExpiryDate(day + "");
                 }