From 95e69381eeb4a589e9ab7b8e3b967ceb36d13b1d Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期四, 18 七月 2024 18:20:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 911 +++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 796 insertions(+), 115 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 ca46217..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);//闈炲姞鐝暟閲�
@@ -550,6 +599,7 @@
if (count == 0 && num == 5) {
List<InsUnPass> insUnPasses = new ArrayList<>();
/*鏍峰搧涓嬬殑椤圭洰鍙鏈変竴涓」鐩笉鍚堟牸鍒欐楠岀粨鏋滀负0,鍚﹀垯涓�1*/
+ //杩欓噷鐨刬nsSamples鏄鍗曚笅鐨勬墍鏈夋牱鍝佸寘鎷�("/")
List<InsSample> insSamples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getInsOrderId, orderId));
for (InsSample insSample : insSamples) {
List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery().eq(InsProduct::getInsSampleId, insSample.getId()).eq(InsProduct::getState, 1));
@@ -581,6 +631,7 @@
insUnPassService.saveBatch(insUnPasses);
InsOrder insOrder = insOrderMapper.selectById(orderId);
Map<String, String> user = insProductMapper.selectUserById(insOrder.getUserId());
+ //samples鏄笉鍖呮嫭甯︽湁"/"鐨勬牱鍝�
List<SampleProductDto> samples = insSampleMapper.selectSampleProductListByOrderId(orderId);
InsReport insReport = new InsReport();
insReport.setCode(insOrder.getEntrustCode());
@@ -593,6 +644,7 @@
String[] monthNames = {"January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"};
AtomicReference<String> resultCh = new AtomicReference<>("");
AtomicReference<String> resultEn = new AtomicReference<>("");
+ /*鍩虹鎶ュ憡(鏍规嵁缁樺埗鐨勫師濮嬭褰曟ā鐗堝舰鎴�)*/
samples.forEach(a -> {
Set<Integer> set = new HashSet<>();
Map<Integer, String> map2 = new HashMap<>();
@@ -889,6 +941,646 @@
});
});
});
+ /*鍏夌氦鎺ュご鎹熻�楃殑鎶ュ憡鏍峰紡*/
+ //鏌ヨ璁㈠崟涓嬫墍鏈夋牱鍝佺殑妫�楠岄」鐩�,濡傛灉鏈夊厜绾ゆ帴澶存崯鑰楀垯閲嶆柊鏋勫缓琛ㄦ牸
+ List<Map<String, Object>> tables4 = new ArrayList<>();
+ List<InsProduct> insProducts0 = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
+ .eq(InsProduct::getState, 1)
+ .in(InsProduct::getInsSampleId, insSamples.stream().map(InsSample::getId).distinct().collect(Collectors.toList())));
+ if (insProducts0.stream().map(InsProduct::getInspectionItem).collect(Collectors.toList()).contains("鍏夌氦鎺ュご鎹熻��")) {
+ //娓呯┖鍘熸湁鐨勫熀纭�琛ㄦ牸
+ tables.clear();
+ //鍘婚噸鐨勬楠岄」鐩�
+ List<String> filteredProducts = insProducts0.stream().map(insProduct -> {
+ return (insProduct.getInspectionItem() + "," + insProduct.getInspectionItemEn() + "," + insProduct.getInspectionItemSubclass() + "," + insProduct.getInspectionItemSubclassEn() + "," + insProduct.getTell());
+ }).distinct().collect(Collectors.toList());
+ //妫�楠岄」鐩殑鎬绘暟閲�(鍘婚噸)
+ long size = filteredProducts.size();
+ long number = 10;
+ long number2 = 7;
+ long index = 1;
+ //妫�楠岀粨鏋滄姤鍛�(褰撴楠岄」鐩秴杩�10涓柊寤鸿〃)
+ for (long i = 0; i < size; i++) {
+ if (i % number == 0) {
+ List<RowRenderData> rows = new ArrayList<>();
+ //琛ㄦ牸鐨勮鏁� 脳 鈭� 鉁� 鉁�
+ 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);
+ rowRenderData.setRowStyle(rowStyle);
+ List<CellRenderData> cells = new ArrayList<>();
+ //琛ㄦ牸鐨勫垪鏁�
+ for (int k = 0; k < 6; k++) {
+ CellRenderData cellRenderData = new CellRenderData();
+ CellStyle cellStyle = new CellStyle();
+ cellStyle.setVertAlign(XWPFTableCell.XWPFVertAlign.CENTER);
+ cellRenderData.setCellStyle(cellStyle);
+ List<ParagraphRenderData> paragraphRenderDataList = new ArrayList<>();
+ ParagraphRenderData paragraphRenderData = new ParagraphRenderData();
+ ParagraphStyle paragraphStyle = new ParagraphStyle();
+ paragraphStyle.setAlign(ParagraphAlignment.CENTER);
+ paragraphRenderData.setParagraphStyle(paragraphStyle);
+ List<RenderData> renderData = new ArrayList<>();
+ TextRenderData textRenderData = new TextRenderData();
+ Style style = new Style();
+ style.setFontFamily("瀹嬩綋");
+ style.setColor("000000");
+ textRenderData.setStyle(style);
+ if (j == 0) {
+ //绗竴琛�
+ if (k < 4) {
+ //鍓�4鍒�
+ textRenderData.setText("瑙勬牸鍨嬪彿@Type鈭�11");
+ renderData.add(textRenderData);
+ paragraphRenderData.setContents(renderData);
+ paragraphRenderDataList.add(paragraphRenderData);
+ cellRenderData.setParagraphs(paragraphRenderDataList);
+ cells.add(cellRenderData);
+ } else {
+ //鍚�2鍒�
+ textRenderData.setText(insSamples.get(0).getModel() + "鈭�12");
+ renderData.add(textRenderData);
+ paragraphRenderData.setContents(renderData);
+ paragraphRenderDataList.add(paragraphRenderData);
+ cellRenderData.setParagraphs(paragraphRenderDataList);
+ cells.add(cellRenderData);
+ }
+ }
+ else if (j == 1) {
+ //绗簩琛�
+ if (k == 0) {
+ //绗竴鍒�
+ textRenderData.setText("搴忓彿@No.鈭�13");
+ renderData.add(textRenderData);
+ paragraphRenderData.setContents(renderData);
+ paragraphRenderDataList.add(paragraphRenderData);
+ cellRenderData.setParagraphs(paragraphRenderDataList);
+ cells.add(cellRenderData);
+ } else if (k == 1) {
+ //绗簩鍒�
+ textRenderData.setText("妫�楠岄」鐩瓳Test Item鈭�14");
+ renderData.add(textRenderData);
+ paragraphRenderData.setContents(renderData);
+ paragraphRenderDataList.add(paragraphRenderData);
+ cellRenderData.setParagraphs(paragraphRenderDataList);
+ cells.add(cellRenderData);
+ } else if (k == 2 || k == 3) {
+ //绗笁鍥涘垪
+ textRenderData.setText("鏍囧噯瑕佹眰@Requirement鈭�15");
+ renderData.add(textRenderData);
+ paragraphRenderData.setContents(renderData);
+ paragraphRenderDataList.add(paragraphRenderData);
+ cellRenderData.setParagraphs(paragraphRenderDataList);
+ cells.add(cellRenderData);
+ } else if (k == 4) {
+ //绗簲鍒�
+ textRenderData.setText("妫�楠岀粨鏋淍Test result鈭�16");
+ renderData.add(textRenderData);
+ paragraphRenderData.setContents(renderData);
+ paragraphRenderDataList.add(paragraphRenderData);
+ cellRenderData.setParagraphs(paragraphRenderDataList);
+ cells.add(cellRenderData);
+ } else {
+ //绗叚鍒�
+ textRenderData.setText("缁撹@Conclusion鈭�17");
+ renderData.add(textRenderData);
+ paragraphRenderData.setContents(renderData);
+ paragraphRenderDataList.add(paragraphRenderData);
+ cellRenderData.setParagraphs(paragraphRenderDataList);
+ cells.add(cellRenderData);
+ }
+ }
+ else if (j == count1-1) {
+ //鏈�鍚庝竴琛�
+ if (k == 0 || k == 1) {
+ //鍓嶄袱鍒�
+ textRenderData.setText("澶囨敞鈭�18");
+ renderData.add(textRenderData);
+ paragraphRenderData.setContents(renderData);
+ paragraphRenderDataList.add(paragraphRenderData);
+ cellRenderData.setParagraphs(paragraphRenderDataList);
+ cells.add(cellRenderData);
+ } else {
+ textRenderData.setText("鈥溾垰鈥濊〃绀洪」鐩悎鏍硷紝鈥溍椻�濊〃绀洪」鐩笉鍚堟牸@鈥溾垰鈥漣ndicates test Item is qualified锛屸�溍椻�漣ndicates test Item is unqualified鈭�19");
+ renderData.add(textRenderData);
+ paragraphRenderData.setContents(renderData);
+ paragraphRenderDataList.add(paragraphRenderData);
+ cellRenderData.setParagraphs(paragraphRenderDataList);
+ cells.add(cellRenderData);
+ }
+ }
+ else {
+ if (k == 0) {
+ //绗竴鍒�
+ textRenderData.setText((j - 1) + "");
+ renderData.add(textRenderData);
+ paragraphRenderData.setContents(renderData);
+ paragraphRenderDataList.add(paragraphRenderData);
+ cellRenderData.setParagraphs(paragraphRenderDataList);
+ cells.add(cellRenderData);
+ } else if (k == 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]);
+ } else {
+ textRenderData.setText(split[0] + "@" + split[1]);
+ }
+ renderData.add(textRenderData);
+ paragraphRenderData.setContents(renderData);
+ paragraphRenderDataList.add(paragraphRenderData);
+ cellRenderData.setParagraphs(paragraphRenderDataList);
+ cells.add(cellRenderData);
+ } else if (k == 2) {
+ //绗笁鍒�
+ //鍏堝垽鏂楠岄」鏄惁鏈夊瓙绫�
+ 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("")) {
+ //濡傛灉娌℃湁瀛愮被
+ textRenderData.setText(split[4] + "鈭�2" + j);//瑕佹眰鎻忚堪
+ } else {
+ //濡傛灉鏈夊瓙绫�
+ //杩樿鍒ゆ柇鏄惁鏈夎嫳鏂�
+ if (ObjectUtils.isEmpty(split[3]) || split[3].equals("")) {
+ textRenderData.setText(split[2]);//妫�楠屽瓙椤�
+ } else {
+ textRenderData.setText(split[2] + "@" + split[3]);//妫�楠屽瓙椤�+鑻辨枃
+ }
+ }
+ renderData.add(textRenderData);
+ paragraphRenderData.setContents(renderData);
+ paragraphRenderDataList.add(paragraphRenderData);
+ cellRenderData.setParagraphs(paragraphRenderDataList);
+ cells.add(cellRenderData);
+ } else if (k == 3) {
+ //绗洓鍒�
+ //鍏堝垽鏂楠岄」鏄惁鏈夊瓙绫�
+ 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("")) {
+ //濡傛灉娌℃湁瀛愮被
+ textRenderData.setText(split[4] + "鈭�2" + j);//瑕佹眰鎻忚堪
+ } else {
+ //濡傛灉鏈夊瓙绫�
+ textRenderData.setText(split[4]);//瑕佹眰鎻忚堪
+ }
+ renderData.add(textRenderData);
+ paragraphRenderData.setContents(renderData);
+ paragraphRenderDataList.add(paragraphRenderData);
+ cellRenderData.setParagraphs(paragraphRenderDataList);
+ cells.add(cellRenderData);
+ } else if (k == 4) {
+ //绗簲鍒�
+ 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()
+ .eq(InsProduct::getState, 1)
+ .eq(InsProduct::getInspectionItem, split[0])
+ .eq(InsProduct::getInspectionItemSubclass, split[2])
+ .in(InsProduct::getInsSampleId, insSamples.stream().map(InsSample::getId).distinct().collect(Collectors.toList())));
+ //鑾峰彇鏈�灏忓�煎拰鏈�澶у��
+ Optional<String> max = products.stream().map(InsProduct::getLastValue)
+ .filter(value -> !value.isEmpty())
+ .max(String::compareTo);
+ Optional<String> min = products.stream().map(InsProduct::getLastValue)
+ .filter(value -> !value.isEmpty())
+ .min(String::compareTo);
+ textRenderData.setText(min.get() + "-" + max.get());//妫�楠岀粨鏋�
+ renderData.add(textRenderData);
+ paragraphRenderData.setContents(renderData);
+ paragraphRenderDataList.add(paragraphRenderData);
+ cellRenderData.setParagraphs(paragraphRenderDataList);
+ cells.add(cellRenderData);
+ } else {
+ //鏈�鍚庝竴鍒�
+ 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()
+ .eq(InsProduct::getState, 1)
+ .eq(InsProduct::getInspectionItem, split[0])
+ .eq(InsProduct::getInspectionItemSubclass, split[2])
+ .in(InsProduct::getInsSampleId, insSamples.stream().map(InsSample::getId).distinct().collect(Collectors.toList())));
+ List<Integer> result = products.stream().map(InsProduct::getInsResult).distinct().collect(Collectors.toList());
+ if (result.size() == 1 && result.contains(1)) {
+ //鍚堟牸
+ textRenderData.setText("鈭�");
+ } else {
+ //涓嶅悎鏍�
+ textRenderData.setText("脳");
+ }
+ renderData.add(textRenderData);
+ paragraphRenderData.setContents(renderData);
+ paragraphRenderDataList.add(paragraphRenderData);
+ cellRenderData.setParagraphs(paragraphRenderDataList);
+ cells.add(cellRenderData);
+ }
+ }
+ }
+ rowRenderData.setCells(cells);
+ if (rowRenderData.getCells().size() != 0) {
+ rows.add(rowRenderData);
+ }
+ }
+ TableRenderData tableRenderData = new TableRenderData();
+ tableRenderData.setRows(rows);
+ int countSize = tableRenderData.getRows().get(0).getCells().size();
+ for (RowRenderData row : tableRenderData.getRows()) {
+ /* for (CellRenderData cell : row.getCells()) {
+ System.out.print(cell.getParagraphs().get(0).getContents());
+ }
+ System.out.println("");*/
+ if (row.getCells().size() != countSize) {
+ throw new ErrorException("姣忚鍗曞厓鏍间笉鐩哥瓑1");
+ }
+ }
+ TableStyle tableStyle = new TableStyle();
+ tableStyle.setWidth(XWPFTable.DEFAULT_PERCENTAGE_WIDTH);
+ tableStyle.setAlign(TableRowAlign.CENTER);
+ BorderStyle borderStyle = new BorderStyle();
+ borderStyle.setColor("000000");
+ borderStyle.setType(XWPFTable.XWPFBorderType.THICK);
+ borderStyle.setSize(14);
+ tableStyle.setLeftBorder(borderStyle);
+ tableStyle.setTopBorder(borderStyle);
+ tableStyle.setRightBorder(borderStyle);
+ tableStyle.setBottomBorder(borderStyle);
+ tableRenderData.setTableStyle(tableStyle);
+ Map<String, Object> table = new HashMap<>();
+ table.put("table", tableRenderData);
+ table.put("report", insReport);
+ table.put("index", index);
+ tables.add(table);
+ index++;
+ }
+ }
+ long index4 = 1;
+ //妫�楠屾姤鍛婃姤鍛�(褰撴楠岄」鐩秴杩�7涓柊寤鸿〃)
+ for (long j = 0; j < size; j++) {
+ if (j % number2 == 0) {
+ List<RowRenderData> rows = new ArrayList<>();
+ //琛ㄦ牸鐨勮鏁�(鏍规嵁鏍峰搧鏁伴噺鏉�)
+ for (int i = 0; i < samples.size() + 2; i++) {
+ RowRenderData rowRenderData = new RowRenderData();
+ RowStyle rowStyle = new RowStyle();
+ rowStyle.setHeight(40);
+ rowRenderData.setRowStyle(rowStyle);
+ List<CellRenderData> cells = new ArrayList<>();
+ //琛ㄦ牸鐨勫垪鏁�
+ for (int k = 0; k < 8; k++) {
+ CellRenderData cellRenderData = new CellRenderData();
+ CellStyle cellStyle = new CellStyle();
+ cellStyle.setVertAlign(XWPFTableCell.XWPFVertAlign.CENTER);
+ cellRenderData.setCellStyle(cellStyle);
+ List<ParagraphRenderData> paragraphRenderDataList = new ArrayList<>();
+ ParagraphRenderData paragraphRenderData = new ParagraphRenderData();
+ ParagraphStyle paragraphStyle = new ParagraphStyle();
+ paragraphStyle.setAlign(ParagraphAlignment.CENTER);
+ paragraphRenderData.setParagraphStyle(paragraphStyle);
+ List<RenderData> renderData = new ArrayList<>();
+ TextRenderData textRenderData = new TextRenderData();
+ Style style = new Style();
+ style.setFontFamily("瀹嬩綋");
+ style.setColor("000000");
+ textRenderData.setStyle(style);
+ if (i == 0) {
+ //绗竴琛�
+ if (k == 0) {
+ //绗竴鍒�
+ textRenderData.setText("鏍峰搧缂栧彿@Sample number鈭�30");
+ renderData.add(textRenderData);
+ paragraphRenderData.setContents(renderData);
+ paragraphRenderDataList.add(paragraphRenderData);
+ cellRenderData.setParagraphs(paragraphRenderDataList);
+ cells.add(cellRenderData);
+ } else {
+ //绗簩鍒�
+ 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);
+ }
+ } else {
+ if (ObjectUtils.isEmpty(split[1]) || split[1].equals("")) {
+ textRenderData.setText(split[0]);
+ } else {
+ textRenderData.setText(split[0] + "@" + split[1]);
+ }
+ }
+ renderData.add(textRenderData);
+ paragraphRenderData.setContents(renderData);
+ paragraphRenderDataList.add(paragraphRenderData);
+ cellRenderData.setParagraphs(paragraphRenderDataList);
+ cells.add(cellRenderData);
+ }
+ } else if (i == 1) {
+ //绗簩琛�
+ if (k == 0) {
+ //绗竴鍒�
+ textRenderData.setText("鏍峰搧缂栧彿@Sample number鈭�30");
+ renderData.add(textRenderData);
+ paragraphRenderData.setContents(renderData);
+ paragraphRenderDataList.add(paragraphRenderData);
+ cellRenderData.setParagraphs(paragraphRenderDataList);
+ cells.add(cellRenderData);
+ } else {
+ //绗簩鍒�
+ 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);
+ }
+ } else {
+ if (ObjectUtils.isEmpty(split[3]) || split[3].equals("")) {
+ textRenderData.setText(split[2]);
+ } else {
+ textRenderData.setText(split[2] + "@" + split[3]);
+ }
+ }
+ renderData.add(textRenderData);
+ paragraphRenderData.setContents(renderData);
+ paragraphRenderDataList.add(paragraphRenderData);
+ cellRenderData.setParagraphs(paragraphRenderDataList);
+ cells.add(cellRenderData);
+ }
+ } else {
+ if (k == 0) {
+ //绗竴鍒�
+ textRenderData.setText(samples.get(i - 2).getSampleCode());
+ renderData.add(textRenderData);
+ paragraphRenderData.setContents(renderData);
+ paragraphRenderDataList.add(paragraphRenderData);
+ cellRenderData.setParagraphs(paragraphRenderDataList);
+ cells.add(cellRenderData);
+ } else {
+ //鏍规嵁鏍峰搧缂栧彿鍜岄」鐩幓鏌ヨ鏈�缁堝��
+ 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)) {
+ //鍙兘鏍规嵁姝ｅ父鐨勬牱鍝佺紪鍙峰拰鍏夌氦鎺ュご鎹熻�楃殑椤圭洰鏌ヤ笉鍒板搴旂殑椤圭洰,鍒欓渶瑕佹牴鎹�"/"鏉ユ煡
+ List<InsSample> sampleList = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().like(InsSample::getSampleCode, samples.get(i - 2).getSampleCode()));
+ List<InsProduct> products = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
+ .eq(InsProduct::getState, 1)
+ .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);
+ }
+ textRenderData.setText(insProduct.getLastValue());
+ renderData.add(textRenderData);
+ paragraphRenderData.setContents(renderData);
+ paragraphRenderDataList.add(paragraphRenderData);
+ cellRenderData.setParagraphs(paragraphRenderDataList);
+ cells.add(cellRenderData);
+ }
+ }
+
+ }
+ rowRenderData.setCells(cells);
+ if (rowRenderData.getCells().size() != 0) {
+ rows.add(rowRenderData);
+ }
+ }
+ TableRenderData tableRenderData = new TableRenderData();
+ tableRenderData.setRows(rows);
+ int countSize = tableRenderData.getRows().get(0).getCells().size();
+ for (RowRenderData row : tableRenderData.getRows()) {
+ /*for (CellRenderData cell : row.getCells()) {
+ System.out.print(cell.getParagraphs().get(0).getContents());
+ }
+ System.out.println("");*/
+ if (row.getCells().size() != countSize) {
+ throw new ErrorException("姣忚鍗曞厓鏍间笉鐩哥瓑2");
+ }
+ }
+ TableStyle tableStyle = new TableStyle();
+ tableStyle.setWidth(XWPFTable.DEFAULT_PERCENTAGE_WIDTH);
+ tableStyle.setAlign(TableRowAlign.CENTER);
+ BorderStyle borderStyle = new BorderStyle();
+ borderStyle.setColor("000000");
+ borderStyle.setType(XWPFTable.XWPFBorderType.THICK);
+ borderStyle.setSize(14);
+ tableStyle.setLeftBorder(borderStyle);
+ tableStyle.setTopBorder(borderStyle);
+ tableStyle.setRightBorder(borderStyle);
+ tableStyle.setBottomBorder(borderStyle);
+ tableRenderData.setTableStyle(tableStyle);
+ Map<String, Object> table = new HashMap<>();
+ table.put("table4", tableRenderData);
+ table.put("report", insReport);
+ table.put("index4", index4);
+ tables4.add(table);
+ index4++;
+ }
+ }
+ //鍏夌氦鎺ュご鎹熻�楃殑鎶ュ憡杩樻槸tables4
+ //鏌ヨ鏍峰搧(鍙煡璇㈠甫"/")鐨勬暟閲�
+ 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) {
+ //鏍峰搧鏁伴噺瓒呰繃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 < count2; j++) {
+ RowRenderData rowRenderData = new RowRenderData();
+ RowStyle rowStyle = new RowStyle();
+ rowStyle.setHeight(40);
+ rowRenderData.setRowStyle(rowStyle);
+ List<CellRenderData> cells = new ArrayList<>();
+ //琛ㄦ牸鐨勫垪鏁�
+ for (int k = 0; k < 6; k++) {
+ CellRenderData cellRenderData = new CellRenderData();
+ CellStyle cellStyle = new CellStyle();
+ cellStyle.setVertAlign(XWPFTableCell.XWPFVertAlign.CENTER);
+ cellRenderData.setCellStyle(cellStyle);
+ List<ParagraphRenderData> paragraphRenderDataList = new ArrayList<>();
+ ParagraphRenderData paragraphRenderData = new ParagraphRenderData();
+ ParagraphStyle paragraphStyle = new ParagraphStyle();
+ paragraphStyle.setAlign(ParagraphAlignment.CENTER);
+ paragraphRenderData.setParagraphStyle(paragraphStyle);
+ List<RenderData> renderData = new ArrayList<>();
+ TextRenderData textRenderData = new TextRenderData();
+ Style style = new Style();
+ style.setFontFamily("瀹嬩綋");
+ style.setColor("000000");
+ textRenderData.setStyle(style);
+ if (j == 0) {
+ //绗竴琛�
+ if (k == 0) {
+ //绗竴鍒�
+ textRenderData.setText("鍏夌氦绫诲瀷@Fiber type");
+ renderData.add(textRenderData);
+ paragraphRenderData.setContents(renderData);
+ paragraphRenderDataList.add(paragraphRenderData);
+ cellRenderData.setParagraphs(paragraphRenderDataList);
+ cells.add(cellRenderData);
+ } else if (k == 1 || k == 2) {
+ //绗簩 涓夊垪
+ textRenderData.setText("鏍峰搧缂栧彿@Sample number");
+ renderData.add(textRenderData);
+ paragraphRenderData.setContents(renderData);
+ paragraphRenderDataList.add(paragraphRenderData);
+ cellRenderData.setParagraphs(paragraphRenderDataList);
+ cells.add(cellRenderData);
+ } else {
+ String[] split = strings.get(k - 3).split(",");
+ if (ObjectUtils.isEmpty(split[3]) || split[3].equals("")) {
+ textRenderData.setText(split[2]);
+ } else {
+ textRenderData.setText(split[2] + "@" + split[3]);
+ }
+ renderData.add(textRenderData);
+ paragraphRenderData.setContents(renderData);
+ paragraphRenderDataList.add(paragraphRenderData);
+ cellRenderData.setParagraphs(paragraphRenderDataList);
+ cells.add(cellRenderData);
+ }
+ }
+ else {
+ if (k == 0) {
+ //绗竴鍒�
+ 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) {
+ //绗簩鍒�
+ 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) {
+ //绗笁鍒�
+ 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 {
+ //鏍规嵁瀵瑰簲鐨勬牱鍝佺紪鍙峰拰妫�楠岄」鐩煡璇㈠搴旀暟鎹�(鏈�缁堝��)
+ String[] split = strings.get(k - 3).split(",");
+ InsProduct insProduct = insProductMapper.selectOne(Wrappers.<InsProduct>lambdaQuery()
+ .eq(InsProduct::getState, 1)
+ .eq(InsProduct::getInsSampleId, sampleList.get(j - 1).getId())
+ .eq(InsProduct::getInspectionItem, split[0])
+ .eq(InsProduct::getInspectionItemSubclass, split[2]));
+ textRenderData.setText(insProduct.getLastValue());
+ renderData.add(textRenderData);
+ paragraphRenderData.setContents(renderData);
+ paragraphRenderDataList.add(paragraphRenderData);
+ cellRenderData.setParagraphs(paragraphRenderDataList);
+ cells.add(cellRenderData);
+ }
+ }
+ }
+ rowRenderData.setCells(cells);
+ if (rowRenderData.getCells().size() != 0) {
+ rows.add(rowRenderData);
+ }
+ }
+ TableRenderData tableRenderData = new TableRenderData();
+ tableRenderData.setRows(rows);
+ int countSize = tableRenderData.getRows().get(0).getCells().size();
+ for (RowRenderData row : tableRenderData.getRows()) {
+ /*for (CellRenderData cell : row.getCells()) {
+ System.out.print(cell.getParagraphs().get(0).getContents());
+ }
+ System.out.println("");*/
+ if (row.getCells().size() != countSize) {
+ throw new ErrorException("姣忚鍗曞厓鏍间笉鐩哥瓑3");
+ }
+ }
+ TableStyle tableStyle = new TableStyle();
+ tableStyle.setWidth(XWPFTable.DEFAULT_PERCENTAGE_WIDTH);
+ tableStyle.setAlign(TableRowAlign.CENTER);
+ BorderStyle borderStyle = new BorderStyle();
+ borderStyle.setColor("000000");
+ borderStyle.setType(XWPFTable.XWPFBorderType.THICK);
+ borderStyle.setSize(14);
+ tableStyle.setLeftBorder(borderStyle);
+ tableStyle.setTopBorder(borderStyle);
+ tableStyle.setRightBorder(borderStyle);
+ tableStyle.setBottomBorder(borderStyle);
+ tableRenderData.setTableStyle(tableStyle);
+ Map<String, Object> table = new HashMap<>();
+ table.put("table4", tableRenderData);
+ table.put("report", insReport);
+ table.put("index4", index4 + 1);
+ tables4.add(table);
+ index4++;
+ index41++;
+ }
+ }
+ tables4.forEach(table4 -> {
+ table4.put("tableSize4", tables4.size());
+ });
+
+ }
String url;
try {
InputStream inputStream = this.getClass().getResourceAsStream("/static/report-template.docx");
@@ -943,6 +1635,9 @@
} catch (Exception e) {
throw new ErrorException("鎵句笉鍒版楠屼汉鐨勭鍚�");
}
+ if (signatureUrl.equals("")) {
+ throw new ErrorException("鎵句笉鍒版楠屼汉鐨勭鍚�");
+ }
//Custom custom = customMapper.selectById(user.get("company"));
Custom custom = customMapper.selectById(insOrder.getCompanyId());
if (!resultCh.get().equals("")) {
@@ -952,6 +1647,8 @@
resultCh.set("渚濇嵁濮旀墭瑕佹眰锛屾墍妫�椤圭洰鍧囩鍚堣姹傘��");
resultEn.set("According to commissioned requirements, all the tested items meet the requirements.");
}
+
+
/*鍏夌氦閰嶇疆鐨勬楠屾姤鍛�*/
//鍏堝垽鏂槸鍚︽湁鍏夌氦閰嶇疆
List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
@@ -1142,12 +1839,12 @@
tableRenderData.setRows(rows);
int countSize = tableRenderData.getRows().get(0).getCells().size();
for (RowRenderData row : tableRenderData.getRows()) {
- for (CellRenderData cell : row.getCells()) {
+ /*for (CellRenderData cell : row.getCells()) {
System.out.print(cell.getParagraphs().get(0).getContents());
}
- System.out.println("");
+ System.out.println("");*/
if (row.getCells().size() != countSize) {
- throw new ErrorException("姣忚鍗曞厓鏍间笉鐩哥瓑");
+ throw new ErrorException("姣忚鍗曞厓鏍间笉鐩哥瓑4");
}
}
TableStyle tableStyle = new TableStyle();
@@ -1300,8 +1997,7 @@
paragraphRenderDataList.add(paragraphRenderData);
cellRenderData.setParagraphs(paragraphRenderDataList);
cells.add(cellRenderData);
- }
- else if (j == 1) {
+ } else if (j == 1) {
//绗簩琛�
if (k == 0) {
//绗竴鍒�
@@ -1314,8 +2010,7 @@
paragraphRenderDataList.add(paragraphRenderData);
cellRenderData.setParagraphs(paragraphRenderDataList);
cells.add(cellRenderData);
- }
- else if (j == 2) {
+ } else if (j == 2) {
//绗笁琛�
if (k == 0) {
//绗竴鍒�
@@ -1347,8 +2042,7 @@
}
}
}
- }
- else if (j == 3) {
+ } else if (j == 3) {
//绗洓琛�
if (k == 0) {
//绗竴鍒�
@@ -1384,8 +2078,7 @@
}
}
}
- }
- else if (j == 4) {
+ } else if (j == 4) {
//绗簲琛�
if (k == 0) {
//绗竴鍒�
@@ -1418,8 +2111,7 @@
cellRenderData.setParagraphs(paragraphRenderDataList);
cells.add(cellRenderData);
}
- }
- else if (j == size2 + 5) {
+ } else if (j == size2 + 5) {
//鍊掓暟绗笁琛�
if (k == 0) {
//绗竴鍒�
@@ -1496,8 +2188,7 @@
cellRenderData.setParagraphs(paragraphRenderDataList);
cells.add(cellRenderData);
}
- }
- else if (j == size2 + 6) {
+ } else if (j == size2 + 6) {
//鍊掓暟绗簩琛�
if (k == 0) {
//绗竴鍒�
@@ -1542,8 +2233,7 @@
cellRenderData.setParagraphs(paragraphRenderDataList);
cells.add(cellRenderData);
}
- }
- else if (j == size2 + 7) {
+ } else if (j == size2 + 7) {
//鍊掓暟绗竴琛�
textRenderData.setText("鈥渱鈭� 伪|鈥濊〃绀洪檮鍔犺“鍑忕粷瀵瑰�尖垜111111");
renderData.add(textRenderData);
@@ -1551,8 +2241,7 @@
paragraphRenderDataList.add(paragraphRenderData);
cellRenderData.setParagraphs(paragraphRenderDataList);
cells.add(cellRenderData);
- }
- else {
+ } else {
//鍏朵綑濉啓妫�楠屽�肩殑鍐呭
if (k == 0) {
//绗竴鍒楀～鍐欒壊鏍�
@@ -1593,8 +2282,7 @@
if (rowRenderData.getCells().size() != 0) {
rows.add(rowRenderData);
}
- }
- else {
+ } else {
//濡傛灉鏈夊娆″惊鐜�
if (i == 0) {
//绗竴娆″惊鐜殑鍒楁暟,閭ｄ箞鍒楁暟鍖呮嫭20鈩冨父娓�(2 * (size-nm.size()) -nm.size()+1)
@@ -1634,8 +2322,7 @@
paragraphRenderDataList.add(paragraphRenderData);
cellRenderData.setParagraphs(paragraphRenderDataList);
cells.add(cellRenderData);
- }
- else if (j == 1) {
+ } else if (j == 1) {
//绗簩琛�
if (k == 0) {
//绗竴鍒�
@@ -1648,8 +2335,7 @@
paragraphRenderDataList.add(paragraphRenderData);
cellRenderData.setParagraphs(paragraphRenderDataList);
cells.add(cellRenderData);
- }
- else if (j == 2) {
+ } else if (j == 2) {
//绗笁琛�
if (k == 0) {
//绗竴鍒�
@@ -1681,8 +2367,7 @@
}
}
}
- }
- else if (j == 3) {
+ } else if (j == 3) {
//绗洓琛�
if (k == 0) {
//绗竴鍒�
@@ -1718,8 +2403,7 @@
}
}
}
- }
- else if (j == 4) {
+ } else if (j == 4) {
//绗簲琛�
if (k == 0) {
//绗竴鍒�
@@ -1752,8 +2436,7 @@
cellRenderData.setParagraphs(paragraphRenderDataList);
cells.add(cellRenderData);
}
- }
- else if (j == size2 + 5) {
+ } else if (j == size2 + 5) {
//鍊掓暟绗笁琛�
if (k == 0) {
//绗竴鍒�
@@ -1830,8 +2513,7 @@
cellRenderData.setParagraphs(paragraphRenderDataList);
cells.add(cellRenderData);
}
- }
- else if (j == size2 + 6) {
+ } else if (j == size2 + 6) {
//鍊掓暟绗簩琛�
if (k == 0) {
//绗竴鍒�
@@ -1876,8 +2558,7 @@
cellRenderData.setParagraphs(paragraphRenderDataList);
cells.add(cellRenderData);
}
- }
- else if (j == size2 + 7) {
+ } else if (j == size2 + 7) {
//鍊掓暟绗竴琛�
textRenderData.setText("鈥渱鈭� 伪|鈥濊〃绀洪檮鍔犺“鍑忕粷瀵瑰�尖垜111111");
renderData.add(textRenderData);
@@ -1885,8 +2566,7 @@
paragraphRenderDataList.add(paragraphRenderData);
cellRenderData.setParagraphs(paragraphRenderDataList);
cells.add(cellRenderData);
- }
- else {
+ } else {
//鍏朵綑濉啓妫�楠屽�肩殑鍐呭
if (k == 0) {
//绗竴鍒楀～鍐欒壊鏍�
@@ -1923,8 +2603,7 @@
}
}
}
- }
- else if (i == size1 - 1) {
+ } else if (i == size1 - 1) {
//鏈�鍚庝竴娆″惊鐜殑鍒楁暟,閭ｄ箞鍒楁暟鍖呮嫭20鈩�(2 * (size-nm.size())+1)
for (long k = 0; k < 2 * (size - nm.size()) + 1; k++) {
CellRenderData cellRenderData = new CellRenderData();
@@ -1962,8 +2641,7 @@
paragraphRenderDataList.add(paragraphRenderData);
cellRenderData.setParagraphs(paragraphRenderDataList);
cells.add(cellRenderData);
- }
- else if (j == 1) {
+ } else if (j == 1) {
//绗簩琛�
if (k == 0) {
//绗竴鍒�
@@ -1976,8 +2654,7 @@
paragraphRenderDataList.add(paragraphRenderData);
cellRenderData.setParagraphs(paragraphRenderDataList);
cells.add(cellRenderData);
- }
- else if (j == 2) {
+ } else if (j == 2) {
//绗笁琛�
if (k == 0) {
//绗竴鍒�
@@ -2001,8 +2678,7 @@
}
}
}
- }
- else if (j == 3) {
+ } else if (j == 3) {
//绗洓琛�
if (k == 0) {
//绗竴鍒�
@@ -2026,8 +2702,7 @@
}
}
}
- }
- else if (j == 4) {
+ } else if (j == 4) {
//绗簲琛�
if (k == 0) {
//绗竴鍒�
@@ -2052,8 +2727,7 @@
cellRenderData.setParagraphs(paragraphRenderDataList);
cells.add(cellRenderData);
}
- }
- else if (j == size2 + 5) {
+ } else if (j == size2 + 5) {
//鍊掓暟绗笁琛�
if (k == 0) {
//绗竴鍒�
@@ -2107,8 +2781,7 @@
cellRenderData.setParagraphs(paragraphRenderDataList);
cells.add(cellRenderData);
}
- }
- else if (j == size2 + 6) {
+ } else if (j == size2 + 6) {
//鍊掓暟绗簩琛�
if (k == 0) {
//绗竴鍒�
@@ -2146,8 +2819,7 @@
cellRenderData.setParagraphs(paragraphRenderDataList);
cells.add(cellRenderData);
}
- }
- else if (j == size2 + 7) {
+ } else if (j == size2 + 7) {
//鍊掓暟绗竴琛�
textRenderData.setText("鈥渱鈭� 伪|鈥濊〃绀洪檮鍔犺“鍑忕粷瀵瑰�尖垜111111");
renderData.add(textRenderData);
@@ -2155,8 +2827,7 @@
paragraphRenderDataList.add(paragraphRenderData);
cellRenderData.setParagraphs(paragraphRenderDataList);
cells.add(cellRenderData);
- }
- else {
+ } else {
//鍏朵綑濉啓妫�楠屽�肩殑鍐呭
if (k == 0) {
//绗竴鍒楀～鍐欒壊鏍�
@@ -2185,8 +2856,7 @@
}
}
}
- }
- else {
+ } else {
//鍏朵綑寰幆鐨勫垪鏁�,,閭ｄ箞鍒楁暟涓嶅寘鎷�20鈩�+20鈩�(甯告俯)(2 * (size- 2*nm.size()) +1)
for (long k = 0; k < 2 * (size - 2 * nm.size()) + 1; k++) {
CellRenderData cellRenderData = new CellRenderData();
@@ -2212,7 +2882,7 @@
} else if (k > (2 * (size - 2 * nm.size()) + 1) / 4 && k <= (2 * (size - 2 * nm.size()) + 1) / 2) {
//绗簩鍒�
textRenderData.setText(sample.getSampleCode() + "鈭�998");
- } else if (k >(2 * (size - 2 * nm.size()) + 1) / 2 && k< 2 * (size - 2 * nm.size())) {
+ } else if (k > (2 * (size - 2 * nm.size()) + 1) / 2 && k < 2 * (size - 2 * nm.size())) {
//绗笁鍒�
textRenderData.setText("瑙勬牸鍨嬪彿@Type鈭�999");
} else {
@@ -2224,8 +2894,7 @@
paragraphRenderDataList.add(paragraphRenderData);
cellRenderData.setParagraphs(paragraphRenderDataList);
cells.add(cellRenderData);
- }
- else if (j == 1) {
+ } else if (j == 1) {
//绗簩琛�
if (k == 0) {
//绗竴鍒�
@@ -2238,8 +2907,7 @@
paragraphRenderDataList.add(paragraphRenderData);
cellRenderData.setParagraphs(paragraphRenderDataList);
cells.add(cellRenderData);
- }
- else if (j == 2) {
+ } else if (j == 2) {
//绗笁琛�
if (k == 0) {
//绗竴鍒�
@@ -2263,8 +2931,7 @@
}
}
}
- }
- else if (j == 3) {
+ } else if (j == 3) {
//绗洓琛�
if (k == 0) {
//绗竴鍒�
@@ -2288,8 +2955,7 @@
}
}
}
- }
- else if (j == 4) {
+ } else if (j == 4) {
//绗簲琛�
if (k == 0) {
//绗竴鍒�
@@ -2314,8 +2980,7 @@
cellRenderData.setParagraphs(paragraphRenderDataList);
cells.add(cellRenderData);
}
- }
- else if (j == size2 + 5) {
+ } else if (j == size2 + 5) {
//鍊掓暟绗笁琛�
if (k == 0) {
//绗竴鍒�
@@ -2369,8 +3034,7 @@
cellRenderData.setParagraphs(paragraphRenderDataList);
cells.add(cellRenderData);
}
- }
- else if (j == size2 + 6) {
+ } else if (j == size2 + 6) {
//鍊掓暟绗簩琛�
if (k == 0) {
//绗竴鍒�
@@ -2408,8 +3072,7 @@
cellRenderData.setParagraphs(paragraphRenderDataList);
cells.add(cellRenderData);
}
- }
- else if (j == size2 + 7) {
+ } else if (j == size2 + 7) {
//鍊掓暟绗竴琛�
textRenderData.setText("鈥渱鈭� 伪|鈥濊〃绀洪檮鍔犺“鍑忕粷瀵瑰�尖垜111111");
renderData.add(textRenderData);
@@ -2417,8 +3080,7 @@
paragraphRenderDataList.add(paragraphRenderData);
cellRenderData.setParagraphs(paragraphRenderDataList);
cells.add(cellRenderData);
- }
- else {
+ } else {
//鍏朵綑濉啓妫�楠屽�肩殑鍐呭
if (k == 0) {
//绗竴鍒楀～鍐欒壊鏍�
@@ -2458,12 +3120,12 @@
tableRenderData.setRows(rows);
int countSize = tableRenderData.getRows().get(0).getCells().size();
for (RowRenderData row : tableRenderData.getRows()) {
- for (CellRenderData cell : row.getCells()) {
+ /*for (CellRenderData cell : row.getCells()) {
System.out.print(cell.getParagraphs().get(0).getContents());
}
- System.out.println("");
+ System.out.println("");*/
if (row.getCells().size() != countSize) {
- throw new ErrorException("姣忚鍗曞厓鏍间笉鐩哥瓑");
+ throw new ErrorException("姣忚鍗曞厓鏍间笉鐩哥瓑5");
}
}
TableStyle tableStyle = new TableStyle();
@@ -2481,8 +3143,6 @@
Map<String, Object> table = new HashMap<>();
table.put("table3", tableRenderData);
table.put("report", insReport);
- table.put("sample_number", sample.getSampleCode());
- table.put("type", sample.getModel());
table.put("index3", index3);
tables3.add(table);
index3++;
@@ -2530,6 +3190,8 @@
put("tableSize2", tables2.size());
put("tables3", tables3);
put("tableSize3", tables3.size());
+ put("tables4", tables4);
+ put("tableSize4", tables4.size());
put("standardMethod", (standardMethod2.toString().equals("null") ? "" : standardMethod2));
put("deviceList", finalDeviceList);
put("twoCode", Pictures.ofLocal(codePath).create());
@@ -2720,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/>";
}
@@ -2781,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