合并

ch

2022-03-10 5d9636ba5741f6ff79c9401bce2626469c35323d

 WebAPI/Controllers/¹¤×ʹÜÀí/Pay_SingleBalBillController.cs

@@ -24,7 +24,7 @@
        public DLL.ClsPay_SingleBalBill BillOld0 = new DLL.ClsPay_SingleBalBill();   //                                                                                         

        /// <summary>
        /// è¿”回工资结算个人列表
        /// è¿”回工资结算个人列表(个人)
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
@@ -43,6 +43,7 @@
                    return objJsonResult;
                }
                ds = Sc_GetSingleBalBill(sWhere);

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "返回记录成功！";
@@ -63,12 +64,12 @@
        {
            if (sWhere == null || sWhere.Equals(""))
            {
                return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Pay_SingleBalBillList order by æ—¥æœŸ desc", "h_v_Pay_SingleBalBillList");
                return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Pay_SingleBalBillList order by hmainid desc", "h_v_Pay_SingleBalBillList");
            }
            else
            {
                string sql1 = "select * from h_v_Pay_SingleBalBillList where 1 = 1 ";
                string sql = sql1 + sWhere + "order by æ—¥æœŸ desc";
                string sql = sql1 + sWhere + " order by hmainid desc";
                return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Pay_SingleBalBillList");
            }

@@ -381,6 +382,37 @@
                return objJsonResult;
            }
        }

        /// <summary>
        /// ç”Ÿæˆå·¥èµ„结算
        /// </summary>
        /// <param name="HBeginDate">开始日期</param>
        /// <param name="HEndDate">结束日期</param>
        /// <param name="HDeptID">部门ID</param>
        /// <returns></returns>
        [Route("Pay_SingleBalBill/GenerateSalary")]
        [HttpGet]
        public object GenerateSalary(string HBeginDate, string HEndDate,int HDeptID)
        {
            try
            {
                string sql = $"exec h_p_Gy_GenerateSalary '{HBeginDate}','{HEndDate}','{HDeptID}' ";
                oCN.RunProc(sql); 
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "生成成功";
                objJsonResult.data = 1;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        //
    }
}