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 | 73 +++++++++++++++++++++++-------------
1 files changed, 47 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 5951f29..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,7 +1,11 @@
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;
@@ -26,9 +30,7 @@
import java.time.LocalDate;
import java.time.LocalDateTime;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* @author gaoaoy
@@ -65,20 +67,19 @@
@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);
+ if(userId!=null){
+ InsSampleUser insSampleUser = new InsSampleUser();
+ insSampleUser.setState(0);
+ insSampleUser.setUserId(userId);
+ insSampleUser.setInsSampleId(orderId);
+ insSampleUserMapper.insert(insSampleUser);
+ }
return 1;
}
@@ -86,24 +87,44 @@
@Transactional(rollbackFor = Exception.class)
public int addInsOrder(List<SampleProductDto> list, InsOrder insOrder) {
insOrder.setState(0);
- insOrder.setEntrustCode(giveCode.giveCode("JCZX-", "ins_order"));
+ String code = insOrderMapper.getLaboratoryCode(insOrder.getLaboratory());
+ insOrder.setEntrustCode(giveCode.giveCode("JCZX-" + code + "-", "ins_order", "-", "yyyyMMdd"));
insOrderMapper.insert(insOrder);
- list.forEach(a->{
+ list.forEach(a -> {
a.setId(null);
a.setInsOrderId(insOrder.getId());
- a.setInsProgress(0);
+ if(StrUtil.isEmpty(a.getSampleCode())){
+ a.setSampleCode(giveCode.giveCode("", "ins_sample", "", "yyMMdd"));
+ }
insSampleMapper.insert(a);
- 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())) {
+ 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 1;
+ return insOrder.getId();
+ }
+
+ @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);
+ map.put("insOrder", insOrder);
+ map.put("sampleProduct", list);
+ return map;
+ }
+
+ @Override
+ public int upInsOrderOfState(InsOrder insOrder) {
+ return insOrderMapper.updateById(insOrder);
}
}
--
Gitblit v1.9.3