DZ/faw-report-library-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci:将部分orgName改为longName

Browse Source
This commit is contained in:
mzaxd
2023-05-16 18:01:02 +08:00
parent 5219263cae
commit d454c7e3a6
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java
+1 -1
View File
@@ -693,7 +693,7 @@ public class IReportServiceImpl extends ServiceImpl<ReportDao, ReportEntity>
String[] idArray = department.split(","); String[] idArray = department.split(",");
List<OrgEO> orgEOList = orgEOService.query().in("ID", idArray).list(); List<OrgEO> orgEOList = orgEOService.query().in("ID", idArray).list();
if (CollectionUtils.isNotEmpty(orgEOList)) { if (CollectionUtils.isNotEmpty(orgEOList)) {
String departmentName = orgEOList.stream().map(OrgEO::getOrgName).collect(Collectors.joining(",")); String departmentName = orgEOList.stream().map(OrgEO::getLongName).collect(Collectors.joining(","));
reportDetailVo.setDepartmentName(departmentName); reportDetailVo.setDepartmentName(departmentName);
} }
} }
report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TaskController.java
+2 -2
View File
@@ -101,7 +101,7 @@ public class TaskController {
historicTaskInstance.put("assignee", assignee.getUsname()); historicTaskInstance.put("assignee", assignee.getUsname());
historicTaskInstance.put("assigneeId", assignee.getUsid()); historicTaskInstance.put("assigneeId", assignee.getUsid());
if(assignee.getOrgEOList().size()>0){ if(assignee.getOrgEOList().size()>0){
historicTaskInstance.put("orgName",assignee.getOrgEOList().get(0).getOrgName()); historicTaskInstance.put("orgName",assignee.getOrgEOList().get(0).getLongName());
} }
QueryWrapper queryWrapper2 = new QueryWrapper(); QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("TASK_ID",historicTaskInstance.get("id")); queryWrapper2.eq("TASK_ID",historicTaskInstance.get("id"));
@@ -118,7 +118,7 @@ public class TaskController {
UserVO userById = userEoService.getUserByIdNodel(busProcessEntrust.getEnUserId()); UserVO userById = userEoService.getUserByIdNodel(busProcessEntrust.getEnUserId());
String enUserName = userById.getUsname(); String enUserName = userById.getUsname();
if(userById.getOrgEOList().size()>0){ if(userById.getOrgEOList().size()>0){
map.put("orgName",userById.getOrgEOList().get(0).getOrgName()); map.put("orgName",userById.getOrgEOList().get(0).getLongName());
} }
map.put("name",historicTaskInstance.get("name")); map.put("name",historicTaskInstance.get("name"));
map.put("assignee", enUserName+"(" + consigner + " 委托)"); map.put("assignee", enUserName+"(" + consigner + " 委托)");