diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/SubCheckDictionaryDTO.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/SubCheckDictionaryDTO.java index 75a8e70a2..f9387c56c 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/SubCheckDictionaryDTO.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/SubCheckDictionaryDTO.java @@ -73,6 +73,11 @@ public class SubCheckDictionaryDTO implements Serializable { */ private String sort; + /** + * 分数权重 + */ + private Integer score; + /** * 逻辑删除标识 */ diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/result/CheckResourcesListResultDTO.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/result/CheckResourcesListResultDTO.java index b041dd920..9fdd668e9 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/result/CheckResourcesListResultDTO.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/result/CheckResourcesListResultDTO.java @@ -80,6 +80,11 @@ public class CheckResourcesListResultDTO extends TreeNodeNew implements Serializ */ private Integer sort; + /** + * 分数权重 + */ + private Integer score; + /** * 上级资源名称 */ diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/SubCheckDictionaryEntity.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/SubCheckDictionaryEntity.java index b97e2ed8d..2851d3e38 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/SubCheckDictionaryEntity.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/SubCheckDictionaryEntity.java @@ -73,4 +73,9 @@ public class SubCheckDictionaryEntity extends BaseEpdcEntity { */ private String sort; + /** + * 分数权重 + */ + private Integer score; + } diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/SubCheckDictionaryExcel.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/SubCheckDictionaryExcel.java index da6b9f89e..9d9c1a4df 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/SubCheckDictionaryExcel.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/SubCheckDictionaryExcel.java @@ -23,7 +23,7 @@ import lombok.Data; import java.util.Date; /** - * 阵地建设考核内容字典表 + * 阵地建设考核内容字典表 * * @author qu qu@elink-cn.com * @since v1.0.0 2020-12-07 @@ -55,6 +55,9 @@ public class SubCheckDictionaryExcel { @Excel(name = "排序") private String sort; + @Excel(name = "分数权重") + private Integer score; + @Excel(name = "逻辑删除标识") private String delFlag; @@ -74,4 +77,4 @@ public class SubCheckDictionaryExcel { private Date updatedTime; -} \ No newline at end of file +} diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/SubCheckDictionaryDao.xml b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/SubCheckDictionaryDao.xml index e356eea91..9c9199c4f 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/SubCheckDictionaryDao.xml +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/SubCheckDictionaryDao.xml @@ -12,6 +12,7 @@ + @@ -29,6 +30,7 @@ +