diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml index bc43106a7..fc024a11a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml @@ -67,8 +67,12 @@ pi.project_laws_inventory_id, pi.buss_document_library_id, pi.acti_proc_inst_id, - - + case + when + year_name_id is null + THEN plb.project_name_id + when year_name_id is not null + THEN concat( pni.project_name, '-', pyni.year_name, '-', @@ -87,7 +91,7 @@ AND dict_id = ( SELECT id FROM sys_dict WHERE dict_code = 'region' ) ) , '-', plb.project_version - ) AS project_name, + ) end AS project_name, pyni.year_name, pli.serial_number, pli.title, @@ -118,7 +122,6 @@ left join project_laws_inventory pli on pi.project_laws_inventory_id = pli.id LEFT JOIN buss_document_library bdl ON pi.buss_document_library_id = bdl.id - plb.platform is null and pi.id IN ( SELECT @@ -161,8 +164,12 @@ pi.project_laws_inventory_id, pi.buss_document_library_id, pi.acti_proc_inst_id, - - + case + when + year_name_id is null + THEN plb.project_name_id + when year_name_id is not null + THEN concat( pni.project_name, '-', pyni.year_name, '-', @@ -181,7 +188,7 @@ AND dict_id = ( SELECT id FROM sys_dict WHERE dict_code = 'region' ) ) , '-', plb.project_version - ) AS project_name, + ) end AS project_name, pyni.year_name, pli.serial_number, pli.title, @@ -224,7 +231,6 @@ #{item} - and plb.platform is null union SELECT pi.id, @@ -232,8 +238,12 @@ pi.project_laws_inventory_id, pi.buss_document_library_id, pi.acti_proc_inst_id, - - + case + when + year_name_id is null + THEN plb.project_name_id + when year_name_id is not null + THEN concat( pni.project_name, '-', pyni.year_name, '-', @@ -252,7 +262,7 @@ AND dict_id = ( SELECT id FROM sys_dict WHERE dict_code = 'region' ) ) , '-', plb.project_version - ) AS project_name, + ) end AS project_name, pyni.year_name, '--' as serial_number, '--' as standard_info, @@ -267,34 +277,6 @@ process_info_detail pid where pid.process_info_id = pi.id and pid.STATUS = 'NotDone' and pid.end_time is not null and pid.user_id = #{params.currentUserId} order by pid.end_time asc limit 1 ) as end_time, - pi.STATUS, pi.prc_num, pi.prc_name, @@ -323,8 +305,7 @@ #{item} - and plb.platform is null - )temp + )temp order by temp.end_time IS NULL,