Commit Graph

73 Commits

Author SHA1 Message Date
cjw 199e6f8086 去除计算公式代码;修改发布时分组逻辑; 2024-04-23 10:52:21 +08:00
cjw 78384ccaf5 校验逻辑优化 2024-04-22 15:34:31 +08:00
cjw 73d7dfc36b 添加校验,只有学生账户才能参加测评 2024-04-22 15:30:55 +08:00
cjw 3f0a9bd46c 取消查询判断 2024-04-22 15:19:20 +08:00
cjw 771239b6da 解决 非 web 上下文无法获取 HttpServletRequest 问题 2024-04-22 15:17:05 +08:00
cjw 747f6eea2a 修改量测逻辑后,优化统计查询sql,量测完成的统计,量测预警的统计 2024-04-22 14:36:11 +08:00
cjw 57dc8d7859 为了以后统计,修改量表测评逻辑,并因为改动逻辑优化之前代码 2024-04-22 10:29:17 +08:00
cjw e24c52a4e2 优化统计结构;新增预警统计 2024-04-21 17:13:43 +08:00
cjw dc63151030 解决redis缓存读取无法转换long问题;预警列表;其他优化 2024-04-19 16:18:26 +08:00
cjw 576fe22d86 修改userType 2024-04-19 15:03:00 +08:00
cjw 1d59a5caf7 修改干预以人为维度 2024-04-19 10:55:57 +08:00
cjw 07d2b5657e Merge branch 'dev' of http://101.37.69.204:3000/mozhe/mental-health-api into dev
# Conflicts:
#	ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/WebServiceImpl.java
2024-04-18 17:12:10 +08:00
cjw 229a22efaf 量测管理活动统计 2024-04-18 17:01:16 +08:00
jiangzhe 801a6a0a46 修改list和pageList 2024-04-18 10:36:32 +08:00
jiangzhe 44c7c3aa2e 增加判断 2024-04-18 09:46:41 +08:00
jiangzhe 37ee243297 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysWarnRecordController.java
2024-04-17 15:51:21 +08:00
jiangzhe 4b77fc747e 增加判断 2024-04-17 15:49:42 +08:00
cjw 76eb40355d 将分页查询路径由/list改为/pageList;添加预警量表详情接口 2024-04-17 10:23:29 +08:00
jiangzhe cdc4f4eabb Merge remote-tracking branch 'origin/dev' into dev 2024-04-17 09:03:03 +08:00
jiangzhe 6b2910d9c1 增加判断 2024-04-17 09:02:54 +08:00
cjw d498439c9f 初始化预警与干预代码 2024-04-16 17:08:39 +08:00
cjw 1dbb86c123 修改因子表结构,将问题id存在因子表中 2024-04-15 16:43:40 +08:00
cjw 0a27a4ca98 量表发布过期判断 2024-04-15 15:35:10 +08:00
cjw a154caee2a 量表发布校验;根据分组查看发布优化;用户提交测评答案校验 2024-04-15 14:02:20 +08:00
cjw 0aef5e4362 优化测评端接口目录,统一入口;添加缓存删除; 2024-04-15 10:06:43 +08:00
jiangzhe 391063bad7 问题增加sort 2024-04-12 14:23:44 +08:00
jiangzhe b403c05b1e Merge remote-tracking branch 'origin/dev' into dev 2024-04-12 13:55:39 +08:00
jiangzhe 1eeecb0ea2 修改因子问题 2024-04-12 13:55:32 +08:00
cjw 6ae0717a99 提交答案计算得分时初始化分数 2024-04-12 13:54:16 +08:00
jiangzhe a78331ca70 Merge remote-tracking branch 'origin/dev' into dev 2024-04-12 10:16:12 +08:00
jiangzhe 5e718c3b33 修改因子问题 2024-04-12 10:16:04 +08:00
cjw 92ab5142d3 规范status字段类型;添加Situation枚举类 2024-04-12 09:44:23 +08:00
cjw 77a0c62a3e Merge branch 'dev' into dev.caojiawei 2024-04-11 18:05:11 +08:00
cjw 66eed711ac 添加缓存 2024-04-11 18:05:04 +08:00
jiangzhe cab38d8e16 Merge remote-tracking branch 'origin/dev' into dev 2024-04-11 16:58:10 +08:00
jiangzhe d225839176 提交量表列表和发布记录 2024-04-11 16:58:04 +08:00
cjw 102f9434b6 因子分段添加scaleid 2024-04-11 16:56:53 +08:00
cjw ceb58ccce4 用户提交测评答案计算结果 2024-04-11 16:54:15 +08:00
jiangzhe 46e59efb2f Merge remote-tracking branch 'origin/dev' into dev 2024-04-11 15:16:16 +08:00
jiangzhe 29d056ad80 提交量表列表和发布记录 2024-04-11 15:16:08 +08:00
cjw d9091659db 优化 2024-04-11 14:28:10 +08:00
cjw b21126950d Merge branch 'dev' into dev.caojiawei
# Conflicts:
#	ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysScaleMapper.java
#	ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScalePublishServiceImpl.java
#	ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysScaleMapper.xml
2024-04-11 14:27:47 +08:00
cjw 3e833ecc7e 测评端获取发布量表信息添加是否做过字段;其他代码优化 2024-04-11 14:21:53 +08:00
jiangzhe 0ee1a04713 提交量表列表和发布记录 2024-04-09 17:29:39 +08:00
cjw 0493163f1e Merge branch 'dev' into dev.caojiawei 2024-04-09 16:58:33 +08:00
cjw eb8ab41082 优化代码 2024-04-09 16:58:20 +08:00
jiangzhe 44be8d8a2f 去除租户模块 2024-04-09 15:33:27 +08:00
jiangzhe 5b6c8a1933 Merge remote-tracking branch 'origin/dev' into dev 2024-04-09 14:59:28 +08:00
jiangzhe 7f61212cbd 提交代码 2024-04-09 14:59:22 +08:00
cjw 51d1dc5373 删除租户和第三方登录相关功能 2024-04-09 14:58:32 +08:00