From edbb9450c78019e7cea4bfb0d0496782e90a4a43 Mon Sep 17 00:00:00 2001
From: 罗媛媛 <2454262093@qq.com>
Date: 星期一, 01 四月 2024 15:22:15 +0800
Subject: [PATCH] 功能调整
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
index e9bf629..4e01879 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
@@ -7,6 +7,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
+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;
@@ -14,9 +15,11 @@
import com.yuanchu.mom.dto.InsOrderPlanDTO;
import com.yuanchu.mom.dto.SampleProductDto;
import com.yuanchu.mom.mapper.InsOrderMapper;
+import com.yuanchu.mom.mapper.InsOrderStateMapper;
import com.yuanchu.mom.mapper.InsSampleMapper;
import com.yuanchu.mom.mapper.InsSampleUserMapper;
import com.yuanchu.mom.pojo.InsOrder;
+import com.yuanchu.mom.pojo.InsOrderState;
import com.yuanchu.mom.pojo.InsProduct;
import com.yuanchu.mom.pojo.InsSampleUser;
import com.yuanchu.mom.service.InsOrderPlanService;
@@ -49,6 +52,8 @@
private StandardTemplateService standardTemplateService;
+ private InsOrderStateMapper insOrderStateMapper;
+
@Override
public Map<String, Object> selectInsOrderPlanList(Page page, InsOrderPlanDTO insOrderPlanDTO) {
Map<String, Object> map = new HashMap<>();
@@ -75,7 +80,7 @@
}
@Override
- public Map<String, Object> doInsOrder(Integer id) {
+ public Map<String, Object> doInsOrder(Integer id, String laboratory) {
InsOrder insOrder = new InsOrder();
insOrder.setId(id);
insOrder.setInsState(1);
@@ -83,6 +88,7 @@
if(BeanUtil.isEmpty(order.getInsTime())){
insOrder.setInsTime(LocalDateTime.now());
insOrderMapper.updateById(insOrder);
+ insOrderStateMapper.update(null, Wrappers.<InsOrderState>lambdaUpdate().eq(InsOrderState::getInsOrderId, id).eq(InsOrderState::getLaboratory, laboratory).set(InsOrderState::getInsTime, LocalDateTime.now()).set(InsOrderState::getInsState, 1));
}
Map<String, Object> map = insOrderService.getInsOrder(id);
Set<Integer> set = new HashSet<>();
@@ -133,4 +139,19 @@
map.put("sampleProduct", list);
return map;
}
+
+ @Override
+ public int upPlanUser(Integer userId, Integer orderId) {
+ InsSampleUser insSampleUser = new InsSampleUser();
+ insSampleUser.setUserId(userId);
+ insSampleUser.setInsSampleId(orderId);
+ insSampleUser.setState(0);
+ return insSampleUserMapper.insert(insSampleUser);
+ }
+
+ @Override
+ public int verifyPlan(Integer orderId, String laboratory, Integer type, String tell) {
+ Integer num = (type==1?5:4);
+ return insOrderStateMapper.update(null, Wrappers.<InsOrderState>lambdaUpdate().eq(InsOrderState::getInsOrderId, orderId).eq(InsOrderState::getLaboratory, laboratory).set(InsOrderState::getInsTime, LocalDateTime.now()).set(InsOrderState::getInsState, num).set(InsOrderState::getVerifyTell, tell));
+ }
}
--
Gitblit v1.9.3