Procházet zdrojové kódy

盟主储蓄金变动明细添加备注

DuGuYang před 2 roky
rodič
revize
9d91fe3ccd

+ 3 - 1
Areas/Admin/Controllers/MainServer/LeaderReserveRecordController.cs

@@ -220,7 +220,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
             {
                 SqlString += " and SeoKeyword=" + SeoKeyword;
                 SqlString += " and SeoKeyword=" + SeoKeyword;
             }
             }
-            var Sql = "SELECT c.MakerCode '创客编号',c.RealName '创客姓名',DATE_FORMAT(c.CreateDate,'%Y-%m-%d %H:%i:%s') '创建时间',c.Remark '变动类型',(CASE WHEN c.ChangeType=1 THEN '增加' WHEN c.ChangeType=2 THEN '减少' ELSE '' end) '操作类型',c.Type1Num '电签兑换券张数',c.Type2Num '大POS兑换券张数',d.LeaderBalanceAmount '可提现余额',c.ChangeAmt '使用额度',c.BeforeAmt '使用前剩余额度',c.AfterAmt '使用后剩余额度' FROM(SELECT a.*,b.MakerCode,b.RealName FROM(SELECT Id,UserId,CreateDate,ChangeAmt,BeforeAmt,AfterAmt,Remark,ChangeType,REPLACE (JSON_EXTRACT (SeoTitle, '$[0].Num'),'\\\"','') AS 'Type1Num', REPLACE (JSON_EXTRACT (SeoTitle, '$[1].Num'),'\\\"','') AS 'Type2Num' FROM LeaderReserveRecord WHERE 1=1 " + SqlString + ") a LEFT JOIN Users b ON a.UserId=b.Id) c LEFT JOIN UserAccount d ON c.UserId=d.Id";
+            var Sql = "SELECT c.MakerCode '创客编号',c.RealName '创客姓名',DATE_FORMAT(c.CreateDate,'%Y-%m-%d %H:%i:%s') '创建时间',c.Remark '变动类型',c.SeoDescription '备注',(CASE WHEN c.ChangeType=1 THEN '增加' WHEN c.ChangeType=2 THEN '减少' ELSE '' end) '操作类型',c.Type1Num '电签兑换券张数',c.Type2Num '大POS兑换券张数',d.LeaderBalanceAmount '可提现余额',c.ChangeAmt '使用额度',c.BeforeAmt '使用前剩余额度',c.AfterAmt '使用后剩余额度' FROM(SELECT a.*,b.MakerCode,b.RealName FROM(SELECT Id,UserId,CreateDate,ChangeAmt,BeforeAmt,AfterAmt,Remark,SeoDescription,ChangeType,REPLACE (JSON_EXTRACT (SeoTitle, '$[0].Num'),'\\\"','') AS 'Type1Num', REPLACE (JSON_EXTRACT (SeoTitle, '$[1].Num'),'\\\"','') AS 'Type2Num' FROM LeaderReserveRecord WHERE 1=1 " + SqlString + ") a LEFT JOIN Users b ON a.UserId=b.Id) c LEFT JOIN UserAccount d ON c.UserId=d.Id";
             var sysAdmin = bsdb.SysAdmin.FirstOrDefault(m => m.AdminName == SysUserName && m.Status > -1);
             var sysAdmin = bsdb.SysAdmin.FirstOrDefault(m => m.AdminName == SysUserName && m.Status > -1);
             var FileName = "盟主储蓄金变动记录" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
             var FileName = "盟主储蓄金变动记录" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
             string SendData = "{\"Operater\":\"" + sysAdmin.Id + "\",\"SqlString\":\"" + Sql + "\",\"FileName\":\"" + FileName + "\",\"MaxCount\":\"0\"}";
             string SendData = "{\"Operater\":\"" + sysAdmin.Id + "\",\"SqlString\":\"" + Sql + "\",\"FileName\":\"" + FileName + "\",\"MaxCount\":\"0\"}";
@@ -286,6 +286,7 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["LeaderBalanceAmount"] = userAccount.LeaderBalanceAmount;
                 dic["LeaderBalanceAmount"] = userAccount.LeaderBalanceAmount;
 
 
                 dic["Remark"] = leaderReserveRecord.Remark;
                 dic["Remark"] = leaderReserveRecord.Remark;
+                dic["SeoDescription"] = leaderReserveRecord.SeoDescription;
                 dic["CreateDate"] = leaderReserveRecord.CreateDate;
                 dic["CreateDate"] = leaderReserveRecord.CreateDate;
 
 
                 //变动类型
                 //变动类型
@@ -331,6 +332,7 @@ namespace MySystem.Areas.Admin.Controllers
             ReturnFields.Add("RealName", "创客姓名");
             ReturnFields.Add("RealName", "创客姓名");
             ReturnFields.Add("CreateDate", "创建时间");
             ReturnFields.Add("CreateDate", "创建时间");
             ReturnFields.Add("Remark", "变动类型");
             ReturnFields.Add("Remark", "变动类型");
+            ReturnFields.Add("SeoDescription", "备注");
             ReturnFields.Add("ChangeTypeName", "操作类型");
             ReturnFields.Add("ChangeTypeName", "操作类型");
             ReturnFields.Add("dPosCoupons", "电签兑换券张数");
             ReturnFields.Add("dPosCoupons", "电签兑换券张数");
             ReturnFields.Add("bPosCoupons", "大POS兑换券张数");
             ReturnFields.Add("bPosCoupons", "大POS兑换券张数");

+ 1 - 0
wwwroot/layuiadmin/modules_main/LeaderReserveRecord_Admin.js

@@ -96,6 +96,7 @@ layui.config({
             , { field: 'UserIdRealName', width: 110, title: '真实姓名', sort: true }
             , { field: 'UserIdRealName', width: 110, title: '真实姓名', sort: true }
             , { field: 'CreateDate', width: 180, title: '创建时间', sort: true }
             , { field: 'CreateDate', width: 180, title: '创建时间', sort: true }
             , { field: 'Remark', width: 110, title: '变动类型', sort: true }
             , { field: 'Remark', width: 110, title: '变动类型', sort: true }
+            , { field: 'SeoDescription', width: 110, title: '备注', sort: true }
             , { field: 'ChangeTypeName', width: 110, title: '操作类型', sort: true }
             , { field: 'ChangeTypeName', width: 110, title: '操作类型', sort: true }
             , { field: 'SourceMakerCode', width: 110, title: '购券创客', sort: true }
             , { field: 'SourceMakerCode', width: 110, title: '购券创客', sort: true }
             , { field: 'SeoKeyword', width: 200, title: '订单编号', sort: true }
             , { field: 'SeoKeyword', width: 200, title: '订单编号', sort: true }