Merge branch '长阳分支中职' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 长阳分支中职

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/CreateGraduateNo.js

@@ -79,6 +79,7 @@ var bootstrap = function ($, learun) {
                 headData: [
                     { label: "学号", name: "StuNo", width: 150, align: "left" },
                     { label: "姓名", name: "StuName", width: 100, align: "left" },
+                    { label: "身份证号", name: "IdentityCardNo", width: 150, align: "left" },
                     {
                         label: "性别", name: "GenderNo", width: 80, align: "left",
                         formatter: function (cellvalue) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.js

@@ -1342,6 +1342,7 @@ var bootstrap = function ($, learun) {
                                         var _department = departmentMap[userMap[_jitem.Id].departmentId];
                                         if (_department) {
                                             name = '【' + _department.name + '】' + name;
+                                            //name = '【' + _department.name + '】' + name;
                                         }
 
                                         nameList.push(name);
@@ -1435,7 +1436,7 @@ var bootstrap = function ($, learun) {
                                         name = '【' + _department.name + '】' + name;
                                     }
                                 }
-                                var content = item.F_OperationName;
+                                var content = '';
                                 if (item.F_Des) {
                                     content += '【审批意见】' + item.F_Des;
                                 }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ReleaseForm.js

@@ -75,8 +75,8 @@ var bootstrap = function ($, learun) {
             learun.httpAsync('GET', top.$.rootUrl + '/LR_NewWorkFlow/NWFScheme/GetMyInfoList', {}, function (data) {
                 schemeList = data;
                 //增加资产申请项目
-                schemeList.push({ F_Id: 'f1414358-cb9b-4eaf-927f-66f6d60e9280', F_Name: '采购申请(普通)', F_Code: 'caigoupt', F_Category: '资产类', F_CodeUrl: '/AssetManagementSystem/Ass_AssetsInfoApply/IndexJY' });
-                schemeList.push({ F_Id: '74701b0e-ad01-4836-9304-bb39222d3bcd', F_Name: '采购申请(耗材)', F_Code: 'caigouhc', F_Category: '资产类', F_CodeUrl: '/AssetManagementSystem/Ass_AssetsInfoApply/IndexJYHC' });
+                //schemeList.push({ F_Id: 'f1414358-cb9b-4eaf-927f-66f6d60e9280', F_Name: '采购申请(普通)', F_Code: 'caigoupt', F_Category: '资产类', F_CodeUrl: '/AssetManagementSystem/Ass_AssetsInfoApply/IndexJY' });
+                //schemeList.push({ F_Id: '74701b0e-ad01-4836-9304-bb39222d3bcd', F_Name: '采购申请(耗材)', F_Code: 'caigouhc', F_Category: '资产类', F_CodeUrl: '/AssetManagementSystem/Ass_AssetsInfoApply/IndexJYHC' });
                 render();
             });
 

Learun.Framework.Ultimate V7/Learun.Application.Web/Content/jquery/plugin/jqprint/jquery.jqprint-0.3.js

@@ -271,7 +271,7 @@
         setTimeout(function () {
             (b.operaSupport && a.browser.opera ? c : e[0].contentWindow).print();
             c && c.close()
-        }, 1E3)
+        }, 3000)
     }
 
 

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>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs

@@ -1127,6 +1127,16 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                         dormitory.StudentID = "";
                         dormitory.StuName = "";
                         db.Update(dormitory);
+                        //宿舍上一级房间，入住人数-1
+                        var room = db.FindEntity<Acc_DormitoryBuildEntity>(x => x.ID == dormitory.ParentID);
+                        if (room != null)
+                        {
+                            if (room.CheckInStu.HasValue && room.CheckInStu.Value>0)
+                            {
+                                room.CheckInStu--;
+                                db.Update(room);
+                            }
+                        }
                     }
                     //班级置为已毕业班级
                     var classInfo = db.FindEntity<ClassInfoEntity>(x => x.ClassNo == item.ClassNo);

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/",
   // 开发环境下自动填充登录账号密码，与接口地址一一对应，只在开发环境下显示