修改若干bug

1.条件可行无法审核
2.保存列表不显示已反馈；
3.效率统计双效匹配航线
4.保存应显示为未反馈

resources/mapper/modules/airport/StatisticalDao.xml

@@ -148,15 +148,11 @@
         <if test="verifType != null and verifType != ''">
             AND a.verif_type = #{verifType}
         </if>
-        AND (a.id in (
-        SELECT id FROM foc_airline_verify where depIata =#{depIata}   AND arrIata= #{arrIata} ) OR	a.id IN
-        (SELECT verif_id FROM foc_airline_connect WHERE depIata =#{depIata}  and arrIata =#{arrIata} AND is_main != '0')
-
-        )
+        AND ((b.depIata=#{depIata} and b.arrIata= #{arrIata}) or (b.arrIata=#{depIata} and b.depIata= #{arrIata}))
         <if test="aircraftType != null and aircraftType != ''">
             AND a.aircraft_type = #{aircraftType}
         </if>
-        GROUP BY verifNo,routeNo,arrIata,depIata
+        GROUP BY verifNo,routeNo
 
     </select>
 </mapper>
\ No newline at end of file

resources/mapper/modules/verify/AirlineVerifyDao.xml

@@ -472,28 +472,28 @@ union (SELECT 	apply_no,create_time AS create_date
         	verif_no AS verifNo, 
         	aircraft_type AS aircraftType,
         	depIata,
-            arrIata, 
-            roundtrip_type,
-            fat.type_name AS aircraftName,
-            CASE WHEN frv.status='0' THEN '00'
-        	ELSE frv.verify_status END routeStatus,
-        	CASE WHEN fav.verif_type='01' OR fav.verif_type='02' 
-            OR fav.verif_type='03' OR fav.verif_type='04' OR fav.verif_type='05'
-            THEN p.city_name
-            ELSE p.airport_name
-            END depName,
-            r.city_name AS arrName,            
-        	verif_status AS verifStatus,
-			CASE WHEN back_status != '0' THEN '2'
-			ELSE frv.status END status,
-        	verif_type AS verifType, 
-        	fav.start_time AS sailingDate, 
-        	DATE_FORMAT(fav.create_date, '%Y-%m-%d') AS createDate
-        	,pro.node_date
-        FROM foc_airline_verify fav
-        LEFT JOIN foc_route_verify frv ON fav.id = frv.verif_id 
-        LEFT JOIN foc_airline_conclusion s   ON fav.id = s.verif_id 
-        LEFT JOIN foc_aircraft_type fat ON fav.aircraft_type = fat.id 
+		arrIata,
+		roundtrip_type,
+		fat.type_name AS aircraftName,
+		CASE WHEN frv.status='0' THEN '00'
+		ELSE frv.verify_status END routeStatus,
+		CASE WHEN fav.verif_type='01' OR fav.verif_type='02'
+		OR fav.verif_type='03' OR fav.verif_type='04' OR fav.verif_type='05'
+		THEN p.city_name
+		ELSE p.airport_name
+		END depName,
+		r.city_name AS arrName,
+		frv.verify_status AS verifStatus,
+		CASE WHEN back_status != '0' THEN '2'
+		ELSE frv.status END status,
+		verif_type AS verifType,
+		fav.start_time AS sailingDate,
+		DATE_FORMAT(fav.create_date, '%Y-%m-%d') AS createDate
+		,pro.node_date
+		FROM foc_airline_verify fav
+		LEFT JOIN foc_route_verify frv ON fav.id = frv.verif_id
+		LEFT JOIN foc_airline_conclusion s ON fav.id = s.verif_id
+		LEFT JOIN foc_aircraft_type fat ON fav.aircraft_type = fat.id
         LEFT JOIN foc_airports p ON p.airport_iata = fav.depIata
         LEFT JOIN foc_airports r ON r.airport_iata = fav.arrIata    
         LEFT JOIN foc_verify_process pro ON pro.verif_id = fav.id 

src/com/ejweb/modules/im/service/HuaweiUCSyncService.java

@@ -957,7 +957,7 @@ public class HuaweiUCSyncService {
             numberInfo.getSip().getSipAuth().setPassword(maxSipNum + "@foc2016");
             //调用userProfileServiceEx服务中的addNumber方法，返回错误码
             Integer res = userProfileServiceEx.addNumber(numberInfo);
-
+            System.out.println("华为添加号码返回结果为:" + res);
             if (0 == res) {
                 return true;
             } else {

src/com/ejweb/modules/route/service/RouteVerifyService.java

@@ -230,7 +230,7 @@ public class RouteVerifyService extends BaseService<RouteVerifyDao> {
             for (FullVerifyConditionEntity verifyConditionEntity : verifyConditionEntities) {
                 verifyConditionEntity = verifyConditionEntities.get(0);
                 verifyConditionEntity.setConditionStatus(verifyStatus);
-                verifyConditionEntity.setComplete("1");
+//                verifyConditionEntity.setComplete("1");
                 // 完成审核通知置灰
                 NotifyAddBean addbean = new NotifyAddBean();
                 addbean.setVerifId(verifyConditionEntity.getId());
@@ -263,7 +263,7 @@ public class RouteVerifyService extends BaseService<RouteVerifyDao> {
         }
 
         if ("0".equals(bean.getStatus())) {
-            fullRouteVerifyEntity.setEndTime(new Date());
+//            fullRouteVerifyEntity.setEndTime(new Date());
             if ("02".equals(verifyStatus) || "03".equals(verifyStatus)) {
                 saveOrCommitVerify(bean, verifyStatus, fullRouteVerifyEntity);
             }