|
|
|
@@ -142,7 +142,7 @@ public class WxMerchantTradeDailyController extends BaseController { |
|
|
|
List<WxMerchantTradeDaily> resultList = pageInfo.getList(); |
|
|
|
// 判断第1条是否是当天 |
|
|
|
if(CollectionUtils.isNotEmpty(resultList)){ |
|
|
|
if(sd.format(resultList.get(0).getReportDate()).equals(sd.format(new Date()))){ |
|
|
|
if(sd.parse(resultList.get(0).getReportDate()).equals(sd.format(new Date()))){ |
|
|
|
resultList.get(0).setIsToday(1); |
|
|
|
} |
|
|
|
} |
|
|
|
|