课时统计

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/coursestatictis.cshtml

@@ -10,6 +10,9 @@
                     <div class="lr-layout-tool-item">
                         <div id="datesearch"></div>
                     </div>
+                    <div class="lr-layout-tool-item">
+                        <div id="weeks"></div>
+                    </div>
                     <div class="lr-layout-tool-item">
                         <a id="btn_Search" class="btn btn-primary btn-sm"><i class="fa fa-search"></i>&nbsp;查询</a>
                     </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/coursestatictis.js

@@ -17,36 +17,51 @@ var bootstrap = function ($, learun) {
         },
         bind: function () {
             // 时间搜索框
-            $('#datesearch').lrdate({
-                dfdata: [
-                    { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
-                    { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
-                    { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
-                    { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }
-                ],
-                // 月
-                mShow: false,
-                premShow: false,
-                // 季度
-                jShow: false,
-                prejShow: false,
-                // 年
-                ysShow: false,
-                yxShow: false,
-                preyShow: false,
-                yShow: false,
-                // 默认
-                dfvalue: '3',
-                selectfn: function (begin, end) {
-                    startTime = begin;
-                    endTime = end;
-                    //page.search();
-                }
-            });
+            $('#weeks').lrselect({
+                data: [{ text: "3周", value: "3" }, { text: "4周", value: "4" }],
+                text: "text",
+                value: "value",
+            })
+            var monthdata = []
+            for (var i = 1; i <= 12; i++) {
+                monthdata.push({ text: i+"月", value: i })
+            }
+            $('#datesearch').lrselect({
+                data: monthdata,
+                text: "text",
+                value: "value",
+            })
+            //$('#datesearch').lrdate({
+            //    dfdata: [
+            //        { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+            //        { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+            //        { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+            //        { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }
+            //    ],
+            //    // 月
+            //    mShow: false,
+            //    premShow: false,
+            //    // 季度
+            //    jShow: false,
+            //    prejShow: false,
+            //    // 年
+            //    ysShow: false,
+            //    yxShow: false,
+            //    preyShow: false,
+            //    yShow: false,
+            //    // 默认
+            //    dfvalue: '3',
+            //    selectfn: function (begin, end) {
+            //        startTime = begin;
+            //        endTime = end;
+            //        //page.search();
+            //    }
+            //});
             // 查询
             $('#btn_Search').on('click', function () {
-                var keyword = $('#txt_Keyword').val();
-                page.search({ keyword: keyword });
+                var month = $('#datesearch').lrselectGet();
+                var weeks = $('#weeks').lrselectGet();
+                page.search({ month: month, weeks: weeks });
             });
             // 刷新
             $('#lr_refresh').on('click', function () {
@@ -122,8 +137,8 @@ var bootstrap = function ($, learun) {
         },
         search: function (param) {
             param = param || {};
-            param.StartTime = startTime;
-            param.EndTime = endTime;
+            //param.StartTime = startTime;
+            //param.EndTime = endTime;
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

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

@@ -2220,14 +2220,16 @@ group by  AcademicYearNo,Semester,DeptNo,MajorNo,LessonNo,TeachClassNo,EmpNo,Les
             try
             {
                 var strSql = new StringBuilder();
-
                 var queryParam = queryJson.ToJObject();
-                strSql.Append("select a.*,b.jobrank as zhiwu,b.F_DepartmentId as dept,b.feestandard,b.Weekcourses,ta.actcourses as monthactcourses,ta.actcourses-(b.Weekcourses*4) as zhesuan_monthactcourses,  ");
+                int month = queryParam["month"] == null ? DateTime.Now.Month : queryParam["month"].ToInt() ;
+                string starttime = DateTime.Now.Year.ToString()+"-" + month + "-1 00:00:00";
+                string endtime = DateTime.Now.Year.ToString() + "-" + month + "-"+ DateTime.DaysInMonth(DateTime.Now.Year, month) +" 23:59:59";
+                strSql.Append("select a.*,b.jobrank as zhiwu,b.F_DepartmentId as dept,b.feestandard,b.Weekcourses,ta.actcourses as monthactcourses,ta.actcourses-(b.Weekcourses*"+ (queryParam["weeks"]==null?4: queryParam["weeks"]) + ") as zhesuan_monthactcourses,  ");
                 strSql.Append("case when  b.jobrank in('5','6') then (ta.actcourses-4*b.Weekcourses)*b.feestandard  ");
-                strSql.Append("when  b.jobrank in(1,2,3,4) then (case when ta.actcourses<=(4*b.weekcourses)/2 then ta.actcourses*b.feestandard else 4*b.weekcourses*b.feestandard/2 end) end as actfeestandard ");
+                strSql.Append("when  b.jobrank in(1,2,3,4) then (case when ta.actcourses<=(" + (queryParam["weeks"]==null ? 4 : queryParam["weeks"]) + "*b.weekcourses)/2 then ta.actcourses*b.feestandard else " + (queryParam["weeks"] == null ? 4 : queryParam["weeks"]) + "*b.weekcourses*b.feestandard/2 end) end as actfeestandard ");
                 strSql.Append("from  ");
-                strSql.Append("(select count(*) as courses,a.empno,a.empname  from ArrangeLessonTerm a where lessondate between '"+ queryParam["StartTime"] + "' and '" + queryParam["EndTime"] + "' group by a.empno,a.empname ) a  ");
-                strSql.Append("left join (select count(*) as actcourses,empno from Teach_attendance where clocktime between '" + queryParam["StartTime"] + "' and '" + queryParam["EndTime"] + "' group by empno) ta on ta.empno=a.empno ");
+                strSql.Append("(select count(*) as courses,a.empno,a.empname  from ArrangeLessonTerm a where lessondate between '"+ starttime + "' and '" + endtime + "' group by a.empno,a.empname ) a  ");
+                strSql.Append("left join (select count(*) as actcourses,empno from Teach_attendance where clocktime between '" + starttime + "' and '" + endtime + "' group by empno) ta on ta.empno=a.empno ");
                 strSql.Append("left join empinfo b on a.empno=b.empno ");
                 return this.BaseRepository("CollegeMIS").FindList<LessonStatictisEntity>(strSql.ToString(), pagination);
             }