[task-5671] 同步dev1缺陷task-5154修复

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/business/service/impl/FacilityEnvironmentServiceImpl.java

@@ -59,7 +59,8 @@ public class FacilityEnvironmentServiceImpl implements FacilityEnvironmentServic
         String sql3 = "select p.id_ from IBPS_PARTY_POSITION p INNER JOIN ibps_party_rel r on p.id_=r.MAIN_PID_ " +
                 "where r.sub_pid_='%s' and r.BIZ_='mainPost' ORDER BY p.CREATE_TIME_ DESC";
         Map<String, Object> data = commonDao.queryOne(String.format(sql3,userId));
-        String fetchSql = "SELECT jian_ce_zhou_qi_,facs_type,pos.name_,COUNT(shi_fou_guo_shen_<>'已完成'  OR NULL ) AS todo,COUNT(shi_fou_guo_shen_='已完成'  OR NULL) AS done ,MAX(facs.pagePath) AS pagePath" +
+        String fetchSql = "SELECT jian_ce_zhou_qi_,facs_type,pos.name_,COUNT(NOT( shi_fou_guo_shen_ = '已完成' OR shi_fou_guo_shen_ = '无需处理' ) OR NULL ) AS todo," +
+                "   COUNT((shi_fou_guo_shen_ = '已完成' OR shi_fou_guo_shen_ = '无需处理' ) OR NULL ) AS done ,MAX(facs.pagePath) AS pagePath" +
                 "   FROM v_facs_summary_daily, ibps_party_position pos,(SELECT DISTINCT pagePath,`type` FROM v_facs WHERE pagePath <>'') facs" +
                 "   WHERE FIND_IN_SET(bian_zhi_bu_men_,'%s') AND bian_zhi_bu_men_=pos.id_ AND facs_type = facs.type" +
                 "   GROUP BY jian_ce_zhou_qi_,facs_type,bian_zhi_bu_men_ ORDER BY facs_type;";
@@ -67,7 +68,8 @@ public class FacilityEnvironmentServiceImpl implements FacilityEnvironmentServic
             mainPosition = data.get("id_").toString();
         }
         if (BeanUtils.isNotEmpty(mainPosition) && mainPosition.equals(jyk)){
-            fetchSql =  "SELECT jian_ce_zhou_qi_,facs_type,pos.name_,COUNT(shi_fou_guo_shen_<>'已完成'  OR NULL ) AS todo,COUNT(shi_fou_guo_shen_='已完成'  OR NULL) AS done ,MAX(facs.pagePath) AS pagePath" +
+            fetchSql =  "SELECT jian_ce_zhou_qi_,facs_type,pos.name_,COUNT(NOT( shi_fou_guo_shen_ = '已完成' OR shi_fou_guo_shen_ = '无需处理' ) OR NULL ) AS todo," +
+                    "   COUNT((shi_fou_guo_shen_ = '已完成' OR shi_fou_guo_shen_ = '无需处理' ) OR NULL ) AS done ,MAX(facs.pagePath) AS pagePath" +
                     "   FROM v_facs_summary_daily, ibps_party_position pos,(SELECT DISTINCT pagePath,`type` FROM v_facs WHERE pagePath <>'') facs" +
                     "   WHERE di_dian_='%s' AND bian_zhi_bu_men_=pos.id_ AND facs_type = facs.type" +
                     "   GROUP BY jian_ce_zhou_qi_,facs_type,bian_zhi_bu_men_ ORDER BY facs_type;";