1

chenhaozhe

8 天以前 aedfd6ce4fbcfcead2e6d0f12ac5ccd11506d127

1

 WebAPI/Controllers/Sc_MouldRepairInBillListController.cs

@@ -5365,12 +5365,66 @@

        #region 器具维修记录统计分析 
        /// <summary>
        /// 器具维修记录统计分析 列表
        /// 器具维修记录统计分析 列表 (年月)
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        [Route("Sb_MouldRepairWorkBill/Sb_MouldRepairWorkBill")]
        [HttpGet]
        public object Sb_MouldRepairWorkBill_Expand1(string DateYear,string HType, string user ,string DateMonth = "-1")
        {
            if(DateMonth == "-1" || DateMonth == "" || DateMonth == null)
            {
                return Sb_MouldRepairWorkBill(DateYear, HType, user);
            }

            try
            {
                List<object> columnNameList = new List<object>();

                if (DateYear == null || DateYear.Equals(""))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "请选择有效年份";
                    return objJsonResult;
                } 
                else
                {
                    ds = oCN.RunProcReturn("exec h_p_Sb_MouldRepairWorkBill_ExpendMonth'" + DateYear + "','" + HType + "'", "h_p_Sb_MouldRepairWorkBill");
                }

                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }

        /// <summary>
        /// 器具维修记录统计分析 列表 (年份)
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        
        public object Sb_MouldRepairWorkBill(string DateYear, string HType, string user)
        {
            try

 WebAPI/WebAPI.csproj.user

@@ -2,7 +2,7 @@
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <LastActiveSolutionConfig>Debug|x86</LastActiveSolutionConfig>
    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
    <LastActiveSolutionConfig>Debug|x86</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>
    <Use64BitIISExpress />
    <IISExpressSSLPort />