|
@@ -86,13 +86,13 @@ public class MaterialReportServiceImpl implements IMaterialReportService {
|
|
marketJsonList = materialReportMapper.selectByMap(paramsMap);
|
|
marketJsonList = materialReportMapper.selectByMap(paramsMap);
|
|
|
|
|
|
} else if (type == 3) {
|
|
} else if (type == 3) {
|
|
- String endDate = DateUtils.getAnotherDay("yyyy-MM-dd", anotherDay, -7);
|
|
|
|
|
|
+ String endDate = DateUtils.getAnotherDay("yyyy-MM-dd", anotherDay, -6);
|
|
paramsMap.put("startDate", anotherDay);
|
|
paramsMap.put("startDate", anotherDay);
|
|
paramsMap.put("endDate", endDate);
|
|
paramsMap.put("endDate", endDate);
|
|
marketJsonList = materialReportMapper.selectDailyByMap(paramsMap);
|
|
marketJsonList = materialReportMapper.selectDailyByMap(paramsMap);
|
|
|
|
|
|
} else if (type == 4) {
|
|
} else if (type == 4) {
|
|
- String endDate = DateUtils.getAnotherDay("yyyy-MM-dd", anotherDay, -15);
|
|
|
|
|
|
+ String endDate = DateUtils.getAnotherDay("yyyy-MM-dd", anotherDay, -14);
|
|
paramsMap.put("startDate", anotherDay);
|
|
paramsMap.put("startDate", anotherDay);
|
|
paramsMap.put("endDate", endDate);
|
|
paramsMap.put("endDate", endDate);
|
|
marketJsonList = materialReportMapper.selectDailyByMap(paramsMap);
|
|
marketJsonList = materialReportMapper.selectDailyByMap(paramsMap);
|
|
@@ -190,25 +190,25 @@ public class MaterialReportServiceImpl implements IMaterialReportService {
|
|
|
|
|
|
} else if (type == 3) {
|
|
} else if (type == 3) {
|
|
// 近一周数据
|
|
// 近一周数据
|
|
- contrastStartDate = DateUtils.getAnotherDay("yyyy-MM-dd", anotherDay, -7);
|
|
|
|
|
|
+ contrastStartDate = DateUtils.getAnotherDay("yyyy-MM-dd", anotherDay, -6);
|
|
paramsMap.put("startDate", contrastStartDate);
|
|
paramsMap.put("startDate", contrastStartDate);
|
|
paramsMap.put("endDate", anotherDay);
|
|
paramsMap.put("endDate", anotherDay);
|
|
contrastJson = materialReportMapper.selectDailyChainRatioByMap(paramsMap);
|
|
contrastJson = materialReportMapper.selectDailyChainRatioByMap(paramsMap);
|
|
if (!Check.isNull(contrastJson)) {
|
|
if (!Check.isNull(contrastJson)) {
|
|
beContrastEndDate = DateUtils.getAnotherDay("yyyy-MM-dd", contrastStartDate, -1);
|
|
beContrastEndDate = DateUtils.getAnotherDay("yyyy-MM-dd", contrastStartDate, -1);
|
|
- beContrastStartDate = DateUtils.getAnotherDay("yyyy-MM-dd", beContrastEndDate, -7);
|
|
|
|
|
|
+ beContrastStartDate = DateUtils.getAnotherDay("yyyy-MM-dd", beContrastEndDate, -6);
|
|
paramsMap.put("endDate", beContrastEndDate);
|
|
paramsMap.put("endDate", beContrastEndDate);
|
|
paramsMap.put("startDate", beContrastStartDate);
|
|
paramsMap.put("startDate", beContrastStartDate);
|
|
beContrastJson = materialReportMapper.selectDailyChainRatioByMap(paramsMap);
|
|
beContrastJson = materialReportMapper.selectDailyChainRatioByMap(paramsMap);
|
|
}
|
|
}
|
|
} else if (type == 4) {
|
|
} else if (type == 4) {
|
|
- contrastStartDate = DateUtils.getAnotherDay("yyyy-MM-dd", anotherDay, -15);
|
|
|
|
|
|
+ contrastStartDate = DateUtils.getAnotherDay("yyyy-MM-dd", anotherDay, -14);
|
|
paramsMap.put("startDate", contrastStartDate);
|
|
paramsMap.put("startDate", contrastStartDate);
|
|
paramsMap.put("endDate", anotherDay);
|
|
paramsMap.put("endDate", anotherDay);
|
|
contrastJson = materialReportMapper.selectDailyChainRatioByMap(paramsMap);
|
|
contrastJson = materialReportMapper.selectDailyChainRatioByMap(paramsMap);
|
|
if (!Check.isNull(contrastJson)) {
|
|
if (!Check.isNull(contrastJson)) {
|
|
beContrastEndDate = DateUtils.getAnotherDay("yyyy-MM-dd", contrastStartDate, -1);
|
|
beContrastEndDate = DateUtils.getAnotherDay("yyyy-MM-dd", contrastStartDate, -1);
|
|
- beContrastStartDate = DateUtils.getAnotherDay("yyyy-MM-dd", beContrastEndDate, -15);
|
|
|
|
|
|
+ beContrastStartDate = DateUtils.getAnotherDay("yyyy-MM-dd", beContrastEndDate, -14);
|
|
paramsMap.put("endDate", beContrastEndDate);
|
|
paramsMap.put("endDate", beContrastEndDate);
|
|
paramsMap.put("startDate", beContrastStartDate);
|
|
paramsMap.put("startDate", beContrastStartDate);
|
|
beContrastJson = materialReportMapper.selectDailyChainRatioByMap(paramsMap);
|
|
beContrastJson = materialReportMapper.selectDailyChainRatioByMap(paramsMap);
|
|
@@ -480,12 +480,12 @@ public class MaterialReportServiceImpl implements IMaterialReportService {
|
|
paramsMap.put("endDate", anotherDay);
|
|
paramsMap.put("endDate", anotherDay);
|
|
marketJsonList = materialReportMapper.selectDayMaterialList(paramsMap);
|
|
marketJsonList = materialReportMapper.selectDayMaterialList(paramsMap);
|
|
} else if (type == 3) {
|
|
} else if (type == 3) {
|
|
- String startDate = DateUtils.getAnotherDay("yyyy-MM-dd", anotherDay, -7);
|
|
|
|
|
|
+ String startDate = DateUtils.getAnotherDay("yyyy-MM-dd", anotherDay, -6);
|
|
paramsMap.put("startDate", startDate);
|
|
paramsMap.put("startDate", startDate);
|
|
paramsMap.put("endDate", anotherDay);
|
|
paramsMap.put("endDate", anotherDay);
|
|
marketJsonList = materialReportMapper.selectDayMaterialList(paramsMap);
|
|
marketJsonList = materialReportMapper.selectDayMaterialList(paramsMap);
|
|
} else if (type == 4) {
|
|
} else if (type == 4) {
|
|
- String startDate = DateUtils.getAnotherDay("yyyy-MM-dd", anotherDay, -15);
|
|
|
|
|
|
+ String startDate = DateUtils.getAnotherDay("yyyy-MM-dd", anotherDay, -14);
|
|
paramsMap.put("startDate", startDate);
|
|
paramsMap.put("startDate", startDate);
|
|
paramsMap.put("endDate", anotherDay);
|
|
paramsMap.put("endDate", anotherDay);
|
|
marketJsonList = materialReportMapper.selectDayMaterialList(paramsMap);
|
|
marketJsonList = materialReportMapper.selectDayMaterialList(paramsMap);
|