履职代码优化

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

@@ -281,7 +281,7 @@ public class ResumptionServiceImpl implements ResumptionService {
     }
 
 
-    private void getTaskNfc(List<ResumptionPlanVo> resumptionPlanVos,List<ResumptionNFCVo> nfcs,Resumption resumption){
+    private List<ResumptionNFCVo> getTaskNfc(List<ResumptionPlanVo> resumptionPlanVos,List<ResumptionNFCVo> nfcs,Resumption resumption){
 
         if (ResumptionStatus.COMPLETED.getCode().equals(resumption.getStatus())) {
             //已提交的只显示nfc扫描的记录
@@ -313,6 +313,7 @@ public class ResumptionServiceImpl implements ResumptionService {
             }
 
             for (ResumptionNFCVo nfc : nfcs) {
+                nfc.setStatus(0);
                 if(areaIds.contains(nfc.getAreaId())){
                     news.add(nfc);
                 }
@@ -323,8 +324,8 @@ public class ResumptionServiceImpl implements ResumptionService {
             }
             nfcs.clear();;
             nfcs.addAll(news);
-
         }
+        return nfcs;
     }
 
 
@@ -354,7 +355,7 @@ public class ResumptionServiceImpl implements ResumptionService {
          * 获取 机构下所有nfc数据
          */
         List<ResumptionNFCVo> nfcs = resumptionMapper.selectNFCOfOrg(resumption.getId(), resumption.getOrgId());
-        getTaskNfc(resumptionPlanVos,nfcs,resumption);
+        nfcs = getTaskNfc(resumptionPlanVos,nfcs,resumption);
 
         /**
          * nfc按区域分组，并统计已扫描和未扫描的数量

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/gx/vo/ResumptionNFCVo.java

@@ -45,7 +45,7 @@ public class ResumptionNFCVo {
     /**
      * 扫描状态
      */
-    private Integer status = 0;
+    private Integer status;
 
     /**
      * 扫描方法