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

修改班组查询接口

master
fanzongzhe 11 months ago
parent
43bd2379c5
commit
838fc1e63c
3 changed files with 131 additions and 136 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. 2
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupMapper.xml
  2. 4
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupRest.java
  3. 261
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupService.java

2
yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupMapper.xml
View File

@ -13,7 +13,7 @@
select sid as groupSid,
groupName
from as_service_group
where createOrgSid = #{useOrgSid}
where useOrgSid = #{useOrgSid}
and isDelete = '0'
</select>
</mapper>

4
yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupRest.java
View File

@ -67,9 +67,9 @@ public class AsServiceGroupRest {
@ApiOperation("查询分公司班组信息")
@PostMapping("/getGroupList")
public ResultBean<List<AsServiceGroupListVo>> getGroupList(@RequestParam("orgPath") String orgPath) {
public ResultBean<List<AsServiceGroupListVo>> getGroupList(@RequestParam("useOrgSid") String useOrgSid) {
ResultBean rb = ResultBean.fireFail();
List<AsServiceGroupListVo> list = asServiceGroupService.getGroupList(orgPath);
List<AsServiceGroupListVo> list = asServiceGroupService.getGroupList(useOrgSid);
return rb.success().setData(list);
}

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

@ -65,150 +65,145 @@ import java.util.List;
@Service
public class AsServiceGroupService extends MybatisBaseService<AsServiceGroupMapper, AsServiceGroup> {
@Autowired
private SysStaffOrgFeign sysStaffOrgFeign;
@Autowired
private SysOrganizationFeign sysOrganizationFeign;
@Autowired
private SysUserFeign sysUserFeign;
@Autowired
private SysStaffOrgFeign sysStaffOrgFeign;
@Autowired
private SysOrganizationFeign sysOrganizationFeign;
@Autowired
private SysUserFeign sysUserFeign;
public PagerVo<AsServiceGroupVo> listPageVo(PagerQuery<AsServiceGroupQuery> pq) {
AsServiceGroupQuery query = pq.getParams();
QueryWrapper<AsServiceGroup> qw = new QueryWrapper<>();
//========================================数据授权开始
if (StringUtils.isNotBlank(query.getMenuUrl())) {
PrivilegeQuery privilegeQuery = new PrivilegeQuery();
privilegeQuery.setOrgPath(query.getOrgPath());
privilegeQuery.setMenuUrl(query.getMenuUrl());
privilegeQuery.setUserSid(query.getUserSid());
ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
//数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
String orgSidPath = query.getOrgPath();
orgSidPath = orgSidPath + "/";
int i1 = orgSidPath.indexOf("/");
int i2 = orgSidPath.indexOf("/", i1 + 1);
int i3 = orgSidPath.indexOf("/", i2 + 1);
int i4 = orgSidPath.indexOf("/", i3 + 1);
String orgLevelKey = defaultIdReltBean.getData();
if ("1".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i1);
qw.like("s.orgSidPath", orgSidPath);
} else if ("2".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i2);
qw.like("s.orgSidPath", orgSidPath);
} else if ("3".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i3);
qw.like("s.orgSidPath", orgSidPath);
} else if ("4".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i4);
qw.like("s.orgSidPath", orgSidPath);
} else if ("5".equals(orgLevelKey)) {
qw.eq("asg.createBySid", query.getUserSid());
} else {
PagerVo<AsServiceGroupVo> p = new PagerVo<>();
return p;
}
} else {
PagerVo<AsServiceGroupVo> p = new PagerVo<>();
return p;
}
}
if (StringUtils.isNotBlank(query.getGroupName())){
qw.like("asg.groupName",query.getGroupName());
}
qw.orderByAsc("asg.sortNo");
qw.eq("asg.isDelete",0);
IPage<AsServiceGroup> page = PagerUtil.queryToPage(pq);
IPage<AsServiceGroupVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<AsServiceGroupVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public PagerVo<AsServiceGroupVo> listPageVo(PagerQuery<AsServiceGroupQuery> pq) {
AsServiceGroupQuery query = pq.getParams();
QueryWrapper<AsServiceGroup> qw = new QueryWrapper<>();
//========================================数据授权开始
if (StringUtils.isNotBlank(query.getMenuUrl())) {
PrivilegeQuery privilegeQuery = new PrivilegeQuery();
privilegeQuery.setOrgPath(query.getOrgPath());
privilegeQuery.setMenuUrl(query.getMenuUrl());
privilegeQuery.setUserSid(query.getUserSid());
ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
//数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
String orgSidPath = query.getOrgPath();
orgSidPath = orgSidPath + "/";
int i1 = orgSidPath.indexOf("/");
int i2 = orgSidPath.indexOf("/", i1 + 1);
int i3 = orgSidPath.indexOf("/", i2 + 1);
int i4 = orgSidPath.indexOf("/", i3 + 1);
String orgLevelKey = defaultIdReltBean.getData();
if ("1".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i1);
qw.like("s.orgSidPath", orgSidPath);
} else if ("2".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i2);
qw.like("s.orgSidPath", orgSidPath);
} else if ("3".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i3);
qw.like("s.orgSidPath", orgSidPath);
} else if ("4".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i4);
qw.like("s.orgSidPath", orgSidPath);
} else if ("5".equals(orgLevelKey)) {
qw.eq("asg.createBySid", query.getUserSid());
} else {
PagerVo<AsServiceGroupVo> p = new PagerVo<>();
return p;
}
} else {
PagerVo<AsServiceGroupVo> p = new PagerVo<>();
return p;
}
}
if (StringUtils.isNotBlank(query.getGroupName())) {
qw.like("asg.groupName", query.getGroupName());
}
qw.orderByAsc("asg.sortNo");
qw.eq("asg.isDelete", 0);
IPage<AsServiceGroup> page = PagerUtil.queryToPage(pq);
IPage<AsServiceGroupVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<AsServiceGroupVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public ResultBean saveOrUpdateDto(AsServiceGroupDto dto){
ResultBean rb = ResultBean.fireFail();
public ResultBean saveOrUpdateDto(AsServiceGroupDto dto) {
ResultBean rb = ResultBean.fireFail();
String dtoSid = dto.getSid();
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);
dto.setUseOrgName(deptName);
createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
//创建组织使用组织
ResultBean<SysOrganizationVo> organizationResultBean = sysOrganizationFeign.fetchBySid(createOrgSid);
if (organizationResultBean.getData() != null) {
dto.setCreateOrgSid(createOrgSid);
dto.setCreateOrgName(organizationResultBean.getData().getName());
}
}
int i = baseMapper.checkByCodeAndUseOrgSid(dto.getGroupName(), dto.getUseOrgSid());
if (i > 0){
return rb.setMsg("编码已存在");
}
this.insertByDto(dto);
return rb.success();
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);
dto.setUseOrgName(deptName);
createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
//创建组织使用组织
ResultBean<SysOrganizationVo> organizationResultBean = sysOrganizationFeign.fetchBySid(createOrgSid);
if (organizationResultBean.getData() != null) {
dto.setCreateOrgSid(createOrgSid);
dto.setCreateOrgName(organizationResultBean.getData().getName());
}
}
int i = baseMapper.checkByCodeAndUseOrgSid(dto.getGroupName(), dto.getUseOrgSid());
if (i > 0) {
return rb.setMsg("编码已存在");
}
this.insertByDto(dto);
return rb.success();
}
int i = baseMapper.checkSidByCodeAndUseOrgSid(dto.getGroupName(), dto.getUseOrgSid(), dtoSid);
if (i > 0) {
return rb.setMsg("编码已存在");
}
int i = baseMapper.checkSidByCodeAndUseOrgSid(dto.getGroupName(), dto.getUseOrgSid(),dtoSid);
if (i > 0){
return rb.setMsg("编码已存在");
}
this.updateByDto(dto);
return rb.success();
}
this.updateByDto(dto);
return rb.success();
}
public void insertByDto(AsServiceGroupDto dto){
AsServiceGroup entity = new AsServiceGroup();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
}
public void insertByDto(AsServiceGroupDto dto) {
AsServiceGroup entity = new AsServiceGroup();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
}
public void updateByDto(AsServiceGroupDto dto){
String dtoSid = dto.getSid();
public void updateByDto(AsServiceGroupDto dto) {
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
return;
}
AsServiceGroup entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
}
AsServiceGroup entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
}
public AsServiceGroupDetailsVo fetchDetailsVoBySid(String sid){
AsServiceGroup entity = baseMapper.fetchIsDeleteBySid(sid);
AsServiceGroupDetailsVo vo = new AsServiceGroupDetailsVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}
public AsServiceGroupDetailsVo fetchDetailsVoBySid(String sid) {
AsServiceGroup entity = baseMapper.fetchIsDeleteBySid(sid);
AsServiceGroupDetailsVo vo = new AsServiceGroupDetailsVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}
public List<AsServiceGroupListVo> getGroupList(String orgPath) {
ResultBean<String> orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(orgPath);
if (orgSidByPath.getSuccess()) {
String useOrgSid = orgSidByPath.getData();
List<AsServiceGroupListVo> list = baseMapper.getGroupList(useOrgSid);
return list;
}
return new ArrayList<>();
}
public List<AsServiceGroupListVo> getGroupList(String useOrgSid) {
List<AsServiceGroupListVo> list = baseMapper.getGroupList(useOrgSid);
return list;
}
public void delete(String[] sids) {
for (String sid : sids) {
baseMapper.updateIsDeleteBySid(sid);
}
}
public void delete(String[] sids) {
for (String sid : sids) {
baseMapper.updateIsDeleteBySid(sid);
}
}
}

Write Preview
Loading…
Cancel
Save