1

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 total = 0;
-                var dataList = ChpayapplicationDAL.GetAuditDataList(condition, user.USERID, isaudit, user.SHOWNAME, user.COMPANYID, null);
+                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 total = 0;
-                var bodyList = new List<ChPayapplication>() { audithead };
+                var audithead = ChinvoiceapplicationDAL.GetDataList(0, 1, condition, out total, user.USERID, user.SHOWNAME, user.COMPANYID, null);
+                //var bodyList = new List<ChPayapplication>() { 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 total = 0;
-                var bodyList = new List<ChPayapplication>() { audithead };
+                var audithead = ChinvoiceapplicationDAL.GetDataList(0, 1, condition, out total, user.USERID, user.SHOWNAME, user.COMPANYID, null);
+                //var bodyList = new List<ChPayapplication>() { 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 BasicDataRefDAL.GetContentResult(result);
-                return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose) };
             }
             return new ContentResult() { Content = json };
         }