|
|
@@ -294,7 +294,9 @@ public class ResumptionServiceImpl implements ResumptionService {
|
|
|
}
|
|
|
|
|
|
if(ResumptionStatus.NO_START.getCode().equals(resumption.getStatus()) ||
|
|
|
- ResumptionStatus.OUT_DATE.getCode().equals(resumption.getStatus())){
|
|
|
+ ResumptionStatus.OUT_DATE.getCode().equals(resumption.getStatus()) ||
|
|
|
+ ResumptionStatus.PROGRESS.getCode().equals(resumption.getStatus())
|
|
|
+ ){
|
|
|
//待履职时,需要对所有标签进行筛选
|
|
|
List<ResumptionNFCVo> news = new ArrayList<>();
|
|
|
Set<String> areaIds = new HashSet<>();
|
|
|
@@ -318,7 +320,9 @@ public class ResumptionServiceImpl implements ResumptionService {
|
|
|
}
|
|
|
|
|
|
for (ResumptionNFCVo nfc : nfcs) {
|
|
|
- nfc.setStatus(0);
|
|
|
+ if( !ResumptionStatus.PROGRESS.getCode().equals(resumption.getStatus())){
|
|
|
+ nfc.setStatus(0);
|
|
|
+ }
|
|
|
if(areaIds.contains(nfc.getAreaId().toString())){
|
|
|
Integer scan = scans.get(nfc.getAreaId().toString());
|
|
|
nfc.setPointScan(scan);
|