From 825da6ff9fbab76ca933930e35575cc8b0e811bd Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期二, 19 三月 2024 17:11:23 +0800
Subject: [PATCH] 功能大调整
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java | 95 +++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 87 insertions(+), 8 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 c103623..e8bc891 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,17 +1,33 @@
package com.yuanchu.mom.service.impl;
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.metadata.IPage;
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.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -30,21 +46,84 @@
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
+ @Transactional(rollbackFor = Exception.class)
+ public int upInsOrder(Integer orderId,Integer sampleId, String appointed, Integer userId) {
+ InsOrder insOrder = new InsOrder();
+ insOrder.setId(orderId);
+ 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);
+ return 1;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public int addInsOrder(List<SampleProductDto> list, InsOrder insOrder) {
+ insOrder.setState(0);
+ insOrder.setEntrustCode(giveCode.giveCode("JCZX-", "ins_order"));
+ insOrderMapper.insert(insOrder);
+ list.forEach(a->{
+ a.setId(null);
+ a.setInsOrderId(insOrder.getId());
+ a.setInsProgress(0);
+ 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 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