ganzi/ganzi-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

部门考核项查看

Browse Source
This commit is contained in:
mythxb 2024-04-02 16:25:02 +08:00
parent 0e8b034c91
commit adad656fd1
4 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
inventory-dao/src/main/java/com/rzyc/bean/ex/UnitStandardDto.java
View File

@ -14,14 +14,26 @@ import javax.validation.constraints.NotNull;
@ApiModel("部门普通考核项列表") @ApiModel("部门普通考核项列表")
public class UnitStandardDto { public class UnitStandardDto {
@NotNull(message = "用户id不能为空") @NotNull(message = "用户不能为空")
@ApiModelProperty(value = "用户id",required = true) @ApiModelProperty(value = "用户id",required = true)
private String userId; private String userId;
@NotNull(message = "部门不能为空")
@ApiModelProperty(value = "部门id",required = true)
private String performId;
@NotNull(message = "考核不能为空") @NotNull(message = "考核不能为空")
@ApiModelProperty(value = "考核id",required = true) @ApiModelProperty(value = "考核id",required = true)
private String examineId; private String examineId;
public String getPerformId() {
return performId;
}
public void setPerformId(String performId) {
this.performId = performId;
}
public String getExamineId() { public String getExamineId() {
return examineId; return examineId;
} }

11
inventory-dao/src/main/java/com/rzyc/model/user/SysUser.java
View File

@ -199,6 +199,9 @@ public class SysUser implements Serializable {
@ApiModelProperty("职务id") @ApiModelProperty("职务id")
private String listperformid; private String listperformid;
@ApiModelProperty("部门id")
private String performId;
/** /**
* 职务名 * 职务名
*/ */
@ -256,6 +259,14 @@ public class SysUser implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
public String getPerformId() {
return performId;
}
public void setPerformId(String performId) {
this.performId = performId;
}
public String getUnitPath() { public String getUnitPath() {
return unitPath; return unitPath;
} }

1
inventory-gov/src/main/java/com/rzyc/controller/BaseController.java
View File

@ -1896,6 +1896,7 @@ public class BaseController {
if(StringUtils.isNotBlank(sysUser.getSystitle())){ if(StringUtils.isNotBlank(sysUser.getSystitle())){
ListPerform listPerform = listPerformMapper.selectByPrimaryKey(sysUser.getSystitle()); ListPerform listPerform = listPerformMapper.selectByPrimaryKey(sysUser.getSystitle());
if(null != listPerform){ if(null != listPerform){
sysUser.setPerformId(listPerform.getSupclassid());
String titleName = listPerform.getPerformclassname(); String titleName = listPerform.getPerformclassname();
if(StringUtils.isNotBlank(sysUser.getSysunitorentname())){ if(StringUtils.isNotBlank(sysUser.getSysunitorentname())){
titleName = titleName.replace(sysUser.getSysunitorentname(),""); titleName = titleName.replace(sysUser.getSysunitorentname(),"");

6
inventory-gov/src/main/java/com/rzyc/controller/ExamineController.java
View File

@ -508,7 +508,7 @@ public class ExamineController extends BaseController{
MultiResult<StandardInfo> result = new MultiResult<>(); MultiResult<StandardInfo> result = new MultiResult<>();
//部门id //部门id
String unitId = getUnitId(unitStandardDto.getUserId()); String unitId = unitStandardDto.getPerformId();
//部门信息 //部门信息
ListPerform listPerform = listPerformMapper.selectByPrimaryKey(unitId); ListPerform listPerform = listPerformMapper.selectByPrimaryKey(unitId);
if(null != listPerform && null != listPerform.getExamineState()){ if(null != listPerform && null != listPerform.getExamineState()){
@ -563,7 +563,7 @@ public class ExamineController extends BaseController{
MultiResult<StandardInfo> result = new MultiResult<>(); MultiResult<StandardInfo> result = new MultiResult<>();
//部门id //部门id
String unitId = getUnitId(unitStandardDto.getUserId()); String unitId = unitStandardDto.getPerformId();
//部门信息 //部门信息
ListPerform listPerform = listPerformMapper.selectByPrimaryKey(unitId); ListPerform listPerform = listPerformMapper.selectByPrimaryKey(unitId);
if(null != listPerform && null != listPerform.getExamineState()){ if(null != listPerform && null != listPerform.getExamineState()){
@ -590,7 +590,7 @@ public class ExamineController extends BaseController{
public MultiResult<StandardInfo> unitStandardList(@Valid UnitStandardDto unitStandardDto)throws Exception{ public MultiResult<StandardInfo> unitStandardList(@Valid UnitStandardDto unitStandardDto)throws Exception{
MultiResult<StandardInfo> result = new MultiResult<>(); MultiResult<StandardInfo> result = new MultiResult<>();
//部门id //部门id
String unitId = getUnitId(unitStandardDto.getUserId()); String unitId = unitStandardDto.getPerformId();
//部门信息 //部门信息
ListPerform listPerform = listPerformMapper.selectByPrimaryKey(unitId); ListPerform listPerform = listPerformMapper.selectByPrimaryKey(unitId);
if(null != listPerform && null != listPerform.getExamineState()){ if(null != listPerform && null != listPerform.getExamineState()){