From 929c6698f4d7598997fc233e09c39c3bdce9fcf8 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 14 八月 2025 10:23:15 +0800
Subject: [PATCH] 判断合格绝对值的问题
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java | 236 +++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 141 insertions(+), 95 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 ea5a8f4..10324dc 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
@@ -7,8 +7,6 @@
import com.alibaba.excel.ExcelWriter;
import com.alibaba.excel.write.metadata.WriteSheet;
import com.alibaba.excel.write.style.column.SimpleColumnWidthStyleStrategy;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
@@ -21,16 +19,15 @@
import com.yuanchu.mom.exception.ErrorException;
import com.yuanchu.mom.mapper.*;
import com.yuanchu.mom.pojo.*;
-import com.yuanchu.mom.service.InsOrderPlanService;
+import com.yuanchu.mom.service.InformationNotificationService;
import com.yuanchu.mom.service.InsOrderService;
-import com.yuanchu.mom.service.InsProductService;
import com.yuanchu.mom.utils.GiveCode;
import com.yuanchu.mom.utils.QYWXApi;
import com.yuanchu.mom.utils.QueryWrappers;
import com.yuanchu.mom.vo.SampleDefectsFatherVo;
import lombok.AllArgsConstructor;
-import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -43,7 +40,6 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.net.URLEncoder;
-import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
@@ -80,27 +76,23 @@
@Resource
InsProductResultMapper insProductResultMapper;
@Resource
- private WarehouseHistoryMapper warehouseHistoryMapper;
- @Resource
private InsProductMapper insProductMapper;
- @Resource
- private InsProductService insProductService;
@Resource
private InsProductUserMapper insProductUserMapper;
@Resource
private GiveCode giveCode;
@Resource
- private InsSampleUserMapper insSampleUserMapper;
- @Resource
- private InsOrderStateMapper insOrderStateMapper;
- @Resource
UserMapper userMapper;
+ @Resource
+ InformationNotificationService informationNotificationService;
@Resource
PowerMapper powerMapper;
@Resource
CustomMapper customMapper;
@Resource
QYWXApi qywxApi;
+ @Autowired
+ ProcessOrder1Mapper processOrderMapper;
//鑾峰彇妫�楠屼笅鍗曟暟鎹�
@@ -139,34 +131,6 @@
return map;
}
- //鍒嗛厤绔欑偣
- @Override
- @Transactional(rollbackFor = Exception.class)
- public int upInsOrder(Integer orderId, Integer sampleId, String appointed, Integer userId, String sonLaboratory) {
- InsOrder insOrder = new InsOrder();
- insOrder.setId(orderId);
- //insOrder.setAppointed(LocalDate.parse(appointed));
- insOrder.setSendTime(LocalDateTime.now());
- insOrderMapper.updateById(insOrder);
- //淇敼鎴愬彧缁欏綋鍓嶉�夋嫨鐨勮瘯楠屽涓嬪彂鍗曞瓙
- InsOrderState insOrderState = new InsOrderState();
- insOrderState.setInsOrderId(orderId);
- insOrderState.setLaboratory(sonLaboratory);
- insOrderState.setInsState(0);
- insOrderState.setNum(1);//鍒濆鏄涓�娆�
- insOrderStateMapper.insert(insOrderState);
- //杩欓噷鏄湪缁欏垎閰嶇殑鎸囧畾鐨勪汉鍜岃瘯楠屽涓嬪彂妫�楠屼汉
- if (userId != null) {
- InsSampleUser insSampleUser = new InsSampleUser();
- insSampleUser.setState(0);
- insSampleUser.setUserId(userId);
- insSampleUser.setInsSampleId(orderId);
- insSampleUser.setSonLaboratory(sonLaboratory);
- insSampleUserMapper.insert(insSampleUser);
- }
- return 1;
- }
-
@Override
@Transactional(rollbackFor = Exception.class)
public int addInsOrder(List<SampleProductDto> list, InsOrder insOrder, List<List<Integer>> pairing, List<MultipartFile> files) {
@@ -202,7 +166,7 @@
a.setInsOrderId(insOrder.getId());
//鏍峰搧缂栧彿
if (StrUtil.isEmpty(a.getSampleCode())) {
- a.setSampleCode("YP-" + a.getModel() + "-" + giveCode.split("-")[2] + "-" + count.get());
+ a.setSampleCode("YP-" + giveCode.split("-")[2] + "-" + count.get());
}
insSampleMapper.insert(a);
//鏍峰搧鐨勬楠岄」鐩�
@@ -246,10 +210,80 @@
}
});
+ List<User> users1 = userMapper.getUserByRole("妫�娴嬩腑蹇冧富浠�");
+ List<User> users2 = userMapper.getUserByRole("鐮斿彂閮ㄧ粡鐞�");
+ List<User> users3 = userMapper.getUserByRole("鎶�鏈礋璐ｄ汉");
//閫氫俊:濡傛灉鏄疌绫昏鍗曟棤闇�瀹℃牳鐩存帴閫氳繃
if (insOrder.getOrderType().equals("C")) {
insOrder.setState(1);
upInsOrderOfState(insOrder);
+ } else if (insOrder.getOrderType().equals("A")) {
+ //甯歌澶栭儴鍗曢渶娑堟伅鎻愰啋妫�楠屼腑蹇冧富浠诲拰鐮斿彂閮ㄧ粡鐞�
+ //todo 涓嬪崟瀹℃牳浼佷笟寰俊鎺ㄩ��
+ users1.addAll(users2);
+ String account = users1.stream().map(User::getAccount).collect(Collectors.joining("|"));
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("touser", account);//鎺ユ敹娑堟伅鎴愬憳鐨勮处鍙�'ZT-031292'杩欑绫诲瀷(濡傛灉鏈夊涓敤'|'鍒嗛殧)
+ map.put("msgtype", "text");//娑堟伅绫诲瀷 text:鏂囨湰
+ map.put("agentid", 1000517);//搴旂敤id
+ HashMap<String, Object> hashMap = new HashMap<>();
+ hashMap.put("content", "鎮ㄦ湁涓�鏉℃楠岃鍗曢渶瑕佸鏍�,璇峰墠寰�LIMS绯荤粺鏌ョ湅銆傚閮ㄨ鍗曞彿鏄細" + insOrder.getOutEntrustCode() +
+ ",鏍峰搧鍚嶇О鏄細"+list.stream().map(SampleProductDto::getSample).collect(Collectors.joining(","))+
+ ",璇峰墠寰�LIMS绯荤粺鏌ョ湅銆傝鐐瑰嚮<a href=\"https://ztwxlims.ztt.cn:7443/enter\">涓ぉ閫氫俊LIMS绯荤粺 </a>");
+ map.put("text", hashMap);//娑堟伅鍐呭
+ map.put("safe", 0);//鏄惁淇濆瘑娑堟伅.0鍚�
+ map.put("enable_id_trans", 0);//鏄惁寮�鍚痠d杞瘧.0鍚�
+ map.put("enable_duplicate_check", 0);//鏄惁寮�鍚噸澶嶆秷鎭鏌�.0鍚�
+ qywxApi.send(map);
+ //lims娑堟伅鎻愰啋
+ ArrayList<InformationNotification> notificationArrayList = new ArrayList<>();
+ for (User user : users1) {
+ InformationNotification info = new InformationNotification();
+ info.setCreateUser(userMapper.selectById(userId).getName());
+ info.setMessageType("2");
+ info.setTheme("瀹℃牳閫氱煡");
+ info.setContent("鎮ㄦ湁涓�鏉℃楠岃鍗曞緟瀹℃牳娑堟伅,璁㈠崟鐨勫閮ㄧ紪鍙锋槸:" + insOrder.getOutEntrustCode()+",鏍峰搧鍚嶇О鏄細"+list.stream().map(SampleProductDto::getSample).collect(Collectors.joining(",")));
+ info.setSenderId(userId);
+ info.setViewStatus(false);
+ info.setJumpPath("b1-inspection-order");
+ info.setConsigneeId(user.getId());
+ notificationArrayList.add(info);
+ }
+ informationNotificationService.saveBatch(notificationArrayList);
+ } else if (insOrder.getOrderType().equals("B")) {
+ //闈炲父瑙勫閮ㄥ崟闇�娑堟伅鎻愰啋妫�楠屼腑蹇冧富浠�,鐮斿彂閮ㄧ粡鐞嗗拰鎶�鏈礋璐ｄ汉
+ //todo 涓嬪崟瀹℃牳浼佷笟寰俊鎺ㄩ��
+ users1.addAll(users2);
+ users1.addAll(users3);
+ String account = users1.stream().map(User::getAccount).collect(Collectors.joining("|"));
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("touser", account);//鎺ユ敹娑堟伅鎴愬憳鐨勮处鍙�'ZT-031292'杩欑绫诲瀷(濡傛灉鏈夊涓敤'|'鍒嗛殧)
+ map.put("msgtype", "text");//娑堟伅绫诲瀷 text:鏂囨湰
+ map.put("agentid", 1000517);//搴旂敤id
+ HashMap<String, Object> hashMap = new HashMap<>();
+ hashMap.put("content", "鎮ㄦ湁涓�鏉℃楠岃鍗曢渶瑕佸鏍�,璇峰墠寰�LIMS绯荤粺鏌ョ湅銆傚閮ㄨ鍗曞彿鏄細" + insOrder.getOutEntrustCode() +
+ ",鏍峰搧鍚嶇О鏄細"+list.stream().map(SampleProductDto::getSample).collect(Collectors.joining(",")) +
+ ",璇峰墠寰�LIMS绯荤粺鏌ョ湅銆傝鐐瑰嚮<a href=\"https://ztwxlims.ztt.cn:7443/enter\">涓ぉ閫氫俊LIMS绯荤粺 </a>");
+ map.put("text", hashMap);//娑堟伅鍐呭
+ map.put("safe", 0);//鏄惁淇濆瘑娑堟伅.0鍚�
+ map.put("enable_id_trans", 0);//鏄惁寮�鍚痠d杞瘧.0鍚�
+ map.put("enable_duplicate_check", 0);//鏄惁寮�鍚噸澶嶆秷鎭鏌�.0鍚�
+ qywxApi.send(map);
+ //lims娑堟伅鎻愰啋
+ ArrayList<InformationNotification> notificationArrayList = new ArrayList<>();
+ for (User user : users1) {
+ InformationNotification info = new InformationNotification();
+ info.setCreateUser(userMapper.selectById(userId).getName());
+ info.setMessageType("2");
+ info.setTheme("瀹℃牳閫氱煡");
+ info.setContent("鎮ㄦ湁涓�鏉℃楠岃鍗曞緟瀹℃牳娑堟伅,璁㈠崟鐨勫閮ㄧ紪鍙锋槸:" + insOrder.getOutEntrustCode()+",鏍峰搧鍚嶇О鏄細"+list.stream().map(SampleProductDto::getSample).collect(Collectors.joining(",")));
+ info.setSenderId(userId);
+ info.setViewStatus(false);
+ info.setJumpPath("b1-inspection-order");
+ info.setConsigneeId(user.getId());
+ notificationArrayList.add(info);
+ }
+ informationNotificationService.saveBatch(notificationArrayList);
}
//濡傛灉鏈変笂浼犵殑闄勪欢
if (CollectionUtils.isNotEmpty(files)) {
@@ -276,7 +310,7 @@
if (!realpath.exists()) {
realpath.mkdirs();
}
- pathName = UUID.randomUUID() + "_" + file.getOriginalFilename();
+ pathName = UUID.randomUUID() + "_" + file.getOriginalFilename().replace("#", "&");
urlString = realpath + "/" + pathName;
file.transferTo(new File(urlString));
insOrderFile.setFileUrl(pathName);
@@ -286,6 +320,35 @@
System.err.println("闄勪欢涓婁紶閿欒");
}
}
+ }
+ //todo 鏍锋満鍛樻帹閫佷紒涓氬井淇� @zss
+ if (!insOrder.getFormType().equals("鍏朵粬鎴愬搧")) {
+ String account = userMapper.selectById(insOrder.getIssueUser()).getAccount();
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("touser", account);//鎺ユ敹娑堟伅鎴愬憳鐨勮处鍙�'ZT-031292'杩欑绫诲瀷(濡傛灉鏈夊涓敤'|'鍒嗛殧)
+ map.put("msgtype", "text");//娑堟伅绫诲瀷 text:鏂囨湰
+ map.put("agentid", 1000517);//搴旂敤id
+ HashMap<String, Object> hashMap = new HashMap<>();
+ hashMap.put("content", "鎮ㄦ湁涓�鏉¤鍗曢渶瑕佸畬鎴�,璇峰墠寰�LIMS绯荤粺鏌ョ湅銆傚閮ㄨ鍗曞彿鏄細" + insOrder.getOutEntrustCode() +
+ ",鏍峰搧鍚嶇О鏄細"+list.stream().map(SampleProductDto::getSample).collect(Collectors.joining(","))+
+ ",璇峰墠寰�LIMS绯荤粺鏌ョ湅銆傝鐐瑰嚮<a href=\"https://ztwxlims.ztt.cn:7443/enter\">涓ぉ閫氫俊LIMS绯荤粺 </a>");
+ map.put("text", hashMap);//娑堟伅鍐呭
+ map.put("safe", 0);//鏄惁淇濆瘑娑堟伅.0鍚�
+ map.put("enable_id_trans", 0);//鏄惁寮�鍚痠d杞瘧.0鍚�
+ map.put("enable_duplicate_check", 0);//鏄惁寮�鍚噸澶嶆秷鎭鏌�.0鍚�
+ qywxApi.send(map);
+
+ //LIMS绯荤粺娑堟伅鎺ㄩ��
+ InformationNotification info = new InformationNotification();
+ info.setCreateUser(insProductMapper.selectUserById(userId).get("name"));
+ info.setMessageType("1");
+ info.setTheme("鏍锋満鍛橀�氱煡");
+ info.setContent("鎮ㄦ湁涓�鏉℃楠岃鍗曠殑鏍锋満寰呭畬鎴愭秷鎭�,澶栭儴璁㈠崟鍙锋槸锛�" + insOrder.getOutEntrustCode() + ",鏍峰搧鍚嶇О鏄細"+list.stream().map(SampleProductDto::getSample).collect(Collectors.joining(",")));
+ info.setSenderId(userId);
+ info.setConsigneeId(insOrder.getIssueUser());
+ info.setViewStatus(false);
+ info.setJumpPath("b1-inspection-order");
+ informationNotificationService.addInformationNotification(info);
}
return insOrder.getId();
}
@@ -329,21 +392,11 @@
//瀹℃牳閫氳繃鎵嶄細鐢熸垚濮旀墭缂栧彿
insOrder.setEntrustCode(giveCode.giveCode2("WT-", "ins_order", "-", "yyMMdd"));
insOrder.setSendTime(LocalDateTime.now());
- //todo 鏍规嵁璁㈠崟绫诲瀷鍒ゆ柇鏄惁闇�瑕佹帹閫佷紒涓氬井淇� @zss
- /* if (!order.getFormType().equals("鍏朵粬鎴愬搧")) {
- String account = userMapper.selectById(order.getIssueUser()).getAccount();
- HashMap<String, Object> map = new HashMap<>();
- map.put("touser", account);//鎺ユ敹娑堟伅鎴愬憳鐨勮处鍙�'ZT-031292'杩欑绫诲瀷(濡傛灉鏈夊涓敤'|'鍒嗛殧)
- map.put("msgtype", "text");//娑堟伅绫诲瀷 text:鏂囨湰
- map.put("agentid", 1000517);//搴旂敤id
- HashMap<String, Object> hashMap = new HashMap<>();
- hashMap.put("content", "鎮ㄦ湁涓�鏉¤鍗曢渶瑕佸畬鎴�,璇峰墠寰�LIMS绯荤粺鏌ョ湅銆傝鍗曞彿鏄細"+order.getEntrustCode()+",璇峰墠寰�LIMS绯荤粺鏌ョ湅銆�<a href=\"https://ztwxlims.ztt.cn:7443/enter\">涓ぉ閫氫俊LIMS绯荤粺 </a>");
- map.put("text", hashMap);//娑堟伅鍐呭
- map.put("safe", 0);//鏄惁淇濆瘑娑堟伅.0鍚�
- map.put("enable_id_trans", 0);//鏄惁寮�鍚痠d杞瘧.0鍚�
- map.put("enable_duplicate_check", 0);//鏄惁寮�鍚噸澶嶆秷鎭鏌�.0鍚�
- qywxApi.send(map);
- }*/
+ /*瀹℃牳閫氳繃杩橀渶瑕佹柊澧炰竴鏉nas瑕佹眰銆佹爣涔﹀拰鍚堝悓璇勫*/
+ ProcessOrder processOrder = new ProcessOrder();
+ processOrder.setInsOrderId(insOrder.getId());
+ processOrder.setRule(insOrder.getRule());
+ processOrderMapper.insert(processOrder);
}
return insOrderMapper.updateById(insOrder);
}
@@ -397,49 +450,42 @@
}
@Override
- public Map<String, Object> getInsOrderAndSample(Integer id, String laboratory) {
+ public Map<String, Object> getInsOrderAndSample(Integer sampleId, String laboratory) {
+ InsSample insSample = insSampleMapper.selectById(sampleId);
Map<String, Object> map = new HashMap<>();
- InsOrder insOrder = insOrderMapper.selectById2(id);
- List<SampleProductDto> insSamples = insSampleMapper.selectList1(insOrder.getId());
- List<SampleProductDto> list = insSampleMapper.getInsOrderAndSample(id, laboratory);
+ InsOrder insOrder = insOrderMapper.selectById2(insSample.getInsOrderId());
+ SampleProductDto sampleProductDto = insSampleMapper.getInsOrderAndSample(sampleId, laboratory);
//鍐嶆璇曢獙浼氬嚭鐜颁负绌虹殑鎯呭喌
- if (list.size() != insSamples.size()) {
- List<Integer> ids = list.stream().map(sampleProductDto -> sampleProductDto.getId()).distinct().collect(Collectors.toList());
- List<SampleProductDto> samples = insSamples.stream().filter(insSample ->
- !ids.contains(insSample.getId())
- ).collect(Collectors.toList());
- for (SampleProductDto insSample : samples) {
- List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
- .eq(InsProduct::getInsSampleId, insSample.getId())
- .eq(InsProduct::getState, 1)
- .eq(InsProduct::getSonLaboratory, laboratory));
- for (InsProduct insProduct : insProducts) {
- List<InsProductResult2> insProductResult2List = insProductResult2Mapper.selectList(Wrappers.<InsProductResult2>lambdaQuery()
- .eq(InsProductResult2::getInsProductId, insProduct.getId()).isNull(InsProductResult2::getNum));
- insProduct.setInsProductResult2(insProductResult2List);
- InsProductResult insProductResult = insProductResultMapper.selectOne(Wrappers.<InsProductResult>lambdaQuery()
- .eq(InsProductResult::getInsProductId, insProduct.getId()).isNull(InsProductResult::getNum));
- insProduct.setInsProductResult(insProductResult);
- }
- insSample.setInsProduct(insProducts);
- list.add(insSample);
+ if (ObjectUtils.isEmpty(sampleProductDto)) {
+ List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
+ .eq(InsProduct::getInsSampleId, insSample.getId())
+ .eq(InsProduct::getState, 1)
+ .eq(InsProduct::getSonLaboratory, laboratory));
+ for (InsProduct insProduct : insProducts) {
+ List<InsProductResult2> insProductResult2List = insProductResult2Mapper.selectList(Wrappers.<InsProductResult2>lambdaQuery()
+ .eq(InsProductResult2::getInsProductId, insProduct.getId()).isNull(InsProductResult2::getNum));
+ insProduct.setInsProductResult2(insProductResult2List);
+ InsProductResult insProductResult = insProductResultMapper.selectOne(Wrappers.<InsProductResult>lambdaQuery()
+ .eq(InsProductResult::getInsProductId, insProduct.getId()).isNull(InsProductResult::getNum));
+ insProduct.setInsProductResult(insProductResult);
}
-
+ SampleProductDto dto = new SampleProductDto();
+ dto.setInsProduct(insProducts);
+ BeanUtils.copyProperties(insSample,dto);
+ sampleProductDto=dto;
}
- for (SampleProductDto sampleProductDto : list) {
- List<Integer> ids = sampleProductDto.getInsProduct().stream().map(InsProduct::getId).collect(Collectors.toList());
- List<InsProductUser> insProductUsers = insProductUserMapper.selectList(Wrappers.<InsProductUser>lambdaQuery()
- .in(InsProductUser::getInsProductId, ids));
- if (CollectionUtils.isNotEmpty(insProductUsers)) {
- List<Integer> userIds = insProductUsers.stream().map(InsProductUser::getCreateUser).distinct().collect(Collectors.toList());
- String collect = userMapper.selectBatchIds(userIds).stream().map(User::getName).collect(Collectors.joining(","));
- sampleProductDto.setCheckName(collect);
- }
+ List<Integer> ids = sampleProductDto.getInsProduct().stream().map(InsProduct::getId).collect(Collectors.toList());
+ List<InsProductUser> insProductUsers = insProductUserMapper.selectList(Wrappers.<InsProductUser>lambdaQuery()
+ .in(InsProductUser::getInsProductId, ids));
+ if (CollectionUtils.isNotEmpty(insProductUsers)) {
+ List<Integer> userIds = insProductUsers.stream().map(InsProductUser::getCreateUser).distinct().collect(Collectors.toList());
+ String collect = userMapper.selectBatchIds(userIds).stream().map(User::getName).collect(Collectors.joining(","));
+ sampleProductDto.setCheckName(collect);
}
map.put("insOrder", insOrder);
- map.put("sampleProduct", list);
+ map.put("sampleProduct", sampleProductDto);
//鏌ヨ鎵�鏈夎褰曟ā鐗堝幓閲�
- List<Map<Integer, Object>> list2 = insOrderMapper.selectReportModelByOrderId(id, laboratory);
+ List<Map<Integer, Object>> list2 = insOrderMapper.selectReportModelByOrderId(insSample.getInsOrderId(), laboratory);
map.put("reportModel", list2);
return map;
}
--
Gitblit v1.9.3