委托管理 样品处理对接完成

parent 458db7d3
...@@ -76,6 +76,12 @@ public class Entrust implements Serializable { ...@@ -76,6 +76,12 @@ public class Entrust implements Serializable {
@ApiModelProperty("项目类型(常规项目,科研项目,质量控制项目)") @ApiModelProperty("项目类型(常规项目,科研项目,质量控制项目)")
private String projectType; private String projectType;
@ApiModelProperty("是否发送样品处理(1是,0否)")
private Integer isHandle;
@ApiModelProperty("是否派发样品检测(1是,0否)")
private Integer isDistribution;
@ApiModelProperty("(0删除,1正常)") @ApiModelProperty("(0删除,1正常)")
private Integer isDelete; private Integer isDelete;
......
...@@ -32,7 +32,11 @@ public class EntrustVo { ...@@ -32,7 +32,11 @@ public class EntrustVo {
@ApiModelProperty("项目类型(常规项目,科研项目,质量控制项目)") @ApiModelProperty("项目类型(常规项目,科研项目,质量控制项目)")
private String projectType; private String projectType;
@ApiModelProperty("是否发送样品处理(1是,0否)")
private Integer isHandle;
@ApiModelProperty("是否派发样品检测(1是,0否)")
private Integer isDistribution;
@ApiModelProperty("委托人id") @ApiModelProperty("委托人id")
private Integer userId; private Integer userId;
......
...@@ -143,6 +143,8 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl ...@@ -143,6 +143,8 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
.setUserId(userService.getLoginUser()!=null?userService.getLoginUser().getId():1) .setUserId(userService.getLoginUser()!=null?userService.getLoginUser().getId():1)
.setStatus(0) .setStatus(0)
.setIsDelete(1) .setIsDelete(1)
.setIsHandle(0)
.setIsDistribution(0)
.setCreateTime(LocalDateTime.now()) .setCreateTime(LocalDateTime.now())
.setSampleNum(query.getSampleTmpList().size()); .setSampleNum(query.getSampleTmpList().size());
entrustMapper.insert(entrust); entrustMapper.insert(entrust);
...@@ -263,6 +265,8 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl ...@@ -263,6 +265,8 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
} }
if(query.getSampleList() != null && query.getSampleList().size()>0){ if(query.getSampleList() != null && query.getSampleList().size()>0){
List<Sample> sampleList = new ArrayList<>(); List<Sample> sampleList = new ArrayList<>();
QueryWrapper<Sample> sampleQueryWrapper = new QueryWrapper<>();
Integer nums = sampleService.count(sampleQueryWrapper);
for(SampleQuery sampleQuery : query.getSampleList()){ for(SampleQuery sampleQuery : query.getSampleList()){
Sample sample = new Sample(); Sample sample = new Sample();
BeanUtils.copyProperties(sampleQuery, sample); BeanUtils.copyProperties(sampleQuery, sample);
...@@ -270,8 +274,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl ...@@ -270,8 +274,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
if(sampleQuery.getIsParallel() ==1){ //平行样 if(sampleQuery.getIsParallel() ==1){ //平行样
//生成本所编号 //生成本所编号
QueryWrapper<Sample> sampleQueryWrapper = new QueryWrapper<>();
Integer nums = sampleService.count(sampleQueryWrapper);
String cementCode = commonService.createNo("BS", nums); String cementCode = commonService.createNo("BS", nums);
String cementCode2 = commonService.createNo("BS", nums+1); String cementCode2 = commonService.createNo("BS", nums+1);
sample.setCementCode(cementCode); sample.setCementCode(cementCode);
...@@ -280,12 +283,12 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl ...@@ -280,12 +283,12 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
BeanUtils.copyProperties(sample, sample2); BeanUtils.copyProperties(sample, sample2);
sample2.setCementCode(cementCode2); sample2.setCementCode(cementCode2);
sampleList.add(sample2); sampleList.add(sample2);
nums = nums + 2;
}else if(sampleQuery.getIsParallel() ==0){ //非平行样 }else if(sampleQuery.getIsParallel() ==0){ //非平行样
QueryWrapper<Sample> sampleQueryWrapper = new QueryWrapper<>();
Integer nums = sampleService.count(sampleQueryWrapper);
String cementCode = commonService.createNo("BS", nums); String cementCode = commonService.createNo("BS", nums);
sample.setCementCode(cementCode); sample.setCementCode(cementCode);
sampleList.add(sample); sampleList.add(sample);
nums = nums + 1;
}else{ }else{
return BaseResponse.errorMsg("请选择是否需要平行样"); return BaseResponse.errorMsg("请选择是否需要平行样");
} }
...@@ -356,6 +359,8 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl ...@@ -356,6 +359,8 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
} }
sampleHandleService.saveBatch(sampleHandleList); sampleHandleService.saveBatch(sampleHandleList);
} }
entrust.setIsHandle(1);
entrustMapper.updateById(entrust);
logsService.saveLog(SysLogs.ObjType.ENTRUST_LOG, entrust.getId(), "发送样品处理任务", null); logsService.saveLog(SysLogs.ObjType.ENTRUST_LOG, entrust.getId(), "发送样品处理任务", null);
return BaseResponse.okMsg("已发送样品处理任务"); return BaseResponse.okMsg("已发送样品处理任务");
} }
...@@ -493,6 +498,8 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl ...@@ -493,6 +498,8 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
} }
distributionService.saveBatch(sampleDistributionList); distributionService.saveBatch(sampleDistributionList);
} }
entrust.setIsDistribution(1);
entrustMapper.updateById(entrust);
logsService.saveLog(SysLogs.ObjType.ENTRUST_LOG, entrust.getId(), "派发检测项目任务", null); logsService.saveLog(SysLogs.ObjType.ENTRUST_LOG, entrust.getId(), "派发检测项目任务", null);
return BaseResponse.okMsg("已派发检测项目任务"); return BaseResponse.okMsg("已派发检测项目任务");
} }
......
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