From 16d63c3d68d131ad0cc4a8bd9f22a0c0515aa6bf Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 17 七月 2024 18:23:57 +0800
Subject: [PATCH] 工时的各需求+检验任务修改
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 352 +++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 226 insertions(+), 126 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
index 58fbd36..6bf6f97 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
@@ -283,13 +283,40 @@
//鍐嶆煡璇㈠嚭鎵�鏈夌殑鍏夌氦甯�
List<InsFibers> insFibers = insFibersMapper.selectList(Wrappers.<InsFibers>lambdaQuery().eq(InsFibers::getInsBushingId, insBushing.getId()));
if (CollectionUtils.isNotEmpty(insFibers)) {
+ for (InsFibers insFiber : insFibers) {
+ List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery().eq(InsProduct::getInsFibersId, insFiber.getId()));
+ List<Integer> collect = insProducts.stream().map(InsProduct::getInsResult).filter(sm -> ObjectUtils.isNotEmpty(sm)).collect(Collectors.toList());
+ if (insProducts.size()==collect.size()) {
+ insFiber.setState(1);//宸叉楠�
+ }else {
+ insFiber.setState(0);//鏈楠�
+ }
+ }
fibers.addAll(insFibers);
//鏌ュ嚭鍏夌氦甯︿笅鎵�鏈夌殑鍏夌氦
List<InsFiber> fiberList = insFiberMapper.selectList(Wrappers.<InsFiber>lambdaQuery().in(InsFiber::getInsFibersId, insFibers.stream().map(InsFibers::getId).collect(Collectors.toList())));
+ for (InsFiber insFiber : fiberList) {
+ List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery().eq(InsProduct::getInsFiberId, insFiber.getId()));
+ List<Integer> collect = insProducts.stream().map(InsProduct::getInsResult).filter(sm -> ObjectUtils.isNotEmpty(sm)).collect(Collectors.toList());
+ if (insProducts.size()==collect.size()) {
+ insFiber.setState(1);//宸叉楠�
+ }else {
+ insFiber.setState(0);//鏈楠�
+ }
+ }
fiber.addAll(fiberList);
} else {
//濡傛灉濂楃涓嬫病鏈夊厜绾ゅ甫灏卞彧鏈夊厜绾や簡
List<InsFiber> insFiberList = insFiberMapper.selectList(Wrappers.<InsFiber>lambdaQuery().eq(InsFiber::getInsBushingId, insBushing.getId()));
+ for (InsFiber insFiber : insFiberList) {
+ List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery().eq(InsProduct::getInsFiberId, insFiber.getId()));
+ List<Integer> collect = insProducts.stream().map(InsProduct::getInsResult).filter(sm -> ObjectUtils.isNotEmpty(sm)).collect(Collectors.toList());
+ if (insProducts.size()==collect.size()) {
+ insFiber.setState(1);//宸叉楠�
+ }else {
+ insFiber.setState(0);//鏈楠�
+ }
+ }
fiber.addAll(insFiberList);
}
}
@@ -309,14 +336,40 @@
//鍏堟煡鍑鸿繖涓牱鍝佷笅鏈夊摢浜涚鑹叉爣,鍏夌氦甯�,鍏夌氦鑹叉爣
//鍏堟煡鍑哄绠�
List<InsBushing> insBushings = insBushingMapper.selectList(Wrappers.<InsBushing>lambdaQuery().eq(InsBushing::getInsSampleId, sampleId));
- for (InsBushing insBushing : insBushings) {
- //鍐嶆煡璇㈠嚭鎵�鏈夌殑鍏夌氦甯�
- List<InsFibers> insFibers = insFibersMapper.selectList(Wrappers.<InsFibers>lambdaQuery().eq(InsFibers::getInsBushingId, insBushing.getId()));
- if (CollectionUtils.isNotEmpty(insFibers)) {
- for (InsFibers insFiber : insFibers) {
- //鏌ュ嚭鍏夌氦甯︿笅鎵�鏈夌殑鍏夌氦
- List<InsFiber> fiberList = insFiberMapper.selectList(Wrappers.<InsFiber>lambdaQuery().eq(InsFiber::getInsFibersId, insFiber.getId()));
- for (InsFiber fiber : fiberList) {
+ if (insBushings.size()>0) {
+ //閫氫俊--娓╁害寰幆
+ for (InsBushing insBushing : insBushings) {
+ //鍐嶆煡璇㈠嚭鎵�鏈夌殑鍏夌氦甯�
+ List<InsFibers> insFibers = insFibersMapper.selectList(Wrappers.<InsFibers>lambdaQuery().eq(InsFibers::getInsBushingId, insBushing.getId()));
+ if (CollectionUtils.isNotEmpty(insFibers)) {
+ for (InsFibers insFiber : insFibers) {
+ //鏌ュ嚭鍏夌氦甯︿笅鎵�鏈夌殑鍏夌氦
+ List<InsFiber> fiberList = insFiberMapper.selectList(Wrappers.<InsFiber>lambdaQuery().eq(InsFiber::getInsFibersId, insFiber.getId()));
+ for (InsFiber fiber : fiberList) {
+ //鍐嶆牴鎹叧鑱旂殑鍏夌氦閰嶇疆鐨刬d鍜屽惊鐜鏁板拰娓╁害鍜屾牱鍝乮d杩涜鏌ヨ妫�楠岄」鐩�
+ List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
+ .eq(InsProduct::getInsSampleId, sampleId)
+ .eq(InsProduct::getInspectionItem, inspectionItem)
+ .eq(InsProduct::getInspectionItemSubclass, inspectionItemSubclass)
+ .eq(InsProduct::getInsFiberId, fiber.getId()));
+ for (InsProduct insProduct : insProducts) {
+ InsProductResult insProductResult = insProductResultMapper.selectOne(Wrappers.<InsProductResult>lambdaQuery().eq(InsProductResult::getInsProductId, insProduct.getId()));
+ ProductVo productVo = new ProductVo();
+ productVo.setCode(insFiber.getCode());
+ productVo.setColor(fiber.getColor());
+ productVo.setBushColor(fiber.getBushColor());
+ if (ObjectUtils.isNotEmpty(insProductResult)) {
+ insProduct.setInsProductResult(insProductResult);
+ }
+ productVo.setInsProduct(insProduct);
+ productVos.add(productVo);
+ }
+ }
+ }
+ } else {
+ //濡傛灉濂楃涓嬫病鏈夊厜绾ゅ甫灏卞彧鏈夊厜绾や簡
+ List<InsFiber> insFiberList = insFiberMapper.selectList(Wrappers.<InsFiber>lambdaQuery().eq(InsFiber::getInsBushingId, insBushing.getId()));
+ for (InsFiber fiber : insFiberList) {
//鍐嶆牴鎹叧鑱旂殑鍏夌氦閰嶇疆鐨刬d鍜屽惊鐜鏁板拰娓╁害鍜屾牱鍝乮d杩涜鏌ヨ妫�楠岄」鐩�
List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
.eq(InsProduct::getInsSampleId, sampleId)
@@ -326,38 +379,31 @@
for (InsProduct insProduct : insProducts) {
InsProductResult insProductResult = insProductResultMapper.selectOne(Wrappers.<InsProductResult>lambdaQuery().eq(InsProductResult::getInsProductId, insProduct.getId()));
ProductVo productVo = new ProductVo();
- productVo.setCode(insFiber.getCode());
+ productVo.setCode("/");
productVo.setColor(fiber.getColor());
productVo.setBushColor(fiber.getBushColor());
- if (ObjectUtils.isNotEmpty(insProductResult)) {
- insProduct.setInsProductResult(insProductResult);
- }
+ insProduct.setInsProductResult(insProductResult);
productVo.setInsProduct(insProduct);
productVos.add(productVo);
}
}
}
- } else {
- //濡傛灉濂楃涓嬫病鏈夊厜绾ゅ甫灏卞彧鏈夊厜绾や簡
- List<InsFiber> insFiberList = insFiberMapper.selectList(Wrappers.<InsFiber>lambdaQuery().eq(InsFiber::getInsBushingId, insBushing.getId()));
- for (InsFiber fiber : insFiberList) {
- //鍐嶆牴鎹叧鑱旂殑鍏夌氦閰嶇疆鐨刬d鍜屽惊鐜鏁板拰娓╁害鍜屾牱鍝乮d杩涜鏌ヨ妫�楠岄」鐩�
- List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
- .eq(InsProduct::getInsSampleId, sampleId)
- .eq(InsProduct::getInspectionItem, inspectionItem)
- .eq(InsProduct::getInspectionItemSubclass, inspectionItemSubclass)
- .eq(InsProduct::getInsFiberId, fiber.getId()));
- for (InsProduct insProduct : insProducts) {
- InsProductResult insProductResult = insProductResultMapper.selectOne(Wrappers.<InsProductResult>lambdaQuery().eq(InsProductResult::getInsProductId, insProduct.getId()));
- ProductVo productVo = new ProductVo();
- productVo.setCode("/");
- productVo.setColor(fiber.getColor());
- productVo.setBushColor(fiber.getBushColor());
- insProduct.setInsProductResult(insProductResult);
- productVo.setInsProduct(insProduct);
- productVos.add(productVo);
- }
+ }
+ productVos = productVos.stream().sorted(Comparator.comparing(productVo -> productVo.getInsProduct().getInspectionItemClass())).collect(Collectors.toList());
+ }
+ else {
+ //鐢靛姏--鐑惊鐜�
+ List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
+ .eq(InsProduct::getInsSampleId, sampleId)
+ .eq(InsProduct::getInspectionItem, inspectionItem));
+ for (InsProduct insProduct : insProducts) {
+ InsProductResult insProductResult = insProductResultMapper.selectOne(Wrappers.<InsProductResult>lambdaQuery().eq(InsProductResult::getInsProductId, insProduct.getId()));
+ ProductVo productVo = new ProductVo();
+ if (ObjectUtils.isNotEmpty(insProductResult)) {
+ insProduct.setInsProductResult(insProductResult);
}
+ productVo.setInsProduct(insProduct);
+ productVos.add(productVo);
}
}
map.put("productVos", productVos);
@@ -467,12 +513,15 @@
//鏍￠獙濡傛灉杩欎釜浜鸿繖涓娴嬮」鐩凡缁忔坊鍔犺繃浜嗗垯涓嶉渶瑕佸啀鏂板
Long count = auxiliaryOutputWorkingHoursMapper.selectCount(Wrappers.<AuxiliaryOutputWorkingHours>lambdaQuery()
.eq(AuxiliaryOutputWorkingHours::getCheck, userId)
- .eq(AuxiliaryOutputWorkingHours::getInspectProject, insProduct.getInspectionItemSubclass() + insProduct.getInspectionItem())
+ .eq(AuxiliaryOutputWorkingHours::getInspectionItem, insProduct.getInspectionItem())
+ .eq(AuxiliaryOutputWorkingHours::getInspectionItemSubclass, insProduct.getInspectionItemSubclass())
.eq(AuxiliaryOutputWorkingHours::getOrderNo, insOrder.getEntrustCode()));
if (count == 0 && ObjectUtils.isNotEmpty(insProduct.getManHour())) {
//娣诲姞姣忎釜浜虹殑浜ч噺宸ユ椂
AuxiliaryOutputWorkingHours auxiliaryOutputWorkingHours = new AuxiliaryOutputWorkingHours();
- auxiliaryOutputWorkingHours.setInspectProject(insProduct.getInspectionItemSubclass() + insProduct.getInspectionItem());//妫�娴嬮」鐩�
+ auxiliaryOutputWorkingHours.setInspectionItem(insProduct.getInspectionItem());//妫�娴嬬埗椤�
+ auxiliaryOutputWorkingHours.setInspectionItemSubclass(insProduct.getInspectionItemSubclass());//妫�娴嬪瓙椤�
+ auxiliaryOutputWorkingHours.setSample(insSampleMapper.selectById(insProduct.getInsSampleId()).getSampleCode());//鏍峰搧缂栧彿
auxiliaryOutputWorkingHours.setOrderNo(insOrder.getEntrustCode());//闈炲姞鐝鎵樺崟鍙�
auxiliaryOutputWorkingHours.setWorkTime(insProduct.getManHour());//闈炲姞鐝伐鏃�
auxiliaryOutputWorkingHours.setAmount(1);//闈炲姞鐝暟閲�
@@ -914,8 +963,9 @@
for (long i = 0; i < size; i++) {
if (i % number == 0) {
List<RowRenderData> rows = new ArrayList<>();
- //琛ㄦ牸鐨勮鏁� 鈭� 鉁� 鉁�
- for (int j = 0; j < number + 3; j++) {
+ //琛ㄦ牸鐨勮鏁� 脳 鈭� 鉁� 鉁�
+ long count1 = size-(index-1)*number < number ? size-(index-1)*number + 3 : number + 3;
+ for (int j = 0; j <count1 ; j++) {
RowRenderData rowRenderData = new RowRenderData();
RowStyle rowStyle = new RowStyle();
rowStyle.setHeight(40);
@@ -957,7 +1007,6 @@
cellRenderData.setParagraphs(paragraphRenderDataList);
cells.add(cellRenderData);
}
-
}
else if (j == 1) {
//绗簩琛�
@@ -1003,7 +1052,7 @@
cells.add(cellRenderData);
}
}
- else if (j == number + 2) {
+ else if (j == count1-1) {
//鏈�鍚庝竴琛�
if (k == 0 || k == 1) {
//鍓嶄袱鍒�
@@ -1014,7 +1063,7 @@
cellRenderData.setParagraphs(paragraphRenderDataList);
cells.add(cellRenderData);
} else {
- textRenderData.setText("鈥溾湐鈥濊〃绀洪」鐩悎鏍硷紝鈥溾湒鈥濊〃绀洪」鐩笉鍚堟牸@鈥溾湐鈥漣ndicates test Item is qualified锛屸�溾湒鈥漣ndicates test Item is unqualified鈭�19");
+ textRenderData.setText("鈥溾垰鈥濊〃绀洪」鐩悎鏍硷紝鈥溍椻�濊〃绀洪」鐩笉鍚堟牸@鈥溾垰鈥漣ndicates test Item is qualified锛屸�溍椻�漣ndicates test Item is unqualified鈭�19");
renderData.add(textRenderData);
paragraphRenderData.setContents(renderData);
paragraphRenderDataList.add(paragraphRenderData);
@@ -1031,10 +1080,14 @@
paragraphRenderDataList.add(paragraphRenderData);
cellRenderData.setParagraphs(paragraphRenderDataList);
cells.add(cellRenderData);
- }
- else if (k == 1) {
+ } else if (k == 1) {
//绗簩鍒�
- String insProduct = filteredProducts.get((int) ((j - 2) + 10 * (index - 1)));
+ String insProduct;
+ try {
+ insProduct = filteredProducts.get((int) ((j - 2) + 10 * (index - 1)));
+ } catch (Exception e) {
+ continue;
+ }
String[] split = insProduct.split(",");
if (ObjectUtils.isEmpty(split[1]) || split[1].equals("")) {
textRenderData.setText(split[0]);
@@ -1046,11 +1099,15 @@
paragraphRenderDataList.add(paragraphRenderData);
cellRenderData.setParagraphs(paragraphRenderDataList);
cells.add(cellRenderData);
- }
- else if (k == 2) {
+ } else if (k == 2) {
//绗笁鍒�
//鍏堝垽鏂楠岄」鏄惁鏈夊瓙绫�
- String insProduct = filteredProducts.get((int) ((j - 2) + 10 * (index - 1)));
+ String insProduct;
+ try {
+ insProduct = filteredProducts.get((int) ((j - 2) + 10 * (index - 1)));
+ } catch (Exception e) {
+ continue;
+ }
String[] split = insProduct.split(",");
if (ObjectUtils.isEmpty(split[2]) || split[2].equals("")) {
//濡傛灉娌℃湁瀛愮被
@@ -1069,11 +1126,15 @@
paragraphRenderDataList.add(paragraphRenderData);
cellRenderData.setParagraphs(paragraphRenderDataList);
cells.add(cellRenderData);
- }
- else if (k == 3) {
+ } else if (k == 3) {
//绗洓鍒�
//鍏堝垽鏂楠岄」鏄惁鏈夊瓙绫�
- String insProduct = filteredProducts.get((int) ((j - 2) + 10 * (index - 1)));
+ String insProduct;
+ try {
+ insProduct = filteredProducts.get((int) ((j - 2) + 10 * (index - 1)));
+ } catch (Exception e) {
+ continue;
+ }
String[] split = insProduct.split(",");
if (ObjectUtils.isEmpty(split[2]) || split[2].equals("")) {
//濡傛灉娌℃湁瀛愮被
@@ -1087,10 +1148,14 @@
paragraphRenderDataList.add(paragraphRenderData);
cellRenderData.setParagraphs(paragraphRenderDataList);
cells.add(cellRenderData);
- }
- else if (k == 4) {
+ } else if (k == 4) {
//绗簲鍒�
- String insProduct = filteredProducts.get((int) ((j - 2) + 10 * (index - 1)));
+ String insProduct;
+ try {
+ insProduct = filteredProducts.get((int) ((j - 2) + 10 * (index - 1)));
+ } catch (Exception e) {
+ continue;
+ }
String[] split = insProduct.split(",");
//鏌ヨ鎵�鏈夋牱鍝佽妫�楠岄」鐨勬楠岀粨鏋�(鏈�缁堝��)
List<InsProduct> products = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
@@ -1105,16 +1170,20 @@
Optional<String> min = products.stream().map(InsProduct::getLastValue)
.filter(value -> !value.isEmpty())
.min(String::compareTo);
- textRenderData.setText(min+"-"+max);//妫�楠岀粨鏋�
+ textRenderData.setText(min.get() + "-" + max.get());//妫�楠岀粨鏋�
renderData.add(textRenderData);
paragraphRenderData.setContents(renderData);
paragraphRenderDataList.add(paragraphRenderData);
cellRenderData.setParagraphs(paragraphRenderDataList);
cells.add(cellRenderData);
- }
- else {
+ } else {
//鏈�鍚庝竴鍒�
- String insProduct = filteredProducts.get((int) ((j - 2) + 10 * (index - 1)));
+ String insProduct;
+ try {
+ insProduct = filteredProducts.get((int) ((j - 2) + 10 * (index - 1)));
+ } catch (Exception e) {
+ continue;
+ }
String[] split = insProduct.split(",");
//鏌ヨ鎵�鏈夋牱鍝佽妫�楠岄」鐨勬楠岀粨璁�(ins_result)
List<InsProduct> products = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
@@ -1125,10 +1194,10 @@
List<Integer> result = products.stream().map(InsProduct::getInsResult).distinct().collect(Collectors.toList());
if (result.size() == 1 && result.contains(1)) {
//鍚堟牸
- textRenderData.setText("鉁�");
- }else {
+ textRenderData.setText("鈭�");
+ } else {
//涓嶅悎鏍�
- textRenderData.setText("鉁�");
+ textRenderData.setText("脳");
}
renderData.add(textRenderData);
paragraphRenderData.setContents(renderData);
@@ -1152,7 +1221,7 @@
}
System.out.println("");*/
if (row.getCells().size() != countSize) {
- throw new ErrorException("姣忚鍗曞厓鏍间笉鐩哥瓑");
+ throw new ErrorException("姣忚鍗曞厓鏍间笉鐩哥瓑1");
}
}
TableStyle tableStyle = new TableStyle();
@@ -1178,7 +1247,7 @@
long index4 = 1;
//妫�楠屾姤鍛婃姤鍛�(褰撴楠岄」鐩秴杩�7涓柊寤鸿〃)
for (long j = 0; j < size; j++) {
- if (j%number2==0){
+ if (j % number2 == 0) {
List<RowRenderData> rows = new ArrayList<>();
//琛ㄦ牸鐨勮鏁�(鏍规嵁鏍峰搧鏁伴噺鏉�)
for (int i = 0; i < samples.size() + 2; i++) {
@@ -1204,9 +1273,9 @@
style.setFontFamily("瀹嬩綋");
style.setColor("000000");
textRenderData.setStyle(style);
- if (i==0){
+ if (i == 0) {
//绗竴琛�
- if (k==0){
+ if (k == 0) {
//绗竴鍒�
textRenderData.setText("鏍峰搧缂栧彿@Sample number鈭�30");
renderData.add(textRenderData);
@@ -1214,22 +1283,26 @@
paragraphRenderDataList.add(paragraphRenderData);
cellRenderData.setParagraphs(paragraphRenderDataList);
cells.add(cellRenderData);
- }
- else {
+ } else {
//绗簩鍒�
- String product = filteredProducts.get((int) ((k - 1) + (index4 - 1) * 7));
+ String product;
+ try {
+ product = filteredProducts.get((int) ((k - 1) + (index4 - 1) * 7));
+ } catch (Exception e) {
+ continue;
+ }
String[] split = product.split(",");
- if (ObjectUtils.isEmpty(split[2])||split[2].equals("")){
- if (ObjectUtils.isEmpty(split[1]) || split[1].equals("")){
- textRenderData.setText(split[0]+"鈭�3"+k);
- }else {
- textRenderData.setText(split[0]+"@"+split[1]+"鈭�3"+k);
+ if (ObjectUtils.isEmpty(split[2]) || split[2].equals("")) {
+ if (ObjectUtils.isEmpty(split[1]) || split[1].equals("")) {
+ textRenderData.setText(split[0] + "鈭�3" + k);
+ } else {
+ textRenderData.setText(split[0] + "@" + split[1] + "鈭�3" + k);
}
- }else {
- if (ObjectUtils.isEmpty(split[1]) || split[1].equals("")){
+ } else {
+ if (ObjectUtils.isEmpty(split[1]) || split[1].equals("")) {
textRenderData.setText(split[0]);
- }else {
- textRenderData.setText(split[0]+"@"+split[1]);
+ } else {
+ textRenderData.setText(split[0] + "@" + split[1]);
}
}
renderData.add(textRenderData);
@@ -1238,10 +1311,9 @@
cellRenderData.setParagraphs(paragraphRenderDataList);
cells.add(cellRenderData);
}
- }
- else if (i==1){
+ } else if (i == 1) {
//绗簩琛�
- if (k==0){
+ if (k == 0) {
//绗竴鍒�
textRenderData.setText("鏍峰搧缂栧彿@Sample number鈭�30");
renderData.add(textRenderData);
@@ -1249,22 +1321,26 @@
paragraphRenderDataList.add(paragraphRenderData);
cellRenderData.setParagraphs(paragraphRenderDataList);
cells.add(cellRenderData);
- }
- else {
+ } else {
//绗簩鍒�
- String product = filteredProducts.get((int) ((k - 1) + (index4 - 1) * 7));
+ String product;
+ try {
+ product = filteredProducts.get((int) ((k - 1) + (index4 - 1) * 7));
+ } catch (Exception e) {
+ continue;
+ }
String[] split = product.split(",");
- if (ObjectUtils.isEmpty(split[2])||split[2].equals("")){
- if (ObjectUtils.isEmpty(split[1]) || split[1].equals("")){
- textRenderData.setText(split[0]+"鈭�3"+k);
- }else {
- textRenderData.setText(split[0]+"@"+split[1]+"鈭�3"+k);
+ if (ObjectUtils.isEmpty(split[2]) || split[2].equals("")) {
+ if (ObjectUtils.isEmpty(split[1]) || split[1].equals("")) {
+ textRenderData.setText(split[0] + "鈭�3" + k);
+ } else {
+ textRenderData.setText(split[0] + "@" + split[1] + "鈭�3" + k);
}
- }else {
- if (ObjectUtils.isEmpty(split[3]) || split[3].equals("")){
+ } else {
+ if (ObjectUtils.isEmpty(split[3]) || split[3].equals("")) {
textRenderData.setText(split[2]);
- }else {
- textRenderData.setText(split[2]+"@"+split[3]);
+ } else {
+ textRenderData.setText(split[2] + "@" + split[3]);
}
}
renderData.add(textRenderData);
@@ -1273,27 +1349,30 @@
cellRenderData.setParagraphs(paragraphRenderDataList);
cells.add(cellRenderData);
}
- }
- else {
- if (k==0){
+ } else {
+ if (k == 0) {
//绗竴鍒�
- textRenderData.setText(samples.get(i-2).getSampleCode());
+ textRenderData.setText(samples.get(i - 2).getSampleCode());
renderData.add(textRenderData);
paragraphRenderData.setContents(renderData);
paragraphRenderDataList.add(paragraphRenderData);
cellRenderData.setParagraphs(paragraphRenderDataList);
cells.add(cellRenderData);
- }
- else {
+ } else {
//鏍规嵁鏍峰搧缂栧彿鍜岄」鐩幓鏌ヨ鏈�缁堝��
- String product = filteredProducts.get((int) ((k - 1) + (index4 - 1) * 7));
+ String product;
+ try {
+ product = filteredProducts.get((int) ((k - 1) + (index4 - 1) * 7));
+ } catch (Exception e) {
+ continue;
+ }
String[] split = product.split(",");
InsProduct insProduct = insProductMapper.selectOne(Wrappers.<InsProduct>lambdaQuery()
.eq(InsProduct::getState, 1)
.eq(InsProduct::getInsSampleId, samples.get(i - 2).getId())
.eq(InsProduct::getInspectionItem, split[0])
.eq(InsProduct::getInspectionItemSubclass, split[2]));
- if (ObjectUtils.isEmpty(insProduct)){
+ if (ObjectUtils.isEmpty(insProduct)) {
//鍙兘鏍规嵁姝ｅ父鐨勬牱鍝佺紪鍙峰拰鍏夌氦鎺ュご鎹熻�楃殑椤圭洰鏌ヤ笉鍒板搴旂殑椤圭洰,鍒欓渶瑕佹牴鎹�"/"鏉ユ煡
List<InsSample> sampleList = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().like(InsSample::getSampleCode, samples.get(i - 2).getSampleCode()));
List<InsProduct> products = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
@@ -1301,7 +1380,7 @@
.in(InsProduct::getInsSampleId, sampleList.stream().map(InsSample::getId).collect(Collectors.toList()))
.eq(InsProduct::getInspectionItem, split[0])
.eq(InsProduct::getInspectionItemSubclass, split[2]));
- insProduct=products.get(0);
+ insProduct = products.get(0);
}
textRenderData.setText(insProduct.getLastValue());
renderData.add(textRenderData);
@@ -1327,7 +1406,7 @@
}
System.out.println("");*/
if (row.getCells().size() != countSize) {
- throw new ErrorException("姣忚鍗曞厓鏍间笉鐩哥瓑");
+ throw new ErrorException("姣忚鍗曞厓鏍间笉鐩哥瓑2");
}
}
TableStyle tableStyle = new TableStyle();
@@ -1355,12 +1434,14 @@
List<InsSample> sampleList = insSamples.stream().filter(insSample -> insSample.getSampleCode().contains("/")).collect(Collectors.toList());
//杩囨护鍑哄厜绾ゆ帴澶存崯鑰楃殑妫�楠岄」鐩�
List<String> strings = filteredProducts.stream().filter(s -> s.contains("鍏夌氦鎺ュご鎹熻��")).distinct().collect(Collectors.toList());
+ long index41 = 1;
for (int i = 0; i < sampleList.size(); i++) {
- if (i%16==0){
+ if (i % 16 == 0) {
//鏍峰搧鏁伴噺瓒呰繃16闇�瑕佹柊澧炶〃鏍�
List<RowRenderData> rows = new ArrayList<>();
+ int count2 = sampleList.size()-(index41-1)*16 < 16 ? (int) (sampleList.size() - (index41 - 1) * 16 + 1) : 17;
//琛ㄦ牸鐨勮鏁�
- for (int j = 0; j < 17; j++) {
+ for (int j = 0; j < count2; j++) {
RowRenderData rowRenderData = new RowRenderData();
RowStyle rowStyle = new RowStyle();
rowStyle.setHeight(40);
@@ -1383,9 +1464,9 @@
style.setFontFamily("瀹嬩綋");
style.setColor("000000");
textRenderData.setStyle(style);
- if (j==0){
+ if (j == 0) {
//绗竴琛�
- if (k==0){
+ if (k == 0) {
//绗竴鍒�
textRenderData.setText("鍏夌氦绫诲瀷@Fiber type");
renderData.add(textRenderData);
@@ -1393,7 +1474,7 @@
paragraphRenderDataList.add(paragraphRenderData);
cellRenderData.setParagraphs(paragraphRenderDataList);
cells.add(cellRenderData);
- }else if (k==1 || k==2){
+ } else if (k == 1 || k == 2) {
//绗簩 涓夊垪
textRenderData.setText("鏍峰搧缂栧彿@Sample number");
renderData.add(textRenderData);
@@ -1401,12 +1482,12 @@
paragraphRenderDataList.add(paragraphRenderData);
cellRenderData.setParagraphs(paragraphRenderDataList);
cells.add(cellRenderData);
- }else {
+ } else {
String[] split = strings.get(k - 3).split(",");
- if (ObjectUtils.isEmpty(split[3])|| split[3].equals("")){
+ if (ObjectUtils.isEmpty(split[3]) || split[3].equals("")) {
textRenderData.setText(split[2]);
- }else {
- textRenderData.setText(split[2]+"@"+split[3]);
+ } else {
+ textRenderData.setText(split[2] + "@" + split[3]);
}
renderData.add(textRenderData);
paragraphRenderData.setContents(renderData);
@@ -1416,34 +1497,31 @@
}
}
else {
- if (k==0){
+ if (k == 0) {
//绗竴鍒�
- textRenderData.setText(sampleList.get(0).getSampleCode()+"鈭�44");
+ textRenderData.setText(sampleList.get(0).getModel() + "鈭�44");
renderData.add(textRenderData);
paragraphRenderData.setContents(renderData);
paragraphRenderDataList.add(paragraphRenderData);
cellRenderData.setParagraphs(paragraphRenderDataList);
cells.add(cellRenderData);
- }
- else if (k==1){
+ } else if (k == 1) {
//绗簩鍒�
- textRenderData.setText(sampleList.get(j-1).getSampleCode().split("/")[0]);
+ textRenderData.setText(sampleList.get(j - 1).getSampleCode().split("/")[0]);
renderData.add(textRenderData);
paragraphRenderData.setContents(renderData);
paragraphRenderDataList.add(paragraphRenderData);
cellRenderData.setParagraphs(paragraphRenderDataList);
cells.add(cellRenderData);
- }
- else if (k==2){
+ } else if (k == 2) {
//绗笁鍒�
- textRenderData.setText(sampleList.get(j-1).getSampleCode().split("/")[1]);
+ textRenderData.setText(sampleList.get(j - 1).getSampleCode().split("/")[1]);
renderData.add(textRenderData);
paragraphRenderData.setContents(renderData);
paragraphRenderDataList.add(paragraphRenderData);
cellRenderData.setParagraphs(paragraphRenderDataList);
cells.add(cellRenderData);
- }
- else {
+ } else {
//鏍规嵁瀵瑰簲鐨勬牱鍝佺紪鍙峰拰妫�楠岄」鐩煡璇㈠搴旀暟鎹�(鏈�缁堝��)
String[] split = strings.get(k - 3).split(",");
InsProduct insProduct = insProductMapper.selectOne(Wrappers.<InsProduct>lambdaQuery()
@@ -1474,7 +1552,7 @@
}
System.out.println("");*/
if (row.getCells().size() != countSize) {
- throw new ErrorException("姣忚鍗曞厓鏍间笉鐩哥瓑");
+ throw new ErrorException("姣忚鍗曞厓鏍间笉鐩哥瓑3");
}
}
TableStyle tableStyle = new TableStyle();
@@ -1492,9 +1570,10 @@
Map<String, Object> table = new HashMap<>();
table.put("table4", tableRenderData);
table.put("report", insReport);
- table.put("index4", index4+1);
+ table.put("index4", index4 + 1);
tables4.add(table);
index4++;
+ index41++;
}
}
tables4.forEach(table4 -> {
@@ -1554,6 +1633,9 @@
try {
signatureUrl = userMapper.selectById(userId).getSignatureUrl();
} catch (Exception e) {
+ throw new ErrorException("鎵句笉鍒版楠屼汉鐨勭鍚�");
+ }
+ if (signatureUrl.equals("")) {
throw new ErrorException("鎵句笉鍒版楠屼汉鐨勭鍚�");
}
//Custom custom = customMapper.selectById(user.get("company"));
@@ -1762,7 +1844,7 @@
}
System.out.println("");*/
if (row.getCells().size() != countSize) {
- throw new ErrorException("姣忚鍗曞厓鏍间笉鐩哥瓑");
+ throw new ErrorException("姣忚鍗曞厓鏍间笉鐩哥瓑4");
}
}
TableStyle tableStyle = new TableStyle();
@@ -2200,8 +2282,7 @@
if (rowRenderData.getCells().size() != 0) {
rows.add(rowRenderData);
}
- }
- else {
+ } else {
//濡傛灉鏈夊娆″惊鐜�
if (i == 0) {
//绗竴娆″惊鐜殑鍒楁暟,閭ｄ箞鍒楁暟鍖呮嫭20鈩冨父娓�(2 * (size-nm.size()) -nm.size()+1)
@@ -3044,7 +3125,7 @@
}
System.out.println("");*/
if (row.getCells().size() != countSize) {
- throw new ErrorException("姣忚鍗曞厓鏍间笉鐩哥瓑");
+ throw new ErrorException("姣忚鍗曞厓鏍间笉鐩哥瓑5");
}
}
TableStyle tableStyle = new TableStyle();
@@ -3301,7 +3382,26 @@
product.setInsResult(1);
}
insProductMapper.updateById(product);
- } else {
+ }
+ //濡傛灉鏄儹寰幆鎴栬�呮槸娓╁崌璇曢獙
+ else if (product.getInspectionItem().equals("鐑惊鐜�") || product.getInspectionItem().equals("娓╁崌璇曢獙")){
+ //鏌ヨ杩欎簺椤圭洰涓嬬殑鍏朵粬妫�楠岄」鐩槸鍚﹀叏閮ㄦ楠�
+ List<InsProduct> insProductList = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
+ .eq(InsProduct::getInsSampleId, product.getInsSampleId())
+ .like(InsProduct::getInspectionItemSubclass, "娓╁害"));
+ List<Integer> collect = insProductList.stream().filter(insProduct -> insProduct.getInsResult() != null).map(InsProduct::getInsResult).collect(Collectors.toList());
+ List<Integer> tt = new ArrayList<>();
+ tt.add(1);
+ if (collect.contains(0)) {
+ product.setLastValue("涓嶅悎鏍�");
+ product.setInsResult(0);
+ } else if (collect.size() == insProductList.size() && collect.stream().distinct().collect(Collectors.toList()).containsAll(tt)) {
+ product.setLastValue("鍚堟牸");
+ product.setInsResult(1);
+ }
+ insProductMapper.updateById(product);
+ }
+ else {
count++;
str += "<br/>" + count + "锛�" + product.getInspectionItem() + " " + product.getInspectionItemSubclass() + "<br/>";
}
@@ -3362,7 +3462,7 @@
calendar.setTime(date);
int dayOfWeek = calendar.get(Calendar.DAY_OF_WEEK);
int day = calendar.get(Calendar.DAY_OF_MONTH);
- return day + " " + getWeekDay(dayOfWeek);
+ return getWeekDay(dayOfWeek);
} catch (Exception e) {
e.printStackTrace();
}
--
Gitblit v1.9.3