From 0c03b83cc8e26963275d9ef16ea476ecdc035a0d Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期四, 09 五月 2024 13:16:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/resources/mapper/InsSampleMapper.xml | 4 +
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java | 3 +
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 116 ++++++++++++++++++++++++++++++++------
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java | 1
inspect-server/src/main/resources/mapper/InsProductMapper.xml | 2
user-server/src/main/java/com/yuanchu/mom/pojo/User.java | 6 +
inspect-server/src/main/java/com/yuanchu/mom/dto/ReportPageDto.java | 4 -
inspect-server/src/main/java/com/yuanchu/mom/pojo/WarehouseCell.java | 8 +-
framework/src/main/java/com/yuanchu/mom/mybatis_config/MyMetaObjectHandler.java | 4 -
inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java | 2
inspect-server/src/main/resources/mapper/InsOrderMapper.xml | 10 ++-
inspect-server/src/main/java/com/yuanchu/mom/pojo/WarehouseShelf.java | 8 +-
inspect-server/src/main/resources/static/report-template.docx | 0
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProduct.java | 1
cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java | 7 +-
inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderMapper.java | 2
16 files changed, 133 insertions(+), 45 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java b/cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java
index 03d5367..6a2e465 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java
@@ -9,7 +9,6 @@
import java.io.Serializable;
import java.math.BigDecimal;
-import java.time.LocalDate;
import java.time.LocalDateTime;
/**
@@ -26,7 +25,7 @@
@ApiModelProperty(value = "璁惧鍚嶇О")
private String deviceName;
- @ValueTableShow(value = 2, name = "en璁惧鍚嶇О")
+ @ValueTableShow(value = 2, name = "璁惧鍚嶇ОEN")
@ApiModelProperty(value = "en璁惧鍚嶇О")
private String enDeviceName;
@@ -53,7 +52,7 @@
@ValueTableShow(8)
@ApiModelProperty(value = "璐疆鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private String acquisitionDate;
+ private LocalDateTime acquisitionDate;
@ValueTableShow(value = 9, name = "鍚敤鏃ユ湡")
@ApiModelProperty(value = "鍚敤鏃ユ湡")
@@ -97,7 +96,7 @@
private Integer deviceStatus;
@ValueTableShow(20)
- @ApiModelProperty(value = "鏍″噯鍛ㄦ湡锛堟湀锛�")
+ @ApiModelProperty(value = "鏍″噯鍛ㄦ湡(鏈�)")
private String calibrationDate;
@ApiModelProperty(value = "鍥剧墖涓婁紶")
diff --git a/framework/src/main/java/com/yuanchu/mom/mybatis_config/MyMetaObjectHandler.java b/framework/src/main/java/com/yuanchu/mom/mybatis_config/MyMetaObjectHandler.java
index c8d518b..acf9656 100644
--- a/framework/src/main/java/com/yuanchu/mom/mybatis_config/MyMetaObjectHandler.java
+++ b/framework/src/main/java/com/yuanchu/mom/mybatis_config/MyMetaObjectHandler.java
@@ -2,7 +2,6 @@
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
-import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.utils.Jwt;
import com.yuanchu.mom.utils.ServletUtils;
import org.apache.ibatis.reflection.MetaObject;
@@ -10,8 +9,6 @@
import org.springframework.stereotype.Component;
import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.Map;
@Component
public class MyMetaObjectHandler implements MetaObjectHandler {
@@ -37,7 +34,6 @@
try {
userId = Integer.parseInt(JSONUtil.parseObj(jwt.readJWT(ServletUtils.getRequest().getHeader("token")).get("data")).get("id") + "");
}catch (Exception ignored){}
- // update鐨勬椂鍊欎娇鐢紝鏇存柊鐨勬椂鍊欏己鍒惰繘琛屽～鍏�
this.strictUpdateFill(metaObject, "updateTime", LocalDateTime.class, LocalDateTime.now()); // 璧峰鐗堟湰 3.3.0(鎺ㄨ崘)
this.strictUpdateFill(metaObject, "updateUser", Integer.class, userId);
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/dto/ReportPageDto.java b/inspect-server/src/main/java/com/yuanchu/mom/dto/ReportPageDto.java
index 95442d8..2e31328 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/dto/ReportPageDto.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/dto/ReportPageDto.java
@@ -1,19 +1,15 @@
package com.yuanchu.mom.dto;
import com.yuanchu.mom.annotation.ValueTableShow;
-import com.yuanchu.mom.common.OrderBy;
import com.yuanchu.mom.pojo.InsReport;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import org.hibernate.validator.constraints.Length;
-import javax.validation.constraints.Size;
import java.io.Serializable;
@Data
public class ReportPageDto extends InsReport implements Serializable {
- @ValueTableShow(2)
@ApiModelProperty(value = "濮旀墭缂栧彿")
private String entrustCode;
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderMapper.java
index e2df74a..446f7b9 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderMapper.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderMapper.java
@@ -38,6 +38,8 @@
List<SampleDefectsFatherVo> selectSampleDefects(Page page, String inspectionItems, String orderNumber);
Long getCount(String inspectionItems, String orderNumber);
+
+ String getEnumLabelByValue(String value);
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java
index 4e1cbe6..88d97ae 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java
@@ -24,6 +24,8 @@
List<SampleProductDto> selectSampleProductListByOrderId(Integer id);
List<SampleProductDto> getInsOrderAndSample(Integer id, String laboratory);
+
+ String getSampleEn(String sample);
}
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 d6fcac0..7141bcc 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
@@ -196,5 +196,8 @@
@ValueTableShow(value = 16, name = "鏉ユ牱鏂瑰紡")
private String formType;
+ @TableField(exist = false)
+ @ApiModelProperty("瀹℃牳鏃堕棿")
+ private LocalDateTime examineTime;
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProduct.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProduct.java
index d669ecf..cc48233 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProduct.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProduct.java
@@ -145,6 +145,7 @@
/**
* 鏈�缁堝��
*/
+ @TableField("`last_value`")
private String lastValue;
/**
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/WarehouseCell.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/WarehouseCell.java
index f6ffeab..f101bdb 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/WarehouseCell.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/WarehouseCell.java
@@ -1,13 +1,11 @@
package com.yuanchu.mom.pojo;
import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
import java.io.Serializable;
import java.time.LocalDateTime;
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
/**
* 璐ф灦鍗曞厓鏍�
@@ -25,11 +23,13 @@
/**
* 琛�
*/
+ @TableField("`row`")
private Integer row;
/**
* 鍒�
*/
+ @TableField("`col`")
private Integer col;
/**
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/WarehouseShelf.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/WarehouseShelf.java
index 426cb92..15f5597 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/WarehouseShelf.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/WarehouseShelf.java
@@ -1,13 +1,11 @@
package com.yuanchu.mom.pojo;
import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
import java.io.Serializable;
import java.time.LocalDateTime;
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
/**
* 璐ф灦
@@ -30,11 +28,13 @@
/**
* 琛�
*/
+ @TableField("`row`")
private Integer row;
/**
* 鍒�
*/
+ @TableField("`col`")
private Integer col;
/**
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 fb20396..e2b7560 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
@@ -6,7 +6,6 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -15,16 +14,18 @@
import com.deepoove.poi.config.Configure;
import com.deepoove.poi.config.ConfigureBuilder;
import com.deepoove.poi.data.*;
+import com.deepoove.poi.data.style.BorderStyle;
import com.deepoove.poi.data.style.Style;
import com.deepoove.poi.data.style.TableStyle;
+import com.deepoove.poi.util.TableTools;
import com.yuanchu.mom.common.GetLook;
import com.yuanchu.mom.common.PrintChina;
import com.yuanchu.mom.dto.ExcelDto;
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.exception.ErrorException;
import com.yuanchu.mom.service.InsOrderPlanService;
import com.yuanchu.mom.service.InsOrderService;
import com.yuanchu.mom.service.StandardTemplateService;
@@ -34,8 +35,7 @@
import com.yuanchu.mom.utils.QueryWrappers;
import com.yuanchu.mom.vo.InsOrderPlanVO;
import org.apache.commons.io.IOUtils;
-import org.apache.poi.xwpf.usermodel.TableRowAlign;
-import org.apache.poi.xwpf.usermodel.XWPFTable;
+import org.apache.poi.xwpf.usermodel.*;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -47,10 +47,10 @@
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.stream.Collectors;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Collectors;
/**
* 妫�楠屼换鍔�-涓氬姟瀹炵幇灞�
@@ -188,9 +188,10 @@
JSONObject resValue = JSON.parseObject(JSON.toJSONString(jo.get("resValue")));
if (resValue.get("v") != null) {
Object o = JSON.parseObject(JSON.toJSONString(resValue.get("v"))).get("v");
- insProduct.setLastValue(o.equals("")?null:(o + ""));
+ insProduct.setLastValue(o.equals("") ? null : (o.toString()));
}
- }catch (Exception e){}
+ } catch (Exception e) {
+ }
if (jo.get("equipValue") != null) {
JSONArray jsonArray2 = JSON.parseArray(JSON.toJSONString(jo.get("equipValue")));
List<Map<String, Object>> ev = new ArrayList<>();
@@ -244,7 +245,7 @@
});
return insContext.keySet().stream().findFirst().orElse(null);
}).thenAccept(res -> {
- if(res!=null){
+ if (res != null) {
int pId = Integer.parseInt(res.replaceAll("\\D+", ""));
InsProduct insProduct = insProductMapper.selectById(pId);
// 閫氳繃pId 鑾峰彇褰撳墠鏍锋湰id
@@ -257,10 +258,6 @@
Long count = insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery().in(InsProduct::getInsSampleId, sampleIds).isNull(InsProduct::getInsResult).eq(InsProduct::getSonLaboratory, insProduct.getSonLaboratory()));
// is null鐨勬暟閲忎负0鏄皢璁㈠崟鐘舵�佽〃鐨勭姸鎬佹敼涓哄凡妫�楠�
List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery().in(InsProduct::getInsSampleId, sampleIds).isNull(InsProduct::getInsResult).eq(InsProduct::getSonLaboratory, insProduct.getSonLaboratory()));
- insProducts.forEach(insProduct1 -> {
- System.out.println(insProduct1.getInsResult());
- System.out.println(insProduct1.getId());
- });
if (count == 0) {
insOrderStateMapper.update(new InsOrderState(), Wrappers.<InsOrderState>lambdaUpdate()
.eq(InsOrderState::getInsOrderId, orderId)
@@ -296,7 +293,8 @@
Map<String, String> user = insProductMapper.selectUserById(insOrder.getUserId());
List<SampleProductDto> samples = insSampleMapper.selectSampleProductListByOrderId(orderId);
InsReport insReport = new InsReport();
- insReport.setCode(giveCode.giveCode("JCZX/TX-", "ins_report", "-", "yyMMdd"));
+// insReport.setCode(giveCode.giveCode("JCZX/TX-", "ins_report", "-", "yyMMdd"));
+ insReport.setCode(insOrder.getEntrustCode());
insReport.setInsOrderId(orderId);
Set<Integer> set = new HashSet<>();
Map<Integer, String> map2 = new HashMap<>();
@@ -406,7 +404,6 @@
if ("鍙傛暟".equals(v.get("v"))) delSet.add(jo1.get("c") + "");
}
}
- // TODO: 2024/5/5 涓嬪垪寰幆缂哄皯word鍚堝苟鍗曞厓鏍肩殑鎿嶄綔
for (int i = 0; i < temp.size(); i++) {
JSONObject jo1 = temp.get(i);
TextRenderData textRenderData = new TextRenderData();
@@ -492,6 +489,9 @@
} else {
textRenderData.setText(v.get("v") == null ? "" : v.get("v") + "");
}
+ if (jo1.get("mc") != null) {
+ textRenderData.setText(textRenderData.getText() + "鈭�" + jo1.get("mc"));
+ }
Style style = new Style();
style.setFontFamily(v.get("ff") == null ? "寰蒋闆呴粦" : v.get("ff") + "");
// style.setFontSize(v.get("fs")==null?14:Integer.parseInt(v.get("fs")+""));
@@ -527,6 +527,14 @@
// tableStyle.setColWidths(ArrayUtils.toPrimitive(colLen.toArray(new Integer[0])));
tableStyle.setAlign(TableRowAlign.CENTER);
tableStyle.setWidth(XWPFTable.DEFAULT_PERCENTAGE_WIDTH);
+ BorderStyle borderStyle = new BorderStyle();
+ borderStyle.setColor("000000");
+ borderStyle.setType(XWPFTable.XWPFBorderType.THICK);
+ borderStyle.setSize(14);
+ tableStyle.setLeftBorder(borderStyle);
+ tableStyle.setTopBorder(borderStyle);
+ tableStyle.setRightBorder(borderStyle);
+ tableStyle.setBottomBorder(borderStyle);
tableRenderData.setTableStyle(tableStyle);
Map<String, Object> table = new HashMap<>();
table.put("table", tableRenderData);
@@ -554,7 +562,10 @@
tables.forEach(table -> {
table.put("tableSize", tables.size() + 1);
});
- List<Map<String, String>> deviceList = insOrderMapper.selectDeviceList(deviceSet);
+ List<Map<String, String>> deviceList = null;
+ if(deviceSet.size()!=0){
+ deviceList = insOrderMapper.selectDeviceList(deviceSet);
+ }
Map<String, String> codeStr = new HashMap<>();
codeStr.put("鎶ュ憡缂栧彿", insReport.getCode());
codeStr.put("鏍峰搧鍚嶇О", insOrder.getSample());
@@ -572,19 +583,21 @@
modelStr += "," + model;
}
String finalModelStr = modelStr;
+ String sampleEn = insSampleMapper.getSampleEn(insOrder.getSample());
+ String orderType = insOrderMapper.getEnumLabelByValue(insOrder.getOrderType());
ConfigureBuilder builder = Configure.builder();
builder.useSpringEL(true);
+ List<Map<String, String>> finalDeviceList = deviceList;
XWPFTemplate template = XWPFTemplate.compile(url, builder.build()).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());
+ put("sampleSize", samples.size());
put("tables", tables);
put("tableSize", tables.size() + 1);
- put("standardMethod", standardMethod2);
- put("deviceList", deviceList);
+ put("standardMethod", (standardMethod2.toString().equals("null") ? "" : standardMethod2));
+ put("deviceList", finalDeviceList);
put("twoCode", Pictures.ofLocal(codePath).create());
put("models", finalModelStr.replace(",", ""));
put("productSize", productSize);
@@ -596,6 +609,10 @@
put("insUrl", null);
put("examineUrl", null);
put("ratifyUrl", null);
+ put("sampleEn", sampleEn);
+ put("orderType", orderType);
+ put("getTime", insOrder.getExamineTime().format(DateTimeFormatter.ofPattern("yyyy骞碝M鏈坉d鏃�")));
+ put("getTimeEn", monthNames[insOrder.getExamineTime().getMonthValue() - 1] + " " + insOrder.getExamineTime().getDayOfMonth() + ", " + insOrder.getExamineTime().getYear());
}});
try {
String name = insReport.getCode().replace("/", "") + ".docx";
@@ -608,6 +625,65 @@
} catch (IOException e) {
throw new RuntimeException(e);
}
+ String path = wordUrl + "/" + insReport.getCode().replace("/", "") + ".docx";
+ try {
+ FileInputStream stream = new FileInputStream(path);
+ XWPFDocument document = new XWPFDocument(stream);
+ List<XWPFTable> xwpfTables = document.getTables();
+ for (int i = 1; i < xwpfTables.size() - (deviceList==null?1:2); i++) {
+ Set<String> set1 = new HashSet<>();
+ Map<String, Map<String, Integer>> maps = new HashMap<>();
+ for (int j = 0; j < xwpfTables.get(i).getRows().size(); j++) {
+ for (int k = 0; k < xwpfTables.get(i).getRows().get(j).getTableCells().size(); k++) {
+ if (xwpfTables.get(i).getRows().get(j).getTableCells().get(k).getText().indexOf("鈭�") > -1) {
+ String[] split = xwpfTables.get(i).getRows().get(j).getTableCells().get(k).getText().split("鈭�");
+ if (set1.add(split[1])) {
+ Map<String, Integer> map = new HashMap<>();
+ map.put("sr", j);
+ map.put("sc", k);
+ map.put("er", j + 0);
+ map.put("ec", k + 0);
+ maps.put(split[1], map);
+ } else {
+ Map<String, Integer> map1 = maps.get(split[1]);
+ if (j == map1.get("sr")) {
+ map1.put("ec", map1.get("ec") + 1);
+ } else if (k == map1.get("sc")) {
+ map1.put("er", map1.get("er") + 1);
+ }
+ }
+ String str = xwpfTables.get(i).getRows().get(j).getTableCells().get(k).getText().split("鈭�")[0];
+ xwpfTables.get(i).getRows().get(j).getTableCells().get(k).removeParagraph(0);
+ xwpfTables.get(i).getRows().get(j).getTableCells().get(k).setText(str);
+ xwpfTables.get(i).getRows().get(j).getTableCells().get(k).setVerticalAlignment(XWPFTableCell.XWPFVertAlign.CENTER);
+ xwpfTables.get(i).getRows().get(j).getTableCells().get(k).getParagraphArray(0).setAlignment(ParagraphAlignment.CENTER);
+ }
+ }
+ }
+ maps.forEach((k,v)->{
+ });
+ List<String> list = new ArrayList<>();
+ for (String s : maps.keySet()) {
+ list.add(s);
+ }
+ for (int a = list.size() - 1; a >= 0; a--) {
+ Map<String, Integer> v = maps.get(list.get(a));
+ for (int j = 0; j < v.get("er") - v.get("sr") + 1; j++) {
+ TableTools.mergeCellsHorizonal(xwpfTables.get(i), v.get("sr") + j, v.get("sc"), v.get("ec"));
+ }
+ if(v.get("er")>v.get("sr")){
+ TableTools.mergeCellsVertically(xwpfTables.get(i), v.get("sc"), v.get("sr"), v.get("er"));
+ }
+ }
+ }
+ FileOutputStream fileOutputStream = new FileOutputStream(path);
+ document.write(fileOutputStream);
+ fileOutputStream.close();
+ } catch (FileNotFoundException e) {
+ throw new RuntimeException(e);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
}
return 1;
}
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 4c450a9..28eea7e 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
@@ -136,6 +136,7 @@
@Override
public int upInsOrderOfState(InsOrder insOrder) {
+ insOrder.setExamineTime(LocalDateTime.now());
return insOrderMapper.updateById(insOrder);
}
diff --git a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
index 8397556..33b4992 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
@@ -160,9 +160,9 @@
</if>
</select>
<select id="selectDeviceList" resultType="java.util.Map">
- select device_name,specification_model,factory_no,date_format(next_calibration_date, '%Y-%m-%d')
- latest_traceability from device
- where factory_no in
+ select device_name,specification_model,management_number,DATE_ADD(date_format(last_calibration_date, '%Y-%m-%d'),INTERVAL calibration_date month) latest_traceability
+ from device
+ where device.management_number in
<foreach collection="names" index="index" open="(" separator="," close=")" item="val">
#{val}
</foreach>
@@ -232,4 +232,8 @@
</if>
) temp
</select>
+ <select id="getEnumLabelByValue" resultType="java.lang.String">
+ select label from `center-lims`.enums
+ where value = #{value}
+ </select>
</mapper>
diff --git a/inspect-server/src/main/resources/mapper/InsProductMapper.xml b/inspect-server/src/main/resources/mapper/InsProductMapper.xml
index 8c59858..16284d3 100644
--- a/inspect-server/src/main/resources/mapper/InsProductMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsProductMapper.xml
@@ -47,7 +47,7 @@
where io.id = #{orderId}
</select>
<select id="selectUserById" resultType="java.util.Map">
- select name,company,phone,address from user where id = #{userId}
+ select name,company,phone,address,name_en from user where id = #{userId}
</select>
<select id="getProductAndResult" resultType="com.yuanchu.mom.dto.ProductResultDto2">
select ip.id,ip.inspection_item,ip.inspection_item_subclass,ip.laboratory,ip.unit,ipr.equip_value,io.entrust_code,ipr.update_time,ip.ins_result,u.name updateUserName
diff --git a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
index 37aec35..11d9261 100644
--- a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
@@ -160,6 +160,10 @@
and state = 1
and ip.son_laboratory = #{laboratory}
</select>
+ <select id="getSampleEn" resultType="java.lang.String">
+ select name_en from `center-lims`.product
+ where name = #{sample}
+ </select>
<resultMap id="sampleDto" type="com.yuanchu.mom.dto.SampleProductDto">
<id property="id" column="id" jdbcType="INTEGER"/>
diff --git a/inspect-server/src/main/resources/static/report-template.docx b/inspect-server/src/main/resources/static/report-template.docx
index 1bae07a..c495275 100644
--- a/inspect-server/src/main/resources/static/report-template.docx
+++ b/inspect-server/src/main/resources/static/report-template.docx
Binary files differ
diff --git a/user-server/src/main/java/com/yuanchu/mom/pojo/User.java b/user-server/src/main/java/com/yuanchu/mom/pojo/User.java
index 1a555c1..fa96e20 100644
--- a/user-server/src/main/java/com/yuanchu/mom/pojo/User.java
+++ b/user-server/src/main/java/com/yuanchu/mom/pojo/User.java
@@ -32,9 +32,13 @@
private String password;
@ValueTableShow(2)
- @ApiModelProperty(value = "鐢ㄦ埛鍚�")
+ @ApiModelProperty(value = "濮撳悕")
private String name;
+// @ValueTableShow(2)
+// @ApiModelProperty(value = "濮撳悕EN")
+// private String nameEn;
+
@ValueTableShow(3)
@ApiModelProperty(value = "鐘舵��")
private Integer state;
--
Gitblit v1.9.3