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 = "创建人id") @TableField(fill = FieldFill.INSERT) private Integer createUser; 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.*; 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; } 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; 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); 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; }); } }
@@ -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); 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; /** * 类型 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
