From 143982ce873b4e868d52cb5315f939386c0fb22c Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期六, 06 四月 2024 13:08:29 +0800
Subject: [PATCH] 新增样品管理文件，完成仓库新增和查询
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 114 ++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 88 insertions(+), 26 deletions(-)
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 4c1ad61..b370cb7 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
@@ -10,21 +10,34 @@
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.deepoove.poi.XWPFTemplate;
+import com.deepoove.poi.config.Configure;
+import com.deepoove.poi.config.ConfigureBuilder;
import com.yuanchu.mom.common.GetLook;
import com.yuanchu.mom.common.PrintChina;
import com.yuanchu.mom.dto.InsOrderPlanDTO;
import com.yuanchu.mom.dto.SampleProductDto;
+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.InsOrderService;
import com.yuanchu.mom.service.StandardTemplateService;
+import com.yuanchu.mom.utils.GiveCode;
import com.yuanchu.mom.utils.QueryWrappers;
import com.yuanchu.mom.vo.InsOrderPlanVO;
import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ResourceUtils;
+import javax.annotation.Resource;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.stream.Collectors;
@@ -32,24 +45,34 @@
* 妫�楠屼换鍔�-涓氬姟瀹炵幇灞�
*/
@Service
-@AllArgsConstructor
+//@AllArgsConstructor
public class InsOrderPlanServiceImpl extends ServiceImpl<InsOrderMapper, InsOrder> implements InsOrderPlanService {
+ @Resource
private InsSampleMapper insSampleMapper;
-
+ @Resource
private InsSampleUserMapper insSampleUserMapper;
-
+ @Resource
private GetLook getLook;
-
+ @Resource
private InsOrderMapper insOrderMapper;
-
+ @Resource
private InsOrderService insOrderService;
-
+ @Resource
private StandardTemplateService standardTemplateService;
-
+ @Resource
private InsOrderStateMapper insOrderStateMapper;
-
+ @Resource
private InsProductMapper insProductMapper;
+
+ @Value("${wordUrl}")
+ private String wordUrl;
+
+ @Resource
+ private GiveCode giveCode;
+
+ @Resource
+ private InsReportMapper insReportMapper;
@Override
public Map<String, Object> selectInsOrderPlanList(Page page, InsOrderPlanDTO insOrderPlanDTO) {
@@ -57,7 +80,7 @@
map.put("head", PrintChina.printChina(InsOrderPlanVO.class));
Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId(null);
Integer userId = map1.get("userId");
- if(ObjectUtil.isNotEmpty(insOrderPlanDTO.getUserId())){
+ if (ObjectUtil.isNotEmpty(insOrderPlanDTO.getUserId())) {
insOrderPlanDTO.setUserId(userId.longValue());
}
IPage<InsOrderPlanVO> insOrderPage = insSampleMapper.findInsSampleAndOrder(page, QueryWrappers.queryWrappers(insOrderPlanDTO), userId);
@@ -67,13 +90,13 @@
@Override
public boolean claimInsOrderPlan(InsOrderPlanDTO entity) {
- if(Objects.isNull(entity)){
+ if (Objects.isNull(entity)) {
return false;
}
Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId(null);
Integer userId = map1.get("userId");
InsSampleUser insSampleUser = new InsSampleUser(entity.getInsSampleId().intValue(), userId, 1);
- return insSampleUserMapper.insert(insSampleUser)>0;
+ return insSampleUserMapper.insert(insSampleUser) > 0;
}
@Override
@@ -82,7 +105,7 @@
insOrder.setId(id);
insOrder.setInsState(1);
InsOrder order = insOrderMapper.selectById(id);
- if(BeanUtil.isEmpty(order.getInsTime())){
+ if (BeanUtil.isEmpty(order.getInsTime())) {
insOrder.setInsTime(LocalDateTime.now());
insOrderMapper.updateById(insOrder);
}
@@ -94,11 +117,15 @@
for (SampleProductDto samples : list) {
if (BeanUtil.isEmpty(samples.getInsProduct())) continue;
for (InsProduct product : samples.getInsProduct()) {
- if(set.add(product.getTemplateId())){
+ if (product.getTemplateId() == null) {
+ product.setTemplate(new ArrayList<>());
+ continue;
+ }
+ if (set.add(product.getTemplateId())) {
map2.put(product.getTemplateId(), standardTemplateService.getStandTempThingById(product.getTemplateId()) + "");
}
String thing = map2.get(product.getTemplateId());
- if (StrUtil.isNotEmpty(thing)){
+ if (StrUtil.isNotEmpty(thing)) {
JSONObject sheet = JSON.parseObject(JSON.toJSONString(JSON.parseArray(JSON.toJSONString(JSON.parseObject(thing).get("data"))).get(0)));
JSONObject config = JSON.parseObject(JSON.toJSONString(sheet.get("config")));
List<JSONObject> cellData = JSON.parseArray(JSON.toJSONString(sheet.get("celldata")), JSONObject.class);
@@ -108,22 +135,22 @@
style.put("rowlen", config.get("rowlen"));
style.put("columnlen", config.get("columnlen"));
int r = -1;
- if (BeanUtil.isNotEmpty(cellData)){
+ if (BeanUtil.isNotEmpty(cellData)) {
for (JSONObject o : cellData) {
JSONObject v = JSON.parseObject(JSON.toJSONString(o.get("v")));
- if(BeanUtil.isNotEmpty(v.get("ps"))){
+ if (BeanUtil.isNotEmpty(v.get("ps"))) {
JSONObject ps = JSON.parseObject(JSON.toJSONString(v.get("ps")));
- if (ps.get("value").equals("妫�楠岄」") && v.get("v").equals(product.getInspectionItem())){
+ if (ps.get("value").equals("妫�楠岄」") && v.get("v").equals(product.getInspectionItem())) {
tableData.add(o);
- r = Integer.parseInt(o.get("r")+"");
+ r = Integer.parseInt(o.get("r") + "");
continue;
}
}
- if(tableData.size()>0){
- if(Integer.parseInt(o.get("r")+"") == r + 1 || Integer.parseInt(o.get("r")+"") == r){
- r = Integer.parseInt(o.get("r")+"");
+ if (tableData.size() > 0) {
+ if (Integer.parseInt(o.get("r") + "") == r + 1 || Integer.parseInt(o.get("r") + "") == r) {
+ r = Integer.parseInt(o.get("r") + "");
tableData.add(o);
- }else{
+ } else {
break;
}
}
@@ -148,17 +175,52 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public int verifyPlan(Integer orderId, String laboratory, Integer type, String tell) {
- Integer num = (type==1?5:4);
- return insOrderStateMapper.update(null, Wrappers.<InsOrderState>lambdaUpdate().eq(InsOrderState::getInsOrderId, orderId).eq(InsOrderState::getLaboratory, laboratory).set(InsOrderState::getInsTime, LocalDateTime.now()).set(InsOrderState::getInsState, num).set(InsOrderState::getVerifyTell, tell));
+ Integer num = (type == 1 ? 5 : 4);
+ insOrderStateMapper.update(null, Wrappers.<InsOrderState>lambdaUpdate().eq(InsOrderState::getInsOrderId, orderId).eq(InsOrderState::getLaboratory, laboratory).set(InsOrderState::getInsTime, LocalDateTime.now()).set(InsOrderState::getInsState, num).set(InsOrderState::getVerifyTell, tell).set(InsOrderState::getVerifyUser, getLook.selectPowerByMethodAndUserId(null).get("userId")));
+ List<InsOrderState> insOrderStates = insOrderStateMapper.selectList(Wrappers.<InsOrderState>lambdaQuery().eq(InsOrderState::getInsOrderId, orderId));
+ long count = insOrderStates.stream().filter(a -> a.getInsState() == 5).count();
+ if (count == insOrderStates.size() && num == 5) {
+ InsOrder insOrder = insOrderMapper.selectById(orderId);
+ Map<String, String> user = insProductMapper.selectUserById(insOrder.getUserId());
+ List<SampleProductDto> samples = insSampleMapper.selectSampleProductListByOrderId(orderId);
+ samples.forEach(System.out::println);
+ InsReport insReport = new InsReport();
+ insReport.setCode(giveCode.giveCode("JCZX/TX-", "ins_report", "-", "yyMMdd"));
+ insReport.setInsOrderId(orderId);
+ String url;
+ try {
+ url = ResourceUtils.getURL("classpath:static/report-template.docx").getPath();
+ } catch (FileNotFoundException e) {
+ throw new ErrorException("鎵句笉鍒版ā鏉挎枃浠�");
+ }
+ XWPFTemplate template = XWPFTemplate.compile(url).render(
+ new HashMap<String, Object>() {{
+ put("order", insOrder);
+ put("report", insReport);
+ put("user", user);
+ put("samples", samples);
+ put("sampleSize", samples.size() + samples.get(0).getUnit());
+ }});
+ try {
+ String name = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yy_MM_dd_HH_mm_ss")) + ".docx";
+ template.writeAndClose(new FileOutputStream(wordUrl + "/" + name));
+ insReport.setUrl("/word/"+ name);
+ insReportMapper.insert(insReport);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ return 1;
}
@Override
public int submitPlan(Integer orderId, String laboratory) {
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<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::getSonLaboratory, laboratory).isNotNull(InsProduct::getInsResult));
- if(insProducts.size()==0){
+ if (insProducts.size() == 0) {
return 0;
}
insOrderStateMapper.update(null, Wrappers.<InsOrderState>lambdaUpdate().eq(InsOrderState::getInsOrderId, orderId).eq(InsOrderState::getLaboratory, laboratory).set(InsOrderState::getInsTime, LocalDateTime.now()).set(InsOrderState::getInsState, 3));
--
Gitblit v1.9.3