fix:查询子项

ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/CheckReportManager.java

@@ -77,27 +77,33 @@ public class CheckReportManager {
         return checkTypeService.saveBatch(list);
     }
 
-    public List<CheckTypeDTO> getCheckTypeDTO(String type) {
-        List<CheckTypeDTO> checkTypeDtoS = new ArrayList<>();
-        SysDictData sysDictData =new SysDictData();
-        sysDictData.setDictType(type);
-        List<SysDictData> list = dictDataService.selectDictDataList(sysDictData);
-        list.forEach(sysDictData1 -> {
+    public List<CheckTypeItemDTO> getCheckTypeDTO(String checkType,String typeName) {
         List<CheckTypeItemDTO> checkTypeItemDTOList =new ArrayList<>();
-            checkTypeDtoS.add(CheckTypeDTO.builder()
-                    .typeName(sysDictData1.getDictLabel())
-                    .checkType(sysDictData1.getDictValue()).checkTypeItemDTOList(checkTypeItemDTOList).build());
         SysDictData dictData = new SysDictData();
-            dictData.setDictType(sysDictData1.getDictValue());
+        dictData.setDictType(checkType);
         List<SysDictData> dataList = dictDataService.selectDictDataList(dictData);
-            dataList.forEach(sysDictData2 -> checkTypeItemDTOList.add(CheckTypeItemDTO.builder().typeName(sysDictData1.getDictLabel())
-                    .checkType(sysDictData1.getDictValue())
+        dataList.forEach(sysDictData2 -> checkTypeItemDTOList.add(CheckTypeItemDTO.builder()
+                .typeName(typeName)
+                .checkType(checkType)
                 .checkItems(sysDictData2.getDictLabel())
                 .itemsType(sysDictData2.getDictCode())
                 .typeContent(sysDictData2.getDictValue())
                 .score(sysDictData2.getCssClass())
                 .deductionCriteria(sysDictData2.getRemark())
                 .build()));
+
+        return checkTypeItemDTOList;
+    }
+
+    public List<CheckTypeDTO> getCheckTypeDTOParent(String type) {
+        List<CheckTypeDTO> checkTypeDtoS = new ArrayList<>();
+        SysDictData sysDictData =new SysDictData();
+        sysDictData.setDictType(type);
+        List<SysDictData> list = dictDataService.selectDictDataList(sysDictData);
+        list.forEach(sysDictData1 -> {
+            checkTypeDtoS.add(CheckTypeDTO.builder()
+                    .typeName(sysDictData1.getDictLabel())
+                    .checkType(sysDictData1.getDictValue()).build());
         });
         return checkTypeDtoS;
     }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/check/CheckReportController.java

@@ -146,7 +146,20 @@ public class CheckReportController extends BaseController {
     @GetMapping("/checkView/{type}")
     @ResponseBody
     public AjaxResult checkView(@PathVariable("type") String type) {
-        return AjaxResult.success(checkReportManager.getCheckTypeDTO(type));
+        return AjaxResult.success(checkReportManager.getCheckTypeDTOParent(type));
+    }
+
+    /**
+     * 查询子项
+     * @param checkType 自查类
+     * @param typeName 自查类名称
+     * @return
+     */
+    @GetMapping("/checkView/{checkType}/{typeName}")
+    @ResponseBody
+    public AjaxResult checkView(@PathVariable("checkType") String checkType,
+                                @PathVariable("typeName") String typeName) {
+        return AjaxResult.success(checkReportManager.getCheckTypeDTO(checkType,typeName));
     }
 
 

ruoyi-system/src/main/java/com/ruoyi/system/domain/check/dto/CheckTypeDTO.java

@@ -28,11 +28,6 @@ public class CheckTypeDTO implements Serializable {
     private String typeName;
 
 
-    /**
-     * 检查类型
-     */
-    private List<CheckTypeItemDTO> checkTypeItemDTOList;
-
 
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;