页面修改

Edu.Repository/Customer/RB_Customer_FinishtaskRepository.cs

@@ -28,8 +28,8 @@ namespace Edu.Repository.Customer
             builder.AppendFormat(@" 
 SELECT A.*,B.TaskKudo,B.TaskKudoImg,B.KudoDescription,C.CustomerName,D.TaskName
 FROM RB_Customer_Finishtask AS A INNER JOIN rb_taskdetails AS B  ON A.TaskId=B.TaskId AND A.DetailsId=B.DetailId
-     LEFT JOIN rb_customer AS C ON A.CustomerId=C.CustomerId
-     LEFT JOIN rb_task AS D ON A.TaskId=D.Id
+     INNER JOIN rb_customer AS C ON A.CustomerId=C.CustomerId
+     INNER JOIN rb_task AS D ON A.TaskId=D.Id
 WHERE 1=1
 ");
             builder.Append(" AND A.ExchangeStatus>0 ");
@@ -62,7 +62,13 @@ WHERE 1=1
                 }
                 if (query.ExchangeStatus > 0)
                 {
-                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Customer_Finishtask_Extend.ExchangeStatus), query.ExchangeStatus);
+                    if (query.ExchangeStatus <= 2)
+                    {
+                        builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Customer_Finishtask_Extend.ExchangeStatus), query.ExchangeStatus);
+                    }
+                    else {
+                        builder.AppendFormat("  AND D.ExchangeEndTime>'{0}' ", Common.ConvertHelper.FormatDate(DateTime.Now));
+                    }
                 }
                 if (!string.IsNullOrEmpty(query.TaskName))
                 {