修改条件评估论证bug

resources/mapper/modules/verify/CondationDao.xml

@@ -349,7 +349,7 @@
     <select id="getUndoneCondition" resultType="Integer">
         select count(*) from foc_verify_condition
         where route_id=#{routeId}
-        and (is_feed=0 or is_feed=1)
+        and ((is_feed=0 or is_feed=1) or (is_feed=2 and review_type=1))
     </select>
 
     <update id="updateCompleteByRouteId">

resources/mapper/modules/verify/VerifyFeedbackDao.xml

@@ -129,7 +129,7 @@
         LEFT JOIN foc_user_depart r ON s.depart_id=r.id
         WHERE
         a.del_flag = #{DEL_FLAG_NORMAL}
-        AND (s.is_feed='1' OR s.is_feed='2') AND s.complete='0'
+        AND (s.is_feed='1' OR s.is_feed='2' OR s.is_feed='3') AND s.complete='0'
         -- AND s.is_feed='0' AND s.complete='0'
         AND s.depart_id = (SELECT depart_id FROM sys_user_profiles WHERE user_id = #{userCode})
         UNION ALL
@@ -407,6 +407,7 @@
         select count(id)
         from foc_verify_condition
         where verif_id=#{verifyId}
+        and depart_id=#{departId}
         and ((is_feed!=2 and review_type=0) or (is_feed!=3 and review_type=1))
         and del_flag=0
     </select>

src/com/ejweb/core/util/Util.java

@@ -766,6 +766,6 @@ public class Util {
 ////        System.out.println(Util.getRelativePath("https://ifos.jdair.net/foc/static/2017/01/13/actuals/images/user/jpg/23198d70826ac171ee03ed5cd3d14c27.jpg"));
 //    }
     public static void main(String[] args) {
-    	System.out.println(Util.entryptPassword("123456"));
-	}
+        System.out.println(Util.validatePassword("Hjwx#1234", "247fd14c5d908a8312dc23e175e86c4f2e011fb76e08827cd65c962b"));
+    }
 }

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

@@ -181,25 +181,25 @@ public class RecordChangeVerifyController {
                 manageService.update_airline_connect(bean.getVerifId(), "foc_airline_connect","2", "0");
                 // 删除未审核子机型
                 manageService.delete_airline_verify2type(bean.getVerifId(),"foc_airline_verify2type","0");
-                manageService.update_airline_verify2type(bean.getVerifId(), "foc_airline_verify2type","2", "0");
+                manageService.update_airline_verify2type(bean.getVerifId(), "foc_airline_verify2type", "2", "0");
             }
             recordChangeVerifyService.update(bean);
             // 更新开航时间
-           VerifyProcessUpdateBean pbean=new VerifyProcessUpdateBean();
-           pbean.setNodeId(id);
-           pbean.setNodeDate(bean.getSailingDate());
-           verifyProcessService.updateStartTime(pbean);
-            
+            VerifyProcessUpdateBean pbean = new VerifyProcessUpdateBean();
+            pbean.setNodeId(id);
+            pbean.setNodeDate(bean.getSailingDate());
+            verifyProcessService.updateStartTime(pbean);
 
-            if("01".equals(bean.getRecordStatus())){
-                /**
-                 * 邮件发送 论证变更
-                 */ 
-                recordChangeVerifyService.sendMail(bean.getVerifId());
-          
-                VerifiedDetailEntity entity= manageService.getVerifed(bean.getVerifId());
-                manageService.sendMailChange(bean.getVerifId(),entity.getSailingDate(),bean.getSailingDate());
-            }
+
+//            if("01".equals(bean.getRecordStatus())){
+//                /**
+//                 * 邮件发送 论证变更
+//                 */
+//                recordChangeVerifyService.sendMail(bean.getVerifId());
+//
+//                VerifiedDetailEntity entity= manageService.getVerifed(bean.getVerifId());
+//                manageService.sendMailChange(bean.getVerifId(),entity.getSailingDate(),bean.getSailingDate());
+//            }
             return responseBean;
         }
         // 参数校验为不通过

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

@@ -12,6 +12,7 @@ import com.ejweb.modules.verify.bean.VerifyFeedbackUpdateBean;
 import com.ejweb.modules.verify.data.ConditionDetailData;
 import com.ejweb.modules.verify.entity.VerifyFeedbackDetailEntity;
 import com.ejweb.modules.verify.entity.VerifyFeedbackEntity;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -45,7 +46,7 @@ public interface VerifyFeedbackDao extends BaseDao {
      */
     List<ConditionDetailData> findByVerifyIdAndDepartId(VerifyFeedbackDetailBean bean);
 
-    int getUnfinishCount(String verifyId);
+    int getUnfinishCount(@Param(value = "verifyId") String verifyId, @Param(value = "departId") String departId);
 
     // 更新反馈信息
     int updateFeedback(VerifyFeedbackUpdateBean bean);

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

@@ -128,7 +128,7 @@ public class VerifyFeedbackService extends BaseService<VerifyFeedbackDao> {
             return null;
         }
         //判断是否所有条件完成
-        int count = dao.getUnfinishCount(bean.getVerifId());
+        int count = dao.getUnfinishCount(bean.getVerifId(), bean.getDepartId());
         if (count == 0) {
             feed.setConditionComplete(1);
         }