yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

useOrgSid存储部门sid 

createOrgSid存储分公司sid
zhanglei
God 1 year ago
parent
ac5a7e9296
commit
42f2679e69
6 changed files with 124 additions and 14 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 32
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupService.java
  2. 36
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicesubject/AsServiceSubjectService.java
  3. 36
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicetype/AsServiceTypeService.java
  4. 2
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierinfo/BaseSupplierInfoDto.java
  5. 30
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierinfo/BaseSupplierInfoService.java
  6. 2
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoDto.java

32
yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupService.java
View File

@ -43,6 +43,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
/**
@ -83,11 +84,34 @@ public class AsServiceGroupService extends MybatisBaseService<AsServiceGroupMapp
public void saveOrUpdateDto(AsServiceGroupDto dto){
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
String deptName = "";
String deptSid = "";
String createOrgSid = "";
String orgPath = dto.getOrgPath();
String createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(createOrgSid).getData();
dto.setCreateOrgSid(createOrgSid);
dto.setCreateOrgName(sysOrganizationVo.getName());
if (StringUtils.isNotBlank(orgPath)) {
List<String> split = Arrays.asList(orgPath.split("/"));
if (split.size() > 1) {
//获取本级sid获取本级部门信息
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(split.size() - 2)).getData();
SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData();
deptName = sysOrganization.getName() + "/" + sysOrganization1.getName();
deptName = sysOrganization1.getName();
deptSid = sysOrganization1.getSid();
} else {
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData();
deptName = sysOrganization.getName();
deptName = sysOrganization.getName();
deptSid = sysOrganization.getSid();
}
dto.setUseOrgSid(deptSid);
createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
//创建组织使用组织
ResultBean<SysOrganizationVo> organizationResultBean = sysOrganizationFeign.fetchBySid(createOrgSid);
if (organizationResultBean.getData() != null) {
dto.setCreateOrgSid(createOrgSid);
dto.setCreateOrgName(organizationResultBean.getData().getName());
}
}
this.insertByDto(dto);
return;
}

36
yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicesubject/AsServiceSubjectService.java
View File

@ -31,6 +31,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationVo;
import com.yxt.anrui.as.feign.portal.sysstafforg.SysStaffOrgFeign;
import com.yxt.common.core.result.ResultBean;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
@ -45,6 +46,9 @@ import com.yxt.anrui.as.api.asservicesubject.AsServiceSubjectDto;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Arrays;
import java.util.List;
/**
* Project: yxt-as(售后服务) <br/>
* File: AsServiceSubjectService.java <br/>
@ -83,12 +87,34 @@ public class AsServiceSubjectService extends MybatisBaseService<AsServiceSubject
public void saveOrUpdateDto(AsServiceSubjectDto dto){
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
String deptName = "";
String deptSid = "";
String createOrgSid = "";
String orgPath = dto.getOrgPath();
String createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(createOrgSid).getData();
dto.setCreateOrgSid(createOrgSid);
dto.setCreateOrgName(sysOrganizationVo.getName());
dto.setUseOrgSid(createOrgSid);
if (StringUtils.isNotBlank(orgPath)) {
List<String> split = Arrays.asList(orgPath.split("/"));
if (split.size() > 1) {
//获取本级sid获取本级部门信息
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(split.size() - 2)).getData();
SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData();
deptName = sysOrganization.getName() + "/" + sysOrganization1.getName();
deptName = sysOrganization1.getName();
deptSid = sysOrganization1.getSid();
} else {
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData();
deptName = sysOrganization.getName();
deptName = sysOrganization.getName();
deptSid = sysOrganization.getSid();
}
dto.setUseOrgSid(deptSid);
createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
//创建组织使用组织
ResultBean<SysOrganizationVo> organizationResultBean = sysOrganizationFeign.fetchBySid(createOrgSid);
if (organizationResultBean.getData() != null) {
dto.setCreateOrgSid(createOrgSid);
dto.setCreateOrgName(organizationResultBean.getData().getName());
}
}
this.insertByDto(dto);
return;
}

36
yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicetype/AsServiceTypeService.java
View File

@ -31,6 +31,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationVo;
import com.yxt.anrui.as.feign.portal.sysstafforg.SysStaffOrgFeign;
import com.yxt.common.core.result.ResultBean;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
@ -45,6 +46,9 @@ import com.yxt.anrui.as.api.asservicetype.AsServiceTypeDto;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Arrays;
import java.util.List;
/**
* Project: yxt-as(售后服务) <br/>
* File: AsServiceTypeService.java <br/>
@ -83,12 +87,34 @@ public class AsServiceTypeService extends MybatisBaseService<AsServiceTypeMapper
public void saveOrUpdateDto(AsServiceTypeDto dto) {
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
String deptName = "";
String deptSid = "";
String createOrgSid = "";
String orgPath = dto.getOrgPath();
String createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(createOrgSid).getData();
dto.setUseOrgSid(createOrgSid);
dto.setCreateOrgSid(createOrgSid);
dto.setCreateOrgName(sysOrganizationVo.getName());
if (StringUtils.isNotBlank(orgPath)) {
List<String> split = Arrays.asList(orgPath.split("/"));
if (split.size() > 1) {
//获取本级sid获取本级部门信息
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(split.size() - 2)).getData();
SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData();
deptName = sysOrganization.getName() + "/" + sysOrganization1.getName();
deptName = sysOrganization1.getName();
deptSid = sysOrganization1.getSid();
} else {
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData();
deptName = sysOrganization.getName();
deptName = sysOrganization.getName();
deptSid = sysOrganization.getSid();
}
dto.setUseOrgSid(deptSid);
createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
//创建组织使用组织
ResultBean<SysOrganizationVo> organizationResultBean = sysOrganizationFeign.fetchBySid(createOrgSid);
if (organizationResultBean.getData() != null) {
dto.setCreateOrgSid(createOrgSid);
dto.setCreateOrgName(organizationResultBean.getData().getName());
}
}
this.insertByDto(dto);
return;
}

2
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierinfo/BaseSupplierInfoDto.java
View File

@ -118,6 +118,8 @@ public class BaseSupplierInfoDto implements Dto {
private String createOrgName; // 创建组织名称
@ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid
@ApiModelProperty("组织全路径")
private String orgPath;
@ApiModelProperty("开户行信息")
private List<BaseSupplierBankDto> baseSupplierBankList = new ArrayList<>();
}

30
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierinfo/BaseSupplierInfoService.java
View File

@ -33,6 +33,7 @@ import com.yxt.base.biz.base.basesupplierBank.BaseSupplierBankDetailsVo;
import com.yxt.base.biz.base.basesupplierBank.BaseSupplierBankDto;
import com.yxt.base.biz.base.basesupplierBank.BaseSupplierBankService;
import com.yxt.base.feign.portal.sysorganization.SysOrganizationFeign;
import com.yxt.base.feign.portal.sysorganization.SysOrganizationVo;
import com.yxt.base.feign.portal.sysstafforg.SysStaffOrgFeign;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
@ -43,6 +44,7 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Arrays;
import java.util.List;
/**
@ -98,6 +100,34 @@ public class BaseSupplierInfoService extends MybatisBaseService<BaseSupplierInfo
String dtoSid = dto.getSid();
List<BaseSupplierBankDto> baseSupplierBankDtoList = dto.getBaseSupplierBankList();
if (StringUtils.isBlank(dtoSid)) {
String deptName = "";
String deptSid = "";
String createOrgSid = "";
String orgPath = dto.getOrgPath();
if (StringUtils.isNotBlank(orgPath)) {
List<String> split = Arrays.asList(orgPath.split("/"));
if (split.size() > 1) {
//获取本级sid获取本级部门信息
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(split.size() - 2)).getData();
SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData();
deptName = sysOrganization.getName() + "/" + sysOrganization1.getName();
deptName = sysOrganization1.getName();
deptSid = sysOrganization1.getSid();
} else {
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData();
deptName = sysOrganization.getName();
deptName = sysOrganization.getName();
deptSid = sysOrganization.getSid();
}
dto.setUseOrgSid(deptSid);
createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
//创建组织使用组织
ResultBean<SysOrganizationVo> organizationResultBean = sysOrganizationFeign.fetchBySid(createOrgSid);
if (organizationResultBean.getData() != null) {
dto.setCreateOrgSid(createOrgSid);
dto.setCreateOrgName(organizationResultBean.getData().getName());
}
}
String sid = this.insertByDto(dto);
for (BaseSupplierBankDto baseSupplierBankDto : baseSupplierBankDtoList) {
baseSupplierBankDto.setSupplierSid(sid);

2
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoDto.java
View File

@ -117,6 +117,8 @@ public class PmsSupplierInfoDto implements Dto {
private String createOrgName; // 创建组织名称
@ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid
@ApiModelProperty("组织全路径")
private String orgPath;
@ApiModelProperty("开户行信息")
private List<PmsSupplierBankDto> pmsSupplierBankList = new ArrayList<>();
}
Write Preview
Loading…
Cancel
Save