|
@@ -102,8 +102,8 @@ public class ZhcxPmqManagementDistributionServiceImpl extends ServiceImpl<ZhcxPm
|
|
if(!updateList.isEmpty()){
|
|
if(!updateList.isEmpty()){
|
|
detailService.updateBatchById(updateList);
|
|
detailService.updateBatchById(updateList);
|
|
}
|
|
}
|
|
- // 可能会涉及到改派
|
|
|
|
- dispatchTochange(pid,baseList);
|
|
|
|
|
|
+ // 可能会涉及到改派 TODO
|
|
|
|
+ //dispatchTochange(pid,baseList);
|
|
// 更新第二层的派单状态
|
|
// 更新第二层的派单状态
|
|
baseMapper.updateDispatchStatus(pid);
|
|
baseMapper.updateDispatchStatus(pid);
|
|
return R.ok("派单成功");
|
|
return R.ok("派单成功");
|
|
@@ -120,10 +120,10 @@ public class ZhcxPmqManagementDistributionServiceImpl extends ServiceImpl<ZhcxPm
|
|
List<ZhcxPmqManagementDistributionDetailDo> detailDos = detailService.list(queryWrapper);
|
|
List<ZhcxPmqManagementDistributionDetailDo> detailDos = detailService.list(queryWrapper);
|
|
// 需要删除的数据集合
|
|
// 需要删除的数据集合
|
|
List<ZhcxPmqManagementDistributionDetailDo> resultList = new ArrayList<>();
|
|
List<ZhcxPmqManagementDistributionDetailDo> resultList = new ArrayList<>();
|
|
- if(detailDos.size() != baseList.size() && !detailDos.isEmpty()){
|
|
|
|
- // 证明有改派的数据,找出改派的数据然后删了
|
|
|
|
|
|
+ if(!detailDos.isEmpty()){
|
|
|
|
+ // 证明有改派的数据,找出改派的数据然后删了 TODO xuan 这根据人的id判断不准确
|
|
for (ZhcxPmqManagementDistributionDetailDo detailDo : detailDos) {
|
|
for (ZhcxPmqManagementDistributionDetailDo detailDo : detailDos) {
|
|
- if (confirmerids.contains(detailDo.getDistributid())) {
|
|
|
|
|
|
+ if (!confirmerids.contains(detailDo.getDistributid())) {
|
|
// 如果在confirmerids里面,
|
|
// 如果在confirmerids里面,
|
|
detailDo.setDeleted("1"); // 伪删
|
|
detailDo.setDeleted("1"); // 伪删
|
|
detailDo.setRemark("改派删除");
|
|
detailDo.setRemark("改派删除");
|