From 1c2c70d07791b702b9819b7ff9a0d9ad984b2cef Mon Sep 17 00:00:00 2001
From: "1378012178@qq.com" <1378012178@qq.com>
Date: Fri, 11 Jul 2025 09:43:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E6=9C=BA=E6=9E=84=E5=8A=A0?=
 =?UTF-8?q?=E7=9B=9F=EF=BC=9A=E5=AE=A1=E6=A0=B8=E9=80=9A=E8=BF=87-?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=90=88=E5=90=8C=E7=8E=AF=E8=8A=82=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E5=AD=97=E6=AE=B5=E5=A4=84=E7=90=86=E6=9C=89=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/OrgApplyInfoServiceImpl.java | 30 +++++++------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/service/impl/OrgApplyInfoServiceImpl.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/service/impl/OrgApplyInfoServiceImpl.java
index 01535d3..85d190d 100644
--- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/service/impl/OrgApplyInfoServiceImpl.java
+++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/service/impl/OrgApplyInfoServiceImpl.java
@@ -206,30 +206,22 @@ public class OrgApplyInfoServiceImpl extends ServiceImpl<OrgApplyInfoMapper, Org
             baseMapper.updateById(orgApplyInfo);
 
         } else {
-            //buildStatus == ‘2’时才是审批流程
-            if ("2".equals(orgApplyInfo.getBuildStatus())) {
+            //buildStatus == ‘approvalPass’时代表加盟审批通过
+            if ("approvalPass".equals(orgApplyInfo.getBuildStatus())) {
                 if ("2".equals(orgApplyInfo.getStatus()) && orgApplyInfo.getFranchiseTime() == null) {
                     //记录机构加盟时间
                     orgApplyInfo.setFranchiseTime(new Date());
                 }
-                if ("2".equals(orgApplyInfo.getStatus())) {
-                    //机构信息是否可修改状态置为“可修改”
-                    orgApplyInfo.setModifyStatus("0");
-                    //将机构的构建状态置为“加盟合同”
-                    orgApplyInfo.setBuildStatus("3");
-
-                }
+                //机构信息是否可修改状态置为“可修改”
+                orgApplyInfo.setModifyStatus("0");
+                //将机构的构建状态置为“加盟合同”
+                orgApplyInfo.setBuildStatus("3");
             }
-            //审批完成后的平台搭建流程
-            else {
-                if ("contractSave".equals(orgApplyInfo.getBuildStatusVal())) {
-                    //合同上传步骤 - 保存为草稿 暂无特殊处理
-                }
-                if ("contractSubmit".equals(orgApplyInfo.getBuildStatusVal())) {
-                    //合同上传步骤 - 保存并提交
-                    //将buildStatus置为“平台搭建”状态
-                    orgApplyInfo.setBuildStatus("4");
-                }
+            //审批完成后的平台搭建流程（合同上传并提交状态）
+            if ("contractSubmit".equals(orgApplyInfo.getBuildStatus())) {
+                //合同上传步骤 - 保存并提交
+                //将buildStatus置为“平台搭建”状态
+                orgApplyInfo.setBuildStatus("4");
             }
             //机构加盟审批流程
             baseMapper.updateById(orgApplyInfo);