From 52f8e08715abd234c3bd6908e4338b1da1d8b0b4 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 18 三月 2024 13:35:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java | 35 +++++++++++++++++++++++++++++++----
1 files changed, 31 insertions(+), 4 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 777cb11..572e8ff 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
@@ -20,6 +20,7 @@
import com.doumee.service.business.ext.ERPSyncService;
import com.doumee.service.business.impl.hksync.HkSyncBaseServiceImpl;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import io.swagger.models.auth.In;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
@@ -48,6 +49,8 @@
private DeviceMapper deviceMapper;
@Autowired
private EmpowerMapper empowerMapper;
+ @Autowired
+ private ParkBookMapper bookMapper;
@Autowired
private MemberCardMapper memberCardMapper;
@Autowired
@@ -209,7 +212,6 @@
model.setOrgIndexCode(c.getHkId());
model.setOrgName(c.getName());
return model;
-
}
/**
@@ -269,6 +271,7 @@
.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;
@@ -304,7 +307,8 @@
String[] ss = doorids.split(",");
try {
for(String s :ss){
- r.add(Integer.parseInt(s));
+ Integer ts =Integer.parseInt(s);
+ r.add(ts);
}
}catch (Exception e){
//鑴忔暟鎹笉澶勭悊
@@ -315,6 +319,16 @@
}
return null;
}
+
+ private static boolean isNorExistInList(Integer ts, List<Integer> list) {
+ for(Integer r :list){
+ if(Constants.equalsInteger(ts,r)){
+ return true;
+ }
+ }
+ return false;
+ }
+
@Transactional
public boolean dealMemberInfoBiz(Member c, Date date, String path) {
if( c.getCompanyId() == null){
@@ -332,9 +346,16 @@
}
private int dealDelMemberRoleEmpower(Member member ) {
//寰呯Щ闄ゆ潈闄愮殑璁惧鏁版嵁鎺堟潈璁板綍锛堥拡瀵瑰垹闄ゅ拰鏇存柊涓㈠け鐨勬潈闄愶紝闇�瑕佸悓姝ヤ笅鍙戝垹闄ゆ潈闄愶級
+ 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));
}
@@ -350,6 +371,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())){
@@ -410,7 +437,7 @@
private List<MemberCard> dealMemberHkCard(Member member) {
List<MemberCard> memberCards = memberCardMapper.selectList(new QueryWrapper<MemberCard>().lambda()
.eq(MemberCard::getMemberId,member.getId())
- .eq(MemberCard::getType,Constants.TWO)
+// .eq(MemberCard::getType,Constants.TWO)
.eq(MemberCard::getHkStatus,Constants.ZERO) );
if(memberCards==null || memberCards.size()==0){
//娌℃湁甯﹀鐞嗙殑鏁版嵁锛岀洿鎺ヨ烦杩�
@@ -471,7 +498,7 @@
public static List<MemberCard> getNormalCardList(Member member,MemberCardMapper memberCardMapper) {
return memberCardMapper.selectList(new QueryWrapper<MemberCard>().lambda()
.eq(MemberCard::getMemberId,member.getId())
- .eq(MemberCard::getType,Constants.TWO)
+// .eq(MemberCard::getType,Constants.TWO)
.eq(MemberCard::getStatus,Constants.MemberCard.normal)
.eq(MemberCard::getHkStatus,Constants.ONE) );
--
Gitblit v1.9.3