|
|
@@ -4,11 +4,8 @@ import cn.hutool.core.collection.ListUtil;
|
|
|
import cn.hutool.core.date.DateUtil;
|
|
|
import cn.hutool.core.util.NumberUtil;
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
|
|
|
-import com.mysql.cj.jdbc.exceptions.MySQLTransactionRollbackException;
|
|
|
import com.xunmei.common.core.constant.SecurityConstants;
|
|
|
import com.xunmei.common.core.exception.ServiceException;
|
|
|
import com.xunmei.common.core.utils.DateHelper;
|
|
|
@@ -23,20 +20,14 @@ import com.xunmei.core.resumption.enums.ResumptionStatus;
|
|
|
import com.xunmei.core.resumption.gx.vo.*;
|
|
|
import com.xunmei.core.resumption.mapper.*;
|
|
|
import com.xunmei.core.resumption.service.AppPlanService;
|
|
|
-import com.xunmei.core.resumption.vo.ResumptionTaskNewDto;
|
|
|
import com.xunmei.system.api.RemoteOrgService;
|
|
|
import com.xunmei.system.api.domain.SysOrg;
|
|
|
-import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
-import org.springframework.transaction.TransactionManager;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
import org.springframework.transaction.support.TransactionSynchronization;
|
|
|
-import org.springframework.transaction.support.TransactionSynchronizationAdapter;
|
|
|
import org.springframework.transaction.support.TransactionSynchronizationManager;
|
|
|
-import sun.nio.ch.ThreadPool;
|
|
|
|
|
|
-import java.text.ParseException;
|
|
|
import java.util.*;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
@@ -285,7 +276,7 @@ public class ResumptionServiceImpl implements ResumptionService {
|
|
|
|
|
|
if (ResumptionStatus.COMPLETED.getCode().equals(resumption.getStatus())) {
|
|
|
//已提交的只显示nfc扫描的记录
|
|
|
- nfcs = nfcs.stream().filter(n -> n.getStatus() == 1).collect(Collectors.toList());
|
|
|
+ nfcs = nfcs.stream().filter(n -> n.getStatus() != null && n.getStatus() == 1).collect(Collectors.toList());
|
|
|
}
|
|
|
if(ResumptionStatus.PROGRESS.getCode().equals(resumption.getStatus())){
|
|
|
//已保存时，只显示保存后的记录
|
gaoxiong