调整列表状态显示逻辑

Util/MerchantAmountSummayUtil.cs

@@ -34,7 +34,9 @@ namespace MySystem
                 {
                     TradeMonth = month.AddMonths(i + 1).ToString("yyyy-MM");
                     TradeTime = month.AddMonths(i + 1).ToString("yyyyMM");
-                    // TradeTime = (int.Parse("202308") + i + 1).ToString();
+                    //测试指定激活时间
+                    // TradeMonth = (int.Parse("202307") + i + 1).ToString();
+                    // TradeTime = (int.Parse("202307") + i + 1).ToString();
                     var check = new MerchantAmountSummayService().QueryAmount("TradeAmount", " and IsAct=1 and TradeMonth='" + TradeTime + "' and MerchantId=" + MerchantId + "");
                     if (check.Count > 0)
                     {
@@ -43,18 +45,24 @@ namespace MySystem
                     }
                     //待考核
                     if (int.Parse(DateTime.Now.ToString("yyyyMM")) < int.Parse(TradeTime))
-                    // if (int.Parse("202309") < int.Parse(TradeTime))
+                    // if (int.Parse("202310") < int.Parse(TradeTime))//测试指定当前时间
                     {
                         Status = 0;
                     }
                     else
                     {
                         //考核中
-                        if (DateTime.Now.ToString("yyyyMM") == TradeMonth) Status = 1;
-                        //已通过
-                        if (TradeAmount >= 10000 && check.Count > 0) Status = 2;
-                        //未通过
-                        if (TradeAmount < 10000 && check.Count > 0) Status = -1;
+                        if (DateTime.Now.ToString("yyyyMM") == TradeTime)
+                        {
+                            Status = 1;
+                        }
+                        else
+                        {
+                            //已通过
+                            if (TradeAmount >= 10000 && check.Count > 0) Status = 2;
+                            //未通过
+                            if (TradeAmount < 10000 && check.Count > 0) Status = -1;
+                        }
                     }
 
                     Dictionary<string, object> curData = new Dictionary<string, object>();