Merge branch 'feature-dgy-后台新功能批量处理' into DuGuYang

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -4212,9 +4212,9 @@ namespace MySystem.Areas.Admin.Controllers
 
         public string TransferPosCouponDo(string Kind, string PosCouponCodes, string FromMakerCode, string ToMakerCode, string LeaderMakerCode = "")
         {
-            if (string.IsNullOrEmpty(PosCouponCodes))
+            if (string.IsNullOrEmpty(Kind))
             {
-                return "请输入机具券码";
+                return "请选择划拨的券类型";
             }
             if (string.IsNullOrEmpty(PosCouponCodes))
             {
@@ -4891,14 +4891,14 @@ namespace MySystem.Areas.Admin.Controllers
                 string[] datelist = BindingTime.Split(new string[] { " - " }, StringSplitOptions.None);
                 bstart = datelist[0] + " 00:00:00";
                 bend = datelist[1] + " 23:59:59";
-                condition += " and tb.BindingTime>='" + bstart + "' and tb.BindingTime<'" + bend + "'";
+                condition += " and tb.BindingTime>='" + bstart + "' and tb.BindingTime<='" + bend + "'";
             }
             if (!string.IsNullOrEmpty(ActivationTime))
             {
                 string[] datelist = ActivationTime.Split(new string[] { " - " }, StringSplitOptions.None);
                 astart = datelist[0] + " 00:00:00";
                 aend = datelist[1] + " 23:59:59";
-                condition += " and tb.ActivationTime>='" + astart + "' and tb.ActivationTime<'" + aend + "'";
+                condition += " and tb.ActivationTime>='" + astart + "' and tb.ActivationTime<='" + aend + "'";
             }
             if (!string.IsNullOrEmpty(PosFeeSelect))
             {
@@ -4971,14 +4971,14 @@ namespace MySystem.Areas.Admin.Controllers
                 string[] datelist = BindingTime.Split(new string[] { " - " }, StringSplitOptions.None);
                 bstart = datelist[0] + " 00:00:00";
                 bend = datelist[1] + " 23:59:59";
-                condition += " and tb.BindingTime>='" + bstart + "' and tb.BindingTime<'" + bend + "'";
+                condition += " and tb.BindingTime>='" + bstart + "' and tb.BindingTime<='" + bend + "'";
             }
             if (!string.IsNullOrEmpty(ActivationTime))
             {
                 string[] datelist = ActivationTime.Split(new string[] { " - " }, StringSplitOptions.None);
                 astart = datelist[0] + " 00:00:00";
                 aend = datelist[1] + " 23:59:59";
-                condition += " and tb.ActivationTime>='" + astart + "' and tb.ActivationTime<'" + aend + "'";
+                condition += " and tb.ActivationTime>='" + astart + "' and tb.ActivationTime<='" + aend + "'";
             }
             if (!string.IsNullOrEmpty(PosFeeSelect))
             {