Merge branch '娄底高职分支' of 123.57.209.16:bjquanjiang/DigitalScholl into 娄底高职分支

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfo/Index.js

@@ -67,10 +67,10 @@ var bootstrap = function ($, learun) {
                 var keyValue = $('#gridtable').jfGridValue('AId');
                 if (learun.checkrow(keyValue)) {
                     learun.layerForm({
-                        id: 'form',
+                        id: 'Ass_AssetsInfoItemIndex',
                         title: '资产明细',
                         url: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfoItem/Index?AId=' + keyValue,
-                        width: 1000,
+                        width: 1300,
                         height: 700,
                         btn: null,
                         end: function () {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Form.cshtml

@@ -7,6 +7,7 @@
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
         <div class="lr-form-item-title">明细编号<font face="宋体">*</font></div>
         <input id="AICode" hidden="hidden" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <input id="AId" type="hidden" class="form-control"/>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
         <div class="lr-form-item-title">序号<font face="宋体">*</font></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Form.js

@@ -5,6 +5,10 @@
  * 描  述：在册登记明细
  */
 var acceptClick;
+var AId = request("AId");//资产主键（资产明细的父主键）
+if (!!AId) {
+    $('#AId').val(AId);
+}
 var keyValue = request('keyValue');
 var bootstrap = function ($, learun) {
     "use strict";

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Index.js

@@ -5,7 +5,7 @@
  * 描  述：在册登记明细
  */
 var refreshGirdData;
-var AId = request("AId");
+var AId = request("AId");//点击登记在册资产-查看明细，会传值进来，代表资产主键（资产明细的父主键）
 var currentUser = request("currentUser");//我的资产需要用到
 var IsDelete = request("IsDelete");//报废资产需要使用
 var bootstrap = function ($, learun) {
@@ -50,7 +50,7 @@ var bootstrap = function ($, learun) {
                 learun.layerForm({
                     id: 'form',
                     title: '新增',
-                    url: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfoItem/Form',
+                    url: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfoItem/Form?AId=' + AId,
                     width: 800,
                     height: 700,
                     callBack: function (id) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Repair/Index.js

@@ -216,7 +216,17 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     { label: "开始维修时间", name: "RStartTime", width: 100, align: "left" },
-                    { label: "维修人", name: "RRepairUserId", width: 100, align: "left" },
+                    {
+                        label: "维修人", name: "RRepairUserId", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('user', {
+                                key: value,
+                                callback: function (_data) {
+                                    callback(_data.name);
+                                }
+                            });
+                        }
+                    },
                     { label: "维修完成时间", name: "REndTime", width: 100, align: "left" },
                     { label: "维修确认时间", name: "RConfirmTime", width: 100, align: "left" },
                     {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Index.js

@@ -167,7 +167,7 @@ var bootstrap = function ($, learun) {
 
         },
         initGird: function () {
-            $('#gridtable').lrAuthorizeJfGrid({
+            $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/GetPageList',
                 headData: [
                     { label: '考生号', name: 'ksh', width: 150, align: "left" },
@@ -372,8 +372,55 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     { label: '银行卡账号', name: 'BankCard', width: 150, align: "left" },
-                    { label: '开户银行位置', name: 'BankLocation', width: 300, align: "left" },
+                    { label: '开户银行位置', name: 'BankLocation', width: 150, align: "left" },
                     { label: '开户行号', name: 'BankNo', width: 150, align: "center" },
+                    { label: '户籍地', name: 'OriginAddress', width: 100, align: "center" },
+                    {
+                        label: '政治面貌', name: 'PartyFaceNo', width: 100, align: "center", formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'PolityStatus',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: '家庭详细地址', name: 'FamilyAddress', width: 100, align: "center" },
+                    { label: '学生联系电话', name: 'telephone', width: 100, align: "center" },
+                    { label: '家长联系电话', name: 'ParentTelephone', width: 100, align: "center" },
+                    { label: '艺术类文化成绩', name: 'ArtCultureScore', width: 100, align: "center" },
+                    { label: '艺术类专业成绩', name: 'ArtProfessionScore', width: 100, align: "center" },
+                    { label: '艺术类综合成绩总分', name: 'ArtComprehensiveScore', width: 120, align: "center" },
+                    {
+                        label: '艺术类录取专业', name: 'ArtRecruitMajorNo', width: 100, align: "center",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
+                                key: value,
+                                keyId: 'majorno',
+                                callback: function (_data) {
+                                    callback(_data['majorname']);
+                                }
+                            });
+                        }
+                    },
+                    { label: '体育类文化成绩', name: 'SportCultureScore', width: 100, align: "center" },
+                    { label: '体育类专业成绩', name: 'SportProfessionScore', width: 100, align: "center" },
+                    { label: '体育类综合成绩总分', name: 'SportComprehensiveScore', width: 120, align: "center" },
+                    {
+                        label: '体育类录取专业', name: 'SportRecruitMajorNo', width: 100, align: "center",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
+                                key: value,
+                                keyId: 'majorno',
+                                callback: function (_data) {
+                                    callback(_data['majorname']);
+                                }
+                            });
+                        }
+                    },
                 ],
                 mainId: 'ID',
                 isPage: true,

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

@@ -80,7 +80,7 @@
             <div class="col-xs-12 flow-btn">
                 <a id="release" class="btn btn-success">创建流程</a>
                 <a id="savedraft" class="btn btn-default">保存草稿</a>
-                <a id="sign" class="btn btn-info">转审</a>
+                <a id="sign" class="btn btn-info">加签</a>
                 <a id="confirm" class="btn btn-info">确认阅读</a>
             </div>
             <div class="col-xs-12 tab-flow-audit">

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Learun.Application.WebApi.csproj

@@ -190,13 +190,13 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Bootstraper.cs" />
-    <Compile Include="Modules\PurchaseEduApi.cs" />
-    <Compile Include="Modules\PurchaseInfoApi.cs" />
-    <Compile Include="Modules\PurchaseLogisticApi.cs" />
-    <Compile Include="Modules\PurchaseOtherApi.cs" />
-    <Compile Include="Modules\PurchasePrintApi.cs" />
-    <Compile Include="Modules\PurchaseStudentApi.cs" />
-    <Compile Include="Modules\PurchaseWorkApi.cs" />
+    <Compile Include="Modules\Purchase\PurchaseEduApi.cs" />
+    <Compile Include="Modules\Purchase\PurchaseInfoApi.cs" />
+    <Compile Include="Modules\Purchase\PurchaseLogisticApi.cs" />
+    <Compile Include="Modules\Purchase\PurchaseOtherApi.cs" />
+    <Compile Include="Modules\Purchase\PurchasePrintApi.cs" />
+    <Compile Include="Modules\Purchase\PurchaseStudentApi.cs" />
+    <Compile Include="Modules\Purchase\PurchaseWorkApi.cs" />
     <Compile Include="Modules\SSOApi.cs" />
     <Compile Include="Modules\AssetManagementSystem\Ass_AssetsInfoItemApi.cs" />
     <Compile Include="Modules\AttendanceApi.cs" />

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/EducationalAdministration/SignUpAboutOnlineApi.cs

@@ -17,6 +17,7 @@ namespace Learun.Application.WebApi
     public class SignUpAboutOnlineApi : BaseNoLoginApi
     {
         private SignUpAboutOnlineIBLL signUpAboutOnlineIBLL = new SignUpAboutOnlineBLL();
+        private StuInfoFreshIBLL stuInfoFreshIBLL = new StuInfoFreshBLL();
 
         /// <summary>
         /// 注册接口
@@ -28,6 +29,7 @@ namespace Learun.Application.WebApi
             Get["/form"] = GetForm;
             Post["/delete"] = DeleteForm;
             Post["/save"] = SaveForm;
+            Post["/saveFreshInfo"] = SaveFreshInfo;
         }
         #region  获取数据
 
@@ -97,6 +99,35 @@ namespace Learun.Application.WebApi
             signUpAboutOnlineIBLL.SaveEntity(parameter.keyValue, entity);
             return Success("报名成功！");
         }
+        /// <summary>
+        /// 保存官网新生填报信息
+        /// <param name="_"></param>
+        /// <summary>
+        /// <returns></returns>
+        public Response SaveFreshInfo(dynamic _)
+        {
+            ReqFormEntity parameter = this.GetReqData<ReqFormEntity>();
+            StuInfoFreshEntity entity = parameter.strEntity.ToObject<StuInfoFreshEntity>();
+
+            //非空判断
+            if (string.IsNullOrEmpty(entity.ksh))
+            {
+                return Fail("考生号不能为空！");
+            }
+            if (string.IsNullOrEmpty(entity.StuName))
+            {
+                return Fail("姓名不能为空！");
+            }
+            //考生号唯一
+            var model = stuInfoFreshIBLL.GetStuInfoFreshEntityByksh(entity.ksh);
+            if (model != null)
+            {
+                return Fail("考生号已存在！");
+            }
+
+            stuInfoFreshIBLL.SaveEntity("", entity);
+            return Success("操作成功！");
+        }
         #endregion
 
         #region  私有类

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfoItem/Ass_AssetsInfoItemService.cs

@@ -675,21 +675,25 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
                 else
                 {
                     entity.Create();
-                    var assinfoEntity=new Ass_AssetsInfoEntity()
+                    if (string.IsNullOrEmpty(entity.AId))
                     {
-                        AName= entity.AIASSName,
-                        ATId=entity.AIASSClass,
-                        AModel = entity.AISpecificationtype,
-                        AManufacturer = entity.AIManufacturer,
-                        ASource = entity.AIAddType,
-                        APrice = entity.AIAssValue,
-                        AUnit = entity?.AIUnits,
-                        ACode = Str.PinYin(entity.AIASSName),
-                        HasDetail = true
-                    };
-                    assinfoEntity.Create();
-                    entity.AId = assinfoEntity.AId;
-                    db.Insert(assinfoEntity);
+                        var assinfoEntity = new Ass_AssetsInfoEntity()
+                        {
+                            AName = entity.AIASSName,
+                            ATId = entity.AIASSClass,
+                            AModel = entity.AISpecificationtype,
+                            AManufacturer = entity.AIManufacturer,
+                            ASource = entity.AIAddType,
+                            APrice = entity.AIAssValue,
+                            AUnit = entity?.AIUnits,
+                            ACode = Str.PinYin(entity.AIASSName),
+                            HasDetail = true
+                        };
+                        assinfoEntity.Create();
+                        entity.AId = assinfoEntity.AId;
+                        db.Insert(assinfoEntity);
+                    }
+                    
                     db.Insert(entity);
                     db.Commit();
                 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshBLL.cs

@@ -207,6 +207,30 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
+        /// <summary> 
+        /// 获取StuInfoFresh表实体数据 
+        /// <param name="keyValue">主键</param> 
+        /// <summary> 
+        /// <returns></returns> 
+        public StuInfoFreshEntity GetStuInfoFreshEntityByksh(string ksh)
+        {
+            try
+            {
+                return stuInfoFreshService.GetStuInfoFreshEntityByksh(ksh);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
         /// <summary> 
         /// 获取StuInfoFreshEmergePeople表实体数据 
         /// <param name="keyValue">主键</param> 

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshEntity.cs

@@ -670,6 +670,61 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <returns></returns> 
         [Column("GETBEDDINGSTATUS")]
         public string GetBeddingStatus { get; set; }
+        /// <summary> 
+        /// 家长联系电话
+        /// </summary> 
+        /// <returns></returns> 
+        [Column("PARENTTELEPHONE")]
+        public string ParentTelephone { get; set; }
+        /// <summary> 
+        /// 艺术类文化成绩 
+        /// </summary> 
+        /// <returns></returns> 
+        [Column("ARTCULTURESCORE")]
+        public decimal? ArtCultureScore { get; set; }
+        /// <summary> 
+        /// 艺术类专业成绩 
+        /// </summary> 
+        /// <returns></returns> 
+        [Column("ARTPROFESSIONSCORE")]
+        public decimal? ArtProfessionScore { get; set; }
+        /// <summary> 
+        /// 艺术类综合成绩总分 
+        /// </summary> 
+        /// <returns></returns> 
+        [Column("ARTCOMPREHENSIVESCORE")]
+        public decimal? ArtComprehensiveScore { get; set; }
+        /// <summary> 
+        /// 艺术类录取专业 
+        /// </summary> 
+        /// <returns></returns> 
+        [Column("ARTRECRUITMAJORNO")]
+        public string ArtRecruitMajorNo { get; set; }
+        /// <summary> 
+        /// 体育类文化成绩 
+        /// </summary> 
+        /// <returns></returns> 
+        [Column("SPORTCULTURESCORE")]
+        public decimal? SportCultureScore { get; set; }
+        /// <summary> 
+        /// 体育类专业成绩 
+        /// </summary> 
+        /// <returns></returns> 
+        [Column("SPORTPROFESSIONSCORE")]
+        public decimal? SportProfessionScore { get; set; }
+        /// <summary> 
+        /// 体育类综合成绩总分 
+        /// </summary> 
+        /// <returns></returns> 
+        [Column("SPORTCOMPREHENSIVESCORE")]
+        public decimal? SportComprehensiveScore { get; set; }
+        /// <summary> 
+        /// 体育类录取专业 
+        /// </summary> 
+        /// <returns></returns> 
+        [Column("SPORTRECRUITMAJORNO")]
+        public string SportRecruitMajorNo { get; set; }
+
         #endregion
 
         #region  扩展操作 
@@ -680,7 +735,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         {
             var user = LoginUserInfo.Get();
             this.ID = Guid.NewGuid().ToString();
-            this.CreateUserId = user.userId;
+            this.CreateUserId = user?.userId;
         }
         /// <summary> 
         /// 编辑调用 
@@ -690,7 +745,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         {
             this.ID = keyValue;
             var user = LoginUserInfo.Get();
-            this.UpdateUserId = user.userId;
+            this.UpdateUserId = user?.userId;
         }
         #endregion
 

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshIBLL.cs

@@ -68,6 +68,13 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <summary> 
         /// <returns></returns> 
         StuInfoFreshEntity GetStuInfoFreshEntityByStuNo(string stuNo);
+
+        /// <summary> 
+        /// 获取StuInfoFresh表实体数据 
+        /// <param name="keyValue">主键</param> 
+        /// <summary> 
+        /// <returns></returns> 
+        StuInfoFreshEntity GetStuInfoFreshEntityByksh(string ksh);
         /// <summary> 
         /// 获取StuInfoFreshEmergePeople表实体数据 
         /// <param name="keyValue">主键</param> 

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshService.cs

@@ -493,6 +493,30 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
+        /// <summary> 
+        /// 获取StuInfoFresh表实体数据 
+        /// <param name="keyValue">主键</param> 
+        /// <summary> 
+        /// <returns></returns> 
+        public StuInfoFreshEntity GetStuInfoFreshEntityByksh(string ksh)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindEntity<StuInfoFreshEntity>(x => x.ksh == ksh);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
         /// <summary> 
         /// 获取StuInfoFreshEmergePeople表实体数据 
         /// <param name="keyValue">主键</param>