页面修改

Edu.Model/ViewModel/Question/RB_Question_ViewModel.cs

@@ -134,5 +134,10 @@ namespace Edu.Model.ViewModel.Question
         /// 开始问题编号
         /// </summary>
         public int StartId { get; set; }
+
+        /// <summary>
+        /// 排序类型(1-问题编号)
+        /// </summary>
+        public int OrderByType { get; set; }
     }
 }
\ No newline at end of file

Edu.Repository/Question/RB_QuestionRepository.cs

@@ -201,7 +201,15 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND A.{0}>{1} ", nameof(RB_Question_ViewModel.QuestionId), query.StartId);
                 }
+                if (query.OrderByType == 1)
+                {
                     builder.AppendFormat(" ORDER BY A.{0} ASC ", nameof(RB_Question_ViewModel.QuestionId));
+                }
+                else
+                {
+                    builder.AppendFormat(" ORDER BY A.{0} ASC ", nameof(RB_Question_ViewModel.SortNum));
+                }
+         
                 return GetPage<RB_Question_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
             }
         }

Edu.Repository/Question/RB_Question_BankRepository.cs

@@ -51,6 +51,10 @@ WHERE 1=1 ");
                     builder.AppendFormat(" AND (A.{0} LIKE @BankName OR A.{1} LIKE @BankName)", nameof(RB_Question_Bank_ViewModel.BankName), nameof(RB_Question_Bank_ViewModel.BankNo));
                     parameters.Add("BankName", "%" + query.BankName.Trim() + "%");
                 }
+                if (query.BankType > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Question_Bank_ViewModel.BankType), (int)query.BankType);
+                }
                 builder.AppendFormat(" ORDER BY A.{0} ASC ", nameof(RB_Question_Bank_ViewModel.BankNo));
                 return GetPage<RB_Question_Bank_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
             }

Edu.Repository/Sell/RB_ReturnMoney_BatchRepository.cs

@@ -24,38 +24,42 @@ namespace Edu.Repository.Sell
         /// <returns></returns>
         public List<RB_ReturnMoney_Batch_ViewModel> GetPageList(int pageIndex, int pageSize, out long count, int type, string month, int groupId)
         {
-            string sql = $@"select IFNULL(SUM(b.CommissionMoeny),0) as TotalEmployee,IFNULL(SUM(c.CommissionMoeny),0) as TotalCustomer,a.FinanceIds,
- IFNULL(SUM(d.CommissionMoeny),0) as TotalInternal,IFNULL(SUM(e.CommissionMoeny),0) as TotalTrans,  a.Id,a.BatchName,TotalMoney,a.CreateBy,a.CreateDate,DATE_FORMAT(a.CreateDate,'%Y-%m-%d %H:%i:%S') as CreateDateStr";
-            sql += $@" from RB_ReturnMoney_Batch a  LEFT JOIN 
- (SELECT SUM(CommissionMoeny) as CommissionMoeny,BatchId FROM rb_order_returncomission  where OrderSourceType=1 and `Status` in(1,2) GROUP BY  OrderSourceType) as b
+            string sql = $@"";
+            sql += $@"  ";
+            sql += " ";
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT IFNULL(SUM(b.CommissionMoeny),0) as TotalEmployee,IFNULL(SUM(c.CommissionMoeny),0) as TotalCustomer,a.FinanceIds
+      ,IFNULL(SUM(d.CommissionMoeny),0) as TotalInternal,IFNULL(SUM(e.CommissionMoeny),0) as TotalTrans
+      ,a.Id,a.BatchName,TotalMoney,a.CreateBy,a.CreateDate,DATE_FORMAT(a.CreateDate,'%Y-%m-%d %H:%i:%S') as CreateDateStr
+FROM RB_ReturnMoney_Batch a  LEFT JOIN 
+   (SELECT SUM(CommissionMoeny) as CommissionMoeny,BatchId FROM rb_order_returncomission  where OrderSourceType=1 and `Status` in(1,2) GROUP BY  OrderSourceType,BatchId) as b
     on a.Id=b.BatchId
-LEFT JOIN 
- (SELECT SUM(CommissionMoeny) as CommissionMoeny,BatchId FROM rb_order_returncomission  where OrderSourceType=2 and `Status` in(1,2) GROUP BY  OrderSourceType) as c
+    LEFT JOIN 
+   (SELECT SUM(CommissionMoeny) as CommissionMoeny,BatchId FROM rb_order_returncomission  where OrderSourceType=2 and `Status` in(1,2) GROUP BY  OrderSourceType,BatchId) as c
     on a.Id=c.BatchId
-LEFT JOIN 
- (SELECT SUM(CommissionMoeny) as CommissionMoeny,BatchId FROM rb_order_returncomission  where OrderSourceType=3 and `Status` in(1,2) GROUP BY  OrderSourceType ) as d
+   LEFT JOIN 
+   (SELECT SUM(CommissionMoeny) as CommissionMoeny,BatchId FROM rb_order_returncomission  where OrderSourceType=3 and `Status` in(1,2) GROUP BY  OrderSourceType,BatchId) as d
     on a.Id=d.BatchId
-LEFT JOIN 
- (SELECT SUM(CommissionMoeny) as CommissionMoeny,BatchId FROM rb_order_returncomission  where OrderSourceType=4 and `Status` in(1,2) GROUP BY  OrderSourceType ) as e
- on a.Id=e.BatchId  ";
-            sql += " where a.GroupId=@gid";
-            DynamicParameters parameters = new DynamicParameters();
-            parameters.Add("gid", groupId);
+   LEFT JOIN 
+   (SELECT SUM(CommissionMoeny) as CommissionMoeny,BatchId FROM rb_order_returncomission  where OrderSourceType=4 and `Status` in(1,2) GROUP BY  OrderSourceType,BatchId) as e
+    on a.Id=e.BatchId 
+WHERE 1=1
+");
+            if (groupId > 0)
+            {
+                builder.AppendFormat(" AND a.GroupId={0} ", groupId);
+            }
             if (!string.IsNullOrEmpty(month)) 
             {
-                sql += " and DATE_FORMAT(a.CreateDate,'%Y-%m')=@month";
-                parameters.Add("month", month);
+                builder.AppendFormat(" AND DATE_FORMAT(a.CreateDate,'%Y-%m')=DATE_FORMAT('{0}-01','%Y-%m')", month);
             }
-
             if (type != 0)
             {
-                sql += " and a.CommissionType=@type";
-                parameters.Add("type", type);
+                builder.AppendFormat(" and a.CommissionType={0} ", type);
             }
-
-            sql += " order by a.CreateDate desc";
-
-            return GetPage<RB_ReturnMoney_Batch_ViewModel>(pageIndex, pageSize, out count, sql, parameters).ToList();
+            builder.Append(" order by a.CreateDate desc ");
+            return GetPage<RB_ReturnMoney_Batch_ViewModel>(pageIndex, pageSize, out count, builder.ToString()).ToList();
         }
 
         /// <summary>