mozhe
/
mental-health-api
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

测评端无法获取量表bug修复

This commit is contained in:
cjw 2024-04-28 15:39:07 +08:00
parent f3e56678cb
commit 246267ce70
7 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ArchiveController.java
View File

@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.RestController;
@RequiredArgsConstructor
@RestController
@RequestMapping("/scale/archives")
@RequestMapping("/scale/archive")
public class ArchiveController {
private final IArchiveService archiveService;
@ -29,15 +29,15 @@ public class ArchiveController {
/**
* 获取用户档案列表
*/
@SaCheckPermission("scale:archives:list")
@SaCheckPermission("scale:archive:list")
@GetMapping("/pageList")
public TableDataInfo<ArchiveVo> pageList(ArchiveVo vo, PageQuery pageQuery) {
return archiveService.queryPageList(vo, pageQuery);
}
/**
* 获取用户列表
* 获取档案静态列表
*/
@SaCheckPermission("scale:archives:list")
@SaCheckPermission("scale:archive:list")
@GetMapping("/statistic/pageList")
public TableDataInfo<ArchiveStatisticVo> statisticPageList(Long userId, PageQuery pageQuery) {
return archiveService.queryStatisticPageList(userId, pageQuery);

2
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/TimeAxisVo.java
View File

@ -19,4 +19,6 @@ public class TimeAxisVo {
private String time;
private String type;
private Integer situation;
}

2
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysScalePublishMapper.java
View File

@ -23,6 +23,6 @@ public interface SysScalePublishMapper extends BaseMapperPlus<SysScalePublish, S
List<String> selectDeptIdsInUse();
SysScalePublishVo selectUsePublishVoByDeptId(Long deptId);
SysScalePublish selectUsePublishByDeptId(Long deptId);
}

10
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/WebServiceImpl.java
View File

@ -2,7 +2,6 @@ package org.dromara.scale.service.impl;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.domain.model.LoginUser;
import org.dromara.common.core.enums.UserType;
@ -78,12 +77,12 @@ public class WebServiceImpl implements IWebService {
if (!UserType.STUDENT.getName().equals(userType)) {
throw new ServiceException("只有学生账户才能测评");
}
SysScalePublishVo sysScalePublishVo = publishMapper.selectUsePublishVoByDeptId(deptId);
SysScalePublish sysScalePublish = publishMapper.selectUsePublishByDeptId(deptId);
Long batchNo = sysScalePublishVo.getBatchNo();
List<String> scaleIds = sysScalePublishVo.getScaleIds();
Long batchNo = sysScalePublish.getBatchNo();
String scaleIds = sysScalePublish.getScaleIds();
//todo
List<SysScaleVo> publishScaleVos = scaleMapper.findSysScaleByIds(StrUtil.join(StrUtil.COMMA, scaleIds));
List<SysScaleVo> publishScaleVos = scaleMapper.findSysScaleByIds(scaleIds);
List<SysEvaluationRecordVo> recordVos = recordMapper.selectSclaeRecordListByUserAndBatch(userId, batchNo);
for (SysScaleVo publishScaleVo : publishScaleVos) {
SysOss sysOss = ossMapper.selectById(publishScaleVo.getCover());
@ -96,6 +95,7 @@ public class WebServiceImpl implements IWebService {
}
}
}
SysScalePublishVo sysScalePublishVo = MapstructUtils.convert(sysScalePublish, SysScalePublishVo.class);
sysScalePublishVo.setScaleList(publishScaleVos);
return sysScalePublishVo;
}

5
ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/StatisticMapper.xml
View File

@ -42,9 +42,10 @@
</select>
<select id="selectStatisticFactor" resultType="org.dromara.scale.domain.vo.StatisticNumVo">
select *
select
from sys_evaluation_record er
left join sys_dept d on find_in_set(er.dept_id, d.ancestors)
left join sys_dept d on d.dept_id = er.dept_id
left join sys_dept parent on parent.dept_id = d.parent_id
left join sys_evaluation_conclusion ec on ec.record_id = er.record_id
left join sys_scale_factor_range sfr on sfr.range_id = ec.factor_range_id
where er.batch_no = #{batchNo}

2
ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysScalePublishMapper.xml
View File

@ -30,7 +30,7 @@
where status = 1
</select>
<select id="selectUsePublishVoByDeptId" resultType="org.dromara.scale.domain.vo.SysScalePublishVo">
<select id="selectUsePublishByDeptId" resultType="org.dromara.scale.domain.SysScalePublish">
select *
from sys_scale_publish
where status = 1

3
ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysWarnRecordMapper.xml
View File

@ -38,7 +38,8 @@
select wr.warn_id as `id`,
CONCAT(DATE_FORMAT(wr.warn_time, '%Y-%m-%d'), ' ', sp.session_name, '的预警') as `name`,
wr.warn_time as `time`,
'warn' as `type`
'warn' as `type`,
wr.situation as `situation`
from sys_warn_record wr
left join sys_scale_publish sp on sp.batch_no = wr.batch_no
where wr.user_id = #{userId}