Commit 24f1891d authored by 竹天卫's avatar 竹天卫

优化委托

parent c9062b66
...@@ -575,13 +575,8 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl ...@@ -575,13 +575,8 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
Map<String, Object> params = new HashMap<>(); Map<String, Object> params = new HashMap<>();
params.put("id", id); params.put("id", id);
List<SampleHandleVo> sampleHandleList = sampleHandleMapper.getSampleHandleList(params); List<SampleHandleVo> sampleHandleList = sampleHandleMapper.getSampleHandleList(params);
Integer handleStatus = null;
if (sampleHandleList != null && sampleHandleList.size() > 0) { if (sampleHandleList != null && sampleHandleList.size() > 0) {
for (SampleHandleVo shVo : sampleHandleList) { for (SampleHandleVo shVo : sampleHandleList) {
if (handleStatus != null && handleStatus != shVo.getStatus()) {
return BaseResponse.errorMsg("接受或完成的状态信息错误");
}
handleStatus = shVo.getStatus() == 1 ? 1 : (shVo.getStatus() == 2 ? 2 : 0);
String contentName = ""; String contentName = "";
if (shVo.getContent() != null) { if (shVo.getContent() != null) {
String[] handIdS = shVo.getContent().split("、"); String[] handIdS = shVo.getContent().split("、");
...@@ -1630,29 +1625,26 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl ...@@ -1630,29 +1625,26 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
List<SampleDistributionTeamVo> sampleDistributionTeamVoList = distributionMapper.getDistributionTeamList(sample.getId(), null); List<SampleDistributionTeamVo> sampleDistributionTeamVoList = distributionMapper.getDistributionTeamList(sample.getId(), null);
if (sampleDistributionTeamVoList != null && sampleDistributionTeamVoList.size() > 0) { if (sampleDistributionTeamVoList != null && sampleDistributionTeamVoList.size() > 0) {
//判断是否为平行样 //判断是否为平行样
if (sample.getIsParallel() == 1) { if (sample.getIsParallel() != 0) {
List<Sample> sampleList1 = sampleMapper.getByCementCode(entrust.getId(), sample.getCementCode()); List<Sample> sampleList1 = sampleMapper.getByCementCode(entrust.getId(), sample.getCementCode());
//检测人员只能看到自己则的检测内容 //检测人员只能看到自己则的检测内容
if (sampleList1.size() == 2) { if (sampleList1.size() > 1) {
List<SampleDistributionTeamVo> sampleDistributionTeamVoList2 = distributionMapper.getDistributionTeamList(sampleList1.get(1).getId(), null); for(Sample sample1 : sampleList1){
List<SampleDistributionTeamVo> sampleDistributionTeamVoList2 = distributionMapper.getDistributionTeamList(sample1.getId(), null);
if (sampleDistributionTeamVoList2.size() == sampleDistributionTeamVoList.size()) { if (sampleDistributionTeamVoList2.size() == sampleDistributionTeamVoList.size()) {
for (int i = 0; i < sampleDistributionTeamVoList.size(); i++) { for (int i = 0; i < sampleDistributionTeamVoList.size(); i++) {
SampleDistributionTeamVo sdtvo = sampleDistributionTeamVoList.get(i); SampleDistributionTeamVo sdtvo = sampleDistributionTeamVoList.get(i);
if(!sdtvo.getUserName().contains(sampleDistributionTeamVoList2.get(i).getUserName())){
sdtvo.setUserName(sdtvo.getUserName() + "、" + sampleDistributionTeamVoList2.get(i).getUserName()); sdtvo.setUserName(sdtvo.getUserName() + "、" + sampleDistributionTeamVoList2.get(i).getUserName());
} }
} else { }
sampleDistributionTeamVoList = }
distributionMapper.getDistributionTeamList(sample.getId(), null);
} }
} else { } else {
sampleDistributionTeamVoList = sampleDistributionTeamVoList =
distributionMapper.getDistributionTeamList(sample.getId(), null); distributionMapper.getDistributionTeamList(sample.getId(), null);
} }
} }
sampleVo.setSampleDistributionTeamVoList(sampleDistributionTeamVoList); sampleVo.setSampleDistributionTeamVoList(sampleDistributionTeamVoList);
} else { } else {
sampleVo.setSampleDistributionTeamVoList(null); sampleVo.setSampleDistributionTeamVoList(null);
......
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