From 1c683ded6a17523c47d7e1d853736562007d26bc Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期一, 03 六月 2024 09:07:34 +0800
Subject: [PATCH] 完成光纤配置进行检验操作
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java | 126 +++++++++++++++++++++++++++++++++--------
1 files changed, 100 insertions(+), 26 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 0a1fc95..6c98fa7 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
@@ -3,15 +3,14 @@
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
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.CostStatisticsDto;
-import com.yuanchu.mom.dto.SampleOrderDto;
-import com.yuanchu.mom.dto.SampleProductDto;
-import com.yuanchu.mom.dto.SampleProductDto2;
+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;
@@ -52,17 +51,44 @@
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;
}
@@ -76,16 +102,20 @@
insOrder.setSendTime(LocalDateTime.now());
insOrderMapper.updateById(insOrder);
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).select(InsProduct::getSonLaboratory).groupBy(InsProduct::getSonLaboratory));
+ 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);
- insOrderState.setLaboratory(insProduct.getSonLaboratory());
+ try {
+ insOrderState.setLaboratory(insProduct.getSonLaboratory());
+ } catch (NullPointerException e) {
+ throw new ErrorException("璇ユ楠屽崟鏈夋湭缁存姢瀹為獙瀹ょ殑妫�楠岄」鐩�");
+ }
insOrderState.setInsState(0);
insOrderStateMapper.insert(insOrderState);
}
- if(userId!=null){
+ if (userId != null) {
InsSampleUser insSampleUser = new InsSampleUser();
insSampleUser.setState(0);
insSampleUser.setUserId(userId);
@@ -99,32 +129,70 @@
@Transactional(rollbackFor = Exception.class)
public int addInsOrder(List<SampleProductDto> list, InsOrder insOrder) {
insOrder.setState(0);
- String code = insOrderMapper.getLaboratoryCode(insOrder.getLaboratory());
+ String code = customMapper.selectById(insOrder.getCompanyId()).getCode2();
insOrder.setEntrustCode(giveCode.giveCode("JCZX-" + code + "-", "ins_order", "-", "yyyyMMdd"));
insOrderMapper.insert(insOrder);
list.forEach(a -> {
a.setId(null);
a.setInsOrderId(insOrder.getId());
- if(StrUtil.isEmpty(a.getSampleCode())){
+ if (StrUtil.isEmpty(a.getSampleCode())) {
a.setSampleCode(giveCode.giveCode("", "ins_sample", "", "yyMMdd"));
}
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());
- if(product.getInspectionItemSubclass() == null){
- product.setInspectionItemSubclass("");
+ addInsProductMethod(a.getId(), a.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());
+ 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);
+ }
}
- insProductMapper.insert(product);
}
}
});
return insOrder.getId();
+ }
+
+ private void addInsProductMethod(Integer sampleId, List<InsProduct> productList, Integer id, Integer type) {
+ for (InsProduct product : productList) {
+ if(product.getState()==1){
+ 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
@@ -170,9 +238,10 @@
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")));
+ 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);
@@ -182,6 +251,11 @@
map.put("total", aLong);
return map;
}
+
+ @Override
+ public int updateStatus(Integer id) {
+ return insOrderMapper.updateStatus(id);
+ }
}
--
Gitblit v1.9.3