From 4c563cb7274be53e15f8ce5537ef6e57e15b6458 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期二, 02 四月 2024 18:01:31 +0800
Subject: [PATCH] 检验报告
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 65 +++++++++++++++++++++++---------
1 files changed, 47 insertions(+), 18 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 4c1ad61..4f74f80 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
@@ -10,6 +10,7 @@
import com.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.yuanchu.mom.common.GetLook;
import com.yuanchu.mom.common.PrintChina;
import com.yuanchu.mom.dto.InsOrderPlanDTO;
@@ -23,7 +24,10 @@
import com.yuanchu.mom.vo.InsOrderPlanVO;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import java.io.FileOutputStream;
+import java.io.IOException;
import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;
@@ -57,7 +61,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);
@@ -67,13 +71,13 @@
@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
@@ -82,7 +86,7 @@
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);
}
@@ -94,11 +98,15 @@
for (SampleProductDto samples : list) {
if (BeanUtil.isEmpty(samples.getInsProduct())) continue;
for (InsProduct product : samples.getInsProduct()) {
- if(set.add(product.getTemplateId())){
+ if (product.getTemplateId() == null) {
+ product.setTemplate(new ArrayList<>());
+ continue;
+ }
+ if (set.add(product.getTemplateId())) {
map2.put(product.getTemplateId(), standardTemplateService.getStandTempThingById(product.getTemplateId()) + "");
}
String thing = map2.get(product.getTemplateId());
- if (StrUtil.isNotEmpty(thing)){
+ 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);
@@ -108,22 +116,22 @@
style.put("rowlen", config.get("rowlen"));
style.put("columnlen", config.get("columnlen"));
int r = -1;
- if (BeanUtil.isNotEmpty(cellData)){
+ if (BeanUtil.isNotEmpty(cellData)) {
for (JSONObject o : cellData) {
JSONObject v = JSON.parseObject(JSON.toJSONString(o.get("v")));
- if(BeanUtil.isNotEmpty(v.get("ps"))){
+ 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())){
+ if (ps.get("value").equals("妫�楠岄」") && v.get("v").equals(product.getInspectionItem())) {
tableData.add(o);
- r = Integer.parseInt(o.get("r")+"");
+ r = Integer.parseInt(o.get("r") + "");
continue;
}
}
- if(tableData.size()>0){
- if(Integer.parseInt(o.get("r")+"") == r + 1 || Integer.parseInt(o.get("r")+"") == r){
- r = Integer.parseInt(o.get("r")+"");
+ 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{
+ } else {
break;
}
}
@@ -148,17 +156,38 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public int verifyPlan(Integer orderId, String laboratory, Integer type, String tell) {
- Integer num = (type==1?5:4);
- return insOrderStateMapper.update(null, Wrappers.<InsOrderState>lambdaUpdate().eq(InsOrderState::getInsOrderId, orderId).eq(InsOrderState::getLaboratory, laboratory).set(InsOrderState::getInsTime, LocalDateTime.now()).set(InsOrderState::getInsState, num).set(InsOrderState::getVerifyTell, tell));
+ Integer num = (type == 1 ? 5 : 4);
+ insOrderStateMapper.update(null, Wrappers.<InsOrderState>lambdaUpdate().eq(InsOrderState::getInsOrderId, orderId).eq(InsOrderState::getLaboratory, laboratory).set(InsOrderState::getInsTime, LocalDateTime.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()) {
+ XWPFTemplate template = XWPFTemplate.compile("template.docx").render(
+ new HashMap<String, Object>() {{
+ put("title", "Hi, poi-tl Word妯℃澘寮曟搸");
+ }});
+ try {
+ template.writeAndClose(new FileOutputStream("output.docx"));
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ List<InsSample> insSamples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getInsOrderId, orderId));
+ insSamples.forEach(a -> {
+ System.out.println(a);
+ List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery().eq(InsProduct::getInsSampleId, a.getId()));
+ insProducts.forEach(System.out::println);
+ });
+ }
+ return 1;
}
@Override
public int submitPlan(Integer orderId, String laboratory) {
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<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).isNotNull(InsProduct::getInsResult));
- if(insProducts.size()==0){
+ if (insProducts.size() == 0) {
return 0;
}
insOrderStateMapper.update(null, Wrappers.<InsOrderState>lambdaUpdate().eq(InsOrderState::getInsOrderId, orderId).eq(InsOrderState::getLaboratory, laboratory).set(InsOrderState::getInsTime, LocalDateTime.now()).set(InsOrderState::getInsState, 3));
--
Gitblit v1.9.3