diff --git a/adc-da-report/target/classes/com/adc/da/report/service/impl/IReportServiceImpl.class b/adc-da-report/target/classes/com/adc/da/report/service/impl/IReportServiceImpl.class index 42e5fde..9585897 100644 Binary files a/adc-da-report/target/classes/com/adc/da/report/service/impl/IReportServiceImpl.class and b/adc-da-report/target/classes/com/adc/da/report/service/impl/IReportServiceImpl.class differ diff --git a/adc-da-report/target/classes/com/adc/da/report/vo/ReportDetailVo.class b/adc-da-report/target/classes/com/adc/da/report/vo/ReportDetailVo.class index b998154..cef2ae9 100644 Binary files a/adc-da-report/target/classes/com/adc/da/report/vo/ReportDetailVo.class and b/adc-da-report/target/classes/com/adc/da/report/vo/ReportDetailVo.class differ diff --git a/adc-da-report/target/classes/mybatis/mapper/mysql/ReportManageMapper.xml b/adc-da-report/target/classes/mybatis/mapper/mysql/ReportManageMapper.xml index 05095f3..4bf88c4 100644 --- a/adc-da-report/target/classes/mybatis/mapper/mysql/ReportManageMapper.xml +++ b/adc-da-report/target/classes/mybatis/mapper/mysql/ReportManageMapper.xml @@ -286,7 +286,8 @@ rm.fileId AS fileId, f.file_name as fileName, rm.confidentialLevel AS confidentialLevel, - rm.privacyLevel AS privacyLevel + rm.privacyLevel AS privacyLevel, + rm.secrecy_last AS secrecyLast FROM `tt_report_manage` AS rm LEFT JOIN ts_user AS u ON u.USID = rm.createUserId LEFT JOIN ts_org as org on org.id = rm.department diff --git a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TaskController.java b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TaskController.java index b1e65eb..387d8e1 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TaskController.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TaskController.java @@ -120,6 +120,7 @@ public class TaskController { if(userById.getOrgEOList().size()>0){ map.put("orgName",userById.getOrgEOList().get(0).getOrgName()); } + map.put("name",historicTaskInstance.get("name")); map.put("assignee", enUserName+"(" + consigner + " 委托)"); map.put("assigneeId", busProcessEntrust.getEnUserId()); map.put("prcType",one.getPrcType()); diff --git a/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TaskController$1.class b/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TaskController$1.class index 8efaceb..911f3d9 100644 Binary files a/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TaskController$1.class and b/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TaskController$1.class differ diff --git a/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TaskController.class b/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TaskController.class index ec7b55e..d72afbe 100644 Binary files a/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TaskController.class and b/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TaskController.class differ