suojin
/
project_husbandry_back
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

二节点样品编号，打印每页折行问题，去掉留样样品编号

Browse Source
dev
litao 3 years ago
parent f0d81c62bc
commit 33407ea183
1 changed files with 56 additions and 23 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 79
      lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EntrustServiceImpl.java

79
lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EntrustServiceImpl.java
Unescape View File

@ -962,7 +962,7 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
result1.put("entrustCustomerName", entrust.getEntrustCustomerName());
String value = DictBizCache.getValue(DictBizEnum.ENTRUST_INVESTIGATIVE_TYPE, entrust.getInvestigativeType());
result1.put("investigativeType", value);
result1.put("mailAddr", entrust.getMailAddr());
result1.put("mailAddr", entrust.getCustomeAddress());
result1.put("phone", entrust.getPhone());
result1.put("submittedBy", entrust.getSubmittedBy());
SimpleDateFormat format3 = new SimpleDateFormat("yyyy年MM月dd日");
@ -973,19 +973,32 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
result1.put("samplingDate", format4);
result1.put("simpleState", entrust.getSimpleState());
result1.put("simpleCount", entrust.getSimpleCount());
// 仪器设备去重
Set<String> set = new HashSet();
// 定义一个仪器编号及名称变量
String instrumentName = "";
// 如果不为空，遍历该集合
if (CollectionUtils.isNotEmpty(examineList)) {
for (Examine examine : examineList) {
// 查询该检测对应的结果数据
LambdaQueryWrapper<ExamineResult> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(ExamineResult::getExamineId, examine.getId());
ExamineResult examineResult = examineResultService.getOne(queryWrapper);
// 切割获取设备仪器id
String[] split = examineResult.getInstrumentId().split(",");
// 往set集合中添加
for (String s : split) {
Instrument instrument = instrumentService.getById(s);
instrumentName += instrument.getCode() + " " + instrument.getName() + ",";
set.add(s);
}
}
}
// 遍历set集合
for (String s : set) {
// 获取该仪器对象
Instrument instrument = instrumentService.getById(s);
// 拼接仪器编号及名称
instrumentName += instrument.getCode() + " " + instrument.getName() + ",";
}
result1.put("code", instrumentName);
result1.put("experieDate", format3.format(taskBlueprint.getCreateTime()));
result1.put("remark", entrust.getRemark());
@ -2555,7 +2568,6 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
}
everyGroupData.add(list1.get(j));
count++;
}
for (int j = 1; j <= resultMap.size(); j++) {
@ -3041,8 +3053,8 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
wrapper.orderByAsc(Simple::getId);
wrapper.eq(Simple::getEntrustId, id);
wrapper.eq(Simple::getIsReagent, "0");
wrapper.orderByAsc(Simple::getIsReagent);
List<Simple> simples = simpleService.list(wrapper);
System.out.println("simples.size(): " + simples.size());
List<Map<String, String>> keyValueList = new ArrayList<>();
for (Simple simple : simples) {
Map<String, String> temp = new HashMap<>();
@ -3050,27 +3062,48 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
temp.put("experieNum", simple.getExperieNum());
keyValueList.add(temp);
}
System.out.println("keyValueList: " + keyValueList);
if (CollectionUtils.isNotEmpty(keyValueList)) {
if (keyValueList.size() % 2 == 0) {
for (int i = 0; i < keyValueList.size() / 2; i++) {
Map<String, Object> row = new HashMap<>();
row.put("experieNum", keyValueList.get(i).get("experieNum"));
row.put("originalNum", keyValueList.get(i).get("originalNum"));
row.put("experieNum1", keyValueList.get(i + (simples.size() / 2)).get("experieNum"));
row.put("originalNum1", keyValueList.get(i + (simples.size() / 2)).get("originalNum"));
resultList1.add(row);
Map<String, List<Map<String, String>>> resultMap = new HashMap<>();
int count = 0;
List<Map<String, String>> everyGroupData = new ArrayList<>();
for (int j = 0; j < keyValueList.size(); j++) {
if (count == 60 || j == keyValueList.size() - 1) {
int keyCount = (j / 60);
if (j == keyValueList.size() - 1) {
keyCount = keyCount + 1;
everyGroupData.add(keyValueList.get(j));
}
resultMap.put(keyCount + "", everyGroupData);
everyGroupData = new ArrayList<>();
count = 0;
}
} else {
for (int i = 0; i < (keyValueList.size() / 2) + 1; i++) {
Map<String, Object> map = new HashMap<>();
map.put("experieNum", keyValueList.get(i).get("experieNum"));
map.put("originalNum", keyValueList.get(i).get("originalNum"));
if (i < (keyValueList.size() / 2)) {
map.put("experieNum1", keyValueList.get((simples.size() / 2) + 1 + i).get("experieNum"));
map.put("originalNum1", keyValueList.get((simples.size() / 2) + 1 + i).get("originalNum"));
everyGroupData.add(keyValueList.get(j));
count++;
}
for (int j = 1; j <= resultMap.size(); j++) {
List<Map<String, String>> arrVOList = resultMap.get(String.valueOf(j));
if (arrVOList.size() % 2 == 0) {
for (int i = 0; i < arrVOList.size() / 2; i++) {
Map<String, Object> row = new HashMap<>();
row.put("experieNum", arrVOList.get(i).get("experieNum"));
row.put("originalNum", arrVOList.get(i).get("originalNum"));
row.put("experieNum1", arrVOList.get(i + (arrVOList.size() / 2)).get("experieNum"));
row.put("originalNum1", arrVOList.get(i + (arrVOList.size() / 2)).get("originalNum"));
resultList1.add(row);
}
} else {
for (int i = 0; i < (arrVOList.size() / 2) + 1; i++) {
Map<String, Object> map = new HashMap<>();
map.put("experieNum", arrVOList.get(i).get("experieNum"));
map.put("originalNum", arrVOList.get(i).get("originalNum"));
if (i < (arrVOList.size() / 2)) {
map.put("experieNum1", arrVOList.get((arrVOList.size() / 2) + 1 + i).get("experieNum"));
map.put("originalNum1", arrVOList.get((arrVOList.size() / 2) + 1 + i).get("originalNum"));
}
resultList1.add(map);
}
resultList1.add(map);
}
}
result.put("list1", resultList1);

Write Preview
Loading…
Cancel
Save