From b364530ee03f8b28b64863f6a633daf05dc94e91 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 18 十二月 2024 15:55:19 +0800
Subject: [PATCH] 查询站点的检验时长+产量工时bug+检验任务提交撤销+首页待办查最近七天的信息+高低温检验增加检验表字段
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java | 36 ++++++++++++++++++++++--------------
1 files changed, 22 insertions(+), 14 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 249dd00..0590eea 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
@@ -222,7 +222,7 @@
upInsOrderOfState(insOrder);
} else if (insOrder.getOrderType().equals("A")) {
//甯歌澶栭儴鍗曢渶娑堟伅鎻愰啋妫�楠屼腑蹇冧富浠诲拰鐮斿彂閮ㄧ粡鐞�
- //todo 浼佷笟寰俊鎺ㄩ��
+ //todo 涓嬪崟瀹℃牳浼佷笟寰俊鎺ㄩ��
users1.addAll(users2);
String account = users1.stream().map(User::getAccount).collect(Collectors.joining("|"));
HashMap<String, Object> map = new HashMap<>();
@@ -230,7 +230,9 @@
map.put("msgtype", "text");//娑堟伅绫诲瀷 text:鏂囨湰
map.put("agentid", 1000517);//搴旂敤id
HashMap<String, Object> hashMap = new HashMap<>();
- hashMap.put("content", "鎮ㄦ湁涓�鏉℃楠岃鍗曢渶瑕佸鏍�,璇峰墠寰�LIMS绯荤粺鏌ョ湅銆傚閮ㄨ鍗曞彿鏄細" + insOrder.getOutEntrustCode() + ",璇峰墠寰�LIMS绯荤粺鏌ョ湅銆�<a href=\"https://ztwxlims.ztt.cn:7443/enter\">涓ぉ閫氫俊LIMS绯荤粺 </a>");
+ 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鍚�
@@ -243,17 +245,17 @@
info.setCreateUser(userMapper.selectById(userId).getName());
info.setMessageType("2");
info.setTheme("瀹℃牳閫氱煡");
- info.setContent("鎮ㄦ湁涓�鏉℃楠岃鍗曞緟瀹℃牳娑堟伅,璁㈠崟鐨勫閮ㄧ紪鍙锋槸:" + insOrder.getOutEntrustCode());
+ info.setContent("鎮ㄦ湁涓�鏉℃楠岃鍗曞緟瀹℃牳娑堟伅,璁㈠崟鐨勫閮ㄧ紪鍙锋槸:" + insOrder.getOutEntrustCode()+",鏍峰搧鍚嶇О鏄細"+list.stream().map(SampleProductDto::getSample).collect(Collectors.joining(",")));
info.setSenderId(userId);
info.setViewStatus(false);
- info.setJumpPath("b1-inspect-order");
+ info.setJumpPath("b1-inspection-order");
info.setConsigneeId(user.getId());
notificationArrayList.add(info);
}
informationNotificationService.saveBatch(notificationArrayList);
} else if (insOrder.getOrderType().equals("B")) {
//闈炲父瑙勫閮ㄥ崟闇�娑堟伅鎻愰啋妫�楠屼腑蹇冧富浠�,鐮斿彂閮ㄧ粡鐞嗗拰鎶�鏈礋璐ｄ汉
- //todo 浼佷笟寰俊鎺ㄩ��
+ //todo 涓嬪崟瀹℃牳浼佷笟寰俊鎺ㄩ��
users1.addAll(users2);
users1.addAll(users3);
String account = users1.stream().map(User::getAccount).collect(Collectors.joining("|"));
@@ -262,7 +264,9 @@
map.put("msgtype", "text");//娑堟伅绫诲瀷 text:鏂囨湰
map.put("agentid", 1000517);//搴旂敤id
HashMap<String, Object> hashMap = new HashMap<>();
- hashMap.put("content", "鎮ㄦ湁涓�鏉℃楠岃鍗曢渶瑕佸鏍�,璇峰墠寰�LIMS绯荤粺鏌ョ湅銆傚閮ㄨ鍗曞彿鏄細" + insOrder.getOutEntrustCode() + ",璇峰墠寰�LIMS绯荤粺鏌ョ湅銆�<a href=\"https://ztwxlims.ztt.cn:7443/enter\">涓ぉ閫氫俊LIMS绯荤粺 </a>");
+ 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鍚�
@@ -275,10 +279,10 @@
info.setCreateUser(userMapper.selectById(userId).getName());
info.setMessageType("2");
info.setTheme("瀹℃牳閫氱煡");
- info.setContent("鎮ㄦ湁涓�鏉℃楠岃鍗曞緟瀹℃牳娑堟伅,璁㈠崟鐨勫閮ㄧ紪鍙锋槸:" + insOrder.getOutEntrustCode());
+ info.setContent("鎮ㄦ湁涓�鏉℃楠岃鍗曞緟瀹℃牳娑堟伅,璁㈠崟鐨勫閮ㄧ紪鍙锋槸:" + insOrder.getOutEntrustCode()+",鏍峰搧鍚嶇О鏄細"+list.stream().map(SampleProductDto::getSample).collect(Collectors.joining(",")));
info.setSenderId(userId);
info.setViewStatus(false);
- info.setJumpPath("b1-inspect-order");
+ info.setJumpPath("b1-inspection-order");
info.setConsigneeId(user.getId());
notificationArrayList.add(info);
}
@@ -320,7 +324,7 @@
}
}
}
- //todo 鏍规嵁璁㈠崟绫诲瀷鍒ゆ柇鏄惁闇�瑕佹帹閫佷紒涓氬井淇� @zss
+ //todo 鏍锋満鍛樻帹閫佷紒涓氬井淇� @zss
if (!insOrder.getFormType().equals("鍏朵粬鎴愬搧")) {
String account = userMapper.selectById(insOrder.getIssueUser()).getAccount();
HashMap<String, Object> map = new HashMap<>();
@@ -328,7 +332,9 @@
map.put("msgtype", "text");//娑堟伅绫诲瀷 text:鏂囨湰
map.put("agentid", 1000517);//搴旂敤id
HashMap<String, Object> hashMap = new HashMap<>();
- hashMap.put("content", "鎮ㄦ湁涓�鏉¤鍗曢渶瑕佸畬鎴�,璇峰墠寰�LIMS绯荤粺鏌ョ湅銆傚閮ㄨ鍗曞彿鏄細" + insOrder.getOutEntrustCode() + ",璇峰墠寰�LIMS绯荤粺鏌ョ湅銆�<a href=\"https://ztwxlims.ztt.cn:7443/enter\">涓ぉ閫氫俊LIMS绯荤粺 </a>");
+ 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鍚�
@@ -340,11 +346,11 @@
info.setCreateUser(insProductMapper.selectUserById(userId).get("name"));
info.setMessageType("1");
info.setTheme("鏍锋満鍛橀�氱煡");
- info.setContent("鎮ㄦ湁涓�鏉℃楠岃鍗曠殑鏍锋満寰呭畬鎴愭秷鎭�,澶栭儴璁㈠崟鍙锋槸锛�" + insOrder.getOutEntrustCode() + ",璇峰墠寰�LIMS绯荤粺鏌ョ湅銆�");
+ 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-inspect-order");
+ info.setJumpPath("b1-inspection-order");
informationNotificationService.addInformationNotification(info);
}
return insOrder.getId();
@@ -461,8 +467,10 @@
.eq(InsProductResult::getInsProductId, insProduct.getId()).isNull(InsProductResult::getNum));
insProduct.setInsProductResult(insProductResult);
}
- BeanUtils.copyProperties(insSample,sampleProductDto);
- sampleProductDto.setInsProduct(insProducts);
+ SampleProductDto dto = new SampleProductDto();
+ dto.setInsProduct(insProducts);
+ BeanUtils.copyProperties(insSample,dto);
+ sampleProductDto=dto;
}
List<Integer> ids = sampleProductDto.getInsProduct().stream().map(InsProduct::getId).collect(Collectors.toList());
List<InsProductUser> insProductUsers = insProductUserMapper.selectList(Wrappers.<InsProductUser>lambdaQuery()
--
Gitblit v1.9.3