From 80563aa6ff88d3ea140b069af087ef8d4dbfcd0b Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 02 四月 2024 13:26:35 +0800
Subject: [PATCH] 审批
---
CoreCms.Net.Web.Admin/Controllers/apply/applyModelController.cs | 76 +++++++++++++++++++++++++++----------
1 files changed, 55 insertions(+), 21 deletions(-)
diff --git a/CoreCms.Net.Web.Admin/Controllers/apply/applyModelController.cs b/CoreCms.Net.Web.Admin/Controllers/apply/applyModelController.cs
index db418df..a904480 100644
--- a/CoreCms.Net.Web.Admin/Controllers/apply/applyModelController.cs
+++ b/CoreCms.Net.Web.Admin/Controllers/apply/applyModelController.cs
@@ -37,6 +37,8 @@
using Essensoft.Paylink.Alipay.Domain;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using K4os.Compression.LZ4.Internal;
+using CoreCms.Net.Model.ViewModels.Basics;
+using System.Collections.Generic;
namespace CoreCms.Net.Web.Admin.Controllers
{
@@ -116,31 +118,28 @@
where = where.And(p => p.id == id);
}
//瀹℃壒浜篒D varchar
- var managerID = Request.Form["managerID"].FirstOrDefault();
- if (!string.IsNullOrEmpty(managerID))
+ var managerName = Request.Form["managerName"].FirstOrDefault();
+ if (!string.IsNullOrEmpty(managerName))
{
- where = where.And(p => p.managerID.Contains(managerID));
+ where = where.And(p => p.managerName.Contains(managerName));
}
- //瀹℃壒瑙掕壊ID varchar
- var roleID = Request.Form["roleID"].FirstOrDefault();
- if (!string.IsNullOrEmpty(roleID))
- {
- where = where.And(p => p.roleID.Contains(roleID));
- }
- //瀹℃牳浜烘暟鏁伴噺 int
- var managerApplyCount = Request.Form["managerApplyCount"].FirstOrDefault().ObjectToInt(0);
- if (managerApplyCount > 0)
- {
- where = where.And(p => p.managerApplyCount == managerApplyCount);
- }
+
//绫诲瀷 int
- var aType = Request.Form["aType"].FirstOrDefault().ObjectToInt(0);
- if (aType > 0)
+ var aType = Request.Form["aType"].FirstOrDefault().ObjectToInt(-1);
+ if (aType > -1)
{
where = where.And(p => p.aType ==(applyType)aType);
}
- //鍐呭 varchar
- var dec = Request.Form["dec"].FirstOrDefault();
+ //绫诲瀷 int
+ var ayStataType = Request.Form["ayStataType"].FirstOrDefault().ObjectToInt(-1);
+ if (ayStataType > -1)
+ {
+ where = where.And(p => p.ayStataType == (applyStataType)ayStataType);
+ }
+
+
+ //鍐呭 varchar
+ var dec = Request.Form["dec"].FirstOrDefault();
if (!string.IsNullOrEmpty(dec))
{
where = where.And(p => p.dec.Contains(dec));
@@ -223,10 +222,45 @@
}
//鑾峰彇鏁版嵁
var list = await _applyModelServices.QueryPageAsync(where, orderEx, orderBy, pageCurrent, pageSize, true);
+
+ var applyModelDTOs = new List<applyModelDTO>();
+
+ foreach( var model in list)
+ {
+ var modelDTO = new applyModelDTO();
+ modelDTO.id = model.id;
+
+ modelDTO.id = model.id;
+ modelDTO.managerID = model.managerID;
+ modelDTO.managerName = model.managerName;
+ modelDTO.roleID = model.roleID;
+ modelDTO.managerApplyCount = model.managerApplyCount;
+ modelDTO.aType = (int)model.aType;
+ modelDTO.aTypeName = model.aType.GetDescription();
+ modelDTO.ayStataType = (int)model.ayStataType;
+ modelDTO.ayStataTypeName = model.ayStataType.GetDescription();
+ modelDTO.userID = model.userID;
+ modelDTO.dec = model.dec;
+ modelDTO.reMake = model.reMake;
+ modelDTO.oldData = model.oldData;
+ modelDTO.data = model.data;
+ modelDTO.createById = model.createById;
+ modelDTO.upDataById = model.upDataById;
+ modelDTO.createTime = model.createTime;
+ modelDTO.upDataTime = model.upDataTime;
+ modelDTO.createBy = model.createBy;
+ modelDTO.upDataBy = model.upDataBy;
+ modelDTO.isdelete = model.isdelete;
+ applyModelDTOs.Add(modelDTO);
+ }
+
+ IPageList<applyModelDTO> listpage = new PageList<applyModelDTO>(applyModelDTOs, list.PageIndex, pageSize, list.TotalCount);
+
+
//杩斿洖鏁版嵁
- jm.data = list;
+ jm.data = listpage;
jm.code = 0;
- jm.count = list.TotalCount;
+ jm.count = listpage.TotalCount;
jm.msg = "鏁版嵁璋冪敤鎴愬姛!";
return jm;
}
--
Gitblit v1.9.1