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

法规评估任务处理标准信息展示。拼接中英文展示 与查询处理。

Browse Source
This commit is contained in:
wangzhijiang
2022-10-27 14:11:33 +08:00
parent 745a8b81e3
commit 99364d52f3
2 changed files with 85 additions and 69 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
+79 -68
View File
@@ -73,6 +73,7 @@
pyni.year_name, pyni.year_name,
pli.serial_number, pli.serial_number,
pli.title, pli.title,
plb.title_en,
pi.flow_type, pi.flow_type,
createBy.username as "create_by", createBy.username as "create_by",
pi.end_time, pi.end_time,
@@ -106,6 +107,7 @@
pyni.year_name, pyni.year_name,
pli.serial_number, pli.serial_number,
pli.title, pli.title,
plb.title_en,
pi.flow_type, pi.flow_type,
createBy.username AS "create_by", createBy.username AS "create_by",
pi.end_time, pi.end_time,
@@ -150,6 +152,7 @@
pyni.year_name, pyni.year_name,
'--' as serial_number, '--' as serial_number,
'' as title, '' as title,
'' as title_en,
pi.flow_type, pi.flow_type,
createBy.username AS "create_by", createBy.username AS "create_by",
(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) as end_time, (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) as end_time,
@@ -206,85 +209,93 @@
order by temp.end_time asc order by temp.end_time asc
</select> </select>
<select id="queryLawsAssessPageList" resultType="com.jero.modules.todoCenter.vo.ProcessInfoVO"> <select id="queryLawsAssessPageList" resultType="com.jero.modules.todoCenter.vo.ProcessInfoVO">
SELECT select temp.* from (
pi.id, SELECT
pi.buss_document_library_id, pi.id,
bdl.serial_number, pi.buss_document_library_id,
bdl.title, bdl.serial_number,
pi.flow_type, bdl.title,
pi.end_time, bdl.title_en,
pi.STATUS, <if test="params.cut == 'cn'">
pi.prc_num, concat(bdl.serial_number,'、',bdl.title) as standard_info,
pi.prc_name,
(
select
detail.task_id
from
process_info_detail detail
where detail.process_info_id = pi.id
and detail.user_id = #{params.currentUserId}
<if test="params.queryType == 'todoProcess'">
and detail.`status` = #{params.taskStatus}
</if> </if>
order by detail.submit_time desc <if test="params.cut == 'en'">
limit 1 concat(bdl.serial_number,'、',bdl.title_en) as standard_info,
) as task_id,
(
select
detail.task_definition_key
from
process_info_detail detail
where detail.process_info_id = pi.id
and detail.user_id = #{params.currentUserId}
<if test="params.queryType == 'todoProcess'">
and detail.`status` = #{params.taskStatus}
</if> </if>
order by detail.submit_time desc pi.flow_type,
limit 1 pi.end_time,
) as task_definition_key, pi.STATUS,
createBy.username AS "create_by", pi.prc_num,
pi.acti_proc_inst_id, pi.prc_name,
pi.create_time (
FROM select
detail.task_id
from
process_info_detail detail
where detail.process_info_id = pi.id
and detail.user_id = #{params.currentUserId}
<if test="params.queryType == 'todoProcess'">
and detail.`status` = #{params.taskStatus}
</if>
order by detail.submit_time desc
limit 1
) as task_id,
(
select
detail.task_definition_key
from
process_info_detail detail
where detail.process_info_id = pi.id
and detail.user_id = #{params.currentUserId}
<if test="params.queryType == 'todoProcess'">
and detail.`status` = #{params.taskStatus}
</if>
order by detail.submit_time desc
limit 1
) as task_definition_key,
createBy.username AS create_by,
pi.acti_proc_inst_id,
pi.create_time
FROM
process_info pi process_info pi
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
LEFT JOIN sys_user createBy on createBy.id = pi.create_by LEFT JOIN sys_user createBy on createBy.id = pi.create_by
<where> <where>
pi.flow_type IN pi.flow_type IN
<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>
<if test="params.queryType == 'issuedProcess'"> <if test="params.queryType == 'issuedProcess'">
and pi.create_by = #{params.createBy} and pi.create_by = #{params.createBy}
</if> </if>
<if test="params.queryType != 'issuedProcess'"> <if test="params.queryType != 'issuedProcess'">
and ( and (
pi.id IN ( pi.id IN (
SELECT SELECT
pid.process_info_id pid.process_info_id
FROM FROM
process_info_detail pid process_info_detail pid
where where
pid.user_id = #{params.currentUserId} and pid.status = #{params.taskStatus} pid.user_id = #{params.currentUserId}
and pid.status = #{params.taskStatus}
)
) )
) </if>
</if> </where>
) temp
<if test="params.serialNumber != null and params.serialNumber != ''"> <where>
and ( <if test="params.standardInfo != null and params.standardInfo != ''">
bdl.serial_number like CONCAT(CONCAT('%',#{params.serialNumber}),'%') and temp.standard_info like CONCAT(CONCAT('%',#{params.standardInfo}),'%')
or bdl.title like CONCAT(CONCAT('%',#{params.serialNumber}),'%')
)
</if> </if>
<if test="params.flowType != null and params.flowType !=''"> <if test="params.flowType != null and params.flowType !=''">
and pi.flow_type = #{params.flowType} and temp.flow_type = #{params.flowType}
</if> </if>
</where> </where>
<if test="params.queryType == 'todoProcess' "> <if test="params.queryType == 'todoProcess' ">
order by pi.end_time asc order by temp.end_time asc
</if> </if>
<if test="params.queryType != 'todoProcess' "> <if test="params.queryType != 'todoProcess' ">
order by pi.end_time desc order by temp.end_time desc
</if> </if>
</select> </select>
</mapper> </mapper>
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/vo/ProcessInfoVO.java
+6 -1
View File
@@ -80,8 +80,10 @@ public class ProcessInfoVO implements Serializable {
/**标准编号*/ /**标准编号*/
private String serialNumber; private String serialNumber;
/**标准标题*/ /**标准标题-中文*/
private String title; private String title;
/**标准标题-英文*/
private String titleEn;
/**项目名称*/ /**项目名称*/
private String projectName; private String projectName;
/**年份*/ /**年份*/
@@ -102,4 +104,7 @@ public class ProcessInfoVO implements Serializable {
private String personChargeFeedback; private String personChargeFeedback;
/**截止日期 过期标识：true为已经过期 false为没有过期**/ /**截止日期 过期标识：true为已经过期 false为没有过期**/
private boolean endTimePastDueFlag = false; private boolean endTimePastDueFlag = false;
/**标准信息**/
private String standardInfo;
} }