11/21

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyService.java

@@ -415,28 +415,26 @@ public class ProjectDailyService extends ServiceImpl<ProjectDailyMapper, Project
     public ResultBean<Map<String,Object>> getProjectDailyZx(ProjectDailyQuery query) {
         ResultBean rb=new ResultBean().fail();
         Map<String,Object> m=new HashMap<>();
-        ProjectDailyQuery params = query;
+//        ProjectDailyQuery params = query;
         QueryWrapper<ProjectDaily> qw = new QueryWrapper<>();
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         String startDate="";
-        if(com.yxt.common.base.utils.StringUtils.isBlank(params.getOrderDate())){
+        if(com.yxt.common.base.utils.StringUtils.isBlank(query.getOrderDate())){
             startDate=sdf.format(DateUtil.yesterday());
         }else{
-            startDate=params.getOrderDate();
+            startDate=query.getOrderDate();
         }
-        String EndDate=sdf.format(DateUtil.offsetDay(DateUtil.parse(startDate),-Integer.parseInt(params.getIntervalTime())+1));
+        String EndDate=sdf.format(DateUtil.offsetDay(DateUtil.parse(startDate),-Integer.parseInt(query.getIntervalTime())+1));
         long i=DateUtil.between(DateUtil.parse(startDate),DateUtil.parse(EndDate), DateUnit.DAY);
-        if (params != null) {
         if (com.yxt.common.base.utils.StringUtils.isNotBlank(startDate)) {
                 qw.le("STR_TO_DATE(orderDate,'%Y-%m-%d')",startDate);
             }
         if (com.yxt.common.base.utils.StringUtils.isNotBlank(EndDate)) {
                 qw.ge("STR_TO_DATE(orderDate,'%Y-%m-%d')",EndDate);
             }
-            if (com.yxt.common.base.utils.StringUtils.isNotBlank(params.getProjectSid())) {
-                qw.eq("projectSid", params.getProjectSid());
-            }
+        if (com.yxt.common.base.utils.StringUtils.isNotBlank(query.getProjectSid())) {
+                qw.eq("projectSid", query.getProjectSid());
             }
         List<ProjectDailyVos> projectDailyVos=baseMapper.getProjectDailys(qw);
         List<String> a=new ArrayList<>();