From b2acf107171f892b53ea5a7560468e2e4d96b297 Mon Sep 17 00:00:00 2001 From: "suhang_max@163.com" Date: Thu, 8 Dec 2022 21:44:08 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E9=9A=90=E8=97=8F=E7=AD=9B=E9=80=89?= =?UTF-8?q?=E9=A1=B9=EF=BC=9B=E4=BF=AE=E6=94=B9=E8=A1=A8=E6=A0=BC=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/admin/project_list.ftl | 27 ++- .../templates/admin/project_list_approve.ftl | 116 +++++------ .../resources/templates/admin/space_list.ftl | 186 +++++++++++------- 3 files changed, 191 insertions(+), 138 deletions(-) diff --git a/src/main/resources/templates/admin/project_list.ftl b/src/main/resources/templates/admin/project_list.ftl index bcedf80..bc8cbb2 100644 --- a/src/main/resources/templates/admin/project_list.ftl +++ b/src/main/resources/templates/admin/project_list.ftl @@ -64,7 +64,6 @@ .fixed-list table tbody tr { width: 100%; } -
@@ -299,14 +298,14 @@
-
直签
-
- -
+
直签
+
+ +
@@ -794,7 +793,7 @@ } - + --> <#----> <#----> - + - + <#list pager.list as list> --> <#--操作--> - + + + + + + + +
@@ -832,11 +831,11 @@ <#--部门名称项目周期最后更新时间操作操作
@@ -920,7 +919,7 @@ <#--最后更新时间--> <#--${(list.lastUpdateTime?string("yyyy-MM-dd HH:mm:ss"))!} +
<#if adminId==1> @@ -1418,7 +1417,7 @@ $("#extend").text("扩展筛选项"); } else { $(".extendCondition").show(); - $('.expand-section').show() + $('.expand-section').show(); $("#extend").val(0); $("#extend").text("隐藏筛选项"); } diff --git a/src/main/resources/templates/admin/project_list_approve.ftl b/src/main/resources/templates/admin/project_list_approve.ftl index 00fcf42..6f788ae 100644 --- a/src/main/resources/templates/admin/project_list_approve.ftl +++ b/src/main/resources/templates/admin/project_list_approve.ftl @@ -64,7 +64,6 @@ .fixed-list table tbody tr { width: 100%; } -
@@ -481,44 +480,45 @@ } - - + + - - - + <#----> + <#----> + <#----> - - - - - - - - - - - - - - - - - - - + + <#----> + <#----> + <#----> + <#-- --> + <#----> + <#----> + <#----> + <#----> + <#----> + <#----> + <#----> + <#----> + <#----> + <#----> + <#----> + <#----> + <#----> + <#----> + <#----> - - - + <#----> + <#----> + <#----> - + <#list pager.list as list> <#--序号--> @@ -532,63 +532,68 @@ <#--项目类型--> <#--垫资模式--> - + <#----> <#--垫资利息--> - + <#----> <#--垫资峰值--> - + <#----> <#--项目合同金额--> + <#--项目阶段--> + <#--项目毛利--> - + <#----> <#--项目毛利率--> - + <#----> <#--项目把握度--> - + <#----> <#--汇智产品金额--> - + <#----> <#--华智产品金额--> - + <#----> <#--华三产品金额--> - + <#----> <#--其他产品金额--> - + <#----> <#--项目状态--> - + <#----> <#--行业场景应用--> - + <#----> <#--解决方案--> - + <#----> <#--客户名称--> - + <#----> <#--最终用户名称--> - + <#----> <#--预计合同签订时间--> - + <#----> <#--项目计划招标时间--> - + <#----> <#--是否二次合作--> - + <#----> <#--直签--> - + <#----> <#--战略合作对象--> - + <#----> <#--项目负责人--> - + <#----> <#--审核状态--> - + <#----> <#--当前审核人--> <#--项目创建者--> <#--部门名称--> - + <#----> <#--项目周期--> - + <#----> <#--最后更新时间--> - + <#----> <#--操作--> - + + @@ -320,34 +329,61 @@ <#list pager.list as list> + <#--序号--> + <#--项目编号--> + <#--项目名称--> + <#--项目类型--> + <#--合作类型--> + + <#--项目阶段--> + + <#--垫资模式--> + <#--华智产品金额--> + <#--华三产品金额--> + <#--汇智产品金额--> + <#--其他产品金额--> <#-- --> <#-- --> <#-- --> <#-- --> + <#--项目把握度--> + <#--项目计划招标时间--> + <#--预计合同签订时间--> + <#--计收计划--> + <#--项目毛利--> + <#--合同金额--> <#-- --> <#-- --> + <#--项目解决方案--> + <#--具体解决方案--> + <#--是否二次签单--> + <#--最终用户名称--> + <#--客户名称--> + <#--紫光汇智直接投标/集成商转签--> + <#--负责人--> + <#--备注--> @@ -394,6 +430,20 @@ }; $(function () { + $("#extend").on("click", function () { + var extend = $("#extend").val(); + if (extend === '0') { + // $(".extendCondition").hide(); + $('.expand-section').hide() + $("#extend").val(1); + $("#extend").text("扩展筛选项"); + } else { + // $(".extendCondition").show(); + $('.expand-section').show(); + $("#extend").val(0); + $("#extend").text("隐藏筛选项"); + } + }); $("#submit-btn").on("click", function () { $("#pageNumber").val(1); From 990cc15740061e42f685e70253c622ce42d7916a Mon Sep 17 00:00:00 2001 From: hanbo <2608504783@qq.com> Date: Fri, 9 Dec 2022 15:58:11 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=98=B6=E6=AE=B5?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/backend/ProjectController.java | 1 - .../templates/admin/project_estimate_add.ftl | 27 +++++++++ .../templates/admin/project_list.ftl | 56 ++++++++++--------- .../templates/admin/project_list_approve.ftl | 23 ++++++++ 4 files changed, 79 insertions(+), 28 deletions(-) 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 cbad382..f020906 100644 --- a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java +++ b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java @@ -848,7 +848,6 @@ public class ProjectController extends BaseController { @RequestMapping("/info/{projectId}") public ResponseMsg info(@PathVariable int projectId,Map model) { Project project = projectService.getProject(projectId); - model.put("info",project); return ResponseMsg.buildSuccessData(project); } diff --git a/src/main/resources/templates/admin/project_estimate_add.ftl b/src/main/resources/templates/admin/project_estimate_add.ftl index dc87a67..801b505 100644 --- a/src/main/resources/templates/admin/project_estimate_add.ftl +++ b/src/main/resources/templates/admin/project_estimate_add.ftl @@ -326,6 +326,33 @@ > + + + + + + + +
序号 项目编号 项目名称 项目类型垫资模式垫资利息垫资峰值垫资模式垫资利息垫资峰值项目合同金额项目毛利项目毛利率项目把握度汇智产品金额华智产品金额华三产品金额其他产品金额项目状态行业场景应用解决方案客户名称最终用户名称预计合同签订时间项目计划招标时间是否二次合作直签战略合作对象项目负责人审核状态项目阶段项目毛利项目毛利率项目把握度汇智产品金额华智产品金额华三产品金额其他产品金额项目状态行业场景应用解决方案客户名称最终用户名称预计合同签订时间项目计划招标时间是否二次合作直签战略合作对象项目负责人审核状态当前审核人 项目创建者部门名称项目周期最后更新时间部门名称项目周期最后更新时间操作
${list.typeDesc!}${list.underwrittenModeStr!}${list.underwrittenModeStr!}${Utils.format(list.advanceInterestAmount, "0.00")}${Utils.format(list.advanceInterestAmount, "0.00")}${Utils.format(list.advancePeakAmount, "0.00")}${Utils.format(list.advancePeakAmount, "0.00")}${Utils.format(list.contractAmount, "0.00")} + 找后端要字段 + <#--${Utils.format(list.contractAmount, "0.00")}--> + ${Utils.format(list.grossProfit, "0.00")}${Utils.format(list.grossProfit, "0.00")}${Utils.format(list.grossProfitMargin, "0.00")}${Utils.format(list.grossProfitMargin, "0.00")}${list.certaintyStr!}${list.certaintyStr!}${Utils.format(list.huizhiProductAmount, "0.00")}${Utils.format(list.huizhiProductAmount, "0.00")}${Utils.format(list.huazhiProductAmount, "0.00")}${Utils.format(list.huazhiProductAmount, "0.00")}${Utils.format(list.huasanProductAmount, "0.00")}${Utils.format(list.huasanProductAmount, "0.00")}${Utils.format(list.ziguangOtherAmount, "0.00")}${Utils.format(list.ziguangOtherAmount, "0.00")}${list.statusDesc!}${list.statusDesc!}${list.industryScenario!}${list.industryScenario!}${list.resolvePlanStr!}${list.resolvePlanStr!}${list.customer!}${list.customer!}${list.terminalCustomer!}${list.terminalCustomer!}${(list.contractTime?string("yyyy-MM-dd"))!}${(list.contractTime?string("yyyy-MM-dd"))!}${(list.bidsTime?string("yyyy-MM-dd"))!}${(list.bidsTime?string("yyyy-MM-dd"))!}${list.isSecondStr!}${list.isSecondStr!}${list.signTypeStr!}${list.signTypeStr!}${list.collaborator!}${list.collaborator!}${list.principal!}${list.principal!}${list.approveStatusDesc!}${list.approveStatusDesc!}${list.approveName!}${list.creatorName!}${list.deptName!}${list.deptName!}${(list.startDate?string("yyyy-MM"))!} ~ ${(list.endDate?string("yyyy-MM"))!}${(list.startDate?string("yyyy-MM"))!} ~ ${(list.endDate?string("yyyy-MM"))!}${(list.lastUpdateTime?string("yyyy-MM-dd HH:mm:ss"))!}${(list.lastUpdateTime?string("yyyy-MM-dd HH:mm:ss"))!} +
<#--
-
diff --git a/src/main/resources/templates/admin/space_list.ftl b/src/main/resources/templates/admin/space_list.ftl index ec04d6c..8b411df 100644 --- a/src/main/resources/templates/admin/space_list.ftl +++ b/src/main/resources/templates/admin/space_list.ftl @@ -191,84 +191,91 @@ - -
-
-
项目负责人
-
- -
-
-
-
审核状态
-
- -
-
-
-
是否二次合作
-
- -
-
-
-
项目解决方案
-
- -
-
-
- -
-
-
项目周期
-
-
- - + +
+ +
+
+
项目负责人
+
+
-
至
-
- - +
+
+
审核状态
+
+ +
+
+
+
是否二次合作
+
+ +
+
+
+
项目解决方案
+
+
-
-
预计合同签订时间
-
-
- - + +
+
+
项目周期
+
+
+ + +
+
至
+
+ + +
-
至
-
- - +
+
+
预计合同签订时间
+
+
+ + +
+
至
+
+ + +
+
+ @@ -296,6 +303,8 @@
项目编号 项目名称 项目类型合作类型项目阶段 垫资模式 华智产品金额 华三产品金额
${list.tempId!}${list.projectNo!}${list.name!}${list.typeDesc!}${'找后端要字段'!}${'找后端要字段'!}${list.underwrittenModeStr!}${list.huazhiRound!}${list.huasanRound!}${list.huizhiRound!}${list.ziguangRound!}${Utils.format(list.huazhiProductAmount, "0.00")}${Utils.format(list.huasanProductAmount, "0.00")}${Utils.format(list.huizhiProductAmount, "0.00")}${Utils.format(list.ziguangOtherAmount, "0.00")}${list.certaintyStr!}${(list.bidsTime?string("yyyy-MM-dd"))!}${(list.contractTime?string("yyyy-MM-dd"))!}${list.calculationCollection!}${list.grossProfitRound!}${list.contractRound!}${Utils.format(list.grossProfit, "0.00")}${Utils.format(list.contractAmount, "0.00")}${list.resolvePlanStr!}${list.mainContractResolvePlan!}${list.isSecondStr!}${list.terminalCustomer!}${list.customer!}${list.signTypeStr!}${list.principal!}${list.remark!}
项目阶段: + +
当前进度描述: + +
<#--
--> <#--
--> diff --git a/src/main/resources/templates/admin/project_list.ftl b/src/main/resources/templates/admin/project_list.ftl index bc8cbb2..4ba05cb 100644 --- a/src/main/resources/templates/admin/project_list.ftl +++ b/src/main/resources/templates/admin/project_list.ftl @@ -456,18 +456,18 @@
项目阶段
- - - - - - - - - - - + + + + + + + + + +
@@ -1229,17 +1229,17 @@ *项目阶段
@@ -1388,8 +1388,8 @@ keywordsObj.otherStart = $("#otherStart").val(); if ($("#otherEnd").val()) keywordsObj.otherEnd = $("#otherEnd").val(); - if ($("#qstage").val()) - keywordsObj.stage = $("#qstage").val(); + if ($("#stage").val()) + keywordsObj.stage = $("#stage").val(); } if ($("#customer").val()) keywordsObj.customer = $("#customer").val(); @@ -1530,6 +1530,8 @@ keywordsObj.otherStart = $("#otherStart").val(); if ($("#otherEnd").val()) keywordsObj.otherEnd = $("#otherEnd").val(); + if ($("#stage").val()) + keywordsObj.stage = $("#stage").val(); } if ($("#customer").val()) keywordsObj.customer = $("#customer").val(); @@ -1635,8 +1637,7 @@ * 项目阶段更新保存 */ var stageRefreshSave = function () { - var stage = $("#stage").val(); - console.info("=============="+stage); + var stage = $("#modalStage").val(); var stageRemark = $("#stageRemark").val(); var projectId = $("#stageProjectId").val(); if (stage == '') { @@ -1808,7 +1809,8 @@ type: 'post', async: false, success: function (data) { - $("#stage").val(data.data.stage); + $("#modalStage").val(data.data.stage); + $("#modalStage option[value='"+data.data.stage+"']").attr("selected","selected"); $("#stageRemark").val(data.data.stageRemark); } }); diff --git a/src/main/resources/templates/admin/project_list_approve.ftl b/src/main/resources/templates/admin/project_list_approve.ftl index 6f788ae..a58c675 100644 --- a/src/main/resources/templates/admin/project_list_approve.ftl +++ b/src/main/resources/templates/admin/project_list_approve.ftl @@ -448,6 +448,27 @@
+ +
+
+
项目阶段
+
+ +
+
+
@@ -737,6 +758,8 @@ keywordsObj.otherStart = $("#otherStart").val(); if ($("#otherEnd").val()) keywordsObj.otherEnd = $("#otherEnd").val(); + if ($("#stage").val()) + keywordsObj.stage = $("#stage").val(); } if ($("#customer").val()) keywordsObj.customer = $("#customer").val(); From 981dfcdf328c0e6fcd706e5bac400f5f13a3c49e Mon Sep 17 00:00:00 2001 From: hanbo <2608504783@qq.com> Date: Fri, 9 Dec 2022 16:27:21 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=98=B6=E6=AE=B5?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/backend/ProjectController.java | 4 +-- .../java/cn/palmte/work/model/Project.java | 11 +++++++ .../palmte/work/service/ProjectService.java | 31 +++++++++++++++++++ .../templates/admin/project_estimate_add.ftl | 1 - .../templates/admin/project_estimate_edit.ftl | 26 ++++++++++++++++ 5 files changed, 70 insertions(+), 3 deletions(-) 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 f020906..c5a6281 100644 --- a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java +++ b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java @@ -143,10 +143,10 @@ public class ProjectController extends BaseController { downloadHeader(httpServletResponse, Utils.generateExcelName("项目报表"), "application/octet-stream"); 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", "startDate", "endDate", "lastUpdateTime"}; + "principal", "valueRisk", "mainContractCollectionTerms", "mainContractResolvePlan", "calculationCollection", "approveStatusDesc", "approveName", "creatorName", "deptName","stageName", "startDate", "endDate", "lastUpdateTime"}; ExportUtils.exportToExcel(headers, exportColumns, 1, 10000, httpServletResponse.getOutputStream(), (pN, pS) -> projectService.list(searchInfo, 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 0ee22b2..63af0c3 100644 --- a/src/main/java/cn/palmte/work/model/Project.java +++ b/src/main/java/cn/palmte/work/model/Project.java @@ -329,6 +329,9 @@ public class Project { @Transient private String actTaskName; + @Transient + private String stageName; + public int getId() { return id; } @@ -1025,4 +1028,12 @@ public class Project { public void setStageRemark(String stageRemark) { this.stageRemark = stageRemark; } + + public String getStageName() { + return stageName; + } + + public void setStageName(String stageName) { + this.stageName = stageName; + } } diff --git a/src/main/java/cn/palmte/work/service/ProjectService.java b/src/main/java/cn/palmte/work/service/ProjectService.java index 6fe1798..4c5ca49 100644 --- a/src/main/java/cn/palmte/work/service/ProjectService.java +++ b/src/main/java/cn/palmte/work/service/ProjectService.java @@ -286,11 +286,42 @@ public class ProjectService { project.setAdvancePeakAmountRound(project.getAdvancePeakAmountRound2()); project.setAdvanceInterestAmountRound(project.getAdvanceInterestAmountRound2()); } + if(null == project.getStage()){ + project.setStageName(getStageName(-1)); + }else { + project.setStageName(getStageName(project.getStage())); + } } } return page; } + public String getStageName(int stage){ + if(stage == 0){ + return "S0-概算立项"; + }else if(stage == 1){ + return "S1-项目调研"; + }else if(stage == 2){ + return "S2-方案设计"; + }else if(stage == 3){ + return "S3-预算评估"; + }else if(stage == 4){ + return "S4-招标期"; + }else if(stage == 5){ + return "S5-合同期"; + }else if(stage == 6){ + return "S6-交付期"; + }else if(stage == 7){ + return "S7-结算期"; + }else if(stage == 8){ + return "S8-决算期"; + }else if(stage == 9){ + return "L-项目丢失"; + }else { + return "无项目阶段"; + } + } + /** * 找到待我审核项目 diff --git a/src/main/resources/templates/admin/project_estimate_add.ftl b/src/main/resources/templates/admin/project_estimate_add.ftl index 801b505..2996d5d 100644 --- a/src/main/resources/templates/admin/project_estimate_add.ftl +++ b/src/main/resources/templates/admin/project_estimate_add.ftl @@ -330,7 +330,6 @@
项目阶段:
项目阶段: + +
当前进度描述: + +
From d9d8bbb8a2591959e79b51f561dfb3ef4238f315 Mon Sep 17 00:00:00 2001 From: hanbo <2608504783@qq.com> Date: Fri, 9 Dec 2022 16:50:49 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=98=B6=E6=AE=B5?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/admin/project_estimate_edit.ftl | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/resources/templates/admin/project_estimate_edit.ftl b/src/main/resources/templates/admin/project_estimate_edit.ftl index ae35a38..80ff6ed 100644 --- a/src/main/resources/templates/admin/project_estimate_edit.ftl +++ b/src/main/resources/templates/admin/project_estimate_edit.ftl @@ -375,16 +375,16 @@ 项目阶段: