|
|
@@ -719,8 +719,8 @@ public class TXinyiCarbonMajorServiceImpl implements ITXinyiCarbonMajorService
|
|
|
//最近7个月的数据集合
|
|
|
TXinyiCarbonMajor tXinyiCarbonMajorReq = new TXinyiCarbonMajor();
|
|
|
String timeEnd = DateUtils.parseDateToStr(DateUtils.YYYY_MM, DateUtils.getNowDate());
|
|
|
- tXinyiCarbonMajorReq.setTimeBegin(DateUtils.getMonthsBefore(timeEnd, INT_6));
|
|
|
- tXinyiCarbonMajorReq.setTimeEnd(timeEnd);
|
|
|
+ tXinyiCarbonMajorReq.setHsTimeBegin(DateUtils.getMonthsBefore(timeEnd, INT_6));
|
|
|
+ tXinyiCarbonMajorReq.setHsTimeEnd(timeEnd);
|
|
|
List<TXinyiCarbonMajor> tXinyiCarbonMajorList = this.tXinyiCarbonMajorMapper.selectTXinyiCarbonMajorList(tXinyiCarbonMajorReq);
|
|
|
List<ChartBasic> recent7PflDatas = new ArrayList<>();
|
|
|
if(!CollectionUtils.isEmpty(tXinyiCarbonMajorList)){
|
