导出字段对接调整提交

lishuai

2023-12-26 2e7ba2bc0fbefa6ee0b44eaf1990a493795efe4a

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

@@ -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());
                }
            }
@@ -340,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());
                }
            }
        }
@@ -357,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);
@@ -375,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());