From 582344d0703da2cae71bdc653810a95c3979dc12 Mon Sep 17 00:00:00 2001 From: ddlucky Date: Mon, 17 Jul 2023 00:12:08 +0800 Subject: [PATCH] 1 --- .../DSWEBAPPInterfaceController.cs | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/DSWeb/Areas/CommMng/Controllers/DSWEBAPPInterfaceController.cs b/DSWeb/Areas/CommMng/Controllers/DSWEBAPPInterfaceController.cs index eafb9183..00bb6839 100644 --- a/DSWeb/Areas/CommMng/Controllers/DSWEBAPPInterfaceController.cs +++ b/DSWeb/Areas/CommMng/Controllers/DSWEBAPPInterfaceController.cs @@ -21,6 +21,8 @@ using DSWeb.Common.DB; using System.Web.UI.WebControls; using DSWeb.MvcShipping.DAL.MsInfoClient; using DSWeb.MvcShipping.Models.MsInfoClient; +using DSWeb.Areas.Account.DAL.Chfee_Invoiceapplication; +using static java.security.cert.CertPathValidatorException; namespace DSWeb.Areas.CommMng.Controllers { @@ -291,35 +293,36 @@ namespace DSWeb.Areas.CommMng.Controllers if (formname == "查询列表") { - - var dataList = ChpayapplicationDAL.GetAuditDataList(condition, user.USERID, isaudit, user.SHOWNAME, user.COMPANYID, null); + var total = 0; + var dataList = ChinvoiceapplicationDAL.GetDataList(0,50,condition,out total, user.USERID, user.SHOWNAME, user.COMPANYID, null); var json1 = JsonConvert.Serialize(new { Success = true, Message = "查询成功", data = dataList.ToList() }); return new ContentResult() { Content = json1 }; } if (formname == "查询明细") { - var dataList = ChpayapplicationDAL.GetBodyAuditList(0, 9999, condition, ""); + var dataList = ChinvoiceapplicationDAL.GetDetailList( condition, ""); var json1 = JsonConvert.Serialize(new { Success = true, Message = "查询成功", data = dataList.ToList() }); return new ContentResult() { Content = json1 }; } if (formname == "审批通过") { - var audithead = ChpayapplicationDAL.GetData(condition, user.USERID, user.SHOWNAME, user.COMPANYID); - var bodyList = new List() { audithead }; + var total = 0; + var audithead = ChinvoiceapplicationDAL.GetDataList(0, 1, condition, out total, user.USERID, user.SHOWNAME, user.COMPANYID, null); + //var bodyList = new List() { audithead }; - DBResult result = ChpayapplicationDAL.AuditList(bodyList, user.USERID); + DBResult result = ChinvoiceapplicationDAL.AuditList(audithead, user.COMPANYID, user.USERID); return BasicDataRefDAL.GetContentResult(result); } if (formname == "驳回") { - var audithead = ChpayapplicationDAL.GetData(condition, user.USERID, user.SHOWNAME, user.COMPANYID); - var bodyList = new List() { audithead }; + var total = 0; + var audithead = ChinvoiceapplicationDAL.GetDataList(0, 1, condition, out total, user.USERID, user.SHOWNAME, user.COMPANYID, null); + //var bodyList = new List() { audithead }; - DBResult result = ChpayapplicationDAL.AuditBackList(bodyList, user.USERID, isaudit); + DBResult result = ChinvoiceapplicationDAL.AuditBackList(audithead, user.USERID, isaudit); - var jsonRespose = new JsonResponse { Success = result.Success, Message = result.Message }; - return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose) }; + return BasicDataRefDAL.GetContentResult(result); } return new ContentResult() { Content = json }; }