履职代码优化

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/gx/service/ResumptionServiceImpl.java

@@ -370,9 +370,6 @@ public class ResumptionServiceImpl implements ResumptionService {
             imgMap = getResumptionDataImg(resumption.getId());
         }
 
-        //履职数据，统计分类
-        Integer yesPointNum = 0;
-        Integer noPointNum = 0;
 
         //每个区域的检查项和检查内容数据
         Map<String, ResumptionItemVo> itemMap = new HashMap<>();
@@ -381,7 +378,7 @@ public class ResumptionServiceImpl implements ResumptionService {
         //区域数据
         Map<Long, AreaResumptionVo> map = new HashMap<>();
 
-        dealData(resumptionPlanVos, imgMap, itemMap, itComMap, map, noPointNum, yesPointNum, isExist);
+        dealData(resumptionPlanVos, imgMap, itemMap, itComMap, map,taskVo, isExist);
 
 
         int yesNFC = 0;
@@ -419,8 +416,6 @@ public class ResumptionServiceImpl implements ResumptionService {
 
         taskVo.setNoNFCNums(noNFC);
         taskVo.setYesNFCNums(yesNFC);
-        taskVo.setNoPointNums(noPointNum);
-        taskVo.setYesPointNums(yesPointNum);
         taskVo.setAreas(areas);
         taskVo.setChecks(ListUtil.toList(itemMap.values()));
         taskVo.setNfcs(nfcs );
@@ -466,8 +461,6 @@ public class ResumptionServiceImpl implements ResumptionService {
      * @param itemMap           要点数据
      * @param itComMap          区域数据
      * @param map               区域数据
-     * @param noPointNum        未执行的检查要点
-     * @param yesPointNum       已执行的检查要点
      * @param isExist           是否已完成
      */
     private void dealData(List<ResumptionPlanVo> resumptionPlanVos,
@@ -475,9 +468,11 @@ public class ResumptionServiceImpl implements ResumptionService {
                           Map<String, ResumptionItemVo> itemMap,
                           Map<Long, Map<String, Integer>> itComMap,
                           Map<Long, AreaResumptionVo> map,
-                          Integer noPointNum,
-                          Integer yesPointNum, boolean isExist) {
+                          ResumptionTaskDetailVo taskVo,
+                           boolean isExist) {
 
+        Integer noPointNum = 0;
+        Integer yesPointNum = 0;
         for (ResumptionPlanVo vo : resumptionPlanVos) {
 
             if (vo.getDataStatus() == 1) {
@@ -553,6 +548,8 @@ public class ResumptionServiceImpl implements ResumptionService {
 
             itemMap.put(vo.getItemId() + "_" + vo.getAreaId(), resumptionItemVo);
         }
+        taskVo.setNoPointNums(noPointNum);
+        taskVo.setYesPointNums(yesPointNum);
     }