From 1901fceb6ddaa56a57f3131191454554c3e77e68 Mon Sep 17 00:00:00 2001
From: guohongjin <guohongjin@test.com>
Date: 星期三, 01 五月 2024 13:56:51 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PsychologicalCounseling
---
common-buiness/src/main/java/cn/stylefeng/guns/modular/business/dto/MentalTestMyTestTopicDTO.java | 36 ++++++++++++++++++++++--------------
1 files changed, 22 insertions(+), 14 deletions(-)
diff --git a/common-buiness/src/main/java/cn/stylefeng/guns/modular/business/dto/MentalTestMyTestTopicDTO.java b/common-buiness/src/main/java/cn/stylefeng/guns/modular/business/dto/MentalTestMyTestTopicDTO.java
index 8a9e124..e733204 100644
--- a/common-buiness/src/main/java/cn/stylefeng/guns/modular/business/dto/MentalTestMyTestTopicDTO.java
+++ b/common-buiness/src/main/java/cn/stylefeng/guns/modular/business/dto/MentalTestMyTestTopicDTO.java
@@ -1,6 +1,6 @@
package cn.stylefeng.guns.modular.business.dto;
-import cn.stylefeng.guns.modular.business.entity.MentalTestRecord;
+import cn.stylefeng.guns.modular.business.entity.OrderMentalTest;
import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -10,15 +10,19 @@
@Data
@ApiModel(value = "我的测试-响应参数")
-public class MentalTestMyTestTopicDTO extends MentalTestRecord {
+public class MentalTestMyTestTopicDTO extends OrderMentalTest {
+
+ @ApiModelProperty(value = "心理测试记录ID")
+ @ChineseDescription("心理测试记录ID")
+ private Long mentalTestRecordId;
+
+ @ApiModelProperty(value = "题库ID")
+ @ChineseDescription("题库ID")
+ private Long topicId;
@ApiModelProperty(value = "状态：1正常，2冻结")
@ChineseDescription("状态：1正常，2冻结")
private Integer topicStatus;
-
- @ApiModelProperty(value = "状态：1正常，2冻结")
- @ChineseDescription("状态：1正常，2冻结")
- private Integer statusFlag;
@ApiModelProperty(value = "标题")
@ChineseDescription("标题")
@@ -52,14 +56,6 @@
@ChineseDescription("咨询费用")
private BigDecimal consultAmount;
- @ApiModelProperty(value = "是否测试")
- @ChineseDescription("是否测试")
- private boolean testFlag;
-
- @ApiModelProperty(value = "是否购买")
- @ChineseDescription("是否购买")
- private boolean payFlag;
-
@ApiModelProperty(value = "测试人数")
@ChineseDescription("测试人数")
private Integer testPeopleNum;
@@ -68,4 +64,16 @@
@ChineseDescription("测试配置人数")
private Integer testSetNum;
+ @ApiModelProperty(value = "是否后台创建")
+ @ChineseDescription("是否后台创建")
+ private Boolean isBack;
+
+ @ApiModelProperty(value = "是否测试")
+ @ChineseDescription("是否测试")
+ private Boolean testFlag;
+
+ @ApiModelProperty(value = "是否购买")
+ @ChineseDescription("是否购买")
+ private Boolean payFlag;
+
}
--
Gitblit v1.7.1