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

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuVolunteerController.cs

@@ -218,7 +218,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
                 WillNum = x.Count(s => s.IsEnroll == true && s.IsSubmit == true),
                 ManNum = x.Count(s => s.IsEnroll == true && s.IsSubmit == true && s.Sex == "1"),
                 WoManNum = x.Count(s => s.IsEnroll == true && s.IsSubmit == true && s.Sex == "0")
-            }).OrderBy(x => x.DeptNo).ThenBy(x=>x.MajorNo).ThenBy(x => x.Grade);
+            }).OrderBy(x => x.DeptNo).ThenBy(x => x.MajorNo).ThenBy(x => x.Grade);
             return Success(list);
         }
         #endregion
@@ -258,7 +258,11 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             entity.UpdateUser = userInfo.realName;
             entity.UpdateTime = DateTime.Now;
             var dWList =
-                stuVolunteerIBLL.GetRepetitions(entity.H_SchoolNo, entity.ApplyNo, entity.CardNo).Where(x => x.ID != keyValue);
+                stuVolunteerIBLL.GetRepetitions(entity.H_SchoolNo, entity.ApplyNo, entity.CardNo);
+            if (!keyValue.IsEmpty())
+            {
+                dWList.Where(x => x.ID != keyValue);
+            }
             if (dWList.Count() > 0)
             {
                 return Fail("保存失败,请检查数据有重复项");
@@ -267,6 +271,22 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             return Success("保存成功！");
         }
 
+        public ActionResult Volunteer(string keyValue, string strEntity)
+        {
+            StuVolunteerEntity entity = strEntity.ToObject<StuVolunteerEntity>();
+            var save = stuVolunteerIBLL.GetStuVolunteerEntity(keyValue);
+            var userInfo = LoginUserInfo.Get();
+            entity.UpdateUser = userInfo.realName;
+            entity.UpdateTime = DateTime.Now;
+            var dWList = stuVolunteerIBLL.GetRepetitions(save.H_SchoolNo, save.ApplyNo, save.CardNo).Where(x => x.ID != keyValue);
+            if (dWList.Count() > 0)
+            {
+                return Fail("保存失败,请检查数据有重复项");
+            }
+            stuVolunteerIBLL.SaveEntity(keyValue, entity);
+            return Success("保存成功！");
+
+        }
 
         /// <summary>
         /// 分班

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/AllocationClass.js

@@ -206,7 +206,7 @@ var bootstrap = function ($, learun) {
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                code: 'BCdPartyFace',
+                                code: 'PolityStatus',
                                 callback: function (_data) {
                                     callback(_data.text);
                                 }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/AmountForm.cshtml

@@ -4,8 +4,8 @@
 }
 <div class="lr-form-wrap">
        <div class="col-xs-12 lr-form-item" data-table="StuEnroll">
-        <div class="lr-form-item-title">实收金额</div>
-        <input id="ActualPayAmount" type="text" class="form-control" />
+        <div class="lr-form-item-title">实收金额<font face="宋体">*</font></div>
+        <input id="ActualPayAmount" type="Number" class="form-control" isvalid="yes" checkexpession="PositiveFloatintZero" />
     </div>
 </div>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuEnroll/AmountForm.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Form.js

@@ -23,7 +23,7 @@ var bootstrap = function ($, learun) {
             //民族
             $('#Nationals').lrDataItemSelect({ code: 'National' });
             //政治面貌
-            //$('#Political').lrDataSourceSelect({ code: 'BCdPartyFace', value: 'partyfaceno', text: 'partyface' });
+            //$('#Political').lrDataSourceSelect({ code: 'PolityStatus', value: 'partyfaceno', text: 'partyface' });
             $('#Political').lrDataItemSelect({ code: 'PolityStatus' });
              $('#DeptNo').lrselect({
                 allowSearch: true,

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/FormView.js

@@ -16,14 +16,14 @@ var bootstrap = function ($, learun) {
             idcardreader.objectcheck("btnread");
         },
         bind: function () {
-            $('#CheckInUrl').lrUploader();
-            $('#MilitaryUrl').lrUploader();
-            $('#SubsidizeUrl').lrUploader();
+            $('#CheckInUrl').lrUploader({ isUpload: false });
+            $('#MilitaryUrl').lrUploader({ isUpload: false });
+            $('#SubsidizeUrl').lrUploader({ isUpload: false });
             $('#Gender').lrDataItemSelect({ code: 'usersexbit' });
             //民族
             $('#Nationals').lrDataItemSelect({ code: 'National' });
             //政治面貌
-            $('#Political').lrDataItemSelect({ code: 'BCdPartyFace' });
+            $('#Political').lrDataItemSelect({ code: 'PolityStatus' });
             $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
             $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' });
             $('#FreshType').lrDataItemSelect({ code: 'timeType' });

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetArticles.js

@@ -217,7 +217,7 @@ var bootstrap = function ($, learun) {
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                code: 'BCdPartyFace',
+                                code: 'PolityStatus',
                                 callback: function (_data) {
                                     callback(_data.text);
                                 }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetCloth.js

@@ -217,7 +217,7 @@ var bootstrap = function ($, learun) {
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                code: 'BCdPartyFace',
+                                code: 'PolityStatus',
                                 callback: function (_data) {
                                     callback(_data.text);
                                 }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetClothSize.js

@@ -213,7 +213,7 @@ var bootstrap = function ($, learun) {
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                code: 'BCdPartyFace',
+                                code: 'PolityStatus',
                                 callback: function (_data) {
                                     callback(_data.text);
                                 }

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

@@ -380,7 +380,7 @@ var bootstrap = function ($, learun) {
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                code: 'BCdPartyFace',
+                                code: 'PolityStatus',
                                 callback: function (_data) {
                                     callback(_data.text);
                                 }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsHelp.js

@@ -157,25 +157,72 @@ var bootstrap = function ($, learun) {
                     {
                         label: "享受等级", name: "SupportGrade", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('dataItem', {
-                                key: value,
-                                code: 'SupportGrade',
-                                callback: function (_data) {
-                                    callback(_data.text);
+                            if (value && value.indexOf(',') != -1) {
+                                var content = '';
+                                var texts = value.split(',');
+                                for (var i = 0; i < texts.length; i++) {
+                                    learun.clientdata.getAsync('dataItem',
+                                        {
+                                            key: texts[i],
+                                            code: 'SupportGrade',
+                                            callback: function (_data) {
+                                                content += _data.text + ',';
+
+                                            }
+                                        });
                                 }
-                            });
+                                content = content.substring(0, content.length - 1);
+                                callback(content);
+                            } else {
+                                learun.clientdata.getAsync('dataItem',
+                                    {
+                                        key: value,
+                                        code: 'SupportGrade',
+                                        callback: function (_data) {
+                                            callback(_data.text);
+                                        }
+                                    });
+                            }
                         }
+                        //formatterAsync: function (callback, value, row, op, $cell) {
+                        //    learun.clientdata.getAsync('dataItem', {
+                        //        key: value,
+                        //        code: 'SupportGrade',
+                        //        callback: function (_data) {
+                        //            callback(_data.text);
+                        //        }
+                        //    });
+                        //}
                     },
                     {
                         label: "资助种类(一等)", name: "SupportType", width: 200, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getsAsync('dataItem', {
-                                key: value,
-                                code: 'SupportType1',
-                                callback: function (text) {
-                                    callback(text);
+                            if (value && value.indexOf(',') != -1) {
+                                var content = '';
+                                var texts = value.split(',');
+                                for (var i = 0; i < texts.length; i++) {
+                                    learun.clientdata.getAsync('dataItem',
+                                        {
+                                            key: texts[i],
+                                            code: 'SupportGrade',
+                                            callback: function (_data) {
+                                                content += _data.text + ',';
+
+                                            }
+                                        });
                                 }
-                            });
+                                content = content.substring(0, content.length - 1);
+                                callback(content);
+                            } else {
+                                learun.clientdata.getAsync('dataItem',
+                                    {
+                                        key: value,
+                                        code: 'SupportGrade',
+                                        callback: function (_data) {
+                                            callback(_data.text);
+                                        }
+                                    });
+                            }
                         }
                     },
                     {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPay.cshtml

@@ -147,7 +147,7 @@
 </div>
 <script>
 	var data = {
-		school: "北京金隅科技学校",
+		school: "长阳职教中心",
 		name: "薛礼根",
 		id: "14060219930602****",
 		type: "汉族",

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPay.js

@@ -249,7 +249,7 @@ var bootstrap = function ($, learun) {
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                code: 'BCdPartyFace',
+                                code: 'PolityStatus',
                                 callback: function (_data) {
                                     callback(_data.text);
                                 }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPhoto.js

@@ -209,7 +209,7 @@ var bootstrap = function ($, learun) {
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                code: 'BCdPartyFace',
+                                code: 'PolityStatus',
                                 callback: function (_data) {
                                     callback(_data.text);
                                 }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Military.js

@@ -247,7 +247,7 @@ var bootstrap = function ($, learun) {
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                code: 'BCdPartyFace',
+                                code: 'PolityStatus',
                                 callback: function (_data) {
                                     callback(_data.text);
                                 }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/PayAfter.js

@@ -335,7 +335,7 @@ var bootstrap = function ($, learun) {
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                code: 'BCdPartyFace',
+                                code: 'PolityStatus',
                                 callback: function (_data) {
                                     callback(_data.text);
                                 }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Report.js

@@ -313,7 +313,7 @@ var bootstrap = function ($, learun) {
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                code: 'BCdPartyFace',
+                                code: 'PolityStatus',
                                 callback: function (_data) {
                                     callback(_data.text);
                                 }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/StuTuition.js

@@ -332,7 +332,7 @@ var bootstrap = function ($, learun) {
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                code: 'BCdPartyFace',
+                                code: 'PolityStatus',
                                 callback: function (_data) {
                                     callback(_data.text);
                                 }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/FormSchool.js

@@ -15,15 +15,15 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
-            $('#IsCYSchool').lrDataItemSelect({ code: 'YesOrNoBit' }); 
-            $('#Sex').lrDataItemSelect({ code: 'usersex' }); 
+            $('#IsCYSchool').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#Sex').lrDataItemSelect({ code: 'usersex' });
         },
         initData: function () {
             if (!!keyValue) {
                 $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/StuVolunteer/GetFormData?keyValue=' + keyValue, function (data) {
                     for (var id in data) {
                         if (!!data[id].length && data[id].length > 0) {
-                            $('#' + id ).jfGridSet('refreshdata', data[id]);
+                            $('#' + id).jfGridSet('refreshdata', data[id]);
                         }
                         else {
                             $('[data-table="' + id + '"]').lrSetFormData(data[id]);
@@ -41,7 +41,7 @@ var bootstrap = function ($, learun) {
         var postData = {
             strEntity: JSON.stringify($('body').lrGetFormData())
         };
-        $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuVolunteer/SaveForm?keyValue=' + keyValue, postData, function (res) {
+        $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuVolunteer/Volunteer?keyValue=' + keyValue, postData, function (res) {
             // 保存成功后才回调
             if (!!callBack) {
                 callBack();

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollService.cs

@@ -98,7 +98,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 t.DeptNo,
                 t.Grade,
                 t.THROUGHPROJECT,
-                t.Status,
+                t.Status,t.EnrollGrade,t.SynthesizeGrade,
 t.IsSupport,t.SupportGrade,t.SupportType,t.SupportType1,t.SupportCondition,t.SupportRemarks,
 t.SupportTime,t.SupportUserName,
 t.IsSupportChange,t.SupportBank,t.SupportBankCard,t.SupportAmount,t.SupportStatus,t.SupportChangeRemark,t.SupportProcessId,t.IsManualSubsidize,
@@ -2230,15 +2230,15 @@ t.SupportChangeTime,t.SupportChangeUserName
                     oldstuEnroll.DormitoryName = "";
                     this.BaseRepository("CollegeMIS").Update(oldstuEnroll);
                 }
-                var olddormitory = this.BaseRepository("CollegeMIS").FindEntity<Acc_DormitoryBuildEntity>(a => a.PlanStudentID == stuId);
+                var olddormitory = this.BaseRepository("CollegeMIS").FindEntity<Acc_DormitoryBuildEntity>(a => a.StudentID == stuId);
                 if (olddormitory != null)
                 {
-                    olddormitory.PlanStudentID = "";
+                    olddormitory.StudentID = "";
                     this.BaseRepository("CollegeMIS").Update(olddormitory);
                 }
 
                 var dormitory = this.BaseRepository("CollegeMIS").FindEntity<Acc_DormitoryBuildEntity>(a => a.ID == dormitoryNo);
-                dormitory.PlanStudentID = stuId;
+                dormitory.StudentID = stuId;
                 this.BaseRepository("CollegeMIS").Update(dormitory);
 
                 var stuEroll = this.BaseRepository("CollegeMIS").FindEntity<StuEnrollEntity>(a => a.StuId == stuId);