update:修改bug
This commit is contained in:
qk
+6
@@ -3,6 +3,7 @@ package com.adc.da.slrs.sarInstitution.controller;
|
||||
|
||||
import com.adc.da.http.ResponseMessage;
|
||||
import com.adc.da.http.Result;
|
||||
import com.adc.da.slrs.sarInstitution.entity.TreeVo;
|
||||
import com.adc.da.slrs.sarInstitution.entity.TsInstitution;
|
||||
import com.adc.da.slrs.sarInstitution.entity.TsUserVO;
|
||||
import com.adc.da.slrs.sarInstitution.service.ITsInstitutionService;
|
||||
@@ -104,6 +105,11 @@ public class TsInstitutionController extends BaseController<TsInstitution> {
|
||||
return tsInstitutionService.getNext(institutionId,userName);
|
||||
}
|
||||
|
||||
@GetMapping("/getNextTwo")
|
||||
public List<TsInstitution> getNextTwo(String userName){
|
||||
return tsInstitutionService.getNextTwo(userName);
|
||||
}
|
||||
|
||||
@ApiOperation("获得下一级的部门和人员")
|
||||
@GetMapping("/getNextById")
|
||||
public List<TsUserVO> getNextById(String ids){
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package com.adc.da.slrs.sarInstitution.dao;
|
||||
|
||||
import com.adc.da.slrs.sarInstitution.entity.InstitutionAndUser;
|
||||
import com.adc.da.slrs.sarInstitution.entity.TreeVo;
|
||||
import com.adc.da.slrs.sarInstitution.entity.TsInstitution;
|
||||
import com.adc.da.slrs.sarInstitution.entity.TsUserVO;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
@@ -24,6 +25,10 @@ public interface TsInstitutionDao extends BaseMapper<TsInstitution> {
|
||||
*/
|
||||
List<TsInstitution> selectNextInstitution(String institutionId);
|
||||
|
||||
List<TsUserVO> selectPreviousInstitution(@Param("userName") String name);
|
||||
|
||||
List<TsInstitution> selectInstitution(@Param("pId") List<String> pId);
|
||||
|
||||
/**
|
||||
* 根据部门id查询此部门的子一级人员
|
||||
* @return
|
||||
|
||||
@@ -0,0 +1,149 @@
|
||||
package com.adc.da.slrs.sarInstitution.entity;
|
||||
|
||||
import com.adc.da.slrs.sarPosition.entity.TsPosition;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import javax.validation.constraints.NotNull;
|
||||
import java.sql.Timestamp;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Author: qk
|
||||
* @Date: 2022/5/20 0020 10:54
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Data
|
||||
public class TreeVo {
|
||||
|
||||
public interface disable{
|
||||
}
|
||||
|
||||
@ApiModelProperty(value = "主键")
|
||||
private String id;
|
||||
|
||||
@ApiModelProperty(value = "上级机构")
|
||||
@TableField("parent_id")
|
||||
private String parentId;
|
||||
|
||||
@ApiModelProperty(value = "机构层级")
|
||||
@TableField("level")
|
||||
private Integer level;
|
||||
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty("是否是机构")
|
||||
private Boolean disabled;
|
||||
|
||||
@TableField("has_child")
|
||||
@ApiModelProperty("是否有子节点(1有，0没有)")
|
||||
private String hasChild;
|
||||
|
||||
@ApiModelProperty(value = "帐户")
|
||||
@TableField("ACCOUNT")
|
||||
private String account;
|
||||
|
||||
@ApiModelProperty(value = "密码")
|
||||
@TableField("PASSWORD")
|
||||
private String password;
|
||||
|
||||
@ApiModelProperty(value = "用户姓名")
|
||||
private String name;
|
||||
|
||||
@ApiModelProperty(value = "用户性别（1为男，2为女）")
|
||||
@TableField("SEX")
|
||||
private String sex;
|
||||
|
||||
@ApiModelProperty(value = "用户来源")
|
||||
@TableField("USER_SOURCE")
|
||||
private String userSource;
|
||||
|
||||
@ApiModelProperty(value = "用户手机号")
|
||||
@TableField("PHONE")
|
||||
private String phone;
|
||||
|
||||
@ApiModelProperty(value = "用户状态")
|
||||
@TableField("STATE")
|
||||
private String state;
|
||||
|
||||
@ApiModelProperty(value = "用户邮箱")
|
||||
@TableField("EMAIL")
|
||||
private String email;
|
||||
|
||||
@ApiModelProperty(value = "所属部门名称")
|
||||
@TableField("INSTITUTION_NAME")
|
||||
private String institutionName;
|
||||
|
||||
@ApiModelProperty(value = "所属部门ID")
|
||||
@TableField("INSTITUTION_ID")
|
||||
private String institutionId;
|
||||
|
||||
@ApiModelProperty(value = "岗位名")
|
||||
@TableField("POSITION_NAME")
|
||||
private String positionName;
|
||||
|
||||
@ApiModelProperty(value = "岗位ID")
|
||||
@TableField("POSITION_ID")
|
||||
private String positionId;
|
||||
|
||||
@ApiModelProperty(value = "工号")
|
||||
@TableField("WORK_NUM")
|
||||
private String workNum;
|
||||
|
||||
@ApiModelProperty(value = "备注")
|
||||
@TableField("EXT_INFO")
|
||||
private String extInfo;
|
||||
|
||||
@TableField("OPER_USER")
|
||||
private String operUser;
|
||||
|
||||
@ApiModelProperty(value = "创建时间")
|
||||
@TableField("CREATION_TIME")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Timestamp creationTime;
|
||||
|
||||
@ApiModelProperty(value = "修改时间")
|
||||
@TableField("MODIFY_TIME")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Timestamp modifyTime;
|
||||
|
||||
@ApiModelProperty(value = "是否有效")
|
||||
@TableField("VALID_FLAG")
|
||||
private String validFlag;
|
||||
|
||||
@ApiModelProperty(value = "是否禁用（0为未禁用，1为已禁用）")
|
||||
@NotNull(message = "disableFlag不能为空",groups = {TsUserVO.disable.class})
|
||||
@TableField("DISABLE_FLAG")
|
||||
private String disableFlag;
|
||||
|
||||
@ApiModelProperty(value = "是否锁定")
|
||||
@TableField("UNLOCK_FLAG")
|
||||
private String unlockFlag;
|
||||
|
||||
@ApiModelProperty(value = "用户类型")
|
||||
@TableField("USER_TYPE")
|
||||
private String userType;
|
||||
|
||||
@ApiModelProperty(value = "对接单点登录用户ID")
|
||||
@TableField("SSO_ID")
|
||||
private String ssoId;
|
||||
|
||||
@ApiModelProperty(value = "岗位")
|
||||
@TableField(exist = false)
|
||||
private List<TsPosition> positions;
|
||||
|
||||
@ApiModelProperty(value = "单位")
|
||||
@TableField(exist = false)
|
||||
private String unit;
|
||||
|
||||
@ApiModelProperty(value = "单位Id")
|
||||
@TableField(exist = false)
|
||||
private String unitId;
|
||||
|
||||
}
|
||||
+3
@@ -1,5 +1,6 @@
|
||||
package com.adc.da.slrs.sarInstitution.service;
|
||||
|
||||
import com.adc.da.slrs.sarInstitution.entity.TreeVo;
|
||||
import com.adc.da.slrs.sarInstitution.entity.TsInstitution;
|
||||
import com.adc.da.slrs.sarInstitution.entity.TsUserVO;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
@@ -38,6 +39,8 @@ public interface ITsInstitutionService extends IService<TsInstitution> {
|
||||
*/
|
||||
public List<TsInstitution> getNext(String institutionId,String userName);
|
||||
|
||||
public List<TsInstitution> getNextTwo(String userName);
|
||||
|
||||
public List<TsInstitution> getInstitutionIdToDept(String institutionIds,String userName);
|
||||
|
||||
public List<TsUserVO> getNextById(String ids);
|
||||
|
||||
+28
@@ -3,6 +3,7 @@ package com.adc.da.slrs.sarInstitution.service.impl;
|
||||
|
||||
import com.adc.da.slrs.sarInstitution.dao.TsInstitutionDao;
|
||||
import com.adc.da.slrs.sarInstitution.entity.SyncInstitution;
|
||||
import com.adc.da.slrs.sarInstitution.entity.TreeVo;
|
||||
import com.adc.da.slrs.sarInstitution.entity.TsInstitution;
|
||||
import com.adc.da.slrs.sarInstitution.entity.TsUserVO;
|
||||
import com.adc.da.slrs.sarInstitution.service.ITsInstitutionService;
|
||||
@@ -226,6 +227,33 @@ public class TsInstitutionServiceImpl extends ServiceImpl<TsInstitutionDao, TsIn
|
||||
return tsInstitutions;
|
||||
}
|
||||
|
||||
public List<TsInstitution> getNextTwo(String userName){
|
||||
List<TsInstitution> tsInstitutions = new ArrayList<>();
|
||||
List<TsUserVO> tsUser = tsInstitutionDao.selectPreviousInstitution(userName);
|
||||
if(tsUser.size() != 0){
|
||||
|
||||
List<String> pId = new ArrayList<>();
|
||||
for (TsUserVO t:tsUser) {
|
||||
pId.add(t.getInstitutionId());
|
||||
}
|
||||
tsInstitutions = tsInstitutionDao.selectInstitution(pId);
|
||||
|
||||
for(TsInstitution tsInstitution:tsInstitutions){
|
||||
tsInstitution.setDisabled(true);
|
||||
}
|
||||
for (TsInstitution t:tsInstitutions){
|
||||
List<Object> uers = new ArrayList<>();
|
||||
for (TsUserVO user:tsUser) {
|
||||
if(t.getId().equals(user.getInstitutionId())){
|
||||
uers.add(user);
|
||||
}
|
||||
t.setChildren(uers);
|
||||
}
|
||||
}
|
||||
}
|
||||
return tsInstitutions;
|
||||
}
|
||||
|
||||
public List<TsUserVO> getNextById(String ids){
|
||||
List<String> strings=new ArrayList<>(Arrays.asList(ids.split(",")));
|
||||
List<TsUserVO> tsUsers=tsInstitutionDao.selectNextUserByIds(strings);
|
||||
|
||||
Reference in New Issue
Block a user