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 221405f..a06dc8c 100644 --- a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java +++ b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java @@ -122,6 +122,13 @@ public class ProjectController extends BaseController { Task currentTask = actUtil.getCurrentTask(project.getId()); String actTaskName = currentTask == null ? "" : currentTask.getName(); project.setActTaskName(actTaskName); + + ProjectBudget projectBudget = projectBudgetRepository.findFirstByProjectId(project.getId()); + if (projectBudget == null || projectBudget.getContractBudget() == null || "".equals(projectBudget.getContractBudget())) { + project.setIsContract(0); + } else { + project.setIsContract(1); + } } int offset = (pageNumber - 1) * pageSize; @@ -966,6 +973,21 @@ public class ProjectController extends BaseController { webDataBinder.addCustomFormatter(new NumberStyleFormatter()); } + /** + * 保存合同名称 + */ + @RequestMapping("/saveContract") + @ResponseBody + public ResponseMsg saveContract(@RequestParam String contractBudget,@RequestParam int id) { + ProjectBudget projectBudget = projectBudgetRepository.findFirstByProjectId(id); + if (projectBudget == null) { + return ResponseMsg.buildFailedMsg("失败"); + } + projectBudget.setContractBudget(contractBudget); + projectBudgetRepository.save(projectBudget); + return ResponseMsg.buildSuccessMsg("成功"); + } + /** * 保存项目与用户的关系 */ @@ -1406,4 +1428,6 @@ public class ProjectController extends BaseController { public ResponseMsg stageRefreshSave(@RequestBody String json, @PathVariable int projectId) { return projectService.stageRefreshSave(json,projectId); } + + } diff --git a/src/main/java/cn/palmte/work/model/Project.java b/src/main/java/cn/palmte/work/model/Project.java index 63af0c3..bf84daf 100644 --- a/src/main/java/cn/palmte/work/model/Project.java +++ b/src/main/java/cn/palmte/work/model/Project.java @@ -323,6 +323,9 @@ public class Project { @Transient private String remark; + @Transient + private int isContract; + /** * 审批任务节点 */ @@ -1013,6 +1016,14 @@ public class Project { this.remark = remark; } + public int getIsContract() { + return isContract; + } + + public void setIsContract(int isContract) { + this.isContract = isContract; + } + public Integer getStage() { return stage; } diff --git a/src/main/java/cn/palmte/work/model/ProjectBudget.java b/src/main/java/cn/palmte/work/model/ProjectBudget.java index 20af118..6807dbc 100644 --- a/src/main/java/cn/palmte/work/model/ProjectBudget.java +++ b/src/main/java/cn/palmte/work/model/ProjectBudget.java @@ -37,6 +37,11 @@ public class ProjectBudget { */ @Column(name = "name_budget") private String nameBudget; + /** + * 合同名称 + */ + @Column(name = "contract_budget") + private String contractBudget; /** * 项目类型:1工程集成类、2设备集成类、3战略合作类 */ @@ -229,6 +234,14 @@ public class ProjectBudget { this.nameBudget = nameBudget; } + public String getContractBudget() { + return contractBudget; + } + + public void setContractBudget(String contractBudget) { + this.contractBudget = contractBudget; + } + public int getTypeBudget() { return typeBudget; } diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl index a3318bd..b1391cb 100644 --- a/src/main/resources/templates/admin/project_budget_edit.ftl +++ b/src/main/resources/templates/admin/project_budget_edit.ftl @@ -334,6 +334,15 @@ name="nameBudget" placeholder="请输入项目名称(1000字符以内)" maxlength="1000" value="${projectBudget.nameBudget!}" /> + <#if project.approveStatusBudget == 2> +