From 09d162f650213d4d48c611d0d8ce4aa7628daf76 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 18 六月 2024 16:35:59 +0800
Subject: [PATCH] 报告生成添加附件

---
 inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java |  612 +++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 544 insertions(+), 68 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 e2b7560..7493e30 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
@@ -1,12 +1,17 @@
 package com.yuanchu.mom.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.lang.UUID;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+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;
@@ -14,10 +19,9 @@
 import com.deepoove.poi.config.Configure;
 import com.deepoove.poi.config.ConfigureBuilder;
 import com.deepoove.poi.data.*;
-import com.deepoove.poi.data.style.BorderStyle;
-import com.deepoove.poi.data.style.Style;
-import com.deepoove.poi.data.style.TableStyle;
+import com.deepoove.poi.data.style.*;
 import com.deepoove.poi.util.TableTools;
+import com.deepoove.poi.xwpf.WidthScalePattern;
 import com.yuanchu.mom.common.GetLook;
 import com.yuanchu.mom.common.PrintChina;
 import com.yuanchu.mom.dto.ExcelDto;
@@ -26,24 +30,25 @@
 import com.yuanchu.mom.exception.ErrorException;
 import com.yuanchu.mom.mapper.*;
 import com.yuanchu.mom.pojo.*;
-import com.yuanchu.mom.service.InsOrderPlanService;
-import com.yuanchu.mom.service.InsOrderService;
-import com.yuanchu.mom.service.StandardTemplateService;
-import com.yuanchu.mom.utils.GiveCode;
+import com.yuanchu.mom.service.*;
 import com.yuanchu.mom.utils.JackSonUtil;
 import com.yuanchu.mom.utils.MatrixToImageWriter;
 import com.yuanchu.mom.utils.QueryWrappers;
+import com.yuanchu.mom.vo.InsOrderPlanTaskSwitchVo;
 import com.yuanchu.mom.vo.InsOrderPlanVO;
 import org.apache.commons.io.IOUtils;
 import org.apache.poi.xwpf.usermodel.*;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import java.io.*;
 import java.nio.file.Files;
 import java.nio.file.Paths;
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
@@ -56,7 +61,6 @@
  * 妫�楠屼换鍔�-涓氬姟瀹炵幇灞�
  */
 @Service
-//@AllArgsConstructor
 public class InsOrderPlanServiceImpl extends ServiceImpl<InsOrderMapper, InsOrder> implements InsOrderPlanService {
 
     @Resource
@@ -83,9 +87,6 @@
     private String twoCode;
 
     @Resource
-    private GiveCode giveCode;
-
-    @Resource
     private InsReportMapper insReportMapper;
 
     @Resource
@@ -93,6 +94,33 @@
 
     @Resource
     private InsProductUserMapper insProductUserMapper;
+
+    @Resource
+    private InsUnPassService insUnPassService;
+
+    @Resource
+    AuxiliaryOutputWorkingHoursMapper auxiliaryOutputWorkingHoursMapper;
+
+    @Resource
+    private InformationNotificationService informationNotificationService;
+
+    @Resource
+    private UserMapper userMapper;
+
+    @Resource
+    private CustomMapper customMapper;
+
+    @Value("${file.path}")
+    private String imgUrl;
+
+    @Resource
+    private InsBushingService insBushingService;
+
+    @Resource
+    private InsFiberMapper insFiberMapper;
+
+    @Resource
+    private InsOrderFileMapper insOrderFileMapper;
 
     @Override
     public Map<String, Object> selectInsOrderPlanList(Page page, InsOrderPlanDTO insOrderPlanDTO) {
@@ -104,6 +132,20 @@
             insOrderPlanDTO.setUserId(userId.longValue());
         }
         IPage<InsOrderPlanVO> insOrderPage = insSampleMapper.findInsSampleAndOrder(page, QueryWrappers.queryWrappers(insOrderPlanDTO), userId);
+        map.put("body", insOrderPage);
+        return map;
+    }
+
+    @Override
+    public Map<String, Object> inspectionOrderDetailsTaskSwitching(Page page, InsOrderPlanDTO insOrderPlanDTO) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("head", PrintChina.printChina(InsOrderPlanTaskSwitchVo.class));
+        Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId(null);
+        Integer userId = map1.get("userId");
+        if (ObjectUtil.isNotEmpty(insOrderPlanDTO.getUserId())) {
+            insOrderPlanDTO.setUserId(userId.longValue());
+        }
+        IPage<InsOrderPlanTaskSwitchVo> insOrderPage = insSampleMapper.inspectionOrderDetailsTaskSwitching(page, QueryWrappers.queryWrappers(insOrderPlanDTO), userId);
         map.put("body", insOrderPage);
         return map;
     }
@@ -130,15 +172,96 @@
             insOrderStateMapper.update(null, Wrappers.<InsOrderState>lambdaUpdate().eq(InsOrderState::getInsOrderId, id).eq(InsOrderState::getLaboratory, laboratory).set(InsOrderState::getInsTime, LocalDateTime.now()).set(InsOrderState::getInsState, 1));
         }
         Map<String, Object> map = insOrderService.getInsOrderAndSample(id, laboratory);
-        Set<Integer> set = new HashSet<>();
-        Map<Integer, String> map2 = new HashMap<>();
         List<SampleProductDto> list = JSON.parseArray(JSON.toJSONString(map.get("sampleProduct")), SampleProductDto.class);
         for (SampleProductDto samples : list) {
+//            Set<Integer> set = new HashSet<>();
+//            Map<Integer, String> map2 = new HashMap<>();
             if (BeanUtil.isEmpty(samples.getInsProduct())) continue;
-            getTemplateThing(set, map2, samples);
+            samples.setBushing(insBushingService.selectBushingBySampleId(samples.getId()));
+//            getTemplateThing(set, map2, samples.getInsProduct());
         }
         map.put("sampleProduct", list);
         return map;
+    }
+
+    @Override
+    public List<InsProduct> getInsProduct(Integer id, Integer type, String laboratory) {
+        List<InsProduct> insProducts = new ArrayList<>();
+        switch (type) {
+            case 0:
+                insProducts = insSampleMapper.getInsProduct1(id, laboratory);
+                break;
+            case 1:
+                insProducts = insSampleMapper.getInsProduct2(id);
+                break;
+            case 2:
+                insProducts = insSampleMapper.getInsProduct3(id);
+                break;
+        }
+        Set<Integer> set = new HashSet<>();
+        Map<Integer, String> map2 = new HashMap<>();
+        if (BeanUtil.isEmpty(insProducts)) return null;
+        getTemplateThing(set, map2, insProducts);
+        return insProducts;
+    }
+
+    @Override
+    public List<String> checkSubmitPlan(Integer orderId, String laboratory) {
+        List<String> collect = new ArrayList<>();
+        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).eq(InsProduct::getInsResult, 0));
+        if (insProducts.size() > 0) {
+            collect = insProducts.stream().map(insProduct -> {
+                return insProduct.getInspectionItem() + "-" + insProduct.getInspectionItemSubclass();
+            }).collect(Collectors.toList());
+        }
+        return collect;
+    }
+
+    @Override
+    public Map<String, Object> getFileList(Page page, InsOrderFile insOrderFile) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("head", PrintChina.printChina(InsOrderFile.class));
+        IPage<InsOrderFile> insOrderFileIPage = insOrderFileMapper.getFileList(page, QueryWrappers.queryWrappers(insOrderFile));
+        map.put("body", insOrderFileIPage);
+        return map;
+    }
+
+    @Override
+    public int uploadFile(Integer orderId, MultipartFile file) {
+        String urlString;
+        String pathName;
+        String path;
+        String filename = file.getOriginalFilename();
+        String contentType = file.getContentType();
+        InsOrderFile insOrderFile = new InsOrderFile();
+        insOrderFile.setInsOrderId(orderId);
+        insOrderFile.setFileName(filename);
+        if (contentType != null && contentType.startsWith("image/")) {
+            // 鏄浘鐗�
+            path = imgUrl;
+            insOrderFile.setType(1);
+        } else {
+            // 鏄枃浠�
+            path = wordUrl;
+            insOrderFile.setType(2);
+        }
+        try {
+            File realpath = new File(path);
+            if (!realpath.exists()) {
+                realpath.mkdirs();
+            }
+            pathName = UUID.randomUUID() + "_" + file.getOriginalFilename();
+            urlString = realpath + "/" + pathName;
+            file.transferTo(new File(urlString));
+            insOrderFile.setFileUrl(pathName);
+            return insOrderFileMapper.insert(insOrderFile);
+        } catch (Exception e) {
+            e.printStackTrace();
+            System.err.println("闄勪欢涓婁紶閿欒");
+            return 0;
+        }
     }
 
     @Override
@@ -232,6 +355,36 @@
                 insProduct.setUpdateUser(userId);
                 insProductMapper.updateById(insProduct);
                 insProductUserMapper.insert(new InsProductUser(null, userId, LocalDateTime.now(), insProduct.getId()));
+
+                insProduct = insProductMapper.selectById(insProduct);
+
+                //鏌ヨ妫�楠屽崟淇℃伅
+                InsOrder insOrder = insOrderMapper.selectById(insSampleMapper.selectById(insProduct.getInsSampleId()).getInsOrderId());
+                //鏍¢獙濡傛灉杩欎釜浜鸿繖涓娴嬮」鐩凡缁忔坊鍔犺繃浜嗗垯涓嶉渶瑕佸啀鏂板
+                Long count = auxiliaryOutputWorkingHoursMapper.selectCount(Wrappers.<AuxiliaryOutputWorkingHours>lambdaQuery()
+                        .eq(AuxiliaryOutputWorkingHours::getCheck, userId)
+                        .eq(AuxiliaryOutputWorkingHours::getInspectProject, insProduct.getInspectionItemSubclass() + insProduct.getInspectionItem())
+                        .eq(AuxiliaryOutputWorkingHours::getOrderNo, insOrder.getEntrustCode()));
+                if (count == 0 && ObjectUtils.isNotEmpty(insProduct.getManHour())) {
+                    //娣诲姞姣忎釜浜虹殑浜ч噺宸ユ椂
+                    AuxiliaryOutputWorkingHours auxiliaryOutputWorkingHours = new AuxiliaryOutputWorkingHours();
+                    auxiliaryOutputWorkingHours.setInspectProject(insProduct.getInspectionItemSubclass() + insProduct.getInspectionItem());//妫�娴嬮」鐩�
+                    auxiliaryOutputWorkingHours.setOrderNo(insOrder.getEntrustCode());//闈炲姞鐝鎵樺崟鍙�
+                    auxiliaryOutputWorkingHours.setWorkTime(insProduct.getManHour());//闈炲姞鐝伐鏃�
+                    auxiliaryOutputWorkingHours.setAmount(1);//闈炲姞鐝暟閲�
+                    auxiliaryOutputWorkingHours.setOutputWorkTime(insProduct.getManHour());//浜ч噺宸ユ椂
+                    auxiliaryOutputWorkingHours.setManHourGroup(insProduct.getManHourGroup());//宸ユ椂鍒嗙粍
+                    DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+                    DateTimeFormatter formatters = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+                    auxiliaryOutputWorkingHours.setDateTime(LocalDateTime.now().toLocalDate().atStartOfDay().format(formatters));//鏃ユ湡
+                    LocalDateTime localDateTime = LocalDateTime.now();
+                    DateTime parse = DateUtil.parse(localDateTime.format(formatter));
+                    auxiliaryOutputWorkingHours.setWeekDay(getWeek(localDateTime.format(formatters)));//鏄熸湡
+                    auxiliaryOutputWorkingHours.setWeek(String.valueOf(DateUtil.weekOfYear(DateUtil.offsetDay(parse, 1))));//鍛ㄦ
+                    auxiliaryOutputWorkingHours.setCheck(userId);//妫�娴嬩汉
+                    auxiliaryOutputWorkingHoursMapper.insert(auxiliaryOutputWorkingHours);
+                }
+
                 InsSample insSample = insSampleMapper.selectById(insProductMapper.selectById(insProduct.getId()).getInsSampleId());
                 insSample.setInsState(1);
                 Long l = insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery()
@@ -255,9 +408,7 @@
                 // 閫氳繃璁㈠崟id鏌ユ壘鎵�鏈夋牱鏈琲d
                 List<Integer> sampleIds = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getInsOrderId, orderId)).stream().map(InsSample::getId).collect(Collectors.toList());
                 // 閫氳繃妫�鏌ユ瘡涓�涓牱鏈琲d鏌ュ埌灞炰簬妫�楠岄」缁撹 is null鐨勬暟閲�
-                Long count = insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery().in(InsProduct::getInsSampleId, sampleIds).isNull(InsProduct::getInsResult).eq(InsProduct::getSonLaboratory, insProduct.getSonLaboratory()));
-                // is null鐨勬暟閲忎负0鏄皢璁㈠崟鐘舵�佽〃鐨勭姸鎬佹敼涓哄凡妫�楠�
-                List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery().in(InsProduct::getInsSampleId, sampleIds).isNull(InsProduct::getInsResult).eq(InsProduct::getSonLaboratory, insProduct.getSonLaboratory()));
+                Long count = insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery().in(InsProduct::getInsSampleId, sampleIds).isNull(InsProduct::getInsResult).eq(InsProduct::getSonLaboratory, insProduct.getSonLaboratory()).eq(InsProduct::getState, 1));
                 if (count == 0) {
                     insOrderStateMapper.update(new InsOrderState(), Wrappers.<InsOrderState>lambdaUpdate()
                             .eq(InsOrderState::getInsOrderId, orderId)
@@ -286,31 +437,63 @@
         Integer num = (type == 1 ? 5 : 4);
         LocalDateTime now = LocalDateTime.now();
         insOrderStateMapper.update(null, Wrappers.<InsOrderState>lambdaUpdate().eq(InsOrderState::getInsOrderId, orderId).eq(InsOrderState::getLaboratory, laboratory).set(InsOrderState::getInsTime, now).set(InsOrderState::getInsState, num).set(InsOrderState::getVerifyTell, tell).set(InsOrderState::getVerifyUser, getLook.selectPowerByMethodAndUserId(null).get("userId")));
-        List<InsOrderState> insOrderStates = insOrderStateMapper.selectList(Wrappers.<InsOrderState>lambdaQuery().eq(InsOrderState::getInsOrderId, orderId));
-        long count = insOrderStates.stream().filter(a -> a.getInsState() == 5).count();
-        if (count == insOrderStates.size() && num == 5) {
+        Long count = insOrderStateMapper.selectCount(Wrappers.<InsOrderState>lambdaQuery().eq(InsOrderState::getInsOrderId, orderId).ne(InsOrderState::getInsState, 5));
+        if (count == 0 && num == 5) {
+            List<InsUnPass> insUnPasses = new ArrayList<>();
+            /*鏍峰搧涓嬬殑椤圭洰鍙鏈変竴涓」鐩笉鍚堟牸鍒欐楠岀粨鏋滀负0,鍚﹀垯涓�1*/
+            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));
+                List<Integer> results = insProducts.stream().map(InsProduct::getInsResult).filter(str -> str != null).collect(Collectors.toList());
+                if (results.contains(0)) {
+                    insSample.setInsResult(0);
+                } else {
+                    insSample.setInsResult(1);
+                }
+                insSampleMapper.updateById(insSample);
+                /*澶嶆牳閫氳繃鍚庯紝灏嗕笉鍚堟牸鐨勯」鐩俊鎭坊鍔犲埌ins_un_pass琛ㄤ腑*/
+                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());
+                        insUnPass.setInspectionItemSubclass(insProduct.getInspectionItemSubclass());
+                        insUnPass.setLastValue(insProduct.getLastValue());
+                        insUnPass.setEntrustCode(insOrderMapper.selectById(orderId).getEntrustCode());
+                        List<Integer> userIds = insProductUserMapper.selectList(Wrappers.<InsProductUser>lambdaQuery().eq(InsProductUser::getInsProductId, insProduct.getId())).stream().map(InsProductUser::getCreateUser).distinct().collect(Collectors.toList());
+                        String name = userMapper.selectBatchIds(userIds).stream().map(User::getName).collect(Collectors.joining(","));
+                        insUnPass.setName(name);
+                        insUnPasses.add(insUnPass);
+                    }
+                }
+            }
+            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(giveCode.giveCode("JCZX/TX-", "ins_report", "-", "yyMMdd"));
             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<>();
             Set<String> models = new HashSet<>();
             AtomicReference<Integer> productSize = new AtomicReference<>(0);
             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<>();
+                Long productCount = insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery().eq(InsProduct::getInsSampleId, a.getId()));
+                productSize.set(productSize.get() + Integer.parseInt(productCount + ""));
                 models.add(a.getModel());
+                standardMethod.add(baseMapper.getStandardMethodCode(a.getStandardMethodListId()));
                 Set<String> templateSet = new HashSet<>();
-                getTemplateThing(set, map2, a);
+                getTemplateThing(set, map2, a.getInsProduct());
                 for (InsProduct b : a.getInsProduct()) {
-                    standardMethod.add(b.getMethodS());
-                    productSize.set(productSize.get() + 1);
                     if (b.getInsProductResult() != null) {
                         List<JSONObject> jsonObjects = JSON.parseArray(b.getInsProductResult().getEquipValue(), JSONObject.class);
                         for (JSONObject jsonObject : jsonObjects) {
@@ -319,13 +502,16 @@
                             }
                         }
                     }
+                    if (b.getTemplate() == null) {
+                        continue;
+                    }
                     if (b.getTemplate().size() == 0) {
                         continue;
                     }
                     templateSet.add(JSON.toJSONString(b.getTemplate()));
                 }
-                AtomicInteger index = new AtomicInteger();
                 templateSet.forEach(tem -> {
+                    AtomicInteger index = new AtomicInteger();
                     Set<Integer> set2 = new HashSet<>();
                     List<RowRenderData> rows = new ArrayList<>();
                     List<TextRenderData> text = new ArrayList<>();
@@ -361,12 +547,19 @@
                     List<JSONObject> temp = JSON.parseArray(JSON.toJSONString(excelDtos), JSONObject.class);
                     Map<String, InsProduct> pMap = new HashMap<>();
                     Set<String> delRSet = new HashSet<>();
+                    delRSet.add("0");
+                    delRSet.add("1");
                     for (JSONObject jo1 : temp) {
                         JSONObject v = JSON.parseObject(JSON.toJSONString(jo1.get("v")));
+                        if (Integer.parseInt(jo1.get("c") + "") > 9) {
+                            delSet.add(jo1.get("c") + "");
+                            continue;
+                        }
                         if (v.get("ps") != null) {
                             int count3 = 0;
                             String str = "";
-                            if ("妫�楠屽��".equals(JSON.parseObject(JSON.toJSONString(v.get("ps"))).get("value") + "") || "璁惧鍚嶇О".equals(JSON.parseObject(JSON.toJSONString(v.get("ps"))).get("value") + "") || "璁惧缂栫爜".equals(JSON.parseObject(JSON.toJSONString(v.get("ps"))).get("value") + "")) {
+                            String s = JSON.parseObject(JSON.toJSONString(v.get("ps"))).get("value") + "";
+                            if ("妫�楠屽��".equals(s) || "璁惧鍚嶇О".equals(s) || "璁惧缂栫爜".equals(s) || "璇曢獙鏂规硶".equals(s) || "妫�娴嬫柟娉�".equals(s)) {
                                 delSet.add(jo1.get("c") + "");
                                 continue;
                             }
@@ -400,8 +593,6 @@
                                     delRSet.add(jo1.get("r") + "");
                                 }
                             }
-                        } else {
-                            if ("鍙傛暟".equals(v.get("v"))) delSet.add(jo1.get("c") + "");
                         }
                     }
                     for (int i = 0; i < temp.size(); i++) {
@@ -435,6 +626,8 @@
                                         textRenderData.setText("鈭�");
                                         break;
                                     case 0:
+                                        resultCh.set(resultCh.get() + "銆�" + p.getInspectionItem() + (Objects.equals(p.getInspectionItemSubclass(), "") ? "" : " " + p.getInspectionItemSubclass()));
+                                        resultEn.set(resultEn.get() + "銆�" + p.getInspectionItemEn() + ((Objects.equals(p.getInspectionItemSubclassEn(), "") || Objects.equals(p.getInspectionItemSubclassEn(), null)) ? "" : " " + p.getInspectionItemSubclassEn()));
                                         textRenderData.setText("脳");
                                         break;
                                     default:
@@ -471,6 +664,8 @@
                                         textRenderData.setText("鉁�");
                                         break;
                                     case 0:
+                                        resultCh.set(resultCh.get() + "銆�" + p.getInspectionItem() + (p.getInspectionItemSubclass().equals("") ? "" : " " + p.getInspectionItemSubclass()));
+                                        resultEn.set(resultEn.get() + "銆�" + p.getInspectionItemEn() + ((Objects.equals(p.getInspectionItemSubclassEn(), "") || Objects.equals(p.getInspectionItemSubclassEn(), null)) ? "" : " " + p.getInspectionItemSubclassEn()));
                                         textRenderData.setText("鉁�");
                                         break;
                                     default:
@@ -493,8 +688,8 @@
                             textRenderData.setText(textRenderData.getText() + "鈭�" + jo1.get("mc"));
                         }
                         Style style = new Style();
-                        style.setFontFamily(v.get("ff") == null ? "寰蒋闆呴粦" : v.get("ff") + "");
-//                        style.setFontSize(v.get("fs")==null?14:Integer.parseInt(v.get("fs")+""));
+//                        style.setFontFamily(v.get("ff") == null ? "瀹嬩綋" : v.get("ff") + "");
+                        style.setFontFamily("瀹嬩綋");
                         if (!((v.get("fc") + "").indexOf("rgb") > -1)) {
                             style.setColor(v.get("fc") == null ? "000000" : (v.get("fc") + "").replace("#", ""));
                         } else {
@@ -502,31 +697,28 @@
                         }
                         textRenderData.setStyle(style);
                         text.add(textRenderData);
-                        if (i == temp.size() - 1) {
-                            TextRenderData[] text2 = text.toArray(new TextRenderData[0]);
-                            rowRenderData = Rows.of(text2).rowAtleastHeight(1).center().create();
-                            rows.add(rowRenderData);
-                            text = new ArrayList<>();
-                        }
+                    }
+                    TextRenderData[] text2 = text.toArray(new TextRenderData[0]);
+                    rowRenderData = Rows.of(text2).rowAtleastHeight(1).center().create();
+                    if (rowRenderData.getCells().size() != 0) {
+                        rows.add(rowRenderData);
                     }
                     TableRenderData tableRenderData = new TableRenderData();
                     tableRenderData.setRows(rows);
-                    TableStyle tableStyle = new TableStyle();
-                    /*JSONObject styleJo = JSON.parseObject(JSON.toJSONString(b.getStyle().get("columnlen")));
-                    List<Integer> colLen = new ArrayList<>();
-                    int colSize = rows.get(0).getCells().size();
-                    int colOne = Integer.parseInt(b.getTemplate().get(0).get("r") + "");
-                    for (int i = colOne; i < colSize + colOne; i++) {
-                        if (styleJo.get(i + "") == null) {
-                            colLen.add(pxToCm(100));
-                        } else {
-                            int i1 = Integer.parseInt(styleJo.get(i + "") + "");
-                            colLen.add(pxToCm(i1));
+                    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());
                         }
-                    }*/
-//                    tableStyle.setColWidths(ArrayUtils.toPrimitive(colLen.toArray(new Integer[0])));
+                        System.out.println("");*/
+                        if (row.getCells().size() != countSize) {
+                            throw new ErrorException("姣忚鍗曞厓鏍间笉鐩哥瓑");
+                        }
+                    }
+                    TableStyle tableStyle = new TableStyle();
+                    tableStyle.setColWidths(new int[]{650, 1600, 2000, 750, 2800, 1100, 1100});
+                    tableStyle.setWidth("10000");
                     tableStyle.setAlign(TableRowAlign.CENTER);
-                    tableStyle.setWidth(XWPFTable.DEFAULT_PERCENTAGE_WIDTH);
                     BorderStyle borderStyle = new BorderStyle();
                     borderStyle.setColor("000000");
                     borderStyle.setType(XWPFTable.XWPFBorderType.THICK);
@@ -563,7 +755,7 @@
                 table.put("tableSize", tables.size() + 1);
             });
             List<Map<String, String>> deviceList = null;
-            if(deviceSet.size()!=0){
+            if (deviceSet.size() != 0) {
                 deviceList = insOrderMapper.selectDeviceList(deviceSet);
             }
             Map<String, String> codeStr = new HashMap<>();
@@ -585,17 +777,229 @@
             String finalModelStr = modelStr;
             String sampleEn = insSampleMapper.getSampleEn(insOrder.getSample());
             String orderType = insOrderMapper.getEnumLabelByValue(insOrder.getOrderType());
+            String formType = insOrderMapper.getEnumLabelByValue(insOrder.getFormType());
             ConfigureBuilder builder = Configure.builder();
             builder.useSpringEL(true);
             List<Map<String, String>> finalDeviceList = deviceList;
+            Integer userId = insSampleUserMapper.selectOne(Wrappers.<InsSampleUser>lambdaQuery().eq(InsSampleUser::getInsSampleId, orderId).last("limit 1")).getUserId();
+            String signatureUrl;
+            try {
+                signatureUrl = userMapper.selectById(userId).getSignatureUrl();
+            } catch (Exception e) {
+                throw new ErrorException("鎵句笉鍒版楠屼汉鐨勭鍚�");
+            }
+            Custom custom = customMapper.selectById(user.get("company"));
+            if (!resultCh.get().equals("")) {
+                resultCh.set("渚濇嵁濮旀墭瑕佹眰锛�" + resultCh.get().replaceFirst("銆�", "") + "绛夋墍妫�椤圭洰涓嶇鍚堣姹傦紝鍏朵綑鎵�妫�椤圭洰鍧囩鍚堣姹傘��");
+                resultEn.set("According to commissioned requirements," + resultEn.get().replaceFirst("銆�", "") + " these inspected items do not meet the requirements, all other inspected items meet the requirements.");
+            } else {
+                resultCh.set("渚濇嵁濮旀墭瑕佹眰锛屾墍妫�椤圭洰鍧囩鍚堣姹傘��");
+                resultEn.set("According to commissioned requirements, all the tested items meet the requirements.");
+            }
+            /*鍏夌氦鐨勬楠屾姤鍛�*/
+            //鍏堝垽鏂槸鍚︽湁鍏夌氦閰嶇疆
+            List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery().eq(InsProduct::getState, 1).in(InsProduct::getInsSampleId, insSamples.stream().map(InsSample::getId).distinct().collect(Collectors.toList())));
+            List<Integer> collect = insProducts.stream().map(InsProduct::getInsFiberId).filter(str -> str != null).collect(Collectors.toList());
+            List<Map<String, Object>> tables2 = new ArrayList<>();
+            if (collect.size() > 0) {
+                samples.forEach(sample -> {
+                    List<InsProduct> insProducts1 = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
+                            .eq(InsProduct::getState, 1)
+                            .eq(InsProduct::getInsSampleId, sample.getId())
+                            .isNotNull(InsProduct::getInsFiberId));
+                    long size = insProducts1.size();
+                    long size2 = insProducts1.stream().map(InsProduct::getInsFiberId).distinct().count();
+                    List<RowRenderData> rows = new ArrayList<>();
+                    //鍒ゆ柇妫�楠岄」鐩槸鍚︽湁鐖跺瓙鍏崇郴
+                    Boolean state = true;
+                    for (InsProduct insProduct : insProducts1) {
+                        if (!insProduct.getInspectionItemSubclass().equals("") && insProduct.getInspectionItemSubclass() != null) {
+                            state = false;
+                        }
+                    }
+                    int a = 1;
+                    if (!state) {
+                        a = 2;
+                    }
+                    //琛ㄦ牸鐨勮鏁�
+                    for (long i = 0; i < size2 + a; i++) {
+                        RowRenderData rowRenderData = new RowRenderData();
+
+                        RowStyle rowStyle = new RowStyle();
+                        rowStyle.setHeight(40);
+                        rowRenderData.setRowStyle(rowStyle);
+                        List<CellRenderData> cells = new ArrayList<>();
+                        //琛ㄦ牸鐨勫垪鏁�
+                        for (long j = 0; j < size + 2; j++) {
+                            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 (j == 0) {
+                                    //绗竴鍒�
+                                    textRenderData.setText("绠¤壊鏍嘰nPipe鈭�100");
+                                    renderData.add(textRenderData);
+                                    paragraphRenderData.setContents(renderData);
+                                    paragraphRenderDataList.add(paragraphRenderData);
+                                    cellRenderData.setParagraphs(paragraphRenderDataList);
+                                    cells.add(cellRenderData);
+                                } else if (j == 1) {
+                                    //绗簩鍒�
+                                    textRenderData.setText("鍏夌氦鑹叉爣\nScanning Number鈭�101");
+                                    renderData.add(textRenderData);
+                                    paragraphRenderData.setContents(renderData);
+                                    paragraphRenderDataList.add(paragraphRenderData);
+                                    cellRenderData.setParagraphs(paragraphRenderDataList);
+                                    cells.add(cellRenderData);
+                                } else {
+                                    //椤圭洰淇℃伅
+                                    textRenderData.setText(insProducts1.get((int) (j - 2)).getInspectionItem() + "\n" + insProducts1.get((int) (j - 2)).getInspectionItemEn() + "鈭�" + (j + 101));
+                                    renderData.add(textRenderData);
+                                    paragraphRenderData.setContents(renderData);
+                                    paragraphRenderDataList.add(paragraphRenderData);
+                                    cellRenderData.setParagraphs(paragraphRenderDataList);
+                                    cells.add(cellRenderData);
+                                }
+                            } else if (a == 2 && i == 1) {
+                                //鏈夌埗瀛愰」鐩叧绯荤殑绗笁琛�
+                                if (j == 0) {
+                                    //绗竴鍒�
+                                    textRenderData.setText("绠¤壊鏍嘰nPipe鈭�100");
+                                    renderData.add(textRenderData);
+                                    paragraphRenderData.setContents(renderData);
+                                    paragraphRenderDataList.add(paragraphRenderData);
+                                    cellRenderData.setParagraphs(paragraphRenderDataList);
+                                    cells.add(cellRenderData);
+                                } else if (j == 1) {
+                                    //绗簩鍒�
+                                    textRenderData.setText("鍏夌氦鑹叉爣\tScanning Number鈭�101");
+                                    renderData.add(textRenderData);
+                                    paragraphRenderData.setContents(renderData);
+                                    paragraphRenderDataList.add(paragraphRenderData);
+                                    cellRenderData.setParagraphs(paragraphRenderDataList);
+                                    cells.add(cellRenderData);
+                                } else {
+                                    //椤圭洰淇℃伅
+                                    //鍒ゆ柇鏄惁鏈夐」鐩瓙绫�
+                                    if (insProducts1.get((int) (j - 2)).getInspectionItemSubclass().equals("") || insProducts1.get((int) (j - 2)).getInspectionItemSubclass() == null) {
+                                        textRenderData.setText(insProducts1.get((int) (j - 2)).getInspectionItem() + "\n" + insProducts1.get((int) (j - 2)).getInspectionItemEn() + "鈭�" + (j + 101));
+                                    } else {
+                                        textRenderData.setText(insProducts1.get((int) (j - 2)).getInspectionItemSubclass() + "\n" + insProducts1.get((int) (j - 2)).getInspectionItemSubclassEn());
+                                    }
+                                    renderData.add(textRenderData);
+                                    paragraphRenderData.setContents(renderData);
+                                    paragraphRenderDataList.add(paragraphRenderData);
+                                    cellRenderData.setParagraphs(paragraphRenderDataList);
+                                    cells.add(cellRenderData);
+                                }
+                            } else {
+                                int aa = 0;
+                                if (a == 2) {
+                                    aa = (int) i - 2;
+                                } else aa = (int) i - 1;
+                                InsFiber insFiber = insFiberMapper.selectById(insProducts1.get(aa).getInsFiberId());
+                                //濉��
+                                if (j == 0) {
+                                    //绗竴鍒�
+                                    textRenderData.setText(insFiber.getBushColor());
+                                    renderData.add(textRenderData);
+                                    paragraphRenderData.setContents(renderData);
+                                    paragraphRenderDataList.add(paragraphRenderData);
+                                    cellRenderData.setParagraphs(paragraphRenderDataList);
+                                    cells.add(cellRenderData);
+                                } else if (j == 1) {
+                                    //绗簩鍒�
+                                    textRenderData.setText(insFiber.getColor());
+                                    renderData.add(textRenderData);
+                                    paragraphRenderData.setContents(renderData);
+                                    paragraphRenderDataList.add(paragraphRenderData);
+                                    cellRenderData.setParagraphs(paragraphRenderDataList);
+                                    cells.add(cellRenderData);
+                                } else {
+                                    //椤圭洰淇℃伅
+                                    textRenderData.setText(insProducts1.get((int) (j - 2)).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("姣忚鍗曞厓鏍间笉鐩哥瓑");
+                        }
+                    }
+                    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("table2", tableRenderData);
+                    table.put("report", insReport);
+                    table.put("sample_number", sample.getSampleCode());
+                    table.put("type", sample.getModel());
+                    tables2.add(table);
+                });
+            }
+
+            /*鑾峰彇闄勪欢鍥剧墖绫诲瀷*/
+            List<Map<String, Object>> images = new ArrayList<>();
+            List<InsOrderFile> insOrderFiles = insOrderFileMapper.selectList(Wrappers.<InsOrderFile>lambdaQuery().eq(InsOrderFile::getType, 1).eq(InsOrderFile::getInsOrderId, orderId));
+            if (CollectionUtils.isNotEmpty(insOrderFiles)) {
+                insOrderFiles.forEach(insOrderFile -> {
+                    Map<String, Object> image = new HashMap<>();
+                    PictureRenderData pictureRenderData = Pictures.ofLocal(imgUrl + "/" + insOrderFile.getFileUrl()).sizeInCm(17,20).create();
+                    image.put("url", pictureRenderData);
+                    image.put("report", insReport);
+                    images.add(image);
+                });
+            }
+
             XWPFTemplate template = XWPFTemplate.compile(url, builder.build()).render(
                     new HashMap<String, Object>() {{
                         put("order", insOrder);
                         put("report", insReport);
                         put("user", user);
+                        put("custom", custom);
                         put("sampleSize", samples.size());
                         put("tables", tables);
                         put("tableSize", tables.size() + 1);
+                        put("tables2", tables2);
                         put("standardMethod", (standardMethod2.toString().equals("null") ? "" : standardMethod2));
                         put("deviceList", finalDeviceList);
                         put("twoCode", Pictures.ofLocal(codePath).create());
@@ -606,20 +1010,26 @@
                         put("insTime", insOrder.getInsTime().format(DateTimeFormatter.ofPattern("yyyy骞碝M鏈坉d鏃�")));
                         put("insTimeEn", monthNames[insOrder.getInsTime().getMonthValue() - 1] + " " + now.getDayOfMonth() + ", " + now.getYear());
                         put("writeUrl", null);
-                        put("insUrl", null);
+                        put("insUrl", Pictures.ofLocal(imgUrl + "/" + signatureUrl).create());
+                        put("images", images);
                         put("examineUrl", null);
                         put("ratifyUrl", null);
                         put("sampleEn", sampleEn);
                         put("orderType", orderType);
                         put("getTime", insOrder.getExamineTime().format(DateTimeFormatter.ofPattern("yyyy骞碝M鏈坉d鏃�")));
                         put("getTimeEn", monthNames[insOrder.getExamineTime().getMonthValue() - 1] + " " + insOrder.getExamineTime().getDayOfMonth() + ", " + insOrder.getExamineTime().getYear());
+                        put("seal1", null);
+                        put("seal2", null);
+                        put("formTypeCh", formType);
+                        put("formTypeEn", insOrder.getFormType());
+                        put("resultCh", resultCh.get());
+                        put("resultEn", resultEn.get());
                     }});
             try {
                 String name = insReport.getCode().replace("/", "") + ".docx";
                 template.writeAndClose(Files.newOutputStream(Paths.get(wordUrl + "/" + name)));
                 insReport.setUrl("/word/" + name);
                 insReportMapper.insert(insReport);
-//                insOrder.setState(4);
                 insOrder.setInsState(5);
                 insOrderMapper.updateById(insOrder);
             } catch (IOException e) {
@@ -630,7 +1040,7 @@
                 FileInputStream stream = new FileInputStream(path);
                 XWPFDocument document = new XWPFDocument(stream);
                 List<XWPFTable> xwpfTables = document.getTables();
-                for (int i = 1; i < xwpfTables.size() - (deviceList==null?1:2); i++) {
+                for (int i = 1; i < xwpfTables.size() - (deviceList == null ? 1 : 2); i++) {
                     Set<String> set1 = new HashSet<>();
                     Map<String, Map<String, Integer>> maps = new HashMap<>();
                     for (int j = 0; j < xwpfTables.get(i).getRows().size(); j++) {
@@ -660,8 +1070,6 @@
                             }
                         }
                     }
-                    maps.forEach((k,v)->{
-                    });
                     List<String> list = new ArrayList<>();
                     for (String s : maps.keySet()) {
                         list.add(s);
@@ -669,9 +1077,11 @@
                     for (int a = list.size() - 1; a >= 0; a--) {
                         Map<String, Integer> v = maps.get(list.get(a));
                         for (int j = 0; j < v.get("er") - v.get("sr") + 1; j++) {
-                            TableTools.mergeCellsHorizonal(xwpfTables.get(i), v.get("sr") + j, v.get("sc"), v.get("ec"));
+                            if (v.get("ec") > v.get("sc")) {
+                                TableTools.mergeCellsHorizonal(xwpfTables.get(i), v.get("sr") + j, v.get("sc"), v.get("ec"));
+                            }
                         }
-                        if(v.get("er")>v.get("sr")){
+                        if (v.get("er") > v.get("sr")) {
                             TableTools.mergeCellsVertically(xwpfTables.get(i), v.get("sc"), v.get("sr"), v.get("er"));
                         }
                     }
@@ -688,16 +1098,18 @@
         return 1;
     }
 
-    private void getTemplateThing(Set<Integer> set, Map<Integer, String> map2, SampleProductDto a) {
-        for (InsProduct product : a.getInsProduct()) {
+    private void getTemplateThing(Set<Integer> set, Map<Integer, String> map2, List<InsProduct> insProducts) {
+        for (InsProduct product : insProducts) {
             if (product.getTemplateId() == null) {
                 product.setTemplate(new ArrayList<>());
                 continue;
             }
+            String thing = null;
             if (product.getTemplateId() != null && set.add(product.getTemplateId())) {
                 map2.put(product.getTemplateId(), standardTemplateService.getStandTempThingById(product.getTemplateId()) + "");
+                thing = map2.get(product.getTemplateId());
             }
-            String thing = map2.get(product.getTemplateId());
+//            thing = map2.get(product.getTemplateId());
             if (StrUtil.isNotEmpty(thing)) {
                 JSONObject sheet = JSON.parseObject(JSON.toJSONString(JSON.parseArray(JSON.toJSONString(JSON.parseObject(thing).get("data"))).get(0)));
                 JSONObject config = JSON.parseObject(JSON.toJSONString(sheet.get("config")));
@@ -713,22 +1125,86 @@
     }
 
     @Override
-    public int submitPlan(Integer orderId, String laboratory) {
+    public int submitPlan(Integer orderId, String laboratory, Integer verifyUser) {
         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));
+        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, laboratory));
         if (insProducts.size() > 0) {
             String str = "";
+            int count = 0;
             for (InsProduct product : insProducts) {
-                str += product.getInspectionItem() + product.getInspectionItemSubclass() + "锛�";
+                count++;
+                str += "<br/>" + count + "锛�" + product.getInspectionItem() + " " + product.getInspectionItemSubclass() + "<br/>";
             }
-            throw new ErrorException("浠ヤ笅鏄湭妫�楠岀殑椤圭洰锛�" + str);
+            throw new ErrorException("<strong>瀛樺湪寰呮楠岀殑椤圭洰锛�</strong><br/>" + str);
         }
-        insOrderStateMapper.update(null, Wrappers.<InsOrderState>lambdaUpdate().eq(InsOrderState::getInsOrderId, orderId).eq(InsOrderState::getLaboratory, laboratory).set(InsOrderState::getInsTime, LocalDateTime.now()).set(InsOrderState::getInsState, 3));
+        insOrderStateMapper.update(null, Wrappers.<InsOrderState>lambdaUpdate().eq(InsOrderState::getInsOrderId, orderId).eq(InsOrderState::getLaboratory, laboratory).set(InsOrderState::getInsTime, LocalDateTime.now()).set(InsOrderState::getInsState, 3).set(InsOrderState::getVerifyUser, verifyUser));
+        Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
+        InformationNotification info = new InformationNotification();
+        info.setCreateUser(insProductMapper.selectUserById(userId).get("name"));
+        info.setMessageType("2");
+        info.setTheme("澶嶆牳閫氱煡");
+        info.setContent("鎮ㄦ湁涓�鏉℃楠屼换鍔″緟澶嶆牳娑堟伅");
+        info.setSenderId(userId);
+        info.setConsigneeId(verifyUser);
+        info.setViewStatus(false);
+        info.setJumpPath("b1-inspect-order-plan");
+        informationNotificationService.addInformationNotification(info);
+        upPlanUser(verifyUser, orderId);
         return 1;
     }
 
     public int pxToCm(int px) {
         return px / 9;
     }
+
+    // 鑾峰彇涓や釜localDateTime鐨勬瘡涓�澶�
+    public static List<LocalDateTime> getLocalDateTimesBetween(LocalDateTime start, LocalDateTime end) {
+        List<LocalDateTime> localDateTimes = new ArrayList<>();
+        LocalDate currentDate = start.toLocalDate();
+        LocalDateTime currentLocalDateTime = start;
+        while (!currentDate.isAfter(end.toLocalDate())) {
+            localDateTimes.add(currentLocalDateTime);
+            currentLocalDateTime = currentLocalDateTime.plusDays(1);
+            currentDate = currentDate.plusDays(1);
+        }
+        return localDateTimes;
+    }
+
+    public static String getWeek(String dayStr) {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        try {
+            Date date = sdf.parse(dayStr);
+            Calendar calendar = Calendar.getInstance();
+            calendar.setTime(date);
+            int dayOfWeek = calendar.get(Calendar.DAY_OF_WEEK);
+            int day = calendar.get(Calendar.DAY_OF_MONTH);
+            return day + " " + getWeekDay(dayOfWeek);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    public static String getWeekDay(int dayOfWeek) {
+        switch (dayOfWeek) {
+            case Calendar.MONDAY:
+                return "鍛ㄤ竴";
+            case Calendar.TUESDAY:
+                return "鍛ㄤ簩";
+            case Calendar.WEDNESDAY:
+                return "鍛ㄤ笁";
+            case Calendar.THURSDAY:
+                return "鍛ㄥ洓";
+            case Calendar.FRIDAY:
+                return "鍛ㄤ簲";
+            case Calendar.SATURDAY:
+                return "鍛ㄥ叚";
+            case Calendar.SUNDAY:
+                return "鍛ㄦ棩";
+            default:
+                return "鏈煡";
+        }
+    }
 }

--
Gitblit v1.9.3