Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

jinghz@oceic.com

2023-08-24 bf24909c6d9cad6fd4bd7335e5f70b45c6a5212b

 WebAPI/Controllers/ÏîÄ¿¹ÜÀí/¹¤×÷ÈÎÎñ/PM_WorkTaskBillController.cs

@@ -333,12 +333,12 @@

                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_PM_WorkTaskBillList order by å•æ®å· ", "h_v_PM_WorkTaskBillList");
                    ds = oCN.RunProcReturn("select * from h_v_PM_WorkTaskBillList order by å•æ®å· desc", "h_v_PM_WorkTaskBillList");
                }
                else
                {
                    string sql1 = "select * from h_v_PM_WorkTaskBillList where 1 = 1 ";
                    string sql = sql1 + sWhere + " order by å•æ®å· ";
                    string sql = sql1 + sWhere + " order by å•æ®å· desc";
                    ds = oCN.RunProcReturn(sql, "h_v_PM_WorkTaskBillList");
                }

@@ -1179,12 +1179,12 @@

                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_PM_WorkTaskReportBillList order by å•æ®å·", "h_v_PM_ProjectStageBillList");
                    ds = oCN.RunProcReturn("select * from h_v_PM_WorkTaskReportBillList order by å•æ®å· desc", "h_v_PM_ProjectStageBillList");
                }
                else
                {
                    string sql1 = "select * from h_v_PM_WorkTaskReportBillList where 1 = 1 ";
                    string sql = sql1 + sWhere + " order by å•æ®å·";
                    string sql = sql1 + sWhere + " order by å•æ®å· desc";
                    ds = oCN.RunProcReturn(sql, "h_v_PM_WorkTaskReportBillList");
                }