Merge branch '黑龙江艺术高中职' of http://8.141.155.183:3000/bjquanjiang/DigitalScholl into 黑龙江艺术高中职

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

@@ -100,7 +100,27 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         {
             Pagination paginationobj = new Pagination() { rows = 100000, page = 1, sidx = "empno ", sord = "asc" };
             var queryJson = "{\"weeks\":\"" + weeks + "\",\"status\":\"" + status + "\",\"deptNo\":\"" + deptNo + "\",\"StartTime\":\"" + StartTime + "\",\"EndTime\":\"" + EndTime + "\"}";
-            var data = arrangeLessonTermIBLL.GetcoursestatictisList(paginationobj, queryJson);
+            var data = arrangeLessonTermIBLL.GetcoursestatictisList(paginationobj, queryJson).ToList();
+
+            if(data.Any())
+            {
+                decimal hj = 0;
+                foreach (var item in data)
+                {
+                    if(!item.actfeestandard.IsEmpty() && Convert.ToDecimal(item.actfeestandard)>0)
+                    {
+                        hj += Convert.ToDecimal(item.actfeestandard);
+                    }
+                }
+                var tj = new LessonStatictisEntity
+                {
+                    empname = "合计",
+                    actfeestandard = hj.ToString()
+                };
+                data.Add(tj);
+            }
+            
+
             ViewBag.data = data;
             ViewBag.startTime = StartTime;
             ViewBag.endTime = EndTime;

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

@@ -4,6 +4,8 @@ using Learun.Application.TwoDevelopment.EducationalAdministration;
 using System.Web.Mvc;
 using System.Collections.Generic;
 using System.Linq;
+using Learun.Application.TwoDevelopment.LogisticsManagement;
+using Newtonsoft.Json;
 
 namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
 {
@@ -63,6 +65,59 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             };
             return Success(jsonData);
         }
+
+
+        [HttpPost, ValidateInput(false)]
+        public ActionResult ExportList(string queryJson)
+        {
+            var data = classroomInfoIBLL.GetList(queryJson).ToList();
+            var result = new List<Dictionary<string, string>>();
+            if (data.Any())
+            {
+                foreach (var item in data)
+                {
+                    var aaa = new Dictionary<string, string>();
+                    aaa.Add("ClassroomName", item.ClassroomName);
+                    aaa.Add("ClassroomNo", item.ClassroomNo);
+                    aaa.Add("StrClassroomType", item.StrClassroomType);
+                    aaa.Add("StrCompany", item.StrCompany);
+                    aaa.Add("StrClassroomBuildingNo", item.StrClassroomBuildingNo);
+                    aaa.Add("ClassroomFloor", item.ClassroomFloor);
+                    aaa.Add("ContainStuNum", item.ContainStuNum.ToString());
+                    aaa.Add("TestContainStuNum", item.TestContainStuNum.ToString());
+                    aaa.Add("StrCheckMark", item.StrCheckMark);
+
+                    result.Add(aaa);
+                }
+            }
+            var resultStr = JsonConvert.SerializeObject(result);
+
+            //数据源
+            var exportTable = resultStr.ToTable();
+            //设置导出格式
+            ExcelConfig excelconfig = new ExcelConfig();
+            excelconfig.Title = "教室信息";
+            excelconfig.TitleFont = "微软雅黑";
+            excelconfig.TitlePoint = 20;
+            excelconfig.FileName = "教室信息.xls";
+            excelconfig.IsAllSizeColumn = true;
+            //每一列的设置,没有设置的列信息，系统将按datatable中的列名导出
+            excelconfig.ColumnEntity = new List<ColumnModel>();
+            excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "ClassroomName", ExcelColumn = "教室名称" });
+            excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "ClassroomNo", ExcelColumn = "教室编号" });
+            excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "StrClassroomType", ExcelColumn = "教室类型" });
+            excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "StrCompany", ExcelColumn = "校区" });
+            excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "StrClassroomBuildingNo", ExcelColumn = "教学楼" });
+            excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "ClassroomFloor", ExcelColumn = "所在楼层" });
+            excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "ContainStuNum", ExcelColumn = "容纳人数" });
+            excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "TestContainStuNum", ExcelColumn = "考试人数" });
+            excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "StrCheckMark", ExcelColumn = "是否启用" });
+
+            //调用导出方法
+            ExcelHelper.ExcelDownload(exportTable, excelconfig);
+
+            return Success("导出成功！");
+        }
         /// <summary>
         /// 获取表单数据
         /// <summary>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassroomInfo/Index.cshtml

@@ -40,6 +40,7 @@
                         <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
                         <a id="lr_lock" class="btn btn-default"><i class="fa fa-lock"></i>&nbsp;启用</a>
                         <a id="lr_unlock" class="btn btn-default"><i class="fa fa-unlock"></i>&nbsp;停用</a>
+                        <a id="lr_cusexport" class="btn btn-default"><i class="fa fa-sign-out"></i>&nbsp;导出</a>
                     </div>
                 </div>
             </div>

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

@@ -126,6 +126,21 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
+            //export
+            $('#lr_cusexport').on('click', function () {
+                var p = {};
+                p.ClassroomName = $('#ClassroomName').val();
+                p.ClassroomNo = $('#ClassroomNo').val();
+                p.ClassroomBuildingNo = $('#ClassroomBuildingNo').lrselectGet();
+                p.ClassroomTypeNo = $('#ClassroomTypeNo').lrselectGet();
+                learun.download({
+                    method: "POST",
+                    url: top.$.rootUrl + '/EducationalAdministration/ClassroomInfo/ExportList',
+                    param: {
+                        queryJson: JSON.stringify(p)
+                    }
+                });
+            });
         },
         // 初始化列表
         initGird: function () {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.js

@@ -26,6 +26,7 @@ var bootstrap = function ($, learun) {
                     learun.alert.warning("请输入学号！");
                     return;
                 }
+
                 page.initGird();
                 page.search(p);
             });
@@ -42,6 +43,8 @@ var bootstrap = function ($, learun) {
                     learun.alert.warning("请输入学号！");
                     return;
                 }
+                var LessonNo = $('#LessonNo').lrselectGet();
+                var Grade = $('#Grade').lrselectGet();
                 learun.layerForm({
                     id: 'AllStuScoreQueryPrint',
                     title: '学生成绩单',

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

@@ -35,8 +35,8 @@ var bootstrap = function ($, learun) {
             $('#StuId').lrGirdSelect({
                 // 字段
                 url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=StuInfoBasic',
-                selectWord: 'stuname',
-                value: 'stuid',
+                selectWord: 'stuno',
+                value: 'stuno',
                 text: 'stuno',
                 headData: [
                     { label: "学号", name: "stuno", width: 100, align: "left" },

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Form.js

@@ -25,10 +25,11 @@ var bootstrap = function ($, learun) {
             $('#ClockStatus').lrDataItemSelect({ code: 'ADStatus' });
             $('#AIsOut').lrDataItemSelect({ code: 'YesOrNoBit' });
             $('#ADPhoto').lrUploader();
-            $('#UserNo').lrDataSourceSelect({ code: 'BaseUser', value: 'f_account', text: 'f_realname', 
+            $('#UserNo').lrDataSourceSelect({
+                code: 'EmpInfo', value: 'empno', text: 'empname', 
                 select: function(item){
                     if(item){
-                        $('#UserName').val(item.f_realname);
+                        $('#UserName').val(item.empname);
                     }
                 }
             });

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Utility/GirdSelectIndex.js

@@ -29,8 +29,6 @@ var bootstrap = function ($, learun) {
         },
         bind: function () {
             var dfop = top.lrGirdSelect[dfopid];
-            console.log(dfop);
-            debugger
             $('#btn_Search').on('click', function () {
                 var keyword = $('#txt_Keyword').val();
                 if (dfop._loaded) {

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

@@ -1,101 +1,103 @@
 <?xml version="1.0" encoding="utf-8"?>
 <unity>
-  <typeAliases>
-    <typeAlias alias="IDatabase" type="Learun.DataBase.IDatabase,Learun.DataBase" />
-    <typeAlias alias="SqlServer" type="Learun.DataBase.SqlServer.Database,Learun.DataBase.SqlServer" />
-    <typeAlias alias="MySql" type="Learun.DataBase.MySqlEx.Database,Learun.DataBase.MySqlEx" />
-    <typeAlias alias="Oracle" type="Learun.DataBase.Oracle.Database,Learun.DataBase.Oracle" />
+	<typeAliases>
+		<typeAlias alias="IDatabase" type="Learun.DataBase.IDatabase,Learun.DataBase" />
+		<typeAlias alias="SqlServer" type="Learun.DataBase.SqlServer.Database,Learun.DataBase.SqlServer" />
+		<typeAlias alias="MySql" type="Learun.DataBase.MySqlEx.Database,Learun.DataBase.MySqlEx" />
+		<typeAlias alias="Oracle" type="Learun.DataBase.Oracle.Database,Learun.DataBase.Oracle" />
 
-    <!--工作流接口-->
-    <typeAlias alias="INodeMethod" type="Learun.Application.WorkFlow.INodeMethod,Learun.Application.WorkFlow" />
-    <typeAlias alias="NodeMethod" type="Learun.Application.WorkFlow.NodeMethod,Learun.Application.WorkFlow" />
-    <typeAlias alias="Ass_AssetsInfoApplyMethod" type="Learun.Application.WorkFlow.Ass_AssetsInfoApplyMethod,Learun.Application.WorkFlow" />
-    <typeAlias alias="Ass_PurchaseApplyMethod" type="Learun.Application.WorkFlow.Ass_PurchaseApplyMethod,Learun.Application.WorkFlow" />
-    <typeAlias alias="Ass_AssetsOutApplyMethod" type="Learun.Application.WorkFlow.Ass_AssetsOutApplyMethod,Learun.Application.WorkFlow" />
-    <typeAlias alias="Ass_AllocationMethod" type="Learun.Application.WorkFlow.Ass_AllocationMethod,Learun.Application.WorkFlow" />
-    <typeAlias alias="Ass_InventoryMethod" type="Learun.Application.WorkFlow.Ass_InventoryMethod,Learun.Application.WorkFlow" />
-    <typeAlias alias="CorporateMaterialApplyMethod" type="Learun.Application.WorkFlow.CorporateMaterialApplyMethod,Learun.Application.WorkFlow" />
-    <typeAlias alias="StampApplyMethod" type="Learun.Application.WorkFlow.StampApplyMethod,Learun.Application.WorkFlow" />
-    <typeAlias alias="Ass_ScrapMethod" type="Learun.Application.WorkFlow.Ass_ScrapMethod,Learun.Application.WorkFlow" />
-    <typeAlias alias="Sys_SendFileMethod" type="Learun.Application.WorkFlow.Sys_SendFileMethod,Learun.Application.WorkFlow" />
-    <typeAlias alias="Sys_ReceiveDocumentMethod" type="Learun.Application.WorkFlow.Sys_ReceiveDocumentMethod,Learun.Application.WorkFlow" />
-    <typeAlias alias="LC_hetongMethod" type="Learun.Application.WorkFlow.LC_hetongMethod,Learun.Application.WorkFlow" />
-    <typeAlias alias="SW_Ask_TypeMethod" type="Learun.Application.WorkFlow.SW_Ask_TypeMethod,Learun.Application.WorkFlow" />
-    <typeAlias alias="SW_Ask_StudentMainMethod" type="Learun.Application.WorkFlow.SW_Ask_StudentMainMethod,Learun.Application.WorkFlow" />
-    <typeAlias alias="Sys_SendFilePartyMethod" type="Learun.Application.WorkFlow.Sys_SendFilePartyMethod,Learun.Application.WorkFlow" />
-    <typeAlias alias="Ass_ReceiveMethod" type="Learun.Application.WorkFlow.Ass_ReceiveMethod,Learun.Application.WorkFlow" />
-    <typeAlias alias="ADR_AddApplyMethod" type="Learun.Application.WorkFlow.ADR_AddApplyMethod,Learun.Application.WorkFlow" />
-    <typeAlias alias="OA_NewsMethod" type="Learun.Application.WorkFlow.OA_NewsMethod,Learun.Application.WorkFlow" />
-    <typeAlias alias="Ass_AcceptanceMethod" type="Learun.Application.WorkFlow.Ass_AcceptanceMethod,Learun.Application.WorkFlow" />
-    <typeAlias alias="TeacherLeaveManagementMethod" type="Learun.Application.WorkFlow.TeacherLeaveManagementMethod,Learun.Application.WorkFlow" />
-    <typeAlias alias="TeacherCancelLeaveManageMethod" type="Learun.Application.WorkFlow.TeacherCancelLeaveManageMethod,Learun.Application.WorkFlow" />
-    <typeAlias alias="TeacherOvertimeManageMethod" type="Learun.Application.WorkFlow.TeacherOvertimeManageMethod,Learun.Application.WorkFlow" />
-    <typeAlias alias="StuDisciplineManageMethod" type="Learun.Application.WorkFlow.StuDisciplineManageMethod,Learun.Application.WorkFlow" />
-    <typeAlias alias="StuCancelDisciplineManageMethod" type="Learun.Application.WorkFlow.StuCancelDisciplineManageMethod,Learun.Application.WorkFlow" />
-    <typeAlias alias="MeetingManagementApplyMethod" type="Learun.Application.WorkFlow.MeetingManagementApplyMethod,Learun.Application.WorkFlow" />
-    <typeAlias alias="DispatchMethod" type="Learun.Application.WorkFlow.DispatchMethod,Learun.Application.WorkFlow" />
-    <typeAlias alias="ArrangeLessonTermAttemperMethod" type="Learun.Application.WorkFlow.ArrangeLessonTermAttemperMethod,Learun.Application.WorkFlow" />
-    <typeAlias alias="StuLeaveManagementMethod" type="Learun.Application.WorkFlow.StuLeaveManagementMethod,Learun.Application.WorkFlow" />
-    <typeAlias alias="StuCancelLeaveManageMethod" type="Learun.Application.WorkFlow.StuCancelLeaveManageMethod,Learun.Application.WorkFlow" />
-    <typeAlias alias="Acc_DormitoryChangeMethod" type="Learun.Application.WorkFlow.Acc_DormitoryChangeMethod,Learun.Application.WorkFlow" />
-    <typeAlias alias="Ass_FixAssetsApplyMethod" type="Learun.Application.WorkFlow.Ass_FixAssetsApplyMethod,Learun.Application.WorkFlow" />
-    <typeAlias alias="Ass_FixAssetsMethod" type="Learun.Application.WorkFlow.Ass_FixAssetsMethod,Learun.Application.WorkFlow" />
+		<!--工作流接口-->
+		<typeAlias alias="INodeMethod" type="Learun.Application.WorkFlow.INodeMethod,Learun.Application.WorkFlow" />
+		<typeAlias alias="NodeMethod" type="Learun.Application.WorkFlow.NodeMethod,Learun.Application.WorkFlow" />
+		<typeAlias alias="Ass_AssetsInfoApplyMethod" type="Learun.Application.WorkFlow.Ass_AssetsInfoApplyMethod,Learun.Application.WorkFlow" />
+		<typeAlias alias="Ass_PurchaseApplyMethod" type="Learun.Application.WorkFlow.Ass_PurchaseApplyMethod,Learun.Application.WorkFlow" />
+		<typeAlias alias="Ass_AssetsOutApplyMethod" type="Learun.Application.WorkFlow.Ass_AssetsOutApplyMethod,Learun.Application.WorkFlow" />
+		<typeAlias alias="Ass_AllocationMethod" type="Learun.Application.WorkFlow.Ass_AllocationMethod,Learun.Application.WorkFlow" />
+		<typeAlias alias="Ass_InventoryMethod" type="Learun.Application.WorkFlow.Ass_InventoryMethod,Learun.Application.WorkFlow" />
+		<typeAlias alias="CorporateMaterialApplyMethod" type="Learun.Application.WorkFlow.CorporateMaterialApplyMethod,Learun.Application.WorkFlow" />
+		<typeAlias alias="StampApplyMethod" type="Learun.Application.WorkFlow.StampApplyMethod,Learun.Application.WorkFlow" />
+		<typeAlias alias="Ass_ScrapMethod" type="Learun.Application.WorkFlow.Ass_ScrapMethod,Learun.Application.WorkFlow" />
+		<typeAlias alias="Sys_SendFileMethod" type="Learun.Application.WorkFlow.Sys_SendFileMethod,Learun.Application.WorkFlow" />
+		<typeAlias alias="Sys_ReceiveDocumentMethod" type="Learun.Application.WorkFlow.Sys_ReceiveDocumentMethod,Learun.Application.WorkFlow" />
+		<typeAlias alias="LC_hetongMethod" type="Learun.Application.WorkFlow.LC_hetongMethod,Learun.Application.WorkFlow" />
+		<typeAlias alias="SW_Ask_TypeMethod" type="Learun.Application.WorkFlow.SW_Ask_TypeMethod,Learun.Application.WorkFlow" />
+		<typeAlias alias="SW_Ask_StudentMainMethod" type="Learun.Application.WorkFlow.SW_Ask_StudentMainMethod,Learun.Application.WorkFlow" />
+		<typeAlias alias="Sys_SendFilePartyMethod" type="Learun.Application.WorkFlow.Sys_SendFilePartyMethod,Learun.Application.WorkFlow" />
+		<typeAlias alias="Ass_ReceiveMethod" type="Learun.Application.WorkFlow.Ass_ReceiveMethod,Learun.Application.WorkFlow" />
+		<typeAlias alias="ADR_AddApplyMethod" type="Learun.Application.WorkFlow.ADR_AddApplyMethod,Learun.Application.WorkFlow" />
+		<typeAlias alias="OA_NewsMethod" type="Learun.Application.WorkFlow.OA_NewsMethod,Learun.Application.WorkFlow" />
+		<typeAlias alias="Ass_AcceptanceMethod" type="Learun.Application.WorkFlow.Ass_AcceptanceMethod,Learun.Application.WorkFlow" />
+		<typeAlias alias="TeacherLeaveManagementMethod" type="Learun.Application.WorkFlow.TeacherLeaveManagementMethod,Learun.Application.WorkFlow" />
+		<typeAlias alias="TeacherCancelLeaveManageMethod" type="Learun.Application.WorkFlow.TeacherCancelLeaveManageMethod,Learun.Application.WorkFlow" />
+		<typeAlias alias="TeacherOvertimeManageMethod" type="Learun.Application.WorkFlow.TeacherOvertimeManageMethod,Learun.Application.WorkFlow" />
+		<typeAlias alias="StuDisciplineManageMethod" type="Learun.Application.WorkFlow.StuDisciplineManageMethod,Learun.Application.WorkFlow" />
+		<typeAlias alias="StuCancelDisciplineManageMethod" type="Learun.Application.WorkFlow.StuCancelDisciplineManageMethod,Learun.Application.WorkFlow" />
+		<typeAlias alias="MeetingManagementApplyMethod" type="Learun.Application.WorkFlow.MeetingManagementApplyMethod,Learun.Application.WorkFlow" />
+		<typeAlias alias="DispatchMethod" type="Learun.Application.WorkFlow.DispatchMethod,Learun.Application.WorkFlow" />
+		<typeAlias alias="ArrangeLessonTermAttemperMethod" type="Learun.Application.WorkFlow.ArrangeLessonTermAttemperMethod,Learun.Application.WorkFlow" />
+		<typeAlias alias="StuLeaveManagementMethod" type="Learun.Application.WorkFlow.StuLeaveManagementMethod,Learun.Application.WorkFlow" />
+		<typeAlias alias="StuCancelLeaveManageMethod" type="Learun.Application.WorkFlow.StuCancelLeaveManageMethod,Learun.Application.WorkFlow" />
+		<typeAlias alias="Acc_DormitoryChangeMethod" type="Learun.Application.WorkFlow.Acc_DormitoryChangeMethod,Learun.Application.WorkFlow" />
+		<typeAlias alias="Ass_FixAssetsApplyMethod" type="Learun.Application.WorkFlow.Ass_FixAssetsApplyMethod,Learun.Application.WorkFlow" />
+		<typeAlias alias="Ass_FixAssetsMethod" type="Learun.Application.WorkFlow.Ass_FixAssetsMethod,Learun.Application.WorkFlow" />
+		<typeAlias alias="StuDisciplineManagementMethod" type="Learun.Application.WorkFlow.StuDisciplineManagementMethod,Learun.Application.WorkFlow" />
 
 
-    <!--任务调度器-->
-    <typeAlias alias="ITSMethod" type="Learun.Application.Extention.TaskScheduling.ITsMethod,Learun.Application.Extention" />
-    <!--<typeAlias alias="TestTask" type="Learun.Plugin.TestTask,Learun.Plugin" />-->
+		<!--任务调度器-->
+		<typeAlias alias="ITSMethod" type="Learun.Application.Extention.TaskScheduling.ITsMethod,Learun.Application.Extention" />
+		<!--<typeAlias alias="TestTask" type="Learun.Plugin.TestTask,Learun.Plugin" />-->
 
-    <!--工作流接口:新的流程接口（新版流程使用）-->
-    <typeAlias alias="IWorkFlowMethod" type=" Learun.Application.WorkFlow.IWorkFlowMethod, Learun.Application.WorkFlow" />
-    <typeAlias alias="WFFileRelease" type=" Learun.Application.WorkFlow.WFFileRelease, Learun.Application.WorkFlow" />
+		<!--工作流接口:新的流程接口（新版流程使用）-->
+		<typeAlias alias="IWorkFlowMethod" type=" Learun.Application.WorkFlow.IWorkFlowMethod, Learun.Application.WorkFlow" />
+		<typeAlias alias="WFFileRelease" type=" Learun.Application.WorkFlow.WFFileRelease, Learun.Application.WorkFlow" />
 
-  </typeAliases>
-  <containers>
-    <container name="IOCcontainer">
-      <type type="IDatabase" mapTo="SqlServer" name="SqlServer"></type >
-      <type type="IDatabase" mapTo="MySql" name="MySql"></type >
-      <type type="IDatabase" mapTo="Oracle" name="Oracle"></type >
-    </container>
-    <container name="WfIOCcontainer">
-      <type type="INodeMethod" mapTo="NodeMethod" name="NodeMethod"></type>
-      <type type="IWorkFlowMethod" mapTo="Ass_AssetsInfoApplyMethod" name="Ass_AssetsInfoApplyMethod"></type>
-      <type type="IWorkFlowMethod" mapTo="Ass_PurchaseApplyMethod" name="Ass_PurchaseApplyMethod"></type>
-      <type type="IWorkFlowMethod" mapTo="Ass_AssetsOutApplyMethod" name="Ass_AssetsOutApplyMethod"></type>
-      <type type="IWorkFlowMethod" mapTo="Sys_SendFileMethod" name="Sys_SendFileMethod"></type>
-      <type type="IWorkFlowMethod" mapTo="Sys_ReceiveDocumentMethod" name="Sys_ReceiveDocumentMethod"></type>
-      <type type="IWorkFlowMethod" mapTo="Ass_InventoryMethod" name="Ass_InventoryMethod"></type>
-      <type type="IWorkFlowMethod" mapTo="StampApplyMethod" name="StampApplyMethod"></type>
-      <type type="IWorkFlowMethod" mapTo="CorporateMaterialApplyMethod" name="CorporateMaterialApplyMethod"></type>
-      <type type="IWorkFlowMethod" mapTo="Ass_AllocationMethod" name="Ass_AllocationMethod"></type>
-      <type type="IWorkFlowMethod" mapTo="Ass_ScrapMethod" name="Ass_ScrapMethod"></type>
-      <type type="IWorkFlowMethod" mapTo="LC_hetongMethod" name="LC_hetongMethod"></type>
-      <type type="IWorkFlowMethod" mapTo="SW_Ask_TypeMethod" name="SW_Ask_TypeMethod"></type>
-      <type type="IWorkFlowMethod" mapTo="SW_Ask_StudentMainMethod" name="SW_Ask_StudentMainMethod"></type>
-      <type type="IWorkFlowMethod" mapTo="Sys_SendFilePartyMethod" name="Sys_SendFilePartyMethod"></type>
-      <type type="IWorkFlowMethod" mapTo="Ass_ReceiveMethod" name="Ass_ReceiveMethod"></type>
-      <type type="IWorkFlowMethod" mapTo="ADR_AddApplyMethod" name="ADR_AddApplyMethod"></type>
-      <type type="IWorkFlowMethod" mapTo="WFFileRelease" name="wfFileRelease"></type>
-      <type type="IWorkFlowMethod" mapTo="OA_NewsMethod" name="OA_NewsMethod"></type>
-      <type type="IWorkFlowMethod" mapTo="Ass_AcceptanceMethod" name="Ass_AcceptanceMethod"></type>
-      <type type="IWorkFlowMethod" mapTo="TeacherLeaveManagementMethod" name="TeacherLeaveManagementMethod"></type>
-      <type type="IWorkFlowMethod" mapTo="TeacherCancelLeaveManageMethod" name="TeacherCancelLeaveManageMethod"></type>
-      <type type="IWorkFlowMethod" mapTo="TeacherOvertimeManageMethod" name="TeacherOvertimeManageMethod"></type>
-      <type type="IWorkFlowMethod" mapTo="StuDisciplineManageMethod" name="StuDisciplineManageMethod"></type>
-      <type type="IWorkFlowMethod" mapTo="StuCancelDisciplineManageMethod" name="StuCancelDisciplineManageMethod"></type>
-      <type type="IWorkFlowMethod" mapTo="MeetingManagementApplyMethod" name="MeetingManagementApplyMethod"></type>
-      <type type="IWorkFlowMethod" mapTo="DispatchMethod" name="DispatchMethod"></type>
-      <type type="IWorkFlowMethod" mapTo="ArrangeLessonTermAttemperMethod" name="ArrangeLessonTermAttemperMethod"></type>
-      <type type="IWorkFlowMethod" mapTo="StuLeaveManagementMethod" name="StuLeaveManagementMethod"></type>
-      <type type="IWorkFlowMethod" mapTo="StuCancelLeaveManageMethod" name="StuCancelLeaveManageMethod"></type>
-      <type type="IWorkFlowMethod" mapTo="Acc_DormitoryChangeMethod" name="Acc_DormitoryChangeMethod"></type>
-      <type type="IWorkFlowMethod" mapTo="Ass_FixAssetsApplyMethod" name="Ass_FixAssetsApplyMethod"></type>
-      <type type="IWorkFlowMethod" mapTo="Ass_FixAssetsMethod" name="Ass_FixAssetsMethod"></type>
+	</typeAliases>
+	<containers>
+		<container name="IOCcontainer">
+			<type type="IDatabase" mapTo="SqlServer" name="SqlServer"></type >
+			<type type="IDatabase" mapTo="MySql" name="MySql"></type >
+			<type type="IDatabase" mapTo="Oracle" name="Oracle"></type >
+		</container>
+		<container name="WfIOCcontainer">
+			<type type="INodeMethod" mapTo="NodeMethod" name="NodeMethod"></type>
+			<type type="IWorkFlowMethod" mapTo="Ass_AssetsInfoApplyMethod" name="Ass_AssetsInfoApplyMethod"></type>
+			<type type="IWorkFlowMethod" mapTo="Ass_PurchaseApplyMethod" name="Ass_PurchaseApplyMethod"></type>
+			<type type="IWorkFlowMethod" mapTo="Ass_AssetsOutApplyMethod" name="Ass_AssetsOutApplyMethod"></type>
+			<type type="IWorkFlowMethod" mapTo="Sys_SendFileMethod" name="Sys_SendFileMethod"></type>
+			<type type="IWorkFlowMethod" mapTo="Sys_ReceiveDocumentMethod" name="Sys_ReceiveDocumentMethod"></type>
+			<type type="IWorkFlowMethod" mapTo="Ass_InventoryMethod" name="Ass_InventoryMethod"></type>
+			<type type="IWorkFlowMethod" mapTo="StampApplyMethod" name="StampApplyMethod"></type>
+			<type type="IWorkFlowMethod" mapTo="CorporateMaterialApplyMethod" name="CorporateMaterialApplyMethod"></type>
+			<type type="IWorkFlowMethod" mapTo="Ass_AllocationMethod" name="Ass_AllocationMethod"></type>
+			<type type="IWorkFlowMethod" mapTo="Ass_ScrapMethod" name="Ass_ScrapMethod"></type>
+			<type type="IWorkFlowMethod" mapTo="LC_hetongMethod" name="LC_hetongMethod"></type>
+			<type type="IWorkFlowMethod" mapTo="SW_Ask_TypeMethod" name="SW_Ask_TypeMethod"></type>
+			<type type="IWorkFlowMethod" mapTo="SW_Ask_StudentMainMethod" name="SW_Ask_StudentMainMethod"></type>
+			<type type="IWorkFlowMethod" mapTo="Sys_SendFilePartyMethod" name="Sys_SendFilePartyMethod"></type>
+			<type type="IWorkFlowMethod" mapTo="Ass_ReceiveMethod" name="Ass_ReceiveMethod"></type>
+			<type type="IWorkFlowMethod" mapTo="ADR_AddApplyMethod" name="ADR_AddApplyMethod"></type>
+			<type type="IWorkFlowMethod" mapTo="WFFileRelease" name="wfFileRelease"></type>
+			<type type="IWorkFlowMethod" mapTo="OA_NewsMethod" name="OA_NewsMethod"></type>
+			<type type="IWorkFlowMethod" mapTo="Ass_AcceptanceMethod" name="Ass_AcceptanceMethod"></type>
+			<type type="IWorkFlowMethod" mapTo="TeacherLeaveManagementMethod" name="TeacherLeaveManagementMethod"></type>
+			<type type="IWorkFlowMethod" mapTo="TeacherCancelLeaveManageMethod" name="TeacherCancelLeaveManageMethod"></type>
+			<type type="IWorkFlowMethod" mapTo="TeacherOvertimeManageMethod" name="TeacherOvertimeManageMethod"></type>
+			<type type="IWorkFlowMethod" mapTo="StuDisciplineManageMethod" name="StuDisciplineManageMethod"></type>
+			<type type="IWorkFlowMethod" mapTo="StuCancelDisciplineManageMethod" name="StuCancelDisciplineManageMethod"></type>
+			<type type="IWorkFlowMethod" mapTo="MeetingManagementApplyMethod" name="MeetingManagementApplyMethod"></type>
+			<type type="IWorkFlowMethod" mapTo="DispatchMethod" name="DispatchMethod"></type>
+			<type type="IWorkFlowMethod" mapTo="ArrangeLessonTermAttemperMethod" name="ArrangeLessonTermAttemperMethod"></type>
+			<type type="IWorkFlowMethod" mapTo="StuLeaveManagementMethod" name="StuLeaveManagementMethod"></type>
+			<type type="IWorkFlowMethod" mapTo="StuCancelLeaveManageMethod" name="StuCancelLeaveManageMethod"></type>
+			<type type="IWorkFlowMethod" mapTo="Acc_DormitoryChangeMethod" name="Acc_DormitoryChangeMethod"></type>
+			<type type="IWorkFlowMethod" mapTo="Ass_FixAssetsApplyMethod" name="Ass_FixAssetsApplyMethod"></type>
+			<type type="IWorkFlowMethod" mapTo="Ass_FixAssetsMethod" name="Ass_FixAssetsMethod"></type>
+			<type type="IWorkFlowMethod" mapTo="StuDisciplineManagementMethod" name="StuDisciplineManagementMethod"></type>
 
-    </container>
+		</container>
 
-    <container name="TsIOCcontainer">
-      <!--<type type="ITSMethod" mapTo="TestTask" name="taskioc"></type>-->
-    </container>
-  </containers>
+		<container name="TsIOCcontainer">
+			<!--<type type="ITSMethod" mapTo="TestTask" name="taskioc"></type>-->
+		</container>
+	</containers>
 </unity>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ClassroomInfo/ClassroomInfoBLL.cs

@@ -41,6 +41,25 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
             }
         }
+
+        public IEnumerable<ClassroomInfoEntity> GetList(string queryJson)
+        {
+            try
+            {
+                return classroomInfoService.GetList(queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
         /// <summary>
         /// 获取页面显示列表数据
         /// <summary>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ClassroomInfo/ClassroomInfoEntity.cs

@@ -74,6 +74,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         public bool? SyncFlag { get; set; }
         #endregion
 
+
         #region  扩展操作
         /// <summary>
         /// 新增调用
@@ -92,6 +93,14 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         }
         #endregion
         #region  扩展字段
+
+        public string StrCheckMark { get { return CheckMark == true ? "启用" : "未启用"; } }
+
+        public string StrClassroomBuildingNo { get; set; }
+
+        public string StrCompany { get;set; }
+
+        public string StrClassroomType { get;set;}
         #endregion
     }
 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ClassroomInfo/ClassroomInfoIBLL.cs

@@ -21,6 +21,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <param name="queryJson">查询参数</param>
         /// <returns></returns>
         IEnumerable<ClassroomInfoEntity> GetPageList(Pagination pagination, string queryJson);
+        IEnumerable<ClassroomInfoEntity> GetList(string queryJson);
         IEnumerable<ClassroomInfoEntity> GetAllList();
         /// <summary>
         /// 获取ClassroomInfo表实体数据

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ClassroomInfo/ClassroomInfoService.cs

@@ -81,6 +81,66 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
             }
         }
+
+        public IEnumerable<ClassroomInfoEntity> GetList(string queryJson)
+        {
+            try
+            {
+                var basedbname = BaseRepository().getDbConnection().Database;
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT ");
+                strSql.Append(@"
+                t.ClassroomId,
+                t.ClassroomName,
+                t.ClassroomNo,
+                t.ClassroomTypeNo,
+                t.ClassroomBuildingNo,
+                t.ClassroomFloor,
+                t.ContainStuNum,
+                t.TestContainStuNum,
+                t.CheckMark,t.F_SchoolId,c.ClassroomBuildingName as StrClassroomBuildingNo,ct.ClassroomType as StrClassroomType,q.F_FullName as StrCompany 
+                ");
+                strSql.Append("  FROM ClassroomInfo t ");
+                strSql.Append("  left join ClassroomBuilding c on t.ClassroomBuildingNo=c.ClassroomBuildingNo left join CdClassType ct on t.ClassroomTypeNo=ct.ClassroomTypeNo  ");
+                strSql.Append(" left join " + basedbname + ".dbo.LR_Base_Company q on t.F_SchoolId= q.F_CompanyId ");
+                strSql.Append("  WHERE 1=1 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["ClassroomName"].IsEmpty())
+                {
+                    dp.Add("ClassroomName", "%" + queryParam["ClassroomName"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.ClassroomName Like @ClassroomName ");
+                }
+                if (!queryParam["ClassroomNo"].IsEmpty())
+                {
+                    dp.Add("ClassroomNo", "%" + queryParam["ClassroomNo"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.ClassroomNo Like @ClassroomNo ");
+                }
+                if (!queryParam["ClassroomBuildingNo"].IsEmpty())
+                {
+                    dp.Add("ClassroomBuildingNo", queryParam["ClassroomBuildingNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.ClassroomBuildingNo = @ClassroomBuildingNo ");
+                }
+                if (!queryParam["ClassroomTypeNo"].IsEmpty())
+                {
+                    dp.Add("ClassroomTypeNo", queryParam["ClassroomTypeNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.ClassroomTypeNo = @ClassroomTypeNo ");
+                }
+                return this.BaseRepository("CollegeMIS").FindList<ClassroomInfoEntity>(strSql.ToString(), dp);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
         /// <summary>
         /// 获取页面显示列表数据
         /// <summary>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuDisciplineManagement/StuDisciplineManagementBLL.cs

@@ -2,6 +2,7 @@
 using System;
 using System.Data;
 using System.Collections.Generic;
+using Learun.Application.TwoDevelopment.AssetManagementSystem;
 
 namespace Learun.Application.TwoDevelopment.EducationalAdministration
 {
@@ -189,6 +190,23 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         }
 
         #endregion
-
+        public void ChangeStatusByProcessId(string ProcessID, int PStatus, string userId)
+        {
+            try
+            {
+                stuDisciplineManagementService.ChangeStatusByProcessId(ProcessID, PStatus, userId);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
     }
 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuDisciplineManagement/StuDisciplineManagementIBLL.cs

@@ -61,6 +61,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <param name="keyValue">主键</param>
         void ChangeStatusByProcessId(string status, string processId, string userId);
         #endregion
-
+        void ChangeStatusByProcessId(string ProcessID, int PStatus, string userId);
     }
 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuDisciplineManagement/StuDisciplineManagementService.cs

@@ -1,4 +1,5 @@
 using Dapper;
+using Learun.Application.TwoDevelopment.AssetManagementSystem;
 using Learun.DataBase.Repository;
 using Learun.Util;
 using System;
@@ -217,6 +218,39 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         }
 
         #endregion
+        public void ChangeStatusByProcessId(string ProcessID, int PStatus, string userId)
+        {
+            var receiveEntity = this.BaseRepository("CollegeMIS").FindEntity<StuDisciplineManagementEntity>(a => a.ProcessId == ProcessID);
+            var db = this.BaseRepository("CollegeMIS").BeginTrans();
+            try
+            {
+                //if (PStatus == 2)
+                //{
+                //修改领取记录的状态
+                receiveEntity.CheckStatus = PStatus.ToString();
+                receiveEntity.CheckUserId = userId;
+                receiveEntity.CheckTime = DateTime.Now;
+                db.Update(receiveEntity);
+
+
+
+                //}
+                db.Commit();
+            }
+            catch (Exception ex)
+            {
+                db.Rollback();
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+
+        }
 
     }
 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Learun.Application.WorkFlow.csproj

@@ -95,6 +95,7 @@
     <Compile Include="Delegate\NWFDelegateRuleEntity.cs" />
     <Compile Include="Delegate\NWFDelegateService.cs" />
     <Compile Include="NodeMethod\Acc_DormitoryChangeMethod.cs" />
+    <Compile Include="NodeMethod\StuDisciplineManagementMethod.cs" />
     <Compile Include="NodeMethod\Ass_FixAssetsMethod.cs" />
     <Compile Include="NodeMethod\Ass_FixAssetsApplyMethod.cs" />
     <Compile Include="NodeMethod\DispatchMethod.cs" />

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

@@ -0,0 +1,23 @@
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using Learun.Util;
+
+namespace Learun.Application.WorkFlow
+{
+    public class StuDisciplineManagementMethod : IWorkFlowMethod
+    {
+        StuDisciplineManagementIBLL asset = new StuDisciplineManagementBLL();
+       
+
+        public void Execute(WfMethodParameter parameter)
+        {
+            if (parameter.code == "agree")
+            {
+                asset.ChangeStatusByProcessId(parameter.processId, 2,LoginUserInfo.Get().userId);
+            }
+            else
+            {
+                asset.ChangeStatusByProcessId(parameter.processId, 0, LoginUserInfo.Get().userId);
+            }
+        }
+    }
+}