From 6133218662aed358c4fda00f05cdae6f4bb2c28b Mon Sep 17 00:00:00 2001
From: ndbs <nabs@LAPTOP-FJ5VQJ6J>
Date: Fri, 21 Oct 2022 18:33:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E7=A8=8B=E5=BA=8F=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80,app2.0=E6=89=8B=E6=9C=BA=E6=B5=81=E7=A8=8B=E6=8C=87?=
 =?UTF-8?q?=E6=B4=BE=E5=AE=A1=E6=A0=B8=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Modules/NewWorkFlowApi.cs                 | 40 +++++++++++++++++++
 .../LearunApp-2.2.0/config.js                 |  6 +--
 2 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/NewWorkFlowApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/NewWorkFlowApi.cs
index 18cb62eee..94509397a 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/NewWorkFlowApi.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/NewWorkFlowApi.cs	
@@ -46,6 +46,9 @@ namespace Learun.Application.WebApi.Modules
             Post["/revoke"] = RevokeFlow;
 
             Post["/refer"] = ReferFlow;
+            Post["/instance"] = SaveInstanceForms;
+            Post["/auditors"] = SaveAuditors;
+
         }
         private NWFSchemeIBLL nWFSchemeIBLL = new NWFSchemeBLL();
         private NWFProcessIBLL nWFProcessIBLL = new NWFProcessBLL();
@@ -379,6 +382,41 @@ namespace Learun.Application.WebApi.Modules
             nWFProcessIBLL.ReferFlow(parameter.processId, parameter.taskId, userInfo);
             return Success("确认成功");
         }
+        /// <summary>
+        /// app保存实例
+        /// </summary>
+        /// <param name="_"></param>
+        /// <returns></returns>
+        public Response SaveInstanceForms(dynamic _)
+        {
+            List<FormParam> param = this.GetReqData<List<FormParam>>();
+
+            foreach (var item in param)
+            {
+                formSchemeIBLL.SaveInstanceForm(item.schemeInfoId, item.processIdName, item.keyValue, item.formData);
+            }
+            return Success("保存成功！");
+        }
+        /// <summary>
+        /// app保存审核人
+        /// </summary>
+        /// <param name="_"></param>
+        /// <returns></returns>
+        public Response SaveAuditors(dynamic _)
+        {
+            var param = this.GetReqData<flowParam>();
+            UserInfo userInfo = LoginUserInfo.Get();
+            try
+            {
+                nWFProcessIBLL.AuditFlow(param.operationCode, param.operationName, param.processId, param.taskId, param.des, param.auditors, param.stamp, param.signUrl, userInfo);
+                return Success("流程审批成功");
+            }
+            catch (System.Exception ex)
+            {
+
+                return Fail(ex.Message);
+            }
+        }
 
         private class flowParam
         {
@@ -443,6 +481,8 @@ namespace Learun.Application.WebApi.Modules
             /// 签字图片信息
             /// </summary>
             public string signUrl { get; set; }
+
+            public string stamp { get; set; }
         }
 
         /// <summary>
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js
index 185c5d9b1..4ae06eb55 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js	
@@ -21,11 +21,11 @@ export default {
   //   "http://192.168.2.98:8088/"
   // ],
   "apiHost": [
-    // "http://cyzjzx.gnway.cc:30626/"//测试地址
-	// "http://cyzjzx.gnway.cc:29615/"//正式地址
+    // "http://cyzjzx.gnway.cc:31218/"//测试地址接口
+	// "http://cyzjzx.gnway.cc:29904/"//正式地址接口
 	 "http://192.168.10.58:8012/"
   ],
-  // "webHost":"http://cyzjzx.gnway.cc:29618/",//测试地址
+  // "webHost":"http://cyzjzx.gnway.cc:30549/",//测试地址
   //"webHost":"http://wxd3f.cyzjzx.com/",//正式地址
   "webHost":"http://192.168.10.31:8087/",
   // 开发环境下自动填充登录账号密码，与接口地址一一对应，只在开发环境下显示