课时费统计打印修改及检索修改

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

@@ -18,7 +18,7 @@
         <div class="tableTop">
             @ViewBag.startTime.Substring(0, 4)年黑龙江艺术职业学院______<span>@ViewBag.deptName</span>______校内专任教师_____月份课时费报表(@ViewBag.startTime.Substring(0, 10)-@ViewBag.endTime.Substring(0, 10))
         </div>
-        @{ 
+        @{
             var now = DateTime.Now;
         }
         <div class="makeTime">制表时间：@now.Year 年 @now.Month 月 @now.Day 日</div>
@@ -40,32 +40,41 @@
             }
             @foreach (LessonStatictisEntity entity in dataList)
             {
-            <tr>
-                <td>@(dataList.IndexOf(entity) + 1)</td>
-                <td><div>@entity.empname</div></td>
-                <td class="zhiwu">@entity.zhiwu</td>
-                <td class="zhichen">@entity.zhicheng</td>
-                <td>@entity.weekcourses</td>
-                <td>@entity.monthactcourses</td>
-                <td>@entity.zhesuan_monthactcourses</td>
-                @if (string.IsNullOrEmpty(entity.feestandard))
-                {
-                    <td>@entity.feestandard</td>
-                }
-                else
-                {
-                    <td>￥@entity.feestandard</td>
-                }
-                @if (string.IsNullOrEmpty(entity.actfeestandard))
-                {
-                    <td>@entity.actfeestandard</td>
-                }
-                else
-                {
-                    <td>￥@entity.actfeestandard</td>
-                }
-                <td></td>
-            </tr>
+                <tr>
+                    <td>@(dataList.IndexOf(entity) + 1)</td>
+                    <td><div>@entity.empname</div></td>
+                    <td class="zhiwu">@entity.zhiwu</td>
+                    <td class="zhichen">@entity.zhicheng</td>
+                    <td>@entity.weekcourses</td>
+                    <td>@entity.monthactcourses</td>
+                    <td>
+                        @if (entity.zhiwu == "1" || entity.zhiwu == "2" || entity.zhiwu == "3" || entity.zhiwu == "4")
+                        {
+
+                        }
+                        else
+                        {
+                            @entity.zhesuan_monthactcourses
+                        }
+                    </td>
+                    @if (string.IsNullOrEmpty(entity.feestandard))
+                    {
+                        <td>@entity.feestandard</td>
+                    }
+                    else
+                    {
+                        <td>￥@entity.feestandard</td>
+                    }
+                    @if (string.IsNullOrEmpty(entity.actfeestandard) || Convert.ToDecimal(entity.actfeestandard) < 0)
+                    {
+                        <td>￥0</td>
+                    }
+                    else
+                    {
+                        <td>￥@entity.actfeestandard</td>
+                    }
+                    <td></td>
+                </tr>
             }
         </table>
         <div class="tableBottom">
@@ -86,7 +95,7 @@
             window.print()
         }
         var bootstrap = function ($, learun) {
-            function getZhiwuName(code,value) {
+            function getZhiwuName(code, value) {
                 var result = "";
                 learun.clientdata.getAsync('dataItem', {
                     key: value,
@@ -115,7 +124,7 @@
                 for (var i = 0; i < $('#tableContainer').find('.zhiwu').length; i++) {
                     var item = $('#tableContainer').find('.zhiwu')[i];
                     if ($(item).html()) {
-                        $(item).html(getZhiwuName('JobGrade',$(item).html()));
+                        $(item).html(getZhiwuName('JobGrade', $(item).html()));
                     }
                     var item = $('#tableContainer').find('.zhichen')[i];
                     if ($(item).html()) {

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

@@ -2282,7 +2282,7 @@ group by  AcademicYearNo,Semester,DeptNo,MajorNo,LessonNo,TeachClassNo,EmpNo,Les
                 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 (select ff.EmpNo,ff.LessonDate,ff.LessonTime from (select aall.* from (select EmpNo,ALTId from Teach_attendance where LessonSortNo='1' and clocktime between '" + starttime + "' and '" + endtime + "' group by EmpNo,ALTId) ee left join ArrangeLessonTerm aall on aall.ALTId=ee.ALTId) ff group by ff.EmpNo,ff.LessonDate,ff.LessonTime) gg group by gg.EmpNo ) ta on ta.empno=a.empno ");
                 strSql.Append("left join empinfo b on a.empno=b.empno ");
-                strSql.Append("where a.empno is not null and (b.IsInActiveStatus="+status+" or 0="+status+")  ");
+                strSql.Append("where a.empno is not null and (b.IsInActiveStatus="+status+" or (0="+status+ " and b.IsInActiveStatus!=2))  ");
                 if (!string.IsNullOrEmpty(deptNo))
                 {
                     strSql.Append("and b.F_DepartmentId='" + deptNo + "' ");