导出字段对接调整提交

lishuai

2023-12-26 2e7ba2bc0fbefa6ee0b44eaf1990a493795efe4a

 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java

@@ -110,7 +110,7 @@
    public  int  initHkConfig(){
        ErpConstants.approveUrl=systemDictDataBiz.queryByCode(Constants.ERP,Constants.ERP_APPROVE_URL).getCode();
        ErpConstants.orgListUrl=systemDictDataBiz.queryByCode(Constants.ERP,Constants.ERP_ORGLIST_URL).getCode();
        ErpConstants.userListUrl=systemDictDataBiz.queryByCode(Constants.ERP,Constants.ERP_USERSTATUS_RL).getCode();
        ErpConstants.userListUrl=systemDictDataBiz.queryByCode(Constants.ERP,Constants.ERP_USERLIST_URL).getCode();
        ErpConstants.userStatusUrl=systemDictDataBiz.queryByCode(Constants.ERP,Constants.ERP_USERSTATUS_RL).getCode();
        return  0;
    }
@@ -177,13 +177,15 @@
                    //如果已删除，加入删除集合中
                    delIds.add(company.getId());
                    continue;
                }else{
                    company.setIsdeleted(Constants.ZERO);
                }
                updateList.add(addUpdateCompanyModel(respone,company,date));
            }
        }
        if(allList!=null && allList.size()>0){
            for(Company  c : allList){
                if(isCompanyDeleted(c,list)){
                if(!isCompanyDeleted(c,list)){
                    delIds.add(c.getId());
                }
            }
@@ -221,6 +223,7 @@
        company.setName(respone.getName());
        company.setErpId(respone.getId());
        company.setCreateDate(date);
        company.setType(Constants.ONE);
        company.setCode(respone.getCode());
        company.setErpParentId(respone.getParentOrgId());
        company.setErpDate(date);
@@ -291,10 +294,11 @@
                        .set(Member::getHkStatus,Constants.ZERO)
                        .set(Member::getIsdeleted, Constants.ONE).in(Member::getId,delIds));
            }
            return "同步数据：新增【"+addList.size()+"】条，更新【"+updateList.size()+"】条，删除【"+delIds.size()+"】条";
        }else{
            throw  new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "同步ERP数据为空！");
        }
        return  null;

    }

    public void dealRoleEmpower(Member member,Date startTime , Date endTime){
@@ -338,9 +342,8 @@
        }
        if(allList!=null && allList.size()>0){
            for(Member  c : allList){
                if(isUserDeleted(c,list)){
                if(!Constants.equalsInteger(c.getIsdeleted(),Constants.ONE) &&  !isUserDeleted(c,list)){
                    delList.add(c);
//                    delIds.add(c.getId());
                }
            }
        }
@@ -355,6 +358,7 @@
        member.setErpDate(new Date());
        member.setErpId(param.getId());
        member.setFsStatus(Constants.ZERO);
        member.setStatus(param.getStatus());
        member.setType(Constants.memberType.internal);
        String encryptIdNo = DESUtil.encrypt(Constants.EDS_PWD,param.getIdNo());
        member.setIdcardNo(encryptIdNo);
@@ -373,6 +377,7 @@
        member.setIdcardDecode(Constants.getTuominStr(param.getIdNo()));
        member.setErpOrgId(param.getOrgId());
        member.setEditDate(new Date());
        member.setStatus(param.getStatus());
        member.setErpDate(new Date());
        member.setHkStatus(Constants.ZERO);
        member.setRoleIds(param.getRoleIds());