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 5cd218e78..57501c8f3 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 @@ -73,6 +73,7 @@ pyni.year_name, pli.serial_number, pli.title, + plb.title_en, pi.flow_type, createBy.username as "create_by", pi.end_time, @@ -106,6 +107,7 @@ pyni.year_name, pli.serial_number, pli.title, + plb.title_en, pi.flow_type, createBy.username AS "create_by", pi.end_time, @@ -150,6 +152,7 @@ pyni.year_name, '--' as serial_number, '' as title, + '' as title_en, pi.flow_type, 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, @@ -206,85 +209,93 @@ order by temp.end_time asc diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/vo/ProcessInfoVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/vo/ProcessInfoVO.java index 75577e278..94a903a45 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/vo/ProcessInfoVO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/vo/ProcessInfoVO.java @@ -80,8 +80,10 @@ public class ProcessInfoVO implements Serializable { /**标准编号*/ private String serialNumber; - /**标准标题*/ + /**标准标题-中文*/ private String title; + /**标准标题-英文*/ + private String titleEn; /**项目名称*/ private String projectName; /**年份*/ @@ -102,4 +104,7 @@ public class ProcessInfoVO implements Serializable { private String personChargeFeedback; /**截止日期 过期标识:true为已经过期 false为没有过期**/ private boolean endTimePastDueFlag = false; + + /**标准信息**/ + private String standardInfo; }