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

售后基础信息问题修改

zhanglei
God 1 year ago
parent
b4354b11c1
commit
2f2c60cbc1
40 changed files with 550 additions and 107 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. 6
      yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroup.java
  2. 6
      yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroupDetailsVo.java
  3. 4
      yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroupDto.java
  4. 4
      yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroupQuery.java
  5. 2
      yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroupVo.java
  6. 6
      yxt-as/src/main/java/com/yxt/anrui/as/api/asservicesubject/AsServiceSubject.java
  7. 6
      yxt-as/src/main/java/com/yxt/anrui/as/api/asservicesubject/AsServiceSubjectDetailsVo.java
  8. 4
      yxt-as/src/main/java/com/yxt/anrui/as/api/asservicesubject/AsServiceSubjectDto.java
  9. 4
      yxt-as/src/main/java/com/yxt/anrui/as/api/asservicesubject/AsServiceSubjectQuery.java
  10. 2
      yxt-as/src/main/java/com/yxt/anrui/as/api/asservicesubject/AsServiceSubjectVo.java
  11. 4
      yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceType.java
  12. 7
      yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceTypeDetailsVo.java
  13. 4
      yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceTypeDto.java
  14. 4
      yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceTypeQuery.java
  15. 2
      yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceTypeVo.java
  16. 20
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupMapper.java
  17. 8
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupMapper.xml
  18. 2
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupRest.java
  19. 60
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupService.java
  20. 20
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicesubject/AsServiceSubjectMapper.java
  21. 8
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicesubject/AsServiceSubjectMapper.xml
  22. 2
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicesubject/AsServiceSubjectRest.java
  23. 60
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicesubject/AsServiceSubjectService.java
  24. 19
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicetype/AsServiceTypeMapper.java
  25. 8
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicetype/AsServiceTypeMapper.xml
  26. 2
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicetype/AsServiceTypeRest.java
  27. 59
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicetype/AsServiceTypeService.java
  28. 7
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoMapper.java
  29. 8
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoMapper.xml
  30. 7
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoQuery.java
  31. 59
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoService.java
  32. 8
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoVo.java
  33. 8
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeMapper.java
  34. 4
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeMapper.xml
  35. 4
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeQuery.java
  36. 52
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeService.java
  37. 22
      yxt-pms-biz/src/main/java/com/yxt/pms/feign/privilege/PrivilegeQuery.java
  38. 21
      yxt-pms-biz/src/main/java/com/yxt/pms/feign/sysuser/OrgList.java
  39. 27
      yxt-pms-biz/src/main/java/com/yxt/pms/feign/sysuser/SysUserFeign.java
  40. 97
      yxt-pms-biz/src/main/java/com/yxt/pms/feign/sysuser/SysUserVo.java

6
yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroup.java
View File

@ -54,11 +54,13 @@ public class AsServiceGroup extends BaseEntity {
private String groupName;
@ApiModelProperty("排序")
private Integer sortNo;
@ApiModelProperty("使用组织sid")
@ApiModelProperty("部门sid")
private String useOrgSid;
@ApiModelProperty("部门名称")
private String useOrgName;
@ApiModelProperty("创建组织名称")
private String createOrgName;
@ApiModelProperty("创建组织sid")
@ApiModelProperty("创建组织sid")
private String createOrgSid;
}

6
yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroupDetailsVo.java
View File

@ -55,8 +55,12 @@ public class AsServiceGroupDetailsVo implements Vo {
private String groupName;
@ApiModelProperty("排序")
private Integer sortNo;
@ApiModelProperty("使用组织sid")
@ApiModelProperty("部门sid")
private String useOrgSid;
@ApiModelProperty("部门名称")
private String useOrgName;
@ApiModelProperty("创建组织名称")
private String createOrgName;
@ApiModelProperty("创建组织sid")
private String createOrgSid;

4
yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroupDto.java
View File

@ -57,8 +57,10 @@ public class AsServiceGroupDto implements Dto {
private String groupName;
@ApiModelProperty("排序")
private Integer sortNo;
@ApiModelProperty("使用组织sid")
@ApiModelProperty("部门sid")
private String useOrgSid;
@ApiModelProperty("部门名称")
private String useOrgName;
@ApiModelProperty("创建组织名称")
private String createOrgName;
@ApiModelProperty("创建组织sid")

4
yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroupQuery.java
View File

@ -53,4 +53,8 @@ public class AsServiceGroupQuery implements Query {
private String orgPath;
@ApiModelProperty("班组名称")
private String groupName;
private String userSid;
@ApiModelProperty("菜单url")
private String menuUrl;
}

2
yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroupVo.java
View File

@ -56,5 +56,5 @@ public class AsServiceGroupVo implements Vo {
@ApiModelProperty("排序")
private Integer sortNo;
@ApiModelProperty("门店")
private String createOrgName;
private String useOrgName;
}

6
yxt-as/src/main/java/com/yxt/anrui/as/api/asservicesubject/AsServiceSubject.java
View File

@ -58,11 +58,13 @@ public class AsServiceSubject extends BaseEntity {
private String subjectType;
@ApiModelProperty("排序")
private Integer sortNo;
@ApiModelProperty("使用组织sid")
@ApiModelProperty("部门sid")
private String useOrgSid;
@ApiModelProperty("部门名称")
private String useOrgName;
@ApiModelProperty("创建组织名称")
private String createOrgName;
@ApiModelProperty("创建组织sid")
@ApiModelProperty("创建组织sid")
private String createOrgSid;
}

6
yxt-as/src/main/java/com/yxt/anrui/as/api/asservicesubject/AsServiceSubjectDetailsVo.java
View File

@ -59,8 +59,12 @@ public class AsServiceSubjectDetailsVo implements Vo {
private String subjectType;
@ApiModelProperty("排序")
private Integer sortNo;
@ApiModelProperty("使用组织sid")
@ApiModelProperty("部门sid")
private String useOrgSid;
@ApiModelProperty("部门名称")
private String useOrgName;
@ApiModelProperty("创建组织名称")
private String createOrgName;
@ApiModelProperty("创建组织sid")
private String createOrgSid;

4
yxt-as/src/main/java/com/yxt/anrui/as/api/asservicesubject/AsServiceSubjectDto.java
View File

@ -61,8 +61,10 @@ public class AsServiceSubjectDto implements Dto {
private String subjectType;
@ApiModelProperty("排序")
private Integer sortNo;
@ApiModelProperty("使用组织sid")
@ApiModelProperty("部门sid")
private String useOrgSid;
@ApiModelProperty("部门名称")
private String useOrgName;
@ApiModelProperty("创建组织名称")
private String createOrgName;
@ApiModelProperty("创建组织sid")

4
yxt-as/src/main/java/com/yxt/anrui/as/api/asservicesubject/AsServiceSubjectQuery.java
View File

@ -53,4 +53,8 @@ public class AsServiceSubjectQuery implements Query {
private String orgPath;
@ApiModelProperty("科目名称")
private String subjectName;
private String userSid;
@ApiModelProperty("菜单url")
private String menuUrl;
}

2
yxt-as/src/main/java/com/yxt/anrui/as/api/asservicesubject/AsServiceSubjectVo.java
View File

@ -60,5 +60,5 @@ public class AsServiceSubjectVo implements Vo {
@ApiModelProperty("排序")
private Integer sortNo;
@ApiModelProperty("门店")
private String createOrgName;
private String useOrgName;
}

4
yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceType.java
View File

@ -62,8 +62,10 @@ public class AsServiceType extends BaseEntity {
private BigDecimal percentageAmount;
@ApiModelProperty("排序")
private Integer sortNo;
@ApiModelProperty("使用组织sid")
@ApiModelProperty("部门sid")
private String useOrgSid;
@ApiModelProperty("部门名称")
private String useOrgName;
@ApiModelProperty("创建组织名称")
private String createOrgName;
@ApiModelProperty("创建组织sid")

7
yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceTypeDetailsVo.java
View File

@ -63,9 +63,12 @@ public class AsServiceTypeDetailsVo implements Vo {
private BigDecimal percentageAmount;
@ApiModelProperty("排序")
private Integer sortNo;
@ApiModelProperty("使用组织sid")
@ApiModelProperty("部门sid")
private String useOrgSid;
@ApiModelProperty("部门名称")
private String useOrgName;
@ApiModelProperty("创建组织名称")
private String createOrgName;
@ApiModelProperty("创建组织sid")
private String createOrgSid;
}

4
yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceTypeDto.java
View File

@ -65,8 +65,10 @@ public class AsServiceTypeDto implements Dto {
private BigDecimal percentageAmount;
@ApiModelProperty("排序")
private Integer sortNo;
@ApiModelProperty("使用组织sid")
@ApiModelProperty("部门sid")
private String useOrgSid;
@ApiModelProperty("部门名称")
private String useOrgName;
@ApiModelProperty("创建组织名称")
private String createOrgName;
@ApiModelProperty("创建组织sid")

4
yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceTypeQuery.java
View File

@ -55,4 +55,8 @@ public class AsServiceTypeQuery implements Query {
private String orgPath;
@ApiModelProperty("服务类别名称")
private String serviceTypeName;
private String userSid;
@ApiModelProperty("菜单url")
private String menuUrl;
}

2
yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceTypeVo.java
View File

@ -64,5 +64,5 @@ public class AsServiceTypeVo implements Vo {
@ApiModelProperty("提成金额")
private BigDecimal percentageAmount;
@ApiModelProperty("门店")
private String createOrgName;
private String useOrgName;
}

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

@ -30,11 +30,13 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.as.api.asservicegroup.AsServiceGroupListVo;
import com.yxt.anrui.as.api.asservicetype.AsServiceType;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import com.yxt.anrui.as.api.asservicegroup.AsServiceGroup;
import com.yxt.anrui.as.api.asservicegroup.AsServiceGroupVo;
import org.apache.ibatis.annotations.Update;
import java.util.List;
@ -54,21 +56,19 @@ import java.util.List;
@Mapper
public interface AsServiceGroupMapper extends BaseMapper<AsServiceGroup> {
//@Update("update as_service_group set name=#{msg} where id=#{id}")
//IPage<AsServiceGroupVo> voPage(IPage<AsServiceGroup> page, @Param(Constants.WRAPPER) QueryWrapper<AsServiceGroup> qw);
IPage<AsServiceGroupVo> selectPageVo(IPage<AsServiceGroup> page, @Param(Constants.WRAPPER) Wrapper<AsServiceGroup> qw);
List<AsServiceGroupVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<AsServiceGroup> qw);
@Select("select * from as_service_group")
List<AsServiceGroupVo> selectListVo();
List<AsServiceGroupListVo> getGroupList(@Param("useOrgSid") String useOrgSid);
@Select("select count(*) from as_service_group where groupName = #{groupName} and useOrgSid = #{useOrgSid}")
@Select("select count(*) from as_service_group where groupName = #{groupName} and useOrgSid = #{useOrgSid} and isDelete = '0'")
int checkByCodeAndUseOrgSid(@Param("groupName") String groupName,@Param("useOrgSid") String useOrgSid);
@Select("select count(*) from as_service_group where groupName = #{groupName} and useOrgSid = #{useOrgSid} and sid != #{dtoSid}")
@Select("select count(*) from as_service_group where groupName = #{groupName} and useOrgSid = #{useOrgSid} and sid != #{dtoSid} and isDelete = '0'")
int checkSidByCodeAndUseOrgSid(@Param("groupName") String groupName,@Param("useOrgSid") String useOrgSid,@Param("dtoSid") String dtoSid);
@Update("update as_service_group set isDelete = '1' where sid = #{sid}")
void updateIsDeleteBySid(String sid);
@Select("select * from as_service_group where sid = #{sid} and isDelete = '0'")
AsServiceGroup fetchIsDeleteBySid(String sid);
}

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

@ -4,18 +4,16 @@
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.as.api.asservicegroup.AsServiceGroupVo">
SELECT * FROM as_service_group
SELECT asg.* FROM as_service_group asg
LEFT JOIN anrui_portal.sys_organization as s ON asg.useOrgSid = s.sid
<where>${ew.sqlSegment}</where>
</select>
<select id="selectListAllVo" resultType="com.yxt.anrui.as.api.asservicegroup.AsServiceGroupVo">
SELECT * FROM as_service_group
<where>${ew.sqlSegment}</where>
</select>
<select id="getGroupList" resultType="com.yxt.anrui.as.api.asservicegroup.AsServiceGroupListVo">
select sid as groupSid,
groupName
from as_service_group
where createOrgSid = #{useOrgSid}
and isDelete = '0'
</select>
</mapper>

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

@ -83,7 +83,7 @@ public class AsServiceGroupRest {
@DeleteMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids) {
ResultBean rb = ResultBean.fireFail();
asServiceGroupService.delBySids(sids);
asServiceGroupService.delete(sids);
return rb.success();
}

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

@ -29,9 +29,12 @@ import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.as.api.asservicegroup.*;
import com.yxt.anrui.as.api.asservicesubject.AsServiceSubjectVo;
import com.yxt.anrui.as.feign.portal.privilege.PrivilegeQuery;
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.anrui.as.feign.portal.sysuser.SysUserFeign;
import com.yxt.common.core.result.ResultBean;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
@ -66,16 +69,56 @@ public class AsServiceGroupService extends MybatisBaseService<AsServiceGroupMapp
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("groupName",query.getGroupName());
qw.like("asg.groupName",query.getGroupName());
}
String createOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
qw.eq("createOrgSid",createOrgSid);
qw.orderByAsc("sortNo");
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);
@ -106,6 +149,7 @@ public class AsServiceGroupService extends MybatisBaseService<AsServiceGroupMapp
deptSid = sysOrganization.getSid();
}
dto.setUseOrgSid(deptSid);
dto.setUseOrgName(deptName);
createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
//创建组织使用组织
ResultBean<SysOrganizationVo> organizationResultBean = sysOrganizationFeign.fetchBySid(createOrgSid);
@ -146,7 +190,7 @@ public class AsServiceGroupService extends MybatisBaseService<AsServiceGroupMapp
}
public AsServiceGroupDetailsVo fetchDetailsVoBySid(String sid){
AsServiceGroup entity = fetchBySid(sid);
AsServiceGroup entity = baseMapper.fetchIsDeleteBySid(sid);
AsServiceGroupDetailsVo vo = new AsServiceGroupDetailsVo();
BeanUtil.copyProperties(entity, vo);
return vo;
@ -161,4 +205,10 @@ public class AsServiceGroupService extends MybatisBaseService<AsServiceGroupMapp
}
return new ArrayList<>();
}
public void delete(String[] sids) {
for (String sid : sids) {
baseMapper.updateIsDeleteBySid(sid);
}
}
}

20
yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicesubject/AsServiceSubjectMapper.java
View File

@ -29,11 +29,13 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.as.api.asservicetype.AsServiceType;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import com.yxt.anrui.as.api.asservicesubject.AsServiceSubject;
import com.yxt.anrui.as.api.asservicesubject.AsServiceSubjectVo;
import org.apache.ibatis.annotations.Update;
import java.util.List;
@ -53,19 +55,17 @@ import java.util.List;
@Mapper
public interface AsServiceSubjectMapper extends BaseMapper<AsServiceSubject> {
//@Update("update as_service_subject set name=#{msg} where id=#{id}")
//IPage<AsServiceSubjectVo> voPage(IPage<AsServiceSubject> page, @Param(Constants.WRAPPER) QueryWrapper<AsServiceSubject> qw);
IPage<AsServiceSubjectVo> selectPageVo(IPage<AsServiceSubject> page, @Param(Constants.WRAPPER) Wrapper<AsServiceSubject> qw);
List<AsServiceSubjectVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<AsServiceSubject> qw);
@Select("select * from as_service_subject")
List<AsServiceSubjectVo> selectListVo();
@Select("select count(*) from as_service_subject where subjectCode = #{subjectCode} and useOrgSid = #{useOrgSid}")
@Select("select count(*) from as_service_subject where subjectCode = #{subjectCode} and useOrgSid = #{useOrgSid} and isDelete = '0'")
int checkByCodeAndUseOrgSid(@Param("subjectCode") String subjectCode,@Param("useOrgSid") String useOrgSid);
@Select("select count(*) from as_service_subject where subjectCode = #{subjectCode} and useOrgSid = #{useOrgSid} and sid != #{dtoSid}")
@Select("select count(*) from as_service_subject where subjectCode = #{subjectCode} and useOrgSid = #{useOrgSid} and sid != #{dtoSid} and isDelete = '0'")
int checkSidByCodeAndUseOrgSid(@Param("subjectCode") String subjectCode,@Param("useOrgSid") String useOrgSid,@Param("dtoSid") String dtoSid);
@Update("update as_service_subject set isDelete = '1' where sid = #{sid}")
void updateIsDeleteBySid(String sid);
@Select("select * from as_service_subject where sid = #{sid} and isDelete = '0'")
AsServiceSubject fetchIsDeleteBySid(String sid);
}

8
yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicesubject/AsServiceSubjectMapper.xml
View File

@ -4,10 +4,8 @@
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.as.api.asservicesubject.AsServiceSubjectVo">
SELECT * FROM as_service_subject <where> ${ew.sqlSegment} </where>
</select>
<select id="selectListAllVo" resultType="com.yxt.anrui.as.api.asservicesubject.AsServiceSubjectVo">
SELECT * FROM as_service_subject <where> ${ew.sqlSegment} </where>
SELECT ass.* FROM as_service_subject ass
LEFT JOIN anrui_portal.sys_organization as s ON ass.useOrgSid = s.sid
<where> ${ew.sqlSegment} </where>
</select>
</mapper>

2
yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicesubject/AsServiceSubjectRest.java
View File

@ -78,7 +78,7 @@ public class AsServiceSubjectRest{
@DeleteMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){
ResultBean rb = ResultBean.fireFail();
asServiceSubjectService.delBySids(sids);
asServiceSubjectService.delete(sids);
return rb.success();
}

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

@ -28,9 +28,12 @@ package com.yxt.anrui.as.biz.asservicesubject;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.as.api.asservicetype.AsServiceTypeVo;
import com.yxt.anrui.as.feign.portal.privilege.PrivilegeQuery;
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.anrui.as.feign.portal.sysuser.SysUserFeign;
import com.yxt.common.core.result.ResultBean;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
@ -69,16 +72,56 @@ public class AsServiceSubjectService extends MybatisBaseService<AsServiceSubject
private SysStaffOrgFeign sysStaffOrgFeign;
@Autowired
private SysOrganizationFeign sysOrganizationFeign;
@Autowired
private SysUserFeign sysUserFeign;
public PagerVo<AsServiceSubjectVo> listPageVo(PagerQuery<AsServiceSubjectQuery> pq) {
AsServiceSubjectQuery query = pq.getParams();
QueryWrapper<AsServiceSubject> 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("ass.createBySid", query.getUserSid());
} else {
PagerVo<AsServiceSubjectVo> p = new PagerVo<>();
return p;
}
} else {
PagerVo<AsServiceSubjectVo> p = new PagerVo<>();
return p;
}
}
if (StringUtils.isNotBlank(query.getSubjectName())){
qw.like("subjectName",query.getSubjectName());
qw.like("ass.subjectName",query.getSubjectName());
}
String createOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
qw.eq("createOrgSid",createOrgSid);
qw.orderByAsc("sortNo");
qw.orderByAsc("ass.sortNo");
qw.eq("ass.isDelete",0);
IPage<AsServiceSubject> page = PagerUtil.queryToPage(pq);
IPage<AsServiceSubjectVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<AsServiceSubjectVo> p = PagerUtil.pageToVo(pagging, null);
@ -109,6 +152,7 @@ public class AsServiceSubjectService extends MybatisBaseService<AsServiceSubject
deptSid = sysOrganization.getSid();
}
dto.setUseOrgSid(deptSid);
dto.setUseOrgName(deptName);
createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
//创建组织使用组织
ResultBean<SysOrganizationVo> organizationResultBean = sysOrganizationFeign.fetchBySid(createOrgSid);
@ -149,9 +193,15 @@ public class AsServiceSubjectService extends MybatisBaseService<AsServiceSubject
}
public AsServiceSubjectDetailsVo fetchDetailsVoBySid(String sid){
AsServiceSubject entity = fetchBySid(sid);
AsServiceSubject entity = baseMapper.fetchIsDeleteBySid(sid);
AsServiceSubjectDetailsVo vo = new AsServiceSubjectDetailsVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}
public void delete(String[] sids) {
for (String sid : sids) {
baseMapper.updateIsDeleteBySid(sid);
}
}
}

19
yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicetype/AsServiceTypeMapper.java
View File

@ -34,6 +34,7 @@ import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import com.yxt.anrui.as.api.asservicetype.AsServiceType;
import com.yxt.anrui.as.api.asservicetype.AsServiceTypeVo;
import org.apache.ibatis.annotations.Update;
import java.util.List;
@ -53,19 +54,17 @@ import java.util.List;
@Mapper
public interface AsServiceTypeMapper extends BaseMapper<AsServiceType> {
//@Update("update as_service_type set name=#{msg} where id=#{id}")
//IPage<AsServiceTypeVo> voPage(IPage<AsServiceType> page, @Param(Constants.WRAPPER) QueryWrapper<AsServiceType> qw);
IPage<AsServiceTypeVo> selectPageVo(IPage<AsServiceType> page, @Param(Constants.WRAPPER) Wrapper<AsServiceType> qw);
List<AsServiceTypeVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<AsServiceType> qw);
@Select("select * from as_service_type")
List<AsServiceTypeVo> selectListVo();
@Select("select count(*) from as_service_type where serviceTypeCode = #{serviceTypeCode} and useOrgSid = #{useOrgSid}")
@Select("select count(*) from as_service_type where serviceTypeCode = #{serviceTypeCode} and useOrgSid = #{useOrgSid} and isDelete = '0'")
int checkByCodeAndUseOrgSid(@Param("serviceTypeCode") String serviceTypeCode,@Param("useOrgSid") String useOrgSid);
@Select("select count(*) from as_service_type where serviceTypeCode = #{serviceTypeCode} and useOrgSid = #{useOrgSid} and sid != #{dtoSid}")
@Select("select count(*) from as_service_type where serviceTypeCode = #{serviceTypeCode} and useOrgSid = #{useOrgSid} and sid != #{dtoSid} and isDelete = '0'")
int checkSidByCodeAndUseOrgSid(@Param("serviceTypeCode") String serviceTypeCode,@Param("useOrgSid") String useOrgSid,@Param("dtoSid") String dtoSid);
@Update("update as_service_type set isDelete = '1' where sid = #{sid}")
void updateIsDeleteBySid(String sid);
@Select("select * from as_service_type where sid = #{sid} and isDelete = '0'")
AsServiceType fetchIsDeleteBySid(String sid);
}

8
yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicetype/AsServiceTypeMapper.xml
View File

@ -4,10 +4,8 @@
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.as.api.asservicetype.AsServiceTypeVo">
SELECT * FROM as_service_type <where> ${ew.sqlSegment} </where>
</select>
<select id="selectListAllVo" resultType="com.yxt.anrui.as.api.asservicetype.AsServiceTypeVo">
SELECT * FROM as_service_type <where> ${ew.sqlSegment} </where>
SELECT ast.* FROM as_service_type ast
LEFT JOIN anrui_portal.sys_organization as s ON ast.useOrgSid = s.sid
<where> ${ew.sqlSegment} </where>
</select>
</mapper>

2
yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicetype/AsServiceTypeRest.java
View File

@ -77,7 +77,7 @@ public class AsServiceTypeRest{
@DeleteMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){
ResultBean rb = ResultBean.fireFail();
asServiceTypeService.delBySids(sids);
asServiceTypeService.delete(sids);
return rb.success();
}

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

@ -28,9 +28,11 @@ package com.yxt.anrui.as.biz.asservicetype;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.as.feign.portal.privilege.PrivilegeQuery;
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.anrui.as.feign.portal.sysuser.SysUserFeign;
import com.yxt.common.core.result.ResultBean;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
@ -69,16 +71,56 @@ public class AsServiceTypeService extends MybatisBaseService<AsServiceTypeMapper
private SysStaffOrgFeign sysStaffOrgFeign;
@Autowired
private SysOrganizationFeign sysOrganizationFeign;
@Autowired
private SysUserFeign sysUserFeign;
public PagerVo<AsServiceTypeVo> listPageVo(PagerQuery<AsServiceTypeQuery> pq) {
AsServiceTypeQuery query = pq.getParams();
QueryWrapper<AsServiceType> 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("ast.createBySid", query.getUserSid());
} else {
PagerVo<AsServiceTypeVo> p = new PagerVo<>();
return p;
}
} else {
PagerVo<AsServiceTypeVo> p = new PagerVo<>();
return p;
}
}
if (StringUtils.isNotBlank(query.getServiceTypeName())){
qw.like("serviceTypeName", query.getServiceTypeName());
qw.like("ast.serviceTypeName", query.getServiceTypeName());
}
String createOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
qw.eq("createOrgSid",createOrgSid);
qw.orderByAsc("sortNo");
qw.orderByAsc("ast.sortNo");
qw.eq("ast.isDelete",0);
IPage<AsServiceType> page = PagerUtil.queryToPage(pq);
IPage<AsServiceTypeVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<AsServiceTypeVo> p = PagerUtil.pageToVo(pagging, null);
@ -109,6 +151,7 @@ public class AsServiceTypeService extends MybatisBaseService<AsServiceTypeMapper
deptSid = sysOrganization.getSid();
}
dto.setUseOrgSid(deptSid);
dto.setUseOrgName(deptName);
createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
//创建组织使用组织
ResultBean<SysOrganizationVo> organizationResultBean = sysOrganizationFeign.fetchBySid(createOrgSid);
@ -150,9 +193,15 @@ public class AsServiceTypeService extends MybatisBaseService<AsServiceTypeMapper
}
public AsServiceTypeDetailsVo fetchDetailsVoBySid(String sid) {
AsServiceType entity = fetchBySid(sid);
AsServiceType entity = baseMapper.fetchIsDeleteBySid(sid);
AsServiceTypeDetailsVo vo = new AsServiceTypeDetailsVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}
public void delete(String[] sids) {
for (String sid : sids) {
baseMapper.updateIsDeleteBySid(sid);
}
}
}

7
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoMapper.java
View File

@ -54,17 +54,12 @@ public interface PmsSupplierInfoMapper extends BaseMapper<PmsSupplierInfo> {
IPage<PmsSupplierInfoVo> selectPageVo(IPage<PmsSupplierInfo> page, @Param(Constants.WRAPPER) Wrapper<PmsSupplierInfo> qw);
List<PmsSupplierInfoVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<PmsSupplierInfo> qw);
@Select("select * from yxt_base.base_supplier_info")
List<PmsSupplierInfoVo> selectListVo();
@Update("update yxt_base.base_supplier_info set isDelete = '1' where sid = #{sid}")
int updateBySidIsDelete(String sid);
@Select("select * from yxt_base.base_supplier_info where createOrgSid = #{createOrgSid} and isDelete = '0'")
List<PmsSupplierInfoChoice> choiceSupplierInfo(String createOrgSid);
@Select("select * from yxt_base.base_supplier_info where sid = #{sid}")
@Select("select * from yxt_base.base_supplier_info where sid = #{sid} and isDelete = '0'")
PmsSupplierInfo selBySid(String sid);
}

8
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoMapper.xml
View File

@ -4,10 +4,8 @@
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.pms.biz.pms.pmssupplierinfo.PmsSupplierInfoVo">
SELECT * FROM yxt_base.base_supplier_info <where> ${ew.sqlSegment} </where>
</select>
<select id="selectListAllVo" resultType="com.yxt.pms.biz.pms.pmssupplierinfo.PmsSupplierInfoVo">
SELECT * FROM yxt_base.base_supplier_info <where> ${ew.sqlSegment} </where>
SELECT bsi.* FROM yxt_base.base_supplier_info bsi
LEFT JOIN anrui_portal.sys_organization as s ON bsi.useOrgSid = s.sid
<where> ${ew.sqlSegment} </where>
</select>
</mapper>

7
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoQuery.java
View File

@ -50,6 +50,8 @@ public class PmsSupplierInfoQuery implements Query {
@ApiModelProperty("供应商名称")
private String supplierName;
@ApiModelProperty("编码")
private String supplierCode;
@ApiModelProperty("供应商类型")
private String supplierTypeName;
@ApiModelProperty("电话")
@ -59,4 +61,9 @@ public class PmsSupplierInfoQuery implements Query {
@ApiModelProperty("其他查询条件")
private String otherQuery;
private String orgPath;
private String userSid;
@ApiModelProperty("菜单url")
private String menuUrl;
}

59
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoService.java
View File

@ -34,7 +34,10 @@ import com.yxt.pms.biz.pms.pmssupplierBank.*;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.pms.biz.pms.pmssuppliertype.PmsSupplierTypeVo;
import com.yxt.pms.feign.portal.sysstafforg.SysStaffOrgFeign;
import com.yxt.pms.feign.privilege.PrivilegeQuery;
import com.yxt.pms.feign.sysuser.SysUserFeign;
import com.yxt.pms.feign.yxtbase.supplier.BaseSupplierBankDto;
import com.yxt.pms.feign.yxtbase.supplier.BaseSupplierInfoDto;
import com.yxt.pms.feign.yxtbase.supplier.BaseSupplierInfoFeign;
@ -66,27 +69,69 @@ public class PmsSupplierInfoService extends MybatisBaseService<PmsSupplierInfoMa
@Autowired
private BaseSupplierInfoFeign baseSupplierInfoFeign;
@Autowired
private SysStaffOrgFeign sysStaffOrgFeign;
private SysUserFeign sysUserFeign;
public PagerVo<PmsSupplierInfoVo> listPageVo(PagerQuery<PmsSupplierInfoQuery> pq) {
PmsSupplierInfoQuery query = pq.getParams();
QueryWrapper<PmsSupplierInfo> qw = new QueryWrapper<PmsSupplierInfo>();
//========================================数据授权开始
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("bsi.createBySid", query.getUserSid());
} else {
PagerVo<PmsSupplierInfoVo> p = new PagerVo<>();
return p;
}
} else {
PagerVo<PmsSupplierInfoVo> p = new PagerVo<>();
return p;
}
}
if (StringUtils.isNotBlank(query.getSupplierName())){
qw.like("supplierName",query.getSupplierName());
qw.like("bsi.supplierName",query.getSupplierName());
}
if (StringUtils.isNotBlank(query.getSupplierCode())){
qw.like("bsi.supplierCode",query.getSupplierCode());
}
if (StringUtils.isNotBlank(query.getSupplierTypeName())){
qw.like("supplierTypeName",query.getSupplierTypeName());
qw.like("bsi.supplierTypeName",query.getSupplierTypeName());
}
if (StringUtils.isNotBlank(query.getContactTelePhone())){
qw.like("contactTelePhone",query.getContactTelePhone());
qw.like("bsi.contactTelePhone",query.getContactTelePhone());
}
if (StringUtils.isNotBlank(query.getContactName())){
qw.like("contactName",query.getContactName());
qw.like("bsi.contactName",query.getContactName());
}
if (StringUtils.isNotBlank(query.getOtherQuery())){
qw.and(wrapper -> wrapper.like("supplierName", query.getOtherQuery()).or().like("supplierPY", query.getOtherQuery()).or().like("contactTelePhone",query.getOtherQuery()));
qw.and(wrapper -> wrapper.like("bsi.supplierName", query.getOtherQuery()).or().like("bsi.supplierPY", query.getOtherQuery()).or().like("bsi.contactTelePhone",query.getOtherQuery()));
}
qw.eq("isDelete",0);
qw.eq("bsi.isDelete",0);
IPage<PmsSupplierInfo> page = PagerUtil.queryToPage(pq);
IPage<PmsSupplierInfoVo> pagging = baseMapper.selectPageVo(page, qw);
List<PmsSupplierInfoVo> records = pagging.getRecords();

8
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoVo.java
View File

@ -31,6 +31,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
* Project: yxt-base(供应商管理) <br/>
* File: BaseSupplierInfoVo.java <br/>
@ -52,6 +54,8 @@ public class PmsSupplierInfoVo implements Vo {
@ApiModelProperty("供应商名称")
private String supplierName;
@ApiModelProperty("编码")
private String supplierCode;
@ApiModelProperty("供应商类型")
private String supplierTypeName;
@ApiModelProperty("详细地址")
@ -62,6 +66,10 @@ public class PmsSupplierInfoVo implements Vo {
private String contactName;
@ApiModelProperty("手机")
private String contactMobile;
@ApiModelProperty("开票类型value")
private String billingTypeValue;
@ApiModelProperty("税率")
private BigDecimal taxRate;
@ApiModelProperty("省")
private String province;

8
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeMapper.java
View File

@ -51,9 +51,9 @@ public interface PmsSupplierTypeMapper extends BaseMapper<PmsSupplierType> {
IPage<PmsSupplierTypeVo> selectPageVo(IPage<PmsSupplierType> page, @Param(Constants.WRAPPER) Wrapper<PmsSupplierType> qw);
@Delete("delete from yxt_base.base_supplier_type where sid = #{sid}")
void del(String sid);
@Select("select * from yxt_base.base_supplier_type where useOrgSid = #{useOrgSid}")
@Select("select * from yxt_base.base_supplier_type where useOrgSid = #{useOrgSid} and isDelete = '0'")
List<PmsSupplierTypeDown> selSupplierType(String useOrgSid);
@Update("update yxt_base.base_supplier_type set isDelete = '1' where sid = #{sid}")
void updateIsDeleteBySid(String sid);
}

4
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeMapper.xml
View File

@ -4,6 +4,8 @@
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.pms.biz.pms.pmssuppliertype.PmsSupplierTypeVo">
SELECT * FROM yxt_base.base_supplier_type <where> ${ew.sqlSegment} </where>
SELECT bst.* FROM yxt_base.base_supplier_type bst
LEFT JOIN anrui_portal.sys_organization as s ON bst.useOrgSid = s.sid
<where> ${ew.sqlSegment} </where>
</select>
</mapper>

4
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeQuery.java
View File

@ -54,4 +54,8 @@ public class PmsSupplierTypeQuery implements Query {
private String supplierTypeCode;
@ApiModelProperty("组织全路径")
private String orgPath;
private String userSid;
@ApiModelProperty("菜单url")
private String menuUrl;
}

52
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeService.java
View File

@ -36,6 +36,8 @@ import com.yxt.common.core.vo.PagerVo;
import com.yxt.pms.feign.portal.sysorganization.SysOrganizationFeign;
import com.yxt.pms.feign.portal.sysorganization.SysOrganizationVo;
import com.yxt.pms.feign.portal.sysstafforg.SysStaffOrgFeign;
import com.yxt.pms.feign.privilege.PrivilegeQuery;
import com.yxt.pms.feign.sysuser.SysUserFeign;
import com.yxt.pms.feign.yxtbase.supplier.BaseSupplierTypeDto;
import com.yxt.pms.feign.yxtbase.supplier.BaseSupplierTypeFeign;
import org.apache.commons.lang3.StringUtils;
@ -62,7 +64,7 @@ import java.util.List;
public class PmsSupplierTypeService extends MybatisBaseService<PmsSupplierTypeMapper, PmsSupplierType> {
@Autowired
private SysStaffOrgFeign sysStaffOrgFeign;
private SysUserFeign sysUserFeign;
@Autowired
private SysOrganizationFeign sysOrganizationFeign;
@Autowired
@ -71,14 +73,52 @@ public class PmsSupplierTypeService extends MybatisBaseService<PmsSupplierTypeMa
public PagerVo<PmsSupplierTypeVo> listPageVo(PagerQuery<PmsSupplierTypeQuery> pq) {
PmsSupplierTypeQuery query = pq.getParams();
QueryWrapper<PmsSupplierType> qw = new QueryWrapper<>();
String createOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
//========================================数据授权开始
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("bst.createBySid", query.getUserSid());
} else {
PagerVo<PmsSupplierTypeVo> p = new PagerVo<>();
return p;
}
} else {
PagerVo<PmsSupplierTypeVo> p = new PagerVo<>();
return p;
}
}
if (StringUtils.isNotBlank(query.getSupplierTypeName())) {
qw.like("supplierTypeName", query.getSupplierTypeName());
qw.like("bst.supplierTypeName", query.getSupplierTypeName());
}
if (StringUtils.isNotBlank(query.getSupplierTypeCode())) {
qw.like("supplierTypeCode", query.getSupplierTypeCode());
qw.like("bst.supplierTypeCode", query.getSupplierTypeCode());
}
qw.eq("createOrgSid", createOrgSid);
qw.eq("bst.isDelete",0);
IPage<PmsSupplierType> page = PagerUtil.queryToPage(pq);
IPage<PmsSupplierTypeVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<PmsSupplierTypeVo> p = PagerUtil.pageToVo(pagging, null);
@ -98,7 +138,7 @@ public class PmsSupplierTypeService extends MybatisBaseService<PmsSupplierTypeMa
public void del(String[] sids) {
for (String sid : sids) {
baseMapper.del(sid);
baseMapper.updateIsDeleteBySid(sid);
}
}

22
yxt-pms-biz/src/main/java/com/yxt/pms/feign/privilege/PrivilegeQuery.java
View File

@ -0,0 +1,22 @@
package com.yxt.pms.feign.privilege;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @description: 权限角色层级
* @author: dimengzhe
* @date: 2023/5/23
**/
@Data
public class PrivilegeQuery {
@ApiModelProperty("菜单路由")
private String menuUrl;
@ApiModelProperty("组织全路径sid")
private String orgPath;
@ApiModelProperty("菜单sid")
private String menuSid;
@ApiModelProperty("用户sid")
private String userSid;
}

21
yxt-pms-biz/src/main/java/com/yxt/pms/feign/sysuser/OrgList.java
View File

@ -0,0 +1,21 @@
package com.yxt.pms.feign.sysuser;
import com.yxt.common.core.vo.Vo;
import lombok.Data;
/**
* @Author dimengzhe
* @Date 2022/9/21 9:26
* @Description
*/
@Data
public class OrgList implements Vo {
private static final long serialVersionUID = -2867882982421321776L;
private String orgName;
private String orgPath;
private String deptName;
private String deptSid;
}

27
yxt-pms-biz/src/main/java/com/yxt/pms/feign/sysuser/SysUserFeign.java
View File

@ -0,0 +1,27 @@
package com.yxt.pms.feign.sysuser;
import com.yxt.common.core.result.ResultBean;
import com.yxt.pms.feign.privilege.PrivilegeQuery;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@Api(tags = "用户表")
@FeignClient(
contextId = "anrui-portal-SysUser",
name = "anrui-portal",
path = "v1/sysuser")
public interface SysUserFeign {
@ApiOperation(value = "查询角色权限的层级获取权限id")
@PostMapping(value = "/selectPrivilegeLevel")
ResultBean<String> selectPrivilegeLevel(@RequestBody PrivilegeQuery query);
@ApiOperation("根据sid获取一条记录")
@GetMapping("/fetchBySid/{sid}")
public ResultBean<SysUserVo> fetchBySid(@PathVariable("sid") String sid);
}

97
yxt-pms-biz/src/main/java/com/yxt/pms/feign/sysuser/SysUserVo.java
View File

@ -0,0 +1,97 @@
package com.yxt.pms.feign.sysuser;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.ArrayList;
import java.util.List;
/**
* Project: anrui_portal(门户建设) <br/>
* File: SysUserVo.java <br/>
* Class: com.yxt.anrui.portal.api.sysuser.SysUserVo <br/>
* Description: 用户表 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2021-08-03 00:24:30 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@ApiModel(value = "用户表 视图数据对象", description = "用户表 视图数据对象")
@Data
@NoArgsConstructor
public class SysUserVo implements Vo {
private static final long serialVersionUID = 2415131854581950721L;
@ApiModelProperty("部门sid")
private String departmentSid;
@ApiModelProperty("部门名称")
private String departmentName;
@ApiModelProperty("上级部门名称-本级部门名称 岗位名称")
@JsonProperty("pNameAndDepartmentNameAndPostName")
private String pNameAndDepartmentNameAndPostName;
@ApiModelProperty("岗位名称")
private String postName;
@ApiModelProperty("岗位Sid")
private String postSid;
@ApiModelProperty("单位sid")
private String organizationSid;
@ApiModelProperty("单位名称")
private String organizationName;
@ApiModelProperty("用户姓名")
private String name;
@ApiModelProperty("登录名，登录名不能相同")
private String userName;
@ApiModelProperty("id")
private Integer id;
@ApiModelProperty("用户sid")
private String sid;
@ApiModelProperty("是否是管理员：1管理员，2一般用户，0是超级管理员,3尚无单位人员")
private String isAdmin;
@ApiModelProperty("角色名称")
private String roleName;
@ApiModelProperty("关联的人员sid")
private String staffSid;
@ApiModelProperty("手机号")
private String mobile;
@ApiModelProperty(value = "禁用状态")
private String isEnable;
@ApiModelProperty("用户类型:1员工、2客户、3供应商")
private String userType;
@ApiModelProperty("用户类型:1、2、3")
private String userTypeKey;
@ApiModelProperty("用户头像")
private String headImage;
@ApiModelProperty("组织名称")
private String orgNamePath;
@ApiModelProperty("组织sid")
private String orgSidPath;
@ApiModelProperty(value = "token")
private String token;
@ApiModelProperty(value = "角色sids")
private List<String> roleSids = new ArrayList<>();
private List<OrgList> orgList = new ArrayList<>();
@ApiModelProperty("默认的组织机构sid全路径")
private String defaultOrgPath;
@ApiModelProperty("默认的组织机构名称全路径")
private String defaultOrgPathName;
private String defaultDeptName;
private String defaultDeptSid;
@ApiModelProperty("是否需要更换密码")
private Boolean needResetPsd;
@ApiModelProperty("工号")
private String jobNumber;
}
Write Preview
Loading…
Cancel
Save