From e5f6b13b9cecc6567ec2e7254234024f176dee27 Mon Sep 17 00:00:00 2001
From: zpl <pzl_7001@163.com>
Date: Tue, 14 Sep 2021 10:43:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=88=9B=E5=BB=BA=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E8=B0=83=E6=95=B4=E6=9C=AA=E7=82=B9=E6=A3=80=E6=89=A7?=
 =?UTF-8?q?=E8=A1=8C=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mesnac/equip/dto/ResourceInspectTaskDto.java      | 11 +++++++++++
 .../resources/mapper/ResourceInspectTaskMapper.xml    |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/dto/ResourceInspectTaskDto.java b/equip/src/main/java/com/foreverwin/mesnac/equip/dto/ResourceInspectTaskDto.java
index 17124e2a..dea4150e 100644
--- a/equip/src/main/java/com/foreverwin/mesnac/equip/dto/ResourceInspectTaskDto.java
+++ b/equip/src/main/java/com/foreverwin/mesnac/equip/dto/ResourceInspectTaskDto.java
@@ -92,6 +92,17 @@ public class ResourceInspectTaskDto implements Serializable {
     private List<ResourceInspectTaskSpare> spareList;
     /**用户名称**/
     private String fullName;
+    /**任务执行日期**/
+    private String taskDay;
+
+
+    public String getTaskDay() {
+        return taskDay;
+    }
+
+    public void setTaskDay(String taskDay) {
+        this.taskDay = taskDay;
+    }
 
     public String getFullName() {
         return fullName;
diff --git a/equip/src/main/resources/mapper/ResourceInspectTaskMapper.xml b/equip/src/main/resources/mapper/ResourceInspectTaskMapper.xml
index f7c5dfca..e5085bf6 100644
--- a/equip/src/main/resources/mapper/ResourceInspectTaskMapper.xml
+++ b/equip/src/main/resources/mapper/ResourceInspectTaskMapper.xml
@@ -643,7 +643,7 @@
 
     <!--自定义sql：模糊查询检验任务所有字段、车间、设备名称等字段-->
     <select id="findResourceInspectTaskList" resultType="com.foreverwin.mesnac.equip.dto.ResourceInspectTaskDto">
-        SELECT DISTINCT RIK.* , ZNU.FULL_NAME, RIP.PLAN_NO AS PLAN_NO ,
+        SELECT DISTINCT RIK.* , TO_CHAR(RIK.TASK_CREATE_DATE, 'yyyy-mm-dd') TASK_DAY  , ZNU.FULL_NAME, RIP.PLAN_NO AS PLAN_NO ,
         R.RESRCE AS RESOURCE_NO ,R.DESCRIPTION AS RESOURCE_DESCRIPTION ,
         RTR.RESOURCE_TYPE_BO ,RT.RESOURCE_TYPE AS RESOURCE_TYPE_NO ,RT.DESCRIPTION AS RESOURCE_TYPE_DESCRIPTION ,
         WCT.DESCRIPTION AS WORK_CENTER