外部单位-意见反馈列表展示调整

src/main/java/com/jeeplus/modules/externalUnit/service/ExternalUnitFeedbackService.java

@@ -126,6 +126,29 @@ public class ExternalUnitFeedbackService extends CrudService<ExternalUnitFeedbac
         page.setCountFlag(false);
         feedback.setPage(page);
         List<ExternalUnitFeedback> capitalDemandList = feedbackDao.findByProId(feedback);
+        if (capitalDemandList != null){
+            for (ExternalUnitFeedback unitFeedback : capitalDemandList) {
+                if (unitFeedback.getExaminer().contains(",")){
+                    String[] split = unitFeedback.getExaminer().split(",");
+                    StringBuilder names = new StringBuilder(); // 使用StringBuilder进行字符串拼接
+
+                    for (String s : split) {
+                        User user = UserUtils.get(s.trim()); // 可能需要去除每个子字符串前后的空格
+                        if (names.length() > 0) { // 如果不是第一个用户，先添加一个逗号
+                            names.append(",");
+                        }
+                        names.append(user.getName()); // 拼接用户名字
+                    }
+
+                    String name = names.toString();
+                    unitFeedback.setExaminer(name);
+                }else {
+                    User user = UserUtils.get(unitFeedback.getExaminer());
+                    unitFeedback.setExaminer(user.getName());
+                }
+
+            }
+        }
         page.setList(capitalDemandList);
         return page;
 

src/main/webapp/webpage/modules/externalUnit/externalUnitFeedbackList.jsp

@@ -315,7 +315,9 @@
 				{field:'index',align:'center', title: '序号',width:80}
 				,{field:'projectName',align:'center', title: '项目名称',minWidth:200,templet:function(d){
 						return "<a class=\"attention-info\" title=\"" + d.projectName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看意见反馈信息', '${ctx}/externalUnit/feedback/detail?id=" + d.id +"','95%', '95%','inputForm',' layui-border-box')\">" + d.projectName + "</a>";
-					}}
+					}}w
+				,{field:'examiner',align:'center', title: '审核人', idth:200}
+				,{field:'remarks',align:'center', title: '备注', minWidth:200}
 				,{field:'createName',align:'center', title: '创建人', width:200,templet:function(d){
 						return "<span title=\"" + d.createName + "\">" + d.createName + "</span>";
 					}}
@@ -362,6 +364,7 @@
 					,"projectId":"${feedback.projectId}"
 					,"createName":"${feedback.createBy.name}"
 					,"status":"${feedback.status}"
+					,"examiner":"${feedback.examiner}"
 					,"procId":"${feedback.processInstanceId}"
 					,"remarks":"${feedback.remarks}"
 					,"projectName":"<c:out value="${feedback.project.name}" escapeXml="true"/>"