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

jhz

2023-04-13 cfee793e8fb3ec23c879e6086db8c25ddd368b46

 WebAPI/Controllers/GZGL/Gy_DuSubsidyItemBillController.cs

@@ -28,36 +28,46 @@
        /// </summary>
        [Route("Gy_DuSubsidyItemBill/Gy_DuSubsidyItemlist")]
        [HttpGet]
        public object Gy_DuSubsidyItemlist(string sWhere)
        public object Gy_DuSubsidyItemlist(string sWhere,string user)
        {
            try
            {
                if (!DBUtility.ClsPub.Security_Log("Gy_DuSubsidyItem", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无查看权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_Gy_DuSubsidyItemList " + sWhere, "h_v_Gy_DuSubsidyItemList");
                    ds = oCN.RunProcReturn("select * from h_v_Gy_DuSubsidyItemList order by 扣补资料代码  ", "h_v_Gy_DuSubsidyItemList");
                }
                else
                {
                    string sql1 = "select * from h_v_Gy_DuSubsidyItemList where 1 = 1 ";
                    string sql = sql1 + sWhere;
                    string sql = sql1 + sWhere+ " order by 扣补资料代码  ";
                    ds = oCN.RunProcReturn(sql, "h_v_Gy_DuSubsidyItemList");
                }
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "false！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "Sucess！";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }

                //if (ds.Tables[0].Rows.Count != 0 || ds != null)
                //{
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
                //}
                //else
                //{
                //objJsonResult.code = "0";
                //objJsonResult.count = 0;
                //objJsonResult.Message = "无数据";
                //objJsonResult.data = null;
                //return objJsonResult;
                //}
            }
            catch (Exception e)
            {
@@ -70,16 +80,25 @@
        }
        #endregion

        #region 删除工资类型
        #region 扣补项目删除
        /// <summary>
        /// 工资类型列表删除按钮
        /// 扣补项目删除按钮
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        [Route("Gy_DuSubsidyItemBill/Delete_Json")]
        [HttpGet]
        public object Delete_Json(string HInterID)
        public object Delete_Json(string HInterID,string user)
        {
            if (!DBUtility.ClsPub.Security_Log("Gy_DuSubsidyItem_Delete", 1, false, user))
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "无删除权限！";
                objJsonResult.data = null;
                return objJsonResult;
            }

            //用id查到该对象
            string sql = "select * from Gy_DuSubsidyItem where HItemID =  " + HInterID;
            ds = oCN.RunProcReturn(sql, "Gy_DuSubsidyItem");
@@ -160,11 +179,20 @@
            string msg1 = _value.ToString();
            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            string msg2 = sArray[0].ToString();
            string msg3 = sArray[1].ToString();

            ListModels oListModels = new ListModels();

            try
            {
                if (!DBUtility.ClsPub.Security_Log("Gy_DuSubsidyItem_Edit", 1, false, msg3))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无保存权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                DLL.ClsGy_DuSubsidyItemBill oBill = new DLL.ClsGy_DuSubsidyItemBill();
                List<Model.ClsGy_DuSubsidyItem_Model> lsmain = new List<Model.ClsGy_DuSubsidyItem_Model>();
                msg2 = msg2.Replace("\\", "");