diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/CheckReportManager.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/CheckReportManager.java index da3c56c..0fdacbf 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/CheckReportManager.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/CheckReportManager.java @@ -93,6 +93,7 @@ public class CheckReportManager { dataList.forEach(sysDictData2 -> checkTypeItemDTOList.add(CheckTypeItemDTO.builder().typeName(sysDictData1.getDictLabel()) .checkType(sysDictData1.getDictValue()) .checkItems(sysDictData2.getDictLabel()) + .itemsType(sysDictData2.getDictCode()) .typeContent(sysDictData2.getDictValue()) .score(sysDictData2.getCssClass()) .deductionCriteria(sysDictData2.getRemark()) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/check/TdCheckType.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/check/TdCheckType.java index 495777b..e219881 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/check/TdCheckType.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/check/TdCheckType.java @@ -38,6 +38,11 @@ public class TdCheckType implements Serializable { */ private String typeName; + /** + * 自查项类型 + */ + private Long itemsType; + /** * 自查项 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/check/dto/CheckTypeItemDTO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/check/dto/CheckTypeItemDTO.java index 6d14e58..9fbd44a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/check/dto/CheckTypeItemDTO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/check/dto/CheckTypeItemDTO.java @@ -26,11 +26,19 @@ public class CheckTypeItemDTO implements Serializable { */ private String typeName; + + /** + * 自查项类型 + */ + private Long itemsType; + + /** * 自查项 */ private String checkItems; + /** * 自查内容 */ diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/check/dto/TdCheckTypeDTO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/check/dto/TdCheckTypeDTO.java index 27cec4c..7bbf482 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/check/dto/TdCheckTypeDTO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/check/dto/TdCheckTypeDTO.java @@ -36,6 +36,11 @@ public class TdCheckTypeDTO implements Serializable { */ private String typeName; + /** + * 自查项类型 + */ + private Long itemsType; + /** * 自查项 diff --git a/ruoyi-system/src/main/resources/mapper/system/TdCheckTypeMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TdCheckTypeMapper.xml index 76e54e3..5805635 100644 --- a/ruoyi-system/src/main/resources/mapper/system/TdCheckTypeMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/TdCheckTypeMapper.xml @@ -12,6 +12,7 @@ + @@ -20,7 +21,7 @@ id,check_id,check_type, - type_content,starts,type_name,check_items,score,real_score,deduction_criteria, + type_content,starts,type_name,check_items,score,real_score,deduction_criteria,items_type, remark