|
@@ -252,17 +252,17 @@ public class BiInfoController {
|
|
int inCount = tranCarInfoService.selectCount(new EntityWrapper<TranCarInfo>()
|
|
int inCount = tranCarInfoService.selectCount(new EntityWrapper<TranCarInfo>()
|
|
.eq("status_flag", "3")
|
|
.eq("status_flag", "3")
|
|
.eq("comp_id", companyId)
|
|
.eq("comp_id", companyId)
|
|
- .eq("update_date", DateUtil.formatDate(new Date(), DateUtils.DATE_FMT_YYYY_MM_DD)));
|
|
|
|
|
|
+ .ge("update_date", DateUtil.formatDate(new Date(), DateUtils.DATE_FMT_YYYY_MM_DD)));
|
|
//今日在途
|
|
//今日在途
|
|
int inAfterCount = tranCarInfoService.selectCount(new EntityWrapper<TranCarInfo>()
|
|
int inAfterCount = tranCarInfoService.selectCount(new EntityWrapper<TranCarInfo>()
|
|
.eq("status_flag", "3")
|
|
.eq("status_flag", "3")
|
|
.eq("comp_id", companyId)
|
|
.eq("comp_id", companyId)
|
|
.lt("update_date", DateUtil.formatDate(new Date(), DateUtils.DATE_FMT_YYYY_MM_DD)));
|
|
.lt("update_date", DateUtil.formatDate(new Date(), DateUtils.DATE_FMT_YYYY_MM_DD)));
|
|
- //今日在途
|
|
|
|
|
|
+ //今日卸车
|
|
int outCount = tranCarInfoService.selectCount(new EntityWrapper<TranCarInfo>()
|
|
int outCount = tranCarInfoService.selectCount(new EntityWrapper<TranCarInfo>()
|
|
.eq("status_flag", "5")
|
|
.eq("status_flag", "5")
|
|
.eq("comp_id", companyId)
|
|
.eq("comp_id", companyId)
|
|
- .eq("update_date", DateUtil.formatDate(new Date(), DateUtils.DATE_FMT_YYYY_MM_DD)));
|
|
|
|
|
|
+ .ge("update_date", DateUtil.formatDate(new Date(), DateUtils.DATE_FMT_YYYY_MM_DD)));
|
|
BiViewInfo biViewInfo = new BiViewInfo();
|
|
BiViewInfo biViewInfo = new BiViewInfo();
|
|
BiViewInfo biViewInfo1 = new BiViewInfo();
|
|
BiViewInfo biViewInfo1 = new BiViewInfo();
|
|
BiViewInfo biViewInfo2 = new BiViewInfo();
|
|
BiViewInfo biViewInfo2 = new BiViewInfo();
|
|
@@ -271,7 +271,7 @@ public class BiInfoController {
|
|
biViewInfo1.setName("在途车辆");
|
|
biViewInfo1.setName("在途车辆");
|
|
biViewInfo1.setCount(String.valueOf(inCount + inAfterCount));
|
|
biViewInfo1.setCount(String.valueOf(inCount + inAfterCount));
|
|
biViewInfo2.setName("装货车辆");
|
|
biViewInfo2.setName("装货车辆");
|
|
- biViewInfo2.setCount(String.valueOf(inAfterCount));
|
|
|
|
|
|
+ biViewInfo2.setCount(String.valueOf(inCount));
|
|
biViewInfo3.setName("卸货车辆");
|
|
biViewInfo3.setName("卸货车辆");
|
|
biViewInfo3.setCount(String.valueOf(outCount));
|
|
biViewInfo3.setCount(String.valueOf(outCount));
|
|
biViewInfoList.add(biViewInfo1);
|
|
biViewInfoList.add(biViewInfo1);
|