From e691b3282287a247f92e7301d778cdbb1fe4eaab Mon Sep 17 00:00:00 2001
From: 罗媛媛 <2454262093@qq.com>
Date: 星期一, 01 四月 2024 17:58:48 +0800
Subject: [PATCH] 功能调整
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 113 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 102 insertions(+), 11 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 5b4a1e7..4c1ad61 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,27 +1,32 @@
package com.yuanchu.mom.service.impl;
+import cn.hutool.core.bean.BeanUtil;
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.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.common.GetLook;
import com.yuanchu.mom.common.PrintChina;
import com.yuanchu.mom.dto.InsOrderPlanDTO;
-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.InsSampleUser;
+import com.yuanchu.mom.dto.SampleProductDto;
+import com.yuanchu.mom.mapper.*;
+import com.yuanchu.mom.pojo.*;
import com.yuanchu.mom.service.InsOrderPlanService;
import com.yuanchu.mom.service.InsOrderService;
+import com.yuanchu.mom.service.StandardTemplateService;
import com.yuanchu.mom.utils.QueryWrappers;
import com.yuanchu.mom.vo.InsOrderPlanVO;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
+import java.time.LocalDateTime;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* 妫�楠屼换鍔�-涓氬姟瀹炵幇灞�
@@ -39,6 +44,12 @@
private InsOrderMapper insOrderMapper;
private InsOrderService insOrderService;
+
+ private StandardTemplateService standardTemplateService;
+
+ private InsOrderStateMapper insOrderStateMapper;
+
+ private InsProductMapper insProductMapper;
@Override
public Map<String, Object> selectInsOrderPlanList(Page page, InsOrderPlanDTO insOrderPlanDTO) {
@@ -66,11 +77,91 @@
}
@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);
- insOrderMapper.updateById(insOrder);
- return insOrderService.getInsOrder(id);
+ InsOrder order = insOrderMapper.selectById(id);
+ 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.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;
+ for (InsProduct product : samples.getInsProduct()) {
+ if(set.add(product.getTemplateId())){
+ map2.put(product.getTemplateId(), standardTemplateService.getStandTempThingById(product.getTemplateId()) + "");
+ }
+ 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;
+ }
+ }
+ 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;
+ }
+ }
+ }
+ }
+ product.setTemplate(tableData);
+ product.setStyle(style);
+ }
+ }
+ }
+ map.put("sampleProduct", list);
+ return map;
+ }
+
+ @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
+ 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));
+ }
+
+ @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<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery().in(InsProduct::getInsSampleId, ids).eq(InsProduct::getSonLaboratory, laboratory).isNotNull(InsProduct::getInsResult));
+ 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));
+ return 1;
}
}
--
Gitblit v1.9.3