From 80d2d0aa190e9a11afba670c1c2c96b14988a933 Mon Sep 17 00:00:00 2001 From: cjw Date: Tue, 23 Apr 2024 14:20:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=8D=E5=BF=85=E8=A6=81?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=EF=BC=8C=E4=BC=98=E5=8C=96=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=BB=93=E6=9E=84=EF=BC=9B=E6=96=B0=E5=A2=9E=E9=87=8F=E6=B5=8B?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SysEvaluationAnswerController.java | 66 ------------------- .../SysEvaluationConclusionController.java | 43 ++++-------- .../SysEvaluationRecordController.java | 2 +- .../controller/SysScaleAnswerController.java | 54 --------------- .../domain/vo/SysEvaluationRecordVo.java | 4 +- .../mapper/SysEvaluationConclusionMapper.java | 2 +- .../mapper/SysEvaluationRecordMapper.java | 5 ++ .../service/ISysEvaluationAnswerService.java | 5 -- .../ISysEvaluationConclusionService.java | 12 ---- .../service/ISysInterveneRecordService.java | 12 +--- .../scale/service/ISysScaleAnswerService.java | 20 ------ .../impl/SysEvaluationAnswerServiceImpl.java | 8 --- .../SysEvaluationConclusionServiceImpl.java | 28 +------- .../impl/SysEvaluationRecordServiceImpl.java | 3 +- .../impl/SysInterveneRecordServiceImpl.java | 11 ---- .../impl/SysScaleAnswerServiceImpl.java | 41 ------------ .../scale/SysEvaluationConclusionMapper.xml | 2 +- .../scale/SysEvaluationRecordMapper.xml | 7 ++ 18 files changed, 37 insertions(+), 288 deletions(-) delete mode 100644 ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysEvaluationAnswerController.java delete mode 100644 ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScaleAnswerController.java 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 deleted file mode 100644 index f9c012d..0000000 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysEvaluationAnswerController.java +++ /dev/null @@ -1,66 +0,0 @@ -package org.dromara.scale.controller; - -import cn.dev33.satoken.annotation.SaCheckPermission; -import jakarta.servlet.http.HttpServletResponse; -import jakarta.validation.constraints.NotNull; -import lombok.RequiredArgsConstructor; -import org.dromara.common.core.domain.R; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -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:pageList") -// @GetMapping("/pageList") -// public TableDataInfo list(SysEvaluationAnswerBo bo, PageQuery pageQuery) { -// return sysEvaluationAnswerService.queryPageList(bo, pageQuery); -// } - - /** - * 导出量测回答记录列表 - */ - @SaCheckPermission("evaluation:answer: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("evaluation:answer:query") - @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { - return R.ok(sysEvaluationAnswerService.queryById(id)); - } - - -} 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 index a1bdf63..73f5312 100644 --- 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 @@ -2,7 +2,6 @@ package org.dromara.scale.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import jakarta.servlet.http.HttpServletResponse; -import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; import org.dromara.common.excel.utils.ExcelUtil; @@ -13,7 +12,10 @@ 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 org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import java.util.List; @@ -26,19 +28,19 @@ import java.util.List; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/scale/evaluationConclusion") +@RequestMapping("/scale/evaluation/conclusion") public class SysEvaluationConclusionController extends BaseController { private final ISysEvaluationConclusionService sysEvaluationConclusionService; -// /** -// * 查询量测结果列表 -// */ -// @SaCheckPermission("scale:evaluationConclusion:pageList") -// @GetMapping("/pageList") -// public TableDataInfo list(SysEvaluationConclusionBo bo, PageQuery pageQuery) { -// return sysEvaluationConclusionService.queryPageList(bo, pageQuery); -// } + /** + * 获取量测结果列表 + */ + @SaCheckPermission("scale:evaluationConclusion:query") + @GetMapping("/list") + public R> getList(SysEvaluationConclusionBo bo) { + return R.ok(sysEvaluationConclusionService.queryList(bo)); + } /** * 导出量测结果列表 @@ -51,24 +53,5 @@ public class SysEvaluationConclusionController extends BaseController { 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:query") - @GetMapping("/list") - public R> getList(SysEvaluationConclusionBo bo) { - return R.ok(sysEvaluationConclusionService.queryList(bo)); - } } 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 index e568c1b..3813f9e 100644 --- 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 @@ -28,7 +28,7 @@ import java.util.List; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/evaluation/record") +@RequestMapping("/scale/evaluation/record") public class SysEvaluationRecordController extends BaseController { private final ISysEvaluationRecordService sysEvaluationRecordService; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScaleAnswerController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScaleAnswerController.java deleted file mode 100644 index 8184644..0000000 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScaleAnswerController.java +++ /dev/null @@ -1,54 +0,0 @@ -package org.dromara.scale.controller; - -import lombok.RequiredArgsConstructor; -import org.dromara.common.web.core.BaseController; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * 选项信息 - * - * @author jiangzhe - * @date 2024-03-29 - */ -@Validated -@RequiredArgsConstructor -@RestController -@RequestMapping("/scale/answer") -public class SysScaleAnswerController extends BaseController { - - //private final ISysScaleAnswerService sysScaleAnswerService; - - /** - * 查询选项信息列表 - */ -// @SaCheckPermission("scale:answer:pageList") -// @GetMapping("/pageList") -// public TableDataInfo list(SysScaleAnswerBo bo, PageQuery pageQuery) { -// return sysScaleAnswerService.queryPageList(bo, pageQuery); -// } - - /** - * 导出选项信息列表 - */ -// @SaCheckPermission("scale:answer:export") -// @Log(title = "选项信息", businessType = BusinessType.EXPORT) -// @PostMapping("/export") -// public void export(SysScaleAnswerBo bo, HttpServletResponse response) { -// List list = sysScaleAnswerService.queryList(bo); -// ExcelUtil.exportExcel(list, "选项信息", SysScaleAnswerVo.class, response); -// } - - /** - * 获取选项信息详细信息 - * - * @param answerId 主键 - */ -// @SaCheckPermission("scale:answer:query") -// @GetMapping("/{answerId}") -// public R getInfo(@NotNull(message = "主键不能为空") -// @PathVariable Long answerId) { -// return R.ok(sysScaleAnswerService.queryById(answerId)); -// } -} 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 index 7637585..b555464 100644 --- 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 @@ -37,6 +37,8 @@ public class SysEvaluationRecordVo implements Serializable { @ExcelProperty(value = "量表id") private Long scaleId; + private String scaleName; + /** * 测评人id */ @@ -61,7 +63,7 @@ public class SysEvaluationRecordVo implements Serializable { - private String scaleName; + } 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 index d74baa7..d8baa96 100644 --- 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 @@ -20,5 +20,5 @@ import java.util.List; public interface SysEvaluationConclusionMapper extends BaseMapperPlus { - List selectVoList(@Param(Constants.WRAPPER) Wrapper queryWrapper); + List selectConclusionVoList(@Param(Constants.WRAPPER) Wrapper queryWrapper); } 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 index b3f147a..ba345e4 100644 --- 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 @@ -1,5 +1,8 @@ package org.dromara.scale.mapper; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; @@ -22,4 +25,6 @@ public interface SysEvaluationRecordMapper extends BaseMapperPlus selectRecordVoPage(@Param("page") Page page, @Param(Constants.WRAPPER) Wrapper queryWrapper); + } 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 index 8e0f83e..b085f8d 100644 --- 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 @@ -15,11 +15,6 @@ import java.util.List; */ public interface ISysEvaluationAnswerService { - /** - * 查询量测回答记录 - */ - SysEvaluationAnswerVo queryById(Long id); - /** * 查询量测回答记录列表 */ 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 index 33e5ce2..19a1cf4 100644 --- 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 @@ -1,7 +1,5 @@ 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; @@ -15,16 +13,6 @@ import java.util.List; */ public interface ISysEvaluationConclusionService { - /** - * 查询量测结果 - */ - SysEvaluationConclusionVo queryById(Long id); - - /** - * 查询量测结果列表 - */ - TableDataInfo queryPageList(SysEvaluationConclusionBo bo, PageQuery pageQuery); - /** * 查询量测结果列表 */ diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysInterveneRecordService.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysInterveneRecordService.java index efacc8f..7b148c9 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysInterveneRecordService.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysInterveneRecordService.java @@ -1,12 +1,10 @@ package org.dromara.scale.service; -import org.dromara.scale.domain.SysInterveneRecord; -import org.dromara.scale.domain.vo.SysInterveneRecordVo; -import org.dromara.scale.domain.bo.SysInterveneRecordBo; -import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.scale.domain.bo.SysInterveneRecordBo; +import org.dromara.scale.domain.vo.SysInterveneRecordVo; -import java.util.Collection; import java.util.List; /** @@ -42,8 +40,4 @@ public interface ISysInterveneRecordService { */ Boolean updateByBo(SysInterveneRecordBo bo); - /** - * 校验并批量删除干预记录信息 - */ - Boolean deleteWithValidByIds(Collection ids, Boolean isValid); } diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysScaleAnswerService.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysScaleAnswerService.java index a3d69dd..76a63c9 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysScaleAnswerService.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysScaleAnswerService.java @@ -1,8 +1,5 @@ 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.SysScaleAnswerBo; import org.dromara.scale.domain.vo.QuestionAnswerVo; import org.dromara.scale.domain.vo.SysScaleAnswerVo; @@ -17,23 +14,6 @@ import java.util.Map; */ public interface ISysScaleAnswerService { - /** - * 查询选项信息 - */ - SysScaleAnswerVo queryById(Long answerId); - - /** - * 查询选项信息列表 - */ - TableDataInfo queryPageList(SysScaleAnswerBo bo, PageQuery pageQuery); - - /** - * 查询选项信息列表 - */ - List queryList(SysScaleAnswerBo bo); - - - List queryQuestionAnswerListByScaleId(Long scaleId); Map> getScaleAnswerMap(Long scaleId); 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 index 72af5d0..9bac0d2 100644 --- 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 @@ -27,14 +27,6 @@ public class SysEvaluationAnswerServiceImpl implements ISysEvaluationAnswerServi private final SysEvaluationAnswerMapper baseMapper; - /** - * 查询量测回答记录 - */ - @Override - public SysEvaluationAnswerVo queryById(Long id){ - return baseMapper.selectVoById(id); - } - /** * 查询量测回答记录列表 */ 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 index c85a132..5e142e0 100644 --- 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 @@ -2,10 +2,7 @@ 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.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; @@ -27,23 +24,6 @@ public class SysEvaluationConclusionServiceImpl implements ISysEvaluationConclus 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); - } /** * 查询量测结果列表 @@ -51,7 +31,7 @@ public class SysEvaluationConclusionServiceImpl implements ISysEvaluationConclus @Override public List queryList(SysEvaluationConclusionBo bo) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); - return baseMapper.selectVoList(lqw); + return baseMapper.selectConclusionVoList(lqw); } private LambdaQueryWrapper buildQueryWrapper(SysEvaluationConclusionBo bo) { @@ -66,10 +46,4 @@ public class SysEvaluationConclusionServiceImpl implements ISysEvaluationConclus return lqw; } - /** - * 保存前的数据校验 - */ - private void validEntityBeforeSave(SysEvaluationConclusion entity) { - //TODO 做一些数据校验,如唯一约束 - } } 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 index 9f427ab..3ae9984 100644 --- 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 @@ -50,7 +50,7 @@ public class SysEvaluationRecordServiceImpl implements ISysEvaluationRecordServi @Override public TableDataInfo queryPageList(SysEvaluationRecordBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + Page result = baseMapper.selectRecordVoPage(pageQuery.build(), lqw); return TableDataInfo.build(result); } @@ -69,6 +69,7 @@ public class SysEvaluationRecordServiceImpl implements ISysEvaluationRecordServi 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()); + lqw.eq(bo.getStatus() != null, SysEvaluationRecord::getStatus, bo.getStatus()); return lqw; } diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysInterveneRecordServiceImpl.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysInterveneRecordServiceImpl.java index c225417..892d462 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysInterveneRecordServiceImpl.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysInterveneRecordServiceImpl.java @@ -19,7 +19,6 @@ import org.dromara.system.domain.SysUser; import org.dromara.system.mapper.SysUserMapper; import org.springframework.stereotype.Service; -import java.util.Collection; import java.util.Date; import java.util.List; @@ -117,14 +116,4 @@ public class SysInterveneRecordServiceImpl implements ISysInterveneRecordService //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/SysScaleAnswerServiceImpl.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScaleAnswerServiceImpl.java index c70c275..8cb67b7 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScaleAnswerServiceImpl.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScaleAnswerServiceImpl.java @@ -2,15 +2,10 @@ 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.constant.CacheNames; -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.SysScaleAnswer; import org.dromara.scale.domain.SysScaleQuestion; -import org.dromara.scale.domain.bo.SysScaleAnswerBo; import org.dromara.scale.domain.vo.QuestionAnswerVo; import org.dromara.scale.domain.vo.SysScaleAnswerVo; import org.dromara.scale.domain.vo.SysScaleQuestionVo; @@ -40,42 +35,6 @@ public class SysScaleAnswerServiceImpl implements ISysScaleAnswerService { private final SysScaleQuestionMapper questionMapper; - /** - * 查询选项信息 - */ - @Override - public SysScaleAnswerVo queryById(Long answerId) { - return baseMapper.selectVoById(answerId); - } - - /** - * 查询选项信息列表 - */ - @Override - public TableDataInfo queryPageList(SysScaleAnswerBo bo, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); - return TableDataInfo.build(result); - } - - /** - * 查询选项信息列表 - */ - @Override - public List queryList(SysScaleAnswerBo bo) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - return baseMapper.selectVoList(lqw); - } - - private LambdaQueryWrapper buildQueryWrapper(SysScaleAnswerBo bo) { - //Map params = bo.getParams(); - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.eq(bo.getQuestionId() != null, SysScaleAnswer::getQuestionId, bo.getQuestionId()); - lqw.eq(StringUtils.isNotBlank(bo.getAnswerOption()), SysScaleAnswer::getAnswerOption, bo.getAnswerOption()); - lqw.eq(bo.getScore() != null, SysScaleAnswer::getScore, bo.getScore()); - return lqw; - } - @Cacheable(cacheNames = CacheNames.SYS_QUESTION_ANSWER, key = "#scaleId") @Override public List queryQuestionAnswerListByScaleId(Long scaleId) { 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 index 44f7a29..a364733 100644 --- a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysEvaluationConclusionMapper.xml +++ b/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysEvaluationConclusionMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + +