From a254510ced8108c0cde37eb31a6b3e6469fcb2fb Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 04 三月 2024 13:51:50 +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, 26 insertions(+), 9 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 fed9403..47cb4d7 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
@@ -264,9 +264,10 @@
List<Member> list = memberMapper.selectJoinList(Member.class,new MPJLambdaWrapper<Member>()
.selectAll(Member.class )
.selectAs(Company::getHkId,Member::getHkOrgId)
- .isNotNull(Member::getFaceImg)
+// .isNotNull(Member::getFaceId
.leftJoin(Company.class,Company::getId,Member::getCompanyId)
.eq(Member::getHkStatus,Constants.ZERO)
+ .eq(Member::getType,Constants.memberType.internal)
.orderByAsc(Member::getErpDate));
if(list ==null || list.size()==0){
return;
@@ -314,7 +315,7 @@
return null;
}
@Transactional
- private boolean dealMemberInfoBiz(Member c, Date date, String path) {
+ public boolean dealMemberInfoBiz(Member c, Date date, String path) {
if( c.getCompanyId() == null){
//濡傛灉娌℃湁缁勭粐涓嶅仛澶勭悊
return false;
@@ -327,6 +328,14 @@
dealUserHkEditBiz(c,date,path);
}
return false;
+ }
+ private void 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));
}
private void dealMemberRoleEmpower(Member member ) {
//澶勭悊鏂板鐨勪汉鍛樺崱鐗囨暟鎹紙涓庢捣搴峰悓姝ワ級
@@ -373,7 +382,6 @@
deviceIds.add(deviceRole.getId());
list.add(model);
}
-
}
//寰呯Щ闄ゆ潈闄愮殑璁惧鏁版嵁鎺堟潈璁板綍锛堥拡瀵瑰垹闄ゅ拰鏇存柊涓㈠け鐨勬潈闄愶紝闇�瑕佸悓姝ヤ笅鍙戝垹闄ゆ潈闄愶級
empowerMapper.update(null,new UpdateWrapper<Empower>().lambda()
@@ -478,13 +486,16 @@
private void dealUserHkEditBiz(Member c, Date date, String path) {
c.setHkStatus(Constants.ONE);
if(Constants.equalsInteger(Constants.ONE,c.getIsdeleted())){
- //澶勭悊鍒犻櫎鏁版嵁锛堝垹闄や箣鍓嶄笅鍙戠殑娴峰悍浜哄憳淇℃伅锛�
- boolean r = doHkDeleteUser(c.getId(),c.getHkId(),date);
+ //澶勭悊鍒犻櫎鏁版嵁锛堝垹闄や箣鍓嶄笅鍙戠殑娴峰悍浜哄憳鏉冮檺淇℃伅锛�
+ 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()));
+ memberCardMapper.delete(new QueryWrapper<MemberCard>().lambda().eq(MemberCard::getMemberId,c.getId()));*/
}else{
//澶勭悊淇敼鏁版嵁锛屽苟涓旀洿鏂颁汉鑴�
UserAddRequest addHkModel = getUserAddModel(c,path,1);//淇敼
@@ -537,6 +548,7 @@
noticeErpFail(c,Constants.ZERO,"浜鸿劯鐓х墖涓嶅瓨鍦紝鑾峰彇澶辫触锛�");
c.setHkStatus(Constants.TWO);
c.setRemark("浜鸿劯鐓х墖涓嶅瓨鍦紝鑾峰彇澶辫触锛�");
+ c.setHkDate(new Date());
memberMapper.updateById(c);
return false;
}
@@ -546,6 +558,7 @@
c.setFaceId(result.getData().getFaceId());
c.setHkStatus(Constants.ONE);
c.setHkId(addHkModel.getPersonId());
+ c.setHkDate(new Date());
memberMapper.updateById(c);
dealMemberRoleEmpower(c);
return true;
@@ -553,6 +566,7 @@
noticeErpFail(c,Constants.ZERO,"浜哄憳淇℃伅鍚屾瀹夐槻骞冲彴澶辫触锛岃淇鍚庨噸璇曪紒"+result.getCode()+result.getMsg());
c.setHkStatus(Constants.TWO);
c.setRemark("浜哄憳淇℃伅鍚屾瀹夐槻骞冲彴澶辫触锛岃淇鍚庨噸璇曪紒"+(result!=null?result.getMsg():""));
+ c.setHkDate(new Date());
memberMapper.updateById(c);
return false;
}
@@ -571,9 +585,12 @@
return response.getData().getFaceId();
}
}else{
- BaseResponse response = HKService.editFace(getFaceUpdateModel(c,path));
- if(StringUtils.equals(response.getCode(),HKConstants.RESPONSE_SUCCEE) ){
- return c.getFaceId();
+ FaceEditRequest param =getFaceUpdateModel(c,path);
+ if(param !=null){
+ BaseResponse response = HKService.editFace(param);
+ if(StringUtils.equals(response.getCode(),HKConstants.RESPONSE_SUCCEE) ){
+ return c.getFaceId();
+ }
}
}
return null;
--
Gitblit v1.9.3