From e44da3a342bad6552b6a6998b9ead44c540c2e47 Mon Sep 17 00:00:00 2001
From: JYW <2013732181@qq.com>
Date: 星期五, 26 四月 2024 09:14:10 +0800
Subject: [PATCH] 2024-04-25 资质凭证bug和印章管理将实验室id改为实验室名称
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java
index eaf6522..a4f2008 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java
@@ -1,9 +1,9 @@
package com.yuanchu.mom.service.impl;
-import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.common.GetLook;
@@ -18,10 +18,10 @@
import com.yuanchu.mom.service.StandardTreeService;
import com.yuanchu.mom.mapper.StandardTreeMapper;
import lombok.AllArgsConstructor;
-import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.time.LocalDateTime;
import java.util.*;
import java.util.concurrent.CompletableFuture;
@@ -71,7 +71,7 @@
standardProductList.setSample(standardTree.getSample());
standardProductList.setModel(standardTree.getModel());
standardProductList.setStandardMethodListId(standardMethod.getId());
- standardProductList.setState(1);
+ standardProductList.setState(0);
standardProductList.setId(null);
standardProductList.setCreateUser(null);
standardProductList.setCreateTime(null);
@@ -150,8 +150,9 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void reTreeBySampleType(String sampleType) {
-// Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
+ Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
CompletableFuture.supplyAsync(() -> {
+ //鏍规嵁鏍峰搧鍚嶇О鏌ヨ鎵�鏈夋娴嬮」鐩弬鏁�(鑳藉姏)
List<StandardProductList> productList = standardTreeMapper.getStandardProductListBySample(sampleType);
List<StandardProductList> productList1 = JSON.parseArray(JSON.toJSONString(productList), StandardProductList.class);
List<StandardMethodList> methodList = standardTreeMapper.getStandardMethodListBySample(sampleType);
@@ -168,14 +169,24 @@
sl1.setRemark(sl2.getRemark());
sl2.setId(sl1.getId());
standardMethodListMapper.updateById(sl1);
+ //閫氳繃妫�楠屾爣鍑唅d鏌ヨ妫�楠岄」鐩�(鏍囧噯搴�)
List<StandardProductList> standardProductList = standardProductListService.selectStandardProductListByMethodId(sl1.getId());
for (StandardProductList pl1 : standardProductList) {
int count2 = 0;
for (StandardProductList pl2 : productList) {
if (Objects.equals(pl1.getInspectionItemSubclass(), pl2.getInspectionItemSubclass()) && Objects.equals(pl1.getInspectionItem(), pl2.getInspectionItem())) {
- pl2.setUpdateUser(null);
- pl2.setUpdateTime(null);
+ pl2.setUpdateUser(userId);
+ pl2.setUpdateTime(LocalDateTime.now());
pl2.setId(pl1.getId());
+ pl2.setSample(tree.getSample());
+ pl2.setDic(pl1.getDic());
+ //濡傛灉鏍囧噯搴撻噷闈㈢殑瑕佹眰鏈夊�煎垯涓嶆洿鏂�,瑕佹眰涓簄ull鍒欏悓姝ユ洿鏂�
+ if (ObjectUtils.isNotEmpty(pl1.getAsk())){
+ pl2.setAsk(null);
+ }
+ if (ObjectUtils.isNotEmpty(pl1.getTell())){
+ pl2.setTell(null);
+ }
standardProductListMapper.updateById(pl2);
break;
} else {
@@ -194,7 +205,7 @@
pl2.setSample(tree.getSample());
pl2.setModel(tree.getModel());
pl2.setStandardMethodListId(sl1.getId());
- pl2.setState(1);
+ pl2.setState(0);
pl2.setId(null);
pl2.setCreateUser(null);
pl2.setCreateTime(null);
@@ -228,7 +239,7 @@
standardProductList.setSample(tree.getSample());
standardProductList.setModel(tree.getModel());
standardProductList.setStandardMethodListId(sl2.getId());
- standardProductList.setState(1);
+ standardProductList.setState(0);
standardProductList.setId(null);
standardProductList.setCreateUser(null);
standardProductList.setCreateTime(null);
--
Gitblit v1.9.3