From f1ba10159c6872b859e5ab1255ed17ae644d94d7 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 26 十一月 2024 14:34:23 +0800
Subject: [PATCH] 前端联调修改
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java | 607 ++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 531 insertions(+), 76 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 ee5067f..892207d 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
@@ -1,33 +1,54 @@
package com.yuanchu.mom.service.impl;
+import cn.hutool.core.lang.UUID;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
+import com.alibaba.excel.EasyExcel;
+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;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.common.GetLook;
import com.yuanchu.mom.common.PrintChina;
-import com.yuanchu.mom.dto.CostStatisticsDto;
-import com.yuanchu.mom.dto.SampleOrderDto;
-import com.yuanchu.mom.dto.SampleProductDto;
-import com.yuanchu.mom.dto.SampleProductDto2;
+import com.yuanchu.mom.dto.*;
import com.yuanchu.mom.exception.ErrorException;
import com.yuanchu.mom.mapper.*;
import com.yuanchu.mom.pojo.*;
+import com.yuanchu.mom.service.InformationNotificationService;
+import com.yuanchu.mom.service.InsOrderPlanService;
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.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+import javax.annotation.Resource;
+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;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
/**
@@ -36,107 +57,324 @@
* @createDate 2024-03-12 16:17:55
*/
@Service
-@AllArgsConstructor
-public class InsOrderServiceImpl extends ServiceImpl<InsOrderMapper, InsOrder>
- implements InsOrderService {
+@Transactional(rollbackFor = Exception.class)
+public class InsOrderServiceImpl extends ServiceImpl<InsOrderMapper, InsOrder> implements InsOrderService {
+ @Resource
private GetLook getLook;
-
+ @Resource
+ private RoleMapper roleMapper;
+ @Resource
private InsOrderMapper insOrderMapper;
+ @Value("${file.path}")
+ private String imgUrl;
+
+ @Value("${wordUrl}")
+ private String wordUrl;
+ @Resource
+ private InsOrderFileMapper insOrderFileMapper;
+ @Resource
private InsSampleMapper insSampleMapper;
-
+ @Resource
+ InsProductResult2Mapper insProductResult2Mapper;
+ @Resource
+ InsProductResultMapper insProductResultMapper;
+ @Resource
private InsProductMapper insProductMapper;
-
+ @Resource
+ private InsProductUserMapper insProductUserMapper;
+ @Resource
private GiveCode giveCode;
+ @Resource
+ UserMapper userMapper;
+ @Resource
+ InformationNotificationService informationNotificationService;
+ @Resource
+ PowerMapper powerMapper;
+ @Resource
+ CustomMapper customMapper;
+ @Resource
+ QYWXApi qywxApi;
- private InsSampleUserMapper insSampleUserMapper;
-
- private InsOrderStateMapper insOrderStateMapper;
-
-
-
//鑾峰彇妫�楠屼笅鍗曟暟鎹�
@Override
public Map<String, Object> selectInsOrderParameter(IPage<InsOrder> page, SampleOrderDto sampleOrderDto) {
Map<String, Object> map = new HashMap<>();
map.put("head", PrintChina.printChina(SampleOrderDto.class));
+ //鍒ゆ柇鍏ㄩ儴,涓汉,缁勭粐鐨勬潈闄�
Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectInsOrderParameter");
- if (map1.get("look") == 1) sampleOrderDto.setCreateUser(map1.get("userId"));
- map.put("body", insOrderMapper.selectInsOrderPage(page, QueryWrappers.queryWrappers(sampleOrderDto)));
+ User user = userMapper.selectById(map1.get("userId"));//褰撳墠鐧诲綍鐨勪汉
+ Integer roleId = user.getRoleId();
+ String laboratory = null;
+ //鍒ゆ柇鏄惁鏄叏閮ㄦ潈闄�
+ Power power = powerMapper.selectOne(Wrappers.<Power>lambdaQuery().eq(Power::getRoleId, roleId).eq(Power::getMenuMethod, "selectAllInsOrderParameter"));
+ if (ObjectUtils.isEmpty(power)) {
+ if (map1.get("look") == 1) {
+ //涓汉
+ sampleOrderDto.setCreateUser(map1.get("userId"));
+ } else {
+ //缁勭粐
+ try {
+ sampleOrderDto.setCompany(customMapper.selectById(user.getCompany()).getCompany());
+ } catch (NullPointerException e) {
+ throw new ErrorException("鎵句笉鍒版墍灞炲崟浣�");
+ }
+ }
+ }
+ IPage<SampleOrderDto> sampleOrderDtoIPage = insOrderMapper.selectInsOrderPage(page, QueryWrappers.queryWrappers(sampleOrderDto), laboratory);
+ sampleOrderDtoIPage.getRecords().forEach(i -> {
+ if (ObjectUtils.isNotEmpty(i.getSampleCode()) && i.getSampleCode().contains("锛�")) {
+ String[] split = i.getSampleCode().split("锛�");
+ i.setSampleCode(split[0]);
+ }
+ });
+ map.put("body", sampleOrderDtoIPage);
return map;
}
@Override
@Transactional(rollbackFor = Exception.class)
- public int upInsOrder(Integer orderId, Integer sampleId, String appointed, Integer userId) {
- InsOrder insOrder = new InsOrder();
- insOrder.setId(orderId);
- insOrder.setAppointed(LocalDate.parse(appointed));
- insOrder.setSendTime(LocalDateTime.now());
- insOrderMapper.updateById(insOrder);
- List<InsSample> insSamples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getInsOrderId, orderId).select(InsSample::getId));
- List<Integer> ids = insSamples.stream().map(a-> a.getId()).collect(Collectors.toList());
- List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery().in(InsProduct::getInsSampleId, ids).eq(InsProduct::getState, 1).select(InsProduct::getSonLaboratory).groupBy(InsProduct::getSonLaboratory));
- for (InsProduct insProduct : insProducts) {
- InsOrderState insOrderState = new InsOrderState();
- insOrderState.setInsOrderId(orderId);
- try {
- insOrderState.setLaboratory(insProduct.getSonLaboratory());
- }catch (NullPointerException e){
- throw new ErrorException("璇ユ楠屽崟鏈夋湭缁存姢瀹為獙瀹ょ殑妫�楠岄」鐩�");
- }
- insOrderState.setInsState(0);
- insOrderStateMapper.insert(insOrderState);
- }
- if(userId!=null){
- InsSampleUser insSampleUser = new InsSampleUser();
- insSampleUser.setState(0);
- insSampleUser.setUserId(userId);
- insSampleUser.setInsSampleId(orderId);
- insSampleUserMapper.insert(insSampleUser);
- }
- return 1;
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public int addInsOrder(List<SampleProductDto> list, InsOrder insOrder) {
+ public int addInsOrder(List<SampleProductDto> list, InsOrder insOrder, List<List<Integer>> pairing, List<MultipartFile> files) {
insOrder.setState(0);
- String code = insOrderMapper.getLaboratoryCode(insOrder.getLaboratory());
- insOrder.setEntrustCode(giveCode.giveCode("JCZX-" + code + "-", "ins_order", "-", "yyyyMMdd"));
+ //鍒ゆ柇閫夋嫨鐨勫鎵樺崟浣嶄笌鍒跺崟浜虹殑濮旀墭鍗曚綅鏄惁涓�鑷�
+ Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
+ String company = userMapper.selectById(userId).getCompany();
+ if (!company.equals(insOrder.getCompanyId() + "")) {
+ //濡傛灉涓嶄竴鑷撮偅涔堝鎵樹汉瀛楁蹇呭～
+ if (ObjectUtils.isEmpty(insOrder.getPrepareUser())) {
+ throw new ErrorException("濮旀墭浜轰笉鑳戒负绌�");
+ }
+ } else {
+ //濡傛灉涓�鑷�,閭ｄ箞鍒跺崟浜哄氨鏄鎵樹汉
+ insOrder.setPrepareUser(insOrder.getCustom());
+ }
+ //瀹㈡埛浠ｅ彿
+ Custom custom = customMapper.selectById(insOrder.getCompanyId());
+ String code = custom.getCode2();
+ if (!custom.getCompany().equals(insOrder.getCompany())) {
+ Custom one = customMapper.selectOne(Wrappers.<Custom>lambdaQuery().eq(Custom::getCompany, insOrder.getCompany()));
+ insOrder.setCompanyId(one.getId());
+ code = one.getCode2();
+ }
+ //澶栭儴濮旀墭缂栧彿
+ insOrder.setOutEntrustCode(giveCode.giveCode("WT-", "ins_order", "-", "yyMMdd"));
+ String giveCode = this.giveCode.giveCode("JCZX-" + code + "-", "ins_sample", "", "yyMMdd");
insOrderMapper.insert(insOrder);
+ AtomicInteger count = new AtomicInteger();
list.forEach(a -> {
+ count.getAndIncrement();
a.setId(null);
a.setInsOrderId(insOrder.getId());
- if(StrUtil.isEmpty(a.getSampleCode())){
- a.setSampleCode(giveCode.giveCode("", "ins_sample", "", "yyMMdd"));
+ //鏍峰搧缂栧彿
+ if (StrUtil.isEmpty(a.getSampleCode())) {
+ a.setSampleCode("YP-" + a.getModel() + "-" + giveCode.split("-")[2] + "-" + count.get());
}
insSampleMapper.insert(a);
+ //鏍峰搧鐨勬楠岄」鐩�
if (ObjectUtil.isNotEmpty(a.getInsProduct())) {
- for (InsProduct product : a.getInsProduct()) {
- product.setId(null);
- product.setCreateTime(null);
- product.setUpdateTime(null);
- product.setUpdateTime(null);
- product.setUpdateUser(null);
- product.setInsSampleId(a.getId());
- if(product.getInspectionItemSubclass() == null){
- product.setInspectionItemSubclass("");
+ addInsProductMethod(a.getId(), a.getInsProduct());
+ }
+ //鏍峰搧鐨勬楠屾爣鍑�
+ if (ObjectUtil.isNotEmpty(a.getInsulating())) {
+ List<InsProduct> ip2 = new ArrayList<>();
+ for (Integer i = 0; i < a.getInsulating().getNum(); i++) {
+ ip2.addAll(a.getInsulating().getInsProduct());
+ }
+ for (InsProduct product : ip2) {
+ product.setStandardMethodListId(a.getInsulating().getStandardMethodListId());
+ }
+ addInsProductMethod(a.getId(), ip2);
+ }
+ //鏍峰搧鐨勬楠屾爣鍑�
+ if (ObjectUtil.isNotEmpty(a.getSheath())) {
+ for (InsProduct product : a.getSheath().getInsProduct()) {
+ product.setStandardMethodListId(a.getSheath().getStandardMethodListId());
+ }
+ addInsProductMethod(a.getId(), a.getSheath().getInsProduct());
+ }
+ //瀛愭牱鍝侀厤缃�
+ if (ObjectUtil.isNotEmpty(a.getChildSampleList())) {
+ for (SampleProductDto b : a.getChildSampleList()) {
+ for (int i = 0; i < b.getNum(); i++) {
+ b.setId(null);
+ b.setInsOrderId(insOrder.getId());
+ b.setParentId(a.getId());
+ if (StrUtil.isEmpty(b.getSampleCode())) {
+ b.setSampleCode(this.giveCode.giveCode("", "ins_sample", "", "yyMMdd"));
+ }
+ insSampleMapper.insert(b);
+ if (ObjectUtil.isNotEmpty(b.getInsProduct())) {
+ addInsProductMethod(b.getId(), b.getInsProduct());
+ }
}
- insProductMapper.insert(product);
}
}
+
});
+ 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() + ",璇峰墠寰�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());
+ info.setSenderId(userId);
+ info.setViewStatus(false);
+ info.setJumpPath("b1-inspect-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() + ",璇峰墠寰�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());
+ info.setSenderId(userId);
+ info.setViewStatus(false);
+ info.setJumpPath("b1-inspect-order");
+ info.setConsigneeId(user.getId());
+ notificationArrayList.add(info);
+ }
+ informationNotificationService.saveBatch(notificationArrayList);
+ }
+ //濡傛灉鏈変笂浼犵殑闄勪欢
+ if (CollectionUtils.isNotEmpty(files)) {
+ for (MultipartFile file : files) {
+ String urlString;
+ String pathName;
+ String path;
+ String filename = file.getOriginalFilename();
+ String contentType = file.getContentType();
+ InsOrderFile insOrderFile = new InsOrderFile();
+ insOrderFile.setInsOrderId(insOrder.getId());
+ insOrderFile.setFileName(filename);
+ if (contentType != null && contentType.startsWith("image/")) {
+ // 鏄浘鐗�
+ path = imgUrl;
+ insOrderFile.setType(1);
+ } else {
+ // 鏄枃浠�
+ path = wordUrl;
+ insOrderFile.setType(2);
+ }
+ try {
+ File realpath = new File(path);
+ if (!realpath.exists()) {
+ realpath.mkdirs();
+ }
+ pathName = UUID.randomUUID() + "_" + file.getOriginalFilename().replace("#", "&");
+ urlString = realpath + "/" + pathName;
+ file.transferTo(new File(urlString));
+ insOrderFile.setFileUrl(pathName);
+ insOrderFileMapper.insert(insOrderFile);
+ } catch (Exception e) {
+ e.printStackTrace();
+ 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() + ",璇峰墠寰�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() + ",璇峰墠寰�LIMS绯荤粺鏌ョ湅銆�");
+ info.setSenderId(userId);
+ info.setConsigneeId(insOrder.getIssueUser());
+ info.setViewStatus(false);
+ info.setJumpPath("b1-inspect-order");
+ informationNotificationService.addInformationNotification(info);
+ }
return insOrder.getId();
+ }
+
+ private void addInsProductMethod(Integer sampleId, List<InsProduct> productList) {
+ for (InsProduct product : productList) {
+ if (product.getState() == 1) {
+ product.setId(null);
+ product.setCreateTime(null);
+ product.setCreateUser(null);
+ product.setUpdateTime(null);
+ product.setUpdateUser(null);
+ product.setInsSampleId(sampleId);
+ if (product.getInspectionItemSubclass() == null) {
+ product.setInspectionItemSubclass("");
+ }
+ insProductMapper.insert(product);
+ }
+ }
}
@Override
public Map<String, Object> getInsOrder(Integer id) {
Map<String, Object> map = new HashMap<>();
InsOrder insOrder = insOrderMapper.selectById(id);
- List<SampleProductDto> list = insSampleMapper.selectSampleProductListByOrderId(id);
+ List<SampleProductDto> list = insSampleMapper.selectSampleProductListByOrderId2(id);
+ if (list.size() == 0) {
+ list = insSampleMapper.selectSampleProductListByOrder2Id2(id);
+ }
map.put("insOrder", insOrder);
map.put("sampleProduct", list);
return map;
@@ -144,17 +382,103 @@
@Override
public int upInsOrderOfState(InsOrder insOrder) {
+ InsOrder order = insOrderMapper.selectById(insOrder.getId());
+ insOrder.setCompany(order.getCompany());
insOrder.setExamineTime(LocalDateTime.now());
+ if (insOrder.getState() == 1) {
+ //瀹℃牳閫氳繃鎵嶄細鐢熸垚濮旀墭缂栧彿
+ insOrder.setEntrustCode(giveCode.giveCode2("WT-", "ins_order", "-", "yyMMdd"));
+ insOrder.setSendTime(LocalDateTime.now());
+ }
return insOrderMapper.updateById(insOrder);
}
@Override
- public Map<String, Object> getInsOrderAndSample(Integer id, String laboratory) {
+ public int upInsOrderOfState2(InsOrder insOrder) {
+ InsOrder order = insOrderMapper.selectById(insOrder.getId());
+ //鑾峰彇褰撳墠浜�
+ Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
+ //鑾峰彇褰撳墠浜虹殑瑙掕壊
+ String roleName = roleMapper.selectById(userMapper.selectById(userId).getRoleId()).getName();
+ //鍒ゆ柇鏄娴嬩腑蹇冧富浠�/鐮斿彂閮ㄧ粡鐞�/鎶�鏈礋璐ｄ汉
+ switch (roleName) {
+ case "妫�娴嬩腑蹇冧富浠�":
+ order.setCheckState1(insOrder.getState());
+ order.setCheckState1User(userId);
+ break;
+ case "鐮斿彂閮ㄧ粡鐞�":
+ order.setCheckState2(insOrder.getState());
+ order.setCheckState2User(userId);
+ break;
+ case "鎶�鏈礋璐ｄ汉":
+ order.setCheckState3(insOrder.getState());
+ order.setCheckState3User(userId);
+ break;
+ default:
+ throw new ErrorException("褰撳墠鐧诲綍鐢ㄦ埛鐨勮鑹蹭笉鏄娴嬩腑蹇冧富浠�/鐮斿彂閮ㄧ粡鐞�/鎶�鏈礋璐ｄ汉,鏃犳硶杩涜瀹℃牳");
+ }
+ insOrderMapper.updateById(order);
+ //鏌ヨ璇ヨ鍗曟槸A绫昏繕鏄疊绫�
+ if (order.getOrderType().equals("B")) {
+ //濡傛灉鏄疊绫�,1鍜�2鍜�3閮藉鏍搁�氳繃杩欎釜鍗曞瓙灏卞鏍搁�氳繃
+ if (order.getCheckState1() == 1 && order.getCheckState2() == 1 && order.getCheckState3() == 1) {
+ order.setState(1);
+ upInsOrderOfState(order);
+ } else if (order.getCheckState1() == 2 || order.getCheckState2() == 2 || order.getCheckState3() == 2) {
+ order.setState(2);
+ upInsOrderOfState(order);
+ }
+ } else if (order.getOrderType().equals("A")) {
+ //濡傛灉鏄疉绫�,1鍜�2瀹℃牳閫氳繃鍚庤繖涓崟瀛愬氨瀹℃牳閫氳繃
+ if (order.getCheckState1() == 1 && order.getCheckState2() == 1) {
+ order.setState(1);
+ upInsOrderOfState(order);
+ } else if (order.getCheckState1() == 2 || order.getCheckState2() == 2) {
+ order.setState(2);
+ upInsOrderOfState(order);
+ }
+ }
+ return 1;
+ }
+
+ @Override
+ public Map<String, Object> getInsOrderAndSample(Integer sampleId, String laboratory) {
+ InsSample insSample = insSampleMapper.selectById(sampleId);
Map<String, Object> map = new HashMap<>();
- InsOrder insOrder = insOrderMapper.selectById(id);
- List<SampleProductDto> list = insSampleMapper.getInsOrderAndSample(id, laboratory);
+ InsOrder insOrder = insOrderMapper.selectById2(insSample.getInsOrderId());
+ SampleProductDto sampleProductDto = insSampleMapper.getInsOrderAndSample(sampleId, laboratory);
+ //鍐嶆璇曢獙浼氬嚭鐜颁负绌虹殑鎯呭喌
+ 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;
+ }
+ 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(insSample.getInsOrderId(), laboratory);
+ map.put("reportModel", list2);
return map;
}
@@ -162,7 +486,19 @@
public Map<String, Object> selectSampleAndProductByOrderId(IPage<SampleProductDto2> page, SampleProductDto2 sampleProductDto) {
Map<String, Object> map = new HashMap<>();
map.put("head", PrintChina.printChina(SampleProductDto2.class));
- map.put("body", insOrderMapper.selectSampleAndProductByOrderId(page, QueryWrappers.queryWrappers(sampleProductDto)));
+ IPage<SampleProductDto2> productDto2IPage = insOrderMapper.selectSampleAndProductByOrderId(page, QueryWrappers.queryWrappers(sampleProductDto).orderByAsc("inspection_item"), sampleProductDto.getId());
+ for (SampleProductDto2 record : productDto2IPage.getRecords()) {
+ InsProductUser insProductUser = insProductUserMapper.selectOne(Wrappers.<InsProductUser>lambdaQuery()
+ .eq(InsProductUser::getInsProductId, record.getInsProductId())
+ .orderByDesc(InsProductUser::getCreateTime)
+ .last("limit 1"));
+ if (ObjectUtils.isNotEmpty(insProductUser)) {
+ record.setCheckName(userMapper.selectById(insProductUser.getCreateUser()).getName());
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+ record.setCheckTime(insProductUser.getCreateTime().format(formatter));
+ }
+ }
+ map.put("body", productDto2IPage);
return map;
}
@@ -175,9 +511,41 @@
map.put("head", PrintChina.printChina(CostStatisticsDto.class));
Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("costStatistics");
if (map1.get("look") == 1) costStatisticsDto.setCreateUser(map1.get("userId"));
- map.put("body", insOrderMapper.selectCostStatistics(page, QueryWrappers.queryWrappers(costStatisticsDto).ge("create_time", split[0]).le("create_time", split[1]+" 23:59:59")));
+ IPage<CostStatisticsDto> dtoIPage = insOrderMapper.selectCostStatistics(page, QueryWrappers.queryWrappers(costStatisticsDto).ge("create_time", split[0]).le("create_time", split[1] + " 23:59:59"));
+ List<CostStatisticsDto> collect = dtoIPage.getRecords().stream().map(dto -> {
+ Set<String> uniqueTags = new HashSet<>();
+ if (dto.getInspectionItem().contains(",")) {
+ for (String s : dto.getInspectionItem().split(",")) {
+ uniqueTags.add(s.split("@")[0]);
+ }
+ } else {
+ uniqueTags.add(dto.getInspectionItem().split("@")[0]);
+ }
+ dto.setInspectionItem(uniqueTags.toString());
+ return dto;
+ }).collect(Collectors.toList());
+ dtoIPage.setRecords(collect);
+ map.put("body", dtoIPage);
return map;
}
+
+ @Override
+ public Map<String, Object> costStatistics2(CostStatisticsDto costStatisticsDto) {
+ Map<String, Object> map = new HashMap<>();
+ String dates = costStatisticsDto.getDates();
+ String[] split = dates.replaceAll("\\[", "").replaceAll("]", "").replaceAll("\"", "").split(",");
+ costStatisticsDto.setDates(null);
+ List<CostStatisticsDto> costStatisticsDtos = insOrderMapper.selectCostStatistics2(QueryWrappers.queryWrappers(costStatisticsDto).ge("create_time", split[0]).le("create_time", split[1] + " 23:59:59"));
+ double totalPrice = costStatisticsDtos.stream()
+ .filter(dto -> dto.getPrice() != null) // 杩囨护鎺変环鏍间负 null 鐨勫璞�
+ .mapToDouble(value -> value.getPrice().doubleValue() * value.getNum())
+ .sum();
+ BigDecimal bd = new BigDecimal(totalPrice).setScale(2, RoundingMode.HALF_UP);
+ double roundedTotalPrice = bd.doubleValue();
+ map.put("total", roundedTotalPrice);
+ return map;
+ }
+
@Override
public Map<String, Object> selectSampleDefects(Page page, String inspectionItems, String orderNumber) {
List<SampleDefectsFatherVo> sampleDefectsFatherVos = insOrderMapper.selectSampleDefects(page, inspectionItems, orderNumber);
@@ -190,7 +558,94 @@
@Override
public int updateStatus(Integer id) {
- return insOrderMapper.updateStatus(id);
+ return insOrderMapper.updateStatus(id);
+ }
+
+ //鏍囩鎵撳嵃
+ @Override
+ 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);
+ return sampleProductDtos;
+ }
+
+ //鏍￠獙鐢垫満缂栧彿
+ @Override
+ public Map<String, List<InsSample>> checkNumber(String ids) {
+ List<InsSample> samples = new ArrayList<>();
+ List<Integer> list = Arrays.stream(ids.split(",")).map(Integer::parseInt).collect(Collectors.toList());
+ List<InsSample> sampleDtos = insSampleMapper.selectInsSample(list);
+ //鍒ゆ柇鏍峰搧鍨嬪彿鏄惁鏄疊Z
+ for (InsSample sampleDto : sampleDtos) {
+ if (sampleDto.getModel().contains("BZ")) {
+ if (ObjectUtils.isEmpty(sampleDto.getMotorNumber())) {
+ samples.add(sampleDto);
+ }
+ }
+ }
+ if (CollectionUtils.isNotEmpty(samples)) {
+ Map<String, List<InsSample>> collect = samples.stream().collect(Collectors.groupingBy(InsSample::getEntrustCode));
+ return collect;
+ } else return null;
+ }
+
+ @Override
+ public void export(CostStatisticsDto costStatisticsDto, HttpServletResponse response) throws IOException {
+ //鏌ヨ瀵煎嚭鐨勮垂鐢ㄧ粺璁℃暟鎹�
+ String dates = costStatisticsDto.getDates();
+ String[] split = dates.replaceAll("\\[", "").replaceAll("]", "").replaceAll("\"", "").split(",");
+ costStatisticsDto.setDates(null);
+ List<CostStatisticsDto> costStatisticsDtos = insOrderMapper.selectCostStatistics2(QueryWrappers.queryWrappers(costStatisticsDto).ge("create_time", split[0]).le("create_time", split[1] + " 23:59:59"));
+ costStatisticsDtos = costStatisticsDtos.stream().map(dto -> {
+ Set<String> uniqueTags = new HashSet<>();
+ if (dto.getInspectionItem().contains(",")) {
+ for (String s : dto.getInspectionItem().split(",")) {
+ uniqueTags.add(s.split("@")[0]);
+ }
+ } else {
+ uniqueTags.add(dto.getInspectionItem().split("@")[0]);
+ }
+ dto.setInspectionItem(uniqueTags.toString());
+ return dto;
+ }).collect(Collectors.toList());
+
+ response.setContentType("application/vnd.ms-excel");
+ response.setCharacterEncoding("UTF-8");
+ // 杩欓噷URLEncoder.encode鍙互闃叉涓枃涔辩爜 褰撶劧鍜宔asyexcel娌℃湁鍏崇郴
+ String fileName = URLEncoder.encode("鏍峰搧璐圭敤缁熻瀵煎嚭", "UTF-8");
+ response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
+ Map<String, List<CostStatisticsDto>> groupByCompany =
+ costStatisticsDtos.stream().filter(e -> StrUtil.isNotEmpty(e.getCompany()))
+ .collect(Collectors.groupingBy(CostStatisticsDto::getCompany));
+ try {
+ // 鏂板缓ExcelWriter
+ // 鏂板缓ExcelWriter
+ ExcelWriter excelWriter =
+ EasyExcel.write(response.getOutputStream())
+ .registerWriteHandler(new SimpleColumnWidthStyleStrategy(25))
+ .build();
+ for (Map.Entry<String, List<CostStatisticsDto>> companyDataEntry : groupByCompany.entrySet()) {
+ String sheetName = companyDataEntry.getKey();
+ List<CostStatisticsDto> dataList = companyDataEntry.getValue();
+ WriteSheet mainSheet = EasyExcel.writerSheet(sheetName)
+ .head(CostStatisticsDto.class)
+ .registerWriteHandler(new SimpleColumnWidthStyleStrategy(25))
+ .build();
+ excelWriter.write(dataList, mainSheet);
+ }
+ // 鍏抽棴娴�
+ excelWriter.finish();
+ } catch (IOException e) {
+ throw new RuntimeException("瀵煎嚭澶辫触");
+ }
+ }
+
+ @Override
+ public int addNumber(List<InsSample> insSamples) {
+ for (InsSample insSample : insSamples) {
+ insSampleMapper.updateById(insSample);
+ }
+ return 0;
}
}
--
Gitblit v1.9.3