From 1fe60de0b826d028c5798de86ec055be45684220 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 28 六月 2024 09:48:03 +0800
Subject: [PATCH] 委托编号格式变更+下单查询检验项目+报告的设备日期+检验下单的样品数量不准确+检验的检验进度计算
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java | 300 +++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 257 insertions(+), 43 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java
index e8bc891..6e42544 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java
@@ -1,36 +1,34 @@
package com.yuanchu.mom.service.impl;
import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.metadata.IPage;
+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;
import com.yuanchu.mom.common.GetLook;
import com.yuanchu.mom.common.PrintChina;
-import com.yuanchu.mom.dto.InsOderDto;
-import com.yuanchu.mom.dto.OrderThingDto;
-import com.yuanchu.mom.dto.SampleOrderDto;
-import com.yuanchu.mom.dto.SampleProductDto;
-import com.yuanchu.mom.mapper.InsOrderMapper;
-import com.yuanchu.mom.mapper.InsProductMapper;
-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.InsSample;
-import com.yuanchu.mom.pojo.InsSampleUser;
+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.InsOrderService;
import com.yuanchu.mom.utils.GiveCode;
import com.yuanchu.mom.utils.QueryWrappers;
+import com.yuanchu.mom.vo.SampleDefectsFatherVo;
import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDate;
import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
/**
* @author gaoaoy
@@ -54,67 +52,209 @@
private InsSampleUserMapper insSampleUserMapper;
+ private InsOrderStateMapper insOrderStateMapper;
+
+ UserMapper userMapper;
+
+ PowerMapper powerMapper;
+
+ private InsBushingMapper insBushingMapper;
+
+ private InsFibersMapper insFibersMapper;
+
+ private InsFiberMapper insFiberMapper;
+
+ CustomMapper customMapper;
+
+
//鑾峰彇妫�楠屼笅鍗曟暟鎹�
@Override
public Map<String, Object> selectInsOrderParameter(IPage<InsOrder> page, SampleOrderDto sampleOrderDto) {
+ //鍒ゆ柇鍏ㄩ儴,涓汉,缁勭粐鐨勬潈闄�
+ Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectInsOrderParameter");
+ User user = userMapper.selectById(map1.get("userId"));
+ Integer roleId = user.getRoleId();
+ //鍒ゆ柇鏄惁鏄叏閮ㄦ潈闄�
+ Power power = powerMapper.selectOne(Wrappers.<Power>lambdaQuery().eq(Power::getRoleId, roleId).eq(Power::getMenuMethod, "selectAllInsOrder"));
+ if (ObjectUtils.isEmpty(power)) {
+ if (map1.get("look") == 1) {
+ //涓汉
+ sampleOrderDto.setCreateUser(map1.get("userId"));
+ } else {
+ //缁勭粐
+ try {
+ sampleOrderDto.setCompany(customMapper.selectById(user.getCompany()).getCompany());
+ } catch (NullPointerException e) {
+ throw new ErrorException("鎵句笉鍒版墍灞炲崟浣�");
+ }
+ }
+ }
Map<String, Object> map = new HashMap<>();
map.put("head", PrintChina.printChina(SampleOrderDto.class));
- Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectInsOrderParameter");
- if (map1.get("look") == 1) sampleOrderDto.setCreateUser(map1.get("userId"));
map.put("body", insOrderMapper.selectInsOrderPage(page, QueryWrappers.queryWrappers(sampleOrderDto)));
return map;
}
@Override
@Transactional(rollbackFor = Exception.class)
- public int upInsOrder(Integer orderId,Integer sampleId, String appointed, Integer userId) {
+ public int upInsOrder(Integer orderId, Integer sampleId, String appointed, Integer userId) {
InsOrder insOrder = new InsOrder();
insOrder.setId(orderId);
+ insOrder.setAppointed(LocalDate.parse(appointed));
+ insOrder.setSendTime(LocalDateTime.now());
insOrderMapper.updateById(insOrder);
- InsSample insSample = new InsSample();
- insSample.setId(sampleId);
- insSample.setAppointed(LocalDate.parse(appointed));
- insSample.setSendTime(LocalDateTime.now());
- insSampleMapper.updateById(insSample);
- InsSampleUser insSampleUser = new InsSampleUser();
- insSampleUser.setState(0);
- insSampleUser.setUserId(userId);
- insSampleUser.setInsSampleId(sampleId);
- insSampleUserMapper.insert(insSampleUser);
+ 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::getState, 1).isNull(InsProduct::getInsFibersId).isNull(InsProduct::getInsFiberId).select(InsProduct::getSonLaboratory).groupBy(InsProduct::getSonLaboratory));
+ for (InsProduct insProduct : insProducts) {
+ InsOrderState insOrderState = new InsOrderState();
+ insOrderState.setInsOrderId(orderId);
+ try {
+ insOrderState.setLaboratory(insProduct.getSonLaboratory());
+ } catch (NullPointerException e) {
+ throw new ErrorException("璇ユ楠屽崟鏈夋湭缁存姢瀹為獙瀹ょ殑妫�楠岄」鐩�");
+ }
+ insOrderState.setInsState(0);
+ insOrderStateMapper.insert(insOrderState);
+ }
+ if (userId != null) {
+ InsSampleUser insSampleUser = new InsSampleUser();
+ insSampleUser.setState(0);
+ insSampleUser.setUserId(userId);
+ insSampleUser.setInsSampleId(orderId);
+ insSampleUserMapper.insert(insSampleUser);
+ }
return 1;
}
@Override
@Transactional(rollbackFor = Exception.class)
- public int addInsOrder(List<SampleProductDto> list, InsOrder insOrder) {
+ public int addInsOrder(List<SampleProductDto> list, InsOrder insOrder, List<List<Integer>> pairing) {
insOrder.setState(0);
- insOrder.setEntrustCode(giveCode.giveCode("JCZX-", "ins_order"));
+ String code = customMapper.selectById(insOrder.getCompanyId()).getCode2();
+ //insOrder.setEntrustCode(giveCode.giveCode("JCZX-" + code + "-", "ins_order", "", "yyMMdd"));
+ String giveCode = this.giveCode.giveCode("JCZX-" + code + "-", "ins_order", "", "yyMMdd");
insOrderMapper.insert(insOrder);
- list.forEach(a->{
+ AtomicInteger count = new AtomicInteger();
+ list.forEach(a -> {
+ count.getAndIncrement();
a.setId(null);
a.setInsOrderId(insOrder.getId());
- a.setInsProgress(0);
+ if (StrUtil.isEmpty(a.getSampleCode())) {
+ a.setSampleCode(giveCode.split("-")[2] + "-" + count.get());
+ }
insSampleMapper.insert(a);
- if(ObjectUtil.isNotEmpty(a.getInsProduct())){
- for (InsProduct product : a.getInsProduct()) {
- product.setId(null);
- product.setCreateTime(null);
- product.setUpdateTime(null);
- product.setUpdateTime(null);
- product.setUpdateUser(null);
- product.setInsSampleId(a.getId());
- insProductMapper.insert(product);
+ if (ObjectUtil.isNotEmpty(a.getInsProduct())) {
+ addInsProductMethod(a.getId(), a.getInsProduct(), null, 0);
+ }
+ if (ObjectUtil.isNotEmpty(a.getInsulating())) {
+ List<InsProduct> ip2 = new ArrayList<>();
+ for (Integer i = 0; i < a.getInsulating().getNum(); i++) {
+ ip2.addAll(a.getInsulating().getInsProduct());
+ }
+ for (InsProduct product : ip2) {
+ product.setStandardMethodListId(a.getInsulating().getStandardMethodListId());
+ }
+ addInsProductMethod(a.getId(), ip2, null, 0);
+ }
+ if (ObjectUtil.isNotEmpty(a.getSheath())) {
+ for (InsProduct product : a.getSheath().getInsProduct()) {
+ product.setStandardMethodListId(a.getSheath().getStandardMethodListId());
+ }
+ addInsProductMethod(a.getId(), a.getSheath().getInsProduct(), null, 0);
+ }
+ if (ObjectUtil.isNotEmpty(a.getChildSampleList())) {
+ for (SampleProductDto b : a.getChildSampleList()) {
+ for (int i = 0; i < b.getNum(); i++) {
+ b.setId(null);
+ b.setInsOrderId(insOrder.getId());
+ b.setParentId(a.getId());
+ if (StrUtil.isEmpty(b.getSampleCode())) {
+ b.setSampleCode(this.giveCode.giveCode("", "ins_sample", "", "yyMMdd"));
+ }
+ insSampleMapper.insert(b);
+ if (ObjectUtil.isNotEmpty(b.getInsProduct())) {
+ addInsProductMethod(b.getId(), b.getInsProduct(), null, 0);
+ }
+ }
+ }
+ }
+ if (ObjectUtil.isNotEmpty(a.getBushing())) {
+ for (BushingDto bushingDto : a.getBushing()) {
+ bushingDto.setInsSampleId(a.getId());
+ insBushingMapper.insert(bushingDto);
+ if (bushingDto.getFiber().size() != 0) {
+ for (FiberDto fiberDto : bushingDto.getFiber()) {
+ fiberDto.setInsBushingId(bushingDto.getId());
+ insFiberMapper.insert(fiberDto);
+ addInsProductMethod(a.getId(), fiberDto.getProductList(), fiberDto.getId(), 2);
+ }
+ } else {
+ for (FibersDto fibersDto : bushingDto.getFibers()) {
+ fibersDto.setInsBushingId(bushingDto.getId());
+ fibersDto.setCode(this.giveCode.giveCode("", "ins_fibers", "", "yyMMdd"));
+ insFibersMapper.insert(fibersDto);
+ for (FiberDto fiberDto : fibersDto.getFiber()) {
+ fiberDto.setInsFibersId(fibersDto.getId());
+ insFiberMapper.insert(fiberDto);
+ addInsProductMethod(a.getId(), fiberDto.getProductList(), fiberDto.getId(), 2);
+ }
+ addInsProductMethod(a.getId(), fibersDto.getProductList(), fibersDto.getId(), 1);
+ }
+ }
}
}
});
+ for (List<Integer> i : pairing) {
+ SampleProductDto sample = JSON.parseObject(JSON.toJSONString(list.get(i.get(0) - 1)), SampleProductDto.class);
+ sample.setSampleCode(list.get(i.get(0) - 1).getSampleCode() + "/" + list.get(i.get(1) - 1).getSampleCode());
+ sample.setId(null);
+ insSampleMapper.insert(sample);
+ try {
+ InsProduct insProduct = sample.getInsProduct().stream().filter(a -> Objects.equals(a.getInspectionItem(), "鐔旀帴鎹熻��")).findFirst().get();
+ insProduct.setId(null);
+ insProduct.setInsSampleId(sample.getId());
+ insProductMapper.insert(insProduct);
+ } catch (Exception e) {
+ }
+ }
return insOrder.getId();
+ }
+
+ private void addInsProductMethod(Integer sampleId, List<InsProduct> productList, Integer id, Integer type) {
+ for (InsProduct product : productList) {
+ /*if(product.getState()==1 && (product.getAsk().indexOf("D")>-1||product.getAsk().indexOf("W")>-1||product.getAsk().indexOf("X")>-1
+ ||product.getAsk().indexOf("RTS")>-1||product.getAsk().indexOf("H")>-1||product.getAsk().indexOf("L")>-1)){
+ throw new ErrorException("鎻愪氦澶辫触锛屽瓨鍦ㄦ湭濉啓鐨勫彉閲忥細"+product.getInspectionItem()+" "+product.getInspectionItemSubclass());
+ }*/
+ if (product.getState() == 1 && !product.getInspectionItem().equals("鐔旀帴鎹熻��")) {
+ switch (type) {
+ case 1:
+ product.setInsFibersId(id);
+ break;
+ case 2:
+ product.setInsFiberId(id);
+ break;
+ }
+ product.setId(null);
+ product.setCreateTime(null);
+ product.setUpdateTime(null);
+ product.setUpdateTime(null);
+ product.setUpdateUser(null);
+ product.setInsSampleId(sampleId);
+ if (product.getInspectionItemSubclass() == null) {
+ product.setInspectionItemSubclass("");
+ }
+ insProductMapper.insert(product);
+ }
+ }
}
@Override
public Map<String, Object> getInsOrder(Integer id) {
Map<String, Object> map = new HashMap<>();
- List<SampleProductDto> list = insSampleMapper.selectSampleProductListByOrderId(id);
InsOrder insOrder = insOrderMapper.selectById(id);
+ List<SampleProductDto> list = insSampleMapper.selectSampleProductListByOrderId2(id);
map.put("insOrder", insOrder);
map.put("sampleProduct", list);
return map;
@@ -122,8 +262,82 @@
@Override
public int upInsOrderOfState(InsOrder insOrder) {
+ insOrder.setExamineTime(LocalDateTime.now());
+ String code = baseMapper.selLaboratoryCode(insOrder.getLaboratory());
+ if (StringUtils.isEmpty(code)) {
+ code = "";
+ }
+ String code2 = customMapper.selectById(insOrder.getCompanyId()).getCode2();
+ insOrder.setEntrustCode(giveCode.giveCode("JC/ZX" + code + "-" + code2 + "-", "ins_order", "", "yyMM"));
return insOrderMapper.updateById(insOrder);
}
+
+ @Override
+ public Map<String, Object> getInsOrderAndSample(Integer id, String laboratory) {
+ Map<String, Object> map = new HashMap<>();
+ InsOrder insOrder = insOrderMapper.selectById(id);
+ List<SampleProductDto> list = insSampleMapper.getInsOrderAndSample(id, laboratory);
+ map.put("insOrder", insOrder);
+ map.put("sampleProduct", list);
+ return map;
+ }
+
+ @Override
+ public Map<String, Object> selectSampleAndProductByOrderId(IPage<SampleProductDto2> page, SampleProductDto2 sampleProductDto) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("head", PrintChina.printChina(SampleProductDto2.class));
+ map.put("body", insOrderMapper.selectSampleAndProductByOrderId(page, QueryWrappers.queryWrappers(sampleProductDto)));
+ return map;
+ }
+
+ @Override
+ public Map<String, Object> costStatistics(IPage<CostStatisticsDto> page, CostStatisticsDto costStatisticsDto) {
+ String dates = costStatisticsDto.getDates();
+ String[] split = dates.replaceAll("\\[", "").replaceAll("]", "").replaceAll("\"", "").split(",");
+ costStatisticsDto.setDates(null);
+ Map<String, Object> map = new HashMap<>();
+ map.put("head", PrintChina.printChina(CostStatisticsDto.class));
+ Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("costStatistics");
+ if (map1.get("look") == 1) costStatisticsDto.setCreateUser(map1.get("userId"));
+ map.put("body", insOrderMapper.selectCostStatistics(page, QueryWrappers.queryWrappers(costStatisticsDto).ge("create_time", split[0]).le("create_time", split[1] + " 23:59:59")));
+ return map;
+ }
+
+ @Override
+ public Map<String, Object> selectSampleDefects(Page page, String inspectionItems, String orderNumber) {
+ List<SampleDefectsFatherVo> sampleDefectsFatherVos = insOrderMapper.selectSampleDefects(page, inspectionItems, orderNumber);
+ Map<String, Object> map = new HashMap<>();
+ map.put("records", sampleDefectsFatherVos);
+ Long aLong = insOrderMapper.getCount(inspectionItems, orderNumber);
+ map.put("total", aLong);
+ return map;
+ }
+
+ @Override
+ public int updateStatus(Integer id) {
+ return insOrderMapper.updateStatus(id);
+ }
+
+ //鏍囩鎵撳嵃
+ @Override
+ public List<SampleProductDto3> labelPrinting(String ids) {
+ List<Integer> list = Arrays.stream(ids.split(",")).map(Integer::parseInt).collect(Collectors.toList());
+ List<SampleProductDto3> sampleProductDtos = insSampleMapper.selectSampleProductListByOrderId3(list);
+ Set<String> processedCodes = new HashSet<>();
+ //濡傛灉鏄厜绾ゆ垨鑰呮槸鍏夌氦甯﹂粯璁ゅ彧鎵撳嵃绗竴涓�
+ List<SampleProductDto3> sampleProductDto3s = sampleProductDtos.stream().filter(sampleProductDto3 -> {
+ if (!"鍏夌氦".equals(sampleProductDto3.getIoSampleType()) && !"鍏夌氦甯�".equals(sampleProductDto3.getIoSampleType())) {
+ return true;
+ }
+ if (processedCodes.contains(sampleProductDto3.getCode())) {
+ return false;
+ } else {
+ processedCodes.add(sampleProductDto3.getCode());
+ return true;
+ }
+ }).collect(Collectors.toList());
+ return sampleProductDto3s;
+ }
}
--
Gitblit v1.9.3