From 63829e2bc9f0c05ee5cf1de90d3bd514033a3198 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <liangqitao@syxysoft.com>
Date: Thu, 10 Oct 2024 14:08:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=96=B0=E6=B3=95=E8=A7=84?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/xml/ProcessNewStandardImportMapper.xml   | 13 ++++---------
 .../impl/ProcessNewStandardImportServiceImpl.java   |  3 +++
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/mapper/xml/ProcessNewStandardImportMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/mapper/xml/ProcessNewStandardImportMapper.xml
index 12800df1..f2784ba2 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/mapper/xml/ProcessNewStandardImportMapper.xml
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/mapper/xml/ProcessNewStandardImportMapper.xml
@@ -5,16 +5,11 @@
 <mapper namespace="com.jero.modules.activiti.process.ni.mapper.ProcessNewStandardImportMapper">
 
     <select id="getStandardNameById" resultType="com.jero.modules.activiti.process.ni.entity.ProcessNewStandardImport">
-        select standard_number,standard_name,
-        (select GROUP_CONCAT(replaced SEPARATOR ', ') from laws_replaced_standard where type=1 and replaced_by = a.standard_number) as substitute_standard_number,
-        implementation_date from
-       (select id, standard_number,standard_name,implementation_date
+       select id,standard_number,standard_name,
+        (select GROUP_CONCAT(replaced SEPARATOR ', ') from laws_replaced_standard where type=1 and replaced_by = laws_domestic_standard.standard_number) as substitute_standard_number,
+        implementation_date,new_product_impl_date,new_auth_impl_date,registration_date
        from laws_domestic_standard
-       where del_flag = 0
-       union all
-       select id, standard_number,standard_name,implementation_date
-       from laws_enterprise_standard
-       where del_flag = 0) a where id = #{id}
+       where del_flag = 0 and id = #{id}
     </select>
 
     <select id="queryByPage" resultType="com.jero.modules.activiti.process.ni.entity.ProcessNewStandardImport">
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/service/impl/ProcessNewStandardImportServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/service/impl/ProcessNewStandardImportServiceImpl.java
index d3e4a679..86d918ec 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/service/impl/ProcessNewStandardImportServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/service/impl/ProcessNewStandardImportServiceImpl.java
@@ -324,6 +324,9 @@ public class ProcessNewStandardImportServiceImpl extends ServiceImpl<ProcessNewS
                 data.setStandardName(processNewStandardImport.getStandardName());
                 data.setStandardNumber(processNewStandardImport.getStandardNumber());
                 data.setImplementationDate(processNewStandardImport.getImplementationDate());
+                data.setNewAuthImplDate(processNewStandardImport.getNewAuthImplDate());
+                data.setRegistrationDate(processNewStandardImport.getRegistrationDate());
+                data.setNewProductImplDate(processNewStandardImport.getNewProductImplDate());
                 data.setSubstituteStandardNumber(processNewStandardImport.getSubstituteStandardNumber());
             }
             result.setBusinessInfoDTO(data);