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/service/impl/InsOrderServiceImpl.java | 78 +++++++++++++++++++++++---------------
1 files changed, 47 insertions(+), 31 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 e1d1bc2..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
@@ -40,6 +40,8 @@
import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.io.IOException;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.net.URLEncoder;
import java.time.LocalDate;
import java.time.LocalDateTime;
@@ -73,6 +75,10 @@
private InsOrderFileMapper insOrderFileMapper;
@Resource
private InsSampleMapper insSampleMapper;
+ @Resource
+ InsProductResult2Mapper insProductResult2Mapper;
+ @Resource
+ InsProductResultMapper insProductResultMapper;
@Resource
private WarehouseHistoryMapper warehouseHistoryMapper;
@Resource
@@ -247,7 +253,7 @@
}
//濡傛灉鏈変笂浼犵殑闄勪欢
if (CollectionUtils.isNotEmpty(files)) {
- for (MultipartFile file : files ) {
+ for (MultipartFile file : files) {
String urlString;
String pathName;
String path;
@@ -322,27 +328,22 @@
if (insOrder.getState() == 1) {
//瀹℃牳閫氳繃鎵嶄細鐢熸垚濮旀墭缂栧彿
insOrder.setEntrustCode(giveCode.giveCode2("WT-", "ins_order", "-", "yyMMdd"));
- //纭畾璁㈠崟鐨勪笅鍙戞椂闂村拰绾﹀畾鏃堕棿
- //int day = insProductService.selectOrderManDay(insOrder.getId());//棰勮瀹屾垚鏃堕棿
- //insOrder.setAppointed(LocalDate.parse(LocalDateTime.now().plusHours(day).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))));
insOrder.setSendTime(LocalDateTime.now());
- /*todo 鏍规嵁璁㈠崟绫诲瀷鍒ゆ柇鏄惁闇�瑕佹帹閫佷紒涓氬井淇� @zss*/
- if (!order.getFormType().equals("鍏朵粬鎴愬搧")) {
- /* HashMap<String, Object> map = new HashMap<>();
+ //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("toparty", "");//鎺ユ敹閮ㄩ棬id
- map.put("totag", "");//娑堟伅鏍囩id
map.put("msgtype", "text");//娑堟伅绫诲瀷 text:鏂囨湰
- map.put("agentid", 1000513);//搴旂敤id
+ map.put("agentid", 1000517);//搴旂敤id
HashMap<String, Object> hashMap = new HashMap<>();
- hashMap.put("content", "鎮ㄦ湁涓�鏉¤鍗曢渶鐢熸垚妫�楠�,璇峰墠寰�LIMS绯荤粺鏌ョ湅銆�<a href=\"http://10.1.13.77/enter\"> </a>");
- map.put("text", JSONArray.toJSONString(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);*/
- }
+ qywxApi.send(map);
+ }*/
}
return insOrderMapper.updateById(insOrder);
}
@@ -373,8 +374,8 @@
}
insOrderMapper.updateById(order);
//鏌ヨ璇ヨ鍗曟槸A绫昏繕鏄疊绫�
- if (order.getOrderType().equals("A")) {
- //濡傛灉鏄疉绫�,1鍜�2鍜�3閮藉鏍搁�氳繃杩欎釜鍗曞瓙灏卞鏍搁�氳繃
+ if (order.getOrderType().equals("B")) {
+ //濡傛灉鏄疊绫�,1鍜�2鍜�3閮藉鏍搁�氳繃杩欎釜鍗曞瓙灏卞鏍搁�氳繃
if (order.getCheckState1() == 1 && order.getCheckState2() == 1 && order.getCheckState3() == 1) {
order.setState(1);
upInsOrderOfState(order);
@@ -382,8 +383,8 @@
order.setState(2);
upInsOrderOfState(order);
}
- } else if (order.getOrderType().equals("B")) {
- //濡傛灉鏄疊绫�,1鍜�2瀹℃牳閫氳繃鍚庤繖涓崟瀛愬氨瀹℃牳閫氳繃
+ } else if (order.getOrderType().equals("A")) {
+ //濡傛灉鏄疉绫�,1鍜�2瀹℃牳閫氳繃鍚庤繖涓崟瀛愬氨瀹℃牳閫氳繃
if (order.getCheckState1() == 1 && order.getCheckState2() == 1) {
order.setState(1);
upInsOrderOfState(order);
@@ -399,9 +400,31 @@
public Map<String, Object> getInsOrderAndSample(Integer id, String laboratory) {
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);
- if (list.size() == 0) {
- list = insSampleMapper.getInsOrderAndSample2(id, 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);
+ }
+
}
for (SampleProductDto sampleProductDto : list) {
List<Integer> ids = sampleProductDto.getInsProduct().stream().map(InsProduct::getId).collect(Collectors.toList());
@@ -479,7 +502,9 @@
.filter(dto -> dto.getPrice() != null) // 杩囨护鎺変环鏍间负 null 鐨勫璞�
.mapToDouble(value -> value.getPrice().doubleValue() * value.getNum())
.sum();
- map.put("total", totalPrice);
+ BigDecimal bd = new BigDecimal(totalPrice).setScale(2, RoundingMode.HALF_UP);
+ double roundedTotalPrice = bd.doubleValue();
+ map.put("total", roundedTotalPrice);
return map;
}
@@ -503,16 +528,7 @@
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 sampleProductDto3s;
+ return sampleProductDtos;
}
//鏍￠獙鐢垫満缂栧彿
--
Gitblit v1.9.3