diff --git a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java index 5910036..dec68cd 100644 --- a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java +++ b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java @@ -369,6 +369,7 @@ public class ProjectController extends BaseController { model.put("deptList", deptService.findAll()); ConcurrentHashMap searchInfo = getSearchInfo(keywords, model); model.put("pager", projectService.findMyApproveProjects(searchInfo, InterfaceUtil.getAdminId(), pageNumber, pageSize)); + model.put("Utils", FreeMarkerUtil.fromStaticPackage("cn.palmte.work.utils.Utils")); return "admin/project_list_approve"; } diff --git a/src/main/resources/templates/admin/project_list_approve.ftl b/src/main/resources/templates/admin/project_list_approve.ftl index cc875ff..935bddc 100644 --- a/src/main/resources/templates/admin/project_list_approve.ftl +++ b/src/main/resources/templates/admin/project_list_approve.ftl @@ -174,8 +174,12 @@ 序号 + 项目编号 项目名称 项目类型 + 项目合同金额 + 华智产品金额 + 其他产品金额 项目状态 审核状态 当前审核人 @@ -190,8 +194,12 @@ <#list pager.list as list> ${list.id!} + ${list.projectNo!} ${list.name!} ${list.typeDesc!} + ${Utils.format(list.contractAmount, "0.00")} + ${Utils.format(list.huazhiProductAmount, "0.00")} + ${Utils.format(list.ziguangOtherAmount, "0.00")} ${list.statusDesc!} ${list.approveStatusDesc!} ${list.approveName!}