From 0f3ea4527c9d3b9117d0439d44a7fe14b516329d Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期二, 08 十月 2024 10:54:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/fhx-base-预约功能整合0808' into fhx-base-预约功能整合0808
---
phi_platform_user/src/main/java/com/hx/phip/controller/appointment/AppAutoMateController.java | 35 +++++++++++++++++++++++------------
1 files changed, 23 insertions(+), 12 deletions(-)
diff --git a/phi_platform_user/src/main/java/com/hx/phip/controller/appointment/AppAutoMateController.java b/phi_platform_user/src/main/java/com/hx/phip/controller/appointment/AppAutoMateController.java
index 87f0cd1..b9d5967 100644
--- a/phi_platform_user/src/main/java/com/hx/phip/controller/appointment/AppAutoMateController.java
+++ b/phi_platform_user/src/main/java/com/hx/phip/controller/appointment/AppAutoMateController.java
@@ -244,10 +244,10 @@
// int sxTime = 5;
sql.setLength(0);
sql.append(" select * from cure_set_time ");
- sql.append(" where isDel = #{m.isDel} and appType = #{m.appType} and userLevel = #{m.userLevel}");
+ sql.append(" where isDel = #{m.isDel} and appType = #{m.appType} and memberLevelId = #{m.memberLevelId}");
values.put("isDel", BaseEntity.NO);
values.put("appType", dto.getAppType());
- values.put("userLevel", user.getUserLevel());
+ values.put("memberLevelId", user.getMemberLevelId());
sqlSentence.setSqlSentence(sql.toString());
List<CureSetTime> cList = commonService.selectList(CureSetTimeMapper.class, sqlSentence);
@@ -312,8 +312,10 @@
//鐢ㄦ埛鎿嶄綔鏃讹紝瀵瑰簲涓埆鏃堕棿涓�0
if(dto.getOpType() == OperatorConstants.OP_TYPE_USER){
// mzTime = 0;
+ //榛樿鏍囧噯杞尮閰嶇殑瀹為檯闈㈣瘖鏃堕暱=绯荤粺闈㈣瘖鏃堕暱
+ dto.setRealMzTime(mzTime);
gtTime = 0;
- sqTime = 0;
+// sqTime = 0;
waitDuration = 0;
}
//鍐嶇敓椤圭洰鏃讹紝鍏朵粬鏃堕棿閮戒负0
@@ -475,7 +477,7 @@
}
ApponintmentVo aVo = null;
- ApponintmentVo aVo2 = null;
+// ApponintmentVo aVo2 = null;
String deviceErr = null;
//浠庡尰鐢熷彲鐢ㄦ椂闂撮噷闈紝鎷兼帴鍑哄綋澶╂渶灏忓彲浠ユ椂闂�
@@ -609,15 +611,21 @@
//鍒ゆ柇鐩稿悓鍚戜笅鍖归厤
if(aVoList.size() > 0)
{
- aVo2 = aVoList.get(0);
+ //閬嶅巻鍒ゆ柇鍖归厤鏃堕棿鏄惁閲嶅锛�
+ boolean isRepeat = false;
+ for(ApponintmentVo apponintmentVo : aVoList){
+ if(
+ (apponintmentVo.getStartTime().compareTo(aVo.getStartTime()) == 0 && apponintmentVo.getEndTime().compareTo(aVo.getEndTime()) == 0)
+ // || (aVo2.getMzStartTime().compareTo(aVo.getMzStartTime()) == 0 && aVo2.getMzEndTime().compareTo(aVo.getMzEndTime()) == 0)
+ // || (aVo2.getZlStartTime().compareTo(aVo.getZlStartTime()) ==0 && aVo2.getEndTime().compareTo(aVo.getEndTime()) == 0)
+ ){
+ isRepeat = true;
+ break;
+ }
+ }
- if(
- (aVo2.getStartTime().compareTo(aVo.getStartTime()) == 0 && aVo2.getEndTime().compareTo(aVo.getEndTime()) == 0)
- // || (aVo2.getMzStartTime().compareTo(aVo.getMzStartTime()) == 0 && aVo2.getMzEndTime().compareTo(aVo.getMzEndTime()) == 0)
- // || (aVo2.getZlStartTime().compareTo(aVo.getZlStartTime()) ==0 && aVo2.getEndTime().compareTo(aVo.getEndTime()) == 0)
- ){
- upOrDown = 1;
- }else{
+ //涓嶉噸澶嶅垯锛屽瓨鍌ㄥ搴斿彲鐢�
+ if(!isRepeat){
aVo.setHandleNum(handleNum);
aVo.setUpOrDown(upOrDown);
aVo.setProjectIds(projectIds);
@@ -638,6 +646,9 @@
//濡傛灉鏄笅鍗堝垎闅旂殑鍙互璺宠繃
break;
}
+ }else{
+ //閲嶅鍒欏悜涓嬪尮閰�
+ upOrDown = 1;
}
}else{
aVo.setHandleNum(handleNum);
--
Gitblit v1.8.0