From ad6a30d4df8f564c65709e2f4078cbdb02f4a90d Mon Sep 17 00:00:00 2001 From: dao Date: Thu, 18 Apr 2024 15:17:13 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=85=A8=E9=99=A2=E6=88=90=E7=BB=A9?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E6=89=93=E5=8D=B0=E6=B2=A1=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=AD=A6=E7=94=9F=E8=BF=9D=E7=BA=AA?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=EF=BC=8C=E6=95=99=E5=AE=A4=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/ClassroomInfoController.cs | 55 ++++++ .../Views/ClassroomInfo/Index.cshtml | 1 + .../Views/ClassroomInfo/Index.js | 15 ++ .../Views/StuScore/AllStuScoreQueryIndex.js | 3 + .../XmlConfig/ioc.config | 184 +++++++++--------- .../ClassroomInfo/ClassroomInfoBLL.cs | 19 ++ .../ClassroomInfo/ClassroomInfoEntity.cs | 9 + .../ClassroomInfo/ClassroomInfoIBLL.cs | 1 + .../ClassroomInfo/ClassroomInfoService.cs | 60 ++++++ .../StuDisciplineManagementBLL.cs | 20 +- .../StuDisciplineManagementIBLL.cs | 2 +- .../StuDisciplineManagementService.cs | 34 ++++ .../Learun.Application.WorkFlow.csproj | 1 + .../StuDisciplineManagementMethod.cs | 23 +++ 14 files changed, 334 insertions(+), 93 deletions(-) create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/NodeMethod/StuDisciplineManagementMethod.cs diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ClassroomInfoController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ClassroomInfoController.cs index d877fa88b..a5f02bc74 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ClassroomInfoController.cs +++ b/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>(); + if (data.Any()) + { + foreach (var item in data) + { + var aaa = new Dictionary(); + 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(); + 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("导出成功！"); + } /// /// 获取表单数据 /// diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassroomInfo/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassroomInfo/Index.cshtml index 2f17a9445..8d55505fc 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassroomInfo/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassroomInfo/Index.cshtml @@ -40,6 +40,7 @@  删除  启用  停用 +  导出 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassroomInfo/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassroomInfo/Index.js index fa66414dd..4202e8b32 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassroomInfo/Index.js +++ b/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 () { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.js index 14882828a..485c6bcb7 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.js +++ b/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: '学生成绩单', diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/ioc.config b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/ioc.config index 15466786c..944975eb5 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/ioc.config +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/ioc.config @@ -1,101 +1,103 @@  - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - + + + + \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ClassroomInfo/ClassroomInfoBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ClassroomInfo/ClassroomInfoBLL.cs index 62bf520d8..cce12ba80 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ClassroomInfo/ClassroomInfoBLL.cs +++ b/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 GetList(string queryJson) + { + try + { + return classroomInfoService.GetList(queryJson); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } /// /// 获取页面显示列表数据 /// diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ClassroomInfo/ClassroomInfoEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ClassroomInfo/ClassroomInfoEntity.cs index 362dafd9b..e72d8369a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ClassroomInfo/ClassroomInfoEntity.cs +++ b/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 扩展操作 /// /// 新增调用 @@ -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 } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ClassroomInfo/ClassroomInfoIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ClassroomInfo/ClassroomInfoIBLL.cs index fb29feb09..e478380df 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ClassroomInfo/ClassroomInfoIBLL.cs +++ b/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 /// 查询参数 /// IEnumerable GetPageList(Pagination pagination, string queryJson); + IEnumerable GetList(string queryJson); IEnumerable GetAllList(); /// /// 获取ClassroomInfo表实体数据 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ClassroomInfo/ClassroomInfoService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ClassroomInfo/ClassroomInfoService.cs index a33042774..34fcae594 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ClassroomInfo/ClassroomInfoService.cs +++ b/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 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(strSql.ToString(), dp); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } /// /// 获取页面显示列表数据 /// diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuDisciplineManagement/StuDisciplineManagementBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuDisciplineManagement/StuDisciplineManagementBLL.cs index e829eaa1c..d06941531 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuDisciplineManagement/StuDisciplineManagementBLL.cs +++ b/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); + } + } + } } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuDisciplineManagement/StuDisciplineManagementIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuDisciplineManagement/StuDisciplineManagementIBLL.cs index 9e787c5fb..23ab28a9f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuDisciplineManagement/StuDisciplineManagementIBLL.cs +++ b/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 /// 主键 void ChangeStatusByProcessId(string status, string processId, string userId); #endregion - + void ChangeStatusByProcessId(string ProcessID, int PStatus, string userId); } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuDisciplineManagement/StuDisciplineManagementService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuDisciplineManagement/StuDisciplineManagementService.cs index 1790d267a..d4e673c6c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuDisciplineManagement/StuDisciplineManagementService.cs +++ b/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(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); + } + } + + } } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Learun.Application.WorkFlow.csproj b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Learun.Application.WorkFlow.csproj index a4c2ff42a..5b69194e8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Learun.Application.WorkFlow.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Learun.Application.WorkFlow.csproj @@ -95,6 +95,7 @@ + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/NodeMethod/StuDisciplineManagementMethod.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/NodeMethod/StuDisciplineManagementMethod.cs new file mode 100644 index 000000000..f659c59ad --- /dev/null +++ b/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); + } + } + } +} From 530f189efbcd4d0327e6c059182aa724402a4139 Mon Sep 17 00:00:00 2001 From: dao Date: Mon, 22 Apr 2024 15:05:11 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=AF=BE=E6=97=B6=E8=B4=B9=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E6=89=93=E5=8D=B0=E5=A2=9E=E5=8A=A0=E5=90=88=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ArrangeLessonTermController.cs | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ArrangeLessonTermController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ArrangeLessonTermController.cs index 73672975d..b088f8102 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ArrangeLessonTermController.cs +++ b/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; From 48da8a2ed90fff8ebc18a4d1067cb2a902017f08 Mon Sep 17 00:00:00 2001 From: dao Date: Tue, 23 Apr 2024 09:29:05 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=A1=A5=E5=8D=A1=E6=A3=80=E7=B4=A2?= =?UTF-8?q?=E3=80=81=E5=AD=A6=E7=94=9F=E5=A5=96=E5=8A=B1=E5=BD=95=E5=85=A5?= =?UTF-8?q?=E9=80=89=E4=BA=BA=E6=A3=80=E7=B4=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EducationalAdministration/Views/StuSubsidize/Form.js | 4 ++-- .../Areas/LogisticsManagement/Views/ADR_Record/Form.js | 5 +++-- .../Learun.Application.Web/Views/Utility/GirdSelectIndex.js | 2 -- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSubsidize/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSubsidize/Form.js index 80bf290ff..56f5eabde 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSubsidize/Form.js +++ b/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" }, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Form.js index 4726eefa2..60ab3fd67 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Form.js +++ b/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); } } }); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Utility/GirdSelectIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Utility/GirdSelectIndex.js index 7576401d9..a1c30f197 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Utility/GirdSelectIndex.js +++ b/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) {