From 68b78ac70b8ef9227ad0001ffbe8f2bed7fc69ae Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期一, 30 九月 2024 09:20:28 +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 | 34 ++++++++++++++--
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java | 6 +++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformGroupServiceImpl.java | 21 +++++++---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/PdaPlatformController.java | 15 +++++++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformServiceImpl.java | 6 +-
server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/PlatformGroupWorkVO.java | 4 +-
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformCloudController.java | 14 +++++++
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformLog.java | 2
8 files changed, 84 insertions(+), 18 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformCloudController.java
index 0baf391..8cc607e 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformCloudController.java
@@ -128,18 +128,21 @@
@ApiOperation("鑾峰彇鏈堝彴缁勪俊鎭�")
@PostMapping("/getPlatformGroupList")
+ @CloudRequiredPermission("business:platform:query")
public ApiResponse<List<PlatformGroup>> getPlatformGroupList (@RequestBody PlatformDataDTO platformDataDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
return ApiResponse.success(platformGroupService.getAllPlatformGroup(platformDataDTO,getLoginUser(token)));
}
@ApiOperation("鑾峰彇鏈堝彴浠诲姟淇℃伅")
@GetMapping("/getPlatformWorkData")
+ @CloudRequiredPermission("business:platform:query")
public ApiResponse<PlatformWorkVO> getPlatformWorkData (@RequestParam Integer platformId, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
return ApiResponse.success(platformJobService.getPlatformWorkVOById(platformId));
}
@ApiOperation("鏇存柊鏈堝彴閰嶇疆淇℃伅")
@GetMapping("/updUserPlatformConfig")
+ @CloudRequiredPermission("business:platform:update")
public ApiResponse updUserPlatformConfig (@RequestParam List<Integer> ids, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
platformShowParamService.updUserConfig(ids,getLoginUser(token));
return ApiResponse.success("鎿嶄綔鎴愬姛");
@@ -148,6 +151,7 @@
@ApiOperation("杞﹁締鎺掗槦鎯呭喌")
@PostMapping("/platformLineUpPage")
+ @CloudRequiredPermission("business:platform:query")
public ApiResponse<PageData<PlatformJob>> platformLineUpPage (@RequestBody PageWrap<PlatformJob> pageWrap, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
return ApiResponse.success(platformJobService.platformCallList(pageWrap));
}
@@ -155,6 +159,7 @@
@ApiOperation("鍙彿鍒楄〃")
@PostMapping("/platformCallList")
+ @CloudRequiredPermission("business:platform:query")
public ApiResponse<PageData<PlatformJob>> platformCallList (@RequestBody PageWrap<PlatformJob> pageWrap, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
return ApiResponse.success(platformJobService.platformCallList(pageWrap));
}
@@ -162,6 +167,7 @@
@ApiOperation("鍙彿鍏ュ洯")
@PostMapping("/platformInPark")
+ @CloudRequiredPermission("business:platform:update")
public ApiResponse platformInPark (@RequestBody JobOperateDTO jobOperateDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
jobOperateDTO.setLoginUserInfo(getLoginUser(token));
PlatformJob platformJob = platformJobService.platformInPark(jobOperateDTO);
@@ -171,6 +177,7 @@
@ApiOperation("鏈堝彴鍙彿")
@PostMapping("/platformCallNumber")
+ @CloudRequiredPermission("business:platform:update")
public ApiResponse platformCallNumber (@RequestBody JobOperateDTO jobOperateDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
jobOperateDTO.setLoginUserInfo(getLoginUser(token));
PlatformJob oldPlatformJob = platformJobService.findById(jobOperateDTO.getJobId());
@@ -184,6 +191,7 @@
@ApiOperation("杞Щ鏈堝彴")
@PostMapping("/platformMove")
+ @CloudRequiredPermission("business:platform:update")
public ApiResponse platformMove (@RequestBody JobOperateDTO jobOperateDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
jobOperateDTO.setLoginUserInfo(getLoginUser(token));
platformJobService.platformMove(jobOperateDTO);
@@ -192,6 +200,7 @@
@ApiOperation("鏈堝彴杩囧彿")
@PostMapping("/platformOverNumber")
+ @CloudRequiredPermission("business:platform:update")
public ApiResponse platformOverNumber (@RequestBody JobOperateDTO jobOperateDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
jobOperateDTO.setLoginUserInfo(getLoginUser(token));
platformJobService.platformOverNumber(jobOperateDTO);
@@ -200,6 +209,7 @@
@ApiOperation("寮傚父鎸傝捣")
@PostMapping("/platformErr")
+ @CloudRequiredPermission("business:platform:update")
public ApiResponse platformErr (@RequestBody JobOperateDTO jobOperateDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
jobOperateDTO.setLoginUserInfo(getLoginUser(token));
platformJobService.platformErr(jobOperateDTO);
@@ -208,6 +218,7 @@
@ApiOperation("鎵嬪姩寮�濮嬩綔涓�")
@PostMapping("/beginWork")
+ @CloudRequiredPermission("business:platform:update")
public ApiResponse beginWork (@RequestBody JobOperateDTO jobOperateDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
jobOperateDTO.setLoginUserInfo(getLoginUser(token));
PlatformJob platformJob = platformJobService.beginWork(jobOperateDTO);
@@ -218,6 +229,7 @@
@ApiOperation("瀹屾垚浣滀笟")
@PostMapping("/finishWork")
+ @CloudRequiredPermission("business:platform:update")
public ApiResponse finishWork (@RequestBody JobOperateDTO jobOperateDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
jobOperateDTO.setLoginUserInfo(getLoginUser(token));
PlatformJob platformJob = platformJobService.finishWork(jobOperateDTO);
@@ -228,6 +240,7 @@
@ApiOperation("鎺堟潈绂诲満")
@PostMapping("/powerLevel")
+ @CloudRequiredPermission("business:platform:update")
public ApiResponse powerLevel (@RequestBody JobOperateDTO jobOperateDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
jobOperateDTO.setLoginUserInfo(getLoginUser(token));
PlatformJob platformJob = platformJobService.powerLevel(jobOperateDTO);
@@ -238,6 +251,7 @@
@ApiOperation("鑾峰彇鏈堝彴缁� 绛夊緟涓庡紓甯告寕璧锋暟鎹�")
@GetMapping("/getPlatformGroupWork")
+ @CloudRequiredPermission("business:platform:query")
public ApiResponse<PlatformGroupWorkVO> getPlatformGroupWork (@RequestParam Integer platformGroupId, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
return ApiResponse.success(platformGroupService.getPlatformGroupWork(platformGroupId));
}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/PdaPlatformController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/PdaPlatformController.java
index 73ca495..d0e2b09 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/PdaPlatformController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/PdaPlatformController.java
@@ -1,6 +1,7 @@
package com.doumee.cloud.web;
import com.doumee.api.BaseController;
+import com.doumee.config.annotation.CloudRequiredPermission;
import com.doumee.config.annotation.LoginNoRequired;
import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.model.ApiResponse;
@@ -60,18 +61,21 @@
@ApiOperation("鑾峰彇鏈堝彴缁勪俊鎭�")
@PostMapping("/getPlatformGroupList")
+ @CloudRequiredPermission("business:platform:query")
public ApiResponse<List<PlatformGroup>> getPlatformGroupList (@RequestBody PlatformDataDTO platformDataDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
return ApiResponse.success(platformGroupService.getAllPlatformGroup(platformDataDTO,getLoginUser(token)));
}
@ApiOperation("鑾峰彇鏈堝彴浠诲姟淇℃伅")
@GetMapping("/getPlatformWorkData")
+ @CloudRequiredPermission("business:platform:query")
public ApiResponse<PlatformWorkVO> getPlatformWorkData (@RequestParam Integer platformId, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
return ApiResponse.success(platformJobService.getPlatformWorkVOById(platformId));
}
@ApiOperation("鏇存柊鏈堝彴閰嶇疆淇℃伅")
@GetMapping("/updUserPlatformConfig")
+ @CloudRequiredPermission("business:platform:update")
public ApiResponse updUserPlatformConfig (@RequestParam List<Integer> ids, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
platformShowParamService.updUserConfig(ids,getLoginUser(token));
return ApiResponse.success("鎿嶄綔鎴愬姛");
@@ -79,6 +83,7 @@
@ApiOperation("淇敼绂佸惎鐢ㄧ姸鎬�")
@PostMapping("/updPlatformStatus")
+ @CloudRequiredPermission("business:platform:update")
public ApiResponse updPlatformStatus (@RequestBody Platform platform, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
platform.setLoginUserInfo(getLoginUser(token));
platformService.updateStatusById(platform);
@@ -87,6 +92,7 @@
@ApiOperation("杞﹁締鎺掗槦鎯呭喌")
@PostMapping("/platformLineUpPage")
+ @CloudRequiredPermission("business:platform:query")
public ApiResponse<PageData<PlatformJob>> platformLineUpPage (@RequestBody PageWrap<PlatformJob> pageWrap, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
return ApiResponse.success(platformJobService.platformCallList(pageWrap));
}
@@ -94,6 +100,7 @@
@ApiOperation("鍙彿鍒楄〃")
@PostMapping("/platformCallList")
+ @CloudRequiredPermission("business:platform:query")
public ApiResponse<PageData<PlatformJob>> platformCallList (@RequestBody PageWrap<PlatformJob> pageWrap, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
return ApiResponse.success(platformJobService.platformCallList(pageWrap));
}
@@ -101,6 +108,7 @@
@ApiOperation("鍙彿鍏ュ洯")
@PostMapping("/platformInPark")
+ @CloudRequiredPermission("business:platform:update")
public ApiResponse platformInPark (@RequestBody JobOperateDTO jobOperateDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
jobOperateDTO.setLoginUserInfo(getLoginUser(token));
PlatformJob platformJob = platformJobService.platformInPark(jobOperateDTO);
@@ -110,6 +118,7 @@
@ApiOperation("鏈堝彴鍙彿")
@PostMapping("/platformCallNumber")
+ @CloudRequiredPermission("business:platform:update")
public ApiResponse platformCallNumber (@RequestBody JobOperateDTO jobOperateDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
jobOperateDTO.setLoginUserInfo(getLoginUser(token));
PlatformJob oldPlatformJob = platformJobService.findById(jobOperateDTO.getJobId());
@@ -123,6 +132,7 @@
@ApiOperation("杞Щ鏈堝彴")
@PostMapping("/platformMove")
+ @CloudRequiredPermission("business:platform:update")
public ApiResponse platformMove (@RequestBody JobOperateDTO jobOperateDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
jobOperateDTO.setLoginUserInfo(getLoginUser(token));
platformJobService.platformMove(jobOperateDTO);
@@ -131,6 +141,7 @@
@ApiOperation("鏈堝彴杩囧彿")
@PostMapping("/platformOverNumber")
+ @CloudRequiredPermission("business:platform:update")
public ApiResponse platformOverNumber (@RequestBody JobOperateDTO jobOperateDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
jobOperateDTO.setLoginUserInfo(getLoginUser(token));
platformJobService.platformOverNumber(jobOperateDTO);
@@ -139,6 +150,7 @@
@ApiOperation("寮傚父鎸傝捣")
@PostMapping("/platformErr")
+ @CloudRequiredPermission("business:platform:update")
public ApiResponse platformErr (@RequestBody JobOperateDTO jobOperateDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
jobOperateDTO.setLoginUserInfo(getLoginUser(token));
platformJobService.platformErr(jobOperateDTO);
@@ -147,6 +159,7 @@
@ApiOperation("鎵嬪姩寮�濮嬩綔涓�")
@PostMapping("/beginWork")
+ @CloudRequiredPermission("business:platform:update")
public ApiResponse beginWork (@RequestBody JobOperateDTO jobOperateDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
jobOperateDTO.setLoginUserInfo(getLoginUser(token));
PlatformJob platformJob = platformJobService.beginWork(jobOperateDTO);
@@ -157,6 +170,7 @@
@ApiOperation("瀹屾垚浣滀笟")
@PostMapping("/finishWork")
+ @CloudRequiredPermission("business:platform:update")
public ApiResponse finishWork (@RequestBody JobOperateDTO jobOperateDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
jobOperateDTO.setLoginUserInfo(getLoginUser(token));
PlatformJob platformJob = platformJobService.finishWork(jobOperateDTO);
@@ -168,6 +182,7 @@
@ApiOperation("WMS杩愯緭鍗曡鎯�")
@GetMapping("/wmsJobDetail")
+ @CloudRequiredPermission("business:platform:query")
public ApiResponse<PlatformWmsJob> wmsJobDetail(@RequestParam Integer id) {
return ApiResponse.success(platformWmsJobService.findByDetailId(id));
}
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 ce6cfd2..fdac02c 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
@@ -315,6 +315,12 @@
@TableField(exist = false)
private String platformName ;
+
+ @ApiModelProperty(value = "浣滀笟閲�" ,hidden = true)
+ @TableField(exist = false)
+ private BigDecimal workNum ;
+
+
@ApiModelProperty(value = "WMS浠诲姟鏃堕棿")
@TableField(exist = false)
private String ioCreatedate;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformLog.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformLog.java
index 5ed449e..0470f9b 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformLog.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformLog.java
@@ -47,7 +47,7 @@
@ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
private Integer isdeleted;
- @ApiModelProperty(value = "澶囨敞")
+ @ApiModelProperty(value = "浣滀笟鏈堝彴")
@ExcelColumn(name="澶囨敞")
private String remark;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/PlatformGroupWorkVO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/PlatformGroupWorkVO.java
index b4dba48..402d0a0 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/PlatformGroupWorkVO.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/PlatformGroupWorkVO.java
@@ -12,9 +12,9 @@
public class PlatformGroupWorkVO {
@ApiModelProperty(value = "绛夊緟鏁伴噺")
- private Long waitNum ;
+ private Integer waitNum ;
@ApiModelProperty(value = "寮傚父鏁伴噺")
- private Long exceptionNum ;
+ private Integer exceptionNum ;
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformGroupServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformGroupServiceImpl.java
index bd14ef9..5a4765b 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformGroupServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformGroupServiceImpl.java
@@ -256,7 +256,9 @@
.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 ")
.selectAs(PlatformWmsJob::getCarrierName,PlatformJob::getCarrierName)
.leftJoin(PlatformWmsJob.class,PlatformWmsJob::getCarryBillCode,PlatformJob::getBillCode)
+ .leftJoin(Platform.class,Platform::getId,PlatformJob::getPlatformId)
.eq(PlatformJob::getIsdeleted,Constants.ZERO)
+ .eq(Platform::getIsdeleted,Constants.ZERO)
.in(PlatformJob::getStatus,
Constants.PlatformJobStatus.WAIT_CALL.getKey(),
Constants.PlatformJobStatus.IN_WAIT.getKey(),
@@ -288,7 +290,7 @@
public static PlatformWorkVO getPlatformWorkVO(Platform platform,List<PlatformJob> platformJobList){
PlatformWorkVO platformWorkVO = new PlatformWorkVO();
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(platformJobList)){
- //鑾峰彇鏈堝彴涓嬬殑鎵�鏈変綔涓氭暟鎹�
+ //鑾峰彇鏈堝彴缁勪笅鐨勬墍鏈変綔涓氭暟鎹�
List<PlatformJob> platformJobs = platformJobList.stream().filter(
i->Constants.equalsInteger(i.getPlatformId(),platform.getId())
|| Constants.equalsInteger(i.getPlatformGroupId(),platform.getGroupId())
@@ -303,12 +305,11 @@
platformWorkVO.setWaitNum(
platformJobs.stream().filter(i->
- Constants.equalsInteger(i.getStatus(),Constants.PlatformJobStatus.TRANSFERING.getKey())
- || Constants.equalsInteger(i.getStatus(),Constants.PlatformJobStatus.WAIT_CALL.getKey())
+ Constants.equalsInteger(i.getStatus(),Constants.PlatformJobStatus.WAIT_CALL.getKey())
).collect(Collectors.toList()).size()
+
platformJobList.stream().filter(i->Constants.equalsInteger(platform.getId(),i.getPlatformId())
- && (Constants.equalsInteger(i.getStatus(),Constants.PlatformJobStatus.IN_WAIT.getKey())
+ && (Constants.equalsInteger(i.getStatus(),Constants.PlatformJobStatus.IN_WAIT.getKey()) || Constants.equalsInteger(i.getStatus(),Constants.PlatformJobStatus.TRANSFERING.getKey())
)
).collect(Collectors.toList()).size()
);
@@ -328,17 +329,23 @@
@Override
public PlatformGroupWorkVO getPlatformGroupWork(Integer platformGroupId){
PlatformGroupWorkVO platformGroupWorkVO = new PlatformGroupWorkVO();
- platformGroupWorkVO.setExceptionNum(platformJobJoinMapper.selectCount(new QueryWrapper<PlatformJob>().lambda()
+ platformGroupWorkVO.setExceptionNum(platformJobJoinMapper.selectJoinCount(new MPJLambdaWrapper<PlatformJob>()
+ .leftJoin(Platform.class,Platform::getId,PlatformJob::getPlatformId)
+ .eq(PlatformJob::getIsdeleted,Constants.ZERO)
+ .eq(Platform::getIsdeleted,Constants.ZERO)
.eq(PlatformJob::getPlatformGroupId,platformGroupId)
.eq(PlatformJob::getStatus,Constants.PlatformJobStatus.EXCEPTION.getKey())
)
);
- platformGroupWorkVO.setWaitNum(platformJobJoinMapper.selectCount(new QueryWrapper<PlatformJob>().lambda()
+ platformGroupWorkVO.setWaitNum(platformJobJoinMapper.selectJoinCount(new MPJLambdaWrapper<PlatformJob>()
+ .leftJoin(Platform.class,Platform::getId,PlatformJob::getPlatformId)
+ .eq(PlatformJob::getIsdeleted,Constants.ZERO)
+ .eq(Platform::getIsdeleted,Constants.ZERO)
.eq(PlatformJob::getPlatformGroupId,platformGroupId)
.and( i->i.eq(PlatformJob::getStatus,Constants.PlatformJobStatus.WAIT_CALL.getKey()).or()
.eq(PlatformJob::getStatus,Constants.PlatformJobStatus.IN_WAIT.getKey()).or()
- .apply(" ( status = "+Constants.PlatformJobStatus.TRANSFERING.getKey()+" and PLATFORM_GROUP_ID = "+platformGroupId+" ) ")
+ .apply(" ( t.status = "+Constants.PlatformJobStatus.TRANSFERING.getKey()+" and t.PLATFORM_GROUP_ID = "+platformGroupId+" ) ")
)
)
);
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..22d5638 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()
@@ -1679,6 +1701,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 +1715,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())){
//璁＄畻宸插彨鍙锋椂闂�
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformServiceImpl.java
index d5f023d..32bf086 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformServiceImpl.java
@@ -320,9 +320,9 @@
.selectAs(PlatformGroup::getName,Platform::getGroupName)
.select(" (select ifnull(TIMESTAMPDIFF(HOUR, '2023-01-01 '||pg.start_time||':00', '2023-01-01 '||pg.end_time||':00' ),0) from platform_group pg " +
" where t.group_id = pg.id ) as openTime ")
- .select(" ( select ROUND( ifnull(SUM(pl.PARAM3),0) / 3600 , 2 ) from platform_log pl where pl.OBJ_ID = t.id and pl.remark = t.id " +
- " and pl.CREATE_DATE > '"+Utils.Date.getStart(platform.getQueryDateStart())+"' " +
- "and pl.CREATE_DATE <= '"+Utils.Date.getEnd(platform.getQueryDateEnd())+"' ) as workCountTime ")
+ .select(" ( select ROUND( ifnull(SUM(pl.PARAM3),0) / 3600 , 2 ) from platform_log pl where pl.remark = t.id " +
+ " and pl.CREATE_DATE > '"+DateUtil.getFomartDate(platform.getQueryDateStart(),"yyyy-MM-dd")+" 00:00:00' " +
+ "and pl.CREATE_DATE <= '"+DateUtil.getFomartDate(platform.getQueryDateEnd(),"yyyy-MM-dd")+" 23:59:59' ) as workCountTime ")
.leftJoin(PlatformGroup.class,PlatformGroup::getId,Platform::getGroupId);
queryWrapper
.eq(platform.getGroupId() != null, Platform::getGroupId, platform.getGroupId())
--
Gitblit v1.9.3