diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxMyController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxMyController.java index 1ab916c..a1984c4 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxMyController.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxMyController.java @@ -47,7 +47,7 @@ public class WxMyController extends BaseController { */ @GetMapping("/evaluation/task/pageList") public TableDataInfo taskList(PageQuery pageQuery) { - return myService.queryPersonalEvaluationRecordPageList(pageQuery); + return myService.queryPersonalTaskPageList(pageQuery); } /** @@ -73,4 +73,12 @@ public class WxMyController extends BaseController { public TableDataInfo publishList(PageQuery pageQuery) { return myService.queryPublishEvaluationRecordPageList(pageQuery); } + + /** + * 查询我的测评 + */ + @GetMapping("/evaluation/Personal/pageList") + public TableDataInfo personalList(PageQuery pageQuery) { + return myService.queryPersonalEvaluationRecordPageList(pageQuery); + } } diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IMyService.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IMyService.java index 0591589..04ff867 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IMyService.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IMyService.java @@ -15,6 +15,7 @@ public interface IMyService { List getMyNum(); + TableDataInfo queryPersonalTaskPageList(PageQuery pageQuery); TableDataInfo queryPersonalEvaluationRecordPageList(PageQuery pageQuery); TableDataInfo queryPublishEvaluationRecordPageList(PageQuery pageQuery); diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/MyServiceImpl.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/MyServiceImpl.java index 21b3d4a..01d1f77 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/MyServiceImpl.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/MyServiceImpl.java @@ -69,16 +69,38 @@ public class MyServiceImpl implements IMyService { return list; } + @Override + public TableDataInfo queryPersonalTaskPageList(PageQuery pageQuery) { + Long userId = LoginHelper.getUserId(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(SysEvaluationRecord::getUserId, userId); + //根据flag查询个人或发布 + lqw.eq(SysEvaluationRecord::getPublishFlag, 0); + lqw.eq(SysEvaluationRecord::getStatus, 0); + lqw.orderByDesc(SysEvaluationRecord::getCreateTime); + return queryEvaluationRecordPageList(lqw, pageQuery); + } + @Override public TableDataInfo queryPersonalEvaluationRecordPageList(PageQuery pageQuery) { Long userId = LoginHelper.getUserId(); - return queryEvaluationRecordPageList(userId, 0, pageQuery); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(SysEvaluationRecord::getUserId, userId); + //根据flag查询个人或发布 + lqw.eq(SysEvaluationRecord::getPublishFlag, 0); + lqw.orderByDesc(SysEvaluationRecord::getCreateTime); + return queryEvaluationRecordPageList(lqw, pageQuery); } @Override public TableDataInfo queryPublishEvaluationRecordPageList(PageQuery pageQuery) { Long userId = LoginHelper.getUserId(); - return queryEvaluationRecordPageList(userId, 1, pageQuery); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(SysEvaluationRecord::getUserId, userId); + //根据flag查询个人或发布 + lqw.eq(SysEvaluationRecord::getPublishFlag, 1); + lqw.orderByDesc(SysEvaluationRecord::getCreateTime); + return queryEvaluationRecordPageList(lqw, pageQuery); } @Override @@ -98,12 +120,7 @@ public class MyServiceImpl implements IMyService { return TableDataInfo.build(page); } - private TableDataInfo queryEvaluationRecordPageList(Long userId, int flag, PageQuery pageQuery) { - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.eq(SysEvaluationRecord::getUserId, userId); - //根据flag查询个人或发布 - lqw.eq(SysEvaluationRecord::getPublishFlag, flag); - lqw.orderByDesc(SysEvaluationRecord::getCreateTime); + private TableDataInfo queryEvaluationRecordPageList(LambdaQueryWrapper lqw, PageQuery pageQuery) { Page result = evaluationRecordMapper.selectRecordVoPage(pageQuery.build(), lqw); List records = result.getRecords(); for (SysEvaluationRecordVo record : records) {