From 175f31386e47b1ca2c751b8f87cd7a089c66e7ae Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 25 八月 2023 16:55:08 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/项目管理/业绩指标/PM_YearEmployeeMoneyBillController.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git "a/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\344\270\232\347\273\251\346\214\207\346\240\207/PM_YearEmployeeMoneyBillController.cs" "b/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\344\270\232\347\273\251\346\214\207\346\240\207/PM_YearEmployeeMoneyBillController.cs"
index f82e012..275f0f4 100644
--- "a/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\344\270\232\347\273\251\346\214\207\346\240\207/PM_YearEmployeeMoneyBillController.cs"
+++ "b/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\344\270\232\347\273\251\346\214\207\346\240\207/PM_YearEmployeeMoneyBillController.cs"
@@ -288,13 +288,13 @@
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select * from PM_YearEmployeeMoneyBillMain order by HBillNo ", "PM_YearEmployeeMoneyBillMain");
+ ds = oCN.RunProcReturn("select * from h_v_PM_YearEmployeeMoneyBillList order by 鍗曟嵁鍙� desc ", "h_v_PM_YearEmployeeMoneyBillList");
}
else
{
- string sql1 = "select * from PM_YearEmployeeMoneyBillMain where 1 = 1 ";
- string sql = sql1 + sWhere + " order by HBillNo ";
- ds = oCN.RunProcReturn(sql, "PM_YearEmployeeMoneyBillMain");
+ string sql1 = "select * from h_v_PM_YearEmployeeMoneyBillList where 1 = 1 ";
+ string sql = sql1 + sWhere + " order by 鍗曟嵁鍙� desc ";
+ ds = oCN.RunProcReturn(sql, "h_v_PM_YearEmployeeMoneyBillList");
}
//娣诲姞鍒楀悕
--
Gitblit v1.9.1