productDev/dmvisit.git

			@@ -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">

			@@ -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()+"】条";

			@@ -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);

	admin/src/components/business/OperaCarsWindow.vue	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPrivilegeServiceImpl.java	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史