modify

Helius

2021-01-15 61073b1c849656e9a3e8097ffe3e658cc72946b6

 zq-erp/src/main/java/com/matrix/system/app/action/ApiStatisticsAction.java

@@ -15,10 +15,7 @@
import com.matrix.system.hive.bean.SysBusinessData;
import com.matrix.system.hive.dao.SysBusinessDataDao;
import com.matrix.system.hive.service.imp.DataAnalysisCustomerServiceImpl;
import com.matrix.system.hiveErp.analysUtil.Caculate;
import com.matrix.system.hiveErp.analysUtil.SeriesVo;
import com.matrix.system.hiveErp.analysUtil.StatisticsParamVo;
import com.matrix.system.hiveErp.analysUtil.StatisticsTimeDaoParam;
import com.matrix.system.hiveErp.analysUtil.*;
import com.matrix.system.hiveErp.dao.TjVipSumDao;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -29,10 +26,7 @@
import org.springframework.web.bind.annotation.*;

import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;

/**
 * @author wzy
@@ -58,23 +52,21 @@
    })
    @PostMapping(value = "/findShopBusinessesData")
    public AjaxResult findShopBusinessesData(@RequestBody BusinessesDto businessesDto) {
        SysBusinessData sysBusinessData = new SysBusinessData();
        // 若shopId为空，则查询门店经营报表
        if (businessesDto.getShopId() == null) {
            sysBusinessData.setShopId(businessesDto.getShopId());
        }
        QueryUtil.setQueryLimitCom(sysBusinessData);

        String unit = "";
        if (BusinessesDto.DAY.equals(businessesDto.getType())) {
            sysBusinessData.setT1("%Y-%m-%d");
            unit = "日";
        } else {
            sysBusinessData.setT1("%Y-%m");
            unit = "月";
        }
        PaginationVO pageVo = new PaginationVO();
        pageVo.setOffset((businessesDto.getPageNum() - 1) * businessesDto.getPageSize());
        pageVo.setLimit(businessesDto.getPageSize());

        return AjaxResult.buildSuccessInstance(sysBusinessDataDao.selectApiBusinessDataInPage(sysBusinessData, pageVo), sysBusinessDataDao.selectApiBusinessDataTotal(sysBusinessData));
        //        PaginationVO pageVo = new PaginationVO();
//        pageVo.setOffset((businessesDto.getPageNum() - 1) * businessesDto.getPageSize());
//        pageVo.setLimit(businessesDto.getPageSize());
        Calendar calendar = Calendar.getInstance();
        Date now = calendar.getTime();
        List<Date> xAxis = StatisticsTimeUtil.getTimeSpace("2021-01-13", "2021-01-13", unit);
        List<StatisticsTimeDaoParam> timeSpaceParam = StatisticsTimeUtil.buidParam(xAxis);
        return AjaxResult.buildSuccessInstance("123");
    }

    @ApiOperation(value = "专项", notes = "专项")
@@ -219,4 +211,14 @@
        return setDataList(ajaxResult);
    }

    @ApiOperation(value = "测试", notes = "测试")
    @GetMapping(value = "/findTestData")
    public AjaxResult findTestData() {
        List<Date> xAxis = StatisticsTimeUtil.getTimeSpace("2021-01-13", "2021-01-13", "日");

        List<StatisticsTimeDaoParam> timeSpaceParam = StatisticsTimeUtil.buidParam(xAxis);
//        List<BusinessesDataShowVo> businessesDataShowVo = sysBusinessDataDao.selectDemo2();
        List<BusinessesDataShowVo> map = sysBusinessDataDao.selectDemo(timeSpaceParam, 34L, 17L);
        return AjaxResult.buildSuccessInstance(map);
    }
}