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.Model/FromBody/FMPage.cs | 5 +
CoreCms.Net.Web.Admin/Controllers/apply/applyModelController.cs | 76 ++++++++++++++++++-------
CoreCms.Net.Web.Admin/wwwroot/views/applymodel/index.html | 78 +++++++++++--------------
CoreCms.Net.Services/Shop/CoreCmsPagesServices.cs | 2
4 files changed, 96 insertions(+), 65 deletions(-)
diff --git a/CoreCms.Net.Model/FromBody/FMPage.cs b/CoreCms.Net.Model/FromBody/FMPage.cs
index 2a74683..7a4226c 100644
--- a/CoreCms.Net.Model/FromBody/FMPage.cs
+++ b/CoreCms.Net.Model/FromBody/FMPage.cs
@@ -30,6 +30,11 @@
/// 鍒ゆ柇鏉′欢
/// </summary>
public string where { get; set; }
+
+ /// <summary>
+ /// 鎺掑簭
+ /// </summary>
+ public string order { get; set; }
}
diff --git a/CoreCms.Net.Services/Shop/CoreCmsPagesServices.cs b/CoreCms.Net.Services/Shop/CoreCmsPagesServices.cs
index 875f620..c7a4a3d 100644
--- a/CoreCms.Net.Services/Shop/CoreCmsPagesServices.cs
+++ b/CoreCms.Net.Services/Shop/CoreCmsPagesServices.cs
@@ -430,7 +430,7 @@
}
limit = limit > 0 ? limit : 10;
- var goods = await _goodsServices.QueryListByComponentsAsync(where, limit, " sort desc,id desc ", true, true, 60);
+ var goods = await _goodsServices.QueryListByComponentsAsync(where, limit, " sort asc,id asc ", true, true, 60);
if (goods != null && goods.Any())
{
var result = JArray.FromObject(goods);
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;
}
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/applymodel/index.html b/CoreCms.Net.Web.Admin/wwwroot/views/applymodel/index.html
index a83d58b..f84ac03 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/applymodel/index.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/applymodel/index.html
@@ -20,59 +20,37 @@
<script type="text/html" id="LAY-app-applyModel-toolbar">
<div class="layui-form coreshop-toolbar-search-form">
<div class="layui-form-item">
-
+
<div class="layui-inline">
- <label class="layui-form-label" for="id">id</label>
+ <label class="layui-form-label" for="managerID">瀹℃壒浜�</label>
<div class="layui-input-inline">
- <input type="text" name="id" placeholder="璇疯緭鍏d" class="layui-input">
+ <input type="text" name="managerName" placeholder="璇疯緭鍏ュ鎵逛汉" class="layui-input">
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label" for="managerID">瀹℃壒浜篒D</label>
- <div class="layui-input-inline">
- <input type="text" name="managerID" placeholder="璇疯緭鍏ュ鎵逛汉ID" class="layui-input">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" for="roleID">瀹℃壒瑙掕壊ID</label>
- <div class="layui-input-inline">
- <input type="text" name="roleID" placeholder="璇疯緭鍏ュ鎵硅鑹睮D" class="layui-input">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" for="managerApplyCount">瀹℃牳浜烘暟鏁伴噺</label>
- <div class="layui-input-inline">
- <input type="text" name="managerApplyCount" placeholder="璇疯緭鍏ュ鏍镐汉鏁版暟閲�" class="layui-input">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" for="aType">绫诲瀷</label>
- <div class="layui-input-inline">
- <input type="text" name="aType" placeholder="璇疯緭鍏ョ被鍨�" class="layui-input">
- </div>
- </div>
+
+
<div class="layui-inline">
<label class="layui-form-label" for="dec">鍐呭</label>
<div class="layui-input-inline">
- <input type="text" name="dec" placeholder="璇疯緭鍏ュ唴瀹�" class="layui-input">
+ <input type="text" name="dec" placeholder="璇疯緭鍏ュ唴瀹�" class="layui-input">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" for="reMake">澶囨敞</label>
<div class="layui-input-inline">
- <input type="text" name="reMake" placeholder="璇疯緭鍏ュ娉�" class="layui-input">
+ <input type="text" name="reMake" placeholder="璇疯緭鍏ュ娉�" class="layui-input">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" for="oldData">璋冩暣鍓嶆暟鎹�</label>
<div class="layui-input-inline">
- <input type="text" name="oldData" placeholder="璇疯緭鍏ヨ皟鏁村墠鏁版嵁" class="layui-input">
+ <input type="text" name="oldData" placeholder="璇疯緭鍏ヨ皟鏁村墠鏁版嵁" class="layui-input">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" for="data">璋冩暣鏁版嵁</label>
<div class="layui-input-inline">
- <input type="text" name="data" placeholder="璇疯緭鍏ヨ皟鏁存暟鎹�" class="layui-input">
+ <input type="text" name="data" placeholder="璇疯緭鍏ヨ皟鏁存暟鎹�" class="layui-input">
</div>
</div>
<div class="layui-inline">
@@ -90,22 +68,36 @@
<div class="layui-inline">
<label class="layui-form-label" for="createBy">鍒涘缓浜�</label>
<div class="layui-input-inline">
- <input type="text" name="createBy" placeholder="璇疯緭鍏ュ垱寤轰汉" class="layui-input">
+ <input type="text" name="createBy" placeholder="璇疯緭鍏ュ垱寤轰汉" class="layui-input">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" for="upDataBy">淇敼浜�</label>
<div class="layui-input-inline">
- <input type="text" name="upDataBy" placeholder="璇疯緭鍏ヤ慨鏀逛汉" class="layui-input">
+ <input type="text" name="upDataBy" placeholder="璇疯緭鍏ヤ慨鏀逛汉" class="layui-input">
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label" for="isdelete">鍒犻櫎鏍囧織</label>
+ <div class="layui-inline">
+ <label class="layui-form-label" for="aType">绫诲瀷</label>
<div class="layui-input-inline">
- <select name="isdelete">
- <option value="">璇烽�夋嫨</option>
- <option value="True">鏄�</option>
- <option value="False">鍚�</option>
+
+ <select name="aType">
+ <option value="-1">璇烽�夋嫨</option>
+ <option value="0">绉垎</option>
+ <option value="1">浣欓</option>
+ <option value="2">鎺ㄨ崘浜�</option>
+ </select>
+ </div>
+ </div>
+
+ <div class="layui-inline">
+ <label class="layui-form-label" for="ayStataType">瀹℃牳鐘舵��</label>
+ <div class="layui-input-inline">
+ <select name="ayStataType">
+ <option value="-1">璇烽�夋嫨</option>
+ <option value="0">鍚屾剰</option>
+ <option value="1">瀹℃牳涓�</option>
+ <option value="2">鎷掔粷</option>
</select>
</div>
</div>
@@ -190,10 +182,10 @@
[
{ type: "checkbox", fixed: "left" },
{ field: 'id', title: 'id', width: 60, sort: false},
- { field: 'managerID', title: '瀹℃壒浜篒D', sort: false,width: 105 },
- { field: 'roleID', title: '瀹℃壒瑙掕壊ID', sort: false,width: 105 },
+ { field: 'managerName', title: '瀹℃壒浜�', sort: false,width: 105 },
+ { field: 'roleID', title: '瀹℃壒瑙掕壊', sort: false,width: 105 },
{ field: 'managerApplyCount', title: '瀹℃牳浜烘暟鏁伴噺', sort: false,width: 105 },
- { field: 'aType', title: '绫诲瀷', sort: false,width: 105 },
+ { field: 'aTypeName', title: '绫诲瀷', sort: false,width: 105 },
{ field: 'dec', title: '鍐呭', sort: false,width: 105 },
{ field: 'reMake', title: '澶囨敞', sort: false,width: 105 },
{ field: 'oldData', title: '璋冩暣鍓嶆暟鎹�', sort: false,width: 105 },
@@ -202,7 +194,7 @@
{ field: 'upDataTime', title: '淇敼鏃堕棿', width: 130, sort: false},
{ field: 'createBy', title: '鍒涘缓浜�', sort: false,width: 105 },
{ field: 'upDataBy', title: '淇敼浜�', sort: false,width: 105 },
- { field: 'isdelete', title: '鍒犻櫎鏍囧織', width: 95, templet: '#switch_isdelete', sort: false , unresize: true},
+ { field: 'ayStataTypeName', title: '瀹℃壒鐘舵��', sort: false, width: 105 },
{ width: 162, align: 'center', title:'鎿嶄綔', fixed: 'right', toolbar: '#LAY-app-applyModel-tableBox-bar' }
]
]
--
Gitblit v1.9.1