productDev/dmvisit.git

			@@ -8,6 +8,9 @@
			<el-form-item label="模块名称" prop="module">
			<el-input v-model="searchForm.module" placeholder="请输入发布人" @keypress.enter.native="search"></el-input>
			</el-form-item>
			<el-form-item label="备注" prop="remark">
			<el-input v-model="searchForm.remark" placeholder="请输入发布人" @keypress.enter.native="search"></el-input>
			</el-form-item>
			<section>
			<el-button type="primary" @click="search">搜索</el-button>
			<!-- <el-button type="primary" :loading="isWorking.export" v-permissions="['business:devices:exportExcel']" @click="exportExcel">导出</el-button> -->
			@@ -83,7 +86,8 @@
			searchForm: {
			id: '',
			beanName: '',
			module: ''
			module: '',
			remark: ''
			},
			pausing:false,
			running:false,

			@@ -890,9 +890,11 @@
			.in(Retention::getCarNo,delRetentionList));
			}
			if(delMemberRetentionList.size()>0){
			//先删除原有的在场人员(内部人员和访客）
			//先删除原有的在场人员(内部人员、相关方和访客）
			retentionMapper.delete(new UpdateWrapper<Retention>().lambda()
			.in(Retention::getType,Constants.memberType.internal,Constants.memberType.visitor)
			.in(Retention::getType,Constants.RetentionMemberType.internalMember
			,Constants.RetentionMemberType.relMember
			,Constants.RetentionMemberType.fk)
			.in(Retention::getMemberId,delMemberRetentionList));
			}
			if(retentionList.size()>0){

			@@ -678,7 +678,10 @@
			}
			info.setPhoneNo(c.getPhone());
			info.setPlateNo(c.getCarNos());
			info.setGender(c.getSex()==null?"1":c.getSex()+"");
			info.setGender( "1" );
			if(Constants.equalsInteger(c.getSex(),Constants.ONE) \|\|Constants.equalsInteger(c.getSex(),Constants.TWO) ){
			info.setGender( c.getSex()+"");
			}
			if(Constants.equalsInteger(c.getIdcardType(),Constants.ZERO)){
			info.setCertificateType(HKConstants.CertificateType.SHENFENZHENG.getKey()+"");
			info.setCertificateNo(DESUtil.decrypt(Constants.EDS_PWD, c.getIdcardNo()));
			@@ -726,8 +729,10 @@
			}
			info.setPhoneNo(c.getPhone());
			info.setPlateNo(c.getCarNos());
			info.setGender( "1");
			if(Constants.equalsInteger(c.getSex(),Constants.ONE) \|\|Constants.equalsInteger(c.getSex(),Constants.TWO) ){
			info.setGender(c.getSex()+"");
			info.setGender(c.getSex()==null?"1":c.getSex()+"");
			}
			if(Constants.equalsInteger(c.getIdcardType(),Constants.ZERO)){
			info.setCertificateType(HKConstants.CertificateType.SHENFENZHENG.getKey()+"");
			info.setCertificateNo(DESUtil.decrypt(Constants.EDS_PWD, c.getIdcardNo()));

	admin/src/views/timer/timer.vue	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncVisitServiceImpl.java	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史