From a940d99836f54fb58cec382d891b51589c94461e Mon Sep 17 00:00:00 2001
From: 15030600271 <1qaz!QAZ>
Date: 星期五, 24 十一月 2023 20:59:44 +0800
Subject: [PATCH] 20231124_qiuyh_修改导出制作人
---
hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/rebarprint/entity/dto/ProduceExportDto.java | 2 ++
hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/rebarprint/service/impl/TSteelProduceServiceImpl.java | 4 ++--
hd/pipe/materialsManage/src/main/resources/mapping/TSteelProduceMapper.xml | 4 ++++
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/rebarprint/entity/dto/ProduceExportDto.java b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/rebarprint/entity/dto/ProduceExportDto.java
index 3eb944c..d1a44e3 100644
--- a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/rebarprint/entity/dto/ProduceExportDto.java
+++ b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/rebarprint/entity/dto/ProduceExportDto.java
@@ -47,5 +47,7 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private String printTime;
+ private String platUserName;
+
}
diff --git a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/rebarprint/service/impl/TSteelProduceServiceImpl.java b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/rebarprint/service/impl/TSteelProduceServiceImpl.java
index fed3638..23e4dbd 100644
--- a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/rebarprint/service/impl/TSteelProduceServiceImpl.java
+++ b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/rebarprint/service/impl/TSteelProduceServiceImpl.java
@@ -238,7 +238,7 @@
}else {
exportDto.setQualityTime(produceDto.getQualityTime().toString());
}
- exportDto.setRealName(produceDto.getRealName());
+ exportDto.setPlatUserName(produceDto.getPlatUserName());
exportDto.setQualityUserName(produceDto.getQualityUserName());
if(produceDto.getIsQualified()!=null && produceDto.getIsQualified()==1){
@@ -263,7 +263,7 @@
excel.addHeaderAlias("blockName", "块号");
excel.addHeaderAlias("groupName", "生产班组");
excel.addHeaderAlias("printTime", "打印时间");
- excel.addHeaderAlias("realName", "制作人");
+ excel.addHeaderAlias("platUserName", "制作人");
excel.addHeaderAlias("qualityUserName", "质检人");
excel.addHeaderAlias("qualityTime", "质检时间");
excel.addHeaderAlias("isQualified", "是否合格");
diff --git a/hd/pipe/materialsManage/src/main/resources/mapping/TSteelProduceMapper.xml b/hd/pipe/materialsManage/src/main/resources/mapping/TSteelProduceMapper.xml
index aeef5b4..f92700f 100644
--- a/hd/pipe/materialsManage/src/main/resources/mapping/TSteelProduceMapper.xml
+++ b/hd/pipe/materialsManage/src/main/resources/mapping/TSteelProduceMapper.xml
@@ -91,6 +91,10 @@
<if test="isModel!=null and isModel!='' ">
and tsp.size_id=#{sizeId}
</if>
+ <if test="realName!=null and realName!='' ">
+ and spu.real_name regexp #{realName}
+ </if>
+
order by tsp.produce_number desc
</select>
<select id="steelProduceInfo" parameterType="java.lang.String" resultType="com.thhy.materials.modules.biz.rebarprint.entity.dto.ProduceDto">
--
Gitblit v1.9.3