bjquanjiang
/
DigitalScholl
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

课时费统计修改

黑艺新账号
dao 9 months ago
parent
76135752f1
commit
61246a2067
6 changed files with 64 additions and 13 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ArrangeLessonTermController.cs
  2. +21
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/PrintCourseStatistic.cshtml
  3. +3
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/coursestatictis.cshtml
  4. +30
    -4
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/coursestatictis.js
  5. +6
    -5
      Learun.Framework.Ultimate V7/Learun.Application.Web/Properties/PublishProfiles/CustomProfile.pubxml
  6. +2
    -1
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs

+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ArrangeLessonTermController.cs View File

@@ -96,10 +96,10 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
/// </summary>
/// <returns></returns>
[HttpGet]
public ActionResult PrintCourseStatistic(string weeks, string deptNo, string StartTime, string EndTime)
public ActionResult PrintCourseStatistic(string weeks, string deptNo, string StartTime, string EndTime, string status)
{
Pagination paginationobj = new Pagination() { rows = 100000, page = 1, sidx = "empno ", sord = "asc" };
var queryJson = "{\"weeks\":\"" + weeks + "\",\"deptNo\":\"" + deptNo + "\",\"StartTime\":\"" + StartTime + "\",\"EndTime\":\"" + EndTime + "\"}";
var queryJson = "{\"weeks\":\"" + weeks + "\",\"status\":\"" + status + "\",\"deptNo\":\"" + deptNo + "\",\"StartTime\":\"" + StartTime + "\",\"EndTime\":\"" + EndTime + "\"}";
var data = arrangeLessonTermIBLL.GetcoursestatictisList(paginationobj, queryJson);
ViewBag.data = data;
ViewBag.startTime = StartTime;


+ 21
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/PrintCourseStatistic.cshtml View File

@@ -16,7 +16,7 @@
<body>
<div>
<div class="tableTop">
@ViewBag.startTime.Substring(0, 4)年黑龙江艺术职业学院______<span>@ViewBag.deptName</span>______系(部)校内专任教师_____月份课时费报表(@ViewBag.startTime.Substring(0, 10)-@ViewBag.endTime.Substring(0, 10))
@ViewBag.startTime.Substring(0, 4)年黑龙江艺术职业学院______<span>@ViewBag.deptName</span>______校内专任教师_____月份课时费报表(@ViewBag.startTime.Substring(0, 10)-@ViewBag.endTime.Substring(0, 10))
</div>
@{
var now = DateTime.Now;
@@ -27,6 +27,7 @@
<td><div style="min-width: 36px;">序号</div></td>
<td><div style="min-width: 44px;">姓名</div></td>
<td>教师职务</td>
<td>教师职称</td>
<td>周任务课时(节)</td>
<td>月课时(节)</td>
<td>折算后月课时(节)</td>
@@ -43,6 +44,7 @@
<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>
@@ -95,12 +97,30 @@
});
return result;
}
function getZhichenName(code, value) {
var result = "";
learun.clientdata.getAsync('dataItem', {
key: value,
code: code,
callback: function (_data) {
result = _data.text;
}
});
if (result == value) {
result = "";
}
return result;
}
setTimeout(function () {
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()));
}
var item = $('#tableContainer').find('.zhichen')[i];
if ($(item).html()) {
$(item).html(getZhichenName('jszc', $(item).html()));
}
};
}, 10);
}


+ 3
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/coursestatictis.cshtml View File

@@ -16,6 +16,9 @@
<div class="lr-layout-tool-item">
<div id="DeptNo" style="min-width:200px"></div>
</div>
<div class="lr-layout-tool-item">
<div id="status" style="min-width:150px"></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>


+ 30
- 4
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/coursestatictis.js View File

@@ -22,6 +22,12 @@ var bootstrap = function ($, learun) {
text: "text",
value: "value",
})
$('#status').lrselect({
placeholder: "是否外聘",
data: [{ text: "是", value: "2" }, { text: "否", value: "0" }],
text: "text",
value: "value",
})
//系部
//$('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
//部门
@@ -58,8 +64,9 @@ var bootstrap = function ($, learun) {
learun.alert.warning("请选择本月周数！");
return false;
}
var status = $('#status').lrselectGet();
var deptNo = $('#DeptNo').lrselectGet();
page.search({ weeks: weeks, deptNo: deptNo });
page.search({ weeks: weeks, deptNo: deptNo, status: status });
});
// 刷新
$('#lr_refresh').on('click', function () {
@@ -75,7 +82,7 @@ var bootstrap = function ($, learun) {
learun.layerForm({
id: 'PrintCourseStatistic',
title: '打印',
url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/PrintCourseStatistic?weeks=' + weeks + '&deptNo=' + $('#DeptNo').lrselectGet() + '&StartTime=' + startTime + '&EndTime=' + endTime,
url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/PrintCourseStatistic?weeks=' + weeks + '&status=' + $('#status').lrselectGet() + '&deptNo=' + $('#DeptNo').lrselectGet() + '&StartTime=' + startTime + '&EndTime=' + endTime,
width: 1200,
height: 800,
btn: null
@@ -127,9 +134,28 @@ var bootstrap = function ($, learun) {
},
{ label: '周任务课时（节）', name: 'weekcourses', width: 200, align: "left" },
{ label: '实际月课时量（节）', name: 'monthactcourses', width: 200, align: "left" },
{ label: '折算后月课时量（节）', name: 'zhesuan_monthactcourses', width: 200, align: "left" },
{
label: '折算后月课时量（节）', name: 'zhesuan_monthactcourses', width: 200, align: "left",
formatter: function (cellvalue, row) {
if (row.zhiwu == '1' || row.zhiwu == '2' || row.zhiwu == '3' || row.zhiwu == '4') {
return "";
} else {
return cellvalue;
}
}
},
{ label: '课时费标准（元/节）', name: 'feestandard', width: 200, align: "left" },
{ label: '实发课时费（元）', name: 'actfeestandard', width: 200, align: "left" },
{
label: '实发课时费（元）', name: 'actfeestandard', width: 200, align: "left",
formatter: function (cellvalue) {
if (cellvalue) {
return cellvalue < 0 ? "0" : "" + cellvalue + "";
} else {
return "0";
}

}
},
],
mainId: 'ALTId',
isPage: true,


+ 6
- 5
Learun.Framework.Ultimate V7/Learun.Application.Web/Properties/PublishProfiles/CustomProfile.pubxml View File

@@ -9,15 +9,16 @@
<LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
<LastUsedPlatform>Any CPU</LastUsedPlatform>
<SiteUrlToLaunchAfterPublish />
<LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
<ExcludeApp_Data>False</ExcludeApp_Data>
<LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
<ExcludeApp_Data>false</ExcludeApp_Data>
<MSDeployServiceURL>58.87.72.71</MSDeployServiceURL>
<DeployIisAppPath>70adms</DeployIisAppPath>
<RemoteSitePhysicalPath />
<SkipExtraFilesOnServer>True</SkipExtraFilesOnServer>
<SkipExtraFilesOnServer>false</SkipExtraFilesOnServer>
<MSDeployPublishMethod>WMSVC</MSDeployPublishMethod>
<EnableMSDeployBackup>True</EnableMSDeployBackup>
<EnableMSDeployBackup>true</EnableMSDeployBackup>
<UserName>administrator</UserName>
<_SavePWD>False</_SavePWD>
<_SavePWD>false</_SavePWD>
<EnableMsDeployAppOffline>false</EnableMsDeployAppOffline>
</PropertyGroup>
</Project>

+ 2
- 1
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs View File

@@ -2271,6 +2271,7 @@ group by AcademicYearNo,Semester,DeptNo,MajorNo,LessonNo,TeachClassNo,EmpNo,Les
int weeks = queryParam["weeks"] == null ? 1 : queryParam["weeks"].ToInt();
if (weeks < 1 || weeks > 5) weeks = 1;
var deptNo = queryParam["deptNo"] == null ? string.Empty : queryParam["deptNo"].ToString();
var status = (queryParam["status"] == null ? "0" : queryParam["status"].ToString()).ToInt();
string starttime = queryParam["StartTime"].IsEmpty() ? DateTime.Now.Date.ToString() : queryParam["StartTime"].ToString();
string endtime = queryParam["EndTime"].IsEmpty() ? DateTime.Now.Date.ToString() : queryParam["EndTime"].ToString();
strSql.Append("select a.*,b.jobrank as zhiwu,b.ProfessionalTitle as zhicheng,b.F_DepartmentId as dept,b.feestandard,b.Weekcourses,ta.actcourses as monthactcourses,ta.actcourses-(" + weeks + "*b.Weekcourses) as zhesuan_monthactcourses, ");
@@ -2281,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 ");
strSql.Append("where a.empno is not null and (b.IsInActiveStatus="+status+" or 0="+status+") ");
if (!string.IsNullOrEmpty(deptNo))
{
strSql.Append("and b.F_DepartmentId='" + deptNo + "' ");


Write Preview
Loading…
Cancel
Save