财税情况数据对接相关的修改

codegit/CallCenterApi/CallCenterApi.BLL/T_Cus_CustomerFinance.cs

@@ -71,6 +71,14 @@ namespace CallCenterApi.BLL
 
             return dal.GetModel(F_CusFinId);
         }
+        /// <summary>
+        /// 得到一个对象实体
+        /// </summary>
+        public CallCenterApi.Model.T_Cus_CustomerFinance GetModels(int F_CustomerId)
+        {
+
+            return dal.GetModels(F_CustomerId);
+        }
 
         /// <summary>
         /// 获得数据列表

codegit/CallCenterApi/CallCenterApi.DAL/T_Cus_CustomerFinance.cs

@@ -318,7 +318,31 @@ namespace CallCenterApi.DAL
                 return null;
             }
         }
+        /// <summary>
+        /// 得到一个对象实体根据customerid
+        /// </summary>
+        public CallCenterApi.Model.T_Cus_CustomerFinance GetModels(int F_CustomerId)
+        {
+
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("select  top 1 * from T_Cus_CustomerFinance ");
+            strSql.Append(" where F_CustomerId=@F_CustomerId");
+            SqlParameter[] parameters = {
+                    new SqlParameter("@F_CustomerId", SqlDbType.Int,4)
+            };
+            parameters[0].Value = F_CustomerId;
 
+            CallCenterApi.Model.T_Cus_CustomerFinance model = new CallCenterApi.Model.T_Cus_CustomerFinance();
+            DataSet ds = DbHelperSQL.Query(strSql.ToString(), parameters);
+            if (ds.Tables[0].Rows.Count > 0)
+            {
+                return DataRowToModel(ds.Tables[0].Rows[0]);
+            }
+            else
+            {
+                return null;
+            }
+        }
 
         /// <summary>
         /// 得到一个对象实体
@@ -334,7 +358,7 @@ namespace CallCenterApi.DAL
                 }
                 if (row["F_CustomerId"] != null && row["F_CustomerId"].ToString() != "")
                 {
-                    model.F_CustomerId = row["F_CustomerId"].ToString();
+                    model.F_CustomerId = int.Parse(row["F_CustomerId"].ToString());
                 }
                 if (row["F_CustomerCode"] != null)
                 {

codegit/CallCenterApi/CallCenterApi.DAL/T_Cus_CustomerFinanceLog.cs

@@ -324,7 +324,7 @@ namespace CallCenterApi.DAL
                 }
                 if (row["F_CustomerId"] != null && row["F_CustomerId"].ToString() != "")
                 {
-                    model.F_CustomerId = row["F_CustomerId"].ToString();
+                    model.F_CustomerId = int.Parse(row["F_CustomerId"].ToString());
                 }
                 if (row["F_CustomerCode"] != null)
                 {

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/SignController.cs

@@ -30,31 +30,55 @@ namespace CallCenterApi.Interface.Controllers
         //获取客户信息 客户id
         public string  GetCustomers(string cusname)
         {
-            string strURL = "https://openapi.17win.com/gateway/openyqdz/manage/customer/queryCustomers";
-            var m = new
+            try
             {
-                customerLikeCriteria = new { fullName = cusname },
-                pageNo = 1,
-                pageSize = 20
-            };
+                string strURL = "https://openapi.17win.com/gateway/openyqdz/manage/customer/queryCustomers";
+                var m = new
+                {
+                    customerLikeCriteria = new { fullName = cusname },
+                    pageNo = 1,
+                    pageSize = 20
+                };
+
+                //实体序列化和反序列化
+                string json1 = JsonConvert.SerializeObject(m);
+                string strHTML = GetP(strURL, json1);
+
+                //验证返回的信息是否正确
+                JObject obj = Newtonsoft.Json.Linq.JObject.Parse(strHTML);
+                var a = obj["head"];
+                string state = obj["head"]["status"].ToString();
+                string meg = obj["head"]["msg"].ToString();
+                if (state == "N")
+                {
+                    string customid = "0";
+                    return customid;
+                }
+                else {
 
-            //实体序列化和反序列化
-            string json1 = JsonConvert.SerializeObject(m);
-            string strHTML = GetP(strURL, json1);
+                    //获取当前月份
+                    string accountPeriods = DateTime.Now.ToString("yyyyMM");
 
-            //获取当前月份
-            string accountPeriods = DateTime.Now.ToString("yyyyMM");
-            DockingCusResultDto jo1 = JsonConvert.DeserializeObject<DockingCusResultDto>(strHTML);
+                    DockingCusResultDto jo1 = JsonConvert.DeserializeObject<DockingCusResultDto>(strHTML);
 
-            string customid = "";
-            if (jo1.body.customerlist.Count>0)
-            {
-                foreach (var item in jo1.body.customerlist)
-                {
-                    customid = item.customerId;
+                    string customid = "";
+                    if (jo1.body.customerlist.Count > 0)
+                    {
+                        foreach (var item in jo1.body.customerlist)
+                        {
+                            customid = item.customerId;
+                        }
+                    }
+                    return customid;
                 }
+
+            }
+            catch (Exception e)
+            {
+
+                throw e;
             }
-            return customid;
+           
             
         }
         //获取客户信息 并获取财税情况 单个的
@@ -109,24 +133,24 @@ namespace CallCenterApi.Interface.Controllers
                 dt = cusbll.GetAllList().Tables[0];
                 if (dt != null)
                 {
-                   
-
                     for (int i = 0; i < dt.Rows.Count; i++)
                     {
                         cusname = dt.Rows[i]["F_CompanyName"].ToString();
                        string  CustomerCode= dt.Rows[i]["F_CustomerCode"].ToString();
 
                         //根据客户名称获取客户id
-                        string customid = GetCustomers(cusname);
-                     
-                         //获取到财税情况
-                         Model.CsqkInfo csqk = GetCsqk(cusname);
-                         if (csqk != null)
-                         {
-                             //给数据库财税情况表赋值
-                             Model.T_Cus_CustomerFinance model = new Model.T_Cus_CustomerFinance();
-                             //model.F_MonthState = input.F_MonthState;
-                             #region 设置数据
+                        int  customid = Convert.ToInt32(dt.Rows[i]["F_CustomerId"]);
+                        
+                            //获取到财税情况
+                            Model.CsqkInfo csqk = GetCsqk(cusname);
+                        if (csqk != null)
+                        {
+                            //给数据库财税情况表赋值
+                            Model.T_Cus_CustomerFinance model = finbll.GetModels(customid);
+                            if (model != null)
+                            {
+                                //model.F_MonthState = input.F_MonthState;
+                                #region 设置数据
                                 model.F_AnnualIncome = csqk.bnsr.ToString();//本年收入
                                 model.F_AnnualProfit = csqk.bnlr.ToString();//本年利润
                                 model.F_AnnualCost = csqk.bnfy.ToString();  //本年费用
@@ -143,20 +167,24 @@ namespace CallCenterApi.Interface.Controllers
                                 model.F_CustomerId = customid;   //客户id
                                 model.F_CustomerCode = CustomerCode;//客户编号
                                                                     //model.F_CreateBy = CurrentUser.UserData.F_UserCode;//当前操作人
-                                model.F_CreateBy = "8000";//当前操作人
+                                model.F_CreateBy = CurrentUser.UserData.F_UserCode;//当前操作人
                                 model.F_CreatedOn = DateTime.Now;        //创建时间
                                 model.F_DeleteFlag = 0;
                                 #endregion
-                             //如果添加成功则写入日志
-                             #region 写入日志
-                                if (finbll.Add(model) > 0)
+
+
+                                //如果添加成功则写入日志
+                                int findid = model.F_CusFinId;
+                                #region 写入日志
+                                if (finbll.Update(model))
                                 {
                                     var modellog = new Model.T_Cus_CustomerFinanceLog();
                                     #region 设置信息
+                                    modellog.F_CusFinId = findid;
                                     modellog.F_CustomerId = model.F_CustomerId;
                                     modellog.F_CustomerCode = model.F_CustomerCode;
                                     modellog.F_CreateBy = model.F_CreateBy;
-                                    modellog.F_CreatedOn =Convert.ToDateTime(DateTime.Now.ToString("yyyy/MM/dd"));
+                                    modellog.F_CreatedOn = DateTime.Now;
                                     modellog.F_DeleteFlag = 0;
                                     // modellog.F_MonthState = model.F_MonthState;
                                     modellog.F_AnnualIncome = model.F_AnnualIncome;
@@ -179,8 +207,8 @@ namespace CallCenterApi.Interface.Controllers
                                     logbll.Add(modellog);
                                 }
                                 #endregion
-                         }
-                      
+                            }
+                        }
                           
                     }
 
@@ -197,70 +225,79 @@ namespace CallCenterApi.Interface.Controllers
                 {
                     //根据id获取客户信息实体
                     Model.T_Cus_CustomerBaseNew customs = cusbll.GetModel(Convert.ToInt32(item));
-                    //获取客户名称
-                    cusname = customs.F_CompanyName;
-
-                    //根据客户名称获取客户id
-                    string customid = GetCustomers(cusname);
-                    //获取到财税情况
-                    Model.CsqkInfo csqk = GetCsqk(cusname);
-                    if (csqk != null)
+                    if (customs != null)
                     {
-                        //给数据库财税情况表赋值
-                        Model.T_Cus_CustomerFinance model = new Model.T_Cus_CustomerFinance();
-                        //model.F_MonthState = input.F_MonthState;
-                        #region 设置数据
-                        model.F_AnnualIncome = csqk.bnsr.ToString();//本年收入
-                        model.F_AnnualProfit = csqk.bnlr.ToString();//本年利润
-                        model.F_AnnualCost = csqk.bnfy.ToString();  //本年费用
-                        model.F_AnnualWages = csqk.bngz.ToString(); //本年工资
-                        model.F_QuarterlyIncome = csqk.bjsr.ToString();//本季收入
-                        model.F_QuarterlyCost = csqk.bjfy.ToString();    //本季费用
-                        model.F_QuarterlyWages = csqk.bjgz.ToString();  //本季工资
-                        model.F_QPVAT = csqk.zzs.ToString();  //增值税
-                        model.F_QPSurtax = csqk.fjs.ToString();     //本季附加税
-                        model.F_QPTaxes = csqk.qysds.ToString();      // 本季企业所得税
-                        model.F_QPConTax = csqk.whsyjss.ToString();     // 本季文化事业建设税
-                        model.F_QPPerinTax = csqk.gs.ToString(); // 本季个税
-                        model.F_QPOtherTax = csqk.qtse.ToString(); // 本季其他税
-                        model.F_CustomerId = customid;   //客户id
-                        model.F_CustomerCode = customs.F_CustomerCode;//客户编号
-                                                                      //model.F_CreateBy = CurrentUser.UserData.F_UserCode;//当前操作人
-                        model.F_CreateBy = "8000";//当前操作人
-                        model.F_CreatedOn = DateTime.Now;        //创建时间
-                        model.F_DeleteFlag = 0;
-                        #endregion
-                        //如果添加成功则写入日志
-                        if (finbll.Add(model) > 0)
+                        //获取客户名称
+                        cusname = customs.F_CompanyName;
+                        
+                            //获取到财税情况
+                            Model.CsqkInfo csqk = GetCsqk(cusname);
+                        if (csqk != null)
                         {
-                            var modellog = new Model.T_Cus_CustomerFinanceLog();
-                            #region 设置信息
-                            modellog.F_CustomerId = model.F_CustomerId;
-                            modellog.F_CustomerCode = model.F_CustomerCode;
-                            modellog.F_CreateBy = model.F_CreateBy;
-                            modellog.F_CreatedOn = DateTime.Now;
-                            modellog.F_DeleteFlag = 0;
-                            // modellog.F_MonthState = model.F_MonthState;
-                            modellog.F_AnnualIncome = model.F_AnnualIncome;
-                            modellog.F_AnnualProfit = model.F_AnnualProfit;
-                            //modellog.F_AnnualPersonCount = model.F_AnnualPersonCount;
-                            modellog.F_AnnualWages = model.F_AnnualWages;
-                            modellog.F_AnnualCost = model.F_AnnualCost;
-                            modellog.F_QuarterlyCost = model.F_QuarterlyCost;
-                            //modellog.F_QuarterlyPersonCount = model.F_QuarterlyPersonCount;
-                            modellog.F_QuarterlyWages = model.F_QuarterlyWages;
-                            modellog.F_QuarterlyIncome = model.F_QuarterlyIncome;
-                            modellog.F_QPVAT = model.F_QPVAT;
-                            modellog.F_QPSurtax = model.F_QPSurtax;
-                            modellog.F_QPTaxes = model.F_QPTaxes;
-                            modellog.F_QPConTax = model.F_QPConTax;
-                            modellog.F_QPPerinTax = model.F_QPPerinTax;
-                            //modellog.F_QPStampTax = model.F_QPStampTax;
-                            modellog.F_QPOtherTax = model.F_QPOtherTax;
-                            #endregion
-                            logbll.Add(modellog);
+                            //给数据库财税情况表赋值
+                            Model.T_Cus_CustomerFinance model = finbll.GetModels(Convert.ToInt32(item));
+                            if (model != null)
+                            {
+                            
+                                //model.F_MonthState = input.F_MonthState;
+                                #region 设置数据
+                                model.F_AnnualIncome = csqk.bnsr.ToString();//本年收入
+                                model.F_AnnualProfit = csqk.bnlr.ToString();//本年利润
+                                model.F_AnnualCost = csqk.bnfy.ToString();  //本年费用
+                                model.F_AnnualWages = csqk.bngz.ToString(); //本年工资
+                                model.F_QuarterlyIncome = csqk.bjsr.ToString();//本季收入
+                                model.F_QuarterlyCost = csqk.bjfy.ToString();    //本季费用
+                                model.F_QuarterlyWages = csqk.bjgz.ToString();  //本季工资
+                                model.F_QPVAT = csqk.zzs.ToString();  //增值税
+                                model.F_QPSurtax = csqk.fjs.ToString();     //本季附加税
+                                model.F_QPTaxes = csqk.qysds.ToString();      // 本季企业所得税
+                                model.F_QPConTax = csqk.whsyjss.ToString();     // 本季文化事业建设税
+                                model.F_QPPerinTax = csqk.gs.ToString(); // 本季个税
+                                model.F_QPOtherTax = csqk.qtse.ToString(); // 本季其他税
+                                model.F_CustomerId = Convert.ToInt32(item);   //客户id
+                                model.F_CustomerCode = customs.F_CustomerCode;//客户编号
+                                                                              //model.F_CreateBy = CurrentUser.UserData.F_UserCode;//当前操作人
+                                model.F_CreateBy = CurrentUser.UserData.F_UserCode;//当前操作人
+                                model.F_CreatedOn = DateTime.Now;        //创建时间
+                                model.F_DeleteFlag = 0;
+                                #endregion
+                                //如果修改成功则写入日志
+                                int findid = model.F_CusFinId;
+                                if (finbll.Update(model))
+                                {
+                                    var modellog = new Model.T_Cus_CustomerFinanceLog();
+                                    #region 设置信息
+                                    modellog.F_CusFinId = findid;
+                                    modellog.F_CustomerId = model.F_CustomerId;
+                                    modellog.F_CustomerCode = model.F_CustomerCode;
+                                    modellog.F_CreateBy = model.F_CreateBy;
+                                    modellog.F_CreatedOn = DateTime.Now;
+                                    modellog.F_DeleteFlag = 0;
+                                    // modellog.F_MonthState = model.F_MonthState;
+                                    modellog.F_AnnualIncome = model.F_AnnualIncome;
+                                    modellog.F_AnnualProfit = model.F_AnnualProfit;
+                                    //modellog.F_AnnualPersonCount = model.F_AnnualPersonCount;
+                                    modellog.F_AnnualWages = model.F_AnnualWages;
+                                    modellog.F_AnnualCost = model.F_AnnualCost;
+                                    modellog.F_QuarterlyCost = model.F_QuarterlyCost;
+                                    //modellog.F_QuarterlyPersonCount = model.F_QuarterlyPersonCount;
+                                    modellog.F_QuarterlyWages = model.F_QuarterlyWages;
+                                    modellog.F_QuarterlyIncome = model.F_QuarterlyIncome;
+                                    modellog.F_QPVAT = model.F_QPVAT;
+                                    modellog.F_QPSurtax = model.F_QPSurtax;
+                                    modellog.F_QPTaxes = model.F_QPTaxes;
+                                    modellog.F_QPConTax = model.F_QPConTax;
+                                    modellog.F_QPPerinTax = model.F_QPPerinTax;
+                                    //modellog.F_QPStampTax = model.F_QPStampTax;
+                                    modellog.F_QPOtherTax = model.F_QPOtherTax;
+                                    #endregion
+                                    logbll.Add(modellog);
+                                }
+                            }
                         }
                     }
+                           
+                   
                   
                 }
                 return Success("更新成功");
@@ -284,40 +321,77 @@ namespace CallCenterApi.Interface.Controllers
 
             //获取当前月份
             string accountPeriods = DateTime.Now.ToString("yyyyMM");
-            DockingCusResultDto jo1 = JsonConvert.DeserializeObject<DockingCusResultDto>(strHTML);
-           
-            Model.CsqkInfo csqkobj = null;
-            if (jo1.body.customerlist.Count > 0)
+            //验证返回的信息是否正确
+            JObject obj = Newtonsoft.Json.Linq.JObject.Parse(strHTML);
+            var a = obj["head"];
+            string state = obj["head"]["status"].ToString();
+            string meg = obj["head"]["msg"].ToString();
+            if (state == "N")
             {
-                foreach (var item in jo1.body.customerlist)
+                Model.CsqkInfo csqkobj = null;
+                return csqkobj;
+            }
+            else {
+                DockingCusResultDto jo1 = JsonConvert.DeserializeObject<DockingCusResultDto>(strHTML);
+                Model.CsqkInfo csqkobj = null;
+                if (jo1.body.customerlist.Count > 0)
                 {
-                    csqkobj = GetCSQK(item.customerId, accountPeriods);
+                    foreach (var item in jo1.body.customerlist)
+                    {
+                        csqkobj = GetCSQK(item.customerId, accountPeriods);
+                    }
                 }
+                return csqkobj;
             }
-            return csqkobj;
+         
+           
+           
            
         }
         //获取科目余额
         public DockingBalanceResultDto GetAccountBalance(string customerId,string beginPeriod,string endPeriod)
         {
-           string strURL = "https://openapi.17win.com/gateway/openyqdz/finance/sheetController/queryAccountBalanceSheet";
-            var m = new
+            try
+            {
+                string strURL = "https://openapi.17win.com/gateway/openyqdz/finance/sheetController/queryAccountBalanceSheet";
+                var m = new
+                {
+                    customerId,
+                    beginPeriod,
+                    endPeriod,
+                    showAssistant = true,
+                    showTitle = true,
+                    showEndBalance0 = true,
+                    pageNo = 0,//页码从0开始
+                    pageSize = 100
+                };
+
+                //实体序列化和反序列化
+                string json1 = JsonConvert.SerializeObject(m);
+                string strHTML = GetP(strURL, json1);
+              
+                //验证返回的信息是否正确
+                JObject obj = Newtonsoft.Json.Linq.JObject.Parse(strHTML);
+                var a = obj["head"];
+                string state = obj["head"]["status"].ToString();
+                string meg =   obj["head"]["msg"].ToString();
+                if (state == "N")
+                {
+                    DockingBalanceResultDto jo1 = new DockingBalanceResultDto();
+                    return  jo1;
+                }
+                else {
+                    DockingBalanceResultDto jo1 = JsonConvert.DeserializeObject<DockingBalanceResultDto>(strHTML);
+                    return jo1;
+                }
+                
+            }
+            catch (Exception e)
             {
-                customerId,
-                beginPeriod,
-                endPeriod,
-                showAssistant = true,
-                showTitle=true,
-                showEndBalance0=true,
-                pageNo = 0,//页码从0开始
-                pageSize = 100
-            };
 
-            //实体序列化和反序列化
-            string json1 = JsonConvert.SerializeObject(m);
-            string strHTML = GetP(strURL, json1);
-            DockingBalanceResultDto jo1 = JsonConvert.DeserializeObject<DockingBalanceResultDto>(strHTML);
-            return jo1;
+                throw e;
+            }
+         
 
 
         }
@@ -335,10 +409,63 @@ namespace CallCenterApi.Interface.Controllers
             dic.Add("accountPeriod", accountPeriod);
            
             string strHTML = GetP1(strURL,dic);
-           
-            DocAllYearMonthResultDto jo1 = JsonConvert.DeserializeObject<DocAllYearMonthResultDto>(strHTML);
+
+            ///最大会计期
+            //string maxperiod = "";
+            //DocCloseresultDto docc = CloseInfo(customerId);
+            //if (docc.body != null)
+            //{
+            //    foreach (var item in docc.body)
+            //    {
+            //        maxperiod = item.list[0].maxClosePeriod;
+            //    }
+            //}
+            ////判断如果当前日期小于最大会计期才能继续执行
+            //if (Convert.ToInt32(accountPeriod) < Convert.ToInt32(maxperiod))
+            //{
+                //验证返回的信息是否正确
+                JObject obj = Newtonsoft.Json.Linq.JObject.Parse(strHTML);
+                var a = obj["head"];
+                string state = obj["head"]["status"].ToString();
+                string meg = obj["head"]["msg"].ToString();
+                if (state == "N")
+                {
+                    DocAllYearMonthResultDto jo1 = null;
+                    return jo1;
+                }
+                else
+                {
+                    DocAllYearMonthResultDto jo1 = JsonConvert.DeserializeObject<DocAllYearMonthResultDto>(strHTML);
+                    return jo1;
+                }
+          //}
+          //  else
+          //  {
+          //      DocAllYearMonthResultDto jo1 = null;
+          //      return jo1;
+          //  }
+
+}
+        /// <summary>
+        /// 获取结账信息接口信息最大会计期
+        /// </summary>
+        /// <param name="customerIds"></param>
+        /// <returns></returns>
+        public DocCloseresultDto CloseInfo(string customerId)
+        {
+            
+            string strURL = "https://openapi.17win.com/gateway/openyqdz/alice/closeInfo/getCloseInfo";
+            var m = new
+            {
+                customerIds = customerId
+            };
+
+            //实体序列化和反序列化
+            string json1 = JsonConvert.SerializeObject(m);
+            string strHTML = GetP(strURL, json1);
+            DocCloseresultDto jo1 = JsonConvert.DeserializeObject<DocCloseresultDto>(strHTML);
             return jo1;
-           
+
         }
         /// <summary>
         /// 获取财税情况
@@ -391,85 +518,87 @@ namespace CallCenterApi.Interface.Controllers
              DocAllYearMonthResultDto jo1 = null;
             
              jo1 = GetselectQuarterIncomeSheet(customerId, accountPeriod.ToString());
-                 
-             //判断是否有数据
-             if (jo1.body != null)
-             {
-                 #region 循环遍历赋值
-                    foreach (var item in jo1.body)
-                    {
-                        //营业收入
-                        if (item.accountTitleName.Contains("营业收入"))
+            if(jo1!=null)
+            {
+                 //判断是否有数据
+                 if (jo1.body != null)
+                 {
+                     #region 循环遍历赋值
+                        foreach (var item in jo1.body)
                         {
-                            //本年收入
-                            bnsr += item.yearAccumulated;
-                            #region 本季度收入
-                            //第一季度
-                            if (monnum == "01")
-                           
+                            //营业收入
+                            if (item.accountTitleName.Contains("营业收入"))
                             {
-                                 bjsr += item.quarterOne;
+                                //本年收入
+                                bnsr += item.yearAccumulated;
+                                #region 本季度收入
+                                //第一季度
+                                if (monnum == "01")
+                           
+                                {
+                                     bjsr += item.quarterOne;
                                
+                                }
+                                //第二季度
+                                if (monnum == "04")
+                                {
+                                    bjsr += item.quarterTwo;
+                                }
+                                //第三季度
+                                if (monnum == "07")
+                                {
+                                    bjsr += item.quarterThree;
+                                }
+                                //第四季度
+                                if (monnum == "10")
+                                {
+                                    bjsr += item.quarterFour;
+                                }
+                                #endregion
+
                             }
-                            //第二季度
-                            if (monnum == "04")
-                            {
-                                bjsr += item.quarterTwo;
-                            }
-                            //第三季度
-                            if (monnum == "07")
-                            {
-                                bjsr += item.quarterThree;
-                            }
-                            //第四季度
-                            if (monnum == "10")
+                            //本年利润=营业利润+营业外收入-营业外支出
+                            if (item.accountTitleName.Contains("利润总额") )
                             {
-                                bjsr += item.quarterFour;
-                            }
-                            #endregion
-
-                        }
-                        //本年利润=营业利润+营业外收入-营业外支出
-                        if (item.accountTitleName.Contains("利润总额") )
-                        {
-                            //本年利润
-                            bnlr += item.yearAccumulated;
+                                //本年利润
+                                bnlr += item.yearAccumulated;
 
 
-                        }
-                        ///本年费用: =管理费用+销售费用+财务费用
-                        if (item.accountTitleName.Contains("管理费用") || item.accountTitleName.Contains("销售费用") || item.accountTitleName.Contains("财务费用"))
-                        {
-                            //本年费用
-                            bnfy += item.yearAccumulated;
-                            #region 本季度费用
-                            //第一季度
-                            if (monnum == "01")
-                            {
-                                bjfy += item.quarterOne;
-                            }
-                            //第二季度
-                            if (monnum == "04")
-                            {
-                                bjfy += item.quarterTwo;
                             }
-                            //第三季度
-                            if (monnum == "07")
+                            ///本年费用: =管理费用+销售费用+财务费用
+                            if (item.accountTitleName.Contains("管理费用") || item.accountTitleName.Contains("销售费用") || item.accountTitleName.Contains("财务费用"))
                             {
-                                bjfy += item.quarterThree;
-                            }
-                            //第四季度
-                            if (monnum == "10")
-                            {
-                                bjfy += item.quarterFour;
+                                //本年费用
+                                bnfy += item.yearAccumulated;
+                                #region 本季度费用
+                                //第一季度
+                                if (monnum == "01")
+                                {
+                                    bjfy += item.quarterOne;
+                                }
+                                //第二季度
+                                if (monnum == "04")
+                                {
+                                    bjfy += item.quarterTwo;
+                                }
+                                //第三季度
+                                if (monnum == "07")
+                                {
+                                    bjfy += item.quarterThree;
+                                }
+                                //第四季度
+                                if (monnum == "10")
+                                {
+                                    bjfy += item.quarterFour;
+                                }
+                                #endregion
+
                             }
-                            #endregion
 
                         }
-
-                    }
-                    #endregion
-             }
+                        #endregion
+                 }
+            }
             #region 定义科目余额表接口能获得的数据
 
             ///本年工资
@@ -499,9 +628,11 @@ namespace CallCenterApi.Interface.Controllers
                 obj = GetAccountBalance(customerId, i.ToString(), i.ToString());
                 
                 //判断是否有数据
-                if (obj.body.list.Count!=0)
+                if (obj.body!=null)
                 {
-                    #region 循环遍历赋值
+                    if(obj.body.list.Count != 0)
+                    { 
+                          #region 循环遍历赋值
                     foreach (var item in obj.body.list)
                     {
                         #region 本年工资、本季工资
@@ -576,7 +707,8 @@ namespace CallCenterApi.Interface.Controllers
                         }
                         #endregion
                     }
-                    #endregion
+                        #endregion
+                    }
                 }
             }
             #endregion

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/customer/CustomerNewController.cs

@@ -778,7 +778,7 @@ namespace CallCenterApi.Interface.Controllers.customer
             }
             else
             {
-                model.F_CustomerId = input.F_CustomerId.ToString();
+                model.F_CustomerId = input.F_CustomerId;
                 model.F_CustomerCode = input.F_CustomerCode;
                 model.F_CreateBy = input.F_CreateBy;
                 model.F_CreatedOn = DateTime.Now;
@@ -794,7 +794,7 @@ namespace CallCenterApi.Interface.Controllers.customer
         {
             var model = new Model.T_Cus_CustomerFinanceLog();
             #region 设置信息
-            model.F_CustomerId = input.F_CustomerId.ToString();
+            model.F_CustomerId = input.F_CustomerId;
             model.F_CustomerCode = input.F_CustomerCode;
             model.F_CreateBy = input.F_CreateBy;
             model.F_CreatedOn = DateTime.Now;
@@ -971,7 +971,7 @@ namespace CallCenterApi.Interface.Controllers.customer
                             #endregion
                             #region 添加财税情况
                             var finmodel = new Model.T_Cus_CustomerFinance();
-                            finmodel.F_CustomerId = n.ToString();
+                            finmodel.F_CustomerId = n;
                             finmodel.F_CustomerCode = cusmodel.F_CustomerCode;
                             finmodel.F_CreateBy = cusmodel.F_CreateBy;
                             finmodel.F_CreatedOn = DateTime.Now;

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Dto/DockingCustomerListDto.cs

@@ -392,6 +392,27 @@ namespace CallCenterApi.Interface.Models.Dto
     }
 
     #endregion
+
+    public class DocCloseDto
+    {
+        public string companyId { get; set; }//机构ID
+        public string customerId { get; set; }//企业ID
+        public string accountSetId { get; set; }//账套ID
+        public string maxClosePeriod { get; set; }//最大结账会计期
+        public string createPeriod { get; set; }//建账会计期
+    }
+    //body
+    public class DocCloseMonthtDto
+    {
+        public List<DocCloseDto> list { get; set; }
+    }
+    //result 结账信息
+    public class DocCloseresultDto
+    {
+        public DockingHeadDto head { get; set; }
+        public List<DocCloseMonthtDto> body { get; set; }
+    }
+
     #region 税种表
 
     public class DocTaxListDto
@@ -642,6 +663,8 @@ namespace CallCenterApi.Interface.Models.Dto
         public DocAssetsDebtSheetDto body { get; set; }
     } 
     #endregion
+
+
     public class DockingHeadDto
     {
         public string code { get; set; }

codegit/CallCenterApi/CallCenterApi.Model/T_Cus_CustomerFinance.cs

@@ -16,7 +16,7 @@ namespace CallCenterApi.Model
         { }
         #region Model
         private int _f_cusfinid;
-        private string _f_customerid;
+        private int? _f_customerid;
         private string _f_customercode;
         private string _f_monthstate;
         private string _f_annualincome;
@@ -57,7 +57,7 @@ namespace CallCenterApi.Model
         /// <summary>
         /// 客户ID
         /// </summary>
-        public string  F_CustomerId
+        public int?  F_CustomerId
         {
             set { _f_customerid = value; }
             get { return _f_customerid; }

codegit/CallCenterApi/CallCenterApi.Model/T_Cus_CustomerFinanceLog.cs

@@ -17,7 +17,7 @@ namespace CallCenterApi.Model
         #region Model
         private int _f_cusfinlogid;
         private int? _f_cusfinid;
-        private string _f_customerid;
+        private int? _f_customerid;
         private string _f_customercode;
         private string _f_monthstate;
         private string _f_annualincome;
@@ -66,7 +66,7 @@ namespace CallCenterApi.Model
         /// <summary>
         /// 客户ID
         /// </summary>
-        public string  F_CustomerId
+        public int?  F_CustomerId
         {
             set { _f_customerid = value; }
             get { return _f_customerid; }