From 60209e41e197a77b3a9eacf263fe838f43ddb11a Mon Sep 17 00:00:00 2001 From: OathK1per Date: Tue, 16 Aug 2022 14:35:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=9B=E7=AE=97=E6=A6=82=E7=AE=97=EF=BC=8C?= =?UTF-8?q?=E5=90=88=E4=BD=9C=E5=AF=B9=E8=B1=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/backend/ProjectController.java | 12 ++ .../work/service/ProjectBudgetService.java | 2 +- .../palmte/work/service/ProjectService.java | 52 +++++ .../static/assets/js/project_budget.js | 6 + .../templates/admin/project_approve.ftl | 19 +- .../templates/admin/project_budget_edit.ftl | 120 +++++++++--- .../templates/admin/project_estimate_add.ftl | 135 ++++++++++--- .../templates/admin/project_estimate_edit.ftl | 179 +++++++++++++----- 8 files changed, 423 insertions(+), 102 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 7b69a1d..473f565 100644 --- a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java +++ b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java @@ -768,4 +768,16 @@ public class ProjectController extends BaseController { return ResponseMsg.buildSuccessMsg("提交成功"); } + + /** + * 下载文件 + */ + @RequestMapping("/downloadUrl") + @ResponseBody + public void downloadUrl(int id, HttpServletResponse response) throws Exception { + Project project = projectRepository.findOne(id); + String url = project.getCollaboratorUrl(); + + + } } diff --git a/src/main/java/cn/palmte/work/service/ProjectBudgetService.java b/src/main/java/cn/palmte/work/service/ProjectBudgetService.java index 7e621ae..1b02e85 100644 --- a/src/main/java/cn/palmte/work/service/ProjectBudgetService.java +++ b/src/main/java/cn/palmte/work/service/ProjectBudgetService.java @@ -795,7 +795,7 @@ public class ProjectBudgetService { */ @Transactional(rollbackFor = RuntimeException.class) public Project budgetEditSave(Project project, Project projectInDb, BudgetBean budgetBean, Admin admin, ApproveStatusEnum approveStatusEnum) { - Project p = projectService.editProject(project, projectInDb); + Project p = projectService.estimateEditProject(project, projectInDb); p.setStatus(StatusEnum.BUDGET_ACCOUNTS.getStatus()); p.setStatusDesc(StatusEnum.BUDGET_ACCOUNTS.getStatusDesc()); p.setApproveStatusBudget(approveStatusEnum.getApproveStatus()); diff --git a/src/main/java/cn/palmte/work/service/ProjectService.java b/src/main/java/cn/palmte/work/service/ProjectService.java index d013622..1e52191 100644 --- a/src/main/java/cn/palmte/work/service/ProjectService.java +++ b/src/main/java/cn/palmte/work/service/ProjectService.java @@ -214,6 +214,57 @@ public class ProjectService { return project; } + public Project estimateEditProject(Project project, Project projectInDb) { + + //只有如下可以修改 + projectInDb.setName(project.getName()); + projectInDb.setCustomer(project.getCustomer()); + projectInDb.setTerminalCustomer(project.getTerminalCustomer()); + projectInDb.setIndustryScenario(project.getIndustryScenario()); + projectInDb.setType(project.getType()); + projectInDb.setTypeDesc(TypeEnum.parseType(project.getType()).getTypeDesc()); + projectInDb.setUnderwrittenMode(project.getUnderwrittenMode()); + projectInDb.setUnderwrittenModeStr(UnderwrittenModeEnum.parseUnderwrittenMode(project.getUnderwrittenMode()).getUnderwrittenModeStr()); + projectInDb.setCertainty(project.getCertainty()); + projectInDb.setCertaintyStr(CertaintyEnum.parseCertainty(project.getCertainty()).getCertaintyStr()); + projectInDb.setIsSecond(project.getIsSecond()); + projectInDb.setIsSecondStr(IsSecondEnum.parseIsSecond(project.getIsSecond()).getIsSecondStr()); + projectInDb.setSignType(project.getSignType()); + projectInDb.setSignTypeStr(SignTypeEnum.parseSignType(project.getSignType()).getSignTypeStr()); + projectInDb.setResolvePlan(project.getResolvePlan()); + projectInDb.setResolvePlanStr(ResolvePlanEnum.parseResolvePlan(project.getResolvePlan()).getResolvePlanStr()); + + projectInDb.setCollaborator(project.getCollaborator()); + projectInDb.setCollaboratorUrl(project.getCollaboratorUrl()); + projectInDb.setGrossProfit(project.getGrossProfit()); + projectInDb.setGrossProfitMargin(project.getGrossProfitMargin()); + projectInDb.setStartDate(project.getStartDate()); + projectInDb.setEndDate(project.getEndDate()); + projectInDb.setContractAmount(project.getContractAmount()); + projectInDb.setHuazhiProductAmount(project.getHuazhiProductAmount()); + projectInDb.setHuizhiProductAmount(project.getHuizhiProductAmount()); + projectInDb.setHuasanProductAmount(project.getHuasanProductAmount()); + projectInDb.setZiguangOtherAmount(project.getZiguangOtherAmount()); + projectInDb.setPrincipal(project.getPrincipal()); + projectInDb.setContractTime(project.getContractTime()); + projectInDb.setBidsTime(project.getBidsTime()); + projectInDb.setAdvanceInterestAmount(project.getAdvanceInterestAmount()); + projectInDb.setAdvancePeakAmount(project.getAdvancePeakAmount()); + projectInDb.setMainContractCollectionTerms(project.getMainContractCollectionTerms()); + projectInDb.setMainContractResolvePlan(project.getMainContractResolvePlan()); + projectInDb.setCalculationCollection(project.getCalculationCollection()); + projectInDb.setValueRisk(project.getValueRisk()); + projectInDb.setOtherName(project.getOtherName()); + + projectInDb.setPlanStartStr(project.getPlanStartStr()); + projectInDb.setPlanEndStr(project.getPlanEndStr()); + /// projectInDb.setApproveStatusEstimate(approveStatusEnum.getApproveStatus()); + + projectInDb.setLastUpdateTime(new Date()); + + return projectInDb; + } + public Project editProject(Project project, Project projectInDb) { //只有如下可以修改 @@ -235,6 +286,7 @@ public class ProjectService { // projectInDb.setResolvePlanStr(ResolvePlanEnum.parseResolvePlan(project.getResolvePlan()).getResolvePlanStr()); projectInDb.setCollaborator(project.getCollaborator()); + projectInDb.setCollaboratorUrl(project.getCollaboratorUrl()); projectInDb.setGrossProfit(project.getGrossProfit()); projectInDb.setGrossProfitMargin(project.getGrossProfitMargin()); projectInDb.setStartDate(project.getStartDate()); diff --git a/src/main/resources/static/assets/js/project_budget.js b/src/main/resources/static/assets/js/project_budget.js index e610544..99ab495 100644 --- a/src/main/resources/static/assets/js/project_budget.js +++ b/src/main/resources/static/assets/js/project_budget.js @@ -58,6 +58,8 @@ BUDGET_PLAN_DETAIL={ var result = 0; $(function () { + generateFileupload('icon'); + $("input[name='costCompanyManageTaxExclude']").change(function () { digitalSelf("costCompanyManageTaxExclude", "input[name='costCompanyManageTaxExclude']"); }); @@ -82,6 +84,8 @@ $(function () { $("#saveDraft").click(function () { $("#saveDraft").attr('disabled', true); + $("#collaboratorUrl").val($("#collaboratorUrl_span").text()); + checkName(); if (result == 1) { @@ -199,6 +203,8 @@ $(function () { }); $("#saveApprove").click(function () { $("#saveApprove").attr('disabled', true); + $("#collaboratorUrl").val($("#collaboratorUrl_span").text()); + checkName(); if (result == 1) { diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl index 70bc7c1..1aff915 100644 --- a/src/main/resources/templates/admin/project_approve.ftl +++ b/src/main/resources/templates/admin/project_approve.ftl @@ -214,24 +214,18 @@
-
-
*
+
hidden> +
*合作对象
- +
- -
- -
-
-
-
-
@@ -2757,6 +2751,7 @@ + + + + + + diff --git a/src/main/resources/templates/admin/project_estimate_add.ftl b/src/main/resources/templates/admin/project_estimate_add.ftl index b8495ed..9192c5d 100644 --- a/src/main/resources/templates/admin/project_estimate_add.ftl +++ b/src/main/resources/templates/admin/project_estimate_add.ftl @@ -87,7 +87,7 @@
*垫资模式
- @@ -97,28 +97,30 @@
-<#--
--> -<#--
*合作对象
--> -<#--
--> -<#-- -<#-- name="collaborator" id="collaborator" placeholder="请输入合作对象" maxlength="20"--> -<#-- value="" />--> -<#--
--> +
+
*合作对象
+
+ +
-<#--
--> -<#-- --> -<#-- --> -<#--
--> -<#-- -<#--
--> -<#--
--> -<#--
--> -<#--
--> -<#--
--> -<#--
--> -<#--
--> +
+ + + + +
+ +
+
+
+
+
+
+
*项目把握度
@@ -622,14 +624,33 @@
+ + + + + diff --git a/src/main/resources/templates/admin/project_estimate_edit.ftl b/src/main/resources/templates/admin/project_estimate_edit.ftl index b95c35b..d46e287 100644 --- a/src/main/resources/templates/admin/project_estimate_edit.ftl +++ b/src/main/resources/templates/admin/project_estimate_edit.ftl @@ -49,7 +49,7 @@
*项目名称
@@ -97,7 +97,7 @@
*垫资模式
- @@ -107,28 +107,30 @@
-<#--
--> -<#--
*合作对象
--> -<#--
--> -<#-- -<#-- name="collaborator" id="collaborator" placeholder="请输入合作对象" maxlength="20"--> -<#-- value="${project.collaborator!}" />--> -<#--
--> +
hidden> +
*合作对象
+
+ +
-<#--
--> -<#-- --> -<#-- --> -<#--
--> -<#-- -<#--
--> -<#--
--> -<#--
--> -<#--
--> -<#--
--> -<#--
--> -<#--
--> +
+ + + ${project.collaboratorUrl!} + +
+ +
+
+
+
+
+
+
*项目把握度
@@ -146,7 +148,7 @@
*行业场景应用
@@ -156,7 +158,7 @@
*客户名称
@@ -166,7 +168,7 @@
*终端客户名称
@@ -176,7 +178,7 @@
*合同金额
@@ -206,7 +208,7 @@
*华智产品金额
@@ -216,7 +218,7 @@
*汇智产品金额
@@ -226,7 +228,7 @@
*华三产品金额
@@ -236,7 +238,7 @@
*其他产品金额
@@ -334,7 +336,7 @@
垫资利息
@@ -343,7 +345,7 @@
垫资峰值
@@ -636,14 +638,32 @@
+ + + + +