From 552dcd8d48b4de12046ec90e7e908493b26b4336 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 08 十月 2024 09:48:07 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java | 70 +++++++----------------------------
1 files changed, 14 insertions(+), 56 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 56d8e4e..ca890bf 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
@@ -4,6 +4,7 @@
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
+import com.doumee.core.haikang.model.HKConstants;
import com.doumee.core.haikang.model.param.BaseResponse;
import com.doumee.core.haikang.model.param.request.ParkReservationAddRequest;
import com.doumee.core.haikang.model.param.request.ParkReservationDelRequest;
@@ -1519,42 +1520,34 @@
.eq(Platform::getStatus,Constants.ZERO)
);
for (Platform platform:platformList) {
- PlatformDataListResponse platformDataListResponse = new PlatformDataListResponse();
+ 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>()
-// .select(" * , ( select pl.CREATE_DATE from platform_log pl where platform_job.id = pl.obj_id and pl.OBJ_TYPE = 5 order by pl.CREATE_DATE desc limit 1 ) as newStartDate ," +
-// " case when platform_job.total_num is null then ( select sum(pwd.IO_QTY) from platform_wms_detail pwd where pwd.JOB_ID = platform_job.id ) else platform_job.total_num end workNum ")
-// .eq("isdeleted",Constants.ZERO)
-// .eq("status",Constants.PlatformJobStatus.WORKING.getKey())
-// .orderByDesc("START_DATE")
-// .last(" limit 1")
-// );
- PlatformJob platformJob = platformJobJoinMapper.selectJoinOne(PlatformJob.class,new MPJLambdaWrapper<PlatformJob>()
+ PlatformJob platformJob = platformJobJoinMapper.selectJoinOne(PlatformJob.class, new MPJLambdaWrapper<PlatformJob>()
.selectAll(PlatformJob.class)
- .selectAs(Platform::getWorkRate,PlatformJob::getWorkRate)
- .selectAs(Platform::getName,PlatformJob::getPlatformName)
+ .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)
+ .leftJoin(Platform.class, Platform::getId, PlatformJob::getPlatformId)
.eq(PlatformJob::getStatus, Constants.PlatformJobStatus.WORKING.getKey())
- .eq(PlatformJob::getPlatformId,platform.getId())
+ .eq(PlatformJob::getPlatformId, platform.getId())
.orderByDesc(PlatformJob::getStatus)
.orderByDesc(PlatformJob::getStartDate)
.last(" limit 1")
);
- if(Objects.nonNull(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
+ 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);
//鏌ヨ浣滀笟鏃堕暱
@@ -1562,51 +1555,16 @@
this.getWorkTime(platformJob)
);
//璁＄畻宸蹭綔涓氭椂闀� 鏍规嵁鏈堝彴宸ヤ綔鏁堢巼 璁＄畻浠诲姟閲忛渶瑕佹椂闂�
- if(Objects.isNull(platformJob.getWorkNum()) || Objects.isNull(platformJob.getWorkRate())){
+ if (Objects.isNull(platformJob.getWorkNum()) || Objects.isNull(platformJob.getWorkRate())) {
platformDataListResponse.setFinishTime(null);
- }else{
+ } else {
Integer workMinute = platformJob.getWorkNum().multiply(new BigDecimal(60)).divide(platformJob.getWorkRate()).intValue();
- Date overDate = DateUtil.getXMinuteAfterDate(platformJob.getNewStartDate(),workMinute);
+ Date overDate = DateUtil.getXMinuteAfterDate(platformJob.getNewStartDate(), workMinute);
platformDataListResponse.setFinishTime(overDate);
- }
- try {
- 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")
- );
- 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)
- );
}
}
platformDataListResponseList.add(platformDataListResponse);
- }catch (Exception e){
- System.out.println("===============================鎶ラ敊鍟︼細\n");
- e.printStackTrace();
}
-
return platformDataListResponseList;
}
--
Gitblit v1.9.3