金隅 新生管理

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

@@ -257,15 +257,21 @@ 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);
-            if (!keyValue.IsEmpty())
+            var dWList = stuVolunteerIBLL.GetRepetitions(entity.H_SchoolNo, entity.ApplyNo, entity.CardNo).FirstOrDefault();
+
+            if (string.IsNullOrEmpty(keyValue))
             {
-                dWList.Where(x => x.ID != keyValue);
+                if (dWList != null)
+                {
+                    return Fail("保存失败,请检查数据有重复项");
+                }
             }
-            if (dWList.Count() > 0)
+            else
             {
-                return Fail("保存失败,请检查数据有重复项");
+                if (dWList != null && dWList.ID != keyValue)
+                {
+                    return Fail("保存失败,请检查数据有重复项");
+                }
             }
             stuVolunteerIBLL.SaveEntity(keyValue, entity);
             return Success("保存成功！");

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

@@ -323,21 +323,27 @@ var bootstrap = function ($, learun) {
             });
             page.search();
         },
-        refreshMoney: function () {
-            var deptNo = $("#DeptNo").lrselectGet();
-            var majorNo = $("#MajorNo").lrselectGet();
-            var classNo = $("#ClassNo").lrselectGet();
-            $.post(
-                top.$.rootUrl + '/EducationalAdministration/StuEnroll/GetCheckInStatistics',
-                {
-                    DeptNo: deptNo,
-                    MajorNo: majorNo,
-                    ClassNo: classNo
-                },
-                function (res) {
-                    $("#allAmount").html(res.data.aa);
-                    $("#isAmount").html(res.data.bb);
-                }, "json");
+        refreshMoney: function (queryJson) {
+            learun.httpAsyncGetWithParam(top.$.rootUrl + '/EducationalAdministration/StuEnroll/GetMilitaryStatistics', { queryJson: queryJson, type: 3 }, function (res) {
+
+                $("#allAmount").html(res.data.aa);
+                $("#isAmount").html(res.data.bb);
+            });
+
+            //var deptNo = $("#DeptNo").lrselectGet();
+            //var majorNo = $("#MajorNo").lrselectGet();
+            //var classNo = $("#ClassNo").lrselectGet();
+            //$.post(
+            //    top.$.rootUrl + '/EducationalAdministration/StuEnroll/GetMilitaryStatistics',
+            //    {
+            //        DeptNo: deptNo,
+            //        MajorNo: majorNo,
+            //        ClassNo: classNo
+            //    },
+            //    function (res) {
+            //        $("#allAmount").html(res.data.aa);
+            //        $("#isAmount").html(res.data.bb);
+            //    }, "json");
         },
         search: function (param) {
             param = param || {};

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

@@ -204,7 +204,7 @@ var bootstrap = function ($, learun) {
                                     learun.clientdata.getAsync('dataItem',
                                         {
                                             key: texts[i],
-                                            code: 'SupportGrade',
+                                            code: 'SupportType1',
                                             callback: function (_data) {
                                                 content += _data.text + ',';
 
@@ -217,7 +217,7 @@ var bootstrap = function ($, learun) {
                                 learun.clientdata.getAsync('dataItem',
                                     {
                                         key: value,
-                                        code: 'SupportGrade',
+                                        code: 'SupportType1',
                                         callback: function (_data) {
                                             callback(_data.text);
                                         }
@@ -228,13 +228,32 @@ var bootstrap = function ($, learun) {
                     {
                         label: "资助种类(二等)", name: "SupportType1", width: 200, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getsAsync('dataItem', {
-                                key: value,
-                                code: 'SupportType2',
-                                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: 'SupportType2',
+                                            callback: function (_data) {
+                                                content += _data.text + ',';
+
+                                            }
+                                        });
                                 }
-                            });
+                                content = content.substring(0, content.length - 1);
+                                callback(content);
+                            } else {
+                                learun.clientdata.getAsync('dataItem',
+                                    {
+                                        key: value,
+                                        code: 'SupportType2',
+                                        callback: function (_data) {
+                                            callback(_data.text);
+                                        }
+                                    });
+                            }
                         }
                         
                     },

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

@@ -17,13 +17,13 @@ var bootstrap = function ($, learun) {
         },
         bind: function () {
             if (MajorNo != null && MajorNo != "" && MajorNo != undefined) {
-                console.log(MajorNo,321);
                 $('#ClassNo').lrselect({
                     url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
                     param: { strWhere: " 1=1 and MajorNo = '" + MajorNo + "'" },
                     value: "classno",
                     text: "classname",
-                    maxHeight: 200
+                    maxHeight: 200,
+                    allowSearch: true,
                 });
             }
             $("#ClassNo").lrselect();

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

@@ -199,7 +199,7 @@ var bootstrap = function ($, learun) {
         },
         search: function (param) {
             param = param || {};
-            param.SqlParameter = " and MajorNo is not null and ClassNo is not null ";
+            param.SqlParameter = " and len (MajorNo) > 0 and len(ClassNo) > 0 ";
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

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

@@ -612,6 +612,11 @@ t.SupportChangeTime,t.SupportChangeUserName
                     aa = list.Count(x => x.IsSubsidize1 == true);
                     bb = list.Count(x => x.IsSubsidize1 == false);
                 }
+                if (type == 3)
+                {
+                    aa = list.Count(x => x.IsCheckIn == true);
+                    bb = list.Count(x => x.IsCheckIn == false);
+                }
                 return new { aa, bb };
             }
             catch (Exception ex)