From 909ee569d4d8bfc523cb71790a5e6f59405d78b7 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 20 二月 2024 14:01:58 +0800
Subject: [PATCH] 大屏
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserFERPServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java
similarity index 97%
rename from server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserFERPServiceImpl.java
rename to server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java
index faa89fe..299175e 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserFERPServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java
@@ -3,12 +3,11 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.doumee.biz.system.SystemDictDataBiz;
+import com.doumee.config.DataSyncConfig;
import com.doumee.core.constants.ResponseStatus;
-import com.doumee.core.erp.model.openapi.request.UserUpdateRequest;
import com.doumee.core.erp.model.openapi.request.erp.UserFailRequest;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.haikang.model.HKConstants;
-import com.doumee.core.haikang.model.HKTools;
import com.doumee.core.haikang.model.param.BaseResponse;
import com.doumee.core.haikang.model.param.request.*;
import com.doumee.core.haikang.model.param.respose.*;
@@ -18,12 +17,10 @@
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.ImageBase64Util;
import com.doumee.dao.business.*;
-import com.doumee.dao.business.join.CompanyJoinMapper;
import com.doumee.dao.business.join.MemberJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.service.business.ERPSyncService;
import com.doumee.service.business.impl.hksync.HkSyncBaseServiceImpl;
-import com.github.yulichang.query.MPJQueryWrapper;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
@@ -41,7 +38,7 @@
*/
@Service
@Slf4j
-public class HkSyncOrgUserServiceImpl extends HkSyncBaseServiceImpl {
+public class HkSyncOrgUserFERPServiceImpl extends HkSyncBaseServiceImpl {
@Autowired
private CompanyMapper companyMapper;
@@ -61,13 +58,15 @@
private ERPSyncService erpSyncService;
@Autowired
private SystemDictDataBiz systemDictDataBiz;
+ @Autowired
+ private DataSyncConfig dataSyncConfig;
/**
* 鍚屾娴峰悍缁勭粐淇℃伅,鏍规嵁erp鍚屾缁勭粐缁撴灉锛屽畾鏃舵鏌ラ渶瑕佷笅鍙戝埌娴峰悍鐨勭粍缁囦俊鎭�
*/
@Override
public void syncOrgData(){
- if(Constants.DEALING_HK_ORG){
+ if(Constants.DEALING_HK_ORG || Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) != DataSyncConfig.origin.erp){
return ;
}
Constants.DEALING_HK_ORG =true;
@@ -258,7 +257,7 @@
*/
@Override
public void syncUserData(){
- if(Constants.DEALING_HK_USER){
+ if(Constants.DEALING_HK_USER || Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) != DataSyncConfig.origin.erp){
return ;
}
Constants.DEALING_HK_USER =true;
@@ -266,7 +265,7 @@
//鏌ヨ鎵�鏈夐渶瑕佸悓姝ョ殑浼佷笟鏁版嵁
List<Member> list = memberMapper.selectJoinList(Member.class,new MPJLambdaWrapper<Member>()
.selectAll(Member.class )
- .selectAs(Company::getHkId,Member::getCompanyHkId)
+ .selectAs(Company::getHkId,Member::getHkOrgId)
.isNotNull(Member::getFaceImg)
.leftJoin(Company.class,Company::getId,Member::getCompanyId)
.eq(Member::getHkStatus,Constants.ZERO)
@@ -426,7 +425,7 @@
}
CardInfoRequest cr = new CardInfoRequest();
cr.setCardNo(m.getCode());
- cr.setOrgIndexCode(member.getCompanyHkId());
+ cr.setOrgIndexCode(member.getHkOrgId());
cr.setPersonId(member.getHkId());
cr.setCardType(m.getType());
param.getCardList().add(cr);
@@ -648,7 +647,7 @@
private UserAddRequest getUserAddModel(Member c,String path,int type) {
UserAddRequest model = new UserAddRequest();
- model.setOrgIndexCode(c.getCompanyHkId());
+ model.setOrgIndexCode(c.getHkOrgId());
model.setJobNo(c.getCode());
model.setCertificateNo(DESUtil.decrypt(Constants.EDS_PWD, c.getIdcardNo()));
model.setCertificateType(HKConstants.CertificateType.SHENFENZHENG.getKey()+"");
--
Gitblit v1.9.3