From 3ae364164cb9d85acce0b53a1ba5c70a80991308 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 03 七月 2024 22:21:49 +0800
Subject: [PATCH] 温度循环+报告英文换行+检验只有一项的设备查询+光纤配置报告换页+温度湿度
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 782 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 734 insertions(+), 48 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 cb1ce57..1e188a4 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,18 @@
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.Console;
+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,36 +20,36 @@
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;
-import com.yuanchu.mom.dto.InsOrderPlanDTO;
-import com.yuanchu.mom.dto.SampleProductDto;
+import com.yuanchu.mom.dto.*;
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.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 com.yuanchu.mom.vo.ProductVo;
+import com.yuanchu.mom.vo.SampleVo;
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.*;
@@ -91,13 +97,37 @@
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 InsBushingMapper insBushingMapper;
+
+ @Resource
+ private InsFiberMapper insFiberMapper;
+
+ @Resource
+ private InsFibersMapper insFibersMapper;
+
+ @Resource
+ private InsOrderFileMapper insOrderFileMapper;
@Override
public Map<String, Object> selectInsOrderPlanList(Page page, InsOrderPlanDTO insOrderPlanDTO) {
@@ -109,6 +139,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;
}
@@ -135,16 +179,188 @@
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) {
if (BeanUtil.isEmpty(samples.getInsProduct())) continue;
- getTemplateThing(set, map2, samples);
+ samples.setBushing(insBushingService.selectBushingBySampleId(samples.getId()));
}
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
+ public Map<String, Object> getReportModel(Integer sampleId) {
+ Map<String, Object> map = new HashMap<>();
+ //鍏堟煡鍑哄绠�
+ List<InsBushing> insBushings = insBushingMapper.selectList(Wrappers.<InsBushing>lambdaQuery().eq(InsBushing::getInsSampleId, sampleId));
+ List<InsFibers> fibers = new ArrayList<>();
+ List<InsFiber> fiber = new ArrayList<>();
+ for (InsBushing insBushing : insBushings) {
+ //鍐嶆煡璇㈠嚭鎵�鏈夌殑鍏夌氦甯�
+ List<InsFibers> insFibers = insFibersMapper.selectList(Wrappers.<InsFibers>lambdaQuery().eq(InsFibers::getInsBushingId, insBushing.getId()));
+ if (CollectionUtils.isNotEmpty(insFibers)) {
+ fibers.addAll(insFibers);
+ //鏌ュ嚭鍏夌氦甯︿笅鎵�鏈夌殑鍏夌氦
+ List<InsFiber> fiberList = insFiberMapper.selectList(Wrappers.<InsFiber>lambdaQuery().in(InsFiber::getInsFibersId, insFibers.stream().map(InsFibers::getId).collect(Collectors.toList())));
+ fiber.addAll(fiberList);
+ } else {
+ //濡傛灉濂楃涓嬫病鏈夊厜绾ゅ甫灏卞彧鏈夊厜绾や簡
+ List<InsFiber> insFiberList = insFiberMapper.selectList(Wrappers.<InsFiber>lambdaQuery().eq(InsFiber::getInsBushingId, insBushing.getId()));
+ fiber.addAll(insFiberList);
+ }
+ }
+ map.put("鍏夌氦甯�", fibers);
+ map.put("鍏夌氦", fiber);
+ return map;
+ }
+
+ //娓╁害寰幆鏌ョ湅鍒楄〃鏁版嵁(鍖呮嫭閫氳繃鏍峰搧id,寰幆娆℃暟,娓╁害,寰幆娆℃暟杩涜绛涢��)
+ @Override
+ public Map<String, Object> temCycle(Integer sampleId, String inspectionItem, String inspectionItemSubclass) {
+ Map<String, Object> map = new HashMap<>();
+ //鏍峰搧淇℃伅
+ SampleVo sampleVo = insSampleMapper.getDetailById(sampleId);
+ map.put("sampleVo", sampleVo);
+ List<ProductVo> productVos = new ArrayList<>();
+ //鍏堟煡鍑鸿繖涓牱鍝佷笅鏈夊摢浜涚鑹叉爣,鍏夌氦甯�,鍏夌氦鑹叉爣
+ //鍏堟煡鍑哄绠�
+ List<InsBushing> insBushings = insBushingMapper.selectList(Wrappers.<InsBushing>lambdaQuery().eq(InsBushing::getInsSampleId, sampleId));
+ for (InsBushing insBushing : insBushings) {
+ //鍐嶆煡璇㈠嚭鎵�鏈夌殑鍏夌氦甯�
+ List<InsFibers> insFibers = insFibersMapper.selectList(Wrappers.<InsFibers>lambdaQuery().eq(InsFibers::getInsBushingId, insBushing.getId()));
+ if (CollectionUtils.isNotEmpty(insFibers)) {
+ for (InsFibers insFiber : insFibers) {
+ //鏌ュ嚭鍏夌氦甯︿笅鎵�鏈夌殑鍏夌氦
+ List<InsFiber> fiberList = insFiberMapper.selectList(Wrappers.<InsFiber>lambdaQuery().eq(InsFiber::getInsFibersId, insFiber.getId()));
+ for (InsFiber fiber : fiberList) {
+ //鍐嶆牴鎹叧鑱旂殑鍏夌氦閰嶇疆鐨刬d鍜屽惊鐜鏁板拰娓╁害鍜屾牱鍝乮d杩涜鏌ヨ妫�楠岄」鐩�
+ List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
+ .eq(InsProduct::getInsSampleId, sampleId)
+ .eq(InsProduct::getInspectionItem, inspectionItem)
+ .eq(InsProduct::getInspectionItemSubclass, inspectionItemSubclass)
+ .eq(InsProduct::getInsFiberId, fiber.getId()));
+ for (InsProduct insProduct : insProducts) {
+ InsProductResult insProductResult = insProductResultMapper.selectOne(Wrappers.<InsProductResult>lambdaQuery().eq(InsProductResult::getInsProductId, insProduct.getId()));
+ ProductVo productVo = new ProductVo();
+ productVo.setCode(insFiber.getCode());
+ productVo.setColor(fiber.getColor());
+ productVo.setBushColor(fiber.getBushColor());
+ if (ObjectUtils.isNotEmpty(insProductResult)) {
+ insProduct.setInsProductResult(insProductResult);
+ }
+ productVo.setInsProduct(insProduct);
+ productVos.add(productVo);
+ }
+ }
+ }
+ } else {
+ //濡傛灉濂楃涓嬫病鏈夊厜绾ゅ甫灏卞彧鏈夊厜绾や簡
+ List<InsFiber> insFiberList = insFiberMapper.selectList(Wrappers.<InsFiber>lambdaQuery().eq(InsFiber::getInsBushingId, insBushing.getId()));
+ for (InsFiber fiber : insFiberList) {
+ //鍐嶆牴鎹叧鑱旂殑鍏夌氦閰嶇疆鐨刬d鍜屽惊鐜鏁板拰娓╁害鍜屾牱鍝乮d杩涜鏌ヨ妫�楠岄」鐩�
+ List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
+ .eq(InsProduct::getInsSampleId, sampleId)
+ .eq(InsProduct::getInspectionItem, inspectionItem)
+ .eq(InsProduct::getInspectionItemSubclass, inspectionItemSubclass)
+ .eq(InsProduct::getInsFiberId, fiber.getId()));
+ for (InsProduct insProduct : insProducts) {
+ InsProductResult insProductResult = insProductResultMapper.selectOne(Wrappers.<InsProductResult>lambdaQuery().eq(InsProductResult::getInsProductId, insProduct.getId()));
+ ProductVo productVo = new ProductVo();
+ productVo.setCode("/");
+ productVo.setColor(fiber.getColor());
+ productVo.setBushColor(fiber.getBushColor());
+ insProduct.setInsProductResult(insProductResult);
+ productVo.setInsProduct(insProduct);
+ productVos.add(productVo);
+ }
+ }
+ }
+ }
+ map.put("productVos", productVos);
+ return map;
+ }
+
@Override
public void saveInsContext(Map<String, Object> insContext) {
@@ -154,9 +370,12 @@
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)) {
+ List<InsProductResult> results = insProductResultMapper.selectList(Wrappers.<InsProductResult>lambdaQuery().eq(InsProductResult::getInsProductId, insProduct.getId()));
+ InsProductResult result;
+ if (CollectionUtils.isEmpty(results)) {
result = new InsProductResult();
+ } else {
+ result = results.get(0);
}
result.setInsProductId(Integer.parseInt(k));
if (jo.get("insValue") != null) {
@@ -237,6 +456,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()
@@ -289,30 +538,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(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()) {
- productSize.set(productSize.get() + 1);
if (b.getInsProductResult() != null) {
List<JSONObject> jsonObjects = JSON.parseArray(b.getInsProductResult().getEquipValue(), JSONObject.class);
for (JSONObject jsonObject : jsonObjects) {
@@ -321,7 +603,7 @@
}
}
}
- if(b.getTemplate()==null){
+ if (b.getTemplate() == null) {
continue;
}
if (b.getTemplate().size() == 0) {
@@ -330,6 +612,7 @@
templateSet.add(JSON.toJSONString(b.getTemplate()));
}
AtomicInteger index = new AtomicInteger();
+ Set<String> itemSet = new HashSet<>();
templateSet.forEach(tem -> {
Set<Integer> set2 = new HashSet<>();
List<RowRenderData> rows = new ArrayList<>();
@@ -338,6 +621,30 @@
Set<String> delSet = new HashSet<>();
List<ExcelDto> excelDtos = JSON.parseArray(tem, ExcelDto.class);
List<ExcelDto> mcList = new ArrayList<>();
+ /* int aaaa = excelDtos.get(excelDtos.size() - 1).getR();//杩欓噷鏄ā鐗堥噷闈㈢殑鎵�鏈夋娴嬮」鐨勯暱搴�,鍏堜互15涓」鐩垎椤�
+ int bbbb = 17;
+ int cccc = 0;
+ for (int p = 0; p < aaaa; p++) {
+ if (p % bbbb == 0) {
+ for (int y = 0; y < excelDtos.size(); y++) {
+ if (y == 0 || y == 1) {
+ if (excelDtos.get(y).getV().getMc() != null && excelDtos.get(y).getV().getMc().getCs() != null && excelDtos.get(y).getV().getMc().getRs() != null) {
+ mcList.add(excelDtos.get(y));
+ }
+ } else {
+ try {
+ excelDtos.get(y + cccc - 2);
+ } catch (Exception e) {
+ continue;
+ }
+ if (excelDtos.get(y + cccc - 2).getV().getMc() != null && excelDtos.get(y + cccc - 2).getV().getMc().getCs() != null && excelDtos.get(y + cccc - 2).getV().getMc().getRs() != null) {
+ mcList.add(excelDtos.get(y + cccc - 2));
+ }
+ }
+ }
+ cccc += 17;
+ }
+ }*/
excelDtos.forEach(b -> {
if (b.getV().getMc() != null && b.getV().getMc().getCs() != null && b.getV().getMc().getRs() != null) {
mcList.add(b);
@@ -366,9 +673,10 @@
List<JSONObject> temp = JSON.parseArray(JSON.toJSONString(excelDtos), JSONObject.class);
Map<String, InsProduct> pMap = new HashMap<>();
Set<String> delRSet = new HashSet<>();
+ delRSet.add("0");
for (JSONObject jo1 : temp) {
JSONObject v = JSON.parseObject(JSON.toJSONString(jo1.get("v")));
- if(Integer.parseInt(jo1.get("c")+"") > 9){
+ if (Integer.parseInt(jo1.get("c") + "") > 9) {
delSet.add(jo1.get("c") + "");
continue;
}
@@ -410,8 +718,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++) {
@@ -436,7 +742,7 @@
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());
+ textRenderData.setText(ObjectUtils.isNotEmpty(p.getTell()) ? p.getTell() : "");
} else if (value.equals("鍗曚綅")) {
textRenderData.setText(p.getUnit());
} else if (value.equals("缁撹")) {
@@ -445,6 +751,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:
@@ -452,7 +760,9 @@
break;
}
} else if (value.equals("搴忓彿")) {
- index.getAndIncrement();
+ if (itemSet.add(p.getInspectionItem())) {
+ index.getAndIncrement();
+ }
textRenderData.setText(index + "");
} else if (value.equals("璁＄畻鍊�")) {
JSONArray jsonArray = JSON.parseArray(p.getInsProductResult().getComValue());
@@ -467,6 +777,14 @@
textRenderData.setText(a.getSample());
} else if (value.equals("璇曢獙鏂规硶")) {
textRenderData.setText(p.getMethodS());
+ } else if (value.equals("妫�楠岄」")) {
+ textRenderData.setText(p.getInspectionItem() + "&" + p.getInspectionItemEn());
+ } else if (value.equals("妫�楠屽瓙椤�")) {
+ if (ObjectUtils.isEmpty(p.getInspectionItemSubclassEn())) {
+ textRenderData.setText(p.getInspectionItemSubclass());
+ } else {
+ textRenderData.setText(p.getInspectionItemSubclass() + "&" + p.getInspectionItemSubclassEn());
+ }
} else {
textRenderData.setText(v.get("v") == null ? "" : v.get("v") + "");
}
@@ -481,6 +799,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:
@@ -503,8 +823,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 {
@@ -512,17 +832,26 @@
}
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);
+ 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.setColWidths(new int[]{650,1600,2000,750,2800,1100,1100});
+ tableStyle.setColWidths(new int[]{650, 1600, 2000, 750, 2800, 1100, 1100});
tableStyle.setWidth("10000");
tableStyle.setAlign(TableRowAlign.CENTER);
BorderStyle borderStyle = new BorderStyle();
@@ -587,21 +916,274 @@
ConfigureBuilder builder = Configure.builder();
builder.useSpringEL(true);
List<Map<String, String>> finalDeviceList = deviceList;
- Integer userId = insSampleUserMapper.selectOne(Wrappers.<InsSampleUser>lambdaQuery().eq(InsSampleUser::getInsSampleId, orderId).orderByDesc(InsSampleUser::getCreateTime).last("limit 1")).getUserId();
+ Integer userId = insSampleUserMapper.selectOne(Wrappers.<InsSampleUser>lambdaQuery().eq(InsSampleUser::getInsSampleId, orderId).last("limit 1")).getUserId();
String signatureUrl;
try {
signatureUrl = userMapper.selectById(userId).getSignatureUrl();
- }catch (Exception e){
+ } catch (Exception e) {
throw new ErrorException("鎵句笉鍒版楠屼汉鐨勭鍚�");
}
+ //Custom custom = customMapper.selectById(user.get("company"));
+ Custom custom = customMapper.selectById(insOrder.getCompanyId());
+ 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)
+ .isNull(InsProduct::getInspectionItemClass));
+ List<InsProduct> filteredProducts = insProducts1.stream()
+ .collect(Collectors.groupingBy(product -> product.getInspectionItem() + product.getInspectionItemSubclass()))
+ .values().stream()
+ .map(group -> group.get(0))
+ .sorted(Comparator.comparing(InsProduct::getInspectionItem))
+ .collect(Collectors.toList());
+ long size = insProducts1.stream().map(insProduct -> {
+ return (insProduct.getInspectionItem() + insProduct.getInspectionItemSubclass());
+ }).distinct().collect(Collectors.toList()).size();
+ long size2 = insProducts1.stream().map(InsProduct::getInsFiberId).distinct().count();
+ long number = 7;
+ long k = 0;
+ for (long c = 0; c < size; c++) {
+ if (c % number == 0) {
+ List<RowRenderData> rows = new ArrayList<>();
+ //鍒ゆ柇妫�楠岄」鐩槸鍚︽湁鐖跺瓙鍏崇郴
+ Boolean state = true;
+ for (InsProduct insProduct : filteredProducts) {
+ 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 < 9; 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("绠¤壊鏍�&Pipe鈭�100");
+ renderData.add(textRenderData);
+ paragraphRenderData.setContents(renderData);
+ paragraphRenderDataList.add(paragraphRenderData);
+ cellRenderData.setParagraphs(paragraphRenderDataList);
+ cells.add(cellRenderData);
+ } else if (j == 1) {
+ //绗簩鍒�
+ textRenderData.setText("鍏夌氦鑹叉爣&Scanning Number鈭�101");
+ renderData.add(textRenderData);
+ paragraphRenderData.setContents(renderData);
+ paragraphRenderDataList.add(paragraphRenderData);
+ cellRenderData.setParagraphs(paragraphRenderDataList);
+ cells.add(cellRenderData);
+ } else {
+ //椤圭洰淇℃伅
+ try {
+ filteredProducts.get((int) (j - 2 + k));
+ } catch (Exception e) {
+ continue;
+ }
+ textRenderData.setText(filteredProducts.get((int) (j - 2 + k)).getInspectionItem() + "&" + insProducts1.get((int) (j - 2 + k)).getInspectionItemEn() + "鈭�" + (j + 101 + k));
+ 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("绠¤壊鏍�&Pipe鈭�100");
+ renderData.add(textRenderData);
+ paragraphRenderData.setContents(renderData);
+ paragraphRenderDataList.add(paragraphRenderData);
+ cellRenderData.setParagraphs(paragraphRenderDataList);
+ cells.add(cellRenderData);
+ } else if (j == 1) {
+ //绗簩鍒�
+ textRenderData.setText("鍏夌氦鑹叉爣&Scanning Number鈭�101");
+ renderData.add(textRenderData);
+ paragraphRenderData.setContents(renderData);
+ paragraphRenderDataList.add(paragraphRenderData);
+ cellRenderData.setParagraphs(paragraphRenderDataList);
+ cells.add(cellRenderData);
+ } else {
+ //椤圭洰淇℃伅
+ try {
+ filteredProducts.get((int) (j - 2 + k));
+ } catch (Exception e) {
+ continue;
+ }
+ //鍒ゆ柇鏄惁鏈夐」鐩瓙绫�
+ if (filteredProducts.get((int) (j - 2 + k)).getInspectionItemSubclass().equals("") || filteredProducts.get((int) (j - 2 + k)).getInspectionItemSubclass() == null) {
+ textRenderData.setText(filteredProducts.get((int) (j - 2 + k)).getInspectionItem() + "&" + filteredProducts.get((int) (j - 2 + k)).getInspectionItemEn() + "鈭�" + (j + 101 + k));
+ } else {
+ textRenderData.setText(filteredProducts.get((int) (j - 2 + k)).getInspectionItemSubclass() + "&" + filteredProducts.get((int) (j - 2 + k)).getInspectionItemSubclassEn());
+ }
+ renderData.add(textRenderData);
+ paragraphRenderData.setContents(renderData);
+ paragraphRenderDataList.add(paragraphRenderData);
+ cellRenderData.setParagraphs(paragraphRenderDataList);
+ cells.add(cellRenderData);
+ }
+ } else {
+ int aa;
+ if (a == 2) {
+ aa = (int) i - 2;
+ } else aa = (int) i - 1;
+ List<Integer> list = insProducts1.stream().map(InsProduct::getInsFiberId).distinct().collect(Collectors.toList());
+ try {
+ insFiberMapper.selectById(list.get(aa));
+ } catch (Exception e) {
+ continue;
+ }
+ InsFiber insFiber = insFiberMapper.selectById(list.get(aa));
+ //濉��
+ 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 {
+ //椤圭洰淇℃伅
+ try {
+ filteredProducts.get((int) (j - 2 + k));
+ } catch (Exception e) {
+ continue;
+ }
+ textRenderData.setText(filteredProducts.get((int) (j - 2 + k)).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);
+ k += 7;
+ }
+ }
+ });
+ }
+
+ /*鑾峰彇闄勪欢鍥剧墖绫诲瀷*/
+ 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);
+ });
+ }
+ //濮旀墭浜哄拰鐢佃瘽瀛楁鍒ゆ柇
+ if (ObjectUtils.isEmpty(insOrder.getPrepareUser())) {
+ insOrder.setPrepareUser("/");
+ }
+ if (ObjectUtils.isEmpty(insOrder.getPhone())) {
+ insOrder.setPhone("/");
+ }
+ //妫�楠岄」鐩殑鐜
+ InsProduct insProduct = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery().eq(InsProduct::getState, 1).eq(InsProduct::getInsSampleId, samples.get(0).getId())).get(0);
+ String environment = "";
+ environment = (ObjectUtils.isNotEmpty(insProduct.getTemperature()) ? insProduct.getTemperature() + "鈩� " : "") + (ObjectUtils.isNotEmpty(insProduct.getHumidity()) ? insProduct.getHumidity() + "%" : "");
+ String finalEnvironment = environment;
XWPFTemplate template = XWPFTemplate.compile(url, builder.build()).render(
new HashMap<String, Object>() {{
put("order", insOrder);
put("report", insReport);
- put("user", user);
+ put("environment", finalEnvironment);
+ 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());
@@ -612,7 +1194,8 @@
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("insUrl", Pictures.ofLocal(imgUrl + "/" + signatureUrl).create());
+ put("images", images);
put("examineUrl", null);
put("ratifyUrl", null);
put("sampleEn", sampleEn);
@@ -623,6 +1206,8 @@
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";
@@ -634,6 +1219,7 @@
} catch (IOException e) {
throw new RuntimeException(e);
}
+ //澶勭悊鍚堝苟鍗曞厓鏍肩殑闂
String path = wordUrl + "/" + insReport.getCode().replace("/", "") + ".docx";
try {
FileInputStream stream = new FileInputStream(path);
@@ -669,8 +1255,6 @@
}
}
}
- maps.forEach((k, v) -> {
- });
List<String> list = new ArrayList<>();
for (String s : maps.keySet()) {
list.add(s);
@@ -695,12 +1279,46 @@
} catch (IOException e) {
throw new RuntimeException(e);
}
+ try {
+ FileInputStream stream1 = new FileInputStream(path);
+ XWPFDocument document1 = new XWPFDocument(stream1);
+ List<XWPFTable> xwpfTables1 = document1.getTables();
+ //澶勭悊涓嫳鏂囨崲琛岀殑闂
+ for (int i = 1; i < xwpfTables1.size() - (deviceList == null ? 1 : 2); i++) {
+ for (int j = 0; j < xwpfTables1.get(i).getRows().size(); j++) {
+ for (int k = 0; k < xwpfTables1.get(i).getRows().get(j).getTableCells().size(); k++) {
+ if (xwpfTables1.get(i).getRows().get(j).getTableCells().get(k).getText().contains("&")) {
+ String text = xwpfTables1.get(i).getRows().get(j).getTableCells().get(k).getText();
+ String[] split = text.split("&");
+ xwpfTables1.get(i).getRows().get(j).getTableCells().get(k).removeParagraph(0);
+ XWPFParagraph xwpfParagraph = xwpfTables1.get(i).getRows().get(j).getTableCells().get(k).addParagraph();
+ XWPFRun run = xwpfParagraph.createRun();
+ run.setText(split[0]);
+ if (ObjectUtils.isNotNull(split[1])) {
+ run.addBreak();
+ run.setText(split[1]);
+ }
+ xwpfParagraph.setAlignment(ParagraphAlignment.CENTER);
+ }
+ }
+ }
+ }
+ //澶勭悊妫�楠岀粨鏋滆法椤电殑闂
+ FileOutputStream fileOutputStream1 = new FileOutputStream(path);
+ document1.write(fileOutputStream1);
+ fileOutputStream1.close();
+ } catch (FileNotFoundException e) {
+ throw new RuntimeException(e);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
}
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;
@@ -729,13 +1347,32 @@
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() + "锛�";
+ //濡傛灉鏄厜缂嗙殑娓╁害寰幆
+ if (product.getInspectionItem().equals("娓╁害寰幆") && insOrderMapper.selectById(orderId).getSampleType().equals("鍏夌紗")) {
+ //鏌ヨ閭ｄ簺寰幆娓╁害鐨勬楠岄」鐩殑缁撹鏄惁鍏ㄩ儴妫�楠�
+ List<InsProduct> insProductList = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery().eq(InsProduct::getInsSampleId, product.getInsSampleId())
+ .isNotNull(InsProduct::getInsFiberId).like(InsProduct::getInspectionItemSubclass, "鈩�"));
+ List<Integer> collect = insProductList.stream().filter(insProduct -> insProduct.getInsResult() != null).map(InsProduct::getInsResult).collect(Collectors.toList());
+ List<Integer> tt = new ArrayList<>();
+ tt.add(1);
+ if (collect.contains(0)) {
+ product.setInsResult(0);
+ } else if (collect.size() == insProductList.size() && collect.stream().distinct().collect(Collectors.toList()).containsAll(tt)) {
+ product.setInsResult(0);
+ }
+ insProductMapper.updateById(product);
+ } else {
+ 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).set(InsOrderState::getVerifyUser, verifyUser));
Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
@@ -756,4 +1393,53 @@
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