From 00310b8b5bf002f0135ba0b60715b17e5a3da31f Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 13 六月 2024 18:02:39 +0800
Subject: [PATCH] 小功能调整

---
 inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 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 652e4b3..3aa1132 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
@@ -10,6 +10,7 @@
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -33,7 +34,6 @@
 import com.yuanchu.mom.utils.QueryWrappers;
 import com.yuanchu.mom.vo.InsOrderPlanTaskSwitchVo;
 import com.yuanchu.mom.vo.InsOrderPlanVO;
-import com.yuanchu.mom.vo.Result;
 import org.apache.commons.io.IOUtils;
 import org.apache.poi.xwpf.usermodel.*;
 import org.springframework.beans.factory.annotation.Value;
@@ -363,7 +363,7 @@
                         .eq(AuxiliaryOutputWorkingHours::getCheck, userId)
                         .eq(AuxiliaryOutputWorkingHours::getInspectProject, insProduct.getInspectionItemSubclass() + insProduct.getInspectionItem())
                         .eq(AuxiliaryOutputWorkingHours::getOrderNo, insOrder.getEntrustCode()));
-                if (count == 0) {
+                if (count == 0 && ObjectUtils.isNotEmpty(insProduct.getManHour())) {
                     //娣诲姞姣忎釜浜虹殑浜ч噺宸ユ椂
                     AuxiliaryOutputWorkingHours auxiliaryOutputWorkingHours = new AuxiliaryOutputWorkingHours();
                     auxiliaryOutputWorkingHours.setInspectProject(insProduct.getInspectionItemSubclass() + insProduct.getInspectionItem());//妫�娴嬮」鐩�
@@ -453,6 +453,7 @@
                 for (InsProduct insProduct : insProducts) {
                     if (insProduct.getInsResult() == 0) {
                         InsUnPass insUnPass = new InsUnPass();
+                        insUnPass.setId(null);
                         insUnPass.setModel(insSample.getModel());
                         insUnPass.setSample(insSample.getSample());
                         insUnPass.setInspectionItem(insProduct.getInspectionItem());
@@ -465,16 +466,14 @@
                         insUnPasses.add(insUnPass);
                     }
                 }
-                insUnPassService.saveBatch(insUnPasses);
             }
+            insUnPassService.saveBatch(insUnPasses);
             InsOrder insOrder = insOrderMapper.selectById(orderId);
             Map<String, String> user = insProductMapper.selectUserById(insOrder.getUserId());
             List<SampleProductDto> samples = insSampleMapper.selectSampleProductListByOrderId(orderId);
             InsReport insReport = new InsReport();
             insReport.setCode(insOrder.getEntrustCode());
             insReport.setInsOrderId(orderId);
-            Set<Integer> set = new HashSet<>();
-            Map<Integer, String> map2 = new HashMap<>();
             List<Map<String, Object>> tables = new ArrayList<>();
             Set<String> standardMethod = new HashSet<>();
             Set<String> deviceSet = new HashSet<>();
@@ -484,6 +483,8 @@
             AtomicReference<String> resultCh = new AtomicReference<>("");
             AtomicReference<String> resultEn = new AtomicReference<>("");
             samples.forEach(a -> {
+                Set<Integer> set = new HashSet<>();
+                Map<Integer, String> map2 = new HashMap<>();
                 Long productCount = insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery().eq(InsProduct::getInsSampleId, a.getId()));
                 productSize.set(productSize.get() + Integer.parseInt(productCount + ""));
                 models.add(a.getModel());
@@ -704,10 +705,10 @@
                     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("姣忚鍗曞厓鏍间笉鐩哥瓑");
                         }
@@ -778,7 +779,7 @@
             ConfigureBuilder builder = Configure.builder();
             builder.useSpringEL(true);
             List<Map<String, String>> finalDeviceList = deviceList;
-            Integer userId = insSampleUserMapper.selectOne(Wrappers.<InsSampleUser>lambdaQuery().eq(InsSampleUser::getInsSampleId, orderId).orderByDesc(InsSampleUser::getCreateTime).last("limit 1")).getUserId();
+            Integer userId = insSampleUserMapper.selectOne(Wrappers.<InsSampleUser>lambdaQuery().eq(InsSampleUser::getInsSampleId, orderId).last("limit 1")).getUserId();
             String signatureUrl;
             try {
                 signatureUrl = userMapper.selectById(userId).getSignatureUrl();
@@ -945,10 +946,10 @@
                     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("姣忚鍗曞厓鏍间笉鐩哥瓑");
                         }
@@ -973,7 +974,6 @@
                     tables2.add(table);
                 });
             }
-
 
             XWPFTemplate template = XWPFTemplate.compile(url, builder.build()).render(
                     new HashMap<String, Object>() {{
@@ -1113,7 +1113,7 @@
         List<InsSample> insSamples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getInsOrderId, orderId).select(InsSample::getId));
         List<Integer> ids = insSamples.stream().map(a -> a.getId()).collect(Collectors.toList());
         List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery().in(InsProduct::getInsSampleId, ids).eq(InsProduct::getSonLaboratory, laboratory).eq(InsProduct::getState, 1).isNull(InsProduct::getInsResult).isNull(InsProduct::getInsFiberId).isNull(InsProduct::getInsFibersId));
-        insProducts.addAll(insProductMapper.selectFiberInsProduct(ids));
+        insProducts.addAll(insProductMapper.selectFiberInsProduct(ids, laboratory));
         if (insProducts.size() > 0) {
             String str = "";
             int count = 0;

--
Gitblit v1.9.3