From 596b91470dd6a0c8a95f784ec4cda6d35161d37c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 06 五月 2025 11:26:07 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java | 4 ++--
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPrivilegeServiceImpl.java | 10 +++++-----
admin/src/components/business/OperaCarsWindow.vue | 8 ++++----
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/admin/src/components/business/OperaCarsWindow.vue b/admin/src/components/business/OperaCarsWindow.vue
index 2b59642..376a3da 100644
--- a/admin/src/components/business/OperaCarsWindow.vue
+++ b/admin/src/components/business/OperaCarsWindow.vue
@@ -42,10 +42,10 @@
noOptionsText="娌℃湁鍙�夐」"
noResultsText="娌℃湁鍖归厤鐨勭粨鏋�" />
<!-- <el-select v-model="form.groupId" @change="changeSel" clearable filterable placeholder="璇烽�夋嫨">
- <template v-for="item in companyList">
- <el-option v-if="item.countNum && item.countNum>0" :key="item.id" :label="item.name" :value="item.id">
- </el-option>
- </template>
+ <template v-for="item in companyList">
+ <el-option v-if="item.countNum && item.countNum>0" :key="item.id" :label="item.name" :value="item.id">
+ </el-option>
+ </template>
</el-select>-->
</el-form-item>
<el-form-item label="閫夋嫨杞︿富锛�" prop="memberId">
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPrivilegeServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPrivilegeServiceImpl.java
index 8a4dae5..3b4ed18 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPrivilegeServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPrivilegeServiceImpl.java
@@ -29,7 +29,7 @@
public class HkSyncPrivilegeServiceImpl extends HkSyncBaseServiceImpl {
@Autowired
- private DeviceRoleMapper DeviceRoleMapper;
+ private DeviceRoleMapper deviceRoleMapper;
/**
* 鍚屾娴峰悍璁垮缁勬潈闄愭暟鎹�
* @param param
@@ -52,7 +52,7 @@
List<Integer> types = new ArrayList<>();
types.add(Constants.DOOR_ROLE_TYPE.fk);
types.add(Constants.DOOR_ROLE_TYPE.lw);
- List<DeviceRole> allList = DeviceRoleMapper.selectList(new QueryWrapper<DeviceRole>().lambda().in(DeviceRole::getType,types).eq(DeviceRole::getIsdeleted,Constants.ZERO));
+ List<DeviceRole> allList = deviceRoleMapper.selectList(new QueryWrapper<DeviceRole>().lambda().in(DeviceRole::getType,types).eq(DeviceRole::getIsdeleted,Constants.ZERO));
boolean hasNext = true;
int curTotal = 0;
int curPage = 1;
@@ -88,15 +88,15 @@
if(deleteList.size()>0){
//閫昏緫鍒犻櫎
for(DeviceRole d : deleteList){
- DeviceRoleMapper.updateById(d);
+ deviceRoleMapper.updateById(d);
}
}
if(addList.size()>0){
- DeviceRoleMapper.insert(addList);
+ deviceRoleMapper.insert(addList);
}
if(editList.size()>0){
for(DeviceRole d : editList){
- DeviceRoleMapper.updateById(d);
+ deviceRoleMapper.updateById(d);
}
}
return "鍚屾鏁版嵁锛氭柊澧炪��"+addList.size()+"銆戞潯锛屾洿鏂般��"+editList.size()+"銆戞潯锛屽垹闄ゃ��"+deleteList.size()+"銆戞潯";
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
index d33e14b..0806679 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
@@ -1063,10 +1063,10 @@
inoutRecordList.add(copyObj);
index++;
if(Constants.equalsInteger(carrecord.getInOrOut(),Constants.ONE)){
- //濡傛灉鏄溅杈嗗嚭鍥尯锛岃瀹㈢敵璇疯嚜鍔ㄧ绂�
- //缁熻璁垮杩涘叆鏁�
+ //濡傛灉鏄溅杈嗗嚭鍥尯 缁熻璁垮杩涘叆鏁�
inoutDayCount.setOutVisitorNum(Constants.formatIntegerNum(inoutDayCount.getOutVisitorNum())+1);
try {
+ //璁垮鐢宠鑷姩绛剧
visitsService.visitLevelForCarOut(v);
//缁熻绛剧鏁�
inoutDayCount.setLeaveVisitorNum(Constants.formatIntegerNum(inoutDayCount.getLeaveVisitorNum())+1);
--
Gitblit v1.9.3