yxt_group
/
supervise
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

10/11

master
wangpengfei 2 years ago
parent
25884500af
commit
ee407941b3
9 changed files with 290 additions and 47 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. 3
      yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/userproject/UserProjectMapper.java
  2. 13
      yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/userproject/UserProjectRest.java
  3. 50
      yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/userproject/UserProjectService.java
  4. 2
      yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationVo.java
  5. 74
      yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/feign/crm/UserProjectVo.java
  6. 30
      yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/feign/crm/userproject/UserProjectFeign.java
  7. 6
      yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationMapper.xml
  8. 17
      yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationRest.java
  9. 142
      yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationService.java

3
yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/userproject/UserProjectMapper.java
View File

@ -8,6 +8,7 @@ import com.yxt.supervise.crm.api.userproject.UserProject;
import com.yxt.supervise.crm.api.userproject.UserProjectVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import java.util.List;
@ -21,6 +22,8 @@ public interface UserProjectMapper extends BaseMapper<UserProject> {
List<UserProjectVo> userProjectList();
List<UserProjectVo> getUserProjectBySid( @Param("projectSid") String projectSid);
List<String> getUsersByProjectSid( @Param("projectSid") String projectSid);
@Select("select sid from user_project where projectSid=#{projectSid} and userSid =#{userSid}")
UserProjectVo getSidByUserSid( @Param("projectSid") String projectSid,@Param("userSid") String userSid);
}

13
yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/userproject/UserProjectRest.java
View File

@ -48,11 +48,16 @@ public class UserProjectRest {
List<UserProjectVo> pv = UserProjectService.userProjectList();
return rb.success().setData(pv);
}
@ApiOperation("保存")
@ApiOperation("关联")
@PostMapping("/save")
public ResultBean save(@RequestBody UserProjectDto dto) {
return UserProjectService.save(dto);
}
@ApiOperation("取消关联")
@PostMapping("/cancellation")
public ResultBean cancellation(@RequestBody UserProjectDto dto) {
return UserProjectService.cancellation(dto);
}
@ApiOperation("修改")
@PostMapping("/update")
public ResultBean update(@RequestBody UserProjectDto dto) {
@ -86,6 +91,12 @@ public class UserProjectRest {
ResultBean rb = ResultBean.fireFail();
return UserProjectService.getUsersByProjectSid(projectSid);
}
@ApiOperation("根据usersid查询")
@GetMapping("/getSidByUserSid/{projectSid}/{userSid}")
public ResultBean<UserProjectVo> getSidByUserSid(@PathVariable("projectSid") String projectSid,@PathVariable("userSid") String userSid){
ResultBean rb = ResultBean.fireFail();
return UserProjectService.getSidByUserSid(projectSid,userSid);
}
// @ApiOperation("根据项目sid查询")
// @GetMapping("/getAllByProjectSid")
// public ResultBean getAllByProjectSid(@RequestParam("projectSid") String projectSid){

50
yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/userproject/UserProjectService.java
View File

@ -49,18 +49,6 @@ public class UserProjectService extends MybatisBaseService<UserProjectMapper, Us
}
public ResultBean save(UserProjectDto dto) {
ResultBean rb=new ResultBean();
//先删除项目
baseMapper.delete(new QueryWrapper<UserProject>().eq("projectSid",dto.getProjectSid()));
//银行人员
// for(String bankUser:dto.getBankUsers()){
// UserProject entity=new UserProject();
// BeanUtil.copyProperties(dto, entity, "id", "sid");
// entity.setSid(UUID.randomUUID().toString());
// entity.setUserSid(bankUser);
// entity.setUserType("3");
// baseMapper.insert(entity);
// }
//监管人员
for(String user:dto.getUsers()){
UserProject entity=new UserProject();
BeanUtil.copyProperties(dto, entity, "id", "sid");
@ -71,6 +59,14 @@ public class UserProjectService extends MybatisBaseService<UserProjectMapper, Us
}
return rb.success().setMsg("保存项目类型成功");
}
public ResultBean cancellation(UserProjectDto dto) {
ResultBean rb=new ResultBean();
for(String user:dto.getUsers()){
baseMapper.delete(new QueryWrapper<UserProject>().eq("userSid",user).eq("projectSid",dto.getProjectSid()));
}
return rb.success().setMsg("取消关联成功");
}
public ResultBean update(UserProjectDto dto) {
ResultBean rb=new ResultBean();
String dtoSid = dto.getSid();
@ -82,20 +78,19 @@ public class UserProjectService extends MybatisBaseService<UserProjectMapper, Us
}
public ResultBean getUserProjectBySid(String projectSid){
ResultBean rb=new ResultBean();
Map<String,Object> map =new HashMap<>();
List<UserProjectVo> banks=baseMapper.getUserProjectBySid(projectSid);
for(UserProjectVo userProjectVo:banks){
List<SysUserVo>list= sysUserFeign.getUserOrgBySid(userProjectVo.getUserSid()).getData();
if(list.size()>0){
userProjectVo.setOrgName(list.get(0).getOrganizationName());
userProjectVo.setName(list.get(0).getName());
if(StrUtil.isNotEmpty(list.get(0).getOpenid())){
userProjectVo.setIsOpenId("2");
}else{
userProjectVo.setIsOpenId("1");
}
}
}
// for(UserProjectVo userProjectVo:banks){
// List<SysUserVo>list= sysUserFeign.getUserOrgBySid(userProjectVo.getUserSid()).getData();
// if(list.size()>0){
// userProjectVo.setOrgName(list.get(0).getOrganizationName());
// userProjectVo.setName(list.get(0).getName());
// if(StrUtil.isNotEmpty(list.get(0).getOpenid())){
// userProjectVo.setIsOpenId("2");
// }else{
// userProjectVo.setIsOpenId("1");
// }
// }
// }
return rb.success().setData(banks);
}
public ResultBean<List<String>> getUsersByProjectSid(String projectSid){
@ -103,6 +98,11 @@ public class UserProjectService extends MybatisBaseService<UserProjectMapper, Us
List<String> banks=baseMapper.getUsersByProjectSid(projectSid);
return rb.success().setData(banks);
}
public ResultBean<UserProjectVo> getSidByUserSid(String projectSid,String userSid){
ResultBean rb=new ResultBean();
UserProjectVo banks=baseMapper.getSidByUserSid(projectSid,userSid);
return rb.success().setData(banks);
}
// public ResultBean<List<String>> getAllByProjectSid(String projectSid){
// ResultBean rb=new ResultBean();
// List<String> banks=baseMapper.getAllByProjectSid(projectSid);

2
yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationVo.java
View File

@ -87,4 +87,6 @@ public class SysOrganizationVo implements Vo {
@ApiModelProperty("其他编码")
private String otherCode;
private String mobile;
private String isOpenId;
private String userProjectSid;
}

74
yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/feign/crm/UserProjectVo.java
View File

@ -0,0 +1,74 @@
package com.yxt.supervise.feign.crm;
import com.yxt.common.core.query.Query;
/**
* @author wangpengfei
* @date 2023/8/6 11:35
*/
public class UserProjectVo implements Query {
private String id;
private String sid;
private String projectSid;
private String userSid;
private String name;
private String orgName;
//是否绑定openid;1 未绑定 2绑定
private String isOpenId;
public String getIsOpenId() {
return isOpenId;
}
public void setIsOpenId(String isOpenId) {
this.isOpenId = isOpenId;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getOrgName() {
return orgName;
}
public void setOrgName(String orgName) {
this.orgName = orgName;
}
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getSid() {
return sid;
}
public void setSid(String sid) {
this.sid = sid;
}
public String getProjectSid() {
return projectSid;
}
public void setProjectSid(String projectSid) {
this.projectSid = projectSid;
}
public String getUserSid() {
return userSid;
}
public void setUserSid(String userSid) {
this.userSid = userSid;
}
}

30
yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/feign/crm/userproject/UserProjectFeign.java
View File

@ -0,0 +1,30 @@
package com.yxt.supervise.feign.crm.userproject;
import com.yxt.common.core.result.ResultBean;
import com.yxt.supervise.feign.crm.UserProjectVo;
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 java.util.List;
/**
* @author wangpengfei
* @date 2023/10/10 11:35
*/
@Api(tags = "用户项目关联信息")
@FeignClient(
contextId = "supervise-crm-userproject",
name = "supervise-crm",
path = "userproject"
)
public interface UserProjectFeign {
@ApiOperation("根据项目sid查询不同类人")
@GetMapping("/getUserProjectBySid/{projectSid}")
public ResultBean<List<UserProjectVo>> getWarehouse(@PathVariable("projectSid") String projectSid);
@ApiOperation("根据usersid查询")
@GetMapping("/getSidByUserSid/{projectSid}/{userSid}")
public ResultBean<UserProjectVo> getSidByUserSid(@PathVariable("projectSid") String projectSid,@PathVariable("userSid") String userSid);
}

6
yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationMapper.xml
View File

@ -131,7 +131,11 @@
ORDER BY so.sort ASC
</select>
<select id="selectUserList" resultType="com.yxt.supervise.system.sysorganization.SysOrganizationVo">
SELECT user.*,staff.name as name
SELECT user.*,staff.name as name,
case user.openid
when user.openid is NULL then 2
ELSE 1
end isOpenId
FROM sys_staff_org org
left join sys_staffinfo staff on staff.sid =org.staffSid
left join sys_user user on user.staffSid =org.staffSid

17
yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationRest.java
View File

@ -90,10 +90,21 @@ public class SysOrganizationRest implements SysOrganizationFeign {
* @return
*/
@ApiOperation("获取组织结构下人员信息")
@GetMapping("/userList")
public ResultBean<List<SysOrganizationVo>> userList() {
@GetMapping("/userList/{projectSid}")
public ResultBean<List<SysOrganizationVo>> userList(@PathVariable("projectSid")String projectSid) {
ResultBean rb = ResultBean.fireFail();
List<SysOrganizationVo> list = sysOrganizationService.userList();
List<SysOrganizationVo> list = sysOrganizationService.userList(projectSid);
return rb.success().setData(list);
}
/**
* 获取组织结构下人员信息
* @return
*/
@ApiOperation("获取组织结构下关联项目人员信息")
@GetMapping("/associationUserList/{projectSid}")
public ResultBean<List<SysOrganizationVo>> associationUserList(@PathVariable("projectSid") String projectSid) {
ResultBean rb = ResultBean.fireFail();
List<SysOrganizationVo> list = sysOrganizationService.associationUserList(projectSid);
return rb.success().setData(list);
}
@Override

142
yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationService.java
View File

@ -3,6 +3,8 @@ package com.yxt.supervise.system.sysorganization;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.supervise.feign.crm.UserProjectVo;
import com.yxt.supervise.feign.crm.userproject.UserProjectFeign;
import com.yxt.supervise.system.sysstaffinfo.SysStaffinfo;
import com.yxt.supervise.system.sysstaffinfo.SysStaffinfoService;
import com.yxt.supervise.system.sysstafforg.SysStaffOrg;
@ -51,20 +53,22 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
private SysStaffinfoService sysStaffInfoService;
@Autowired
private RedisUtil redisUtil;
@Autowired
UserProjectFeign userProjectFeign;
public ResultBean saveOrg(SysOrganizationDto dto){
public ResultBean saveOrg(SysOrganizationDto dto) {
ResultBean rb = ResultBean.fireFail();
SysOrganization entity = new SysOrganization();
dto.fillEntity(entity);
String psid = dto.getPsid();
if (psid.equals("0")){
if (psid.equals("0")) {
entity.setOrgSidPath(entity.getSid());
entity.setSort(1);
}else {
} else {
SysOrganization sysOrganization = fetchBySid(psid);
entity.setOrgSidPath(sysOrganization.getOrgSidPath()+"/"+entity.getSid());
entity.setOrgSidPath(sysOrganization.getOrgSidPath() + "/" + entity.getSid());
String[] split = sysOrganization.getOrgSidPath().split("/");
entity.setSort(split.length+1);
entity.setSort(split.length + 1);
}
this.saveOrUpdate(entity);
return rb.success().setMsg("添加成功");
@ -151,26 +155,130 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
getChildList(sysOrganizations);
return sysOrganizations;
}
public List<SysOrganizationVo> userList() {
public List<SysOrganizationVo> userList(String projectSid) {
List<SysOrganizationVo> sysOrganizations = baseMapper.selectFirstOrgList();
List<UserProjectVo>userProjectVoList=userProjectFeign.getWarehouse(projectSid).getData();
getChildList(sysOrganizations);
getUserList(sysOrganizations);
getUserList(sysOrganizations,userProjectVoList);
return sysOrganizations;
}
public void getUserList(List<SysOrganizationVo> list) {
for(SysOrganizationVo sysOrganizationVo:list){
for (SysOrganizationVo sysOrganizationVo1:sysOrganizationVo.getChildren()){
// if(sysOrganizationVo1.getUserList().size()>0){
for(SysOrganizationVo s:sysOrganizationVo1.getChildren()){
List<SysOrganizationVo> listUser = baseMapper.selectUserList(s.getSid());
s.setChildren(listUser);
public List<SysOrganizationVo> associationUserList(String projectSid) {
List<SysOrganizationVo> sysOrganizations = baseMapper.selectFirstOrgList();
getChildList(sysOrganizations);
association(sysOrganizations,projectSid);
return sysOrganizations;
}
public void association(List<SysOrganizationVo> list,String projectSid) {
List<UserProjectVo>userProjectList=userProjectFeign.getWarehouse(projectSid).getData();
for (SysOrganizationVo sysOrganizationVo : list) {
int i=0;
for (SysOrganizationVo sysOrganizationVo1 : sysOrganizationVo.getChildren()) {
int j=0;
List<SysOrganizationVo> list1 = new ArrayList<>();
List<SysOrganizationVo> User = baseMapper.selectUserList(sysOrganizationVo1.getSid());
for (SysOrganizationVo l : User) {
for(UserProjectVo userProjectVo:userProjectList){
if(l.getSid().equals(userProjectVo.getUserSid())){
System.out.println(l);
UserProjectVo userProjectVo1=userProjectFeign.getSidByUserSid(projectSid,l.getSid()).getData();
l.setUserProjectSid(userProjectVo1.getSid());
i++;
j++;
list1.add(l);
}
}
}
for (SysOrganizationVo s : sysOrganizationVo1.getChildren()) {
int k=0;
List<SysOrganizationVo> listUser = baseMapper.selectUserList(s.getSid());
List<SysOrganizationVo> list2 =new ArrayList<>();
listUser.stream().forEach(t->{
for(UserProjectVo userProjectVo:userProjectList){
if(t.getSid().equals(userProjectVo.getUserSid())){
UserProjectVo userProjectVo2=userProjectFeign.getSidByUserSid(projectSid,userProjectVo.getUserSid()).getData();
t.setUserProjectSid(userProjectVo2.getSid());
list2.add(t);
}
}
});
for(SysOrganizationVo sysOrganizationVo2:listUser){
for(UserProjectVo userProjectVo:userProjectList){
if(sysOrganizationVo2.getSid().equals(userProjectVo.getUserSid())){
// UserProjectVo userProjectVo2=userProjectFeign.getSidByUserSid(projectSid,userProjectVo.getUserSid()).getData();
System.out.println(s);
s.setChildren(list2);
// sysOrganizationVo2.setUserProjectSid(userProjectVo2.getSid());
i++;
j++;
k++;
}
}
}
if(s.getChildren().size()!=0){
list1.add(s);
}
s.setName(s.getName()+" "+"["+k+"]");
}
sysOrganizationVo1.setChildren(list1);
sysOrganizationVo1.setName(sysOrganizationVo1.getName()+" "+"["+j+"]");
}
sysOrganizationVo.setName(sysOrganizationVo.getName()+" "+"["+i+"]");
List<SysOrganizationVo> list2 = new ArrayList<>();
for(SysOrganizationVo sysOrganizationVo1 : sysOrganizationVo.getChildren()){
if(sysOrganizationVo1.getChildren().size()!=0){
list2.add(sysOrganizationVo1);
}
}
sysOrganizationVo.setChildren(list2);
}
}
public void getUserList(List<SysOrganizationVo> list,List<UserProjectVo> userProjectList) {
for (SysOrganizationVo sysOrganizationVo : list) {
for (SysOrganizationVo sysOrganizationVo1 : sysOrganizationVo.getChildren()) {
List<SysOrganizationVo> list1 =new ArrayList<>();
List<SysOrganizationVo> User = baseMapper.selectUserList(sysOrganizationVo1.getSid());
//把已选中的放入
User.stream().forEach(s->{
list1.add(s);
});
for (SysOrganizationVo l : User) {
for(UserProjectVo userProjectVo:userProjectList){
if(l.getSid().equals(userProjectVo.getUserSid())){
System.out.println(l);
// list1.add(l);
list1.remove(l);
}
}
// list1.add(l);
}
for (SysOrganizationVo s : sysOrganizationVo1.getChildren()) {
//支行 、部门下的人
List<SysOrganizationVo> list2 =new ArrayList<>();
List<SysOrganizationVo> listUser = baseMapper.selectUserList(s.getSid());
listUser.stream().forEach(t->{
list2.add(t);
});
for(SysOrganizationVo sysOrganizationVo2:listUser){
for(UserProjectVo userProjectVo:userProjectList){
if(sysOrganizationVo2.getSid().equals(userProjectVo.getUserSid())){
System.out.println(s);
list2.remove(sysOrganizationVo2);
// s.setChildren(list2);
// list1.add(s);
}
}
}
// }
List<SysOrganizationVo> listUser = baseMapper.selectUserList(sysOrganizationVo1.getSid());
sysOrganizationVo1.setChildren(listUser);
s.setChildren(list2);
list1.add(s);
}
sysOrganizationVo1.setChildren(list1);
}
}
}
public void getChildList(List<SysOrganizationVo> list) {
list.forEach(str -> {
String sid = str.getSid();

Write Preview
Loading…
Cancel
Save