From c594169b9e916b0efe4eb0ee819f32277b0e28cd Mon Sep 17 00:00:00 2001 From: hanbo <2608504783@qq.com> Date: Wed, 7 Dec 2022 15:58:00 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=98=B6=E6=AE=B5=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/backend/ProjectController.java | 14 ++ .../java/cn/palmte/work/model/Project.java | 22 +++ .../palmte/work/service/ProjectService.java | 19 +++ .../templates/admin/project_approve.ftl | 37 +++++ .../templates/admin/project_list.ftl | 140 +++++++++++++++++- .../templates/admin/project_list_approve.ftl | 2 +- 6 files changed, 232 insertions(+), 2 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 d2f1901..cbad382 100644 --- a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java +++ b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java @@ -844,6 +844,14 @@ public class ProjectController extends BaseController { return "admin/project_select_role_user"; } + @ResponseBody + @RequestMapping("/info/{projectId}") + public ResponseMsg info(@PathVariable int projectId,Map model) { + Project project = projectService.getProject(projectId); + model.put("info",project); + return ResponseMsg.buildSuccessData(project); + } + /** * 获取当前所有的角色和角色下的用户，根据项目决定是否check */ @@ -1386,4 +1394,10 @@ public class ProjectController extends BaseController { return "admin/project_final_list"; } + + @ResponseBody + @RequestMapping("/stageRefreshSave/{projectId}") + 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 6c32f3f..0ee22b2 100644 --- a/src/main/java/cn/palmte/work/model/Project.java +++ b/src/main/java/cn/palmte/work/model/Project.java @@ -257,6 +257,12 @@ public class Project { @Column(name = "calculation_collection") private String calculationCollection; + @Column(name = "stage") + private Integer stage; + + @Column(name = "stage_remark") + private String stageRemark; + @Transient private String contractRound; @@ -1003,4 +1009,20 @@ public class Project { public void setRemark(String remark) { this.remark = remark; } + + public Integer getStage() { + return stage; + } + + public void setStage(Integer stage) { + this.stage = stage; + } + + public String getStageRemark() { + return stageRemark; + } + + public void setStageRemark(String stageRemark) { + this.stageRemark = stageRemark; + } } diff --git a/src/main/java/cn/palmte/work/service/ProjectService.java b/src/main/java/cn/palmte/work/service/ProjectService.java index af65da6..6fe1798 100644 --- a/src/main/java/cn/palmte/work/service/ProjectService.java +++ b/src/main/java/cn/palmte/work/service/ProjectService.java @@ -112,6 +112,9 @@ public class ProjectService { } if(StrUtil.isNotEmpty(searchInfo.get("extend")) && "0".equals(searchInfo.get("extend"))) { + if (StrUtil.isNotEmpty(searchInfo.get("stage")) && !"-1".equals(searchInfo.get("stage"))) { + queryHelper.addCondition("p.stage=?", Integer.parseInt(searchInfo.get("stage"))); + } if (StrUtil.isNotEmpty(searchInfo.get("isSecond")) && !"-1".equals(searchInfo.get("isSecond"))) { queryHelper.addCondition("p.is_second=?", Integer.parseInt(searchInfo.get("isSecond"))); } @@ -895,4 +898,20 @@ public class ProjectService { } } + + public ResponseMsg stageRefreshSave(String json,int projectId) { + JSONObject obj = JSON.parseObject(json); + int stage = obj.getIntValue("stage"); + String stageRemark = obj.getString("stageRemark"); + + Project project = projectRepository.getOne(projectId); + if(null == project){ + return ResponseMsg.buildFailedMsg("项目不存在"); + } + + project.setStage(stage); + project.setStageRemark(stageRemark); + projectRepository.saveAndFlush(project); + return ResponseMsg.buildSuccessMsg("保存成功"); + } } diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl index 2c59358..7b5760f 100644 --- a/src/main/resources/templates/admin/project_approve.ftl +++ b/src/main/resources/templates/admin/project_approve.ftl @@ -395,6 +395,43 @@ >${project.calculationCollection!} + + 项目阶段: + + <#if project.stage??> + <#if (project.stage) =0> + + <#elseif (project.stage) =1> + + <#elseif (project.stage) =2> + + <#elseif (project.stage) =3> + + <#elseif (project.stage) =4> + + <#elseif (project.stage) =5> + + <#elseif (project.stage) =6> + + <#elseif (project.stage) =7> + + <#elseif (project.stage) =8> + + <#elseif (project.stage) =9> + + + <#else> + + + + + + 当前进度描述: + + + + <#-- 项目预算信息 展示内容 --> diff --git a/src/main/resources/templates/admin/project_list.ftl b/src/main/resources/templates/admin/project_list.ftl index a25d274..2be4fe9 100644 --- a/src/main/resources/templates/admin/project_list.ftl +++ b/src/main/resources/templates/admin/project_list.ftl @@ -176,7 +176,7 @@
-
项目状态
+
项目当前状态
+ + + + + + + + + + + + +
+
+ <#-- 按钮 -->
@@ -1027,6 +1048,10 @@ +
@@ -1188,6 +1213,55 @@ + + <#--项目阶段更新弹窗--> + @@ -1315,6 +1389,8 @@ keywordsObj.otherStart = $("#otherStart").val(); if ($("#otherEnd").val()) keywordsObj.otherEnd = $("#otherEnd").val(); + if ($("#qstage").val()) + keywordsObj.stage = $("#qstage").val(); } if ($("#customer").val()) keywordsObj.customer = $("#customer").val(); @@ -1556,6 +1632,44 @@ }); }; + /** + * 项目阶段更新保存 + */ + var stageRefreshSave = function () { + var stage = $("#stage").val(); + console.info("=============="+stage); + var stageRemark = $("#stageRemark").val(); + var projectId = $("#stageProjectId").val(); + if (stage == '') { + layer.alert("请选择项目阶段"); + return; + } + if (stageRemark == '') { + layer.alert("请填写当前进度描述"); + return; + } + + var params = { + stage: stage, + stageRemark: stageRemark + }; + $.ajax({ + url: '${base}/project/stageRefreshSave/' + projectId, + data: JSON.stringify(params), + dataType: "json", + contentType: "application/json", + type: 'post', + async: false, + success: function (data) { + if (data.status == 0) { + layer.alert(data.msg); + window.location.href=window.location.href; + } else if (data.status == 1) { + layer.alert(data.msg); + } + } + }); + }; //上传会签单 var generateFileupload = function (name) { @@ -1687,6 +1801,30 @@ }); }; + var stageRefreshModal = function(id) { + $.ajax({ + url: "${base}/project/info/" + id, + dataType: "json", + contentType: "application/json", + type: 'post', + async: false, + success: function (data) { + $("#stage").val(data.data.stage); + $("#stageRemark").val(data.data.stageRemark); + } + }); + $("#stageProjectId").val(id); + $('#myModal4').modal({ + relatedElement: this, + onConfirm: function() { + console.log("提交"); + }, + onCancel: function() { + console.log("取消"); + } + }); + }; + var projectNoCheck = function () { var newProjectNo = $("#newProjectNo").val(); var id = $("#modelId").val(); diff --git a/src/main/resources/templates/admin/project_list_approve.ftl b/src/main/resources/templates/admin/project_list_approve.ftl index 6b9d0a6..00fcf42 100644 --- a/src/main/resources/templates/admin/project_list_approve.ftl +++ b/src/main/resources/templates/admin/project_list_approve.ftl @@ -173,7 +173,7 @@
-
项目状态
+
项目当前状态