From d1022dab44c4916c2935d10f5b04c7e7bbaa5dad Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 21 十一月 2024 16:26:34 +0800
Subject: [PATCH] 调整
---
inspect-server/src/main/resources/mapper/InsOrderMapper.xml | 5 +++--
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 2 +-
inspect-server/src/main/java/com/yuanchu/mom/utils/FuSheUtils.java | 3 ---
inspect-server/src/main/java/com/yuanchu/mom/dto/SampleOrderDto.java | 1 +
4 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleOrderDto.java b/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleOrderDto.java
index 2f58b7b..909b73d 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleOrderDto.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleOrderDto.java
@@ -28,6 +28,7 @@
private String sampleModel;
private String assign;
+ private String name;
@ValueTableShow(5)
@ApiModelProperty("鏍峰搧鏁伴噺")
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 69a5707..5036ca7 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
@@ -332,7 +332,7 @@
if (ObjectUtils.isNotEmpty(sonLaboratory) && (sonLaboratory.equals("杩戝満") || sonLaboratory.equals("杩滃満")) &&
split[split.length - 1].equals("csv")) {
//鍒ゆ柇鏄摢绉峜sv鏂囦欢,鏄惁鏈夆�斺��
- if (!file.getOriginalFilename().contains("鈥斺��")) {
+ if (sonLaboratory.equals("杩戝満")) {
fuSheUtils.getFuSheWord1(sonLaboratory, insOrderFile);
} else {
fuSheUtils.getFuSheWord2(sonLaboratory, insOrderFile);
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/utils/FuSheUtils.java b/inspect-server/src/main/java/com/yuanchu/mom/utils/FuSheUtils.java
index 1a9ac2d..1593dd4 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/utils/FuSheUtils.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/utils/FuSheUtils.java
@@ -45,9 +45,6 @@
InsOrderFileMapper insOrderFileMapper;
@Resource
- InsOrderMapper insOrderMapper;
-
- @Resource
InsSampleMapper insSampleMapper;
public void getFuSheWord1(String sonLaboratory, InsOrderFile insOrderFile) {
diff --git a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
index 6631485..34a07c7 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
@@ -60,7 +60,7 @@
<association property="children" resultMap="SampleDefectsChildrenMap" javaType="java.util.List"/>
</resultMap>
- <resultMap id="ProductThingDto" type="com.yuanchu.mom.dto.SampleOrderDto">
+ <resultMap id="SampleOrderDto" type="com.yuanchu.mom.dto.SampleOrderDto">
<id property="id" column="id" jdbcType="INTEGER"/>
<result property="entrustCode" column="entrust_code" jdbcType="VARCHAR"/>
<result property="outEntrustCode" column="out_entrust_code" jdbcType="VARCHAR"/>
@@ -85,6 +85,7 @@
<result property="motorNumber" column="motor_number"/>
<result property="sampleName" column="sample_name"/>
<result property="sampleModel" column="sample_model"/>
+ <result property="name" column="name"/>
<collection property="reportDtos" ofType="com.yuanchu.mom.dto.ReportDto" resultMap="reportDto"/>
</resultMap>
<resultMap id="reportDto" type="com.yuanchu.mom.dto.ReportDto">
@@ -94,7 +95,7 @@
<result property="name" column="name"/>
</resultMap>
- <select id="selectInsOrderPage" resultType="com.yuanchu.mom.dto.SampleOrderDto">
+ <select id="selectInsOrderPage" resultMap="SampleOrderDto">
select *
from (
SELECT
--
Gitblit v1.9.3