修改条件评估论证bug

resources/jdbc.properties

 #MySQL Database Config(The All Config Is Must)
 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.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  
+#\u521d\u59cb\u5316\u8fde\u63a5
 jdbc.initialSize=0
 #\u8fde\u63a5\u6c60\u7684\u6700\u5927\u6d3b\u52a8\u4e2a\u6570  
 jdbc.maxActive=20

resources/mapper/modules/verify/VerifyFeedbackDao.xml

@@ -190,7 +190,7 @@
         <if test="aircraftType != null and aircraftType != ''">
             AND a.aircraft_type = #{aircraftType}
         </if>
-        group by a.id
+        group by a.id,depart_name
 
     </select>
 
@@ -319,8 +319,8 @@
                 a.del_flag = #{DEL_FLAG_NORMAL}
                 AND a.verif_id = #{verifId}
                 AND f.depart_id = #{userDepartId}
-                -- AND f.feedback_status='00'
-                group by a.verif_id,f.depart_id
+                AND a.depart_id= #{departId}
+                -- group by a.verif_id,f.depart_id
             </when>
             <otherwise>
                 WHERE
@@ -372,6 +372,7 @@
                 left join foc_condition_feedback f on v.id=f.condition_id
                 where f.depart_id=#{userDepartId}
                 and v.verif_id=#{verifId}
+                AND v.depart_id= #{departId}
                 group by v.id
             </when>
             <otherwise>

resources/mybatis-config.xml

@@ -37,6 +37,6 @@
         <setting name="jdbcTypeForNull" value="NULL"/>
 
         <!--打印sql-->
-        <!--<setting name="logImpl" value="STDOUT_LOGGING"/>-->
+        <setting name="logImpl" value="STDOUT_LOGGING"/>
     </settings>
 </configuration>

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

@@ -243,7 +243,7 @@ public class VerifyFeedbackService extends BaseService<VerifyFeedbackDao> {
     }
 
     private List<ConditionDetailData> getConditionDetailData(VerifyFeedbackDetailBean verifyFeedbackBean) {
-        List<ConditionDetailData> conditions = dao.findByVerifyIdAndDepartId(verifyFeedbackBean);
+         List<ConditionDetailData> conditions = dao.findByVerifyIdAndDepartId(verifyFeedbackBean);
         List<ConditionDetailData> conditionList = new ArrayList<>();
         if (!CollectionUtils.isEmpty(conditions)) {
             for (ConditionDetailData data : conditions) {