From 1d59a5caf74961fcf820ff99ca5641026ac51b69 Mon Sep 17 00:00:00 2001 From: cjw Date: Fri, 19 Apr 2024 10:55:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B9=B2=E9=A2=84=E4=BB=A5?= =?UTF-8?q?=E4=BA=BA=E4=B8=BA=E7=BB=B4=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SysWarnRecordController.java | 3 +-- .../scale/domain/SysInterveneRecord.java | 10 ++++++-- .../dromara/scale/domain/SysWarnRecord.java | 5 ---- .../scale/domain/bo/SysInterveneRecordBo.java | 11 ++++++--- .../scale/domain/bo/SysWarnRecordBo.java | 21 +++++++---------- .../scale/domain/vo/SysInterveneRecordVo.java | 14 ++++++----- .../scale/domain/vo/SysWarnRecordVo.java | 14 ++--------- .../mapper/SysEvaluationConclusionMapper.java | 5 ++++ .../SysEvaluationConclusionServiceImpl.java | 3 +-- .../impl/SysInterveneRecordServiceImpl.java | 23 +++++++++++-------- .../impl/SysWarnRecordServiceImpl.java | 2 +- .../scale/service/impl/WebServiceImpl.java | 3 +-- .../scale/SysEvaluationConclusionMapper.xml | 8 +++++++ .../org/dromara/system/domain/SysUser.java | 5 ++++ .../dromara/system/domain/vo/SysUserVo.java | 5 ++++ 15 files changed, 75 insertions(+), 57 deletions(-) diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysWarnRecordController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysWarnRecordController.java index 9f113be..9e6dd26 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysWarnRecordController.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysWarnRecordController.java @@ -39,9 +39,8 @@ public class SysWarnRecordController extends BaseController { /** * 查询预警记录列表 */ -// @GetMapping("/pageList") @SaCheckPermission("scale:warn:list") - @GetMapping("/list") + @GetMapping("/pageList") public TableDataInfo list(SysWarnRecordBo bo, PageQuery pageQuery) { return sysWarnRecordService.queryPageList(bo, pageQuery); } diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysInterveneRecord.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysInterveneRecord.java index 48131d8..0451d73 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysInterveneRecord.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysInterveneRecord.java @@ -27,9 +27,9 @@ public class SysInterveneRecord { private Long interveneId; /** - * 预警记录id + * 用户id */ - private Long warnId; + private Long userId; /** * 诊断 @@ -41,6 +41,12 @@ public class SysInterveneRecord { */ private Long annex; + /** + * 咨询师id + */ + private Long counselorId; + + private Date createTime; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysWarnRecord.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysWarnRecord.java index f834912..56411b2 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysWarnRecord.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysWarnRecord.java @@ -36,11 +36,6 @@ public class SysWarnRecord { */ private Long userId; - /** - * 状态 0 未处理，1 分配咨询师，2 咨询师拒绝干预，3 干预中 4 干预结束 - */ - private Integer status; - /** * 补充说明 */ diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysInterveneRecordBo.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysInterveneRecordBo.java index 82e25b4..68c9702 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysInterveneRecordBo.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysInterveneRecordBo.java @@ -27,10 +27,10 @@ public class SysInterveneRecordBo extends BaseEntity { private Long interveneId; /** - * 预警记录id + * 用户id */ - @NotNull(message = "预警记录id不能为空", groups = { AddGroup.class, EditGroup.class }) - private Long warnId; + @NotNull(message = "用户id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long userId; /** * 诊断 @@ -44,6 +44,11 @@ public class SysInterveneRecordBo extends BaseEntity { //@NotNull(message = "诊断附件不能为空", groups = { AddGroup.class, EditGroup.class }) private Long annex; + /** + * 咨询师id + */ + private Long counselorId; + /** * 状态，是暂存还是完成 */ diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysWarnRecordBo.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysWarnRecordBo.java index ea2013f..95766fc 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysWarnRecordBo.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysWarnRecordBo.java @@ -1,15 +1,16 @@ package org.dromara.scale.domain.bo; -import org.dromara.scale.domain.SysWarnRecord; -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 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.SysWarnRecord; + import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; /** * 预警记录业务对象 sys_warn_record @@ -23,7 +24,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; public class SysWarnRecordBo extends BaseEntity { /** - * + * */ @NotNull(message = "不能为空", groups = { EditGroup.class }) private Long warnId; @@ -40,12 +41,6 @@ public class SysWarnRecordBo extends BaseEntity { @NotNull(message = "测评人id不能为空", groups = { AddGroup.class, EditGroup.class }) private Long userId; - /** - * 状态 0 未处理，1 分配咨询师，2 咨询师拒绝干预，3 干预中 4 干预结束 - */ - @NotNull(message = "状态 0 未处理，1 分配咨询师，2 咨询师拒绝干预，3 干预中 4 干预结束不能为空", groups = { AddGroup.class, EditGroup.class }) - private Integer status; - /** * 补充说明 */ diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysInterveneRecordVo.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysInterveneRecordVo.java index 1d60639..afe6d46 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysInterveneRecordVo.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysInterveneRecordVo.java @@ -1,16 +1,13 @@ package org.dromara.scale.domain.vo; -import org.dromara.scale.domain.SysInterveneRecord; 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.scale.domain.SysInterveneRecord; import java.io.Serial; import java.io.Serializable; -import java.util.Date; @@ -37,8 +34,8 @@ public class SysInterveneRecordVo implements Serializable { /** * 预警记录id */ - @ExcelProperty(value = "预警记录id") - private Long warnId; + @ExcelProperty(value = "用户id") + private Long userId; /** * 诊断 @@ -52,5 +49,10 @@ public class SysInterveneRecordVo implements Serializable { @ExcelProperty(value = "诊断附件") private Long annex; + /** + * 咨询师id + */ + private Long counselorId; + } diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysWarnRecordVo.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysWarnRecordVo.java index 650662b..af4b798 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysWarnRecordVo.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysWarnRecordVo.java @@ -1,14 +1,10 @@ package org.dromara.scale.domain.vo; -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.dromara.scale.domain.SysWarnRecord; 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.scale.domain.SysWarnRecord; import java.io.Serial; import java.io.Serializable; @@ -31,7 +27,7 @@ public class SysWarnRecordVo implements Serializable { private static final long serialVersionUID = 1L; /** - * + * */ @ExcelProperty(value = "") private Long warnId; @@ -48,12 +44,6 @@ public class SysWarnRecordVo implements Serializable { @ExcelProperty(value = "测评人id") private Long userId; - /** - * 状态 0 未处理，1 分配咨询师，2 咨询师拒绝干预，3 干预中 4 干预结束 - */ - @ExcelProperty(value = "状态 0 未处理，1 分配咨询师，2 咨询师拒绝干预，3 干预中 4 干预结束") - private Integer status; - /** * 补充说明 */ 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 fb8bff1..3612910 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 @@ -2,9 +2,12 @@ package org.dromara.scale.mapper; import org.apache.ibatis.annotations.Mapper; import org.dromara.scale.domain.SysEvaluationConclusion; +import org.dromara.scale.domain.bo.SysEvaluationConclusionBo; import org.dromara.scale.domain.vo.SysEvaluationConclusionVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import java.util.List; + /** * 量测结果Mapper接口 * @@ -14,4 +17,6 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; @Mapper public interface SysEvaluationConclusionMapper extends BaseMapperPlus { + + List selectVoList(SysEvaluationConclusionBo bo); } 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..b0fc09a 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 @@ -50,8 +50,7 @@ public class SysEvaluationConclusionServiceImpl implements ISysEvaluationConclus */ @Override public List queryList(SysEvaluationConclusionBo bo) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - return baseMapper.selectVoList(lqw); + return baseMapper.selectVoList(bo); } private LambdaQueryWrapper buildQueryWrapper(SysEvaluationConclusionBo bo) { 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 9319c5f..34a9d89 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 @@ -4,17 +4,19 @@ 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.domain.model.LoginUser; 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.constant.StatusEnum; import org.dromara.scale.domain.SysInterveneRecord; -import org.dromara.scale.domain.SysWarnRecord; import org.dromara.scale.domain.bo.SysInterveneRecordBo; import org.dromara.scale.domain.vo.SysInterveneRecordVo; import org.dromara.scale.mapper.SysInterveneRecordMapper; -import org.dromara.scale.mapper.SysWarnRecordMapper; import org.dromara.scale.service.ISysInterveneRecordService; +import org.dromara.system.domain.SysUser; +import org.dromara.system.mapper.SysUserMapper; import org.springframework.stereotype.Service; import java.util.Collection; @@ -22,6 +24,8 @@ import java.util.Date; import java.util.List; import java.util.Map; +import static org.dromara.common.satoken.utils.LoginHelper.getLoginUser; + /** * 干预记录Service业务层处理 * @@ -34,7 +38,7 @@ public class SysInterveneRecordServiceImpl implements ISysInterveneRecordService private final SysInterveneRecordMapper baseMapper; - private final SysWarnRecordMapper warnMapper; + private final SysUserMapper userMapper; /** * 查询干预记录 @@ -66,7 +70,7 @@ public class SysInterveneRecordServiceImpl implements ISysInterveneRecordService private LambdaQueryWrapper buildQueryWrapper(SysInterveneRecordBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.eq(bo.getWarnId() != null, SysInterveneRecord::getWarnId, bo.getWarnId()); + //lqw.eq(bo.getWarnId() != null, SysInterveneRecord::getWarnId, bo.getWarnId()); lqw.eq(StringUtils.isNotBlank(bo.getDiagnose()), SysInterveneRecord::getDiagnose, bo.getDiagnose()); lqw.eq(bo.getAnnex() != null, SysInterveneRecord::getAnnex, bo.getAnnex()); return lqw; @@ -77,9 +81,10 @@ public class SysInterveneRecordServiceImpl implements ISysInterveneRecordService */ @Override public Boolean insertByBo(SysInterveneRecordBo bo) { - + LoginUser loginUser = getLoginUser(); SysInterveneRecord add = MapstructUtils.convert(bo, SysInterveneRecord.class); add.setCreateTime(new Date()); + add.setInterveneId(loginUser.getUserId()); validEntityBeforeSave(add); boolean flag = baseMapper.insert(add) > 0; if (flag) { @@ -87,10 +92,10 @@ public class SysInterveneRecordServiceImpl implements ISysInterveneRecordService } Integer status = bo.getStatus(); if (status.equals(1)) { - SysWarnRecord warnRecord = new SysWarnRecord(); - warnRecord.setWarnId(add.getWarnId()); - warnRecord.setStatus(4); - warnMapper.updateById(warnRecord); + SysUser record = new SysUser(); + record.setUserId(bo.getUserId()); + record.setInterveneStatus(StatusEnum.DISABLED.getValue()); + userMapper.updateById(record); } return flag; } diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysWarnRecordServiceImpl.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysWarnRecordServiceImpl.java index 1800c1c..e127aa1 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysWarnRecordServiceImpl.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysWarnRecordServiceImpl.java @@ -63,7 +63,7 @@ public class SysWarnRecordServiceImpl implements ISysWarnRecordService { LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.eq(bo.getBatchNo() != null, SysWarnRecord::getBatchNo, bo.getBatchNo()); lqw.eq(bo.getUserId() != null, SysWarnRecord::getUserId, bo.getUserId()); - lqw.eq(bo.getStatus() != null, SysWarnRecord::getStatus, bo.getStatus()); + //lqw.eq(bo.getStatus() != null, SysWarnRecord::getStatus, bo.getStatus()); lqw.eq(StringUtils.isNotBlank(bo.getNote()), SysWarnRecord::getNote, bo.getNote()); lqw.eq(bo.getWarnTime() != null, SysWarnRecord::getWarnTime, bo.getWarnTime()); return lqw; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/WebServiceImpl.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/WebServiceImpl.java index a674de4..6f2a175 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/WebServiceImpl.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/WebServiceImpl.java @@ -147,7 +147,6 @@ public class WebServiceImpl implements IWebService { public Map submitAnswer(SubmitAnswerBo bo) { boolean allowQueryResult = true; Long scaleId = bo.getScaleId(); - Map> answerMapByQuestion = scaleAnswerService.getScaleAnswerMap(scaleId); int keySize = answerMapByQuestion.keySet().size(); List answerList = bo.getAnswerList(); @@ -183,7 +182,7 @@ public class WebServiceImpl implements IWebService { SysWarnRecord wre = new SysWarnRecord(); wre.setBatchNo(scalePublishVo.getBatchNo()); wre.setUserId(getLoginUser().getUserId()); - wre.setStatus(0); + //wre.setStatus(0); wre.setWarnTime(new Date()); warnRecordService.insertByBo(wre); } 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 772281a..287f741 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 @@ -4,4 +4,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUser.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUser.java index 07439ef..eaad336 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUser.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUser.java @@ -103,6 +103,11 @@ public class SysUser extends BaseEntity { */ private String remark; + /** + * 干预状态 + */ + private Integer interveneStatus; + public SysUser(Long userId) { this.userId = userId; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java index 7150ce1..58d83c4 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java @@ -103,6 +103,11 @@ public class SysUserVo implements Serializable { */ private String remark; + /** + * 干预状态 + */ + private Integer interveneStatus; + /** * 创建时间 */