diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeach.css b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeach.css new file mode 100644 index 000000000..d01e93557 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeach.css @@ -0,0 +1,12 @@ +#lr_im_message_list .lr-list-item-media img { + border-radius:5px; +} +#lr_im_message_list .lr-list-item-media .date { + position: absolute; + top: 15px; + right: 5px; + text-align: right; + font-size: 12px; + font-weight: 400; + color: #8f8f94; +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeach.html b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeach.html new file mode 100644 index 000000000..0e3cad6d5 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeach.html @@ -0,0 +1,22 @@ +
+
+
+ 总共0条 +
+
+
+ +
+
+ + +
+
+
+
+
+
+ +
\ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeach.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeach.js new file mode 100644 index 000000000..347ad0d1b --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeach.js @@ -0,0 +1,76 @@ +(function () { + var multipleData = null; + var page = { + grid: null, + init: function ($page) { + page.grid = $page.find('#lr_EvaluationTeach_list').lrpagination({ + lclass: page.lclass, + rows: 10, // 每页行数 + getData: function (param, callback) {// 获取数据 param 分页参数,callback 异步回调 + param.multipleData = multipleData; + page.loadData(param, callback, $page); + }, + renderData: function (_index, _item, _$item) {// 渲染数据模板 + return page.rowRender(_index, _item, _$item, $page); + }, + click: function (item, $item, $et) {// 列表行点击事件 + if ($et.hasClass('lr-btn-success')) { + page.btnClick(item, $item, $page); + } + else { + page.rowClick(item, $item, $page); + } + } + //btns: page.rowBtns + }); + }, + lclass: 'lr-list', + loadData: function (param, callback, $page) {// 列表加载后台数据 + var _postParam = { + pagination: { + rows: param.rows, + page: param.page + }, + queryJson: '{}' + }; + if (param.multipleData) { + _postParam.queryJson = JSON.stringify(multipleData); + } + learun.httpget(config.webapi + '/learun/eval/studentlist', _postParam, (data) => { + $page.find('.lr-badge').text('0'); + if (data) { + $page.find('.lr-badge').text(data.records); + callback(data.rows, parseInt(data.records)); + } + else { + callback([], 0); + } + }); + }, + rowRender: function (_index, _item, _$item, $page) {// 渲染列表行数据 + _$item.addClass('lr-list-item lr-list-item-multi'); + _$item.append($('

学年:

').dataFormatter({ value: _item.AcademicYearNo })); + _$item.append($('

学期:

').dataFormatter({ value: _item.Semester })); + _$item.append($('

教师姓名:

').dataFormatter({ value: _item.EmpName })); + _$item.append($('

课程名称:

').dataFormatter({ value: _item.LessonName })); + _$item.append($('

评教状态:

').dataFormatter({ value: (_item.UID != undefined && _item.UID !== '') ? "已评" : "未评" })); + return ''; + }, + rowClick: function (item, $item, $page) {// 列表行点击触发方法 + if (item.UID != undefined && item.UID !== '') { + learun.layer.warning("当前项目已评教！"); + return; + } + learun.nav.go({ path: 'EvaluationTeach/EvaluationTeahcers', title: '评价教师', type: 'right', param: { VID: item.VID, EmpNo: item.EmpNo, LessonNo: item.LessonNo } }); + }, + btnClick: function (item, $item, $page) {// 左滑按钮点击事件 + if (item.UID == undefined || item.UID === '') { + learun.layer.warning("当前项目未评教！"); + return; + } + learun.nav.go({ path: 'EvaluationTeach/EvaluationTeahcers', title: '评价教师', type: 'right', param: { VID: item.VID, StuNo: item.StuNo } }); + }, + rowBtns: ['查看'] // 列表行左滑按钮 + }; + return page; +})(); \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeahcers/EvaluationTeahcers.css b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeahcers/EvaluationTeahcers.css new file mode 100644 index 000000000..78fc8c547 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeahcers/EvaluationTeahcers.css @@ -0,0 +1,170 @@ +@charset "utf-8"; +/* CSS Document */ + + +body { + font-family: "Microsoft YaHei", "微软雅黑" !important; +} + + + + +/*****sec1*******/ +.eva_sec1{ + padding: 1px 0; +} +.eva_sec1 .index_box { + padding: 0 12px 15px; + border: 1px solid #E5E5E7; + width: 94%; + margin: 20px auto; +} +.inSecTitle{ + font-size: 20px; + text-align: center; + margin: 20px 0 0px; +} +.inSecTime{ + font-size: 12px; + text-align: center; +} +.shenInput { + margin-top: 15px; + font-size: 14px; + line-height: 24px; +} +.shenInput3 { + display: none; +} +.shenInput:before, .shenInput:after { + display: table; + content: " "; +} +.shenInput:after { + clear: both; +} +.signTxt { + line-height: 24px; + font-size: 14px; + position: relative; +} +.shenInputBox { + position: relative; +} +.shenInputBox1 { + margin-left: 60px; +} +.inputRadioRow { + overflow: hidden; +} +.inputRadioCol4 {margin-top: 8px;} +.inputRadio { + border-radius: 50%; +} +.inputCheck{ + border-radius: 2px; +} +.inputRadio.active:after { + content: ''; + width: 12px; + height: 12px; + background: #0C86D8; + position: absolute; + left: 0; + right: 0; + bottom: 0; + top: 0; + margin: auto; + border-radius: 50%; +} +.inputCheck.active:after { + content: ''; + width: 12px; + height: 12px; + background: #0C86D8; + position: absolute; + left: 0; + right: 0; + bottom: 0; + top: 0; + margin: auto; + border-radius: 2px; +} +.inputRadio,.inputCheck { + font-style: normal; + display: inline-block; + vertical-align: middle; + width: 20px; + height: 20px; + border: 1px solid #CBCBCB; + margin: 0 10px; + position: relative; + cursor: pointer; +} + + +.shenInputBox>span, .inputRadioCol4 span, .inputRadioCol3 span, .inputRadioCol2 span { + display: inline-block; + vertical-align: middle; +} +.shenInput>span { + display: block; + float: left; + width: 60px; + text-align: right; + padding: 4px 8px 4px 0px; + line-height: 24px; +} +.shenInputBox .inputTxt { + width: 100%; + display: block; + height: 32px; + line-height: 20px; + border: 1px solid #CBCBCB; + padding: 6px 10px; + font-size: 14px; +} +.shenBtnBox .signTxt { + margin-top: 30px; + margin-left: 30px; +} +.shenBtn { + width: 74%; + background: #0C86D8; + text-align: center; + line-height: 40px; + margin: 20px auto 20px; + font-size: 17px; + color: #fff; + border-radius: 2px; + cursor: pointer; + border-radius: 4px; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; +} +.signTextareaBox { + margin-top: 20px; + position: relative; +} +.inputRadioRow { + overflow: hidden; +} +.inputRadioCol2 { + margin-top: 8px; +} +.inputCheck img { + width: 100%; + display: none; +} +.signTextarea { + margin-top: 15px; + font-size: 14px; + line-height: 24px; +} +.redEva{ + color: red!important; +} +/*****sec1*******/ + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeahcers/EvaluationTeahcers.html b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeahcers/EvaluationTeahcers.html new file mode 100644 index 000000000..6a420b147 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeahcers/EvaluationTeahcers.html @@ -0,0 +1,14 @@ +
+ +
+
+
+
+ +
+
+
保  存
+
+
+ +
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeahcers/EvaluationTeahcers.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeahcers/EvaluationTeahcers.js new file mode 100644 index 000000000..373a8a33c --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeahcers/EvaluationTeahcers.js @@ -0,0 +1,168 @@ +(function() { + var page = { + isScroll: true, + init: function($page, param) { + var path = config.webapi; + learun.layer.loading(true, "加载数据中..."); + learun.httpget(path + "/learun/eval/paper", { + VID: param.VID + }, (res) => { + learun.layer.loading(false); + $page.find('.inSecTitle').html(res.VTitle).end().find('.inSecTime').html(res.VStartTime + ' - ' + res.VStopTime) + var dataList = res.Eval_Questions; + var otherHtml = '
'+ + '其他'+ + '
'+ + ''+ + '
'+ + '
'; + var html = ''; + $.each(dataList, function(i, n){ + html += '
'; + var flag = false; + if(n.QType == 1){ + html += '
'+ + '
'+ + '
'+ n.QTitle +'
'+ + '
'; + $.each(n.Eval_QuestionItems, function(j, m){ + m.QShowText ? flag = true : ''; + html += '
'+ + ''+ + ''+ m.ITitle +''+ + '
'; + + }) + }else if(n.QType == 2){ + html += '
'+ + '
'+ + '
'+ n.QTitle +'
'+ + '
'; + $.each(n.Eval_QuestionItems, function(j, m){ + if(m.QShowText){ + flag = true; + } + html += '
'+ + ''+ + ''+ m.ITitle +''+ + '
'; + }) + } + html += '
'; + html += flag? otherHtml + '
' : '
'; + }) + $('.index_box').html(html) + }); + + + $page.find('.shenBtn').on('tap', function() { + var jsonArr= []; + var qmustFlag = false; + var flag = false; + $('.signTxt').removeClass('redEva'); + $('.signSec2Box').each(function(i, n){ + var _this = $(n); + var qmust = _this.attr('qmust'); + var qmin = _this.attr('qmin') == 'null'? 0 : _this.attr('qmin'); + var qmax = _this.attr('qmax') == 'null'? 0 : _this.attr('qmax'); + var checkBoxs = _this.find('.checkBoxs.active'); + var ind = checkBoxs.length; + if(qmust == 'true' && ind == 0){ + qmustFlag = true; + _this.find('.signTxt').addClass('redEva'); + } + if((qmin && ind < qmin) || (qmax && ind > qmax)){ + flag = true; + _this.find('.signTxt').addClass('redEva'); + } + var UText = _this.find('.shenInput3 .inputTxt').val(); + var qid = $(this).attr("qid"); + checkBoxs.each(function(j, m){ + var txt = $(m).attr('flag') == 'true'? UText : ''; + jsonArr.push({QID: qid, IID: $(m).attr("iid"), UText: txt}) + }) + }) + // console.log(jsonArr) + if(qmustFlag){ + learun.layer.toast('有必选项未选择'); + return + } + if(flag){ + learun.layer.toast('有选择项少选或多选'); + return + } + // return + learun.httppost(path + "/learun/eval/savepaper", + { + VID: param.VID, + LessonNo: param.LessonNo, + EmpNo: param.EmpNo, + postarray: jsonArr + }, (res) => { + learun.layer.toast('操作成功'); + learun.nav.closeCurrent(); + var prepage = learun.nav.getpage('EvaluationTeach'); + prepage.grid.reload(); + }); + }) + + //单选框 + $page.on('tap', '.shenInputBox .inputRadio', function() { + if (!$(this).hasClass('active')) { + // var iid = $(this).attr('iid'); + $(this).addClass('active').parents('.shenInputBox').find('.inputRadio').not($(this)).removeClass('active'); + judgeRideo($(this)) + } + }) + + //多选框 + $page.on('tap', '.inputCheck', function() { + var parents = $(this).parents('.signSec2Box'); + var qmin = parents.attr('qmin') == 'null'? 0 : parents.attr('qmin'); + var qmax = parents.attr('qmax') == 'null'? 0 : parents.attr('qmax'); + var ind = parents.find('.inputCheck.active').length; + if ($(this).hasClass('active')) { + if(qmin && ind <= qmin){ + learun.layer.toast('该选项最少选择'+ qmin + '项'); + return + } + $(this).removeClass('active') + } else { + if(qmax && ind >= qmax){ + learun.layer.toast('该选项最多选择'+ qmax + '项'); + return + } + $(this).addClass('active'); + } + // var iids = ''; + // parents.find('.inputCheck.active').each(function(i, n){ + // var iid = $(n).attr('iid'); + // iids += i== 0? iid : ',' + iid; + // }) + // parents.attr('iid', iids) + judgeRideo($(this)) + }) + //是否为其他选项判断 + function judgeRideo(obj) { + var parents = obj.parents('.signSec2Box'); + var inputs = parents.find('.shenInput3'); + + if (parents.find("i[flag='true']").hasClass('active')) { + inputs.css({ + display: 'block' + }); + } else { + inputs.css({ + display: 'none' + }).find('input').val(''); + } + } + + + }, + destroy: function(pageinfo) { + + } + }; + return page; +})(); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Form.cshtml index 2698030e8..83a11a01a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Form.cshtml @@ -42,8 +42,8 @@
-
资产名称
- +
资产名称*
+
部门
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ClassPlanController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ClassPlanController.cs index 00ec7b2f3..eb15366b0 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ClassPlanController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ClassPlanController.cs @@ -181,13 +181,14 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { var lessonList = classInfoIBLL.GetAllClass(). Where(x => x.DeptNo == entity[i].DeptNo && x.MajorNo == entity[i].MajorNo && x.Grade == entity[i].Grade) - .OrderBy(x => x.ClassNo).Select(x => x.ClassNo).ToList(); + .OrderBy(x => x.ClassNo).Select(field1 => new { field1.ClassNo, field1.ClassName }).ToList(); if (lessonList.Count > 0) { for (int j = 0; j < lessonList.Count; j++) { TeachClassEntity TeachEntity = new TeachClassEntity(); - TeachEntity.TeachClassNo = lessonList[j]; + TeachEntity.TeachClassNo = lessonList[j].ClassNo; + TeachEntity.TeachClassName = lessonList[j].ClassName; TeachEntity.AcademicYearNo = entity[i].AcademicYearNo; TeachEntity.DeptNo = entity[i].DeptNo; TeachEntity.MajorNo = entity[i].MajorNo; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassPlan/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassPlan/Form.js index eb03c43cc..024fb9e46 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassPlan/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassPlan/Form.js @@ -69,6 +69,7 @@ var bootstrap = function ($, learun) { text: "lessonname", maxHeight: 200 }); + console.log(param); } } }); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassPlanTeach/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassPlanTeach/Index.cshtml index 4a6fdd314..6cf2377a4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassPlanTeach/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassPlanTeach/Index.cshtml @@ -35,14 +35,14 @@
学期
- @*
-
系部
-
-
*@ -
+
年级
+
+
教师
+
+
课程
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassPlanTeach/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassPlanTeach/Index.js index 2755e71ab..3ec306776 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassPlanTeach/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassPlanTeach/Index.js @@ -36,6 +36,8 @@ var bootstrap = function ($, learun) { }); $('#Semester').lrDataItemSelect({ code: 'Semester' }); $("#MajorNo").lrselect(); + $('#EmpNo').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_encode', text: 'f_realname' }); + $('#LessonNo').lrselect({ placeholder: "请选择课程", allowSearch: true, @@ -212,7 +214,8 @@ var bootstrap = function ($, learun) { { label: "人数", name: "StuNum", width: 80, align: "left" }, { label: "上机课时", name: "PracticeHour", width: 80, align: "left" }, { label: "课程区别码", name: "PartCode", width: 80, align: "left" }, - { label: "班级", name: "TeachClassNo", width: 80, align: "left" }, + { label: "班级编号", name: "TeachClassNo", width: 80, align: "left" }, + { label: "班级名称", name: "TeachClassName", width: 80, align: "left" }, { label: "教师", name: "EmpNo", width: 80, align: "left", formatterAsync: function (callback, value, row, op, $cell) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexOfElectiveInTeacher.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexOfElectiveInTeacher.cshtml index 72044bbf9..f16cdbf5a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexOfElectiveInTeacher.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexOfElectiveInTeacher.cshtml @@ -86,17 +86,17 @@
- @*
+
 开始录入  提交教务处  去审核成绩  设置成绩比例 -
*@ +
- @*
+
比例设置： 平时成绩占比 0 %， 期中成绩占比 0 %， @@ -108,7 +108,7 @@ 分钟（秒）
续时
-
*@ +
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/EvalApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/EvalApi.cs index 5fa59f7ae..ba9dfb7ae 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/EvalApi.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/EvalApi.cs @@ -17,11 +17,11 @@ namespace Learun.Application.WebApi.Modules public class EvalApi : BaseApi { public EvalApi() - : base("/learun/adms/eval") + : base("/learun/eval") { Get["/paper"] = GetPaper;// 获取组织机构数据映射表 Get["/studentlist"] = GetStudentList; - Get["/savepaper"] = SavePaper; + Post["/savepaper"] = SavePaper; } private Eval_MainIBLL ask_MainIBLL = new Eval_MainBLL(); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfo/Ass_AssetsInfoService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfo/Ass_AssetsInfoService.cs index 0e5d53689..28ff56fd0 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfo/Ass_AssetsInfoService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfo/Ass_AssetsInfoService.cs @@ -227,7 +227,7 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem { codeNum++; infoItem.AId = assInfoEntity.AId; - infoItem.AICode = assInfoEntity.ACode + "_" + codeNum.ToString(); + infoItem.AICode = assInfoEntity.ACode + "_" + codeNum.ToString().PadLeft(5, '0'); infoItem.AICodeNum = codeNum; } @@ -301,8 +301,8 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem Ass_AssetsInfoItem.AISpecification = entity.ASpecification;//规格 Ass_AssetsInfoItem.AIAssType = entity.AAssType;//属性 Ass_AssetsInfoItem.AICodeNum = i + 1; - Ass_AssetsInfoItem.AICode = entity.ACode + "_" + Ass_AssetsInfoItem.AICodeNum; - Ass_AssetsInfoItem.AICodeNumJY = entity.ACode + "_" + Ass_AssetsInfoItem.AICodeNum; + Ass_AssetsInfoItem.AICode = entity.ACode + "_" + Ass_AssetsInfoItem.AICodeNum.ToString().PadLeft(5, '0'); + Ass_AssetsInfoItem.AICodeNumJY = entity.ACode + "_" + Ass_AssetsInfoItem.AICodeNum.ToString().PadLeft(5, '0'); Ass_AssetsInfoItem.AIIStorageId = entity.AIIStorageId; Ass_AssetsInfoItem.AIIStoragePosition = entity.AIIStoragePosition; Ass_AssetsInfoItem.AIIsInStorage = true; @@ -326,8 +326,8 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem Ass_AssetsInfoItem.AISpecification = entity.ASpecification;//规格 Ass_AssetsInfoItem.AIAssType = entity.AAssType;//属性 Ass_AssetsInfoItem.AICodeNum = 1; - Ass_AssetsInfoItem.AICode = entity.ACode + "_" + Ass_AssetsInfoItem.AICodeNum; - Ass_AssetsInfoItem.AICodeNumJY = entity.ACode + "_" + Ass_AssetsInfoItem.AICodeNum; + Ass_AssetsInfoItem.AICode = entity.ACode + "_" + Ass_AssetsInfoItem.AICodeNum.ToString().PadLeft(5, '0'); + Ass_AssetsInfoItem.AICodeNumJY = entity.ACode + "_" + Ass_AssetsInfoItem.AICodeNum.ToString().PadLeft(5, '0'); Ass_AssetsInfoItem.AIIStorageId = entity.AIIStorageId; Ass_AssetsInfoItem.AIIStoragePosition = entity.AIIStoragePosition; Ass_AssetsInfoItem.AIIsInStorage = false; @@ -351,8 +351,8 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem Ass_AssetsInfoItem.AISpecification = entity.ASpecification;//规格 Ass_AssetsInfoItem.AIAssType = entity.AAssType;//属性 Ass_AssetsInfoItem.AICodeNum = 1; - Ass_AssetsInfoItem.AICode = entity.ACode + "_" + Ass_AssetsInfoItem.AICodeNum; - Ass_AssetsInfoItem.AICodeNumJY = entity.ACode + "_" + Ass_AssetsInfoItem.AICodeNum; + Ass_AssetsInfoItem.AICode = entity.ACode + "_" + Ass_AssetsInfoItem.AICodeNum.ToString().PadLeft(5,'0'); + Ass_AssetsInfoItem.AICodeNumJY = entity.ACode + "_" + Ass_AssetsInfoItem.AICodeNum.ToString().PadLeft(5, '0'); Ass_AssetsInfoItem.AIIStorageId = entity.AIIStorageId; Ass_AssetsInfoItem.AIIStoragePosition = entity.AIIStoragePosition; Ass_AssetsInfoItem.AIIsInStorage = entity.AStock > 0; diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfoApply/Ass_AssetsInfoApplyService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfoApply/Ass_AssetsInfoApplyService.cs index 1400a9021..939443024 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfoApply/Ass_AssetsInfoApplyService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfoApply/Ass_AssetsInfoApplyService.cs @@ -320,8 +320,8 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem insertassinfoitem.Create(); insertassinfoitem.AId = assinfoitem.AId; insertassinfoitem.AICodeNum = Ass_AssetsInfoItemMaxNum + 1 + i; - insertassinfoitem.AICode = assinfoitem.ACode + "_" + insertassinfoitem.AICodeNum.ToString(); - insertassinfoitem.AICodeNumJY = assinfoitem.ACode + "_" + insertassinfoitem.AICodeNum.ToString();//金隅编号 + insertassinfoitem.AICode = assinfoitem.ACode + "_" + insertassinfoitem.AICodeNum.ToString().PadLeft(5, '0'); + insertassinfoitem.AICodeNumJY = assinfoitem.ACode + "_" + insertassinfoitem.AICodeNum.ToString().PadLeft(5, '0');//金隅编号 insertassinfoitem.AIAssValue = assinfoitem.APrice;//价值 insertassinfoitem.AIUnits = assinfoitem.AUnit;//单位 insertassinfoitem.AISpecificationtype = assinfoitem.AModel;//型号 @@ -426,8 +426,8 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem insertassinfoitem.Create(); insertassinfoitem.AId = insertAss_AssetsInfo.AId; insertassinfoitem.AICodeNum = i + 1; - insertassinfoitem.AICode = insertAss_AssetsInfo.ACode + "_" + insertassinfoitem.AICodeNum.ToString(); - insertassinfoitem.AICodeNumJY = insertAss_AssetsInfo.ACode + "_" + insertassinfoitem.AICodeNum.ToString(); + insertassinfoitem.AICode = insertAss_AssetsInfo.ACode + "_" + insertassinfoitem.AICodeNum.ToString().PadLeft(5, '0'); + insertassinfoitem.AICodeNumJY = insertAss_AssetsInfo.ACode + "_" + insertassinfoitem.AICodeNum.ToString().PadLeft(5, '0'); insertassinfoitem.AIAssValue = assitemapp.AAIPrice;//价值 insertassinfoitem.AIUnits = assitemapp.AAIUnit;//单位 insertassinfoitem.AISpecificationtype = assitemapp.AAIModel;//型号 @@ -489,8 +489,8 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem insertassinfoitem.Create(); insertassinfoitem.AId = insertAss_AssetsInfo.AId; insertassinfoitem.AICodeNum = 1; - insertassinfoitem.AICode = insertAss_AssetsInfo.ACode + "_" + insertassinfoitem.AICodeNum.ToString(); - insertassinfoitem.AICodeNumJY = insertAss_AssetsInfo.ACode + "_" + insertassinfoitem.AICodeNum.ToString(); + insertassinfoitem.AICode = insertAss_AssetsInfo.ACode + "_" + insertassinfoitem.AICodeNum.ToString().PadLeft(5, '0'); + insertassinfoitem.AICodeNumJY = insertAss_AssetsInfo.ACode + "_" + insertassinfoitem.AICodeNum.ToString().PadLeft(5, '0'); insertassinfoitem.AIAssValue = assitemapp.AAIPrice;//价值 insertassinfoitem.AIUnits = assitemapp.AAIUnit;//单位 insertassinfoitem.AISpecificationtype = assitemapp.AAIModel;//型号 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs index 12e74d8e0..bd4c6d752 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs @@ -819,6 +819,7 @@ WHERE (AcademicYearNo = '" + strAcademicYear + "') and semester='" + strSemest Grade = classitemEntity?.Grade, LessonSortNo = teachClassEntity.LessonSortNo, TeachClassNo = teachClassEntity.TeachClassNo, + TeachClassName = teachClassEntity.TeachClassName, EmpNo = teachClassEntity.EmpNo, F_SchoolId = entity.F_SchoolId }; @@ -932,7 +933,8 @@ WHERE (AcademicYearNo = '" + strAcademicYear + "') and semester='" + strSemest CheckMarkDept = "1", CheckMark = "1", TestMark = 0, - F_SchoolId = item.F_SchoolId + F_SchoolId = item.F_SchoolId, + State = 1 }; if (openLessonPlanData.Count(m => m.AcademicYearNo == insertData.AcademicYearNo && m.Semester == insertData.Semester && diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachClass/TeachClassEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachClass/TeachClassEntity.cs index c0a69b63d..60a21345b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachClass/TeachClassEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachClass/TeachClassEntity.cs @@ -82,6 +82,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration [Column("TEACHCLASSNO")] public string TeachClassNo { get; set; } /// + /// TeachClassNo + /// + /// + [Column("TEACHCLASSNAME")] + public string TeachClassName { get; set; } + /// /// 学生数 /// /// diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachClass/TeachClassService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachClass/TeachClassService.cs index 6798daddd..34b009e87 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachClass/TeachClassService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachClass/TeachClassService.cs @@ -72,6 +72,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration dp.Add("LessonNo", queryParam["LessonNo"].ToString(), DbType.String); strSql.Append(" AND t.LessonNo = @LessonNo "); } + if (!queryParam["EmpNo"].IsEmpty()) + { + dp.Add("EmpNo", queryParam["EmpNo"].ToString(), DbType.String); + strSql.Append(" AND t.EmpNo = @EmpNo "); + } return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination); } catch (Exception ex)