From e9a48b3968947dbd072325cf3a61df5e34542143 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 26 三月 2025 17:43:32 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 174 ++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 139 insertions(+), 35 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
index 5a06a00..c9d09d6 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
@@ -91,6 +91,8 @@
private PlatformGroupMapper platformGroupMapper;
@Autowired
private TmsService tmsService;
+ @Autowired
+ private PlatformDeviceMapper platformDeviceMapper;
@Value("${debug_model}")
private Boolean isDebug;
@@ -132,6 +134,7 @@
.select(PlatformJob::getTotalNum)
.eq(PlatformJob::getIsdeleted,Constants.ZERO)
.eq(PlatformJob::getOrigin,Constants.ONE)
+ .in(PlatformJob::getType,new Integer[]{0,2,4})
.in(PlatformJob::getStatus, Constants.PlatformJobStatus.DONE.getKey()
, Constants.PlatformJobStatus.AUTHED_LEAVE.getKey()
, Constants.PlatformJobStatus.LEAVED.getKey())
@@ -148,6 +151,7 @@
List<PlatformJob> jobs = platformJobMapper.selectList (new MPJLambdaWrapper<PlatformJob>()
.select(PlatformJob::getTotalNum)
.eq(PlatformJob::getIsdeleted,Constants.ZERO)
+ .eq(PlatformJob::getOrigin,Constants.ZERO)
.eq(PlatformJob::getPlatformGroupId,platformGroupId)
.apply("to_days(done_date) = to_days(now())")
.in(PlatformJob::getStatus, Constants.PlatformJobStatus.DONE.getKey()
@@ -801,11 +805,13 @@
.selectAll(PlatformJob.class)
.eq(PlatformJob::getIsdeleted,Constants.ZERO)
.eq(PlatformJob::getCarCodeFront,param.getCarCode())
- .in(PlatformJob::getStatus,
+ .notIn(PlatformJob::getStatus,
Constants.PlatformJobStatus.DONE.getKey(),
Constants.PlatformJobStatus.LEAVED.getKey(),
Constants.PlatformJobStatus.AUTHED_LEAVE.getKey(),
- Constants.PlatformJobStatus.CALLED.getKey())
+ Constants.PlatformJobStatus.CANCEL.getKey()
+ )
+ .orderByAsc(PlatformJob::getId)
.last("limit 1"));
dealJobDetailAndContractBiz(job,data);
@@ -944,15 +950,17 @@
Date lastMonth = DateUtil.addMonthToDate(month,-1);//涓婃湀
Date year = Utils.Date.getStart(new Date());//浠婂勾
Date lastYear = DateUtil.addYearToDate(year,-1);//鍘诲勾
-
List<PlatformJob> monthNum = platformJobMapper.selectJoinList(PlatformJob.class,
new MPJLambdaWrapper<PlatformJob>()
.selectAs(PlatformJob::getId,PlatformJob::getId)
- .select(PlatformJob::getType,PlatformJob::getType)
+ .select(PlatformJob::getType,PlatformJob::getType)
.select(PlatformJob::getTotalNum,PlatformJob::getTotalNum)
.select(PlatformJob::getStatus,PlatformJob::getStatus)
.eq(PlatformJob::getIsdeleted,Constants.ZERO)
- .in(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE.getKey(),Constants.PlatformJobStatus.LEAVED.getKey(),Constants.PlatformJobStatus.AUTHED_LEAVE.getKey())
+ .in(PlatformJob::getType,Constants.ONE,Constants.THREE)
+ .in(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE.getKey(),
+ Constants.PlatformJobStatus.LEAVED.getKey(),
+ Constants.PlatformJobStatus.AUTHED_LEAVE.getKey())
.apply("year(done_date) = year('"+DateUtil.getPlusTime2(month)+"') and month(done_date) = month('"+DateUtil.getPlusTime2(month)+"') "));
List<PlatformJob> monthLastNum = platformJobMapper.selectJoinList(PlatformJob.class,
new MPJLambdaWrapper<PlatformJob>()
@@ -1109,7 +1117,7 @@
return r;
}
- private BigDecimal getSumTotalByList(List<PlatformJob> list,Integer type,Integer status) {
+ private BigDecimal getSumTotalByList(List<PlatformJob> list,Integer type,Integer status) {
BigDecimal r = new BigDecimal(0);
if(list==null || list.size() == 0){
return r;
@@ -1234,7 +1242,6 @@
@Override
public YearDeviceDataVO yearFightingAdminDeviceData(){
YearDeviceDataVO data = new YearDeviceDataVO();
-
FireStatisticRequest param = new FireStatisticRequest();
param.setIndexCode("api_fire_statistic");
BaseResponse<FireStatisticResponse> response = HKService.fireStatistic(param);
@@ -1242,7 +1249,6 @@
data.setProtectNum(Constants.formatIntegerNum(response.getData().getMaintenanceNum()));
data.setPlanProtectTotal(Constants.formatIntegerNum(response.getData().getDeviceTotalNum()));
}
-
param = new FireStatisticRequest();
param.setIndexCode("api_fire_statistic_month");
BaseResponse<FireStatisticResponse> response1 = HKService.fireStatisticMonth(param);
@@ -1252,7 +1258,6 @@
data.setMonthTotalNum(Constants.formatIntegerNum(response1.getData().getDeviceTotalNum()));
}
return data;
-
}
/**
@@ -1263,7 +1268,37 @@
public FightingAdminCenterDataVO centerFightingAdminData(){
FightingAdminCenterDataVO data = new FightingAdminCenterDataVO();
List<DeviceNumByTypeVO> list = new ArrayList<>();
- FireDevStatusTotalRequest param = new FireDevStatusTotalRequest();
+ FindDeviceStatisticsRequest param1 = new FindDeviceStatisticsRequest();
+ param1.setRegionIndexCode("root000000");
+ BaseResponse<List<FindDeviceStatisticsResponse>> response = HKService.findDeviceStatistics(param1);
+ if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) && response.getData()!=null ){
+ for(FindDeviceStatisticsResponse r :response.getData()){
+ if(r.getDevices()!=null){
+ for(FindDeviceStatisticsInfoResponse td : r.getDevices()){
+ DeviceNumByTypeVO t = new DeviceNumByTypeVO();
+ t.setTypeName(td.getDeviceName());
+ //灞忚斀鏁�
+ t.setShieldDeviceNum(Constants.formatIntegerNum(t.getShieldDeviceNum() )+ Constants.formatIntegerNum(td.getShieldSensorCount()));
+ //鎶ヨ鏁�
+ t.setAlarmDeviceNum(Constants.formatIntegerNum(t.getAlarmDeviceNum())+ Constants.formatIntegerNum(td.getAlarmSensorCount()));
+ //姝ｅ父鏁�
+ t.setOnlineDeviceNum(Constants.formatIntegerNum(t.getOnlineDeviceNum())+Constants.formatIntegerNum(td.getNormalSensorCount()));
+ //鏁呴殰鏁�
+ t.setErrDeviceNum(Constants.formatIntegerNum(t.getErrDeviceNum())+ Constants.formatIntegerNum(td.getFaultSensorCount()));
+ //鎬昏澶囨暟
+ t.setTotalDeviceNum(Constants.formatIntegerNum(t.getTotalDeviceNum())+ Constants.formatIntegerNum(td.getTotalSensorCount()));
+ list.add(t);
+// data.setOfflineDeviceNum(Constants.formatIntegerNum( data.getOfflineDeviceNum())+Constants.formatIntegerNum(t.getOfflineDeviceNum()));
+ data.setShieldDeviceNum(Constants.formatIntegerNum( data.getShieldDeviceNum())+Constants.formatIntegerNum(t.getShieldDeviceNum()));
+ data.setAlarmDeviceNum(Constants.formatIntegerNum( data.getAlarmDeviceNum())+Constants.formatIntegerNum(t.getAlarmDeviceNum()));
+ data.setOnlineDeviceNum(Constants.formatIntegerNum( data.getOnlineDeviceNum())+Constants.formatIntegerNum(t.getOnlineDeviceNum()));
+ data.setErrDeviceNum(Constants.formatIntegerNum( data.getErrDeviceNum())+Constants.formatIntegerNum(t.getErrDeviceNum()));
+ data.setTotalDeviceNum(Constants.formatIntegerNum( data.getTotalDeviceNum())+Constants.formatIntegerNum(t.getTotalDeviceNum()));
+ }
+ }
+ }
+ }
+ /* FireDevStatusTotalRequest param = new FireDevStatusTotalRequest();
param.setIncludeBool(1);
param.setRegionIds(new String[]{"root000000"});
BaseResponse<List<FireDevStatusListResponse>> response = HKService.getFireDevStatusList(param);
@@ -1283,7 +1318,7 @@
data.setErrDeviceNum(Constants.formatIntegerNum( data.getErrDeviceNum())+Constants.formatIntegerNum(r.getFaultFireDevCount()));
data.setTotalDeviceNum(Constants.formatIntegerNum( data.getTotalDeviceNum())+Constants.formatIntegerNum(r.getTotalFireDevCount()));
}
- }
+ }*/
data.setDeviceTypeList(list);
Long totalNum =hiddenDangerMapper.selectCount(new QueryWrapper<HiddenDanger>().lambda()
.eq(HiddenDanger::getIsdeleted,Constants.ZERO )
@@ -1711,11 +1746,11 @@
.eq(Visits::getIsdeleted,Constants.ZERO)
.apply("to_days(create_date)=to_days(now())")
.in(Visits::getStatus,Constants.VisitStatus.pass,Constants.VisitStatus.xfSuccess )));//寰呰闂�
- result.setWaitVisitNum(visitsJoinMapper.selectCount(new MPJLambdaWrapper<Visits>()
+ result.setRegisterVisitNum(visitsJoinMapper.selectCount(new MPJLambdaWrapper<Visits>()
.eq(Visits::getIsdeleted,Constants.ZERO)
.apply("to_days(create_date)=to_days(now())")
.in(Visits::getStatus,Constants.VisitStatus.signout,Constants.VisitStatus.signin )));//宸茬櫥璁�
- result.setWaitVisitNum(visitsJoinMapper.selectCount(new MPJLambdaWrapper<Visits>()
+ result.setLevelNum(visitsJoinMapper.selectCount(new MPJLambdaWrapper<Visits>()
.eq(Visits::getIsdeleted,Constants.ZERO)
.apply("to_days(create_date)=to_days(now())")
.in(Visits::getStatus,Constants.VisitStatus.signout )));//宸茬绂�
@@ -1763,6 +1798,7 @@
result.getVisitRetentionDataList().add(t);
});
}
+ result.setRetentionNum(result.getVisitRetentionDataList().size());
return result;
}
@@ -1776,6 +1812,7 @@
.selectAll(Retention.class)
.selectAs(Company::getType,Retention::getCompanyType)
.leftJoin(Company.class,Company::getId,Retention::getCompanyId)
+ .eq(Retention::getIsdeleted,Constants.ZERO)
);
//浠婃棩鍦ㄥ洯浜烘暟
@@ -1874,6 +1911,10 @@
.orderByDesc(PlatformJob::getStatus )
.orderByAsc(PlatformJob::getId )
);
+ List<PlatformDevice> platformDevices = platformDeviceMapper.selectList(new QueryWrapper<PlatformDevice>().lambda().eq(PlatformDevice::getType,Constants.ONE)
+ .eq(PlatformDevice::getIsdeleted,Constants.ZERO).isNotNull(PlatformDevice::getDeviceId));
+
+ String videoUrl = getVideoUrl();
//鏈堝彴鐘舵�侊細0=浣滀笟涓紱1=绌洪棽涓紱2=浣滀笟瓒呮椂;3=鍙彿
for(Platform model : platformList){
PlatformWorkDataVO platformDurationVO = new PlatformWorkDataVO();
@@ -1881,6 +1922,13 @@
platformDurationVO.setPlatformId(model.getId());
platformDurationVO.setPlatformCode(model.getCode());
platformDurationVO.setPlatformSort(model.getSortnum());
+ if(CollectionUtils.isNotEmpty(platformDevices)){
+ List<PlatformDevice> deviceList = platformDevices.stream().filter(i->Constants.equalsInteger(i.getPlatformId(),model.getId())).collect(Collectors.toList());
+ if (CollectionUtils.isNotEmpty(deviceList)) {
+ platformDurationVO.setDeviceId(deviceList.get(Constants.ZERO).getDeviceId());
+ platformDurationVO.setVideoPluginUrl(videoUrl);
+ }
+ }
PlatformJob job = getJobFromListById(model.getId(),jobList);
if(job != null){
if(Constants.equalsInteger(job.getType(),Constants.ONE) || Constants.equalsInteger(job.getType(),Constants.THREE)){
@@ -1888,9 +1936,13 @@
}else{
platformDurationVO.setWorkType(Constants.ZERO);//濡傛灉鏄嵏璐�
}
- Integer workMinute = Constants.formatBigdecimal(job.getWorkNum()).multiply(new BigDecimal(60)).divide(model.getWorkRate(),0,BigDecimal.ROUND_HALF_UP).intValue();
- Date overDate = DateUtil.getXMinuteAfterDate(job.getNewStartDate(),workMinute + model.getWorkTimeoutAlarmTime());//棰勮瀹屾垚鏃堕棿
- platformDurationVO.setFinishTimeStr(DateUtil.DateToStr(overDate,"HH:mm"));
+ Integer workMinute = 0;
+ Date overDate =null;
+ if(model.getWorkRate()!=null && model.getWorkRate().compareTo(new BigDecimal(0)) !=0){
+ workMinute = Constants.formatBigdecimal(job.getWorkNum()).multiply(new BigDecimal(60)).divide(model.getWorkRate(),0,BigDecimal.ROUND_HALF_UP).intValue();
+ overDate = DateUtil.getXMinuteAfterDate(job.getNewStartDate(),workMinute + model.getWorkTimeoutAlarmTime());//棰勮瀹屾垚鏃堕棿
+ platformDurationVO.setFinishTimeStr(DateUtil.DateToStr(overDate,"HH:mm"));
+ }
platformDurationVO.setWorkNum(Constants.formatBigdecimal(job.getWorkNum()).intValue());
platformDurationVO.setCarNo(job.getCarCodeFront());//杞︾墝鍙�
@@ -1899,7 +1951,7 @@
}else{
platformDurationVO.setStatus(Constants.ZERO); //浣滀笟涓�
platformDurationVO.setWorkTime(PlatformJobServiceImpl.getWorkTime(job,platformLogMapper));//宸插伐浣滄椂闂�
- if(overDate.getTime() < System.currentTimeMillis() ){
+ if(overDate!=null && overDate.getTime() < System.currentTimeMillis() ){
model.setStatus(Constants.TWO); //浣滀笟宸茶秴鏃�
}
}
@@ -1937,7 +1989,7 @@
List<PlatformJob> jobList = platformJobMapper.selectJoinList(PlatformJob.class, new MPJLambdaWrapper<PlatformJob>()
.selectAll( PlatformJob.class)
// .select("(select sum(ifnull(a.io_qty,0)) from platform_wms_detail a where a.isdeleted=0 and a.job_id =t.id )", create_date)
- .apply("to_days(t.create_date) = to_days(now())")
+ .apply("to_days(t.done_date) = to_days(now())")
.eq(Platform::getIsdeleted, Constants.ZERO)
.in(PlatformJob::getStatus, Constants.PlatformJobStatus.DONE.getKey()
, Constants.PlatformJobStatus.AUTHED_LEAVE.getKey()
@@ -1951,7 +2003,7 @@
}
int curtotalNum = 0;
Date today = Utils.Date.getStart(new Date());
- long curTime=0, lastTime=0;
+ long curTime=0, lastTime=0 ;
for (int i = 0; i < 8; i++) {
lastTime = curTime;//涓婃鐨勬椂闂�
int curHour = 8+(i*2);
@@ -1974,7 +2026,7 @@
curtotalNum += Constants.formatIntegerNum(workEfficiencyVO.getWorkNum()) ;
}
workEfficiencyVO.setTotalWorkNum(curtotalNum);//绱鍊�
- if(System.currentTimeMillis() < curTime){
+ if((System.currentTimeMillis() + 2*60*60*1000) < curTime ){
workEfficiencyVO.setTotalWorkNum(0);
}
workEfficiencyVOList.add(workEfficiencyVO);
@@ -2036,16 +2088,16 @@
data.setFreePlatform(
list.stream().filter(i->Constants.formatIntegerNum(i.getWorkStatus())<=Constants.ZERO).collect(Collectors.toList()).size()
);
- //鏌ヨ浠婃棩鏈堝彴涓姸鎬佷綔涓氭暟閲�
+ /* //鏌ヨ浠婃棩鏈堝彴涓姸鎬佷綔涓氭暟閲�
List<PlatformJob> jobList = platformJobMapper.selectJoinList(PlatformJob.class,new MPJLambdaWrapper<PlatformJob>()
.selectAll(PlatformJob.class)
.select("count(id)" ,PlatformJob::getCountum)
.eq(PlatformJob::getIsdeleted,Constants.ZERO)
.apply("to_days(create_date) = to_days(now())" )
- .groupBy(PlatformJob::getStatus )
+ .groupBy(PlatformJob::getStatus)
);
- if(jobList!=null){
+ if(jobList!=null){
//-------------TODO----------銆愮湅鏉裤�戠埍纭闇�姹�--------------
// * 0寰呯‘璁� 1寰呯鍒� 2绛夊緟鍙彿 3鍏ュ洯绛夊緟 4宸插彨鍙� 5浣滀笟涓� 6浣滀笟瀹屾垚 7杞Щ涓� 8寮傚父鎸傝捣 9宸叉巿鏉冪鍥� 10宸茬鍥� 11 宸茶繃鍙� 12宸插彇娑�
for(PlatformJob model : jobList){
@@ -2122,14 +2174,64 @@
}
}
+ }*/
+ //棰勭害鏁�
+ data.setReservationCar(platformJobMapper.selectCount(new MPJLambdaWrapper<PlatformJob>()
+ .eq(PlatformJob::getIsdeleted,Constants.ZERO)
+ .apply("to_days(create_date) = to_days(now())" )).intValue());
+ //浣滀笟涓�
+ data.setWorkingCar(platformJobMapper.selectCount(new MPJLambdaWrapper<PlatformJob>()
+ .eq(PlatformJob::getIsdeleted,Constants.ZERO)
+ .eq(PlatformJob::getStatus,Constants.PlatformJobStatus.WORKING.getKey())
+ ).intValue());
+ //鎺掗槦杞�
+ data.setLineUpCar(platformJobMapper.selectCount(new MPJLambdaWrapper<PlatformJob>()
+ .eq(PlatformJob::getIsdeleted,Constants.ZERO)
+ .in(PlatformJob::getStatus,Constants.PlatformJobStatus.CALLED.getKey(),
+ Constants.PlatformJobStatus.WAIT_CALL.getKey(),
+ Constants.PlatformJobStatus.IN_WAIT.getKey())).intValue());
+ //宸插彨鍙�
+ data.setCalledNum(platformJobMapper.selectCount(new MPJLambdaWrapper<PlatformJob>()
+ .eq(PlatformJob::getIsdeleted,Constants.ZERO)
+ .apply("to_days(call_date) = to_days(now())" )).intValue());
+ //绛惧埌鏁�
+ data.setSignedNum(platformJobMapper.selectCount(new MPJLambdaWrapper<PlatformJob>()
+ .eq(PlatformJob::getIsdeleted,Constants.ZERO)
+ .apply("to_days(sign_date) = to_days(now())" )).intValue());
+ //浠婃棩瀹屾垚鏁�
+ data.setDoneNum(platformJobMapper.selectCount(new MPJLambdaWrapper<PlatformJob>()
+ .eq(PlatformJob::getIsdeleted,Constants.ZERO)
+ .in(PlatformJob::getStatus,Constants.PlatformJobStatus.LEAVED.getKey(),
+ Constants.PlatformJobStatus.AUTHED_LEAVE.getKey(),
+ Constants.PlatformJobStatus.DONE.getKey())
+ .apply("to_days(done_date) = to_days(now())" )).intValue());
- data.setVideoPluginUrl(getVideoUrl());
- String indexCodes = systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.HK_CHANGNEI_SCREEN_INDEXCODES).getCode();
- if(StringUtils.isNotBlank(indexCodes)){
- data.setVideoIndexCodes(indexCodes.split(","));
- }
+ //宸蹭綔涓氭暟
+ data.setWorkedNum(platformJobMapper.selectCount(new MPJLambdaWrapper<PlatformJob>()
+ .eq(PlatformJob::getIsdeleted,Constants.ZERO)
+ .and(w-> w.eq(PlatformJob::getStatus,Constants.PlatformJobStatus.WORKING.getKey())
+ .or().in(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE.getKey()
+ ,Constants.PlatformJobStatus.AUTHED_LEAVE.getKey()
+ ,Constants.PlatformJobStatus.LEAVED.getKey()).apply("to_days(done_date) = to_days(now())")
+ .or().eq(PlatformJob::getStatus,Constants.PlatformJobStatus.EXCEPTION.getKey()).apply("to_days(done_date) = to_days(now())")
+ .or().eq(PlatformJob::getStatus,Constants.PlatformJobStatus.TRANSFERING.getKey()).apply("to_days(trans_platform_date) = to_days(now())")
+ )
+// .and(w->{w.eq(PlatformJob::getStatus,Constants.PlatformJobStatus.WORKING.getKey());})
+// .and(w->{w.in(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE.getKey()
+// ,Constants.PlatformJobStatus.AUTHED_LEAVE.getKey()
+// ,Constants.PlatformJobStatus.LEAVED.getKey())
+// .apply("to_days(done_date) = to_days(now())");})
+// .and(w->{w.eq(PlatformJob::getStatus,Constants.PlatformJobStatus.EXCEPTION.getKey())
+// .apply("to_days(error_date) = to_days(now())");})
+// .and(w->{w.eq(PlatformJob::getStatus,Constants.PlatformJobStatus.TRANSFERING.getKey())
+// .apply("to_days(trans_platform_date) = to_days(now())");})
+ ).intValue());
+
+ data.setVideoPluginUrl(getVideoUrl());
+ String indexCodes = systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.HK_CHANGNEI_SCREEN_INDEXCODES).getCode();
+ if(StringUtils.isNotBlank(indexCodes)){
+ data.setVideoIndexCodes(indexCodes.split(","));
}
-
return data;
}
@@ -2448,8 +2550,10 @@
data.setCurrentOutNum(data.getCurrentOutNum().add(Constants.formatBigdecimal(model.getOutSideProvinceOutQty())));
data.setCurrentInNum(data.getCurrentInNum().add(Constants.formatBigdecimal(model.getInSideProvinceOutQty())));
data.setTotalCarNum(data.getTotalCarNum()+Constants.formatIntegerNum(model.getVehicleQty()));//绱杞︽
- data.setCurrentProvinceNum(data.getCurrentProvinceNum().add(model.getOutSideProvinceOutQty()).add(model.getInSideProvinceOutT01Qty()));//鐪佸唴鐪佸閿�鍞噺
- data.setCurrentOtherNum(data.getCurrentOtherNum().add(model.getOutSideProvinceOutT03Qty()).add(model.getInSideProvinceOutT03Qty()));//鐪佸唴鐪佸鍏朵粬鍑哄簱閲�
+ data.setCurrentProvinceNum(data.getCurrentProvinceNum().add(Constants.formatBigdecimal(model.getOutSideProvinceOutT01Qty()))
+ .add(Constants.formatBigdecimal(model.getInSideProvinceOutT01Qty())));//鐪佸唴鐪佸閿�鍞噺
+ data.setCurrentOtherNum(data.getCurrentOtherNum().add(Constants.formatBigdecimal(model.getOutSideProvinceOutT03Qty()))
+ .add(Constants.formatBigdecimal(model.getInSideProvinceOutT03Qty())));//鐪佸唴鐪佸鍏朵粬鍑哄簱閲�
}
}
param.setDateEnd(DateUtil.getShortTime(lastEnd));
@@ -2555,7 +2659,7 @@
return infoList;
}
/**
- * 杩戜竷鏃ュ埌璐ф儏鍐�
+ * 杩戜竷鏃ュ埌璐ф儏鍐�-鏀规垚杩�15鏃�
* @return
*/
@Override
@@ -2567,17 +2671,17 @@
param.getFacrotyCodeList().add(code);//鏌ヨ鎸囧畾鍘傚尯
}
Date date = new Date();
- Date startDate = DateUtil.addDaysToDate(date,-7);
+ Date startDate = DateUtil.addDaysToDate(date,-15);
//鐪嬫澘澶у睆杩�7鏃ュ埌璐ф儏鍐垫棩鏈� 0琛ㄧず褰撳ぉ褰撳墠鎺�7澶╋紝-1琛ㄧず鏈湀鍒�1鍙�-7鍙�
String flag = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.SCREEN_SEVENT_ARRIVAL_STARTDATE).getCode();
if(StringUtils.equals(flag,"-1")){
startDate =DateUtil.getBeginDayOfMonth(0);
- date = DateUtil.addDaysToDate(startDate,7);
+ date = DateUtil.addDaysToDate(startDate,15);
}
param.setNcCreateDateFrom(DateUtil.getShortTime(startDate));
param.setNcCreateDateThrough(DateUtil.getShortTime(date));
List<TmsSevenArrivalStatusAndDetailsResponse> infoList = tmsService.getSevenArrivalStatusAndDetails(param);//鏌ヨ鍑哄簱閲�
- for (int i = 0; i < 7; i++) {
+ for (int i = 0; i < 15; i++) {
LastSevenDaysOrderVo model = new LastSevenDaysOrderVo();
Date td = DateUtil.addDaysToDate(date,-i);
model.setDateStr(DateUtil.getShortTime(td));
--
Gitblit v1.9.3