From 29cadb9df9e289fc4dd45d17e577fe9695232ea4 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 30 五月 2024 22:35:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java |  840 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 787 insertions(+), 53 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 e9bf629..db2f487 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,53 +1,114 @@
 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.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.ObjectUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.deepoove.poi.XWPFTemplate;
+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.util.TableTools;
 import com.yuanchu.mom.common.GetLook;
 import com.yuanchu.mom.common.PrintChina;
+import com.yuanchu.mom.dto.ExcelDto;
 import com.yuanchu.mom.dto.InsOrderPlanDTO;
 import com.yuanchu.mom.dto.SampleProductDto;
-import com.yuanchu.mom.mapper.InsOrderMapper;
-import com.yuanchu.mom.mapper.InsSampleMapper;
-import com.yuanchu.mom.mapper.InsSampleUserMapper;
-import com.yuanchu.mom.pojo.InsOrder;
-import com.yuanchu.mom.pojo.InsProduct;
-import com.yuanchu.mom.pojo.InsSampleUser;
+import com.yuanchu.mom.exception.ErrorException;
+import com.yuanchu.mom.mapper.*;
+import com.yuanchu.mom.pojo.*;
+import com.yuanchu.mom.service.InformationNotificationService;
 import com.yuanchu.mom.service.InsOrderPlanService;
 import com.yuanchu.mom.service.InsOrderService;
 import com.yuanchu.mom.service.StandardTemplateService;
+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 lombok.AllArgsConstructor;
+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 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.time.temporal.TemporalAdjusters;
 import java.util.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Collectors;
 
 /**
  * 妫�楠屼换鍔�-涓氬姟瀹炵幇灞�
  */
 @Service
-@AllArgsConstructor
 public class InsOrderPlanServiceImpl extends ServiceImpl<InsOrderMapper, InsOrder> implements InsOrderPlanService {
 
+    @Resource
     private InsSampleMapper insSampleMapper;
-
+    @Resource
     private InsSampleUserMapper insSampleUserMapper;
-
+    @Resource
     private GetLook getLook;
-
+    @Resource
     private InsOrderMapper insOrderMapper;
-
+    @Resource
     private InsOrderService insOrderService;
-
+    @Resource
     private StandardTemplateService standardTemplateService;
+    @Resource
+    private InsOrderStateMapper insOrderStateMapper;
+    @Resource
+    private InsProductMapper insProductMapper;
+
+    @Value("${wordUrl}")
+    private String wordUrl;
+
+    @Value("${twoCode}")
+    private String twoCode;
+
+    @Resource
+    private InsReportMapper insReportMapper;
+
+    @Resource
+    private InsProductResultMapper insProductResultMapper;
+
+    @Resource
+    private InsProductUserMapper insProductUserMapper;
+
+    @Resource
+    AuxiliaryOutputWorkingHoursMapper auxiliaryOutputWorkingHoursMapper;
+
+    @Resource
+    private InformationNotificationService informationNotificationService;
+
+    @Resource
+    private UserMapper userMapper;
+
+    @Value("${file.path}")
+    private String imgUrl;
 
     @Override
     public Map<String, Object> selectInsOrderPlanList(Page page, InsOrderPlanDTO insOrderPlanDTO) {
@@ -55,7 +116,7 @@
         map.put("head", PrintChina.printChina(InsOrderPlanVO.class));
         Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId(null);
         Integer userId = map1.get("userId");
-        if(ObjectUtil.isNotEmpty(insOrderPlanDTO.getUserId())){
+        if (ObjectUtil.isNotEmpty(insOrderPlanDTO.getUserId())) {
             insOrderPlanDTO.setUserId(userId.longValue());
         }
         IPage<InsOrderPlanVO> insOrderPage = insSampleMapper.findInsSampleAndOrder(page, QueryWrappers.queryWrappers(insOrderPlanDTO), userId);
@@ -64,73 +125,746 @@
     }
 
     @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;
+    }
+
+    @Override
     public boolean claimInsOrderPlan(InsOrderPlanDTO entity) {
-        if(Objects.isNull(entity)){
+        if (Objects.isNull(entity)) {
             return false;
         }
         Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId(null);
         Integer userId = map1.get("userId");
         InsSampleUser insSampleUser = new InsSampleUser(entity.getInsSampleId().intValue(), userId, 1);
-        return insSampleUserMapper.insert(insSampleUser)>0;
+        return insSampleUserMapper.insert(insSampleUser) > 0;
     }
 
     @Override
-    public Map<String, Object> doInsOrder(Integer id) {
+    public Map<String, Object> doInsOrder(Integer id, String laboratory) {
         InsOrder insOrder = new InsOrder();
         insOrder.setId(id);
-        insOrder.setInsState(1);
         InsOrder order = insOrderMapper.selectById(id);
-        if(BeanUtil.isEmpty(order.getInsTime())){
+        if (BeanUtil.isEmpty(order.getInsTime())) {
             insOrder.setInsTime(LocalDateTime.now());
             insOrderMapper.updateById(insOrder);
+            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.getInsOrder(id);
+        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) {
-            for (InsProduct product : samples.getInsProduct()) {
-                if(set.add(product.getTemplateId())){
-                    map2.put(product.getTemplateId(), standardTemplateService.getStandTempThingById(product.getTemplateId()) + "");
+            if (BeanUtil.isEmpty(samples.getInsProduct())) continue;
+            getTemplateThing(set, map2, samples);
+        }
+        map.put("sampleProduct", list);
+        return map;
+    }
+
+    @Override
+    public void saveInsContext(Map<String, Object> insContext) {
+        Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
+        CompletableFuture.supplyAsync(() -> {
+            insContext.forEach((k, v) -> {
+                JSONObject jo = JSON.parseObject(JSON.toJSONString(v));
+                InsProduct insProduct = new InsProduct();
+                insProduct.setId(Integer.parseInt(k));
+                InsProductResult result = insProductResultMapper.selectOne(Wrappers.<InsProductResult>lambdaQuery().eq(InsProductResult::getInsProductId, insProduct.getId()));
+                if (BeanUtil.isEmpty(result)) {
+                    result = new InsProductResult();
                 }
-                String 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")));
-                    List<JSONObject> cellData = JSON.parseArray(JSON.toJSONString(sheet.get("celldata")), JSONObject.class);
-                    List<JSONObject> tableData = new ArrayList<>();
-                    Map<String, Object> style = new HashMap<>();
-//                    style.put("borderInfo", config.get("borderInfo"));
-                    style.put("rowlen", config.get("rowlen"));
-                    style.put("columnlen", config.get("columnlen"));
-                    int r = -1;
-                    if (BeanUtil.isNotEmpty(cellData)){
-                        for (JSONObject o : cellData) {
-                            JSONObject v = JSON.parseObject(JSON.toJSONString(o.get("v")));
-                            if(BeanUtil.isNotEmpty(v.get("ps"))){
-                                JSONObject ps = JSON.parseObject(JSON.toJSONString(v.get("ps")));
-                                if (ps.get("value").equals("妫�楠岄」") && v.get("v").equals(product.getInspectionItem())){
-                                    tableData.add(o);
-                                    r = Integer.parseInt(o.get("r")+"");
-                                    continue;
+                result.setInsProductId(Integer.parseInt(k));
+                if (jo.get("insValue") != null) {
+                    JSONArray jsonArray = JSON.parseArray(JSON.toJSONString(jo.get("insValue")));
+                    List<Map<String, Object>> iv = new ArrayList<>();
+                    for (Object o : jsonArray) {
+                        JSONObject insValue = JSON.parseObject(JSON.toJSONString(o));
+                        Map<String, Object> map = new HashMap<>();
+                        map.put("v", JSON.parseObject(JSON.toJSONString(insValue.get("v"))).get("v"));
+                        try {
+                            if ((insValue.get("u") == null || insValue.get("u").equals("")) && StrUtil.isNotEmpty(JSON.parseObject(JSON.toJSONString(insValue.get("v"))).get("v").toString())) {
+                                map.put("u", userId + "");
+                            } else {
+                                map.put("u", insValue.get("u"));
+                            }
+                            iv.add(map);
+                        } catch (Exception e) {
+                        }
+                    }
+                    result.setInsValue(JSON.toJSONString(iv));
+                }
+                if (jo.get("comValue") != null && !Objects.equals(jo.get("comValue"), "")) {
+                    JSONArray jsonArray2 = JSON.parseArray(JSON.toJSONString(jo.get("comValue")));
+                    List<Map<String, Object>> cv = new ArrayList<>();
+                    for (Object o : jsonArray2) {
+                        JSONObject comValue = JSON.parseObject(JSON.toJSONString(o));
+                        Map<String, Object> map = new HashMap<>();
+                        map.put("v", JSON.parseObject(JSON.toJSONString(comValue.get("v"))).get("v"));
+                        cv.add(map);
+                    }
+                    result.setComValue(JSON.toJSONString(cv));
+                }
+                try {
+                    JSONObject resValue = JSON.parseObject(JSON.toJSONString(jo.get("resValue")));
+                    if (resValue.get("v") != null) {
+                        Object o = JSON.parseObject(JSON.toJSONString(resValue.get("v"))).get("v");
+                        insProduct.setLastValue(o.equals("") ? null : (o.toString()));
+                    }
+                } catch (Exception e) {
+                }
+                if (jo.get("equipValue") != null) {
+                    JSONArray jsonArray2 = JSON.parseArray(JSON.toJSONString(jo.get("equipValue")));
+                    List<Map<String, Object>> ev = new ArrayList<>();
+                    for (Object o : jsonArray2) {
+                        JSONObject equipValue = JSON.parseObject(JSON.toJSONString(o));
+                        Map<String, Object> map = new HashMap<>();
+                        map.put("v", JSON.parseObject(JSON.toJSONString(equipValue.get("v"))).get("v"));
+                        ev.add(map);
+                    }
+                    result.setEquipValue(JSON.toJSONString(ev));
+                }
+                if (jo.get("equipName") != null) {
+                    JSONArray jsonArray2 = JSON.parseArray(JSON.toJSONString(jo.get("equipName")));
+                    List<Map<String, Object>> ev = new ArrayList<>();
+                    for (Object o : jsonArray2) {
+                        JSONObject equipValue = JSON.parseObject(JSON.toJSONString(o));
+                        Map<String, Object> map = new HashMap<>();
+                        map.put("v", JSON.parseObject(JSON.toJSONString(equipValue.get("v"))).get("v"));
+                        ev.add(map);
+                    }
+                    result.setEquipName(JSON.toJSONString(ev));
+                }
+                try {
+                    JSONObject insResult = JSON.parseObject(JSON.toJSONString(jo.get("insResult")));
+                    String ir = JSON.parseObject(JSON.toJSONString(insResult.get("v"))).get("v") + "";
+                    insProduct.setInsResult(Integer.parseInt(ir));
+                } catch (Exception e) {
+                }
+                if (BeanUtil.isEmpty(result.getId())) {
+                    result.setCreateUser(userId);
+                    result.setUpdateUser(userId);
+                    insProductResultMapper.insert(result);
+                } else {
+                    result.setUpdateUser(userId);
+                    result.setUpdateTime(LocalDateTime.now());
+                    insProductResultMapper.updateById(result);
+                }
+                insProduct.setUpdateUser(userId);
+                insProductMapper.updateById(insProduct);
+                insProductUserMapper.insert(new InsProductUser(null, userId, LocalDateTime.now(), insProduct.getId()));
+
+                //鏌ヨ妫�楠屽崟淇℃伅
+                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) {
+                    //娣诲姞姣忎釜浜虹殑浜ч噺宸ユ椂
+                    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().format(formatter));//鏃ユ湡
+                    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()
+                        .eq(InsProduct::getInsSampleId, insSample.getId()));
+                Long l1 = insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery()
+                        .eq(InsProduct::getInsSampleId, insSample.getId()).isNotNull(InsProduct::getInsResult));
+                if (l == l1) {
+                    insSample.setInsState(2);
+                }
+                insSampleMapper.updateById(insSample);
+            });
+            return insContext.keySet().stream().findFirst().orElse(null);
+        }).thenAccept(res -> {
+            if (res != null) {
+                int pId = Integer.parseInt(res.replaceAll("\\D+", ""));
+                InsProduct insProduct = insProductMapper.selectById(pId);
+                // 閫氳繃pId 鑾峰彇褰撳墠鏍锋湰id
+                int sampleId = insProductMapper.selectById(pId).getInsSampleId();
+                // 閫氳繃鏍锋湰id鑾峰彇璁㈠崟id
+                int orderId = insSampleMapper.selectById(sampleId).getInsOrderId();
+                // 閫氳繃璁㈠崟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()).eq(InsProduct::getState, 1));
+                if (count == 0) {
+                    insOrderStateMapper.update(new InsOrderState(), Wrappers.<InsOrderState>lambdaUpdate()
+                            .eq(InsOrderState::getInsOrderId, orderId)
+                            .eq(InsOrderState::getLaboratory, insProduct.getSonLaboratory())
+                            .set(InsOrderState::getInsState, 2));
+                }
+            }
+        }).exceptionally(e -> {
+            e.printStackTrace();
+            return null;
+        });
+    }
+
+    @Override
+    public int upPlanUser(Integer userId, Integer orderId) {
+        InsSampleUser insSampleUser = new InsSampleUser();
+        insSampleUser.setUserId(userId);
+        insSampleUser.setInsSampleId(orderId);
+        insSampleUser.setState(0);
+        return insSampleUserMapper.insert(insSampleUser);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int verifyPlan(Integer orderId, String laboratory, Integer type, String tell) {
+        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) {
+            /*鏍峰搧涓嬬殑椤圭洰鍙鏈変竴涓」鐩笉鍚堟牸鍒欐楠岀粨鏋滀负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);
+            }
+            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<>();
+            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"};
+            samples.forEach(a -> {
+                models.add(a.getModel());
+                standardMethod.add(baseMapper.getStandardMethodCode(a.getStandardMethodListId()));
+                Set<String> templateSet = new HashSet<>();
+                getTemplateThing(set, map2, a);
+                for (InsProduct b : a.getInsProduct()) {
+                    productSize.set(productSize.get() + 1);
+                    if (b.getInsProductResult() != null) {
+                        List<JSONObject> jsonObjects = JSON.parseArray(b.getInsProductResult().getEquipValue(), JSONObject.class);
+                        for (JSONObject jsonObject : jsonObjects) {
+                            if (!"".equals(jsonObject.get("v") + "")) {
+                                deviceSet.add(jsonObject.get("v") + "");
+                            }
+                        }
+                    }
+                    if (b.getTemplate() == null) {
+                        continue;
+                    }
+                    if (b.getTemplate().size() == 0) {
+                        continue;
+                    }
+                    templateSet.add(JSON.toJSONString(b.getTemplate()));
+                }
+                AtomicInteger index = new AtomicInteger();
+                templateSet.forEach(tem -> {
+                    Set<Integer> set2 = new HashSet<>();
+                    List<RowRenderData> rows = new ArrayList<>();
+                    List<TextRenderData> text = new ArrayList<>();
+                    RowRenderData rowRenderData;
+                    Set<String> delSet = new HashSet<>();
+                    List<ExcelDto> excelDtos = JSON.parseArray(tem, ExcelDto.class);
+                    List<ExcelDto> mcList = new ArrayList<>();
+                    excelDtos.forEach(b -> {
+                        if (b.getV().getMc() != null && b.getV().getMc().getCs() != null && b.getV().getMc().getRs() != null) {
+                            mcList.add(b);
+                        }
+                    });
+                    int count5 = 0;
+                    for (ExcelDto b : mcList) {
+                        for (ExcelDto excelDto : excelDtos) {
+                            for (int i = 0; i < b.getV().getMc().getCs(); i++) {
+                                for (int i2 = 0; i2 < b.getV().getMc().getRs(); i2++) {
+                                    if (excelDto.getC() == b.getC() + i && excelDto.getR() == b.getR() + i2) {
+                                        ExcelDto bb = JSON.parseObject(JSON.toJSONString(b), ExcelDto.class);
+                                        excelDto.getV().setV(bb.getV().getV());
+                                        excelDto.getV().setPs(bb.getV().getPs());
+                                        excelDto.getV().setFc(bb.getV().getFc());
+                                        excelDto.getV().setFs(bb.getV().getFs());
+                                        excelDto.getV().setHt(bb.getV().getHt());
+                                        excelDto.setMc(count5);
+                                        break;
+                                    }
                                 }
                             }
-                            if(tableData.size()>0){
-                                if(Integer.parseInt(o.get("r")+"") == r + 1 || Integer.parseInt(o.get("r")+"") == r){
-                                    r = Integer.parseInt(o.get("r")+"");
-                                    tableData.add(o);
-                                }else{
-                                    break;
+                        }
+                        count5++;
+                    }
+                    List<JSONObject> temp = JSON.parseArray(JSON.toJSONString(excelDtos), JSONObject.class);
+                    Map<String, InsProduct> pMap = new HashMap<>();
+                    Set<String> delRSet = new HashSet<>();
+                    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 = "";
+                            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;
+                            }
+                            for (JSONObject jo2 : temp) {
+                                JSONObject v2 = JSON.parseObject(JSON.toJSONString(jo2.get("v")));
+                                if (jo1.get("r").equals(jo2.get("r"))) {
+                                    if (v2.get("ps") != null && JSON.parseObject(JSON.toJSONString(v2.get("ps"))).get("value").equals("妫�楠岄」")) {
+                                        if (count3 == 0) {
+                                            str += v2.get("v");
+                                            count3 += 1;
+                                        }
+                                    } else if (v2.get("ps") != null && JSON.parseObject(JSON.toJSONString(v2.get("ps"))).get("value").equals("妫�楠屽瓙椤�")) {
+                                        if (count3 == 1) {
+                                            str += v2.get("v");
+                                            count3 += 1;
+                                        }
+                                    }
+                                }
+                            }
+                            if (!str.equals("")) {
+                                int count2 = 0;
+                                for (InsProduct product : a.getInsProduct()) {
+                                    if ((product.getInspectionItem() + product.getInspectionItemSubclass()).equals(str)) {
+                                        pMap.put(jo1.get("r") + "", product);
+                                        break;
+                                    } else {
+                                        count2++;
+                                    }
+                                }
+                                if (count2 == a.getInsProduct().size()) {
+                                    delRSet.add(jo1.get("r") + "");
                                 }
                             }
                         }
                     }
-                    product.setTemplate(tableData);
-                    product.setStyle(style);
+                    for (int i = 0; i < temp.size(); i++) {
+                        JSONObject jo1 = temp.get(i);
+                        TextRenderData textRenderData = new TextRenderData();
+                        if (set2.add(Integer.parseInt(jo1.get("r") + ""))) {
+                            if (text.size() > 0) {
+                                TextRenderData[] text2 = text.toArray(new TextRenderData[0]);
+                                rowRenderData = Rows.of(text2).center().rowAtleastHeight(1).create();
+                                rows.add(rowRenderData);
+                                text = new ArrayList<>();
+                            }
+                        }
+                        if (delRSet.stream().anyMatch(e -> e.equals(jo1.get("r") + ""))) {
+                            continue;
+                        }
+                        if (delSet.stream().anyMatch(e -> e.equals(jo1.get("c") + ""))) {
+                            continue;
+                        }
+                        JSONObject v = JSON.parseObject(JSON.toJSONString(jo1.get("v")));
+                        InsProduct p = pMap.get(jo1.get("r") + "");
+                        if (p != null && v.get("ps") != null) {
+                            String value = JSON.parseObject(JSON.toJSONString(v.get("ps"))).get("value") + "";
+                            if (value.equals("瑕佹眰鍊�")) {
+                                textRenderData.setText(p.getAsk());
+                            } else if (value.equals("鍗曚綅")) {
+                                textRenderData.setText(p.getUnit());
+                            } else if (value.equals("缁撹")) {
+                                switch (p.getInsResult()) {
+                                    case 1:
+                                        textRenderData.setText("鈭�");
+                                        break;
+                                    case 0:
+                                        textRenderData.setText("脳");
+                                        break;
+                                    default:
+                                        textRenderData.setText("-");
+                                        break;
+                                }
+                            } else if (value.equals("搴忓彿")) {
+                                index.getAndIncrement();
+                                textRenderData.setText(index + "");
+                            } else if (value.equals("璁$畻鍊�")) {
+                                JSONArray jsonArray = JSON.parseArray(p.getInsProductResult().getComValue());
+                                textRenderData.setText((JSON.parseObject(JSON.toJSONString(jsonArray.get(0))).get("v") + "").equals("") ? "/" : JSON.parseObject(JSON.toJSONString(jsonArray.get(0))).get("v") + "");
+                            } else if (value.equals("鏈�缁堝��")) {
+                                textRenderData.setText(p.getLastValue());
+                            } else if (value.equals("鏍峰搧缂栧彿")) {
+                                textRenderData.setText(a.getSampleCode());
+                            } else if (value.equals("鏍峰搧鍨嬪彿")) {
+                                textRenderData.setText(a.getModel());
+                            } else if (value.equals("鏍峰搧鍚嶇О")) {
+                                textRenderData.setText(a.getSample());
+                            } else if (value.equals("璇曢獙鏂规硶")) {
+                                textRenderData.setText(p.getMethodS());
+                            } else {
+                                textRenderData.setText(v.get("v") == null ? "" : v.get("v") + "");
+                            }
+                        } else if (p == null && v.get("ps") != null) {
+                            String value = JSON.parseObject(JSON.toJSONString(v.get("ps"))).get("value") + "";
+                            p = pMap.get(pMap.keySet().iterator().next());
+                            if (value.equals("鏈�缁堝��")) {
+                                textRenderData.setText(p.getLastValue());
+                            } else if (value.equals("缁撹")) {
+                                switch (p.getInsResult()) {
+                                    case 1:
+                                        textRenderData.setText("鉁�");
+                                        break;
+                                    case 0:
+                                        textRenderData.setText("鉁�");
+                                        break;
+                                    default:
+                                        textRenderData.setText("-");
+                                        break;
+                                }
+                            } else if (value.equals("鏍峰搧缂栧彿")) {
+                                textRenderData.setText(a.getSampleCode());
+                            } else if (value.equals("鏍峰搧鍨嬪彿")) {
+                                textRenderData.setText(a.getModel());
+                            } else if (value.equals("鏍峰搧鍚嶇О")) {
+                                textRenderData.setText(a.getSample());
+                            } else {
+                                textRenderData.setText(v.get("v") == null ? "" : v.get("v") + "");
+                            }
+                        } else {
+                            textRenderData.setText(v.get("v") == null ? "" : v.get("v") + "");
+                        }
+                        if (jo1.get("mc") != null) {
+                            textRenderData.setText(textRenderData.getText() + "鈭�" + jo1.get("mc"));
+                        }
+                        Style style = new Style();
+                        style.setFontFamily(v.get("ff") == null ? "寰蒋闆呴粦" : v.get("ff") + "");
+                        if (!((v.get("fc") + "").indexOf("rgb") > -1)) {
+                            style.setColor(v.get("fc") == null ? "000000" : (v.get("fc") + "").replace("#", ""));
+                        } else {
+                            style.setColor("000000");
+                        }
+                        textRenderData.setStyle(style);
+                        text.add(textRenderData);
+                    }
+                    TextRenderData[] text2 = text.toArray(new TextRenderData[0]);
+                    rowRenderData = Rows.of(text2).rowAtleastHeight(1).center().create();
+                    rows.add(rowRenderData);
+                    TableRenderData tableRenderData = new TableRenderData();
+                    tableRenderData.setRows(rows);
+                    TableStyle tableStyle = new TableStyle();
+                    tableStyle.setColWidths(new int[]{650, 1600, 2000, 750, 2800, 1100, 1100});
+                    tableStyle.setWidth("10000");
+                    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);
+                    tables.add(table);
+                });
+            });
+            String url;
+            try {
+                InputStream inputStream = this.getClass().getResourceAsStream("/static/report-template.docx");
+                File file = File.createTempFile("temp", ".tmp");
+                OutputStream outputStream = new FileOutputStream(file);
+                IOUtils.copy(inputStream, outputStream);
+                url = file.getAbsolutePath();
+            } catch (FileNotFoundException e) {
+                throw new ErrorException("鎵句笉鍒版ā鏉挎枃浠�");
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+            StringBuilder standardMethod2 = new StringBuilder();
+            for (String s : standardMethod) {
+                standardMethod2.append("銆�").append(s);
+            }
+            standardMethod2.replace(0, 1, "");
+            tables.forEach(table -> {
+                table.put("tableSize", tables.size() + 1);
+            });
+            List<Map<String, String>> deviceList = null;
+            if (deviceSet.size() != 0) {
+                deviceList = insOrderMapper.selectDeviceList(deviceSet);
+            }
+            Map<String, String> codeStr = new HashMap<>();
+            codeStr.put("鎶ュ憡缂栧彿", insReport.getCode());
+            codeStr.put("鏍峰搧鍚嶇О", insOrder.getSample());
+            codeStr.put("瑙勬牸鍨嬪彿", samples.get(0).getModel());
+            codeStr.put("鍙戞斁鏃ユ湡", now.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+            String codePath;
+            try {
+                codePath = new MatrixToImageWriter().code(JackSonUtil.marshal(codeStr).replaceAll("\\{", "")
+                        .replaceAll("}", "").replaceAll(",", "").replaceAll("\"", ""), twoCode);
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+            String modelStr = "";
+            for (String model : models) {
+                modelStr += "," + model;
+            }
+            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).orderByDesc(InsSampleUser::getCreateTime).last("limit 1")).getUserId();
+            String signatureUrl;
+            try {
+                signatureUrl = userMapper.selectById(userId).getSignatureUrl();
+            } catch (Exception e) {
+                throw new ErrorException("鎵句笉鍒版楠屼汉鐨勭鍚�");
+            }
+            if (signatureUrl == null || "".equals(signatureUrl)) {
+                throw new ErrorException("鎵句笉鍒版楠屼汉鐨勭鍚�");
+            }
+            XWPFTemplate template = XWPFTemplate.compile(url, builder.build()).render(
+                    new HashMap<String, Object>() {{
+                        put("order", insOrder);
+                        put("report", insReport);
+                        put("user", user);
+                        put("sampleSize", samples.size());
+                        put("tables", tables);
+                        put("tableSize", tables.size() + 1);
+                        put("standardMethod", (standardMethod2.toString().equals("null") ? "" : standardMethod2));
+                        put("deviceList", finalDeviceList);
+                        put("twoCode", Pictures.ofLocal(codePath).create());
+                        put("models", finalModelStr.replace(",", ""));
+                        put("productSize", productSize);
+                        put("createTime", now.format(DateTimeFormatter.ofPattern("yyyy骞碝M鏈坉d鏃�")));
+                        put("createTimeEn", monthNames[now.getMonthValue() - 1] + " " + now.getDayOfMonth() + ", " + now.getYear());
+                        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", Pictures.ofLocal(imgUrl + "/" + signatureUrl).create());
+                        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());
+                    }});
+            try {
+                String name = insReport.getCode().replace("/", "") + ".docx";
+                template.writeAndClose(Files.newOutputStream(Paths.get(wordUrl + "/" + name)));
+                insReport.setUrl("/word/" + name);
+                insReportMapper.insert(insReport);
+                insOrder.setInsState(5);
+                insOrderMapper.updateById(insOrder);
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+            String path = wordUrl + "/" + insReport.getCode().replace("/", "") + ".docx";
+            try {
+                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++) {
+                    Set<String> set1 = new HashSet<>();
+                    Map<String, Map<String, Integer>> maps = new HashMap<>();
+                    for (int j = 0; j < xwpfTables.get(i).getRows().size(); j++) {
+                        for (int k = 0; k < xwpfTables.get(i).getRows().get(j).getTableCells().size(); k++) {
+                            if (xwpfTables.get(i).getRows().get(j).getTableCells().get(k).getText().indexOf("鈭�") > -1) {
+                                String[] split = xwpfTables.get(i).getRows().get(j).getTableCells().get(k).getText().split("鈭�");
+                                if (set1.add(split[1])) {
+                                    Map<String, Integer> map = new HashMap<>();
+                                    map.put("sr", j);
+                                    map.put("sc", k);
+                                    map.put("er", j + 0);
+                                    map.put("ec", k + 0);
+                                    maps.put(split[1], map);
+                                } else {
+                                    Map<String, Integer> map1 = maps.get(split[1]);
+                                    if (j == map1.get("sr")) {
+                                        map1.put("ec", map1.get("ec") + 1);
+                                    } else if (k == map1.get("sc")) {
+                                        map1.put("er", map1.get("er") + 1);
+                                    }
+                                }
+                                String str = xwpfTables.get(i).getRows().get(j).getTableCells().get(k).getText().split("鈭�")[0];
+                                xwpfTables.get(i).getRows().get(j).getTableCells().get(k).removeParagraph(0);
+                                xwpfTables.get(i).getRows().get(j).getTableCells().get(k).setText(str);
+                                xwpfTables.get(i).getRows().get(j).getTableCells().get(k).setVerticalAlignment(XWPFTableCell.XWPFVertAlign.CENTER);
+                                xwpfTables.get(i).getRows().get(j).getTableCells().get(k).getParagraphArray(0).setAlignment(ParagraphAlignment.CENTER);
+                            }
+                        }
+                    }
+                    maps.forEach((k, v) -> {
+                    });
+                    List<String> list = new ArrayList<>();
+                    for (String s : maps.keySet()) {
+                        list.add(s);
+                    }
+                    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++) {
+                            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")) {
+                            TableTools.mergeCellsVertically(xwpfTables.get(i), v.get("sc"), v.get("sr"), v.get("er"));
+                        }
+                    }
                 }
+                FileOutputStream fileOutputStream = new FileOutputStream(path);
+                document.write(fileOutputStream);
+                fileOutputStream.close();
+            } catch (FileNotFoundException e) {
+                throw new RuntimeException(e);
+            } catch (IOException e) {
+                throw new RuntimeException(e);
             }
         }
-        map.put("sampleProduct", list);
-        return map;
+        return 1;
+    }
+
+    private void getTemplateThing(Set<Integer> set, Map<Integer, String> map2, SampleProductDto a) {
+        for (InsProduct product : a.getInsProduct()) {
+            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());
+            }
+//            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")));
+                List<JSONObject> cellData = JSON.parseArray(JSON.toJSONString(sheet.get("celldata")), JSONObject.class);
+                Map<String, Object> style = new HashMap<>();
+                style.put("rowlen", config.get("rowlen"));
+                style.put("columnlen", config.get("columnlen"));
+                product.setTemplate(cellData);
+                product.setStyle(style);
+                product.setTemplateName(standardTemplateService.getStandTempNameById(product.getTemplateId()));
+            }
+        }
+    }
+
+    @Override
+    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));
+        if (insProducts.size() > 0) {
+            String str = "";
+            for (InsProduct product : insProducts) {
+                str += product.getInspectionItem() + " " + product.getInspectionItemSubclass() + "锛�";
+            }
+            throw new ErrorException("浠ヤ笅鏄湭妫�楠岀殑椤圭洰锛�" + str);
+        }
+        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