仓租明细汇总报表开始结束日期判断条件修改

Code/LQKJ.K3.CZXT.Pluglus/Executetheplan.cs

@@ -100,16 +100,6 @@ namespace LQKJ.K3.CZXT.Pluglus
                 filterObj["BeginDate"] = Convert.ToDateTime(F_LQKJ_StartDate);
                 filterObj["EndDate"] = Convert.ToDateTime(F_LQKJ_StartDate);
             }
-            //AppServiceContext.DBService.LoadReferenceObject(ctx, new DynamicObject[] { filterObj }, det, false);
-
-            //IRptParams p = new RptParams();
-            //p.FormId = reportFilterMetadata.BusinessInfo.GetForm().Id;
-            //p.CurrentPosition = currentPosition;//分页账表当前位置
-            //p.StartRow = 1;
-            //p.EndRow = int.MaxValue;
-            //p.FilterParameter = filter;
-            //p.FilterFieldInfo = model.FilterFieldInfo;
-            //p.BaseDataTempTable.AddRange(permissionService.GetBaseDataTempTable(ctx, reportMetadata.BusinessInfo.GetForm().Id));
             IRptParams rptParam = new RptParams();
             rptParam.FormId = reportFilterMetadata.BusinessInfo.GetForm().Id;
             rptParam.CurrentPosition = currentPosition;//分页账表当前位置

Code/LQKJ.K3.CZXT.Pluglus/WarehouseRentReport.cs

@@ -149,7 +149,7 @@ namespace LQKJ.K3.CZXT.Pluglus
             //日期
             //F_LQKJ_StartDate = (customFilter["F_LQKJ_StartDate"] == null) ? string.Empty : Convert.ToDateTime(customFilter["F_LQKJ_StartDate"]).ToString("yyyy-MM-dd");
             //F_LQKJ_EndDate = (customFilter["F_LQKJ_EndDate"] == null) ? string.Empty : Convert.ToDateTime(customFilter["F_LQKJ_EndDate"]).ToString("yyyy-MM-dd");
-            if (!string.IsNullOrWhiteSpace(F_LQKJ_StartDate) && !string.IsNullOrWhiteSpace(F_LQKJ_EndDate))
+            if (!string.IsNullOrWhiteSpace(F_LQKJ_StartDate) || !string.IsNullOrWhiteSpace(F_LQKJ_EndDate))
             { 
                 strwhere.AppendLine(string.Format(" AND T1.FDate>='{0}' AND T1.FDate<='{1}' ", F_LQKJ_StartDate, F_LQKJ_EndDate)); 
             }

Code/LQKJ.K3.CZXT.Pluglus/Warehouserent_MXBB.cs

@@ -119,7 +119,10 @@ namespace LQKJ.K3.CZXT.Pluglus
                 F_LQKJ_StartDate = OpenParameter["data"].ToString();
                 F_LQKJ_EndDate = OpenParameter["data"].ToString();
             }
-            strwhere.AppendLine(string.Format(" AND T1.FDate>='{0}' AND T1.FDate<='{1}' ", F_LQKJ_StartDate, F_LQKJ_EndDate));
+            if(!string.IsNullOrWhiteSpace(F_LQKJ_StartDate) || !string.IsNullOrWhiteSpace(F_LQKJ_EndDate))
+            {
+                strwhere.AppendLine(string.Format(" AND T1.FDate>='{0}' AND T1.FDate<='{1}' ", F_LQKJ_StartDate, F_LQKJ_EndDate));
+            }
 
             //仓库
             string Stoc = this.GetBaseDataNameValue(customFilter["F_LQKJ_Stocks"] as DynamicObjectCollection);