fix:事业部配置新增学科和阶段,支持多选
This commit is contained in:
@@ -10,4 +10,7 @@ public class DeptQueryReq extends BaseReq {
|
||||
@Schema(description = "部门名称")
|
||||
private String deptName;
|
||||
|
||||
@Schema(description = "学科")
|
||||
private String subject;
|
||||
|
||||
}
|
||||
|
||||
@@ -19,6 +19,12 @@ public class SysDeptUserResp {
|
||||
@Schema(description = "部门名称")
|
||||
private String deptName;
|
||||
|
||||
@Schema(description = "学科")
|
||||
private String subject;
|
||||
|
||||
@Schema(description = "阶段")
|
||||
private String stage;
|
||||
|
||||
@Schema(description = "部门负责人用户ID")
|
||||
@JsonFormat(shape = JsonFormat.Shape.STRING)
|
||||
private Long userId;
|
||||
|
||||
@@ -38,4 +38,20 @@ public class SysDeptFeignClientImpl implements ISysDeptFeignClient {
|
||||
}
|
||||
return response;
|
||||
}
|
||||
|
||||
@Override
|
||||
public SdmResponse<List<SysDeptUserResp>> queryByDeptAndSubject(DeptQueryReq req) {
|
||||
SdmResponse<List<SysDeptUserResp>> response = null;
|
||||
try {
|
||||
response = sysDeptFeignClient.queryByDeptAndSubject(req);
|
||||
if (response == null || !response.isSuccess()) {
|
||||
log.error("queryByDeptAndSubject failed response:{}", JSONObject.toJSONString(Optional.ofNullable(response)));
|
||||
return SdmResponse.failed("根据部门和学科查询负责人失败");
|
||||
}
|
||||
} catch (Exception e) {
|
||||
log.error("queryByDeptAndSubject error response:{}", JSONObject.toJSONString(Optional.ofNullable(response)));
|
||||
return SdmResponse.failed("根据部门和学科查询负责人失败");
|
||||
}
|
||||
return response;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -17,4 +17,7 @@ public interface ISysDeptFeignClient {
|
||||
@GetMapping("/dept/listDept")
|
||||
SdmResponse<PageDataResp<List<SysDeptUserResp>>> listDept(@SpringQueryMap DeptQueryReq req);
|
||||
|
||||
@GetMapping("/dept/queryByDeptAndSubject")
|
||||
SdmResponse<List<SysDeptUserResp>> queryByDeptAndSubject(@SpringQueryMap DeptQueryReq req);
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user