From 0644a19b927f4cd40ce45552b01064bb9b6521ad Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 31 十月 2024 13:53:22 +0800
Subject: [PATCH] 培训后优化
---
inspect-server/src/main/java/com/yuanchu/mom/dto/SampleProductDto3.java | 2 +-
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsProductServiceImpl.java | 10 +++++++---
inspect-server/src/main/resources/mapper/InsSampleMapper.xml | 3 +++
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 16 ++++++++--------
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java | 15 +++------------
5 files changed, 22 insertions(+), 24 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleProductDto3.java b/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleProductDto3.java
index 2ab55b7..485efe4 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleProductDto3.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleProductDto3.java
@@ -23,5 +23,5 @@
private Integer isLeave;
private LocalDate issueTime;
-
+ private String issueName;
}
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 697c993..233bcb5 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
@@ -1112,8 +1112,8 @@
info.setViewStatus(false);
info.setJumpPath("b1-inspect-order-plan");
informationNotificationService.addInformationNotification(info);
- //todo 浼佷笟寰俊娑堟伅鎺ㄩ�丂zss
- HashMap<String, Object> map = new HashMap<>();
+ // todo 浼佷笟寰俊娑堟伅鎺ㄩ�丂zss
+ /*HashMap<String, Object> map = new HashMap<>();
String account = userMapper.selectById(userId).getAccount();
map.put("touser", account);//鎺ユ敹娑堟伅鎴愬憳鐨勮处鍙�'ZT-031292'杩欑绫诲瀷(濡傛灉鏈夊涓敤'|'鍒嗛殧)
map.put("toparty", "");//鎺ユ敹閮ㄩ棬id
@@ -1126,7 +1126,7 @@
map.put("safe", 0);//鏄惁淇濆瘑娑堟伅.0鍚�
map.put("enable_id_trans", 0);//鏄惁寮�鍚痠d杞瘧.0鍚�
map.put("enable_duplicate_check", 0);//鏄惁寮�鍚噸澶嶆秷鎭鏌�.0鍚�
- qywxApi.send(map);
+ qywxApi.send(map);*/
// }
//澶嶆牳浜�--妫�楠屽崟鐩稿叧璐熻矗浜�
InsSampleUser insSampleUser = new InsSampleUser();
@@ -1139,11 +1139,11 @@
if (submitPlanDto.getLaboratory().equals("鐢佃矾璇曢獙")) {
wordUtils.generateWord(submitPlanDto.getTerm(), orderState);
//todo 鐢佃矾绔欑偣鎶ュ憡 姝ｅ紡搴撻儴缃叉斁寮�
-// try {
-// wordUtils.generateWord(submitPlanDto.getTerm(), orderState);
-// } catch (Exception e) {
-// throw new ErrorException("鐢佃矾璇曢獙鐨勭珯鐐规姤鍛婄敓鎴愭湁璇�,璇疯仈绯诲紑鍙戜汉鍛樿皟鏁�!");
-// }
+ /*try {
+ wordUtils.generateWord(submitPlanDto.getTerm(), orderState);
+ } catch (Exception e) {
+ throw new ErrorException("鐢佃矾璇曢獙鐨勭珯鐐规姤鍛婄敓鎴愭湁璇�,璇疯仈绯诲紑鍙戜汉鍛樿皟鏁�!");
+ }*/
}
/*// 鍒犻櫎鏁伴噰閲囬泦娆℃暟
String key = "frequency" + ":" + submitPlanDto.getEntrustCode() + ":*";
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 ab6fc59..0a7fe10 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
@@ -329,8 +329,8 @@
//瀹℃牳閫氳繃鎵嶄細鐢熸垚濮旀墭缂栧彿
insOrder.setEntrustCode(giveCode.giveCode2("WT-", "ins_order", "-", "yyMMdd"));
insOrder.setSendTime(LocalDateTime.now());
- /*todo 鏍规嵁璁㈠崟绫诲瀷鍒ゆ柇鏄惁闇�瑕佹帹閫佷紒涓氬井淇� @zss*/
- if (!order.getFormType().equals("鍏朵粬鎴愬搧")) {
+ //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'杩欑绫诲瀷(濡傛灉鏈夊涓敤'|'鍒嗛殧)
@@ -343,7 +343,7 @@
map.put("enable_id_trans", 0);//鏄惁寮�鍚痠d杞瘧.0鍚�
map.put("enable_duplicate_check", 0);//鏄惁寮�鍚噸澶嶆秷鎭鏌�.0鍚�
qywxApi.send(map);
- }
+ }*/
}
return insOrderMapper.updateById(insOrder);
}
@@ -528,15 +528,6 @@
public List<SampleProductDto3> labelPrinting(String ids) {
List<Integer> list = Arrays.stream(ids.split(",")).map(Integer::parseInt).collect(Collectors.toList());
List<SampleProductDto3> sampleProductDtos = insSampleMapper.selectSampleProductListByOrderId3(list);
- Set<String> processedCodes = new HashSet<>();
- /* List<SampleProductDto3> sampleProductDto3s = sampleProductDtos.stream().filter(sampleProductDto3 -> {
- if (processedCodes.contains(sampleProductDto3.getCode())) {
- return false;
- } else {
- processedCodes.add(sampleProductDto3.getCode());
- return true;
- }
- }).collect(Collectors.toList());*/
return sampleProductDtos;
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsProductServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsProductServiceImpl.java
index 8f6d417..26770d2 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsProductServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsProductServiceImpl.java
@@ -41,11 +41,15 @@
@Override
public int updateInspected(Integer id, String ids) {
- InsOrder insOrder = new InsOrder();
- insOrder.setId(id);
+ InsOrder insOrder = insOrderMapper.selectById(id);
insOrder.setIsRevocation(1);//闇�瑕佸鏍�
insOrder.setRevocationInsProductIds(ids);
- return insOrderMapper.updateById(insOrder);
+ insOrderMapper.updateById(insOrder);
+ //濡傛灉鏄唴閮ㄥ崟鏃犻渶瀹℃牳鎾ら攢
+ if (insOrder.getOrderType().equals("C")) {
+ checkUpdate(id, 1);
+ }
+ return 1;
}
@Override
diff --git a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
index a52c2d0..3aceb0e 100644
--- a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
@@ -538,10 +538,12 @@
ip.model ip_model,
ip.state,
io.issue_time,
+ u.name issueName,
ins_sample_id
from ins_sample isa
left join ins_product ip on isa.id = ip.ins_sample_id
left join ins_order io on io.id = ins_order_id
+ left join user u on io.issue_user = u.id
where ip.state = 1
and ins_order_id in
<foreach collection="ids" open="(" close=")" item="id" separator=",">
@@ -854,6 +856,7 @@
<result property="joinNum" column="join_num" jdbcType="INTEGER"/>
<result property="remark" column="remark" jdbcType="VARCHAR"/>
<result property="issueTime" column="issue_time" />
+ <result property="issueName" column="issueName" />
<result property="createUser" column="create_user" jdbcType="INTEGER"/>
<result property="updateUser" column="update_user" jdbcType="INTEGER"/>
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
--
Gitblit v1.9.3