From bfd663a05e00ff37a3198baea27cde86e1350cad Mon Sep 17 00:00:00 2001
From: OathK1per <zhangypg@gmail.com>
Date: Wed, 29 Dec 2021 10:49:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../palmte/work/service/ProjectService.java   | 15 +++++---
 .../templates/admin/project_list.ftl          | 36 +++++++++++--------
 2 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/src/main/java/cn/palmte/work/service/ProjectService.java b/src/main/java/cn/palmte/work/service/ProjectService.java
index f471c56..eb88375 100644
--- a/src/main/java/cn/palmte/work/service/ProjectService.java
+++ b/src/main/java/cn/palmte/work/service/ProjectService.java
@@ -342,18 +342,25 @@ public class ProjectService {
     }
 
     public void saveApprove(Project project, Admin admin) throws Exception {
-        if (project.getApproveStatusEstimate() == 0) {
+        if (project.getApproveStatusEstimate() == ApproveStatusEnum.APPROVAL_UNCOMMIT.getApproveStatus()) {
             Integer approveStatusEstimate = project.getApproveStatusEstimate();
 
             projectEstimateService.estimateApprove(approveStatusEstimate, project, admin);
-        } else if (project.getApproveStatusBudget() == 0) {
+            project.setApproveStatusEstimate(ApproveStatusEnum.APPROVAL_PENDING.getApproveStatus());
+        } else if (project.getApproveStatusBudget() == ApproveStatusEnum.APPROVAL_UNCOMMIT.getApproveStatus()) {
             Integer approveStatusBudget = project.getApproveStatusBudget();
 
             projectBudgetService.budgetApprove(approveStatusBudget, project, admin);
-        } else if (project.getApproveStatusSettle() == 0) {
+            project.setApproveStatusBudget(ApproveStatusEnum.APPROVAL_PENDING.getApproveStatus());
+        } else if (project.getApproveStatusSettle() == ApproveStatusEnum.APPROVAL_UNCOMMIT.getApproveStatus()) {
             projectInstanceService.startSettleProcessInstance(project, InterfaceUtil.getAdmin());
-        } else if (project.getApproveStatusFinal() == 0) {
+            project.setApproveStatusSettle(ApproveStatusEnum.APPROVAL_PENDING.getApproveStatus());
+        } else if (project.getApproveStatusFinal() == ApproveStatusEnum.APPROVAL_UNCOMMIT.getApproveStatus()) {
             projectInstanceService.startFinalProcessInstance(project.getId(), InterfaceUtil.getAdmin());
+            project.setApproveStatusFinal(ApproveStatusEnum.APPROVAL_PENDING.getApproveStatus());
+        } else {
+            return ;
         }
+        projectRepository.save(project);
     }
 }
diff --git a/src/main/resources/templates/admin/project_list.ftl b/src/main/resources/templates/admin/project_list.ftl
index 21f5ad0..6c7d33e 100644
--- a/src/main/resources/templates/admin/project_list.ftl
+++ b/src/main/resources/templates/admin/project_list.ftl
@@ -281,7 +281,7 @@
                                             <#if list.approveStatusEstimate == 0 || list.approveStatusBudget == 0 || list.approveStatusSettle == 0 || list.approveStatusFinal == 0>
                                                 <button type="button"
                                                         class="am-btn am-btn-default am-btn-xs am-text-secondary"
-                                                        onclick="location.href='${base}/project/saveApprove?id=${list.id}'"><span
+                                                        onclick="approveProject('${list.id}')"><span
                                                             class="am-icon-pencil-square-o"></span>提交审核
                                                 </button>
                                             </#if>
@@ -355,6 +355,25 @@
 <script src="../assets/js/amazeui.switch.js"></script>
 <script src="${base}/assets/js/project_common.js"></script>
 <script type="text/javascript">
+    var approveProject = function (id) {
+        if (window.confirm('确定要提交审核吗？')) {
+            $.ajax({
+                url: '${base}/project/saveApprove,
+                data: {id:id},
+                dataType: "json",
+                async: false,
+                success: function (data) {
+                    if (data.status == 0) {
+                        alert(data.msg);
+                        window.location.href = window.location.href;
+                    } else if (data.status == 1) {
+                        alert(data.msg);
+                    }
+                }
+            });
+        }
+    };
+
     $(function () {
 
         $("#submit-btn").on("click", function () {
@@ -402,19 +421,6 @@
             $("#keywords").val(keywords);
         }
 
-
-/*        if("1" == "${hasApproveProjects!'0'}"){
-            var hasApproveProjectsLayer = layer.open({
-                type: 1,
-                title:'待审核项目提醒',
-                skin: 'layui-layer-rim', //加上边框
-                area: ['350px', '150px'], //宽高
-                content: "<div style='margin-top:20px;margin-left:20px;color:red;'>有新的待审核项目，请及时确认。&nbsp;&nbsp;&nbsp;" +
-                "<span style='color: #0b6fa2;cursor: pointer;text-decoration:underline' onclick='window.location.href=\"${base}/project/listApprove\"'>前往处理</span></div>"
-            });
-
-        }*/
-
     });
 
 
@@ -434,6 +440,6 @@
                 }
             });
         }
-    }
+    };
 
 </script>