Browse Source

fix: 修复考核部门错误

pull/7/head
pref_mail@163.com 1 year ago
parent
commit
685122f540
  1. 14
      blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/IndicatorsVO.java
  2. 3
      blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml
  3. 3
      blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/IndicatorsServiceImpl.java

14
blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/IndicatorsVO.java

@ -28,11 +28,25 @@ public class IndicatorsVO extends IndicatorsEntity {
private String parentClassifyName;
/**
* 考核制定部门Id
*/
private Long examineDeptId;
/**
* 考核制定部门
*/
private String examineDeptName;
/**
* 考核指标应用部门
*/
private String rangeDeptName;
private String deduction;
private List<PointsVO> PointsVOS = new ArrayList<>();
private List<IndicatorsAnnexEntity> pictures = new ArrayList<>();

3
blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml

@ -7,7 +7,8 @@
select si.id id,
sc.id classifyId,
sc.name classifyName,
sc.examine_dept_name examineDeptName,
sc.create_dept examineDeptId,
sc.examine_dept_name rangeDeptName,
psc.id parentClassifyId,
psc.name parentClassifyName,
si.assess_dept_name assessDeptName,

3
blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/IndicatorsServiceImpl.java

@ -64,6 +64,9 @@ public class IndicatorsServiceImpl extends BaseServiceImpl<IndicatorsMapper, Ind
for (IndicatorsVO record : records) {
Long deptId = record.getCreateDept();
Long examineDeptId = record.getExamineDeptId();
String examinDeptName = deptClient.findNameById(examineDeptId);
record.setExamineDeptName(examinDeptName);
String deptName = deptClient.findNameById(deptId);
record.setCreateDeptName(deptName);
Long createUser = record.getCreateUser();

Loading…
Cancel
Save