申请单管理

resources/mapper/modules/verify/VerifyManageDao.xml

@@ -50,7 +50,8 @@
         LEFT JOIN foc_aircraft_type q ON q.id = a.aircraft_type
         WHERE
         a.del_flag = #{DEL_FLAG_NORMAL}
-        AND a.verif_status!='02'
+        AND a.verif_status!='02' AND !(( a.verif_status ='01' or a.verif_status='03' ) AND a.verif_no IS not NULL)
+
         <if test="verifNo != null and verifNo != ''">
             AND a.verif_no LIKE CONCAT('%', #{verifNo}, '%')
         </if>

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

@@ -8,6 +8,7 @@ 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.airport.entity.StatisticalListEntity;
 import com.ejweb.modules.depart.dao.DepartDao;
 import com.ejweb.modules.depart.entity.DepartEntity;
 import com.ejweb.modules.notify.bean.NotifyAddBean;
@@ -86,6 +87,19 @@ public class VerifyManageService extends BaseService<VerifyManageDao> {
         if (list == null || list.size() == 0) {
             return null;
         }
+
+        /*//使用迭代器进行筛选
+        Iterator<VerifyManageEntity> iter = list.iterator();
+        while(iter.hasNext()){
+            VerifyManageEntity str =  iter.next();
+            //当此对象状态与传入状态不一致时remove对象
+            if (StringUtils.isNotEmpty(str.getVerifNo())) {
+                if( "01".equals(str.getVerifStatus()) || "03".equals(str.getVerifStatus())){
+                    iter.remove();
+                }
+            }
+        }*/
+
         for (VerifyManageEntity entity : list) {
             entity.setTypeList(verifyDao.getTypeList(entity.getVerifId()));
             entity.setConnect(verifyDao.getConnectList(entity.getVerifId()));