From 0c3093f553437faf2bfd48ff23d753872f86c9d7 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 30 九月 2024 17:05:50 +0800
Subject: [PATCH] 最新版本
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java | 94 +++++++++++++++++++++++++++++++----------------
1 files changed, 62 insertions(+), 32 deletions(-)
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 5d37270..d611dd0 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
@@ -296,6 +296,8 @@
.leftJoin(Platform.class,Platform::getId,PlatformJob::getPlatformId)
.leftJoin(PlatformWmsJob.class,PlatformWmsJob::getCarryBillCode,PlatformJob::getBillCode)
.leftJoin(PlatformBooks.class,PlatformBooks::getJobId,PlatformJob::getId)
+ .eq(PlatformJob::getIsdeleted,Constants.ZERO)
+ .eq(Platform::getIsdeleted,Constants.ZERO)
.eq(pageWrap.getModel().getPlatformGroupId() != null, PlatformJob::getPlatformGroupId, pageWrap.getModel().getPlatformGroupId())
.like(pageWrap.getModel().getCarCodeFront() != null, PlatformJob::getCarCodeFront, pageWrap.getModel().getCarCodeFront())
@@ -812,11 +814,30 @@
if(Constants.equalsInteger(platformJob.getType(),Constants.TWO)
|| Constants.equalsInteger(platformJob.getType(),Constants.THREE)
|| Constants.equalsInteger(platformJob.getType(),Constants.FOUR)){
+
//鏌ヨ褰撳墠鍚敤鐨勫仠杞﹀満
List<Parks> parksList = parksMapper.selectList(new QueryWrapper<Parks>()
.lambda()
.isNotNull(Parks::getHkId)
.eq(Parks::getIsdeleted,Constants.ZERO));
+
+ //鍙栨秷褰撳墠杞﹁締鎵�鏈夋潈闄�
+ List<VisitPark> cancelParkList = visitParkMapper.selectList(new QueryWrapper<VisitPark>().lambda()
+ .eq(VisitPark::getCarCode,platformJob.getCarCodeFront())
+ .eq(VisitPark::getObjType,Constants.ONE)
+ .eq(VisitPark::getHkStatus,Constants.ONE)
+ .isNotNull(VisitPark::getHkId)
+ .apply(" END_TIME > now() ")
+ );
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(cancelParkList)){
+ for (VisitPark visitPark:cancelParkList) {
+ ParkReservationDelRequest param = new ParkReservationDelRequest();
+ param.setReserveOrderNo(visitPark.getHkId());
+ HKService.parkReservationDeletion(param);
+ }
+ }
+
+
List<VisitPark> visitParkList = new ArrayList<>();
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(parksList)){
Boolean sendStatus = true;
@@ -882,7 +903,7 @@
|| Constants.equalsInteger(platformJob.getType(),Constants.FOUR)){
List<VisitPark> visitParkList = visitParkMapper.selectList(new QueryWrapper<VisitPark>().lambda()
- .eq(VisitPark::getVisitApplyId,platformJob.getId())
+ .eq(VisitPark::getCarCode,platformJob.getCarCodeFront())
.eq(VisitPark::getObjType,Constants.ONE)
.eq(VisitPark::getHkStatus,Constants.ONE)
.isNotNull(VisitPark::getHkId)
@@ -1275,6 +1296,7 @@
platformLog.setParam2(DateUtil.dateTypeToString(platformLog.getCreateDate(),"yyyy-MM-dd HH:mm:ss"));
String v = Long.toString((platformLog.getCreateDate().getTime() - DateUtil.StringToDate(lastBeginPlatform.getParam1(),"yyyy-MM-dd HH:mm:ss").getTime() )/ 1000) ;
platformLog.setParam3(v);
+ platformLog.setRemark(platformJobBefor.getPlatformId().toString());
}else if(Constants.equalsInteger(objType,Constants.PlatformJobLogType.TRANSFERING.getKey())){
//鏌ヨ鏈�鍚庝竴娆℃棩蹇楁槸鍚︿负寮傚父鎸傝捣锛屽紓甯告寕璧峰悗鍙繘琛岃浆绉� 濡傛灉杩涜杞Щ閭ｄ箞涓氬姟灏遍渶瑕侀噸鏂拌繘琛屽紑濮嬪氨涓嶉渶瑕佺壒娈婂鐞� 锛屽鏋滀笉鏄紓甯告寕璧疯繘琛屾暟鎹粨鏉� 鍒欑洿鎺ユ煡璇㈡渶鍚庝竴娆″紑濮嬬殑鏃堕棿
PlatformLog lastPlatformLog = platformLogMapper.selectOne(new QueryWrapper<PlatformLog>().lambda()
@@ -1485,37 +1507,43 @@
@Override
public List<PlatformDataListResponse> platformWorkingDataList(PlatformDataListRequest param){
List<PlatformDataListResponse> platformDataListResponseList = new ArrayList<>();
- List<Platform> platformList = platformJoinMapper.selectList(
- new MPJLambdaWrapper<Platform>().eq(Platform::getIsdeleted,Constants.ZERO)
- .eq(Platform::getStatus,Constants.ZERO)
- );
- for (Platform platform:platformList) {
- PlatformDataListResponse platformDataListResponse = new PlatformDataListResponse();
- platformDataListResponse.setId(platform.getId());
- platformDataListResponse.setHkId(platform.getHkId());
- platformDataListResponse.setName(platform.getName());
- platformDataListResponse.setWorkStatus(Constants.ZERO);
- //鏌ヨ褰撳墠浣滀笟杞﹁締
- PlatformJob platformJob = platformJobMapper.selectOne(new QueryWrapper<PlatformJob>().lambda()
- .eq(PlatformJob::getIsdeleted,Constants.ZERO)
- .eq(PlatformJob::getStatus,Constants.PlatformJobStatus.WORKING.getKey())
- .orderByDesc(PlatformJob::getWorkTime)
- .last(" limit 1")
+ try {
+ List<Platform> platformList = platformJoinMapper.selectList(
+ new MPJLambdaWrapper<Platform>().eq(Platform::getIsdeleted,Constants.ZERO)
+ .eq(Platform::getStatus,Constants.ZERO)
);
- if(Objects.nonNull(platformJob)){
- platformDataListResponse.setCarCode(platformJob.getCarCodeFront());
- platformDataListResponse.setWorkType(
- Constants.equalsInteger(platformJob.getType(),Constants.platformJobType.zycxh)
- ||Constants.equalsInteger(platformJob.getType(),Constants.platformJobType.wxcxh)
- ||Constants.equalsInteger(platformJob.getType(),Constants.platformJobType.sgscxh)?Constants.ZERO:Constants.ONE
+ for (Platform platform:platformList) {
+ PlatformDataListResponse platformDataListResponse = new PlatformDataListResponse();
+ platformDataListResponse.setId(platform.getId());
+ platformDataListResponse.setHkId(platform.getHkId());
+ platformDataListResponse.setName(platform.getName());
+ platformDataListResponse.setWorkStatus(Constants.ZERO);
+ //鏌ヨ褰撳墠浣滀笟杞﹁締
+ PlatformJob platformJob = platformJobMapper.selectOne(new QueryWrapper<PlatformJob>().lambda()
+ .eq(PlatformJob::getIsdeleted,Constants.ZERO)
+ .eq(PlatformJob::getStatus,Constants.PlatformJobStatus.WORKING.getKey())
+ .orderByDesc(PlatformJob::getWorkTime)
+ .last(" limit 1")
);
- platformDataListResponse.setWorkStatus(Constants.ONE);
- //鏌ヨ浣滀笟鏃堕暱
- platformDataListResponse.setWorkTime(
- this.getWorkTime(platformJob)
- );
+ if(Objects.nonNull(platformJob)){
+ platformDataListResponse.setCarCode(platformJob.getCarCodeFront());
+ platformDataListResponse.setWorkType(
+ Constants.equalsInteger(platformJob.getType(),Constants.platformJobType.zycxh)
+ ||Constants.equalsInteger(platformJob.getType(),Constants.platformJobType.wxcxh)
+ ||Constants.equalsInteger(platformJob.getType(),Constants.platformJobType.sgscxh)?Constants.ZERO:Constants.ONE
+ );
+ platformDataListResponse.setWorkStatus(Constants.ONE);
+ //鏌ヨ浣滀笟鏃堕暱
+ platformDataListResponse.setWorkTime(
+ this.getWorkTime(platformJob)
+ );
+ }
}
+ }catch (Exception e){
+ System.out.println("===============================鎶ラ敊鍟︼細\n");
+ e.printStackTrace();
}
+
return platformDataListResponseList;
}
@@ -1679,6 +1707,8 @@
List<PlatformJob> platformJobList = platformJobJoinMapper.selectJoinList(PlatformJob.class,new MPJLambdaWrapper<PlatformJob>()
.selectAll(PlatformJob.class)
.selectAs(Platform::getWorkRate,PlatformJob::getWorkRate)
+ .selectAs(Platform::getName,PlatformJob::getPlatformName)
+ .select(" case when t.total_num is null then ( select sum(pwd.IO_QTY) from platform_wms_detail pwd where pwd.JOB_ID = t.id ) else t.total_num end workNum ")
.select(" ( select pl.CREATE_DATE from platform_log pl where t.id = pl.obj_id and pl.OBJ_TYPE = 5 order by pl.CREATE_DATE desc limit 1 ) as newStartDate ")
.select(" ( select pl.CREATE_DATE from platform_log pl where t.id = pl.obj_id and pl.OBJ_TYPE = 4 order by pl.CREATE_DATE desc limit 1 ) as newCallDate ")
.leftJoin(Platform.class,Platform::getId,PlatformJob::getPlatformId)
@@ -1691,16 +1721,16 @@
.orderByDesc(PlatformJob::getStatus)
.orderByAsc(PlatformJob::getSignDate)
);
- if(CollectionUtils.isEmpty(platformJobList)){
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(platformJobList)){
for (PlatformJob platformJob:platformJobList) {
if(Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.WORKING.getKey())){
//璁＄畻宸蹭綔涓氭椂闀� 鏍规嵁鏈堝彴宸ヤ綔鏁堢巼 璁＄畻浠诲姟閲忛渶瑕佹椂闂�
- if(Objects.isNull(platformJob.getTotalNum()) || Objects.isNull(platformJob.getWorkRate())){
+ if(Objects.isNull(platformJob.getWorkNum()) || Objects.isNull(platformJob.getWorkRate())){
platformJob.setOptTime(0L);
}else{
- Integer workMinute = platformJob.getTotalNum().multiply(new BigDecimal(60)).divide(platformJob.getWorkRate()).intValue();
+ Integer workMinute = platformJob.getWorkNum().multiply(new BigDecimal(60)).divide(platformJob.getWorkRate()).intValue();
Date overDate = DateUtil.getXMinuteAfterDate(platformJob.getNewStartDate(),workMinute);
- platformJob.setOptTime(overDate.getTime()/1000);
+ platformJob.setOptTime(overDate.getTime());
}
}else if(Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.CALLED.getKey())){
//璁＄畻宸插彨鍙锋椂闂�
--
Gitblit v1.9.3