From 29cadb9df9e289fc4dd45d17e577fe9695232ea4 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 30 五月 2024 22:35:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java | 188 +++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 167 insertions(+), 21 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 6dcaf57..743cdb3 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,20 +1,35 @@
package com.yuanchu.mom.service.impl;
+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.OrderThingDto;
-import com.yuanchu.mom.mapper.InsOrderMapper;
-import com.yuanchu.mom.pojo.InsOrder;
+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.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.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
/**
* @author gaoaoy
@@ -30,38 +45,169 @@
private InsOrderMapper insOrderMapper;
- @Override
- public List<OrderThingDto> getOrderThing() {
- return insOrderMapper.getOrderThing();
- }
+ private InsSampleMapper insSampleMapper;
+
+ private InsProductMapper insProductMapper;
+
+ private GiveCode giveCode;
+
+ private InsSampleUserMapper insSampleUserMapper;
+
+ private InsOrderStateMapper insOrderStateMapper;
+
+ UserMapper userMapper;
+
+ PowerMapper powerMapper;
+
//鑾峰彇妫�楠屼笅鍗曟暟鎹�
@Override
- public Map<String, Object> selectInsOrderParameter(IPage<InsOrder> page, InsOrder itemParameter) {
- Map<String, Object> map = new HashMap<>();
- map.put("head", PrintChina.printChina(InsOrder.class));
+ public Map<String, Object> selectInsOrderParameter(IPage<InsOrder> page, SampleOrderDto sampleOrderDto) {
+ //鍒ゆ柇鍏ㄩ儴,涓汉,缁勭粐鐨勬潈闄�
Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectInsOrderParameter");
- if (map1.get("look") == 1) itemParameter.setCreateUser(map1.get("userId"));
- map.put("body", insOrderMapper.selectPage(page, QueryWrappers.queryWrappers(itemParameter)));
+ 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 {
+ //缁勭粐
+ sampleOrderDto.setCompany(user.getCompany());
+ }
+ }
+ Map<String, Object> map = new HashMap<>();
+ map.put("head", PrintChina.printChina(SampleOrderDto.class));
+ map.put("body", insOrderMapper.selectInsOrderPage(page, QueryWrappers.queryWrappers(sampleOrderDto)));
return map;
}
- //娣诲姞妫�楠屼笅鍗曟暟鎹�
@Override
- public int addInsOrderParameter(InsOrder itemParameter) {
- return insOrderMapper.insert(itemParameter);
+ @Transactional(rollbackFor = Exception.class)
+ 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);
+ 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));
+ 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
- public int delInsOrderParameter(Integer id) {
- return insOrderMapper.deleteById(id);
+ @Transactional(rollbackFor = Exception.class)
+ public int addInsOrder(List<SampleProductDto> list, InsOrder insOrder) {
+ insOrder.setState(0);
+ String code = insOrderMapper.getLaboratoryCode(insOrder.getLaboratory());
+ 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())) {
+ 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("");
+ }
+ insProductMapper.insert(product);
+ }
+ }
+ });
+ return insOrder.getId();
}
- //淇敼妫�楠屼笅鍗曟暟鎹�
@Override
- public int upInsOrderParameter(InsOrder itemParameter) {
- return insOrderMapper.updateById(itemParameter);
+ public Map<String, Object> getInsOrder(Integer id) {
+ Map<String, Object> map = new HashMap<>();
+ InsOrder insOrder = insOrderMapper.selectById(id);
+ List<SampleProductDto> list = insSampleMapper.selectSampleProductListByOrderId(id);
+ map.put("insOrder", insOrder);
+ map.put("sampleProduct", list);
+ return map;
+ }
+
+ @Override
+ public int upInsOrderOfState(InsOrder insOrder) {
+ insOrder.setExamineTime(LocalDateTime.now());
+ 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);
}
}
--
Gitblit v1.9.3