Explorar o código

审核记录添加项目名称

yurk %!s(int64=2) %!d(string=hai) anos
pai
achega
1d2e8b1f56

+ 2 - 3
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java

@@ -1157,8 +1157,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                 List<Report> reportList = reportMapper.selectList(new QueryWrapper<Report>().in("id", ids));
                 List<Integer> collect = reportList.stream().map(rl -> rl.getProjectId()).distinct().collect(Collectors.toList());
                 List<Project> projectList = projectMapper.selectList(new QueryWrapper<Project>().in("id", collect));
-                List<String> stringList = projectList.stream().map(pl -> pl.getProjectName()).distinct().collect(Collectors.toList());
-                String s = org.apache.commons.lang3.StringUtils.join(stringList, ",");
+                String pNames = projectList.stream().map(Project::getProjectName).collect(Collectors.joining(", ", "[", "]"));
                 //对导入审核,添加记录
                 int channel = oldState == -1?0:1; //0-导入审核, 项目报告审核
                 ReportAuditLog log = new ReportAuditLog();
@@ -1167,7 +1166,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                 log.setResult("通过");
                 log.setUserId(user.getId());
                 log.setUserName(user.getName());
-                log.setProjectName(s);
+                log.setProjectName(pNames);
                 reportAuditLogMapper.insert(log);
                 //员工的日期
                 ReportAlogMembdate membdate = new ReportAlogMembdate();