Merge branch '西昌分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 西昌分支

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

@@ -122,6 +122,22 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             var data = arrangeLessonTermIBLL.GetEntity(keyValue);
             return Success(data);
         }
+        /// <summary>
+        /// 获取调度时间数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetLessonDateList(string queryJson)
+        {
+            var data = arrangeLessonTermIBLL.GetList(queryJson).Where(x => x.LessonDate.HasValue).Select(x => x.LessonDate).Distinct().Select(x => new
+            {
+                text = x,
+                value = x
+            }).OrderBy(x => x.value);
+
+            return Success(data);
+        }
         #endregion
 
         #region  提交数据

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

@@ -46,16 +46,16 @@ var bootstrap = function ($, learun) {
                 //调度开始时间
                 $('#AttemperStartTime').lrselectRefresh({
                     allowSearch: true,
-                    url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/GetList?queryJson=' + JSON.stringify(p),
-                    value: 'LessonDate',
-                    text: 'LessonDate'
+                    url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/GetLessonDateList?queryJson=' + JSON.stringify(p),
+                    value: 'value',
+                    text: 'text'
                 });
                 //调度结束时间
                 $('#AttemperEndTime').lrselectRefresh({
                     allowSearch: true,
-                    url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/GetList?queryJson=' + JSON.stringify(p),
-                    value: 'LessonDate',
-                    text: 'LessonDate'
+                    url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/GetLessonDateList?queryJson=' + JSON.stringify(p),
+                    value: 'value',
+                    text: 'text'
                 });
             }
         },
@@ -180,20 +180,9 @@ var bootstrap = function ($, learun) {
             $('#ClassroomNo').lrDataSourceSelect({ code: 'ClassRoomInfo', value: 'classroomno', text: 'classroomname' });
             $('#NewClassroomNo').lrDataSourceSelect({ code: 'ClassRoomInfo', value: 'classroomno', text: 'classroomname' });
             //调度开始时间
-            $('#AttemperStartTime').lrselect({
-                allowSearch: true,
-                url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/GetList?queryJson=' + JSON.stringify({}),
-                value: 'LessonDate',
-                text: 'LessonDate'
-            });
+            $('#AttemperStartTime').lrselect({ allowSearch: true });
             //调度结束时间
-            $('#AttemperEndTime').lrselect({
-                allowSearch: true,
-                url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/GetList?queryJson=' + JSON.stringify({}),
-                value: 'LessonDate',
-                text: 'LessonDate'
-            });
-
+            $('#AttemperEndTime').lrselect({ allowSearch: true });
         },
         initData: function () {
             if (!!keyValue) {
@@ -234,7 +223,10 @@ var bootstrap = function ($, learun) {
                                 $('#NewClassroomNo').siblings('div').html('教室<font face="宋体">*</font>');
                             }
                         }
-                        page.query();
+                        var timer = setTimeout(function () {
+                            page.query();
+                            clearTimeout(timer);
+                        }, 3000)
                     }
                 });
             }
@@ -268,7 +260,7 @@ var bootstrap = function ($, learun) {
         }
     };
     // 设置表单数据
-    setFormData = function (processId) {
+    setFormData = function (processId, param, callback) {
         if (!!processId) {
             $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTermAttemper/GetFormDataByProcessId?processId=' + processId, function (data) {
                 for (var id in data) {
@@ -310,9 +302,14 @@ var bootstrap = function ($, learun) {
                             $('#NewClassroomNo').siblings('div').html('教室<font face="宋体">*</font>');
                         }
                     }
+                    var timer = setTimeout(function () {
+                        page.query();
+                        clearTimeout(timer);
+                    }, 3000)
                 }
             });
         }
+        callback && callback();
     }
     // 验证数据是否填写完整
     validForm = function () {
@@ -336,7 +333,7 @@ var bootstrap = function ($, learun) {
                 return false;
             }
             if (formData.AttemperEndTime < formData.AttemperStartTime) {
-                learun.alert.warning("调度结束时间应该大于调度开始时间！");
+                learun.alert.warning("调度结束时间不能小于调度开始时间！");
                 return false;
             }
         }
@@ -349,7 +346,7 @@ var bootstrap = function ($, learun) {
         $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTermAttemper/SaveForm?keyValue=' + keyValue, postData, function (res) {
             // 保存成功后才回调
             if (!!callBack) {
-                callBack(res, formData, i);
+                callBack(res, i);
             }
         });
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.cshtml

@@ -126,11 +126,11 @@
     </div>
     <div class="col-xs-6 lr-form-item AttemperType AttemperTypeTiao" data-table="ArrangeLessonTermAttemper">
         <div class="lr-form-item-title">调度开始时间<font face="宋体">*</font></div>
-        <div id="AttemperStartTime" readonly></div>
+        <input id="AttemperStartTime" class="form-control" readonly/>
     </div>
     <div class="col-xs-6 lr-form-item AttemperType AttemperTypeTiao" data-table="ArrangeLessonTermAttemper">
         <div class="lr-form-item-title">调度结束时间<font face="宋体">*</font></div>
-        <div id="AttemperEndTime" readonly></div>
+        <input id="AttemperEndTime" class="form-control" readonly />
     </div>
     <div class="col-xs-12 lr-form-item " data-table="ArrangeLessonTermAttemper">
         <div class="lr-form-item-title">调度备注</div>

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

@@ -41,21 +41,22 @@ var bootstrap = function ($, learun) {
             p.TeachClassNo = $('#TeachClassNo').lrselectGet();
             p.EmpNo = $('#EmpNo').lrselectGet();
             p.ClassroomNo = $('#ClassroomNo').lrselectGet();
+            //console.log(p);
             //if (!!p.F_SchoolId && !!p.AcademicYearNo && !!p.Semester && !!p.DeptNo && !!p.MajorNo && !!p.LessonNo && !!p.TeachClassNo && !!p.EmpNo && !!p.ClassroomNo) {
             if (!!p.AcademicYearNo && !!p.Semester && !!p.DeptNo && !!p.MajorNo && !!p.LessonNo && !!p.TeachClassNo && !!p.EmpNo && !!p.ClassroomNo) {
                 //调度开始时间
                 $('#AttemperStartTime').lrselectRefresh({
                     allowSearch: true,
-                    url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/GetList?queryJson=' + JSON.stringify(p),
-                    value: 'LessonDate',
-                    text: 'LessonDate'
+                    url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/GetLessonDateList?queryJson=' + JSON.stringify(p),
+                    value: 'value',
+                    text: 'text'
                 });
                 //调度结束时间
                 $('#AttemperEndTime').lrselectRefresh({
                     allowSearch: true,
-                    url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/GetList?queryJson=' + JSON.stringify(p),
-                    value: 'LessonDate',
-                    text: 'LessonDate'
+                    url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/GetLessonDateList?queryJson=' + JSON.stringify(p),
+                    value: 'value',
+                    text: 'text'
                 });
             }
         },
@@ -179,20 +180,6 @@ var bootstrap = function ($, learun) {
             $('#NewEmpNo').lrDataSourceSelect({ code: 'EmpInfo', value: 'empno', text: 'empname' });
             $('#ClassroomNo').lrDataSourceSelect({ code: 'ClassRoomInfo', value: 'classroomno', text: 'classroomname' });
             $('#NewClassroomNo').lrDataSourceSelect({ code: 'ClassRoomInfo', value: 'classroomno', text: 'classroomname' });
-            //调度开始时间
-            $('#AttemperStartTime').lrselect({
-                allowSearch: true,
-                url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/GetList?queryJson=' + JSON.stringify({}),
-                value: 'LessonDate',
-                text: 'LessonDate'
-            });
-            //调度结束时间
-            $('#AttemperEndTime').lrselect({
-                allowSearch: true,
-                url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/GetList?queryJson=' + JSON.stringify({}),
-                value: 'LessonDate',
-                text: 'LessonDate'
-            });
 
         },
         initData: function () {
@@ -236,7 +223,7 @@ var bootstrap = function ($, learun) {
                                 $('#NewClassroomNo').siblings('div').html('教室<font face="宋体">*</font>');
                             }
                         }
-                        page.query();
+                        
                     }
                 });
             }
@@ -270,7 +257,7 @@ var bootstrap = function ($, learun) {
         }
     };
     // 设置表单数据
-    setFormData = function (processId) {
+    setFormData = function (processId, param, callback) {
         if (!!processId) {
             $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTermAttemper/GetFormDataByProcessId?processId=' + processId, function (data) {
                 for (var id in data) {
@@ -317,6 +304,7 @@ var bootstrap = function ($, learun) {
                 }
             });
         }
+        callback && callback();
     }
     // 验证数据是否填写完整
     validForm = function () {
@@ -336,7 +324,7 @@ var bootstrap = function ($, learun) {
             }
         } else if (formData.AttemperType == "01") {     //调课：调度时间比较
             if (formData.AttemperEndTime < formData.AttemperStartTime) {
-                learun.alert.warning("调度结束时间应该大于调度开始时间！");
+                learun.alert.warning("调度结束时间不能小于调度开始时间！");
                 return false;
             }
         }
@@ -349,7 +337,7 @@ var bootstrap = function ($, learun) {
         $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTermAttemper/SaveForm?keyValue=' + keyValue, postData, function (res) {
             // 保存成功后才回调
             if (!!callBack) {
-                callBack(res, formData, i);
+                callBack(res, i);
             }
         });
     };

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

@@ -408,21 +408,36 @@ var bootstrap = function ($, learun) {
         }
     };
     refreshGirdData = function (res, postData) {
-        if (res.code == 200) {
+        //if (res.code == 200) {
+        //    // 发起流程
+        //    learun.workflowapi.create({
+        //        isNew: true,
+        //        schemeCode: 'ArrangeLessonTermAttemper',// 填写流程对应模板编号
+        //        processId: processId,
+        //        processName: '课程异动申请',// 对应流程名称
+        //        processLevel: '1',
+        //        description: '',
+        //        formData: JSON.stringify(postData),
+        //        callback: function (res, data) {
+        //        }
+        //    });
+        //    page.search();
+        //}
+
+        if (res && res.code && res.code == 200) {
             // 发起流程
-            learun.workflowapi.create({
-                isNew: true,
-                schemeCode: 'ArrangeLessonTermAttemper',// 填写流程对应模板编号
+
+            var postData = {
+                schemeCode: 'ArrangeLessonTermAttemper',// 填写流程对应模板编号 
                 processId: processId,
-                processName: '课程异动申请',// 对应流程名称
-                processLevel: '1',
-                description: '',
-                formData: JSON.stringify(postData),
-                callback: function (res, data) {
-                }
+                level: '1',
+            };
+            learun.httpAsync('Post', top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/CreateFlow', postData, function (data) {
+                learun.loading(false);
             });
-            page.search();
+
         }
+        page.search();
     };
     page.init();
 }

Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/ioc.config

@@ -35,6 +35,7 @@
     <typeAlias alias="MeetingManagementApplyMethod" type="Learun.Application.WorkFlow.MeetingManagementApplyMethod,Learun.Application.WorkFlow" />
     <typeAlias alias="DispatchMethod" type="Learun.Application.WorkFlow.DispatchMethod,Learun.Application.WorkFlow" />
     <typeAlias alias="TextBookIndentMethod" type="Learun.Application.WorkFlow.TextBookIndentMethod,Learun.Application.WorkFlow" />
+    <typeAlias alias="ArrangeLessonTermAttemperMethod" type="Learun.Application.WorkFlow.ArrangeLessonTermAttemperMethod,Learun.Application.WorkFlow" />
 
     <!--任务调度器-->
     <typeAlias alias="ITSMethod" type="Learun.Application.Extention.TaskScheduling.ITsMethod,Learun.Application.Extention" />
@@ -80,6 +81,7 @@
       <type type="IWorkFlowMethod" mapTo="MeetingManagementApplyMethod" name="MeetingManagementApplyMethod"></type>
       <type type="IWorkFlowMethod" mapTo="DispatchMethod" name="DispatchMethod"></type>
       <type type="IWorkFlowMethod" mapTo="TextBookIndentMethod" name="TextBookIndentMethod"></type>
+      <type type="IWorkFlowMethod" mapTo="ArrangeLessonTermAttemperMethod" name="ArrangeLessonTermAttemperMethod"></type>
 
     </container>
 

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs

@@ -74,15 +74,57 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             try
             {
                 //参考写法
-                //var queryParam = queryJson.ToJObject();
+                var queryParam = queryJson.ToJObject();
                 // 虚拟参数
-                //var dp = new DynamicParameters(new { });
-                //dp.Add("startTime", queryParam["StartTime"].ToDate(), DbType.DateTime);
+                var dp = new DynamicParameters(new { });
+
                 var strSql = new StringBuilder();
                 strSql.Append("SELECT ");
                 strSql.Append(fieldSql);
-                strSql.Append(" FROM ArrangeLessonTerm t ");
-                return this.BaseRepository("CollegeMIS").FindList<ArrangeLessonTermEntity>(strSql.ToString());
+                strSql.Append(" FROM ArrangeLessonTerm t where 1=1 ");
+
+                if (!queryParam["AcademicYearNo"].IsEmpty())
+                {
+                    dp.Add("AcademicYearNo", queryParam["AcademicYearNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.AcademicYearNo = @AcademicYearNo ");
+                }
+                if (!queryParam["Semester"].IsEmpty())
+                {
+                    dp.Add("Semester", queryParam["Semester"].ToString(), DbType.String);
+                    strSql.Append(" AND t.Semester = @Semester ");
+                }
+                if (!queryParam["DeptNo"].IsEmpty())
+                {
+                    dp.Add("DeptNo", queryParam["DeptNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.DeptNo = @DeptNo ");
+                }
+                if (!queryParam["MajorNo"].IsEmpty())
+                {
+                    dp.Add("MajorNo", queryParam["MajorNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.MajorNo = @MajorNo ");
+                }
+                if (!queryParam["LessonNo"].IsEmpty())
+                {
+                    dp.Add("LessonNo", queryParam["LessonNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.LessonNo = @LessonNo ");
+                }
+                if (!queryParam["TeachClassNo"].IsEmpty())
+                {
+                    dp.Add("TeachClassNo", "%"+queryParam["TeachClassNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.TeachClassNo like @TeachClassNo ");
+                }
+                if (!queryParam["EmpNo"].IsEmpty())
+                {
+                    dp.Add("EmpNo", queryParam["EmpNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.EmpNo = @EmpNo ");
+                }
+                if (!queryParam["ClassroomNo"].IsEmpty())
+                {
+                    dp.Add("ClassroomNo", queryParam["ClassroomNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.ClassroomNo = @ClassroomNo ");
+                }
+
+                return this.BaseRepository("CollegeMIS").FindList<ArrangeLessonTermEntity>(strSql.ToString(),dp);
             }
             catch (Exception ex)
             {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/NodeMethod/ArrangeLessonTermAttemperMethod.cs

@@ -7,17 +7,21 @@ using System.Threading.Tasks;
 
 namespace Learun.Application.WorkFlow
 {
-    public class ArrangeLessonTermAttemperMethod : INodeMethod
+    public class ArrangeLessonTermAttemperMethod : IWorkFlowMethod
     {
         ArrangeLessonTermAttemperIBLL arrangeLessonTermAttemperIBLL = new ArrangeLessonTermAttemperBLL();
-        public void Sucess(string processId)
+        
+        public void Execute(WfMethodParameter parameter)
         {
-            arrangeLessonTermAttemperIBLL.ModifyStatusByProcessId(2, processId);
-        }
-
-        public void Fail(string processId)
-        {
-            arrangeLessonTermAttemperIBLL.ModifyStatusByProcessId(0, processId);
+            if (parameter.code == "agree")
+            {
+                arrangeLessonTermAttemperIBLL.ModifyStatusByProcessId(2, parameter.processId);
+            }
+            else
+            {
+                arrangeLessonTermAttemperIBLL.ModifyStatusByProcessId(0, parameter.processId);
+            }
         }
+        
     }
 }