From 864918cd96b6eec16598dc00a71a3372367545a1 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期日, 17 三月 2024 10:37:24 +0800
Subject: [PATCH] aaa
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java | 56 +++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 39 insertions(+), 17 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java
index 47cb4d7..77d1a3e 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java
@@ -49,6 +49,8 @@
@Autowired
private EmpowerMapper empowerMapper;
@Autowired
+ private ParkBookMapper bookMapper;
+ @Autowired
private MemberCardMapper memberCardMapper;
@Autowired
private MemberJoinMapper memberMapper;
@@ -209,7 +211,6 @@
model.setOrgIndexCode(c.getHkId());
model.setOrgName(c.getName());
return model;
-
}
/**
@@ -228,7 +229,7 @@
List<String> fIds = new ArrayList<>();
if(result.getData()!=null){
for(OrgUpdateFailureResponse r : result.getData()){
- if(!r.getCode().equals("0x00052102")){
+ if(r.getCode().equals("0x00052102")){
//涓嶅瓨鍦ㄧ殑涔熺畻鍒犻櫎鎴愬姛
fIds.add(r.getOrgIndexCode());//鍒犻櫎澶辫触鐨勬暟鎹泦鍚�
}
@@ -267,7 +268,9 @@
// .isNotNull(Member::getFaceId
.leftJoin(Company.class,Company::getId,Member::getCompanyId)
.eq(Member::getHkStatus,Constants.ZERO)
+ .eq(Member::getStatus,Constants.ZERO)
.eq(Member::getType,Constants.memberType.internal)
+ .notExists("select d.id from empower d where d.member_id=t.id and d.send_status in (1,5)")//鎺掗櫎鏈夋鍦ㄥ悓姝ヤ笅鍙戜换鍔＄殑鏁版嵁
.orderByAsc(Member::getErpDate));
if(list ==null || list.size()==0){
return;
@@ -329,13 +332,20 @@
}
return false;
}
- private void dealDelMemberRoleEmpower(Member member ) {
+ private int dealDelMemberRoleEmpower(Member member ) {
//寰呯Щ闄ゆ潈闄愮殑璁惧鏁版嵁鎺堟潈璁板綍锛堥拡瀵瑰垹闄ゅ拰鏇存柊涓㈠け鐨勬潈闄愶紝闇�瑕佸悓姝ヤ笅鍙戝垹闄ゆ潈闄愶級
- empowerMapper.update(null,new UpdateWrapper<Empower>().lambda()
- .eq(Empower::getMemberId,member.getId())
- .set(Empower::getIsdeleted,Constants.ONE)
- .eq(Empower::getIsdeleted,Constants.ZERO)
- .set(Empower::getSendStatus,Constants.ZERO));
+ bookMapper.update(null,new UpdateWrapper<ParkBook>().lambda()
+ .eq(ParkBook::getMemberId,member.getId())
+ .set(ParkBook::getRemark,"绛夊緟鍚屾鍒犻櫎瀹夐槻骞冲彴")
+ .set(ParkBook::getIsdeleted,Constants.ONE)
+ .eq(ParkBook::getIsdeleted,Constants.ZERO)
+ .set(ParkBook::getHkStatus,Constants.ZERO));
+ return empowerMapper.update(null,new UpdateWrapper<Empower>().lambda()
+ .eq(Empower::getMemberId,member.getId())
+ .set(Empower::getIsdeleted,Constants.ONE)
+ .set(Empower::getRemark,"绛夊緟鍚屾鍒犻櫎瀹夐槻骞冲彴")
+ .eq(Empower::getIsdeleted,Constants.ZERO)
+ .set(Empower::getSendStatus,Constants.ZERO));
}
private void dealMemberRoleEmpower(Member member ) {
//澶勭悊鏂板鐨勪汉鍛樺崱鐗囨暟鎹紙涓庢捣搴峰悓姝ワ級
@@ -349,6 +359,12 @@
}
List<Integer> doorIds = getRoleIdByParam(member,deviceRoleMapper);
if(doorIds==null || doorIds.size() == 0){
+ //濡傛灉鏉冮檺娓呯┖锛屽垯娓呯┖浜哄憳鎺堟潈鐨勬潈闄愭暟鎹�
+ empowerMapper.update(null,new UpdateWrapper<Empower>().lambda()
+ .eq(Empower::getMemberId,member.getId())
+ .set(Empower::getIsdeleted,Constants.ONE)
+ .eq(Empower::getIsdeleted,Constants.ZERO)
+ .set(Empower::getSendStatus,Constants.ZERO));
return;
}
if(StringUtils.isBlank(member.getFaceImg())){
@@ -487,15 +503,21 @@
c.setHkStatus(Constants.ONE);
if(Constants.equalsInteger(Constants.ONE,c.getIsdeleted())){
//澶勭悊鍒犻櫎鏁版嵁锛堝垹闄や箣鍓嶄笅鍙戠殑娴峰悍浜哄憳鏉冮檺淇℃伅锛�
- dealDelMemberRoleEmpower(c);
- c.setHkStatus(Constants.FOUR );
- c.setRemark( "绛夊緟鍒犻櫎鎺堟潈锛�");
- /*boolean r = doHkDeleteUser(c.getId(),c.getHkId(),date);
- c.setHkStatus(r?Constants.ONE:Constants.TWO);
- c.setRemark(r?null:"鍒犻櫎娴峰悍浜哄憳淇℃伅澶辫触锛�");
- c.setIsdeleted(r? Constants.ONE: Constants.ZERO);//鍒犻櫎澶辫触锛屾仮澶嶆暟鎹�
- //鍒犻櫎鎵�鏈夌粦瀹氱殑鍗＄墖淇℃伅
- memberCardMapper.delete(new QueryWrapper<MemberCard>().lambda().eq(MemberCard::getMemberId,c.getId()));*/
+ int rr = dealDelMemberRoleEmpower(c);
+ if(rr >0){
+ //濡傛灉鏈夋瑠闄愬緟鍒櫎锛岀瓑寰呭垹闄ゅ畬鎴愬啀鍒犻櫎浜哄憳
+ c.setHkStatus(Constants.FOUR );
+ c.setRemark( "绛夊緟鍒犻櫎鎺堟潈锛�");
+ }else{
+ //娌℃湁鏉冮檺鐩存帴鍒犻櫎浜哄憳
+ boolean r = doHkDeleteUser(c.getId(),c.getHkId(),date);
+ c.setHkStatus(r?Constants.ONE:Constants.TWO);
+ c.setRemark(r?null:"鍒犻櫎娴峰悍浜哄憳淇℃伅澶辫触锛�");
+ c.setIsdeleted(r? Constants.ONE: Constants.ZERO);//鍒犻櫎澶辫触锛屾仮澶嶆暟鎹�
+ //鍒犻櫎鎵�鏈夌粦瀹氱殑鍗＄墖淇℃伅
+ memberCardMapper.delete(new QueryWrapper<MemberCard>().lambda().eq(MemberCard::getMemberId,c.getId()));
+ }
+
}else{
//澶勭悊淇敼鏁版嵁锛屽苟涓旀洿鏂颁汉鑴�
UserAddRequest addHkModel = getUserAddModel(c,path,1);//淇敼
--
Gitblit v1.9.3