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 a250688..1aeb466 100644 --- a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java +++ b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java @@ -103,6 +103,7 @@ public class ProjectController extends BaseController { } } model.put("pager", page); + model.put("Utils", FreeMarkerUtil.fromStaticPackage("cn.palmte.work.utils.Utils")); /// /*Page myApproveProjects = projectService.findMyApproveProjects(searchInfo, InterfaceUtil.getAdminId(), 1, Integer.MAX_VALUE); model.put("hasApproveProjects", CollectionUtil.isNotEmpty(myApproveProjects.getList()) ? "1" : "0");*/ @@ -116,8 +117,8 @@ public class ProjectController extends BaseController { public void export(@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 = {"name", "typeDesc", "statusDesc", "approveStatusDesc", "approveName", "creatorName", "deptName", "startDateYM", "endDateYM", "lastUpdateTime"}; + String[] headers = {"项目编号", "项目名称", "项目类型", "项目合同金额", "华智产品金额", "其他产品金额", "项目状态", "审核状态", "当前审核人", "项目创建者", "部门名称", "项目开始时间", "项目结束时间", "最后更新时间"}; + String[] exportColumns = {"projectNo", "name", "typeDesc", "contractRound", "huazhiRound", "ziguangRound", "statusDesc", "approveStatusDesc", "approveName", "creatorName", "deptName", "startDateYM", "endDateYM", "lastUpdateTime"}; ExportUtils.exportToExcel(headers, exportColumns, 1, 10000, httpServletResponse.getOutputStream(), (pN, pS) -> projectService.list(searchInfo, pN, pS).getList()); } @@ -417,6 +418,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"; } @@ -427,8 +429,8 @@ 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 = {"name", "typeDesc", "statusDesc", "approveStatusDesc", "approveName", "creatorName", "deptName", "startDate", "endDate", "lastUpdateTime"}; + String[] headers = {"项目编号", "项目名称", "项目类型", "项目合同金额", "华智产品金额", "其他产品金额", "项目状态", "审核状态", "当前审核人", "项目创建者", "部门名称", "项目开始时间", "项目结束时间", "最后更新时间"}; + String[] exportColumns = {"projectNo", "name", "typeDesc", "contractRound", "huazhiRound", "ziguangRound", "statusDesc", "approveStatusDesc", "approveName", "creatorName", "deptName", "startDate", "endDate", "lastUpdateTime"}; ExportUtils.exportToExcel(headers, exportColumns, 1, 10000, httpServletResponse.getOutputStream(), (pN, pS) -> projectService.findMyApproveProjects(searchInfo, InterfaceUtil.getAdminId(), pN, pS).getList()); } diff --git a/src/main/java/cn/palmte/work/model/Project.java b/src/main/java/cn/palmte/work/model/Project.java index 15092af..5c80b85 100644 --- a/src/main/java/cn/palmte/work/model/Project.java +++ b/src/main/java/cn/palmte/work/model/Project.java @@ -224,6 +224,15 @@ public class Project { @Transient private String CalculationCollection; + @Transient + private String contractRound; + + @Transient + private String huazhiRound; + + @Transient + private String ziguangRound; + public int getId() { return id; } @@ -543,116 +552,4 @@ public class Project { public void setPlanEndStr(String planEndStr) { this.planEndStr = planEndStr; } - - public String getUnderwrittenModeDesc() { - return underwrittenModeDesc; - } - - public void setUnderwrittenModeDesc(String underwrittenModeDesc) { - this.underwrittenModeDesc = underwrittenModeDesc; - } - - public String getCertainty() { - return certainty; - } - - public void setCertainty(String certainty) { - this.certainty = certainty; - } - - public BigDecimal getGrossProfit() { - return grossProfit; - } - - public void setGrossProfit(BigDecimal grossProfit) { - this.grossProfit = grossProfit; - } - - public BigDecimal getGrossProfitMargin() { - return grossProfitMargin; - } - - public void setGrossProfitMargin(BigDecimal grossProfitMargin) { - this.grossProfitMargin = grossProfitMargin; - } - - public BigDecimal getHuizhiProductAmount() { - return huizhiProductAmount; - } - - public void setHuizhiProductAmount(BigDecimal huizhiProductAmount) { - this.huizhiProductAmount = huizhiProductAmount; - } - - public BigDecimal getHuasanProductAmount() { - return huasanProductAmount; - } - - public void setHuasanProductAmount(BigDecimal huasanProductAmount) { - this.huasanProductAmount = huasanProductAmount; - } - - public String getPrincipal() { - return principal; - } - - public void setPrincipal(String principal) { - this.principal = principal; - } - - public Date getContractTime() { - return contractTime; - } - - public void setContractTime(Date contractTime) { - this.contractTime = contractTime; - } - - public Date getBidsTime() { - return bidsTime; - } - - public void setBidsTime(Date bidsTime) { - this.bidsTime = bidsTime; - } - - public String getIsSecondStr() { - return isSecondStr; - } - - public void setIsSecondStr(String isSecondStr) { - this.isSecondStr = isSecondStr; - } - - public String getSignTypeStr() { - return signTypeStr; - } - - public void setSignTypeStr(String signTypeStr) { - this.signTypeStr = signTypeStr; - } - - public String getResolvePlanStr() { - return resolvePlanStr; - } - - public void setResolvePlanStr(String resolvePlanStr) { - this.resolvePlanStr = resolvePlanStr; - } - - public String getMainContractResolvePlan() { - return mainContractResolvePlan; - } - - public void setMainContractResolvePlan(String mainContractResolvePlan) { - this.mainContractResolvePlan = mainContractResolvePlan; - } - - public String getCalculationCollection() { - return CalculationCollection; - } - - public void setCalculationCollection(String calculationCollection) { - CalculationCollection = calculationCollection; - } } diff --git a/src/main/java/cn/palmte/work/service/ProjectService.java b/src/main/java/cn/palmte/work/service/ProjectService.java index 9014abc..62382d9 100644 --- a/src/main/java/cn/palmte/work/service/ProjectService.java +++ b/src/main/java/cn/palmte/work/service/ProjectService.java @@ -52,7 +52,7 @@ public class ProjectService { "CASE p.status WHEN 0 THEN '草稿' WHEN 1 THEN '项目创建' WHEN 5 THEN '概算完成' WHEN 10 THEN '预算完成' WHEN 15 THEN '结算中' WHEN 20 THEN '决算完成' ELSE '未知' AS statusDesc," + "CASE p.approve_status WHEN 0 THEN '待审核' WHEN 1 THEN '审核通过' WHEN 2 THEN '审核不通过' ELSE '未知' AS approveStatusDesc," + */ - QueryHelper queryHelper = new QueryHelper("SELECT p.*","project","p"); + QueryHelper queryHelper = new QueryHelper("SELECT p.*, FORMAT(p.contract_amount,2) as contractRound, FORMAT(p.huazhi_product_amount,2) as huazhiRound, FORMAT(p.ziguang_other_amount,2) as ziguangRound","project","p"); if(StrUtil.isNotEmpty(searchInfo.get("status")) && !"-1".equals(searchInfo.get("status"))){ queryHelper.addCondition("p.status=?", Integer.parseInt(searchInfo.get("status"))); } @@ -181,6 +181,7 @@ public class ProjectService { //只有如下可以修改 projectInDb.setName(project.getName()); + projectInDb.setProjectNo(project.getProjectNo()); projectInDb.setCustomer(project.getCustomer()); projectInDb.setTerminalCustomer(project.getTerminalCustomer()); projectInDb.setIndustryScenario(project.getIndustryScenario()); diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl index fb2e47c..cb87402 100644 --- a/src/main/resources/templates/admin/project_approve.ftl +++ b/src/main/resources/templates/admin/project_approve.ftl @@ -116,7 +116,7 @@
  • class="am-active">项目基本信息
    • <#if project.status==1 || project.status==5 || project.status==10 || project.status==15> -
  • 项目概算信息
    • +
  • 项目立项(概算)信息
    • <#if project.status==5 || project.status==10 || project.status==15>
  • 项目预算信息
    • @@ -164,7 +164,7 @@
    <#----> - +
    diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl index b5df41e..b319292 100644 --- a/src/main/resources/templates/admin/project_budget_edit.ftl +++ b/src/main/resources/templates/admin/project_budget_edit.ftl @@ -44,7 +44,7 @@
    - +
    +
    *项目编号
    +
    + +
    +
    +
    *项目名称
    diff --git a/src/main/resources/templates/admin/project_estimate_add.ftl b/src/main/resources/templates/admin/project_estimate_add.ftl index 9406e4c..ef0924e 100644 --- a/src/main/resources/templates/admin/project_estimate_add.ftl +++ b/src/main/resources/templates/admin/project_estimate_add.ftl @@ -4,7 +4,7 @@
    -
    项目概算表
    +
    项目立项(概算)表
    diff --git a/src/main/resources/templates/admin/project_estimate_edit.ftl b/src/main/resources/templates/admin/project_estimate_edit.ftl index 700657d..7072a30 100644 --- a/src/main/resources/templates/admin/project_estimate_edit.ftl +++ b/src/main/resources/templates/admin/project_estimate_edit.ftl @@ -12,7 +12,7 @@
    -
    项目概算表 / ${project.name}
    +
    项目立项(概算)表 / ${project.name}
    @@ -67,7 +67,7 @@
    + value="${project.projectNo!}" required />
    diff --git a/src/main/resources/templates/admin/project_list.ftl b/src/main/resources/templates/admin/project_list.ftl index 2856616..e4f1cf3 100644 --- a/src/main/resources/templates/admin/project_list.ftl +++ b/src/main/resources/templates/admin/project_list.ftl @@ -197,12 +197,12 @@ <#list pager.list as list> ${list.tempId!} - ${list.projectNo!} + ${list.projectNo!} ${list.name!} ${list.typeDesc!} - ${list.contractAmount!} - ${list.huazhiProductAmount!} - ${list.ziguangOtherAmount!} + ${Utils.format(list.contractAmount, "0.00")} + ${Utils.format(list.huazhiProductAmount, "0.00")} + ${Utils.format(list.ziguangOtherAmount, "0.00")} ${list.statusDesc!} ${list.approveStatusDesc!} ${list.approveName!} @@ -387,7 +387,7 @@
    - +
    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!}