From 44f4c17ed71ccaf151d600836f7ef32a8c2dbaea Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 25 四月 2024 16:46:50 +0800
Subject: [PATCH] 完善报告；完善检验对象内容
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java | 6 +-
inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTemplateController.java | 1
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsSample.java | 5 --
cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureTestObject.java | 13 ++++++
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java | 30 ++++++++++++++-
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsReportServiceImpl.java | 27 ++++++++++---
user-server/src/main/java/com/yuanchu/mom/pojo/Enums.java | 2
user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java | 2
inspect-server/src/main/java/com/yuanchu/mom/service/InsReportService.java | 3 +
9 files changed, 69 insertions(+), 20 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureTestObject.java b/cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureTestObject.java
index e5cbc2d..c85ec7c 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureTestObject.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureTestObject.java
@@ -25,9 +25,20 @@
private Integer id;
@ValueTableShow(1)
- @ApiModelProperty(value = "鏍峰搧鍚嶇О")
+ @ApiModelProperty(value = "鍦烘墍")
+ private Integer laboratory;
+
+ @TableField(exist = false)
+ private Integer laboratory_id;
+
+ @ValueTableShow(1)
+ @ApiModelProperty(value = "妫�楠屽璞�")
private String specimenName;
+ @ValueTableShow(2)
+ @ApiModelProperty(value = "瀵硅薄浠ｅ彿")
+ private String code;
+
@ApiModelProperty(value = "鍒涘缓浜篿d")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTemplateController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTemplateController.java
index 34c02e9..655e5f0 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTemplateController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTemplateController.java
@@ -7,6 +7,7 @@
import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java
index 9950112..d6fcac0 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java
@@ -34,12 +34,18 @@
@Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
private String entrustCode;
+ @ValueTableShow(2)
+ @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+ @ApiModelProperty(value = "妫�楠岀被鍒�")
+ @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+ private String orderType;
+
/**
* 涓嬪崟瀹㈡埛
*/
@ValueTableShow(3)
@Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- @ApiModelProperty("涓嬪崟瀹㈡埛")
+ @ApiModelProperty("濮旀墭瀹㈡埛")
@Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
private String custom;
@@ -48,9 +54,15 @@
*/
@ValueTableShow(4)
@Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- @ApiModelProperty("涓嬪崟鍗曚綅")
+ @ApiModelProperty("濮旀墭鍗曚綅")
@Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
private String company;
+
+ @ValueTableShow(4)
+ @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+ @ApiModelProperty("鑱旂郴鏂瑰紡")
+ @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+ private String phone;
/**
* 宸ュ巶鍩�
@@ -79,6 +91,14 @@
// @ValueTableShow(7)
@ApiModelProperty("妫�楠岀粨鏋�")
private Integer insResult;
+
+ @ValueTableShow(7)
+ @ApiModelProperty("鏍峰搧澶勭悊鏂瑰紡")
+ private Integer processing;
+
+ @ValueTableShow(7)
+ @ApiModelProperty("鏄惁鐣欐牱")
+ private Integer isLeave;
/**
* 1锛氭楠屽鐞� 0锛氬緟瀹℃牳 2锛氶��鍥� 3锛氭挙閿�
@@ -171,4 +191,10 @@
@ValueTableShow(value = 14, name = "閫�鍥炵悊鐢�")
private String tell;
+ @ValueTableShow(value = 15, name = "鎶ュ憡鍙戦�佹柟寮�")
+ private Integer send;
+
+ @ValueTableShow(value = 16, name = "鏉ユ牱鏂瑰紡")
+ private String formType;
+
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsSample.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsSample.java
index f7e03b2..313d54c 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsSample.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsSample.java
@@ -80,11 +80,6 @@
private String model;
/**
- * 鏄惁鐣欐牱 1锛氱暀鏍� 0锛氫笉鐣欐牱
- */
- private Integer isLeave;
-
- /**
* 妫�楠岀姸鎬�(0锛氬緟妫�楠�1:妫�楠屼腑 2:宸叉楠�3锛氬緟澶嶆牳4锛氬鏍告湭閫氳繃5锛氬鏍搁�氳繃)
*/
private Integer insState;
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/InsReportService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/InsReportService.java
index 77fdf99..2f81dca 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/InsReportService.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/InsReportService.java
@@ -1,7 +1,6 @@
package com.yuanchu.mom.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yuanchu.mom.dto.InsOrderPlanDTO;
import com.yuanchu.mom.dto.ReportPageDto;
import com.yuanchu.mom.pojo.InsReport;
import com.baomidou.mybatisplus.extension.service.IService;
@@ -19,6 +18,8 @@
String wordToHtml(String path);
+ void wordToPdf(String path);
+
int inReport(String url, Integer id);
int upReportUrl(Integer id);
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsReportServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsReportServiceImpl.java
index 7e38126..2392e16 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsReportServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsReportServiceImpl.java
@@ -1,6 +1,5 @@
package com.yuanchu.mom.service.impl;
-import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -11,9 +10,7 @@
import com.spire.doc.FileFormat;
import com.yuanchu.mom.common.GetLook;
import com.yuanchu.mom.common.PrintChina;
-import com.yuanchu.mom.dto.InsOrderPlanDTO;
import com.yuanchu.mom.dto.ReportPageDto;
-import com.yuanchu.mom.dto.SampleOrderDto;
import com.yuanchu.mom.exception.ErrorException;
import com.yuanchu.mom.mapper.InsOrderMapper;
import com.yuanchu.mom.mapper.UserMapper;
@@ -22,21 +19,19 @@
import com.yuanchu.mom.service.InsReportService;
import com.yuanchu.mom.mapper.InsReportMapper;
import com.yuanchu.mom.utils.QueryWrappers;
-import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.io.ByteArrayOutputStream;
-import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
import java.util.HashMap;
import java.util.Map;
+import java.util.concurrent.CompletableFuture;
/**
* @author Administrator
@@ -172,6 +167,7 @@
wordInsertUrl(new HashMap<String, Object>(){{
put("ratifyUrl", Pictures.ofLocal(imgUrl+"/"+signatureUrl).create());
}}, (urlS==null?url:urlS).replace("/word", wordUrl));
+ wordToPdf((urlS == null ? url : urlS).replace("/word", wordUrl));
InsOrder insOrder = new InsOrder();
insOrder.setId(insReportMapper.selectById(id).getInsOrderId());
insOrder.setState(4);
@@ -189,6 +185,25 @@
}
return 1;
}
+
+ @Override
+ public void wordToPdf(String path) {
+ CompletableFuture.supplyAsync(() -> {
+ try(ByteArrayOutputStream outputStream = new ByteArrayOutputStream()) {
+ Document document = new Document();
+ document.loadFromFile(path);
+ document.saveToFile(path.replace(".docx", ".pdf"), FileFormat.PDF);
+ System.out.println(path.replace(".docx", ".pdf"));
+ return null;
+ } catch (Exception e) {
+ throw new ErrorException("杞崲澶辫触");
+ }
+ }).thenAccept(res -> {
+ }).exceptionally(e -> {
+ e.printStackTrace();
+ return null;
+ });
+ }
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java
index 61026bf..f61fa52 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java
@@ -73,7 +73,7 @@
standardProductList.setSample(standardTree.getSample());
standardProductList.setModel(standardTree.getModel());
standardProductList.setStandardMethodListId(standardMethod.getId());
- standardProductList.setState(1);
+ standardProductList.setState(0);
standardProductList.setId(null);
standardProductList.setCreateUser(null);
standardProductList.setCreateTime(null);
@@ -207,7 +207,7 @@
pl2.setSample(tree.getSample());
pl2.setModel(tree.getModel());
pl2.setStandardMethodListId(sl1.getId());
- pl2.setState(1);
+ pl2.setState(0);
pl2.setId(null);
pl2.setCreateUser(null);
pl2.setCreateTime(null);
@@ -241,7 +241,7 @@
standardProductList.setSample(tree.getSample());
standardProductList.setModel(tree.getModel());
standardProductList.setStandardMethodListId(sl2.getId());
- standardProductList.setState(1);
+ standardProductList.setState(0);
standardProductList.setId(null);
standardProductList.setCreateUser(null);
standardProductList.setCreateTime(null);
diff --git a/user-server/src/main/java/com/yuanchu/mom/pojo/Enums.java b/user-server/src/main/java/com/yuanchu/mom/pojo/Enums.java
index 8b89147..5e97d2b 100644
--- a/user-server/src/main/java/com/yuanchu/mom/pojo/Enums.java
+++ b/user-server/src/main/java/com/yuanchu/mom/pojo/Enums.java
@@ -45,7 +45,7 @@
@ValueTableShow(3)
@ApiModelProperty(value = "浼樺厛绾�")
- private Integer orderNum;
+ private Double orderNum;
/**
* 绫诲瀷
diff --git a/user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java b/user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java
index d5698c6..351cd81 100644
--- a/user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java
+++ b/user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java
@@ -94,7 +94,7 @@
@Override
public User getUserNow() {
Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId(null);
- return userMapper.selectOne(Wrappers.<User>lambdaQuery().eq(User::getId, map1.get("userId")).eq(User::getIsCustom, 1).select(User::getId, User::getCompany, User::getName, User::getCode));
+ return userMapper.selectOne(Wrappers.<User>lambdaQuery().eq(User::getId, map1.get("userId")).eq(User::getIsCustom, 1).select(User::getId, User::getCompany, User::getName, User::getCode, User::getPhone));
}
@Override
--
Gitblit v1.9.3