Skip to content

T
tianjin-cement
Commit 8fdcade9 authored by 竹天卫's avatar 竹天卫
Browse files
Options

派发接口优化 先校验产值 再进行派发

parent e9b43bb8
Show whitespace changes
Inline Side-by-side
Showing with 24 additions and 20 deletions
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/EntrustServiceImpl.java
View file @ 8fdcade9
......@@ -852,10 +852,8 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
//已经派发过的列表
List<SampleTeamGroupVo> sampleTeamGroupVoListed = new ArrayList<>();
List<Integer> teamGroupIdList = new ArrayList<>();
//todo 分组可以在优化一下
// Map<Integer,List<SampleDistributionTeamVo>> DistributionTeamVoMap = sampleDistributionTeamVoList.stream().map(Co)
for (SampleDistributionTeamVo sampleDistributionTeamVo : sampleDistributionTeamVoList) {
SampleDistribution sampleDistribution = distributionMapper.selectById(sampleDistributionTeamVo.getDistributionId());
TeamGroup teamGroup = teamGroupMapper.selectById(sampleDistribution.getTeamGroupId());
......@@ -870,7 +868,6 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
sampleTeamGroupVoListed.add(sampleTeamGroupVo);
} else {
SampleTeamGroupVo sampleTeamGroupVo2 = null;
for (SampleTeamGroupVo vo : sampleTeamGroupVoListed) {
if (vo.getTeamGroupId() == sampleDistribution.getTeamGroupId()) {
......@@ -2538,9 +2535,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
List<SampleDistributionQuery> sampleDistributionQueryList = query.getSampleDistributionQueryList();
// List<SampleDistribution> sampleDistributionList = new ArrayList<>();
/*************上面是样品处理 (样品处理进入检测表提前到样品处理完成的时候了) 下面是样品检测的***************/
List<Sample> sampleList = new ArrayList<>();
//判断产值是否已经配置
for (SampleDistributionQuery distributionQuery : sampleDistributionQueryList) {
if (distributionQuery == null || distributionQuery.getSampleId() == null) {
return BaseResponse.errorMsg("样品信息错误");
......@@ -2555,19 +2550,6 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
if (distributionTeamQuery.getUserId() == null) {
return BaseResponse.errorMsg("请选择检测人员");
}
SampleDistribution sampleDistribution = new SampleDistribution();
sampleDistribution.setEntrustId(entrust.getId())
.setSampleId(distributionQuery.getSampleId())
.setTeamGroupId(distributionTeamQuery.getTeamGroupId())
.setTeamId(distributionTeamQuery.getTeamId())
.setUserId(distributionTeamQuery.getUserId())
// .setStatus(0)
.setCreateTime(LocalDateTime.now())
.setStatus(1) //直接接收检测任务
.setAcceptTime(LocalDateTime.now());
distributionService.save(sampleDistribution);
// sampleDistributionList.add(sampleDistribution);
//获取产值信息
QueryWrapper<NormProduction> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("assess_id", distributionTeamQuery.getTeamGroupId());
......@@ -2588,7 +2570,29 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
}
}
}
}
}
/*************上面是样品处理 (样品处理进入检测表提前到样品处理完成的时候了) 下面是样品检测的***************/
List<Sample> sampleList = new ArrayList<>();
for (SampleDistributionQuery distributionQuery : sampleDistributionQueryList) {
if (distributionQuery.getSampleDistributionTeamQueryList() != null && distributionQuery.getSampleDistributionTeamQueryList().size() > 0) {
List<SampleDistributionTeamQuery> sampleDistributionTeamQueryList = distributionQuery.getSampleDistributionTeamQueryList();
for (SampleDistributionTeamQuery distributionTeamQuery : sampleDistributionTeamQueryList) {
SampleDistribution sampleDistribution = new SampleDistribution();
sampleDistribution.setEntrustId(entrust.getId())
.setSampleId(distributionQuery.getSampleId())
.setTeamGroupId(distributionTeamQuery.getTeamGroupId())
.setTeamId(distributionTeamQuery.getTeamId())
.setUserId(distributionTeamQuery.getUserId())
// .setStatus(0)
.setCreateTime(LocalDateTime.now())
.setStatus(1) //直接接收检测任务
.setAcceptTime(LocalDateTime.now());
distributionService.save(sampleDistribution);
// sampleDistributionList.add(sampleDistribution);
//消息推送
BaseResponse wrapper = userMessageService.sendMessage(distributionTeamQuery.getUserId(), "您有一条样品检测信息等待检测", entrust.getId(), SysUserMessage.MessageType.ENTRUST);
if (wrapper.getCode() != 200) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment