diff --git a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspecttemplate/InspectTemplateController.java b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspecttemplate/InspectTemplateController.java index ff601ec..4353c19 100644 --- a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspecttemplate/InspectTemplateController.java +++ b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspecttemplate/InspectTemplateController.java @@ -67,6 +67,12 @@ public class InspectTemplateController { InspectTemplateDO template = templateService.getTemplate(id); return success(BeanUtils.toBean(template, InspectTemplateRespVO.class)); } + @GetMapping("/getcategory") + @Operation(summary = "根据模版类型获取所属模版类别") + public CommonResult> getcategory(@RequestParam("type") String type) { + List category = templateService.getcategory(type); + return success(category); + } @GetMapping("/page") @Operation(summary = "获得汇总模板分页") diff --git a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspecttemplate/vo/InspectTemplatePageReqVO.java b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspecttemplate/vo/InspectTemplatePageReqVO.java index 8b016c7..132765c 100644 --- a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspecttemplate/vo/InspectTemplatePageReqVO.java +++ b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspecttemplate/vo/InspectTemplatePageReqVO.java @@ -33,4 +33,7 @@ public class InspectTemplatePageReqVO extends PageParam { @Schema(description = "模板名称", example = "赵六") private String contentName; + @Schema(description = "模板类别", example = "赵六") + private String category; + } \ No newline at end of file diff --git a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspecttemplate/vo/InspectTemplateRespVO.java b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspecttemplate/vo/InspectTemplateRespVO.java index c089052..c866bcb 100644 --- a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspecttemplate/vo/InspectTemplateRespVO.java +++ b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspecttemplate/vo/InspectTemplateRespVO.java @@ -38,4 +38,7 @@ public class InspectTemplateRespVO { @ExcelProperty("模板名称") private String contentName; + @Schema(description = "模板类别", example = "赵六") + private String category; + } \ No newline at end of file diff --git a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspecttemplate/vo/InspectTemplateSaveReqVO.java b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspecttemplate/vo/InspectTemplateSaveReqVO.java index dd23db5..5019db3 100644 --- a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspecttemplate/vo/InspectTemplateSaveReqVO.java +++ b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspecttemplate/vo/InspectTemplateSaveReqVO.java @@ -29,4 +29,7 @@ public class InspectTemplateSaveReqVO { @Schema(description = "模板名称", example = "赵六") private String contentName; + @Schema(description = "模板类别", example = "赵六") + private String category; + } \ No newline at end of file diff --git a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/dal/dataobject/inspecttemplate/InspectTemplateDO.java b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/dal/dataobject/inspecttemplate/InspectTemplateDO.java index 7fe070c..88cd02c 100644 --- a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/dal/dataobject/inspecttemplate/InspectTemplateDO.java +++ b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/dal/dataobject/inspecttemplate/InspectTemplateDO.java @@ -62,4 +62,10 @@ public class InspectTemplateDO { @TableField("contentName") private String contentName; + /** + * 模板类别 + */ + @TableField("category") + private String category; + } \ No newline at end of file diff --git a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspecttemplate/InspectTemplateService.java b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspecttemplate/InspectTemplateService.java index 04008f1..8148a58 100644 --- a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspecttemplate/InspectTemplateService.java +++ b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspecttemplate/InspectTemplateService.java @@ -44,6 +44,10 @@ public interface InspectTemplateService { * @return 汇总模板 */ InspectTemplateDO getTemplate(Integer id); + /* + * 根据模版类型查询所属模版类别 + * */ + List getcategory(String type); /** * 获得汇总模板分页 diff --git a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspecttemplate/InspectTemplateServiceImpl.java b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspecttemplate/InspectTemplateServiceImpl.java index 1103524..ffa5ee7 100644 --- a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspecttemplate/InspectTemplateServiceImpl.java +++ b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspecttemplate/InspectTemplateServiceImpl.java @@ -1,15 +1,13 @@ package cn.iocoder.yudao.module.inspect.service.inspecttemplate; -import cn.iocoder.yudao.framework.common.exception.ErrorCode; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; -import org.springframework.transaction.annotation.Transactional; import java.util.*; import cn.iocoder.yudao.module.inspect.controller.admin.inspecttemplate.vo.*; import cn.iocoder.yudao.module.inspect.dal.dataobject.inspecttemplate.InspectTemplateDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.inspect.dal.mysql.inspecttemplate.InspectTemplateMapper; @@ -66,6 +64,17 @@ public class InspectTemplateServiceImpl implements InspectTemplateService { public InspectTemplateDO getTemplate(Integer id) { return templateMapper.selectById(id); } + @Override + public List getcategory(String type){ + List list1 = new ArrayList<>(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("category", type); + List doList=templateMapper.selectList(queryWrapper); + for (InspectTemplateDO inspectTemplateDO : doList) { + list1.add(inspectTemplateDO.getCategory()); + } + return list1; + } @Override public PageResult getTemplatePage(InspectTemplatePageReqVO pageReqVO) {