履职代码优化

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

@@ -296,16 +296,20 @@ public class ResumptionServiceImpl implements ResumptionService {
             List<ResumptionNFCVo> news = new ArrayList<>();
             Set<Long> areaIds = new HashSet<>();
             Set<String> acs = new HashSet<>();
+            Map<String,Integer> scans = new HashMap<>();
             for (ResumptionPlanVo vo : resumptionPlanVos) {
                 Long areaId = vo.getAreaId();
                 Long checkId = vo.getCheckId();
+                Integer pointScan = vo.getPointScan();
 
                 if(areaId != null && checkId == null){
                     areaIds.add(areaId);
+                    scans.put(areaId.toString(),pointScan);
                 }
 
                 if(areaId!=null && checkId != null){
                     acs.add(areaId + "_" + checkId);
+                    scans.put(areaId + "_" + checkId,pointScan);
                 }
 
             }
@@ -313,10 +317,14 @@ public class ResumptionServiceImpl implements ResumptionService {
             for (ResumptionNFCVo nfc : nfcs) {
                 nfc.setStatus(0);
                 if(areaIds.contains(nfc.getAreaId())){
+                    Integer scan = scans.get(nfc.getAreaId());
+                    nfc.setPointScan(scan);
                     news.add(nfc);
                 }
 
                 if(acs.contains(nfc.getAreaId() + "_"+ nfc.getCheckId())){
+                    Integer scan = scans.get(nfc.getAreaId() + "_"+ nfc.getCheckId());
+                    nfc.setPointScan(scan);
                     news.add(nfc);
                 }
             }