Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/impl/UserAnalysisServiceImpl.java

@@ -200,13 +200,14 @@ public class UserAnalysisServiceImpl implements UserAnalysisService {
             logger.info("机关名："+m.getName()+",总数="+m.getTotal());
         }
         //2021.5.25  平音客户热心居民改网格员  sun  start
-        if (StrConstant.PY_CUSTOMER.equals(tokenDto.getCustomerId())) {
+        //2021.121.17 应胡科家要求在改回去
+        /*if (StrConstant.PY_CUSTOMER.equals(tokenDto.getCustomerId())) {
             dimList.forEach(d->{
                 if("热心居民".equals(d.getType())){
                     d.setType("网格员");
                 }
             });
-        }
+        }*/
         //2021.5.25  平音客户热心居民改网格员  sun  end
         return dimList;
     }
@@ -333,13 +334,14 @@ public class UserAnalysisServiceImpl implements UserAnalysisService {
             logger.info("网格名："+m.getName()+",总数="+m.getTotal());
         }
         //2021.5.25  平音客户热心居民改网格员  sun  start
-        if (StrConstant.PY_CUSTOMER.equals(tokenDto.getCustomerId())) {
+        //2021.121.17 应胡科家要求在改回去
+        /*if (StrConstant.PY_CUSTOMER.equals(tokenDto.getCustomerId())) {
             dimList.forEach(d->{
                 if("热心居民".equals(d.getType())){
                     d.setType("网格员");
                 }
             });
-        }
+        }*/
         //2021.5.25  平音客户热心居民改网格员  sun  end
         return dimList;
     }
@@ -507,13 +509,14 @@ public class UserAnalysisServiceImpl implements UserAnalysisService {
             resultList.add(party);
         }
         //2021.5.25  平音客户热心居民改网格员  sun  start
-        if (StrConstant.PY_CUSTOMER.equals(tokenDto.getCustomerId())) {
+        //2021.121.17 应胡科家要求在改回去
+        /*if (StrConstant.PY_CUSTOMER.equals(tokenDto.getCustomerId())) {
             resultList.forEach(d->{
                 if("热心居民".equals(d.getType())){
                     d.setType("网格员");
                 }
             });
-        }
+        }*/
         //2021.5.25  平音客户热心居民改网格员  sun  end
         return resultList;
     }

epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml

@@ -279,7 +279,12 @@
         floor(diff.EVENT_COST_TIME/60) AS totalHours,
         diff.EVENT_RE_ORG AS reOrg,
         diff.EVENT_HANDLED_COUNT AS handledCount,
-        IFNULL(spd.SATISFACTION_SCORE,80) AS score
+        <if test="status!= null and status == 'pending'">
+            spd.SATISFACTION_SCORE AS score
+        </if>
+        <if test="status!= null and status == 'closed'">
+            IFNULL(spd.SATISFACTION_SCORE,80) AS score
+        </if>
         FROM
         (
             select scg.AREA_CODE,sdd1.* from screen_difficulty_data sdd1