Skip to content

P
patzn-cloud-service-hmhj
Commit 59590dee by jiangxuming
Options

feat: 孙主任提的导出表

parent cdf07ad4
Showing with 180 additions and 78 deletions
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustSampleServiceImpl.java
...@@ -387,47 +387,52 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe ...@@ -387,47 +387,52 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
if(CollectionUtils.isEmpty(collect)){ if(CollectionUtils.isEmpty(collect)){
continue; continue;
} }
Integer day = collect.get(0).getDay(); //随便取厂房1234&001槽号的,用来定义表头日期
//判断奇数偶数 List<String> voList5001 = list.stream().filter(s -> s.getSlotNo().equals("5001")).map(EntrustSampleItemVO::getMonthDay).distinct().sorted(String::compareTo).collect(Collectors.toList());
List<String> voList6001 = list.stream().filter(s -> s.getSlotNo().equals("6001")).map(EntrustSampleItemVO::getMonthDay).distinct().sorted(String::compareTo).collect(Collectors.toList());
if (sheetName.equals("5.1区") || sheetName.equals("5.2区") || sheetName.equals("5.3区") || sheetName.equals("5.4区")) {
int m = 0; int m = 0;
if (day % 2 == 0) {
for (int k = 0; k < 6; k++) { for (int k = 0; k < 6; k++) {
sheet.getRow(1).getCell(m + 1).setCellValue(2); sheet.getRow(1).getCell(m + 1).setCellValue(voList5001.size() > 0 ? voList5001.get(0) : "");
sheet.getRow(1).getCell(m + 2).setCellValue(4); sheet.getRow(1).getCell(m + 2).setCellValue(voList5001.size() > 1 ? voList5001.get(1) : "");
sheet.getRow(1).getCell(m + 3).setCellValue(6); sheet.getRow(1).getCell(m + 3).setCellValue(voList5001.size() > 2 ? voList5001.get(2) : "");
sheet.getRow(1).getCell(m + 4).setCellValue(8); sheet.getRow(1).getCell(m + 4).setCellValue(voList5001.size() > 3 ? voList5001.get(3) : "");
sheet.getRow(1).getCell(m + 5).setCellValue(10); sheet.getRow(1).getCell(m + 5).setCellValue(voList5001.size() > 4 ? voList5001.get(4) : "");
sheet.getRow(1).getCell(m + 6).setCellValue(12); sheet.getRow(1).getCell(m + 6).setCellValue(voList5001.size() > 5 ? voList5001.get(5) : "");
sheet.getRow(1).getCell(m + 7).setCellValue(14); sheet.getRow(1).getCell(m + 7).setCellValue(voList5001.size() > 6 ? voList5001.get(6) : "");
sheet.getRow(1).getCell(m + 8).setCellValue(16); sheet.getRow(1).getCell(m + 8).setCellValue(voList5001.size() > 7 ? voList5001.get(7) : "");
sheet.getRow(1).getCell(m + 9).setCellValue(18); sheet.getRow(1).getCell(m + 9).setCellValue(voList5001.size() > 8 ? voList5001.get(8) : "");
sheet.getRow(1).getCell(m + 10).setCellValue(20); sheet.getRow(1).getCell(m + 10).setCellValue(voList5001.size() > 9 ? voList5001.get(9) : "");
sheet.getRow(1).getCell(m + 11).setCellValue(22); sheet.getRow(1).getCell(m + 11).setCellValue(voList5001.size() > 10 ? voList5001.get(10) : "");
sheet.getRow(1).getCell(m + 12).setCellValue(24); sheet.getRow(1).getCell(m + 12).setCellValue(voList5001.size() > 11 ? voList5001.get(11) : "");
sheet.getRow(1).getCell(m + 13).setCellValue(26); sheet.getRow(1).getCell(m + 13).setCellValue(voList5001.size() > 12 ? voList5001.get(12) : "");
sheet.getRow(1).getCell(m + 14).setCellValue(28); sheet.getRow(1).getCell(m + 14).setCellValue(voList5001.size() > 13 ? voList5001.get(13) : "");
sheet.getRow(1).getCell(m + 15).setCellValue(30); sheet.getRow(1).getCell(m + 15).setCellValue(voList5001.size() > 14 ? voList5001.get(14) : "");
sheet.getRow(1).getCell(m + 16).setCellValue("--"); sheet.getRow(1).getCell(m + 16).setCellValue(voList5001.size() > 15 ? voList5001.get(15) : "");
m += 17; m += 17;
} }
} else { }
if (sheetName.equals("6.1区") || sheetName.equals("6.2区") || sheetName.equals("6.3区") || sheetName.equals("6.4区")) {
int m = 0;
for (int k = 0; k < 6; k++) { for (int k = 0; k < 6; k++) {
sheet.getRow(1).getCell(m + 1).setCellValue(1); sheet.getRow(1).getCell(m + 1).setCellValue(voList6001.size() > 0 ? voList6001.get(0) : "");
sheet.getRow(1).getCell(m + 2).setCellValue(3); sheet.getRow(1).getCell(m + 2).setCellValue(voList6001.size() > 1 ? voList6001.get(1) : "");
sheet.getRow(1).getCell(m + 3).setCellValue(5); sheet.getRow(1).getCell(m + 3).setCellValue(voList6001.size() > 2 ? voList6001.get(2) : "");
sheet.getRow(1).getCell(m + 4).setCellValue(7); sheet.getRow(1).getCell(m + 4).setCellValue(voList6001.size() > 3 ? voList6001.get(3) : "");
sheet.getRow(1).getCell(m + 5).setCellValue(9); sheet.getRow(1).getCell(m + 5).setCellValue(voList6001.size() > 4 ? voList6001.get(4) : "");
sheet.getRow(1).getCell(m + 6).setCellValue(11); sheet.getRow(1).getCell(m + 6).setCellValue(voList6001.size() > 5 ? voList6001.get(5) : "");
sheet.getRow(1).getCell(m + 7).setCellValue(13); sheet.getRow(1).getCell(m + 7).setCellValue(voList6001.size() > 6 ? voList6001.get(6) : "");
sheet.getRow(1).getCell(m + 8).setCellValue(15); sheet.getRow(1).getCell(m + 8).setCellValue(voList6001.size() > 7 ? voList6001.get(7) : "");
sheet.getRow(1).getCell(m + 9).setCellValue(17); sheet.getRow(1).getCell(m + 9).setCellValue(voList6001.size() > 8 ? voList6001.get(8) : "");
sheet.getRow(1).getCell(m + 10).setCellValue(19); sheet.getRow(1).getCell(m + 10).setCellValue(voList6001.size() > 9 ? voList6001.get(9) : "");
sheet.getRow(1).getCell(m + 11).setCellValue(21); sheet.getRow(1).getCell(m + 11).setCellValue(voList6001.size() > 10 ? voList6001.get(10) : "");
sheet.getRow(1).getCell(m + 12).setCellValue(23); sheet.getRow(1).getCell(m + 12).setCellValue(voList6001.size() > 11 ? voList6001.get(11) : "");
sheet.getRow(1).getCell(m + 13).setCellValue(25); sheet.getRow(1).getCell(m + 13).setCellValue(voList6001.size() > 12 ? voList6001.get(12) : "");
sheet.getRow(1).getCell(m + 14).setCellValue(27); sheet.getRow(1).getCell(m + 14).setCellValue(voList6001.size() > 13 ? voList6001.get(13) : "");
sheet.getRow(1).getCell(m + 15).setCellValue(29); sheet.getRow(1).getCell(m + 15).setCellValue(voList6001.size() > 14 ? voList6001.get(14) : "");
sheet.getRow(1).getCell(m + 16).setCellValue(31); sheet.getRow(1).getCell(m + 16).setCellValue(voList6001.size() > 15 ? voList6001.get(15) : "");
m += 17; m += 17;
} }
} }
...@@ -435,7 +440,7 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe ...@@ -435,7 +440,7 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
//构建品味数据 //构建品味数据
HashMap<String, String> gradingMap = new HashMap<>(); HashMap<String, String> gradingMap = new HashMap<>();
for (EntrustSampleItemVO vo : list) { for (EntrustSampleItemVO vo : list) {
gradingMap.putIfAbsent(vo.getDay() + "#" + vo.getSlotNo(), vo.getSampleGrading()); gradingMap.putIfAbsent(vo.getMonthDay() + "#" + vo.getSlotNo(), vo.getSampleGrading());
} }
//填充数据 //填充数据
...@@ -466,7 +471,7 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe ...@@ -466,7 +471,7 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
//构建原铝其他指标数据 //构建原铝其他指标数据
HashMap<String, Double> itemMap = new HashMap<>(); HashMap<String, Double> itemMap = new HashMap<>();
for (EntrustSampleItemVO vo : list) { for (EntrustSampleItemVO vo : list) {
itemMap.putIfAbsent(vo.getDay() + "#" + vo.getSlotNo() + "#" + vo.getName(), Double.parseDouble(vo.getTestValue())); itemMap.putIfAbsent(vo.getMonthDay() + "#" + vo.getSlotNo() + "#" + vo.getName(), Double.parseDouble(vo.getTestValue()));
} }
//填充数据 //填充数据
...@@ -587,55 +592,152 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe ...@@ -587,55 +592,152 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
if(CollectionUtils.isEmpty(collect)){ if(CollectionUtils.isEmpty(collect)){
continue; continue;
} }
Integer day = collect.get(0).getDay(); //随便取厂房1234&001槽号的,用来定义表头日期
//判断奇数偶数 List<String> voList1001 = list.stream().filter(s -> s.getSlotNo().equals("1001")).map(EntrustSampleItemVO::getMonthDay).distinct().sorted(String::compareTo).collect(Collectors.toList());
List<String> voList2001 = list.stream().filter(s -> s.getSlotNo().equals("2001")).map(EntrustSampleItemVO::getMonthDay).distinct().sorted(String::compareTo).collect(Collectors.toList());
List<String> voList3001 = list.stream().filter(s -> s.getSlotNo().equals("3001")).map(EntrustSampleItemVO::getMonthDay).distinct().sorted(String::compareTo).collect(Collectors.toList());
List<String> voList4001 = list.stream().filter(s -> s.getSlotNo().equals("4001")).map(EntrustSampleItemVO::getMonthDay).distinct().sorted(String::compareTo).collect(Collectors.toList());
if (sheetName.equals("1.1区") || sheetName.equals("1.2区") || sheetName.equals("1.3区")) {
int m = 0; int m = 0;
if (day % 2 == 0) {
for (int k = 0; k < 6; k++) { for (int k = 0; k < 6; k++) {
sheet.getRow(1).getCell(m + 1).setCellValue(2); sheet.getRow(1).getCell(m + 1).setCellValue(voList1001.size() > 0 ? voList1001.get(0) : "");
sheet.getRow(1).getCell(m + 2).setCellValue(4); sheet.getRow(1).getCell(m + 2).setCellValue(voList1001.size() > 1 ? voList1001.get(1) : "");
sheet.getRow(1).getCell(m + 3).setCellValue(6); sheet.getRow(1).getCell(m + 3).setCellValue(voList1001.size() > 2 ? voList1001.get(2) : "");
sheet.getRow(1).getCell(m + 4).setCellValue(8); sheet.getRow(1).getCell(m + 4).setCellValue(voList1001.size() > 3 ? voList1001.get(3) : "");
sheet.getRow(1).getCell(m + 5).setCellValue(10); sheet.getRow(1).getCell(m + 5).setCellValue(voList1001.size() > 4 ? voList1001.get(4) : "");
sheet.getRow(1).getCell(m + 6).setCellValue(12); sheet.getRow(1).getCell(m + 6).setCellValue(voList1001.size() > 5 ? voList1001.get(5) : "");
sheet.getRow(1).getCell(m + 7).setCellValue(14); sheet.getRow(1).getCell(m + 7).setCellValue(voList1001.size() > 6 ? voList1001.get(6) : "");
sheet.getRow(1).getCell(m + 8).setCellValue(16); sheet.getRow(1).getCell(m + 8).setCellValue(voList1001.size() > 7 ? voList1001.get(7) : "");
sheet.getRow(1).getCell(m + 9).setCellValue(18); sheet.getRow(1).getCell(m + 9).setCellValue(voList1001.size() > 8 ? voList1001.get(8) : "");
sheet.getRow(1).getCell(m + 10).setCellValue(20); sheet.getRow(1).getCell(m + 10).setCellValue(voList1001.size() > 9 ? voList1001.get(9) : "");
sheet.getRow(1).getCell(m + 11).setCellValue(22); sheet.getRow(1).getCell(m + 11).setCellValue(voList1001.size() > 10 ? voList1001.get(10) : "");
sheet.getRow(1).getCell(m + 12).setCellValue(24); sheet.getRow(1).getCell(m + 12).setCellValue(voList1001.size() > 11 ? voList1001.get(11) : "");
sheet.getRow(1).getCell(m + 13).setCellValue(26); sheet.getRow(1).getCell(m + 13).setCellValue(voList1001.size() > 12 ? voList1001.get(12) : "");
sheet.getRow(1).getCell(m + 14).setCellValue(28); sheet.getRow(1).getCell(m + 14).setCellValue(voList1001.size() > 13 ? voList1001.get(13) : "");
sheet.getRow(1).getCell(m + 15).setCellValue(30); sheet.getRow(1).getCell(m + 15).setCellValue(voList1001.size() > 14 ? voList1001.get(14) : "");
sheet.getRow(1).getCell(m + 16).setCellValue("--"); sheet.getRow(1).getCell(m + 16).setCellValue(voList1001.size() > 15 ? voList1001.get(15) : "");
m += 17; m += 17;
} }
} else { }
if (sheetName.equals("2.1区") || sheetName.equals("2.2区") || sheetName.equals("2.3区")) {
int m = 0;
for (int k = 0; k < 6; k++) { for (int k = 0; k < 6; k++) {
sheet.getRow(1).getCell(m + 1).setCellValue(1); sheet.getRow(1).getCell(m + 1).setCellValue(voList2001.size() > 0 ? voList2001.get(0) : "");
sheet.getRow(1).getCell(m + 2).setCellValue(3); sheet.getRow(1).getCell(m + 2).setCellValue(voList2001.size() > 1 ? voList2001.get(1) : "");
sheet.getRow(1).getCell(m + 3).setCellValue(5); sheet.getRow(1).getCell(m + 3).setCellValue(voList2001.size() > 2 ? voList2001.get(2) : "");
sheet.getRow(1).getCell(m + 4).setCellValue(7); sheet.getRow(1).getCell(m + 4).setCellValue(voList2001.size() > 3 ? voList2001.get(3) : "");
sheet.getRow(1).getCell(m + 5).setCellValue(9); sheet.getRow(1).getCell(m + 5).setCellValue(voList2001.size() > 4 ? voList2001.get(4) : "");
sheet.getRow(1).getCell(m + 6).setCellValue(11); sheet.getRow(1).getCell(m + 6).setCellValue(voList2001.size() > 5 ? voList2001.get(5) : "");
sheet.getRow(1).getCell(m + 7).setCellValue(13); sheet.getRow(1).getCell(m + 7).setCellValue(voList2001.size() > 6 ? voList2001.get(6) : "");
sheet.getRow(1).getCell(m + 8).setCellValue(15); sheet.getRow(1).getCell(m + 8).setCellValue(voList2001.size() > 7 ? voList2001.get(7) : "");
sheet.getRow(1).getCell(m + 9).setCellValue(17); sheet.getRow(1).getCell(m + 9).setCellValue(voList2001.size() > 8 ? voList2001.get(8) : "");
sheet.getRow(1).getCell(m + 10).setCellValue(19); sheet.getRow(1).getCell(m + 10).setCellValue(voList2001.size() > 9 ? voList2001.get(9) : "");
sheet.getRow(1).getCell(m + 11).setCellValue(21); sheet.getRow(1).getCell(m + 11).setCellValue(voList2001.size() > 10 ? voList2001.get(10) : "");
sheet.getRow(1).getCell(m + 12).setCellValue(23); sheet.getRow(1).getCell(m + 12).setCellValue(voList2001.size() > 11 ? voList2001.get(11) : "");
sheet.getRow(1).getCell(m + 13).setCellValue(25); sheet.getRow(1).getCell(m + 13).setCellValue(voList2001.size() > 12 ? voList2001.get(12) : "");
sheet.getRow(1).getCell(m + 14).setCellValue(27); sheet.getRow(1).getCell(m + 14).setCellValue(voList2001.size() > 13 ? voList2001.get(13) : "");
sheet.getRow(1).getCell(m + 15).setCellValue(29); sheet.getRow(1).getCell(m + 15).setCellValue(voList2001.size() > 14 ? voList2001.get(14) : "");
sheet.getRow(1).getCell(m + 16).setCellValue(31); sheet.getRow(1).getCell(m + 16).setCellValue(voList2001.size() > 15 ? voList2001.get(15) : "");
m += 17; m += 17;
} }
} }
if (sheetName.equals("3.1区") || sheetName.equals("3.2区") || sheetName.equals("3.3区")) {
int m = 0;
for (int k = 0; k < 6; k++) {
sheet.getRow(1).getCell(m + 1).setCellValue(voList3001.size() > 0 ? voList3001.get(0) : "");
sheet.getRow(1).getCell(m + 2).setCellValue(voList3001.size() > 1 ? voList3001.get(1) : "");
sheet.getRow(1).getCell(m + 3).setCellValue(voList3001.size() > 2 ? voList3001.get(2) : "");
sheet.getRow(1).getCell(m + 4).setCellValue(voList3001.size() > 3 ? voList3001.get(3) : "");
sheet.getRow(1).getCell(m + 5).setCellValue(voList3001.size() > 4 ? voList3001.get(4) : "");
sheet.getRow(1).getCell(m + 6).setCellValue(voList3001.size() > 5 ? voList3001.get(5) : "");
sheet.getRow(1).getCell(m + 7).setCellValue(voList3001.size() > 6 ? voList3001.get(6) : "");
sheet.getRow(1).getCell(m + 8).setCellValue(voList3001.size() > 7 ? voList3001.get(7) : "");
sheet.getRow(1).getCell(m + 9).setCellValue(voList3001.size() > 8 ? voList3001.get(8) : "");
sheet.getRow(1).getCell(m + 10).setCellValue(voList4001.size() > 9 ? voList3001.get(9) : "");
sheet.getRow(1).getCell(m + 11).setCellValue(voList4001.size() > 10 ? voList3001.get(10) : "");
sheet.getRow(1).getCell(m + 12).setCellValue(voList4001.size() > 11 ? voList3001.get(11) : "");
sheet.getRow(1).getCell(m + 13).setCellValue(voList4001.size() > 12 ? voList3001.get(12) : "");
sheet.getRow(1).getCell(m + 14).setCellValue(voList4001.size() > 13 ? voList3001.get(13) : "");
sheet.getRow(1).getCell(m + 15).setCellValue(voList4001.size() > 14 ? voList3001.get(14) : "");
sheet.getRow(1).getCell(m + 16).setCellValue(voList4001.size() > 15 ? voList3001.get(15) : "");
m += 17;
}
}
if (sheetName.equals("4.1区") || sheetName.equals("4.2区") || sheetName.equals("4.3区")) {
int m = 0;
for (int k = 0; k < 6; k++) {
sheet.getRow(1).getCell(m + 1).setCellValue(voList4001.size() > 0 ? voList4001.get(0) : "");
sheet.getRow(1).getCell(m + 2).setCellValue(voList4001.size() > 1 ? voList4001.get(1) : "");
sheet.getRow(1).getCell(m + 3).setCellValue(voList4001.size() > 2 ? voList4001.get(2) : "");
sheet.getRow(1).getCell(m + 4).setCellValue(voList4001.size() > 3 ? voList4001.get(3) : "");
sheet.getRow(1).getCell(m + 5).setCellValue(voList4001.size() > 4 ? voList4001.get(4) : "");
sheet.getRow(1).getCell(m + 6).setCellValue(voList4001.size() > 5 ? voList4001.get(5) : "");
sheet.getRow(1).getCell(m + 7).setCellValue(voList4001.size() > 6 ? voList4001.get(6) : "");
sheet.getRow(1).getCell(m + 8).setCellValue(voList4001.size() > 7 ? voList4001.get(7) : "");
sheet.getRow(1).getCell(m + 9).setCellValue(voList4001.size() > 8 ? voList4001.get(8) : "");
sheet.getRow(1).getCell(m + 10).setCellValue(voList4001.size() > 9 ? voList4001.get(9) : "");
sheet.getRow(1).getCell(m + 11).setCellValue(voList4001.size() > 10 ? voList4001.get(10) : "");
sheet.getRow(1).getCell(m + 12).setCellValue(voList4001.size() > 11 ? voList4001.get(11) : "");
sheet.getRow(1).getCell(m + 13).setCellValue(voList4001.size() > 12 ? voList4001.get(12) : "");
sheet.getRow(1).getCell(m + 14).setCellValue(voList4001.size() > 13 ? voList4001.get(13) : "");
sheet.getRow(1).getCell(m + 15).setCellValue(voList4001.size() > 14 ? voList4001.get(14) : "");
sheet.getRow(1).getCell(m + 16).setCellValue(voList4001.size() > 15 ? voList4001.get(15) : "");
m += 17;
}
}
// //判断奇数偶数
// int m = 0;
// if (day % 2 == 0) {
// for (int k = 0; k < 6; k++) {
// sheet.getRow(1).getCell(m + 1).setCellValue(2);
// sheet.getRow(1).getCell(m + 2).setCellValue(4);
// sheet.getRow(1).getCell(m + 3).setCellValue(6);
// sheet.getRow(1).getCell(m + 4).setCellValue(8);
// sheet.getRow(1).getCell(m + 5).setCellValue(10);
// sheet.getRow(1).getCell(m + 6).setCellValue(12);
// sheet.getRow(1).getCell(m + 7).setCellValue(14);
// sheet.getRow(1).getCell(m + 8).setCellValue(16);
// sheet.getRow(1).getCell(m + 9).setCellValue(18);
// sheet.getRow(1).getCell(m + 10).setCellValue(20);
// sheet.getRow(1).getCell(m + 11).setCellValue(22);
// sheet.getRow(1).getCell(m + 12).setCellValue(24);
// sheet.getRow(1).getCell(m + 13).setCellValue(26);
// sheet.getRow(1).getCell(m + 14).setCellValue(28);
// sheet.getRow(1).getCell(m + 15).setCellValue(30);
// sheet.getRow(1).getCell(m + 16).setCellValue("--");
// m += 17;
// }
// } else {
// for (int k = 0; k < 6; k++) {
// sheet.getRow(1).getCell(m + 1).setCellValue(1);
// sheet.getRow(1).getCell(m + 2).setCellValue(3);
// sheet.getRow(1).getCell(m + 3).setCellValue(5);
// sheet.getRow(1).getCell(m + 4).setCellValue(7);
// sheet.getRow(1).getCell(m + 5).setCellValue(9);
// sheet.getRow(1).getCell(m + 6).setCellValue(11);
// sheet.getRow(1).getCell(m + 7).setCellValue(13);
// sheet.getRow(1).getCell(m + 8).setCellValue(15);
// sheet.getRow(1).getCell(m + 9).setCellValue(17);
// sheet.getRow(1).getCell(m + 10).setCellValue(19);
// sheet.getRow(1).getCell(m + 11).setCellValue(21);
// sheet.getRow(1).getCell(m + 12).setCellValue(23);
// sheet.getRow(1).getCell(m + 13).setCellValue(25);
// sheet.getRow(1).getCell(m + 14).setCellValue(27);
// sheet.getRow(1).getCell(m + 15).setCellValue(29);
// sheet.getRow(1).getCell(m + 16).setCellValue(31);
// m += 17;
// }
// }
} }
//构建品味数据 //构建品味数据
HashMap<String, String> gradingMap = new HashMap<>(); HashMap<String, String> gradingMap = new HashMap<>();
for (EntrustSampleItemVO vo : list) { for (EntrustSampleItemVO vo : list) {
gradingMap.putIfAbsent(vo.getDay() + "#" + vo.getSlotNo(), vo.getSampleGrading()); gradingMap.putIfAbsent(vo.getMonthDay() + "#" + vo.getSlotNo(), vo.getSampleGrading());
} }
//填充数据 //填充数据
...@@ -668,7 +770,7 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe ...@@ -668,7 +770,7 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
//构建原铝其他指标数据 //构建原铝其他指标数据
HashMap<String, Double> itemMap = new HashMap<>(); HashMap<String, Double> itemMap = new HashMap<>();
for (EntrustSampleItemVO vo : list) { for (EntrustSampleItemVO vo : list) {
itemMap.putIfAbsent(vo.getDay() + "#" + vo.getSlotNo() + "#" + vo.getName(), Double.parseDouble(vo.getTestValue())); itemMap.putIfAbsent(vo.getMonthDay() + "#" + vo.getSlotNo() + "#" + vo.getName(), Double.parseDouble(vo.getTestValue()));
} }
//填充数据 //填充数据
......
src/main/resources/mapper/hmhj/EntrustSampleMapper.xml
...@@ -520,6 +520,7 @@ ...@@ -520,6 +520,7 @@
<select id="laborHourStatisticsTable" resultType="com.patzn.cloud.service.hmhj.vo.EntrustSampleItemVO"> <select id="laborHourStatisticsTable" resultType="com.patzn.cloud.service.hmhj.vo.EntrustSampleItemVO">
SELECT SELECT
EXTRACT(DAY FROM s.ctime) AS day, EXTRACT(DAY FROM s.ctime) AS day,
TO_CHAR(s.ctime, 'MM.DD') AS monthDay,
s.sample_grading, s.sample_grading,
slot_no , slot_no ,
i.name, i.name,
...@@ -528,8 +529,7 @@ ...@@ -528,8 +529,7 @@
"entrust_sample" s join entrust_sample_item i on i.entrust_sample_id = s.id join entrust_sample_item_index ii on ii.entrust_sample_item_id = i.id "entrust_sample" s join entrust_sample_item i on i.entrust_sample_id = s.id join entrust_sample_item_index ii on ii.entrust_sample_item_id = i.id
WHERE WHERE
s.NAME IN ( '原铝', '原铝重取' ) s.NAME IN ( '原铝', '原铝重取' )
AND s.ctime > date_trunc('month', CURRENT_DATE) AND s.ctime between #{dto.entrustTimeStart} and #{dto.entrustTimeEnd}
AND s.ctime &lt; date_trunc('month', CURRENT_DATE) + INTERVAL '1 month'
AND CAST(TRIM(slot_no) AS INTEGER) >= 1001 AND CAST(TRIM(slot_no) AS INTEGER) >= 1001
AND CAST(TRIM(slot_no) AS INTEGER) &lt;= 7000 AND CAST(TRIM(slot_no) AS INTEGER) &lt;= 7000
ORDER BY ORDER BY
......
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