QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

完善新法规导入流程

Browse Source
This commit is contained in:
梁琦涛
2024-10-10 14:08:21 +08:00
parent 9f87893556
commit 63829e2bc9
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/ni/mapper/xml/ProcessNewStandardImportMapper.xml
+4 -9
View File
@@ -5,16 +5,11 @@
<mapper namespace="com.jero.modules.activiti.process.ni.mapper.ProcessNewStandardImportMapper"> <mapper namespace="com.jero.modules.activiti.process.ni.mapper.ProcessNewStandardImportMapper">
<select id="getStandardNameById" resultType="com.jero.modules.activiti.process.ni.entity.ProcessNewStandardImport"> <select id="getStandardNameById" resultType="com.jero.modules.activiti.process.ni.entity.ProcessNewStandardImport">
select standard_number,standard_name, select id,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, (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 from implementation_date,new_product_impl_date,new_auth_impl_date,registration_date
(select id, standard_number,standard_name,implementation_date
from laws_domestic_standard from laws_domestic_standard
where del_flag = 0 where del_flag = 0 and id = #{id}
union all
select id, standard_number,standard_name,implementation_date
from laws_enterprise_standard
where del_flag = 0) a where id = #{id}
</select> </select>
<select id="queryByPage" resultType="com.jero.modules.activiti.process.ni.entity.ProcessNewStandardImport"> <select id="queryByPage" resultType="com.jero.modules.activiti.process.ni.entity.ProcessNewStandardImport">
laws-modules/src/main/java/com/jero/modules/activiti/process/ni/service/impl/ProcessNewStandardImportServiceImpl.java
+3
View File
@@ -324,6 +324,9 @@ public class ProcessNewStandardImportServiceImpl extends ServiceImpl<ProcessNewS
data.setStandardName(processNewStandardImport.getStandardName()); data.setStandardName(processNewStandardImport.getStandardName());
data.setStandardNumber(processNewStandardImport.getStandardNumber()); data.setStandardNumber(processNewStandardImport.getStandardNumber());
data.setImplementationDate(processNewStandardImport.getImplementationDate()); data.setImplementationDate(processNewStandardImport.getImplementationDate());
data.setNewAuthImplDate(processNewStandardImport.getNewAuthImplDate());
data.setRegistrationDate(processNewStandardImport.getRegistrationDate());
data.setNewProductImplDate(processNewStandardImport.getNewProductImplDate());
data.setSubstituteStandardNumber(processNewStandardImport.getSubstituteStandardNumber()); data.setSubstituteStandardNumber(processNewStandardImport.getSubstituteStandardNumber());
} }
result.setBusinessInfoDTO(data); result.setBusinessInfoDTO(data);