WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_20230912_Platform' into dev_20230912_Platform

Browse Source
This commit is contained in:
zyx.net
2023-09-15 16:59:10 +08:00
parent 0e8b3cd2d9 19131b86d9
commit a94e803313
1 changed files with 22 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml
+22 -41
View File
@@ -67,8 +67,12 @@
pi.project_laws_inventory_id, pi.project_laws_inventory_id,
pi.buss_document_library_id, pi.buss_document_library_id,
pi.acti_proc_inst_id, pi.acti_proc_inst_id,
<!--pni.project_name,--> case
<!--concat( pni.project_name, '-', pyni.year_name ) AS project_name,--> when
year_name_id is null
THEN plb.project_name_id
when year_name_id is not null
THEN
concat( concat(
pni.project_name, '-', pni.project_name, '-',
pyni.year_name, '-', pyni.year_name, '-',
@@ -87,7 +91,7 @@
AND dict_id = ( SELECT id FROM sys_dict WHERE dict_code = 'region' ) AND dict_id = ( SELECT id FROM sys_dict WHERE dict_code = 'region' )
) , '-', ) , '-',
plb.project_version plb.project_version
) AS project_name, ) end AS project_name,
pyni.year_name, pyni.year_name,
pli.serial_number, pli.serial_number,
pli.title, pli.title,
@@ -118,7 +122,6 @@
left join project_laws_inventory pli on pi.project_laws_inventory_id = pli.id 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 LEFT JOIN buss_document_library bdl ON pi.buss_document_library_id = bdl.id
<where> <where>
plb.platform is null
<if test="params.queryType != 'issuedProcess'"> <if test="params.queryType != 'issuedProcess'">
and pi.id IN ( and pi.id IN (
SELECT SELECT
@@ -161,8 +164,12 @@
pi.project_laws_inventory_id, pi.project_laws_inventory_id,
pi.buss_document_library_id, pi.buss_document_library_id,
pi.acti_proc_inst_id, pi.acti_proc_inst_id,
<!--pni.project_name,--> case
<!--concat( pni.project_name, '-', pyni.year_name ) AS project_name,--> when
year_name_id is null
THEN plb.project_name_id
when year_name_id is not null
THEN
concat( concat(
pni.project_name, '-', pni.project_name, '-',
pyni.year_name, '-', pyni.year_name, '-',
@@ -181,7 +188,7 @@
AND dict_id = ( SELECT id FROM sys_dict WHERE dict_code = 'region' ) AND dict_id = ( SELECT id FROM sys_dict WHERE dict_code = 'region' )
) , '-', ) , '-',
plb.project_version plb.project_version
) AS project_name, ) end AS project_name,
pyni.year_name, pyni.year_name,
pli.serial_number, pli.serial_number,
pli.title, pli.title,
@@ -224,7 +231,6 @@
<foreach collection="params.flowTypeList" index="index" item="item" open="(" separator="," close=")"> <foreach collection="params.flowTypeList" index="index" item="item" open="(" separator="," close=")">
#{item} #{item}
</foreach> </foreach>
and plb.platform is null
union union
SELECT SELECT
pi.id, pi.id,
@@ -232,8 +238,12 @@
pi.project_laws_inventory_id, pi.project_laws_inventory_id,
pi.buss_document_library_id, pi.buss_document_library_id,
pi.acti_proc_inst_id, pi.acti_proc_inst_id,
<!--pni.project_name,--> case
<!--concat( pni.project_name, '-', pyni.year_name ) AS project_name,--> when
year_name_id is null
THEN plb.project_name_id
when year_name_id is not null
THEN
concat( concat(
pni.project_name, '-', pni.project_name, '-',
pyni.year_name, '-', pyni.year_name, '-',
@@ -252,7 +262,7 @@
AND dict_id = ( SELECT id FROM sys_dict WHERE dict_code = 'region' ) AND dict_id = ( SELECT id FROM sys_dict WHERE dict_code = 'region' )
) , '-', ) , '-',
plb.project_version plb.project_version
) AS project_name, ) end AS project_name,
pyni.year_name, pyni.year_name,
'--' as serial_number, '--' as serial_number,
'--' as standard_info, '--' as standard_info,
@@ -267,34 +277,6 @@
process_info_detail pid 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 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, ) as end_time,
<!--(
case when flow_type = '21' then
(
SELECT
pci.end_time
FROM
project_certification_inventory pci
WHERE
pci.project_library_id = pi.id
AND ( pci.flow_status = 'List to be checked' OR pci.flow_status = 'Refusal of responsible person' )
ORDER BY
pci.end_time ASC
LIMIT 1
)
when flow_type = '10' then
(
SELECT
pid.end_time
FROM
process_info_detail pid
WHERE
pid.process_info_id = pi.id
AND pid.STATUS = 'NotDone'
ORDER BY
pid.end_time ASC
LIMIT 1
) end
)AS end_time,-->
pi.STATUS, pi.STATUS,
pi.prc_num, pi.prc_num,
pi.prc_name, pi.prc_name,
@@ -323,8 +305,7 @@
<foreach collection="params.qdqrFlowTypeValue" index="index" item="item" open="(" separator="," close=")"> <foreach collection="params.qdqrFlowTypeValue" index="index" item="item" open="(" separator="," close=")">
#{item} #{item}
</foreach> </foreach>
and plb.platform is null )temp
)temp
<include refid="BaseQuerySql"/> <include refid="BaseQuerySql"/>
order by order by
temp.end_time IS NULL, temp.end_time IS NULL,