baifenbaishop.git

			@@ -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);
			}
			//审批人ID 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;
			}