修改营业报表查询条件

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/controller/XfConsumeDetailController.java

@@ -19,6 +19,7 @@ import org.dromara.backstage.consumption.service.IXfConsumeDetailService;
 import org.dromara.common.core.config.DefaultConfig;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.core.utils.DateUtils;
+import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.core.utils.pdf.PdfUtil;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
@@ -191,17 +192,8 @@ public class XfConsumeDetailController extends BaseController {
         String makeTime = DateUtils.getTime();
         // 查询时间范围
         String queryTime = beginDate + "至" + endDate;
-        String fileName = "_营业报表_" + DateUtils.dateTimeNow() + ".pdf";
-        if(DateUtils.YYYY.equals(dateFormat)){
-            // 查询年份的最后一天
-            queryTime = beginDate +" 01-01" + "~" + DateUtils.lastDayOfYear(Integer.parseInt(endDate));
-            fileName = endDate + "年"+ fileName;
-        }else if(DateUtils.YYYY_MM.equals(dateFormat)){
-            String year = endDate.split("-")[0];
-            String month = endDate.split("-")[1];
-            queryTime = beginDate +"-01" + "~" + DateUtils.lastDayOfMonth(Integer.parseInt(year), Integer.parseInt(month));
-            fileName = endDate + "年"+ month+"月" +fileName;
-        }
+        String fileName = "_营业报表.pdf";
+
         Map<String, Object> hashMap = new HashMap<>();
         hashMap.put("useUint", useUint);
         hashMap.put("makeMan", makeMan);