From e92e9f7c3ac621e5cb328df62ae34039b78fe57c Mon Sep 17 00:00:00 2001 From: cjw Date: Sun, 7 Apr 2024 15:39:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=87=8F=E6=B5=8B=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E3=80=81=E9=87=8F=E6=B5=8B=E7=AD=94=E6=A1=88=E3=80=81?= =?UTF-8?q?=E9=87=8F=E6=B5=8B=E7=BB=93=E6=9E=9C=E3=80=81=E9=87=8F=E8=A1=A8?= =?UTF-8?q?=E5=8F=91=E5=B8=83=E5=88=9D=E5=A7=8B=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SysEvaluationAnswerController.java | 106 ++++++++++++++++ .../SysEvaluationConclusionController.java | 106 ++++++++++++++++ .../SysEvaluationRecordController.java | 106 ++++++++++++++++ .../controller/SysScalePublishController.java | 106 ++++++++++++++++ .../scale/domain/SysEvaluationAnswer.java | 44 +++++++ .../scale/domain/SysEvaluationConclusion.java | 60 +++++++++ .../scale/domain/SysEvaluationRecord.java | 53 ++++++++ .../org/dromara/scale/domain/SysScale.java | 16 ++- .../dromara/scale/domain/SysScalePublish.java | 84 +++++++++++++ .../domain/bo/SysEvaluationAnswerBo.java | 45 +++++++ .../domain/bo/SysEvaluationConclusionBo.java | 66 ++++++++++ .../domain/bo/SysEvaluationRecordBo.java | 47 +++++++ .../dromara/scale/domain/bo/SysScaleBo.java | 25 ++-- .../scale/domain/bo/SysScalePublishBo.java | 87 +++++++++++++ .../domain/vo/SysEvaluationAnswerVo.java | 53 ++++++++ .../domain/vo/SysEvaluationConclusionVo.java | 72 +++++++++++ .../domain/vo/SysEvaluationRecordVo.java | 53 ++++++++ .../scale/domain/vo/SysScalePublishVo.java | 84 +++++++++++++ .../dromara/scale/domain/vo/SysScaleVo.java | 20 +-- .../mapper/SysEvaluationAnswerMapper.java | 15 +++ .../mapper/SysEvaluationConclusionMapper.java | 15 +++ .../mapper/SysEvaluationRecordMapper.java | 15 +++ .../scale/mapper/SysScalePublishMapper.java | 15 +++ .../service/ISysEvaluationAnswerService.java | 48 ++++++++ .../ISysEvaluationConclusionService.java | 48 ++++++++ .../service/ISysEvaluationRecordService.java | 48 ++++++++ .../service/ISysScalePublishService.java | 48 ++++++++ .../impl/SysEvaluationAnswerServiceImpl.java | 109 +++++++++++++++++ .../SysEvaluationConclusionServiceImpl.java | 112 +++++++++++++++++ .../impl/SysEvaluationRecordServiceImpl.java | 109 +++++++++++++++++ .../impl/SysScalePublishServiceImpl.java | 115 ++++++++++++++++++ .../scale/SysEvaluationAnswerMapper.xml | 7 ++ .../scale/SysEvaluationConclusionMapper.xml | 7 ++ .../scale/SysEvaluationRecordMapper.xml | 7 ++ .../mapper/scale/SysScalePublishMapper.xml | 7 ++ 35 files changed, 1938 insertions(+), 20 deletions(-) create mode 100644 ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysEvaluationAnswerController.java create mode 100644 ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysEvaluationConclusionController.java create mode 100644 ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysEvaluationRecordController.java create mode 100644 ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScalePublishController.java create mode 100644 ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysEvaluationAnswer.java create mode 100644 ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysEvaluationConclusion.java create mode 100644 ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysEvaluationRecord.java create mode 100644 ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScalePublish.java create mode 100644 ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysEvaluationAnswerBo.java create mode 100644 ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysEvaluationConclusionBo.java create mode 100644 ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysEvaluationRecordBo.java create mode 100644 ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysScalePublishBo.java create mode 100644 ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysEvaluationAnswerVo.java create mode 100644 ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysEvaluationConclusionVo.java create mode 100644 ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysEvaluationRecordVo.java create mode 100644 ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScalePublishVo.java create mode 100644 ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysEvaluationAnswerMapper.java create mode 100644 ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysEvaluationConclusionMapper.java create mode 100644 ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysEvaluationRecordMapper.java create mode 100644 ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysScalePublishMapper.java create mode 100644 ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysEvaluationAnswerService.java create mode 100644 ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysEvaluationConclusionService.java create mode 100644 ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysEvaluationRecordService.java create mode 100644 ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysScalePublishService.java create mode 100644 ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysEvaluationAnswerServiceImpl.java create mode 100644 ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysEvaluationConclusionServiceImpl.java create mode 100644 ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysEvaluationRecordServiceImpl.java create mode 100644 ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScalePublishServiceImpl.java create mode 100644 ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysEvaluationAnswerMapper.xml create mode 100644 ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysEvaluationConclusionMapper.xml create mode 100644 ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysEvaluationRecordMapper.xml create mode 100644 ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysScalePublishMapper.xml diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysEvaluationAnswerController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysEvaluationAnswerController.java new file mode 100644 index 0000000..8fff4d1 --- /dev/null +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysEvaluationAnswerController.java @@ -0,0 +1,106 @@ +package org.dromara.scale.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.web.core.BaseController; +import org.dromara.scale.domain.bo.SysEvaluationAnswerBo; +import org.dromara.scale.domain.vo.SysEvaluationAnswerVo; +import org.dromara.scale.service.ISysEvaluationAnswerService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 量测回答记录 + * + * @author CJW + * @date 2024-04-07 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/evaluation/answer") +public class SysEvaluationAnswerController extends BaseController { + + private final ISysEvaluationAnswerService sysEvaluationAnswerService; + + /** + * 查询量测回答记录列表 + */ + @SaCheckPermission("evaluation:answer:list") + @GetMapping("/list") + public TableDataInfo list(SysEvaluationAnswerBo bo, PageQuery pageQuery) { + return sysEvaluationAnswerService.queryPageList(bo, pageQuery); + } + + /** + * 导出量测回答记录列表 + */ + @SaCheckPermission("scale:evaluationAnswer:export") + @Log(title = "量测回答记录", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(SysEvaluationAnswerBo bo, HttpServletResponse response) { + List list = sysEvaluationAnswerService.queryList(bo); + ExcelUtil.exportExcel(list, "量测回答记录", SysEvaluationAnswerVo.class, response); + } + + /** + * 获取量测回答记录详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("scale:evaluationAnswer:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(sysEvaluationAnswerService.queryById(id)); + } + + /** + * 新增量测回答记录 + */ + @SaCheckPermission("scale:evaluationAnswer:add") + @Log(title = "量测回答记录", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody SysEvaluationAnswerBo bo) { + return toAjax(sysEvaluationAnswerService.insertByBo(bo)); + } + + /** + * 修改量测回答记录 + */ + @SaCheckPermission("scale:evaluationAnswer:edit") + @Log(title = "量测回答记录", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody SysEvaluationAnswerBo bo) { + return toAjax(sysEvaluationAnswerService.updateByBo(bo)); + } + + /** + * 删除量测回答记录 + * + * @param ids 主键串 + */ + @SaCheckPermission("scale:evaluationAnswer:remove") + @Log(title = "量测回答记录", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(sysEvaluationAnswerService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysEvaluationConclusionController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysEvaluationConclusionController.java new file mode 100644 index 0000000..f27c3a8 --- /dev/null +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysEvaluationConclusionController.java @@ -0,0 +1,106 @@ +package org.dromara.scale.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.web.core.BaseController; +import org.dromara.scale.domain.bo.SysEvaluationConclusionBo; +import org.dromara.scale.domain.vo.SysEvaluationConclusionVo; +import org.dromara.scale.service.ISysEvaluationConclusionService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 量测结果 + * + * @author CJW + * @date 2024-04-07 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/scale/evaluationConclusion") +public class SysEvaluationConclusionController extends BaseController { + + private final ISysEvaluationConclusionService sysEvaluationConclusionService; + + /** + * 查询量测结果列表 + */ + @SaCheckPermission("scale:evaluationConclusion:list") + @GetMapping("/list") + public TableDataInfo list(SysEvaluationConclusionBo bo, PageQuery pageQuery) { + return sysEvaluationConclusionService.queryPageList(bo, pageQuery); + } + + /** + * 导出量测结果列表 + */ + @SaCheckPermission("scale:evaluationConclusion:export") + @Log(title = "量测结果", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(SysEvaluationConclusionBo bo, HttpServletResponse response) { + List list = sysEvaluationConclusionService.queryList(bo); + ExcelUtil.exportExcel(list, "量测结果", SysEvaluationConclusionVo.class, response); + } + + /** + * 获取量测结果详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("scale:evaluationConclusion:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(sysEvaluationConclusionService.queryById(id)); + } + + /** + * 新增量测结果 + */ + @SaCheckPermission("scale:evaluationConclusion:add") + @Log(title = "量测结果", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody SysEvaluationConclusionBo bo) { + return toAjax(sysEvaluationConclusionService.insertByBo(bo)); + } + + /** + * 修改量测结果 + */ + @SaCheckPermission("scale:evaluationConclusion:edit") + @Log(title = "量测结果", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody SysEvaluationConclusionBo bo) { + return toAjax(sysEvaluationConclusionService.updateByBo(bo)); + } + + /** + * 删除量测结果 + * + * @param ids 主键串 + */ + @SaCheckPermission("scale:evaluationConclusion:remove") + @Log(title = "量测结果", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(sysEvaluationConclusionService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysEvaluationRecordController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysEvaluationRecordController.java new file mode 100644 index 0000000..9f2661b --- /dev/null +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysEvaluationRecordController.java @@ -0,0 +1,106 @@ +package org.dromara.scale.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.web.core.BaseController; +import org.dromara.scale.domain.bo.SysEvaluationRecordBo; +import org.dromara.scale.domain.vo.SysEvaluationRecordVo; +import org.dromara.scale.service.ISysEvaluationRecordService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 量测记录 + * + * @author CJW + * @date 2024-04-07 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/scale/evaluationRecord") +public class SysEvaluationRecordController extends BaseController { + + private final ISysEvaluationRecordService sysEvaluationRecordService; + + /** + * 查询量测记录列表 + */ + @SaCheckPermission("scale:evaluationRecord:list") + @GetMapping("/list") + public TableDataInfo list(SysEvaluationRecordBo bo, PageQuery pageQuery) { + return sysEvaluationRecordService.queryPageList(bo, pageQuery); + } + + /** + * 导出量测记录列表 + */ + @SaCheckPermission("scale:evaluationRecord:export") + @Log(title = "量测记录", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(SysEvaluationRecordBo bo, HttpServletResponse response) { + List list = sysEvaluationRecordService.queryList(bo); + ExcelUtil.exportExcel(list, "量测记录", SysEvaluationRecordVo.class, response); + } + + /** + * 获取量测记录详细信息 + * + * @param recordId 主键 + */ + @SaCheckPermission("scale:evaluationRecord:query") + @GetMapping("/{recordId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long recordId) { + return R.ok(sysEvaluationRecordService.queryById(recordId)); + } + + /** + * 新增量测记录 + */ + @SaCheckPermission("scale:evaluationRecord:add") + @Log(title = "量测记录", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody SysEvaluationRecordBo bo) { + return toAjax(sysEvaluationRecordService.insertByBo(bo)); + } + + /** + * 修改量测记录 + */ + @SaCheckPermission("scale:evaluationRecord:edit") + @Log(title = "量测记录", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody SysEvaluationRecordBo bo) { + return toAjax(sysEvaluationRecordService.updateByBo(bo)); + } + + /** + * 删除量测记录 + * + * @param recordIds 主键串 + */ + @SaCheckPermission("scale:evaluationRecord:remove") + @Log(title = "量测记录", businessType = BusinessType.DELETE) + @DeleteMapping("/{recordIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] recordIds) { + return toAjax(sysEvaluationRecordService.deleteWithValidByIds(List.of(recordIds), true)); + } +} diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScalePublishController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScalePublishController.java new file mode 100644 index 0000000..4b3d481 --- /dev/null +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScalePublishController.java @@ -0,0 +1,106 @@ +package org.dromara.scale.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.web.core.BaseController; +import org.dromara.scale.domain.bo.SysScalePublishBo; +import org.dromara.scale.domain.vo.SysScalePublishVo; +import org.dromara.scale.service.ISysScalePublishService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 量发布 + * + * @author CJW + * @date 2024-04-07 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/scale/scalePublish") +public class SysScalePublishController extends BaseController { + + private final ISysScalePublishService sysScalePublishService; + + /** + * 查询量发布列表 + */ + @SaCheckPermission("scale:scalePublish:list") + @GetMapping("/list") + public TableDataInfo list(SysScalePublishBo bo, PageQuery pageQuery) { + return sysScalePublishService.queryPageList(bo, pageQuery); + } + + /** + * 导出量发布列表 + */ + @SaCheckPermission("scale:scalePublish:export") + @Log(title = "量发布", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(SysScalePublishBo bo, HttpServletResponse response) { + List list = sysScalePublishService.queryList(bo); + ExcelUtil.exportExcel(list, "量发布", SysScalePublishVo.class, response); + } + + /** + * 获取量发布详细信息 + * + * @param batchNo 主键 + */ + @SaCheckPermission("scale:scalePublish:query") + @GetMapping("/{batchNo}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long batchNo) { + return R.ok(sysScalePublishService.queryById(batchNo)); + } + + /** + * 新增量发布 + */ + @SaCheckPermission("scale:scalePublish:add") + @Log(title = "量发布", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody SysScalePublishBo bo) { + return toAjax(sysScalePublishService.insertByBo(bo)); + } + + /** + * 修改量发布 + */ + @SaCheckPermission("scale:scalePublish:edit") + @Log(title = "量发布", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody SysScalePublishBo bo) { + return toAjax(sysScalePublishService.updateByBo(bo)); + } + + /** + * 删除量发布 + * + * @param batchNos 主键串 + */ + @SaCheckPermission("scale:scalePublish:remove") + @Log(title = "量发布", businessType = BusinessType.DELETE) + @DeleteMapping("/{batchNos}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] batchNos) { + return toAjax(sysScalePublishService.deleteWithValidByIds(List.of(batchNos), true)); + } +} diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysEvaluationAnswer.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysEvaluationAnswer.java new file mode 100644 index 0000000..7a234fb --- /dev/null +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysEvaluationAnswer.java @@ -0,0 +1,44 @@ +package org.dromara.scale.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serial; + +/** + * 量测回答记录对象 sys_evaluation_answer + * + * @author CJW + * @date 2024-04-07 + */ +@Data +@TableName("sys_evaluation_answer") +public class SysEvaluationAnswer { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * + */ + @TableId(value = "id") + private Long id; + + /** + * td_evaluation_record表id + */ + private Long recordId; + + /** + * 题目id + */ + private Long questionId; + + /** + * 答案id + */ + private Long answerId; + + +} diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysEvaluationConclusion.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysEvaluationConclusion.java new file mode 100644 index 0000000..c0b16dd --- /dev/null +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysEvaluationConclusion.java @@ -0,0 +1,60 @@ +package org.dromara.scale.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serial; +import java.math.BigDecimal; + +/** + * 量测结果对象 sys_evaluation_conclusion + * + * @author CJW + * @date 2024-04-07 + */ +@Data +@TableName("sys_evaluation_conclusion") +public class SysEvaluationConclusion { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * + */ + @TableId(value = "id") + private Long id; + + /** + * td_evaluation_record表id + */ + private Long recordId; + + /** + * sys_scale_factor表id + */ + private Long factorId; + + /** + * 得分 + */ + private BigDecimal score; + + /** + * 得分率 + */ + private BigDecimal scoreRate; + + /** + * sys_scale_factor_range表主键 + */ + private Long factorRangeId; + + /** + * 0:未命中，1:命中，若命中则，测评人符合该测评项，未命中则测评人不符合测评项 + */ + private Integer status; + + +} diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysEvaluationRecord.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysEvaluationRecord.java new file mode 100644 index 0000000..6d7e2e2 --- /dev/null +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysEvaluationRecord.java @@ -0,0 +1,53 @@ +package org.dromara.scale.domain; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serial; +import java.util.Date; + +/** + * 量测记录对象 sys_evaluation_record + * + * @author CJW + * @date 2024-04-07 + */ +@Data +@TableName("sys_evaluation_record") +public class SysEvaluationRecord { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * + */ + @TableId(value = "record_id") + private Long recordId; + + /** + * 量表id + */ + private Long scaleId; + + /** + * 测评人id + */ + private Long userId; + + /** + * td_scale_publish表主键 + */ + private Long batchNo; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + private Date createTime; + + +} diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScale.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScale.java index 8a4b7d5..9a02be2 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScale.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScale.java @@ -1,11 +1,10 @@ package org.dromara.scale.domain; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; +import org.dromara.common.mybatis.core.domain.BaseEntity; import java.io.Serial; @@ -48,6 +47,15 @@ public class SysScale extends BaseEntity { * 类型 */ private String scaleType; + /** + * 维度类型：0:单项单维，1:多项单维型，2:多项多维型 + */ + private Integer dimensionType; + + /** + * 0:高分异常，1：低分异常 + */ + private Integer selectDirection; /** * 测评时间 diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScalePublish.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScalePublish.java new file mode 100644 index 0000000..fb3acc3 --- /dev/null +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScalePublish.java @@ -0,0 +1,84 @@ +package org.dromara.scale.domain; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serial; +import java.util.Date; + +/** + * 量发布对象 sys_scale_publish + * + * @author CJW + * @date 2024-04-07 + */ +@Data +@TableName("sys_scale_publish") +public class SysScalePublish { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * + */ + @TableId(value = "batch_no") + private Long batchNo; + + /** + * 量表id，以逗号隔开 + */ + private String scaleIds; + + /** + * 量表名称 以逗号隔开 + */ + private String scaleNames; + + /** + * 场次名称 + */ + private String sessionName; + + /** + * 部门分组id + */ + private Long deptId; + + /** + * 应参评人数 + */ + private Long partNum; + + /** + * 截止日期 + */ + private Date expireTime; + + /** + * 状态 0:正常；1:停用 + */ + private Long status; + + /** + * 0:不允许，1：允许 + */ + private Integer allowQueryResult; + + /** + * 创建者 + */ + @TableField(fill = FieldFill.INSERT) + private Long createBy; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + private Date createTime; + + +} diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysEvaluationAnswerBo.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysEvaluationAnswerBo.java new file mode 100644 index 0000000..db475b6 --- /dev/null +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysEvaluationAnswerBo.java @@ -0,0 +1,45 @@ +package org.dromara.scale.domain.bo; + +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.scale.domain.SysEvaluationAnswer; + +/** + * 量测回答记录业务对象 sys_evaluation_answer + * + * @author CJW + * @date 2024-04-07 + */ +@Data +@AutoMapper(target = SysEvaluationAnswer.class, reverseConvertGenerate = false) +public class SysEvaluationAnswerBo { + + /** + * + */ + @NotNull(message = "不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * td_evaluation_record表id + */ + @NotNull(message = "td_evaluation_record表id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long recordId; + + /** + * 题目id + */ + @NotNull(message = "题目id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long questionId; + + /** + * 答案id + */ + @NotNull(message = "答案id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long answerId; + + +} diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysEvaluationConclusionBo.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysEvaluationConclusionBo.java new file mode 100644 index 0000000..4167f02 --- /dev/null +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysEvaluationConclusionBo.java @@ -0,0 +1,66 @@ +package org.dromara.scale.domain.bo; + +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.scale.domain.SysEvaluationConclusion; + +import java.math.BigDecimal; + +/** + * 量测结果业务对象 sys_evaluation_conclusion + * + * @author CJW + * @date 2024-04-07 + */ +@Data +@AutoMapper(target = SysEvaluationConclusion.class, reverseConvertGenerate = false) +public class SysEvaluationConclusionBo { + + /** + * + */ + @NotNull(message = "不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * td_evaluation_record表id + */ + @NotNull(message = "td_evaluation_record表id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long recordId; + + /** + * sys_scale_factor表id + */ + @NotNull(message = "sys_scale_factor表id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long factorId; + + /** + * 得分 + */ + @NotNull(message = "得分不能为空", groups = { AddGroup.class, EditGroup.class }) + private BigDecimal score; + + /** + * 得分率 + */ + @NotNull(message = "得分率不能为空", groups = { AddGroup.class, EditGroup.class }) + private BigDecimal scoreRate; + + /** + * sys_scale_factor_range表主键 + */ + @NotNull(message = "sys_scale_factor_range表主键不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long factorRangeId; + + /** + * 0:未命中，1:命中，若命中则，测评人符合该测评项，未命中则测评人不符合测评项 + */ + @NotNull(message = "0:未命中，1:命中，若命中则，测评人符合该测评项，未命中则测评人不符合测评项不能为空", groups = { AddGroup.class, EditGroup.class }) + private Integer status; + + +} diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysEvaluationRecordBo.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysEvaluationRecordBo.java new file mode 100644 index 0000000..501e458 --- /dev/null +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysEvaluationRecordBo.java @@ -0,0 +1,47 @@ +package org.dromara.scale.domain.bo; + +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.scale.domain.SysEvaluationRecord; + +import java.util.Date; + +/** + * 量测记录业务对象 sys_evaluation_record + * + * @author CJW + * @date 2024-04-07 + */ +@Data +@AutoMapper(target = SysEvaluationRecord.class, reverseConvertGenerate = false) +public class SysEvaluationRecordBo { + + /** + * + */ + @NotNull(message = "不能为空", groups = { EditGroup.class }) + private Long recordId; + + /** + * 量表id + */ + @NotNull(message = "量表id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long scaleId; + + /** + * 测评人id + */ + @NotNull(message = "测评人id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long userId; + + /** + * td_scale_publish表主键 + */ + @NotNull(message = "td_scale_publish表主键不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long batchNo; + + private Date createTime; +} diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysScaleBo.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysScaleBo.java index 8f7cd76..04fa9cf 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysScaleBo.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysScaleBo.java @@ -1,17 +1,14 @@ package org.dromara.scale.domain.bo; -import org.dromara.scale.domain.SysScale; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.EqualsAndHashCode; -import jakarta.validation.constraints.*; - -import java.util.Date; - -import com.fasterxml.jackson.annotation.JsonFormat; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.scale.domain.SysScale; /** * 心理测评量业务对象 sys_scale @@ -54,6 +51,16 @@ public class SysScaleBo extends BaseEntity { @NotBlank(message = "类型不能为空", groups = {AddGroup.class, EditGroup.class}) private String scaleType; + /** + * 维度类型：0:单项单维，1:多项单维型，2:多项多维型 + */ + @NotNull(message = "维度类型不能为空", groups = {AddGroup.class, EditGroup.class}) + private Integer dimensionType; + + /** + * 0:高分异常，1：低分异常 + */ + private Integer selectDirection; /** * 测评时间 diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysScalePublishBo.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysScalePublishBo.java new file mode 100644 index 0000000..4fa7959 --- /dev/null +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysScalePublishBo.java @@ -0,0 +1,87 @@ +package org.dromara.scale.domain.bo; + +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.scale.domain.SysScalePublish; + +import java.util.Date; + +/** + * 量发布业务对象 sys_scale_publish + * + * @author CJW + * @date 2024-04-07 + */ +@Data +@AutoMapper(target = SysScalePublish.class, reverseConvertGenerate = false) +public class SysScalePublishBo { + + /** + * + */ + @NotNull(message = "不能为空", groups = { EditGroup.class }) + private Long batchNo; + + /** + * 量表id，以逗号隔开 + */ + @NotBlank(message = "量表id，以逗号隔开不能为空", groups = { AddGroup.class, EditGroup.class }) + private String scaleIds; + + /** + * 量表名称 以逗号隔开 + */ + @NotBlank(message = "量表名称 以逗号隔开不能为空", groups = { AddGroup.class, EditGroup.class }) + private String scaleNames; + + /** + * 场次名称 + */ + @NotBlank(message = "场次名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String sessionName; + + /** + * 部门分组id + */ + @NotNull(message = "部门分组id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long deptId; + + /** + * 应参评人数 + */ + @NotNull(message = "应参评人数不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long partNum; + + /** + * 截止日期 + */ + @NotNull(message = "截止日期不能为空", groups = { AddGroup.class, EditGroup.class }) + private Date expireTime; + + /** + * 状态 0:正常；1:停用 + */ + @NotNull(message = "状态 0:正常；1:停用不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long status; + + /** + * 0:不允许，1：允许 + */ + @NotNull(message = "0:不允许，1：允许不能为空", groups = { AddGroup.class, EditGroup.class }) + private Integer allowQueryResult; + + /** + * 创建者 + */ + private Long createBy; + + /** + * 创建时间 + */ + private Date createTime; + +} diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysEvaluationAnswerVo.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysEvaluationAnswerVo.java new file mode 100644 index 0000000..312e1c9 --- /dev/null +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysEvaluationAnswerVo.java @@ -0,0 +1,53 @@ +package org.dromara.scale.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.scale.domain.SysEvaluationAnswer; + +import java.io.Serial; +import java.io.Serializable; + + + +/** + * 量测回答记录视图对象 sys_evaluation_answer + * + * @author CJW + * @date 2024-04-07 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = SysEvaluationAnswer.class) +public class SysEvaluationAnswerVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * + */ + @ExcelProperty(value = "") + private Long id; + + /** + * td_evaluation_record表id + */ + @ExcelProperty(value = "td_evaluation_record表id") + private Long recordId; + + /** + * 题目id + */ + @ExcelProperty(value = "题目id") + private Long questionId; + + /** + * 答案id + */ + @ExcelProperty(value = "答案id") + private Long answerId; + + +} diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysEvaluationConclusionVo.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysEvaluationConclusionVo.java new file mode 100644 index 0000000..59567ff --- /dev/null +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysEvaluationConclusionVo.java @@ -0,0 +1,72 @@ +package org.dromara.scale.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.scale.domain.SysEvaluationConclusion; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; + + + +/** + * 量测结果视图对象 sys_evaluation_conclusion + * + * @author CJW + * @date 2024-04-07 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = SysEvaluationConclusion.class) +public class SysEvaluationConclusionVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * + */ + @ExcelProperty(value = "") + private Long id; + + /** + * td_evaluation_record表id + */ + @ExcelProperty(value = "td_evaluation_record表id") + private Long recordId; + + /** + * sys_scale_factor表id + */ + @ExcelProperty(value = "sys_scale_factor表id") + private Long factorId; + + /** + * 得分 + */ + @ExcelProperty(value = "得分") + private BigDecimal score; + + /** + * 得分率 + */ + @ExcelProperty(value = "得分率") + private BigDecimal scoreRate; + + /** + * sys_scale_factor_range表主键 + */ + @ExcelProperty(value = "sys_scale_factor_range表主键") + private Long factorRangeId; + + /** + * 0:未命中，1:命中，若命中则，测评人符合该测评项，未命中则测评人不符合测评项 + */ + @ExcelProperty(value = "0:未命中，1:命中，若命中则，测评人符合该测评项，未命中则测评人不符合测评项") + private Integer status; + + +} diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysEvaluationRecordVo.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysEvaluationRecordVo.java new file mode 100644 index 0000000..83dd73e --- /dev/null +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysEvaluationRecordVo.java @@ -0,0 +1,53 @@ +package org.dromara.scale.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.scale.domain.SysEvaluationRecord; + +import java.io.Serial; +import java.io.Serializable; + + + +/** + * 量测记录视图对象 sys_evaluation_record + * + * @author CJW + * @date 2024-04-07 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = SysEvaluationRecord.class) +public class SysEvaluationRecordVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * + */ + @ExcelProperty(value = "") + private Long recordId; + + /** + * 量表id + */ + @ExcelProperty(value = "量表id") + private Long scaleId; + + /** + * 测评人id + */ + @ExcelProperty(value = "测评人id") + private Long userId; + + /** + * td_scale_publish表主键 + */ + @ExcelProperty(value = "td_scale_publish表主键") + private Long batchNo; + + +} diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScalePublishVo.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScalePublishVo.java new file mode 100644 index 0000000..4eba35a --- /dev/null +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScalePublishVo.java @@ -0,0 +1,84 @@ +package org.dromara.scale.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.scale.domain.SysScalePublish; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 量发布视图对象 sys_scale_publish + * + * @author CJW + * @date 2024-04-07 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = SysScalePublish.class) +public class SysScalePublishVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * + */ + @ExcelProperty(value = "") + private Long batchNo; + + /** + * 量表id，以逗号隔开 + */ + @ExcelProperty(value = "量表id，以逗号隔开") + private String scaleIds; + + /** + * 量表名称 以逗号隔开 + */ + @ExcelProperty(value = "量表名称 以逗号隔开") + private String scaleNames; + + /** + * 场次名称 + */ + @ExcelProperty(value = "场次名称") + private String sessionName; + + /** + * 部门分组id + */ + @ExcelProperty(value = "部门分组id") + private Long deptId; + + /** + * 应参评人数 + */ + @ExcelProperty(value = "应参评人数") + private Long partNum; + + /** + * 截止日期 + */ + @ExcelProperty(value = "截止日期") + private Date expireTime; + + /** + * 状态 0:正常；1:停用 + */ + @ExcelProperty(value = "状态 0:正常；1:停用") + private Long status; + + /** + * 0:不允许，1：允许 + */ + @ExcelProperty(value = "0:不允许，1：允许") + private Integer allowQueryResult; + + +} diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScaleVo.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScaleVo.java index 0a21b41..09c51c5 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScaleVo.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScaleVo.java @@ -1,19 +1,15 @@ package org.dromara.scale.domain.vo; -import java.util.Date; - -import com.fasterxml.jackson.annotation.JsonFormat; -import org.dromara.scale.domain.SysScale; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import org.dromara.scale.domain.SysScale; import java.io.Serial; import java.io.Serializable; -import java.util.Date; /** @@ -67,6 +63,16 @@ public class SysScaleVo implements Serializable { */ private String scaleTypeName; + /** + * 维度类型：0:单项单维，1:多项单维型，2:多项多维型 + */ + private Integer dimensionType; + + /** + * 0:高分异常，1：低分异常 + */ + private Integer selectDirection; + /** * 测评时间 */ diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysEvaluationAnswerMapper.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysEvaluationAnswerMapper.java new file mode 100644 index 0000000..033ca39 --- /dev/null +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysEvaluationAnswerMapper.java @@ -0,0 +1,15 @@ +package org.dromara.scale.mapper; + +import org.dromara.scale.domain.SysEvaluationAnswer; +import org.dromara.scale.domain.vo.SysEvaluationAnswerVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 量测回答记录Mapper接口 + * + * @author CJW + * @date 2024-04-07 + */ +public interface SysEvaluationAnswerMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysEvaluationConclusionMapper.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysEvaluationConclusionMapper.java new file mode 100644 index 0000000..f4c41df --- /dev/null +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysEvaluationConclusionMapper.java @@ -0,0 +1,15 @@ +package org.dromara.scale.mapper; + +import org.dromara.scale.domain.SysEvaluationConclusion; +import org.dromara.scale.domain.vo.SysEvaluationConclusionVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 量测结果Mapper接口 + * + * @author CJW + * @date 2024-04-07 + */ +public interface SysEvaluationConclusionMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysEvaluationRecordMapper.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysEvaluationRecordMapper.java new file mode 100644 index 0000000..5cc9d39 --- /dev/null +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysEvaluationRecordMapper.java @@ -0,0 +1,15 @@ +package org.dromara.scale.mapper; + +import org.dromara.scale.domain.SysEvaluationRecord; +import org.dromara.scale.domain.vo.SysEvaluationRecordVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 量测记录Mapper接口 + * + * @author CJW + * @date 2024-04-07 + */ +public interface SysEvaluationRecordMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysScalePublishMapper.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysScalePublishMapper.java new file mode 100644 index 0000000..ed78666 --- /dev/null +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysScalePublishMapper.java @@ -0,0 +1,15 @@ +package org.dromara.scale.mapper; + +import org.dromara.scale.domain.SysScalePublish; +import org.dromara.scale.domain.vo.SysScalePublishVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 量发布Mapper接口 + * + * @author CJW + * @date 2024-04-07 + */ +public interface SysScalePublishMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysEvaluationAnswerService.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysEvaluationAnswerService.java new file mode 100644 index 0000000..6113e56 --- /dev/null +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysEvaluationAnswerService.java @@ -0,0 +1,48 @@ +package org.dromara.scale.service; + +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.scale.domain.bo.SysEvaluationAnswerBo; +import org.dromara.scale.domain.vo.SysEvaluationAnswerVo; + +import java.util.Collection; +import java.util.List; + +/** + * 量测回答记录Service接口 + * + * @author CJW + * @date 2024-04-07 + */ +public interface ISysEvaluationAnswerService { + + /** + * 查询量测回答记录 + */ + SysEvaluationAnswerVo queryById(Long id); + + /** + * 查询量测回答记录列表 + */ + TableDataInfo queryPageList(SysEvaluationAnswerBo bo, PageQuery pageQuery); + + /** + * 查询量测回答记录列表 + */ + List queryList(SysEvaluationAnswerBo bo); + + /** + * 新增量测回答记录 + */ + Boolean insertByBo(SysEvaluationAnswerBo bo); + + /** + * 修改量测回答记录 + */ + Boolean updateByBo(SysEvaluationAnswerBo bo); + + /** + * 校验并批量删除量测回答记录信息 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysEvaluationConclusionService.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysEvaluationConclusionService.java new file mode 100644 index 0000000..85d0a5e --- /dev/null +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysEvaluationConclusionService.java @@ -0,0 +1,48 @@ +package org.dromara.scale.service; + +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.scale.domain.bo.SysEvaluationConclusionBo; +import org.dromara.scale.domain.vo.SysEvaluationConclusionVo; + +import java.util.Collection; +import java.util.List; + +/** + * 量测结果Service接口 + * + * @author CJW + * @date 2024-04-07 + */ +public interface ISysEvaluationConclusionService { + + /** + * 查询量测结果 + */ + SysEvaluationConclusionVo queryById(Long id); + + /** + * 查询量测结果列表 + */ + TableDataInfo queryPageList(SysEvaluationConclusionBo bo, PageQuery pageQuery); + + /** + * 查询量测结果列表 + */ + List queryList(SysEvaluationConclusionBo bo); + + /** + * 新增量测结果 + */ + Boolean insertByBo(SysEvaluationConclusionBo bo); + + /** + * 修改量测结果 + */ + Boolean updateByBo(SysEvaluationConclusionBo bo); + + /** + * 校验并批量删除量测结果信息 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysEvaluationRecordService.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysEvaluationRecordService.java new file mode 100644 index 0000000..a8c5674 --- /dev/null +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysEvaluationRecordService.java @@ -0,0 +1,48 @@ +package org.dromara.scale.service; + +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.scale.domain.bo.SysEvaluationRecordBo; +import org.dromara.scale.domain.vo.SysEvaluationRecordVo; + +import java.util.Collection; +import java.util.List; + +/** + * 量测记录Service接口 + * + * @author CJW + * @date 2024-04-07 + */ +public interface ISysEvaluationRecordService { + + /** + * 查询量测记录 + */ + SysEvaluationRecordVo queryById(Long recordId); + + /** + * 查询量测记录列表 + */ + TableDataInfo queryPageList(SysEvaluationRecordBo bo, PageQuery pageQuery); + + /** + * 查询量测记录列表 + */ + List queryList(SysEvaluationRecordBo bo); + + /** + * 新增量测记录 + */ + Boolean insertByBo(SysEvaluationRecordBo bo); + + /** + * 修改量测记录 + */ + Boolean updateByBo(SysEvaluationRecordBo bo); + + /** + * 校验并批量删除量测记录信息 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysScalePublishService.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysScalePublishService.java new file mode 100644 index 0000000..084cd01 --- /dev/null +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysScalePublishService.java @@ -0,0 +1,48 @@ +package org.dromara.scale.service; + +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.scale.domain.bo.SysScalePublishBo; +import org.dromara.scale.domain.vo.SysScalePublishVo; + +import java.util.Collection; +import java.util.List; + +/** + * 量发布Service接口 + * + * @author CJW + * @date 2024-04-07 + */ +public interface ISysScalePublishService { + + /** + * 查询量发布 + */ + SysScalePublishVo queryById(Long batchNo); + + /** + * 查询量发布列表 + */ + TableDataInfo queryPageList(SysScalePublishBo bo, PageQuery pageQuery); + + /** + * 查询量发布列表 + */ + List queryList(SysScalePublishBo bo); + + /** + * 新增量发布 + */ + Boolean insertByBo(SysScalePublishBo bo); + + /** + * 修改量发布 + */ + Boolean updateByBo(SysScalePublishBo bo); + + /** + * 校验并批量删除量发布信息 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysEvaluationAnswerServiceImpl.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysEvaluationAnswerServiceImpl.java new file mode 100644 index 0000000..256ddde --- /dev/null +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysEvaluationAnswerServiceImpl.java @@ -0,0 +1,109 @@ +package org.dromara.scale.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.scale.domain.SysEvaluationAnswer; +import org.dromara.scale.domain.bo.SysEvaluationAnswerBo; +import org.dromara.scale.domain.vo.SysEvaluationAnswerVo; +import org.dromara.scale.mapper.SysEvaluationAnswerMapper; +import org.dromara.scale.service.ISysEvaluationAnswerService; +import org.springframework.stereotype.Service; + +import java.util.Collection; +import java.util.List; + +/** + * 量测回答记录Service业务层处理 + * + * @author CJW + * @date 2024-04-07 + */ +@RequiredArgsConstructor +@Service +public class SysEvaluationAnswerServiceImpl implements ISysEvaluationAnswerService { + + private final SysEvaluationAnswerMapper baseMapper; + + /** + * 查询量测回答记录 + */ + @Override + public SysEvaluationAnswerVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 查询量测回答记录列表 + */ + @Override + public TableDataInfo queryPageList(SysEvaluationAnswerBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询量测回答记录列表 + */ + @Override + public List queryList(SysEvaluationAnswerBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(SysEvaluationAnswerBo bo) { + //Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getRecordId() != null, SysEvaluationAnswer::getRecordId, bo.getRecordId()); + lqw.eq(bo.getQuestionId() != null, SysEvaluationAnswer::getQuestionId, bo.getQuestionId()); + lqw.eq(bo.getAnswerId() != null, SysEvaluationAnswer::getAnswerId, bo.getAnswerId()); + return lqw; + } + + /** + * 新增量测回答记录 + */ + @Override + public Boolean insertByBo(SysEvaluationAnswerBo bo) { + SysEvaluationAnswer add = MapstructUtils.convert(bo, SysEvaluationAnswer.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改量测回答记录 + */ + @Override + public Boolean updateByBo(SysEvaluationAnswerBo bo) { + SysEvaluationAnswer update = MapstructUtils.convert(bo, SysEvaluationAnswer.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(SysEvaluationAnswer entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 批量删除量测回答记录 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteBatchIds(ids) > 0; + } +} diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysEvaluationConclusionServiceImpl.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysEvaluationConclusionServiceImpl.java new file mode 100644 index 0000000..a6a2fc5 --- /dev/null +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysEvaluationConclusionServiceImpl.java @@ -0,0 +1,112 @@ +package org.dromara.scale.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.scale.domain.SysEvaluationConclusion; +import org.dromara.scale.domain.bo.SysEvaluationConclusionBo; +import org.dromara.scale.domain.vo.SysEvaluationConclusionVo; +import org.dromara.scale.mapper.SysEvaluationConclusionMapper; +import org.dromara.scale.service.ISysEvaluationConclusionService; +import org.springframework.stereotype.Service; + +import java.util.Collection; +import java.util.List; + +/** + * 量测结果Service业务层处理 + * + * @author CJW + * @date 2024-04-07 + */ +@RequiredArgsConstructor +@Service +public class SysEvaluationConclusionServiceImpl implements ISysEvaluationConclusionService { + + private final SysEvaluationConclusionMapper baseMapper; + + /** + * 查询量测结果 + */ + @Override + public SysEvaluationConclusionVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 查询量测结果列表 + */ + @Override + public TableDataInfo queryPageList(SysEvaluationConclusionBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询量测结果列表 + */ + @Override + public List queryList(SysEvaluationConclusionBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(SysEvaluationConclusionBo bo) { + //Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getRecordId() != null, SysEvaluationConclusion::getRecordId, bo.getRecordId()); + lqw.eq(bo.getFactorId() != null, SysEvaluationConclusion::getFactorId, bo.getFactorId()); + lqw.eq(bo.getScore() != null, SysEvaluationConclusion::getScore, bo.getScore()); + lqw.eq(bo.getScoreRate() != null, SysEvaluationConclusion::getScoreRate, bo.getScoreRate()); + lqw.eq(bo.getFactorRangeId() != null, SysEvaluationConclusion::getFactorRangeId, bo.getFactorRangeId()); + lqw.eq(bo.getStatus() != null, SysEvaluationConclusion::getStatus, bo.getStatus()); + return lqw; + } + + /** + * 新增量测结果 + */ + @Override + public Boolean insertByBo(SysEvaluationConclusionBo bo) { + SysEvaluationConclusion add = MapstructUtils.convert(bo, SysEvaluationConclusion.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改量测结果 + */ + @Override + public Boolean updateByBo(SysEvaluationConclusionBo bo) { + SysEvaluationConclusion update = MapstructUtils.convert(bo, SysEvaluationConclusion.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(SysEvaluationConclusion entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 批量删除量测结果 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteBatchIds(ids) > 0; + } +} diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysEvaluationRecordServiceImpl.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysEvaluationRecordServiceImpl.java new file mode 100644 index 0000000..f98e94c --- /dev/null +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysEvaluationRecordServiceImpl.java @@ -0,0 +1,109 @@ +package org.dromara.scale.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.scale.domain.SysEvaluationRecord; +import org.dromara.scale.domain.bo.SysEvaluationRecordBo; +import org.dromara.scale.domain.vo.SysEvaluationRecordVo; +import org.dromara.scale.mapper.SysEvaluationRecordMapper; +import org.dromara.scale.service.ISysEvaluationRecordService; +import org.springframework.stereotype.Service; + +import java.util.Collection; +import java.util.List; + +/** + * 量测记录Service业务层处理 + * + * @author CJW + * @date 2024-04-07 + */ +@RequiredArgsConstructor +@Service +public class SysEvaluationRecordServiceImpl implements ISysEvaluationRecordService { + + private final SysEvaluationRecordMapper baseMapper; + + /** + * 查询量测记录 + */ + @Override + public SysEvaluationRecordVo queryById(Long recordId){ + return baseMapper.selectVoById(recordId); + } + + /** + * 查询量测记录列表 + */ + @Override + public TableDataInfo queryPageList(SysEvaluationRecordBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询量测记录列表 + */ + @Override + public List queryList(SysEvaluationRecordBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(SysEvaluationRecordBo bo) { + //Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getScaleId() != null, SysEvaluationRecord::getScaleId, bo.getScaleId()); + lqw.eq(bo.getUserId() != null, SysEvaluationRecord::getUserId, bo.getUserId()); + lqw.eq(bo.getBatchNo() != null, SysEvaluationRecord::getBatchNo, bo.getBatchNo()); + return lqw; + } + + /** + * 新增量测记录 + */ + @Override + public Boolean insertByBo(SysEvaluationRecordBo bo) { + SysEvaluationRecord add = MapstructUtils.convert(bo, SysEvaluationRecord.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setRecordId(add.getRecordId()); + } + return flag; + } + + /** + * 修改量测记录 + */ + @Override + public Boolean updateByBo(SysEvaluationRecordBo bo) { + SysEvaluationRecord update = MapstructUtils.convert(bo, SysEvaluationRecord.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(SysEvaluationRecord entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 批量删除量测记录 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteBatchIds(ids) > 0; + } +} diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScalePublishServiceImpl.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScalePublishServiceImpl.java new file mode 100644 index 0000000..309babc --- /dev/null +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScalePublishServiceImpl.java @@ -0,0 +1,115 @@ +package org.dromara.scale.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.scale.domain.SysScalePublish; +import org.dromara.scale.domain.bo.SysScalePublishBo; +import org.dromara.scale.domain.vo.SysScalePublishVo; +import org.dromara.scale.mapper.SysScalePublishMapper; +import org.dromara.scale.service.ISysScalePublishService; +import org.springframework.stereotype.Service; + +import java.util.Collection; +import java.util.List; + +/** + * 量发布Service业务层处理 + * + * @author CJW + * @date 2024-04-07 + */ +@RequiredArgsConstructor +@Service +public class SysScalePublishServiceImpl implements ISysScalePublishService { + + private final SysScalePublishMapper baseMapper; + + /** + * 查询量发布 + */ + @Override + public SysScalePublishVo queryById(Long batchNo){ + return baseMapper.selectVoById(batchNo); + } + + /** + * 查询量发布列表 + */ + @Override + public TableDataInfo queryPageList(SysScalePublishBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询量发布列表 + */ + @Override + public List queryList(SysScalePublishBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(SysScalePublishBo bo) { + //Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(StringUtils.isNotBlank(bo.getScaleIds()), SysScalePublish::getScaleIds, bo.getScaleIds()); + lqw.eq(StringUtils.isNotBlank(bo.getScaleNames()), SysScalePublish::getScaleNames, bo.getScaleNames()); + lqw.like(StringUtils.isNotBlank(bo.getSessionName()), SysScalePublish::getSessionName, bo.getSessionName()); + lqw.eq(bo.getDeptId() != null, SysScalePublish::getDeptId, bo.getDeptId()); + lqw.eq(bo.getPartNum() != null, SysScalePublish::getPartNum, bo.getPartNum()); + lqw.eq(bo.getExpireTime() != null, SysScalePublish::getExpireTime, bo.getExpireTime()); + lqw.eq(bo.getStatus() != null, SysScalePublish::getStatus, bo.getStatus()); + lqw.eq(bo.getAllowQueryResult() != null, SysScalePublish::getAllowQueryResult, bo.getAllowQueryResult()); + return lqw; + } + + /** + * 新增量发布 + */ + @Override + public Boolean insertByBo(SysScalePublishBo bo) { + SysScalePublish add = MapstructUtils.convert(bo, SysScalePublish.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setBatchNo(add.getBatchNo()); + } + return flag; + } + + /** + * 修改量发布 + */ + @Override + public Boolean updateByBo(SysScalePublishBo bo) { + SysScalePublish update = MapstructUtils.convert(bo, SysScalePublish.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(SysScalePublish entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 批量删除量发布 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteBatchIds(ids) > 0; + } +} diff --git a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysEvaluationAnswerMapper.xml b/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysEvaluationAnswerMapper.xml new file mode 100644 index 0000000..b6c6fb2 --- /dev/null +++ b/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysEvaluationAnswerMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysEvaluationConclusionMapper.xml b/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysEvaluationConclusionMapper.xml new file mode 100644 index 0000000..772281a --- /dev/null +++ b/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysEvaluationConclusionMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysEvaluationRecordMapper.xml b/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysEvaluationRecordMapper.xml new file mode 100644 index 0000000..e152a63 --- /dev/null +++ b/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysEvaluationRecordMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysScalePublishMapper.xml b/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysScalePublishMapper.xml new file mode 100644 index 0000000..718bbe7 --- /dev/null +++ b/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysScalePublishMapper.xml @@ -0,0 +1,7 @@ + + + + +