From 53da067c76ca7d4406b57c1a78565bd7b990868d Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期五, 22 三月 2024 17:58:50 +0800
Subject: [PATCH] 功能大调整
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java | 103 +++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 83 insertions(+), 20 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..4cc7203 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,36 @@
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.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
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.service.InsOrderService;
+import com.yuanchu.mom.utils.GiveCode;
import com.yuanchu.mom.utils.QueryWrappers;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.*;
/**
* @author gaoaoy
@@ -30,38 +46,85 @@
private InsOrderMapper insOrderMapper;
- @Override
- public List<OrderThingDto> getOrderThing() {
- return insOrderMapper.getOrderThing();
- }
+ private InsSampleMapper insSampleMapper;
+
+ private InsProductMapper insProductMapper;
+
+ private GiveCode giveCode;
+
+ private InsSampleUserMapper insSampleUserMapper;
//鑾峰彇妫�楠屼笅鍗曟暟鎹�
@Override
- public Map<String, Object> selectInsOrderParameter(IPage<InsOrder> page, InsOrder itemParameter) {
+ public Map<String, Object> selectInsOrderParameter(IPage<InsOrder> page, SampleOrderDto sampleOrderDto) {
Map<String, Object> map = new HashMap<>();
- map.put("head", PrintChina.printChina(InsOrder.class));
+ map.put("head", PrintChina.printChina(SampleOrderDto.class));
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)));
+ if (map1.get("look") == 1) sampleOrderDto.setCreateUser(map1.get("userId"));
+ 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);
+ 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());
+ 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<>();
+ List<SampleProductDto> list = insSampleMapper.selectSampleProductListByOrderId(id);
+ InsOrder insOrder = insOrderMapper.selectById(id);
+ map.put("insOrder", insOrder);
+ map.put("sampleProduct", list);
+ return map;
+ }
+
+ @Override
+ public int upInsOrderOfState(InsOrder insOrder) {
+ return insOrderMapper.updateById(insOrder);
}
}
--
Gitblit v1.9.3