diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxCounselorController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxCounselorController.java
index 65bb5ce..b2fadf9 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxCounselorController.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxCounselorController.java
@@ -36,4 +36,6 @@ public class WxCounselorController extends BaseController {
return R.ok(counselorService.queryById(userId));
}
+
+
}
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
new file mode 100644
index 0000000..3f76635
--- /dev/null
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxMyController.java
@@ -0,0 +1,45 @@
+package org.dromara.scale.controller.wx;
+
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.scale.service.IMyService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ *
TODO
+ *
+ * @author cjw
+ * @version V1.0.0
+ * @date 2024/8/19 9:29
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/wx/my")
+public class WxMyController extends BaseController {
+
+ private final IMyService myService;
+
+ /**
+ * 获取测评任务数量
+ *
+ */
+ @GetMapping("/evaluation/task/num")
+ public R getEvaluationTaskNum() {
+ return R.ok(myService.getMyEvaluationTaskNum());
+ }
+ /**
+ * 获取测评任务
+ *
+ */
+ @GetMapping("/evaluation/task")
+ public R getInfo() {
+ return R.ok(myService.getMyEvaluationTaskNum());
+ }
+
+
+}
diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxScaleController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxScaleController.java
index acdffaa..a4a8623 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxScaleController.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxScaleController.java
@@ -71,6 +71,6 @@ public class WxScaleController extends BaseController {
*/
@GetMapping("/{scaleId}")
public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long scaleId) {
- return R.ok(sysScaleService.queryById(scaleId));
+ return R.ok(sysScaleService.queryById4Wx(scaleId));
}
}
diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/CounselorExperienceBo.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/CounselorExperienceBo.java
index 221e342..662b998 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/CounselorExperienceBo.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/CounselorExperienceBo.java
@@ -1,13 +1,15 @@
package org.dromara.scale.domain.bo;
-import org.dromara.scale.domain.CounselorExperience;
-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.CounselorExperience;
+import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
@@ -43,10 +45,13 @@ public class CounselorExperienceBo extends BaseEntity {
/**
* 经历开始时间
*/
+
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date startTime;
/**
* 经历结束时间
*/
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date endTime;
}
diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/CounselorVo.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/CounselorVo.java
index eb7f00a..93578e0 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/CounselorVo.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/CounselorVo.java
@@ -31,7 +31,7 @@ public class CounselorVo implements Serializable {
*
*/
private Long id;
-
+
@JsonIgnore
private Long userId;
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
new file mode 100644
index 0000000..7d9eca2
--- /dev/null
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IMyService.java
@@ -0,0 +1,6 @@
+package org.dromara.scale.service;
+
+public interface IMyService {
+
+ Integer getMyEvaluationTaskNum();
+}
diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysScaleService.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysScaleService.java
index 9816b08..b527c88 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysScaleService.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysScaleService.java
@@ -17,6 +17,12 @@ import java.util.Map;
*/
public interface ISysScaleService {
+ /**
+ * 查询心理测评量
+ */
+ SysScaleVo queryById4Wx(Long scaleId);
+
+
/**
* 查询心理测评量
*/
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
new file mode 100644
index 0000000..034a401
--- /dev/null
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/MyServiceImpl.java
@@ -0,0 +1,36 @@
+package org.dromara.scale.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.scale.constant.StatusEnum;
+import org.dromara.scale.domain.SysEvaluationRecord;
+import org.dromara.scale.mapper.SysEvaluationRecordMapper;
+import org.dromara.scale.service.IMyService;
+import org.springframework.stereotype.Service;
+
+/**
+ * TODO
+ *
+ * @author cjw
+ * @version V1.0.0
+ * @date 2024/8/19 9:52
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class MyServiceImpl implements IMyService {
+
+ private final SysEvaluationRecordMapper evaluationRecordMapper;
+
+
+ @Override
+ public Integer getMyEvaluationTaskNum() {
+ Long userId = LoginHelper.getUserId();
+ Long l = evaluationRecordMapper.selectCount(new LambdaQueryWrapper()
+ .eq(SysEvaluationRecord::getUserId, userId)
+ .le(SysEvaluationRecord::getStatus, StatusEnum.DISABLED.getValue()));
+ return l.intValue();
+ }
+}
diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScaleServiceImpl.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScaleServiceImpl.java
index 69b2b4a..9253d2a 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScaleServiceImpl.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScaleServiceImpl.java
@@ -45,7 +45,7 @@ public class SysScaleServiceImpl implements ISysScaleService {
* 查询心理测评量
*/
@Override
- public SysScaleVo queryById(Long scaleId) {
+ public SysScaleVo queryById4Wx(Long scaleId) {
Long userId = LoginHelper.getUserId();
SysScaleVo sysScaleVo = baseMapper.selectVoById(scaleId);
String scaleTypeName = dictService.getDictLabel("scale_type", StrUtil.join(StrUtil.COMMA, sysScaleVo.getScaleType()));
@@ -90,6 +90,14 @@ public class SysScaleServiceImpl implements ISysScaleService {
return sysScaleVo;
}
+ /**
+ * 查询心理测评量
+ */
+ @Override
+ public SysScaleVo queryById(Long scaleId) {
+ return baseMapper.selectVoById(scaleId);
+ }
+
/**
* 查询心理测评量列表