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 0b3c747..716044e 100644 --- a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java +++ b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java @@ -511,11 +511,35 @@ public class ProjectController extends BaseController { @RequestParam(value = PAGE_NUMBER, defaultValue = DEFAULT_PAGE_NUMBER) int pageNumber, @RequestParam(value = PAGE_SIZE, defaultValue = DEFAULT_PAGE_SIZE) int pageSize, Map model) { +// //当前登录人的角色类型 +// model.put("keywords", keywords); +// model.put("deptList", deptService.findAll()); +// ConcurrentHashMap searchInfo = getSearchInfo(keywords, model); +// model.put("pager", projectService.findMyApproveProjects(searchInfo, InterfaceUtil.getAdminId(), pageNumber, pageSize)); //当前登录人的角色类型 model.put("keywords", keywords); + model.put("adminId", InterfaceUtil.getAdminId()); + model.put("admin", InterfaceUtil.getAdmin()); model.put("deptList", deptService.findAll()); ConcurrentHashMap searchInfo = getSearchInfo(keywords, model); - model.put("pager", projectService.findMyApproveProjects(searchInfo, InterfaceUtil.getAdminId(), pageNumber, pageSize)); + model.putIfAbsent("extend", "0"); + Page page = projectService.list(searchInfo, pageNumber, pageSize); + List list = page.getList(); + if(CollectionUtil.isNotEmpty(list)){ + + //查询项目当前审批任务节点 + for (Project project : list) { + Task currentTask = actUtil.getCurrentTask(project.getId()); + String actTaskName = currentTask == null ? "" : currentTask.getName(); + project.setActTaskName(actTaskName); + } + + int offset = (pageNumber - 1) * pageSize; + for (int i = 0 , size = list.size(); i < size; i++) { + list.get(i).setTempId(i+1 + offset); + } + } + model.put("pager", page); model.put("Utils", FreeMarkerUtil.fromStaticPackage("cn.palmte.work.utils.Utils")); return "admin/project_list_approve"; } @@ -527,8 +551,12 @@ public class ProjectController extends BaseController { public void exportApprove(@RequestParam(value = "keywords", required = false) String keywords, HttpServletResponse httpServletResponse) throws IOException { Map searchInfo = getSearchInfo(keywords); downloadHeader(httpServletResponse, Utils.generateExcelName("待我审核项目报表"), "application/octet-stream"); - String[] headers = {"项目编号", "项目名称", "项目类型", "项目合同金额", "华智产品金额", "其他产品金额", "项目状态", "审核状态", "当前审核人", "项目创建者", "部门名称", "项目开始时间", "项目结束时间", "最后更新时间"}; - String[] exportColumns = {"projectNo", "name", "typeDesc", "contractRound", "huazhiRound", "ziguangRound", "statusDesc", "approveStatusDesc", "approveName", "creatorName", "deptName", "startDate", "endDate", "lastUpdateTime"}; + String[] headers = {"项目编号", "项目名称", "项目类型", "垫资模式", "垫资利息", "垫资峰值", "项目合同金额", "项目毛利", "项目毛利率", "项目把握度", "汇智产品金额", "华智产品金额", + "华三产品金额", "其他产品金额", "项目状态", "行业场景应用", "解决方案", "客户名称", "终端客户名称", "预计合同签订时间", "项目计划招标时间", "是否二次合作", "签单方式", "合作对象", + "项目负责人", "价值及风险", "主合同收款条款", "主合同具体解决方案", "计收计划", "审核状态", "当前审核人", "项目创建者", "部门名称", "项目开始时间", "项目结束时间", "最后更新时间"}; + String[] exportColumns = {"projectNo", "name", "typeDesc", "underwrittenModeStr", "advanceInterestAmountRound", "advancePeakAmountRound", "contractRound", "grossProfitRound", "grossProfitMarginRound", "certaintyStr", "huizhiRound", "huazhiRound", + "huasanRound", "ziguangRound", "statusDesc", "industryScenario", "resolvePlan", "customer", "terminalCustomer", "contractTime", "bidsTime", "isSecondStr", "signTypeStr", "collaborator", + "principal", "valueRisk", "mainContractCollectionTerms", "mainContractResolvePlan", "calculationCollection", "approveStatusDesc", "approveName", "creatorName", "deptName", "startDateYM", "endDateYM", "lastUpdateTime"}; ExportUtils.exportToExcel(headers, exportColumns, 1, 10000, httpServletResponse.getOutputStream(), (pN, pS) -> projectService.findMyApproveProjects(searchInfo, InterfaceUtil.getAdminId(), pN, pS).getList()); } diff --git a/src/main/resources/templates/admin/project_list_approve.ftl b/src/main/resources/templates/admin/project_list_approve.ftl index 935bddc..fabf16a 100644 --- a/src/main/resources/templates/admin/project_list_approve.ftl +++ b/src/main/resources/templates/admin/project_list_approve.ftl @@ -23,53 +23,24 @@ - - + + + - - + - - - - - - - - - - - - - + + + + + + + + + + + + + - - + - - + + + + + + + + hidden> + + + + + + + + + + + hidden> + + + + + + + + - @@ -177,10 +291,28 @@ + + + + + + + + + + + + + + + + + + @@ -191,22 +323,40 @@ - <#list pager.list as list> + <#list pager.list as list> - - + + + + + + + + + + + + + + + + + + + + - - + +
项目名称 + 项目编号 +
+ +
+ 		项目名称
项目创建者 + 项目状态
- -
-
项目类型 -
- -
- 		部门名称 -
- -
-
项目状态 -
- @@ -78,73 +49,216 @@
审核状态 + 项目创建者
- +
+
部门名称 +
+ +
+ 		项目类型 +
+ +
+ 		垫资模式 +
+ +
+ 		项目把握度 +
+
项目周期 + 客户名称
-
-
- - -
-
至
-
- - -
-
+
最后更新时间 + 终端客户名称 +
+ +
+ 		项目负责人 +
+ +
+ 		审核状态 +
+ +
+
是否二次合作 +
+ +
+ 		签单方式 +
+ +
+ 		行业场景 +
+ +
+ 		项目解决方案 +
+ +
+
最后更新时间
+ value="${startUpdateDate!}" placeholder="开始日期" autocomplete="off" data-am-datepicker>
至
+ value="${endUpdateDate!}" placeholder="结束日期" autocomplete="off" data-am-datepicker>
项目周期 +
+
+
+ + +
+
至
+
+ + +
+
+
+ 		预计合同签订时间 +
+
+
+ + +
+
至
+
+ + +
+
+
+ 		+ +
+
- <@shiro.hasPermission name="APPROVE_QUERY"> + <@shiro.hasPermission name="APPROVE_QUERY"> + <@shiro.hasPermission name="APPROVE_EXPORT"> - +
项目编号 项目名称 项目类型垫资模式垫资利息垫资峰值 项目合同金额项目毛利项目毛利率项目把握度汇智产品金额 华智产品金额华三产品金额 其他产品金额 项目状态行业场景应用解决方案客户名称终端客户名称预计合同签订时间项目计划招标时间是否二次合作签单方式战略合作对象项目负责人 审核状态 当前审核人 项目创建者
${list.id!}${list.projectNo!}${list.tempId!}${list.projectNo!} ${list.name!} ${list.typeDesc!}${list.underwrittenModeStr!}${Utils.format(list.advanceInterestAmount, "0.00")}${Utils.format(list.advancePeakAmount, "0.00")} ${Utils.format(list.contractAmount, "0.00")}${Utils.format(list.grossProfit, "0.00")}${Utils.format(list.grossProfitMargin, "0.00")}${list.certaintyStr!}${Utils.format(list.huizhiProductAmount, "0.00")} ${Utils.format(list.huazhiProductAmount, "0.00")}${Utils.format(list.huasanProductAmount, "0.00")} ${Utils.format(list.ziguangOtherAmount, "0.00")} ${list.statusDesc!}${list.industryScenario!}${list.resolvePlanStr!}${list.customer!}${list.terminalCustomer!}${(list.contractTime?string("yyyy-MM-dd HH:mm:ss"))!}${(list.bidsTime?string("yyyy-MM-dd HH:mm:ss"))!}${list.isSecondStr!}${list.signTypeStr!}${list.collaborator!}${list.principal!} ${list.approveStatusDesc!} ${list.approveName!} ${list.creatorName!} ${list.deptName!}${list.startDate?string("yyyy-MM")} ~ ${list.endDate?string("yyyy-MM")}${list.lastUpdateTime?string("yyyy-MM-dd HH:mm:ss")}${(list.startDate?string("yyyy-MM"))!} ~ ${(list.endDate?string("yyyy-MM"))!}${(list.lastUpdateTime?string("yyyy-MM-dd HH:mm:ss"))!}
@@ -263,22 +413,39 @@