From 40c628dbd5239699d9511f756506bd119e97dfbd Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 08 五月 2025 15:58:51 +0800
Subject: [PATCH] 最新版本541200007
---
admin/src/views/timer/timer.vue | 6 +++++-
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java | 6 ++++--
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncVisitServiceImpl.java | 11 ++++++++---
3 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/admin/src/views/timer/timer.vue b/admin/src/views/timer/timer.vue
index fc76f3e..06fe4cf 100644
--- a/admin/src/views/timer/timer.vue
+++ b/admin/src/views/timer/timer.vue
@@ -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,
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 337f753..c2c4691 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
@@ -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){
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncVisitServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncVisitServiceImpl.java
index bd6cf76..5e69f9a 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncVisitServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncVisitServiceImpl.java
@@ -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(c.getSex()+"");
- 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()));
--
Gitblit v1.9.3