From 9eee30e1fedbe9c19d593fcf9a82352fc7cdc4ec Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 25 九月 2024 14:47:14 +0800
Subject: [PATCH] 最新版本
---
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java | 15 +++++++++++----
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java | 2 +-
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/wms/WmsServiceImpl.java | 2 +-
3 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java
index 733303d..4579fe9 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java
@@ -32,12 +32,19 @@
* 2銆佺墿涓氬悗鍕わ細wyhq
* 3銆佽鏀垮姙鍏細xzbg
* 4銆佽繍钀ヤ腑蹇冿細yyzx
+ *
+ * 1銆佸畨闃蹭腑蹇冿細afzx
+ * 2銆佹秷鎺т腑蹇冿細xkzx
+ * 3銆佽兘绠′腑蹇冿細ngzx
*/
public interface MenuPageId{
- String zhaf = "zhaf";//缁煎悎瀹夐槻
- String wyhq = "wyhq";//鐗╀笟鍚庡嫟
- String xzbg = "xzbg";//琛屾斂鍔炲叕
- String yyzx = "yyzx";//杩愯惀涓績
+ String afzx = "afzx";//瀹夐槻涓績
+ String zhaf = "zhaf";//娑堟帶涓績
+ String ngzx = "ngzx";//鑳界涓績
+ String wyhq = "wyhq";//鐗╀笟鍚庡嫟
+ String xkzx = "xkzx";//缁煎悎瀹夐槻
+ String xzbg = "xzbg";//琛屾斂鍔炲叕
+ String yyzx = "yyzx";//杩愯惀涓績
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
index 31f76aa..e9f749e 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
@@ -387,7 +387,7 @@
public static BaseResponse parkReservationDeletion(ParkReservationDelRequest param){
log.info("銆愭捣搴疯溅浣嶅彇娑堥绾︺��================寮�濮�===="+JSONObject.toJSONString(param));
try {
- String res = HKTools.carChargeDeletion(JSONObject.toJSONString(param));
+ String res = HKTools.parkDeletion(JSONObject.toJSONString(param));
TypeReference typeReference =
new TypeReference< BaseResponse>(){};
BaseResponse result = JSONObject.parseObject(res, typeReference.getType());
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/wms/WmsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/wms/WmsServiceImpl.java
index 2d41a85..4e15f11 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/wms/WmsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/wms/WmsServiceImpl.java
@@ -317,7 +317,7 @@
}
PlatformGroup group = platformGroupMapper.selectOne(new QueryWrapper<PlatformGroup>().lambda()
.eq(PlatformGroup::getIsdeleted,Constants.ZERO)
- .eq(PlatformGroup::getType,Constants.ONE)
+ .eq(PlatformGroup::getType,type==0?Constants.ONE:Constants.ZERO)
.last("limit 1") );//鏌ヨ鍗歌揣鏈堝彴缁勭紪鐮�
job.setPlatformGroupId(group!=null?group.getId():null);
Member driver = memberMapper.selectJoinOne(Member.class,new MPJLambdaWrapper<Member>()
--
Gitblit v1.9.3