From 563966210b041d0223ab004a3063029bf0c5378a Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 06 二月 2025 09:20:45 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
admin/src/views/platform/LogisticsRecord/waybill.vue | 8 +
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java | 36 +++-
admin/src/views/platform/config.js | 4
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformJobCloudController.java | 18 ++
admin/src/views/business/trainTime.vue | 60 ++++++--
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/TrainTimeServiceImpl.java | 3
admin/src/views/platform/LogisticsRecord/operationCity.vue | 25 ++-
server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java | 21 +++
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/TrainTime.java | 6
server/system_gateway/src/main/java/com/doumee/config/CustomWebFilterConfig.java | 1
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/PlatformJobExportVo.java | 86 ++++++++++++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java | 9
server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsOutQtyAndVehicleQtyResponse.java | 2
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunActController.java | 2
admin/src/views/platform/LogisticsRecord/subscribe.vue | 9 +
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 70 ++++++++-
admin/src/views/platform/LogisticsRecord/operation.vue | 20 ++
17 files changed, 317 insertions(+), 63 deletions(-)
diff --git a/admin/src/views/business/trainTime.vue b/admin/src/views/business/trainTime.vue
index db6d4dc..92f382d 100644
--- a/admin/src/views/business/trainTime.vue
+++ b/admin/src/views/business/trainTime.vue
@@ -8,7 +8,7 @@
<el-form-item label="缁勭粐" prop="companyName">
<el-input v-model="searchForm.companyName" placeholder="璇疯緭鍏ョ粍缁囧悕绉�" @keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="璧峰鏃堕棿" prop="eventType">
+ <el-form-item label="鍩硅寮�濮嬫椂闂�" prop="eventType">
<el-date-picker
@change="seleTime"
v-model="time"
@@ -81,11 +81,15 @@
searchForm: {
keyWords: '',
companyName: '',
- startTime: '',
- endTime: '',
- radio: 0
+ startTimeStart: '',
+ startTimeEnd: '',
+ endTimeStart: '',
+ endTimeEnd: '',
+ radio: 0,
+ radio1: 0
},
- time: []
+ time: [],
+ time1: []
}
},
created () {
@@ -101,30 +105,58 @@
methods: {
changeRadio (e) {
if (e === '0') {
- this.searchForm.startTime = timeForMat(0)[0]
- this.searchForm.endTime = timeForMat(0)[1]
+ this.searchForm.startTimeStart = timeForMat(0)[0]
+ this.searchForm.startTimeEnd = timeForMat(0)[1]
this.time = timeForMat(0)
} else if (e === '1') {
- this.searchForm.startTime = timeForMat(6)[0]
- this.searchForm.endTime = timeForMat(6)[1]
+ this.searchForm.startTimeStart = timeForMat(6)[0]
+ this.searchForm.startTimeEnd = timeForMat(6)[1]
this.time = timeForMat(6)
} else if (e === '2') {
- this.searchForm.startTime = timeForMat(29)[0]
- this.searchForm.endTime = timeForMat(29)[1]
+ this.searchForm.startTimeStart = timeForMat(29)[0]
+ this.searchForm.startTimeEnd = timeForMat(29)[1]
this.time = timeForMat(29)
}
this.search()
},
seleTime (e) {
- this.searchForm.startTime = e[0]
- this.searchForm.endTime = e[1]
- this.searchForm.radio = null
+ if(e && e.length > 1) {
+ this.searchForm.startTimeStart = e[0]
+ this.searchForm.startTimeEnd = e[1]
+ this.searchForm.radio = null
+ this.search()
+ }
+ },
+ changeRadio1 (e) {
+ if (e === '0') {
+ this.searchForm.endTimeStart = timeForMat(0)[0]
+ this.searchForm.endTimeEnd = timeForMat(0)[1]
+ this.time1 = timeForMat(0)
+ } else if (e === '1') {
+ this.searchForm.endTimeStart = timeForMat(6)[0]
+ this.searchForm.endTimeEnd = timeForMat(6)[1]
+ this.time1 = timeForMat(6)
+ } else if (e === '2') {
+ this.searchForm.endTimeStart = timeForMat(29)[0]
+ this.searchForm.endTimeEnd = timeForMat(29)[1]
+ this.time1 = timeForMat(29)
+ }
this.search()
+ },
+ seleTime1 (e) {
+ if (e && e.length > 1 ) {
+ this.searchForm.endTimeStart = e[0]
+ this.searchForm.endTimeEnd = e[1]
+ this.searchForm.radio1 = null
+ this.search()
+ }
},
reset () {
this.$refs.searchForm.resetFields()
this.time = []
+ this.time1 = []
this.searchForm.radio = '0'
+ this.searchForm.radio1 = '0'
this.changeRadio('0')
this.search()
}
diff --git a/admin/src/views/platform/LogisticsRecord/operation.vue b/admin/src/views/platform/LogisticsRecord/operation.vue
index ebb64e6..4dca807 100644
--- a/admin/src/views/platform/LogisticsRecord/operation.vue
+++ b/admin/src/views/platform/LogisticsRecord/operation.vue
@@ -150,7 +150,11 @@
this.list.forEach(item => {
item.inTypeTemp = item.inType == 0 ? '鏁存墭鐩�' : '浠剁儫'
item.taskOrigin = 'WMS鑾峰彇'
- item.workTime = dayjs.duration(item.workTime, 'seconds').format('H鏃秏鍒唖绉�');
+ if(item.workTime && item.workTime>=24*60*60 ){
+ item.workTime = dayjs.duration(item.workTime, 'seconds').format('D澶〩鏃秏鍒唖绉�');
+ }else{
+ item.workTime = dayjs.duration(item.workTime, 'seconds').format('H鏃秏鍒唖绉�');
+ }
})
this.pagination.total = res.total || 0
}, () => {
@@ -169,11 +173,17 @@
this.$dialog.exportConfirm('纭瀵煎嚭鍚楋紵')
.then(() => {
this.exLoading = true
+ const { filters } = this
platformJobExport({
- page: this.pagination.page,
- capacity: 1000000,
- jobType: '0',
- model: this.filters
+ model: {
+ ...filters,
+ jobType: 0,
+ createDateStart: filters.selDate && filters.selDate.length > 0 ? filters.selDate[0] : null,
+ createDateEnd: filters.selDate && filters.selDate.length > 0 ? filters.selDate[1] : null,
+ },
+ sorts: [{ direction: 'DESC', property: 'create_date' }],
+ capacity: 10000,
+ page: 1,
})
.then(response => {
this.download(response)
diff --git a/admin/src/views/platform/LogisticsRecord/operationCity.vue b/admin/src/views/platform/LogisticsRecord/operationCity.vue
index 86465e4..5ec9a53 100644
--- a/admin/src/views/platform/LogisticsRecord/operationCity.vue
+++ b/admin/src/views/platform/LogisticsRecord/operationCity.vue
@@ -137,8 +137,8 @@
model: {
...filters,
jobType: 1,
- beginWorkDateStart: filters.selDate && filters.selDate.length > 0 ? filters.selDate[0] : null,
- beginWorkDateEnd: filters.selDate && filters.selDate.length > 0 ? filters.selDate[1] : null,
+ createDateStart: filters.selDate && filters.selDate.length > 0 ? filters.selDate[0] : null,
+ createDateEnd: filters.selDate && filters.selDate.length > 0 ? filters.selDate[1] : null,
},
sorts: [{ direction: 'DESC', property: 'create_date' }],
capacity: pagination.pageSize,
@@ -149,7 +149,12 @@
this.list.forEach(item => {
item.inTypeTemp = item.inType == 0 ? '鏁存墭鐩�' : '浠剁儫'
item.taskOrigin = 'WMS鑾峰彇'
- item.workTime = dayjs.duration(item.workTime, 'seconds').format('H鏃秏鍒唖绉�')
+ if(item.workTime && item.workTime>=24*60*60 ){
+ item.workTime = dayjs.duration(item.workTime, 'seconds').format('D澶〩鏃秏鍒唖绉�');
+ }else{
+ item.workTime = dayjs.duration(item.workTime, 'seconds').format('H鏃秏鍒唖绉�');
+ }
+ // item.workTime = dayjs.duration(item.workTime, 'seconds').format('H鏃秏鍒唖绉�')
})
this.pagination.total = res.total || 0
}, () => {
@@ -168,11 +173,17 @@
this.$dialog.exportConfirm('纭瀵煎嚭鍚楋紵')
.then(() => {
this.exLoading = true
+ const { filters } = this
platformJobExport({
- page: this.pagination.page,
- capacity: 1000000,
- jobType: 1,
- model: this.filters
+ model: {
+ ...filters,
+ jobType: 1,
+ createDateStart: filters.selDate && filters.selDate.length > 0 ? filters.selDate[0] : null,
+ createDateEnd: filters.selDate && filters.selDate.length > 0 ? filters.selDate[1] : null
+ },
+ sorts: [{ direction: 'DESC', property: 'create_date' }],
+ capacity: 10000,
+ page: 1,
})
.then(response => {
this.download(response)
diff --git a/admin/src/views/platform/LogisticsRecord/subscribe.vue b/admin/src/views/platform/LogisticsRecord/subscribe.vue
index 6422ad2..7742256 100644
--- a/admin/src/views/platform/LogisticsRecord/subscribe.vue
+++ b/admin/src/views/platform/LogisticsRecord/subscribe.vue
@@ -256,11 +256,16 @@
handleEx() {
this.$dialog.exportConfirm('纭瀵煎嚭鍚楋紵')
.then(() => {
+ const { filters } = this
this.exLoading = true
platformBooksExport({
page: this.pagination.page,
capacity: 1000000,
- model: this.filters
+ model: {
+ ...filters,
+ arriveDateStart: filters.selDate && filters.selDate.length > 0 ? filters.selDate[0] : null,
+ arriveDateEnd: filters.selDate && filters.selDate.length > 0 ? filters.selDate[1] : null,
+ },
})
.then(response => {
this.download(response)
@@ -348,4 +353,4 @@
color: #000000;
margin-bottom: 15px;
}
-</style>
\ No newline at end of file
+</style>
diff --git a/admin/src/views/platform/LogisticsRecord/waybill.vue b/admin/src/views/platform/LogisticsRecord/waybill.vue
index c4d2c55..a00a3da 100644
--- a/admin/src/views/platform/LogisticsRecord/waybill.vue
+++ b/admin/src/views/platform/LogisticsRecord/waybill.vue
@@ -201,11 +201,17 @@
this.$dialog.exportConfirm('纭瀵煎嚭鍚楋紵')
.then(() => {
this.exLoading = true
+ const { filters } = this
platformJobExport({
page: this.pagination.page,
capacity: 1000000,
jobType: '0',
- model: this.filters
+ model: {
+ ...filters,
+ jobType: '0',
+ createDateStart: filters.selDate && filters.selDate.length > 0 ? filters.selDate[0] : null,
+ createDateEnd: filters.selDate && filters.selDate.length > 0 ? filters.selDate[1] : null,
+ }
})
.then(response => {
this.download(response)
diff --git a/admin/src/views/platform/config.js b/admin/src/views/platform/config.js
index add62d5..3d09ff7 100644
--- a/admin/src/views/platform/config.js
+++ b/admin/src/views/platform/config.js
@@ -11,7 +11,7 @@
9: '宸叉巿鏉冪鍥�',
10: '宸茬鍥�',
11: '宸茶繃鍙�',
- 12: '宸插彇娑�',
+ 12: '宸插彇娑�'
}
export const queryQueueUpConfig = {
formItems: [
@@ -23,4 +23,4 @@
},
],
online: true
-}
\ No newline at end of file
+}
diff --git a/server/system_gateway/src/main/java/com/doumee/config/CustomWebFilterConfig.java b/server/system_gateway/src/main/java/com/doumee/config/CustomWebFilterConfig.java
index 9e34aa6..ac43309 100644
--- a/server/system_gateway/src/main/java/com/doumee/config/CustomWebFilterConfig.java
+++ b/server/system_gateway/src/main/java/com/doumee/config/CustomWebFilterConfig.java
@@ -36,7 +36,6 @@
String token = exchange.getRequest().getHeaders().getFirst(Constants.HEADER_USER_TOKEN);
if (token == null || token.isEmpty()) {
return unAuthorize(exchange);
-
}
String userInfo =(String) stringRedisTemplate.opsForValue().get(Constants.REDIS_TOKEN_KEY + token);
if (StringUtils.isBlank(userInfo)) {
diff --git a/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java b/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java
index cf8b45b..4e27a08 100644
--- a/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java
+++ b/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java
@@ -672,6 +672,27 @@
throw e;
}
}
+ public static String getTimeStrBySecond(Long seconds) {
+ String returnTime ="0鏃�0鍒�0绉�";
+ long longHour = 0;
+ long longMinu = 0;
+ long longSec =seconds ==null?0:seconds;
+ try {
+ if (longSec == 0) {
+ returnTime = "0鏃�0鍒�0绉�";
+ return returnTime;
+ }
+ longHour = longSec / 3600; // 鍙栧緱灏忔椂鏁�
+ longSec = longSec % 3600; // 鍙栧緱浣欎笅鐨勭
+ longMinu = longSec / 60; // 鍙栧緱鍒嗘暟
+ longSec = longSec % 60; // 鍙栧緱浣欎笅鐨勭
+ returnTime = longHour + "鏃�" + longMinu + "鍒�" + longSec + "绉�";
+ return returnTime;
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return returnTime;
+ }
/**
* Descrption:鍙栧緱褰撳墠鏃ユ湡,鏍煎紡涓�:yyyy-MM-dd HH:mm:ss
diff --git a/server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsOutQtyAndVehicleQtyResponse.java b/server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsOutQtyAndVehicleQtyResponse.java
index 0ddeedc..e7a72a9 100644
--- a/server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsOutQtyAndVehicleQtyResponse.java
+++ b/server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsOutQtyAndVehicleQtyResponse.java
@@ -35,6 +35,6 @@
private BigDecimal totalOutT01Qty ;//鏁板瓧 璋冩嫧鍑哄簱閲�(鐪佸唴閿�鍞�+鐪佸閿�鍞�)
@ApiModelProperty(value = "鍏朵粬鍑哄簱閲�(鐪佸唴鍏朵粬+鐪佸鍏朵粬)")
private BigDecimal totalOutT03Qty ;//鏁板瓧 鍏朵粬鍑哄簱閲�(鐪佸唴鍏朵粬+鐪佸鍏朵粬)
- @ApiModelProperty(value = "绱鍑哄簱閲�")
+ @ApiModelProperty(value = "绱鍑哄簱杞︽鏁�")
private Integer vehicleQty ;//鏁板瓧 杞︽鏁�
}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformJobCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformJobCloudController.java
index 2ec6aff..3943389 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformJobCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformJobCloudController.java
@@ -5,6 +5,7 @@
import com.doumee.config.annotation.LoginNoRequired;
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
+import com.doumee.dao.business.vo.PlatformJobExportVo;
import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.service.business.third.model.PageData;
import com.doumee.service.business.third.model.PageWrap;
@@ -15,12 +16,15 @@
import com.doumee.service.business.PlatformJobService;
import com.doumee.service.business.third.WmsService;
import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
+import com.mchange.v2.beans.BeansUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -100,7 +104,19 @@
platformJob.setJobForm(Constants.ZERO);
}
}
- ExcelExporter.build(PlatformJob.class).export(platformJobList, "瀹夋嘲鐗╂祦浣滀笟浠诲姟", response);
+ if(Constants.equalsInteger(pageWrap.getModel().getJobType(),1)){
+ List<PlatformJobExportVo> exportVoList =new ArrayList<>();
+ if(platformJobList!=null){
+ for(PlatformJob job : platformJobList){
+ PlatformJobExportVo t = new PlatformJobExportVo();
+ BeanUtils.copyProperties(job,t);
+ exportVoList.add(t);
+ }
+ ExcelExporter.build(PlatformJobExportVo.class).export(exportVoList, "棰勭害鍏ュ洯浣滀笟璁板綍", response);
+ }
+ }else{
+ ExcelExporter.build(PlatformJob.class).export(platformJobList, "瀹夋嘲鐗╂祦浣滀笟浠诲姟", response);
+ }
}
@ApiOperation("鏍规嵁ID鏌ヨ")
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunActController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunActController.java
index ba34f51..4b4f355 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunActController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunActController.java
@@ -120,7 +120,7 @@
// ,Constants.PlatformJobStatus.DONE.getKey()
)
.orderByDesc(PlatformJob::getSignNum)
- .last(" limit 20 ")
+// .last(" limit 20 ")
);
return ApiResponse.success(list);
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java
index 8e07e9c..64f59a6 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java
@@ -32,7 +32,7 @@
private Integer creator;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @ExcelColumn(name="鍒涘缓鏃堕棿",index = 7, dateFormat = "yyyy-MM-dd hh:mm:ss")
+ @ExcelColumn(name="鍒涘缓鏃堕棿",index = 12, dateFormat = "yyyy-MM-dd hh:mm:ss",width = 10)
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -53,7 +53,7 @@
private String remark;
@ApiModelProperty(value = "鐘舵�� 0寰呯‘璁� 1寰呯鍒� 2绛夊緟鍙彿 3鍏ュ洯绛夊緟 4宸插彨鍙� 5浣滀笟涓� 6浣滀笟瀹屾垚 7杞Щ涓� 8寮傚父鎸傝捣 9宸叉巿鏉冪鍥� 10宸茬鍥� 11 宸茶繃鍙� 12鍙栨秷锛圵MS锛�" , example = "1")
- @ExcelColumn(name="鐘舵��",index = 8, valueMapping = "0=寰呯‘璁�;1=寰呯鍒�;2=绛夊緟鍙彿;3=鍏ュ洯绛夊緟;4=宸插彨鍙�;5=浣滀笟涓�;6=浣滀笟瀹屾垚;7=杞Щ涓�;8=寮傚父鎸傝捣;9=宸叉巿鏉冪鍥�;10=宸茬鍥�;11=宸茶繃鍙�;12=鍙栨秷锛圵MS锛�;")
+ @ExcelColumn(name="鐘舵��",index =13,width = 6, valueMapping = "0=寰呯‘璁�;1=寰呯鍒�;2=绛夊緟鍙彿;3=鍏ュ洯绛夊緟;4=宸插彨鍙�;5=浣滀笟涓�;6=浣滀笟瀹屾垚;7=杞Щ涓�;8=寮傚父鎸傝捣;9=宸叉巿鏉冪鍥�;10=宸茬鍥�;11=宸茶繃鍙�;12=鍙栨秷锛圵MS锛�;")
private Integer status;
@ApiModelProperty(value = "杞﹁締杩涘叆鐘舵�� 0涓嶅湪 1杩涘叆 " , example = "1")
@@ -66,24 +66,25 @@
private String code;
@ApiModelProperty(value = "浣滀笟鍞竴鏍囪瘑(鎵胯繍鍗曞彿锛�")
- @ExcelColumn(name="杩愬崟鍙�",index = 0)
+ @ExcelColumn(name="杩愬崟鍙�",index = 0,width = 5)
private String billCode;
@ApiModelProperty(value = "鍙告満缂栫爜", example = "1")
private Integer driverId;
@ApiModelProperty(value = "鍙告満濮撳悕")
- @ExcelColumn(name="鍙告満濮撳悕",index = 4)
+ @ExcelColumn(name="鍙告満濮撳悕",index = 4,width = 6)
private String driverName;
@ApiModelProperty(value = "杞︾墝鍙�")
private String plateNum;
@ApiModelProperty(value = "鍙告満鎵嬫満鍙�")
- @ExcelColumn(name="鍙告満鐢佃瘽",index = 5)
+ @ExcelColumn(name="鍙告満鐢佃瘽",index = 5,width = 8)
private String drivierPhone;
@ApiModelProperty(value = "绛惧埌鏃堕棿")
+ @ExcelColumn(name="绛惧埌鏃堕棿",index =7,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 10)
private Date signDate;
@ApiModelProperty(value = "绛惧埌鏂瑰紡 0app绛惧埌 1鎵爜绛惧埌 2鍚庡彴绛惧埌", example = "1")
@@ -108,6 +109,7 @@
private BigDecimal signDistance;
@ApiModelProperty(value = "浣滀笟鏈堝彴鍚嶇О闆嗗悎锛屽涓娇鐢ㄨ嫳鏂囬�楀彿闅斿紑")
+ @ExcelColumn(name="浣滀笟鏈堝彴鍚嶇О",index =17 ,width = 8)
private String platformNames;
@ApiModelProperty(value = "浣滀笟鏈堝彴缂栫爜闆嗗悎锛屽涓娇鐢ㄨ嫳鏂囬�楀彿闅斿紑")
@@ -126,6 +128,7 @@
private Integer inwaitUserId;
@ApiModelProperty(value = "鍙彿鏃堕棿")
+ @ExcelColumn(name="鍙彿鏃堕棿",index =8 ,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 10)
private Date callDate;
@ApiModelProperty(value = "鍙彿浜虹紪鐮�", example = "1")
@@ -135,9 +138,11 @@
private String callInfo;
@ApiModelProperty(value = "寮�濮嬩綔涓氭椂闂�")
+ @ExcelColumn(name="寮�濮嬩綔涓氭椂闂�",index =9 ,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 10)
private Date startDate;
@ApiModelProperty(value = "浣滀笟瀹屾垚鏃堕棿锛堟渶缁堟椂闂达級")
+ @ExcelColumn(name="浣滀笟瀹屾垚鏃堕棿",index =10 ,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 10)
private Date doneDate;
@ApiModelProperty(value = "寮傚父鎸傝捣鏃堕棿")
@@ -191,14 +196,15 @@
private Date inHkdate;
@ApiModelProperty(value = "浣滀笟绫诲瀷 0鑷湁杞﹀嵏璐� 1鑷湁杞﹁璐� 2澶栧崗杞﹀嵏璐� 3澶栧崗杞﹁璐� 4甯傚叕鍙稿鍗忚溅鍗歌揣", example = "1")
- @ExcelColumn(name="浣滀笟绫诲瀷",index = 6,valueMapping = "0=鑷湁杞﹀嵏璐�;1=鑷湁杞﹁璐�;2=澶栧崗杞﹀嵏璐�;3=澶栧崗杞﹁璐�;4=甯傚叕鍙稿鍗忚溅鍗歌揣")
+ @ExcelColumn(name="浣滀笟绫诲瀷",index = 15,width = 6,valueMapping = "0=鑷湁杞﹀嵏璐�;1=鑷湁杞﹁璐�;2=澶栧崗杞﹀嵏璐�;3=澶栧崗杞﹁璐�;4=甯傚叕鍙稿鍗忚溅鍗歌揣")
private Integer type;
@ApiModelProperty(value = "鍓嶈溅鐗屽彿")
- @ExcelColumn(name="鍓嶈溅鐗屽彿",index = 2)
+ @ExcelColumn(name="鍓嶈溅鐗屽彿",index = 2,width = 5)
private String carCodeFront;
@ApiModelProperty(value = "鍚庤溅鐗屽彿")
+ @ExcelColumn(name="鍚庤溅鐗屽彿",index =3 ,width = 5)
private String carCodeBack;
@ApiModelProperty(value = "鍙告満鎵�灞為儴闂ㄧ紪鐮�", example = "1")
@@ -229,9 +235,11 @@
private Integer inType;
@ApiModelProperty(value = "鎬昏繍杈撻噺", example = "1")
+ @ExcelColumn(name="鎬讳綔涓氶噺锛堜竾鏀級",index = 1,width = 5)
private BigDecimal totalNum;
@ApiModelProperty(value = "纭浠诲姟鏃堕棿")
+ @ExcelColumn(name="纭鏃堕棿",index =6 ,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 10)
private Date confirmTaskDate;
@ApiModelProperty(value = "绛惧埌搴忓彿", example = "1")
@@ -287,8 +295,8 @@
@ApiModelProperty(value = "WMS浠诲姟鏃堕棿")
@TableField(exist = false)
+ @ExcelColumn(name="WMS鍒涘缓鏃堕棿",index =18,width = 10)
private String ioCreatedate;
-
@ApiModelProperty(value = "绂诲満涓嬪彂鎿嶄綔浜哄悕绉�", example = "1")
@TableField(exist = false)
private String outUserName;
@@ -302,7 +310,7 @@
private Integer groupType ;
@ApiModelProperty(value = "鎵胯繍鍟�")
- @ExcelColumn(name="杩愯緭鍏徃",index = 3)
+ @ExcelColumn(name="杩愯緭鍏徃",index = 16,width = 10)
@TableField(exist = false)
private String carrierName ;
@@ -322,6 +330,10 @@
@ApiModelProperty(value = "宸蹭綔涓氭椂闂�")
@TableField(exist = false)
private Long workTime;
+ @ApiModelProperty(value = "浣滀笟鏃堕暱")
+ @TableField(exist = false)
+ @ExcelColumn(name="浣滀笟鏃堕暱",index =11 ,width = 6)
+ private String workTimeStr;
@ApiModelProperty(value = "WMS浠诲姟淇℃伅")
@TableField(exist = false)
@@ -347,12 +359,12 @@
@TableField(exist = false)
private Date beginWorkDateStart;
@ApiModelProperty(value = "寮�濮嬫椂闂磋捣")
- @JsonFormat(pattern = "yyyy-MM-dd")
+// @JsonFormat(pattern = "yyyy-MM-dd")
@TableField(exist = false)
private Date createDateStart;
@ApiModelProperty(value = "寮�濮嬫椂闂存")
@TableField(exist = false)
- @JsonFormat(pattern = "yyyy-MM-dd")
+// @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDateEnd;
@ApiModelProperty(value = "寮�濮嬩綔涓氭椂闂存")
@@ -393,7 +405,7 @@
private String queryStatusForPower;
@ApiModelProperty(value = "浠诲姟鏉ユ簮")
- @ExcelColumn(name="浠诲姟鏉ユ簮",index = 1,valueMapping = "0=WMS鑾峰彇;1=鑷富棰勭害;")
+ @ExcelColumn(name="浠诲姟鏉ユ簮",index =14,valueMapping = "0=WMS鑾峰彇;1=鑷富棰勭害;")
@TableField(exist = false)
private Integer jobForm;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/TrainTime.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/TrainTime.java
index 65b8870..c895e5a 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/TrainTime.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/TrainTime.java
@@ -98,5 +98,11 @@
@ApiModelProperty(value = "鍏抽敭瀛�,濮撳悕/鎵嬫満鍙�")
@TableField(exist = false)
private String keyWords;
+ @ApiModelProperty(value = "鏌ヨ寮�濮嬫椂闂�")
+ @TableField(exist = false)
+ private Date startTimeStart;
+ @ApiModelProperty(value = "鏌ヨ鎴鏃堕棿")
+ @TableField(exist = false)
+ private Date startTimeEnd;
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/PlatformJobExportVo.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/PlatformJobExportVo.java
new file mode 100644
index 0000000..fe4cb50
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/PlatformJobExportVo.java
@@ -0,0 +1,86 @@
+package com.doumee.dao.business.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.core.utils.Constants;
+import com.doumee.dao.business.model.PlatformWmsJob;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 鏈堝彴璋冨害浣滀笟淇℃伅琛�
+ * @author 姹熻箘韫�
+ * @date 2024/06/28 10:03
+ */
+@Data
+@ApiModel("鏈堝彴璋冨害浣滀笟淇℃伅琛ㄥ埌澶�")
+public class PlatformJobExportVo {
+
+ @ApiModelProperty(value = "鍚堝悓鍙�")
+ @ExcelColumn(name="鍚堝悓鍙�",index = 0,width = 5)
+ private String contractNum;
+ @ApiModelProperty(value = "鍏ュ洯浜嬬敱")
+ @ExcelColumn(name="鍏ュ洯浜嬬敱",index = 1,width = 10)
+ private String reason;
+
+ @ApiModelProperty(value = "鍓嶈溅鐗屽彿")
+ @ExcelColumn(name="鍓嶈溅鐗屽彿",index = 2,width = 5)
+ private String carCodeFront;
+
+ @ApiModelProperty(value = "鍚庤溅鐗屽彿")
+ @ExcelColumn(name="鍚庤溅鐗屽彿",index =3 ,width = 5)
+ private String carCodeBack;
+
+ @ApiModelProperty(value = "鍙告満濮撳悕")
+ @ExcelColumn(name="鍙告満濮撳悕",index = 4,width = 6)
+ private String driverName;
+
+
+ @ApiModelProperty(value = "鍙告満鎵嬫満鍙�")
+ @ExcelColumn(name="鍙告満鐢佃瘽",index = 5,width = 8)
+ private String drivierPhone;
+ @ApiModelProperty(value = "纭浠诲姟鏃堕棿")
+ @ExcelColumn(name="纭鏃堕棿",index =6 ,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 10)
+ private Date confirmTaskDate;
+
+ @ApiModelProperty(value = "绛惧埌鏃堕棿")
+ @ExcelColumn(name="绛惧埌鏃堕棿",index =7,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 10)
+ private Date signDate;
+
+ @ApiModelProperty(value = "鍙彿鏃堕棿")
+ @ExcelColumn(name="鍙彿鏃堕棿",index =8 ,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 10)
+ private Date callDate;
+
+ @ApiModelProperty(value = "寮�濮嬩綔涓氭椂闂�")
+ @ExcelColumn(name="寮�濮嬩綔涓氭椂闂�",index =9 ,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 10)
+ private Date startDate;
+
+ @ApiModelProperty(value = "浣滀笟瀹屾垚鏃堕棿锛堟渶缁堟椂闂达級")
+ @ExcelColumn(name="浣滀笟瀹屾垚鏃堕棿",index =10 ,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 10)
+ private Date doneDate;
+ @ApiModelProperty(value = "浣滀笟鏃堕暱")
+ @ExcelColumn(name="浣滀笟鏃堕暱",index =11 ,width = 6)
+ private String workTimeStr;
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @ExcelColumn(name="鍒涘缓鏃堕棿",index = 12, dateFormat = "yyyy-MM-dd hh:mm:ss",width = 10)
+ private Date createDate;
+
+ @ApiModelProperty(value = "鐘舵�� 0寰呯‘璁� 1寰呯鍒� 2绛夊緟鍙彿 3鍏ュ洯绛夊緟 4宸插彨鍙� 5浣滀笟涓� 6浣滀笟瀹屾垚 7杞Щ涓� 8寮傚父鎸傝捣 9宸叉巿鏉冪鍥� 10宸茬鍥� 11 宸茶繃鍙� 12鍙栨秷锛圵MS锛�" , example = "1")
+ @ExcelColumn(name="鐘舵��",index =13,width = 6, valueMapping = "0=寰呯‘璁�;1=寰呯鍒�;2=绛夊緟鍙彿;3=鍏ュ洯绛夊緟;4=宸插彨鍙�;5=浣滀笟涓�;6=浣滀笟瀹屾垚;7=杞Щ涓�;8=寮傚父鎸傝捣;9=宸叉巿鏉冪鍥�;10=宸茬鍥�;11=宸茶繃鍙�;12=鍙栨秷锛圵MS锛�;")
+ private Integer status;
+
+ @ApiModelProperty(value = "浣滀笟鏈堝彴鍚嶇О")
+ @ExcelColumn(name="浣滀笟鏈堝彴鍚嶇О",index =14,width = 8)
+ private String platformName ;
+ @ApiModelProperty(value = "鎬昏繍杈撻噺", example = "1")
+ @ExcelColumn(name="鎬讳綔涓氶噺锛堜竾鏀級",index = 15,width = 5)
+ private BigDecimal totalNum;
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
index 3135e0c..ff3aea9 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
@@ -297,8 +297,8 @@
.apply(pageWrap.getModel().getQueryStatus() != null, " find_in_set(t.`STATUS`,'"+pageWrap.getModel().getQueryStatus()+"')")
.apply(pageWrap.getModel().getQueryStatusForPower() != null, " find_in_set(t.`STATUS`,'"+pageWrap.getModel().getQueryStatusForPower()+"')")
.apply(pageWrap.getModel().getQueryType() != null, " find_in_set(t.TYPE,'"+pageWrap.getModel().getQueryType()+"')")
- .ge(pageWrap.getModel().getCreateDateStart() != null, PlatformJob::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDateStart()))
- .le(pageWrap.getModel().getCreateDateEnd() != null, PlatformJob::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDateEnd()))
+ .ge(pageWrap.getModel().getCreateDateStart() != null, PlatformJob::getCreateDate, pageWrap.getModel().getCreateDateStart())
+ .le(pageWrap.getModel().getCreateDateEnd() != null, PlatformJob::getCreateDate, pageWrap.getModel().getCreateDateEnd())
.ge(pageWrap.getModel().getBeginWorkDateStart() != null, PlatformJob::getStartDate, Utils.Date.getStart(pageWrap.getModel().getBeginWorkDateStart()))
.le(pageWrap.getModel().getBeginWorkDateEnd() != null, PlatformJob::getStartDate, Utils.Date.getEnd(pageWrap.getModel().getBeginWorkDateEnd()))
.ge(pageWrap.getModel().getBeginDoneDateStart() != null, PlatformJob::getDoneDate, Utils.Date.getStart(pageWrap.getModel().getBeginDoneDateStart()))
@@ -471,7 +471,9 @@
platformJob.setWaitTime("棰勮绛夊緟锛�-灏忔椂-鍒嗛挓");
}
}else if(Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.WORKING.getKey())
- || Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.DONE.getKey())){
+ || Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.DONE.getKey())
+ || Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.AUTHED_LEAVE.getKey())
+ || Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.LEAVED.getKey())){
//鏌ヨ鏈�鍚庡紑濮嬩换鍔＄殑鏈堝彴璁板綍 鏃ュ織琛� 鍥犱负瀛樺湪寮傚父鎸傝捣 杞Щ 绛夐棶棰�
PlatformLog platformLog = platformLogMapper.selectOne(new QueryWrapper<PlatformLog>().lambda()
.eq(PlatformLog::getJobId,platformJob.getId())
@@ -494,6 +496,7 @@
}
}
+ platformJob.setWorkTimeStr(DateUtil.getTimeStrBySecond(platformJob.getWorkTime()));
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/TrainTimeServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/TrainTimeServiceImpl.java
index f1b7560..43c6cf1 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/TrainTimeServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/TrainTimeServiceImpl.java
@@ -145,6 +145,9 @@
queryWrapper.selectAs(Company::getCompanyNamePath,TrainTime::getCompanyName);
queryWrapper.selectAs(SystemUser::getRealname,TrainTime::getCreateName);
queryWrapper.eq(TrainTime::getIsdeleted, Constants.ZERO);
+ queryWrapper.ge(pageWrap.getModel().getStartTimeStart() != null, TrainTime::getStartTime, pageWrap.getModel().getStartTimeStart());
+ queryWrapper.le(pageWrap.getModel().getStartTimeEnd() != null, TrainTime::getStartTime, pageWrap.getModel().getStartTimeEnd());
+
queryWrapper.and(StringUtils.isNotBlank(pageWrap.getModel().getName()), ms->ms.like(Member::getPhone,pageWrap.getModel().getName())
.or().like(Member::getName,pageWrap.getModel().getName()));
queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),Company::getName,pageWrap.getModel().getCompanyName());
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 9a84710..4a08183 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
@@ -944,15 +944,16 @@
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::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 +1110,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;
@@ -2041,7 +2042,7 @@
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)
@@ -2049,8 +2050,8 @@
.apply("to_days(create_date) = to_days(now())" )
.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){
@@ -2127,14 +2128,57 @@
}
}
+ }*/
+ //棰勭害鏁�
+ 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());})
+ .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;
}
@@ -2453,7 +2497,7 @@
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(Constants.formatBigdecimal(model.getOutSideProvinceOutQty()))
+ 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())));//鐪佸唴鐪佸鍏朵粬鍑哄簱閲�
--
Gitblit v1.9.3