From 7d9f414e676d8cf823351dcd26a6dd354c43d57a Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期四, 24 四月 2025 10:02:45 +0800
Subject: [PATCH] 样品导出调整
---
cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessTotaldealServiceImpl.java | 3 ++-
cnas-process/src/main/java/com/ruoyi/process/dto/ProcessDealDto.java | 19 +++++++++++++++++++
cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessDealMapper.java | 3 ++-
cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessDeal.java | 4 ----
cnas-process/src/main/resources/mapper/ProcessDealMapper.xml | 4 ++--
cnas-process/src/main/resources/static/sample-deal.docx | 0
6 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/cnas-process/src/main/java/com/ruoyi/process/dto/ProcessDealDto.java b/cnas-process/src/main/java/com/ruoyi/process/dto/ProcessDealDto.java
new file mode 100644
index 0000000..b3c0a0c
--- /dev/null
+++ b/cnas-process/src/main/java/com/ruoyi/process/dto/ProcessDealDto.java
@@ -0,0 +1,19 @@
+package com.ruoyi.process.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.ruoyi.process.pojo.ProcessDeal;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author zhuo
+ * @Date 2025/4/23
+ */
+@Data
+public class ProcessDealDto extends ProcessDeal {
+ @ApiModelProperty("搴忓彿")
+ private String indexs;
+
+ @ApiModelProperty("鏃堕棿")
+ private String dealTimeStr;
+}
diff --git a/cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessDealMapper.java b/cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessDealMapper.java
index 9af6989..82913de 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessDealMapper.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessDealMapper.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.process.dto.ProcessDealDto;
import com.ruoyi.process.pojo.ProcessDeal;
import org.apache.ibatis.annotations.Param;
@@ -21,6 +22,6 @@
IPage<ProcessDeal> pageProcessDeal(Page page, @Param("ew") QueryWrapper<ProcessDeal> queryWrappers);
- List<ProcessDeal> selectDeal(@Param("id") Integer id);
+ List<ProcessDealDto> selectDeal(@Param("id") Integer id);
}
diff --git a/cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessDeal.java b/cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessDeal.java
index 078e04e..721c609 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessDeal.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessDeal.java
@@ -65,8 +65,4 @@
@ApiModelProperty("鍏宠仈鐨勬牱鍝佹帴鏀秈d")
private Integer processSampleId;
-
- @ApiModelProperty("搴忓彿")
- @TableField(select = false,exist = false)
- private String indexs;
}
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessTotaldealServiceImpl.java b/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessTotaldealServiceImpl.java
index 7e7bad5..51feeec 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessTotaldealServiceImpl.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessTotaldealServiceImpl.java
@@ -17,6 +17,7 @@
import com.ruoyi.framework.exception.ErrorException;
import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
import com.ruoyi.inspect.util.UserUtils;
+import com.ruoyi.process.dto.ProcessDealDto;
import com.ruoyi.process.mapper.InspectionOrderMapper;
import com.ruoyi.process.mapper.ProcessDealMapper;
import com.ruoyi.process.mapper.ProcessSampleMapper;
@@ -185,7 +186,7 @@
@Override
public void exportProcessTotaldeal(Integer id, HttpServletResponse response) {
- List<ProcessDeal> sampleDealDtos = processDealMapper.selectDeal(id);
+ List<ProcessDealDto> sampleDealDtos = processDealMapper.selectDeal(id);
ProcessTotaldeal processTotaldeal = processTotaldealMapper.selectById(id);
// 鑾峰彇璺緞
diff --git a/cnas-process/src/main/resources/mapper/ProcessDealMapper.xml b/cnas-process/src/main/resources/mapper/ProcessDealMapper.xml
index 282eaa7..037afa8 100644
--- a/cnas-process/src/main/resources/mapper/ProcessDealMapper.xml
+++ b/cnas-process/src/main/resources/mapper/ProcessDealMapper.xml
@@ -24,7 +24,7 @@
</if>
</select>
- <select id="selectDeal" resultType="com.ruoyi.process.pojo.ProcessDeal">
+ <select id="selectDeal" resultType="com.ruoyi.process.dto.ProcessDealDto">
select ROW_NUMBER() OVER (ORDER BY id) AS indexs,
id,
sample_name,
@@ -32,7 +32,7 @@
sample_supplier,
num,
deal_method,
- deal_time
+ DATE_FORMAT(deal_time, '%Y-%m-%d') dealTimeStr
from cnas_process_deal
where totaldeal_id = #{id}
</select>
diff --git a/cnas-process/src/main/resources/static/sample-deal.docx b/cnas-process/src/main/resources/static/sample-deal.docx
index 9401b21..7cc0d8b 100644
--- a/cnas-process/src/main/resources/static/sample-deal.docx
+++ b/cnas-process/src/main/resources/static/sample-deal.docx
Binary files differ
--
Gitblit v1.9.3