From 01ceaa50ebbbdd17cd775c3db4bbe00a128651a1 Mon Sep 17 00:00:00 2001 From: zhizhi wu <2377881365@qq.com> Date: Fri, 12 Nov 2021 16:15:58 +0800 Subject: [PATCH] =?UTF-8?q?=E8=84=91=E5=8A=9B=E6=B5=8B=E8=AF=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 6 +- .../yanyuan/api/MentalTestController.java | 47 ++ .../yanyuan/api/QuestionController.java | 56 ++ .../ccsens/yanyuan/api/ToolController.java | 10 + .../ccsens/yanyuan/api/TraineeController.java | 10 +- .../ccsens/yanyuan/bean/dto/FamilyDto.java | 5 +- .../yanyuan/bean/dto/MentalTestDto.java | 26 + .../ccsens/yanyuan/bean/dto/QuestionDto.java | 44 + .../com/ccsens/yanyuan/bean/dto/ToolDto.java | 7 + .../ccsens/yanyuan/bean/dto/TraineeDto.java | 6 +- .../ccsens/yanyuan/bean/po/EvaluationNum.java | 117 +++ .../yanyuan/bean/po/EvaluationNumExample.java | 761 ++++++++++++++++++ .../yanyuan/bean/po/EvaluationOption.java | 23 +- .../bean/po/EvaluationOptionExample.java | 108 +-- .../yanyuan/bean/po/EvaluationQuestion.java | 35 +- .../bean/po/EvaluationQuestionExample.java | 166 ++-- .../yanyuan/bean/po/MentalQuestion.java | 12 +- .../bean/po/MentalQuestionExample.java | 48 +- .../ccsens/yanyuan/bean/po/MentalRecord.java | 23 +- .../yanyuan/bean/po/MentalRecordExample.java | 118 +-- .../ccsens/yanyuan/bean/po/MentalTest.java | 6 +- .../yanyuan/bean/po/MentalTestExample.java | 20 +- .../java/com/ccsens/yanyuan/bean/po/Tool.java | 22 + .../ccsens/yanyuan/bean/po/ToolExample.java | 130 +++ .../ccsens/yanyuan/bean/vo/MentalTestVo.java | 44 + .../ccsens/yanyuan/bean/vo/QuestionVo.java | 83 ++ .../com/ccsens/yanyuan/bean/vo/ToolVo.java | 13 +- .../com/ccsens/yanyuan/bean/vo/TraineeVo.java | 8 + .../com/ccsens/yanyuan/config/BeanConfig.java | 12 + .../yanyuan/mq/MentalTestGenerateReceive.java | 44 + .../ccsens/yanyuan/mq/MentalTestReceive.java | 51 ++ .../yanyuan/persist/dao/EvaluationNumDao.java | 28 + .../ccsens/yanyuan/persist/dao/FamilyDao.java | 3 + .../persist/dao/MentalQuestionDao.java | 20 + .../yanyuan/persist/dao/MentalTestDao.java | 45 ++ .../yanyuan/persist/dao/TraineeDao.java | 5 +- .../persist/mapper/EvaluationNumMapper.java | 30 + .../ccsens/yanyuan/service/FamilyService.java | 48 +- .../yanyuan/service/IMentalTestService.java | 34 + .../yanyuan/service/IQuestionService.java | 24 + .../ccsens/yanyuan/service/IToolService.java | 8 + .../yanyuan/service/ITraineeService.java | 7 +- .../yanyuan/service/MentalTestService.java | 137 ++++ .../yanyuan/service/QuestionService.java | 111 +++ .../ccsens/yanyuan/service/ToolService.java | 36 + .../yanyuan/service/TraineeService.java | 76 +- .../ccsens/yanyuan/util/YanYuanConstant.java | 32 +- src/main/resources/application-common.yml | 4 +- src/main/resources/application-test.yml | 4 +- .../resources/mapper_dao/EvaluationNumDao.xml | 115 +++ .../mapper_dao/MentalQuestionDao.xml | 11 + .../resources/mapper_dao/MentalTestDao.xml | 98 +++ src/main/resources/mapper_dao/TraineeDao.xml | 2 +- .../mapper_raw/EvaluationNumMapper.xml | 275 +++++++ .../mapper_raw/EvaluationOptionMapper.xml | 59 +- .../mapper_raw/EvaluationQuestionMapper.xml | 81 +- .../mapper_raw/MentalQuestionMapper.xml | 28 +- .../mapper_raw/MentalRecordMapper.xml | 56 +- .../resources/mapper_raw/MentalTestMapper.xml | 14 +- src/main/resources/mapper_raw/ToolMapper.xml | 45 +- src/main/resources/mbg.xml | 15 +- 61 files changed, 2895 insertions(+), 617 deletions(-) create mode 100644 src/main/java/com/ccsens/yanyuan/api/MentalTestController.java create mode 100644 src/main/java/com/ccsens/yanyuan/api/QuestionController.java create mode 100644 src/main/java/com/ccsens/yanyuan/bean/dto/MentalTestDto.java create mode 100644 src/main/java/com/ccsens/yanyuan/bean/dto/QuestionDto.java create mode 100644 src/main/java/com/ccsens/yanyuan/bean/po/EvaluationNum.java create mode 100644 src/main/java/com/ccsens/yanyuan/bean/po/EvaluationNumExample.java create mode 100644 src/main/java/com/ccsens/yanyuan/bean/vo/MentalTestVo.java create mode 100644 src/main/java/com/ccsens/yanyuan/bean/vo/QuestionVo.java create mode 100644 src/main/java/com/ccsens/yanyuan/mq/MentalTestGenerateReceive.java create mode 100644 src/main/java/com/ccsens/yanyuan/mq/MentalTestReceive.java create mode 100644 src/main/java/com/ccsens/yanyuan/persist/dao/EvaluationNumDao.java create mode 100644 src/main/java/com/ccsens/yanyuan/persist/dao/MentalQuestionDao.java create mode 100644 src/main/java/com/ccsens/yanyuan/persist/dao/MentalTestDao.java create mode 100644 src/main/java/com/ccsens/yanyuan/persist/mapper/EvaluationNumMapper.java create mode 100644 src/main/java/com/ccsens/yanyuan/service/IMentalTestService.java create mode 100644 src/main/java/com/ccsens/yanyuan/service/IQuestionService.java create mode 100644 src/main/java/com/ccsens/yanyuan/service/MentalTestService.java create mode 100644 src/main/java/com/ccsens/yanyuan/service/QuestionService.java create mode 100644 src/main/resources/mapper_dao/EvaluationNumDao.xml create mode 100644 src/main/resources/mapper_dao/MentalQuestionDao.xml create mode 100644 src/main/resources/mapper_dao/MentalTestDao.xml create mode 100644 src/main/resources/mapper_raw/EvaluationNumMapper.xml diff --git a/pom.xml b/pom.xml index 1b24751..67ce7ea 100644 --- a/pom.xml +++ b/pom.xml @@ -41,7 +41,11 @@ 1.0-SNAPSHOT compile - + + wechatutil + com.ccsens + 1.0-SNAPSHOT + diff --git a/src/main/java/com/ccsens/yanyuan/api/MentalTestController.java b/src/main/java/com/ccsens/yanyuan/api/MentalTestController.java new file mode 100644 index 0000000..a900b51 --- /dev/null +++ b/src/main/java/com/ccsens/yanyuan/api/MentalTestController.java @@ -0,0 +1,47 @@ +package com.ccsens.yanyuan.api; + +import com.ccsens.cloudutil.annotation.MustLogin; +import com.ccsens.util.JsonResponse; +import com.ccsens.util.bean.dto.QueryDto; +import com.ccsens.yanyuan.bean.dto.MentalTestDto; +import com.ccsens.yanyuan.bean.dto.QuestionDto; +import com.ccsens.yanyuan.bean.vo.MentalTestVo; +import com.ccsens.yanyuan.bean.vo.QuestionVo; +import com.ccsens.yanyuan.service.IMentalTestService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +/** + * @description: + * @author: whj + * @time: 2021/11/10 16:37 + */ +@Api(tags = "脑力测评" ) +@Slf4j +@RestController +@RequestMapping(value = "/mentalTest") +public class MentalTestController { + + @Resource + private IMentalTestService mentalTestService; + + @MustLogin + @ApiOperation(value = "脑力测评结果计算", notes = "脑力测评结果计算") + @RequestMapping(value = "/calculate", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse calculate(@ApiParam @Validated @RequestBody QueryDto params) throws Exception{ + log.info("脑力测评结果计算:{}",params); + MentalTestVo.Result message = mentalTestService.calculate(params.getParam(), params.getUserId()); + log.info("脑力测评结果计算结束{}", message); + return JsonResponse.newInstance().ok(message); + } + +} diff --git a/src/main/java/com/ccsens/yanyuan/api/QuestionController.java b/src/main/java/com/ccsens/yanyuan/api/QuestionController.java new file mode 100644 index 0000000..345f11b --- /dev/null +++ b/src/main/java/com/ccsens/yanyuan/api/QuestionController.java @@ -0,0 +1,56 @@ +package com.ccsens.yanyuan.api; + +import com.ccsens.cloudutil.annotation.MustLogin; +import com.ccsens.util.JsonResponse; +import com.ccsens.util.bean.dto.QueryDto; +import com.ccsens.yanyuan.bean.dto.QuestionDto; +import com.ccsens.yanyuan.bean.vo.QuestionVo; +import com.ccsens.yanyuan.service.IQuestionService; +import com.ccsens.yanyuan.util.YanYuanCodeError; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +/** + * @description: 试题 + * @author: whj + * @time: 2021/11/11 17:27 + */ +@Api(tags = "测评" ) +@Slf4j +@RestController +@RequestMapping(value = "/question") +public class QuestionController { + + @Resource + private IQuestionService questionService; + + @MustLogin + @ApiOperation(value = "试题查询", notes = "试题查询") + @RequestMapping(value = "/get", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse get(@ApiParam @Validated @RequestBody QueryDto params) throws Exception{ + log.info("试题查询:{}",params); + QuestionVo.QuestionMessage message = questionService.get(params.getParam(), params.getUserId()); + log.info("试题查询结束{}", message); + return JsonResponse.newInstance().ok(message); + } + + @MustLogin + @ApiOperation(value = "试题答案保存", notes = "试题答案保存") + @RequestMapping(value = "/saveAnswer", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse saveAnswer(@ApiParam @Validated @RequestBody QueryDto params) throws Exception{ + log.info("试题答案保存:{}",params); + questionService.saveAnswer(params.getParam(), params.getUserId()); + log.info("试题答案保存结束"); + return JsonResponse.newInstance().ok(); + } + +} diff --git a/src/main/java/com/ccsens/yanyuan/api/ToolController.java b/src/main/java/com/ccsens/yanyuan/api/ToolController.java index 23d6249..14ed115 100644 --- a/src/main/java/com/ccsens/yanyuan/api/ToolController.java +++ b/src/main/java/com/ccsens/yanyuan/api/ToolController.java @@ -42,4 +42,14 @@ public class ToolController { return JsonResponse.newInstance().ok(bindTool); } + @MustLogin + @ApiOperation(value = "查询指定工具箱二维码", notes = "查询指定工具箱二维码") + @RequestMapping(value = "/qrCode", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse qrCode(@ApiParam @Validated @RequestBody QueryDto params) throws Exception{ + log.info("查询指定工具箱二维码:{}",params); + ToolVo.QrCode qrCode = toolService.generateQrCode(params.getParam(), params.getUserId()); + log.info("查询指定工具箱二维码结束{}",qrCode); + return JsonResponse.newInstance().ok(qrCode); + } + } diff --git a/src/main/java/com/ccsens/yanyuan/api/TraineeController.java b/src/main/java/com/ccsens/yanyuan/api/TraineeController.java index 071116b..7cc663b 100644 --- a/src/main/java/com/ccsens/yanyuan/api/TraineeController.java +++ b/src/main/java/com/ccsens/yanyuan/api/TraineeController.java @@ -48,9 +48,9 @@ public class TraineeController { @MustLogin @ApiOperation(value = "绑定手机号后，关联用户原有的使用者", notes = "该接口仅在前期使用，待旧版小程序停止，且用户全部迁移后，将不再调用改接口") @RequestMapping(value = "/relation", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) - public JsonResponse relation(@ApiParam @Validated @RequestBody QueryDto params) throws Exception{ + public JsonResponse relation(@ApiParam @Validated @RequestBody QueryDto params) throws Exception{ log.info("关联用户原有的使用者:{}",params); - CodeError.Code code = traineeService.bindOldTrainee(params.getParam(), params.getUserId()); + CodeError.Code code = traineeService.bindOldTrainee(params.getPhone(), params.getUserId()); log.info("关联用户原有的使用者结束: {}",code); return JsonResponse.newInstance().ok(code); } @@ -80,8 +80,8 @@ public class TraineeController { @RequestMapping(value = "/add", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse add(@ApiParam @Validated @RequestBody QueryDto params) throws Exception{ log.info("填写用户信息:{}",params); - JsonResponse response = traineeService.add(params.getParam(), params.getPhone(), params.getUserId()); - log.info("填写用户信息结果: {}",response); - return response; + CodeError.Code code = traineeService.add(params.getParam(), params.getPhone(), params.getUserId()); + log.info("填写用户信息结果: {}",code); + return JsonResponse.newInstance().ok(code); } } diff --git a/src/main/java/com/ccsens/yanyuan/bean/dto/FamilyDto.java b/src/main/java/com/ccsens/yanyuan/bean/dto/FamilyDto.java index d21f2f5..5a89e0d 100644 --- a/src/main/java/com/ccsens/yanyuan/bean/dto/FamilyDto.java +++ b/src/main/java/com/ccsens/yanyuan/bean/dto/FamilyDto.java @@ -7,6 +7,7 @@ import lombok.Data; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; +import java.util.List; /** * @description: @@ -16,10 +17,10 @@ import javax.validation.constraints.NotNull; public class FamilyDto { @Data @ApiModel("申请成为家属-请求") - public class Apply { + public static class Apply { @NotNull @ApiModelProperty("使用者userId") - private Long keyUserId; + private List keyUserIds; @ApiModelProperty("家属姓名") private String name; @ApiModelProperty("家属性别 1：男 2：女") diff --git a/src/main/java/com/ccsens/yanyuan/bean/dto/MentalTestDto.java b/src/main/java/com/ccsens/yanyuan/bean/dto/MentalTestDto.java new file mode 100644 index 0000000..767926a --- /dev/null +++ b/src/main/java/com/ccsens/yanyuan/bean/dto/MentalTestDto.java @@ -0,0 +1,26 @@ +package com.ccsens.yanyuan.bean.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: 脑力测评-请求 + * @author: whj + * @time: 2021/11/10 16:48 + */ +public class MentalTestDto { + + @Data + @ApiModel("为某个用户生成脑力测评") + public static class GenerateOne{ + @ApiModelProperty("使用者ID") + private Long keyUserId; + } + @Data + @ApiModel("测评报告ID") + public static class Id { + @ApiModelProperty("脑力测评ID") + private Long mentalTestId; + } +} diff --git a/src/main/java/com/ccsens/yanyuan/bean/dto/QuestionDto.java b/src/main/java/com/ccsens/yanyuan/bean/dto/QuestionDto.java new file mode 100644 index 0000000..c461983 --- /dev/null +++ b/src/main/java/com/ccsens/yanyuan/bean/dto/QuestionDto.java @@ -0,0 +1,44 @@ +package com.ccsens.yanyuan.bean.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; + +/** + * @description: 试题 + * @author: whj + * @time: 2021/11/11 17:37 + */ +public class QuestionDto { + @ApiModel("查询试题-请求") + @Data + public static class Get { + @NotEmpty + @ApiModelProperty("题目code NLCP:脑力测评 ZARIT:照顾者负担量表") + private String code; + @NotNull + @ApiModelProperty("测评ID 脑力测评ID或zaritID") + private Long reportId; + @ApiModelProperty("题号") + private int num; + } + @ApiModel("保存试题答案-请求") + @Data + public static class SaveAnswer { + @NotEmpty + @ApiModelProperty("题目code NLCP:脑力测评 ZARIT:照顾者负担量表") + private String code; + @NotNull + @ApiModelProperty("测评ID 脑力测评ID或zaritID") + private Long reportId; + @NotNull + @ApiModelProperty("题目ID") + private Long questionId; + @NotNull + @ApiModelProperty("选项ID") + private Long optionId; + } +} diff --git a/src/main/java/com/ccsens/yanyuan/bean/dto/ToolDto.java b/src/main/java/com/ccsens/yanyuan/bean/dto/ToolDto.java index 8b6331c..a9d58e1 100644 --- a/src/main/java/com/ccsens/yanyuan/bean/dto/ToolDto.java +++ b/src/main/java/com/ccsens/yanyuan/bean/dto/ToolDto.java @@ -15,4 +15,11 @@ public class ToolDto { @ApiModelProperty("工具箱code码") private String toolCode; } + + @Data + @ApiModel("工具箱二维码-请求") + public static class QrCode { + @ApiModelProperty("工具箱ID") + private Long id; + } } diff --git a/src/main/java/com/ccsens/yanyuan/bean/dto/TraineeDto.java b/src/main/java/com/ccsens/yanyuan/bean/dto/TraineeDto.java index 16b9b84..9b65f58 100644 --- a/src/main/java/com/ccsens/yanyuan/bean/dto/TraineeDto.java +++ b/src/main/java/com/ccsens/yanyuan/bean/dto/TraineeDto.java @@ -1,5 +1,6 @@ package com.ccsens.yanyuan.bean.dto; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -62,6 +63,7 @@ public class TraineeDto { @ApiModelProperty("就诊医生") private String clinicDoctor; @ApiModelProperty("出生年月") + @JsonFormat(pattern = "yyyy-MM-dd") private Date birthDate; @ApiModelProperty("身高") private String height; @@ -76,8 +78,10 @@ public class TraineeDto { @ApiModelProperty("长期居住地") private String abodePlace; @ApiModelProperty("出现认知障碍时间") + @JsonFormat(pattern = "yyyy-MM-dd") private Date appearTime; @ApiModelProperty("首次诊断痴呆时间") + @JsonFormat(pattern = "yyyy-MM-dd") private Date diagnoseTime; @ApiModelProperty("诊断") private String diagnoseResult; @@ -97,7 +101,7 @@ public class TraineeDto { private String relativeDiseasesRecord; @ApiModelProperty("是否失眠： 0 不 1 是") private Byte isInsomnic; - @ApiModelProperty("每天平均失眠时间") + @ApiModelProperty("每天平均睡眠时间") private String insomnicPeriod; @ApiModelProperty("是否吸烟 0 不 1 吸烟已戒 2 吸烟未戒") private Byte isSmoke; diff --git a/src/main/java/com/ccsens/yanyuan/bean/po/EvaluationNum.java b/src/main/java/com/ccsens/yanyuan/bean/po/EvaluationNum.java new file mode 100644 index 0000000..2d93b80 --- /dev/null +++ b/src/main/java/com/ccsens/yanyuan/bean/po/EvaluationNum.java @@ -0,0 +1,117 @@ +package com.ccsens.yanyuan.bean.po; + +import java.io.Serializable; +import java.util.Date; + +public class EvaluationNum implements Serializable { + private Long id; + + private String code; + + private Integer num; + + private Integer sort; + + private String remark; + + private Long operator; + + private Date createdAt; + + private Date updatedAt; + + private Byte recStatus; + + private static final long serialVersionUID = 1L; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code == null ? null : code.trim(); + } + + public Integer getNum() { + return num; + } + + public void setNum(Integer num) { + this.num = num; + } + + public Integer getSort() { + return sort; + } + + public void setSort(Integer sort) { + this.sort = sort; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark == null ? null : remark.trim(); + } + + public Long getOperator() { + return operator; + } + + public void setOperator(Long operator) { + this.operator = operator; + } + + public Date getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Date createdAt) { + this.createdAt = createdAt; + } + + public Date getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(Date updatedAt) { + this.updatedAt = updatedAt; + } + + public Byte getRecStatus() { + return recStatus; + } + + public void setRecStatus(Byte recStatus) { + this.recStatus = recStatus; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", id=").append(id); + sb.append(", code=").append(code); + sb.append(", num=").append(num); + sb.append(", sort=").append(sort); + sb.append(", remark=").append(remark); + sb.append(", operator=").append(operator); + sb.append(", createdAt=").append(createdAt); + sb.append(", updatedAt=").append(updatedAt); + sb.append(", recStatus=").append(recStatus); + sb.append("]"); + return sb.toString(); + } +} \ No newline at end of file diff --git a/src/main/java/com/ccsens/yanyuan/bean/po/EvaluationNumExample.java b/src/main/java/com/ccsens/yanyuan/bean/po/EvaluationNumExample.java new file mode 100644 index 0000000..0202465 --- /dev/null +++ b/src/main/java/com/ccsens/yanyuan/bean/po/EvaluationNumExample.java @@ -0,0 +1,761 @@ +package com.ccsens.yanyuan.bean.po; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class EvaluationNumExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public EvaluationNumExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andIdIsNull() { + addCriterion("id is null"); + return (Criteria) this; + } + + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); + return (Criteria) this; + } + + public Criteria andIdEqualTo(Long value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(Long value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(Long value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(Long value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(Long value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(Long value) { + addCriterion("id <=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(Long value1, Long value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(Long value1, Long value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andCodeIsNull() { + addCriterion("code is null"); + return (Criteria) this; + } + + public Criteria andCodeIsNotNull() { + addCriterion("code is not null"); + return (Criteria) this; + } + + public Criteria andCodeEqualTo(String value) { + addCriterion("code =", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeNotEqualTo(String value) { + addCriterion("code <>", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeGreaterThan(String value) { + addCriterion("code >", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeGreaterThanOrEqualTo(String value) { + addCriterion("code >=", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeLessThan(String value) { + addCriterion("code <", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeLessThanOrEqualTo(String value) { + addCriterion("code <=", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeLike(String value) { + addCriterion("code like", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeNotLike(String value) { + addCriterion("code not like", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeIn(List values) { + addCriterion("code in", values, "code"); + return (Criteria) this; + } + + public Criteria andCodeNotIn(List values) { + addCriterion("code not in", values, "code"); + return (Criteria) this; + } + + public Criteria andCodeBetween(String value1, String value2) { + addCriterion("code between", value1, value2, "code"); + return (Criteria) this; + } + + public Criteria andCodeNotBetween(String value1, String value2) { + addCriterion("code not between", value1, value2, "code"); + return (Criteria) this; + } + + public Criteria andNumIsNull() { + addCriterion("num is null"); + return (Criteria) this; + } + + public Criteria andNumIsNotNull() { + addCriterion("num is not null"); + return (Criteria) this; + } + + public Criteria andNumEqualTo(Integer value) { + addCriterion("num =", value, "num"); + return (Criteria) this; + } + + public Criteria andNumNotEqualTo(Integer value) { + addCriterion("num <>", value, "num"); + return (Criteria) this; + } + + public Criteria andNumGreaterThan(Integer value) { + addCriterion("num >", value, "num"); + return (Criteria) this; + } + + public Criteria andNumGreaterThanOrEqualTo(Integer value) { + addCriterion("num >=", value, "num"); + return (Criteria) this; + } + + public Criteria andNumLessThan(Integer value) { + addCriterion("num <", value, "num"); + return (Criteria) this; + } + + public Criteria andNumLessThanOrEqualTo(Integer value) { + addCriterion("num <=", value, "num"); + return (Criteria) this; + } + + public Criteria andNumIn(List values) { + addCriterion("num in", values, "num"); + return (Criteria) this; + } + + public Criteria andNumNotIn(List values) { + addCriterion("num not in", values, "num"); + return (Criteria) this; + } + + public Criteria andNumBetween(Integer value1, Integer value2) { + addCriterion("num between", value1, value2, "num"); + return (Criteria) this; + } + + public Criteria andNumNotBetween(Integer value1, Integer value2) { + addCriterion("num not between", value1, value2, "num"); + return (Criteria) this; + } + + public Criteria andSortIsNull() { + addCriterion("sort is null"); + return (Criteria) this; + } + + public Criteria andSortIsNotNull() { + addCriterion("sort is not null"); + return (Criteria) this; + } + + public Criteria andSortEqualTo(Integer value) { + addCriterion("sort =", value, "sort"); + return (Criteria) this; + } + + public Criteria andSortNotEqualTo(Integer value) { + addCriterion("sort <>", value, "sort"); + return (Criteria) this; + } + + public Criteria andSortGreaterThan(Integer value) { + addCriterion("sort >", value, "sort"); + return (Criteria) this; + } + + public Criteria andSortGreaterThanOrEqualTo(Integer value) { + addCriterion("sort >=", value, "sort"); + return (Criteria) this; + } + + public Criteria andSortLessThan(Integer value) { + addCriterion("sort <", value, "sort"); + return (Criteria) this; + } + + public Criteria andSortLessThanOrEqualTo(Integer value) { + addCriterion("sort <=", value, "sort"); + return (Criteria) this; + } + + public Criteria andSortIn(List values) { + addCriterion("sort in", values, "sort"); + return (Criteria) this; + } + + public Criteria andSortNotIn(List values) { + addCriterion("sort not in", values, "sort"); + return (Criteria) this; + } + + public Criteria andSortBetween(Integer value1, Integer value2) { + addCriterion("sort between", value1, value2, "sort"); + return (Criteria) this; + } + + public Criteria andSortNotBetween(Integer value1, Integer value2) { + addCriterion("sort not between", value1, value2, "sort"); + return (Criteria) this; + } + + public Criteria andRemarkIsNull() { + addCriterion("remark is null"); + return (Criteria) this; + } + + public Criteria andRemarkIsNotNull() { + addCriterion("remark is not null"); + return (Criteria) this; + } + + public Criteria andRemarkEqualTo(String value) { + addCriterion("remark =", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkNotEqualTo(String value) { + addCriterion("remark <>", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkGreaterThan(String value) { + addCriterion("remark >", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkGreaterThanOrEqualTo(String value) { + addCriterion("remark >=", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkLessThan(String value) { + addCriterion("remark <", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkLessThanOrEqualTo(String value) { + addCriterion("remark <=", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkLike(String value) { + addCriterion("remark like", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkNotLike(String value) { + addCriterion("remark not like", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkIn(List values) { + addCriterion("remark in", values, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkNotIn(List values) { + addCriterion("remark not in", values, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkBetween(String value1, String value2) { + addCriterion("remark between", value1, value2, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkNotBetween(String value1, String value2) { + addCriterion("remark not between", value1, value2, "remark"); + return (Criteria) this; + } + + public Criteria andOperatorIsNull() { + addCriterion("operator is null"); + return (Criteria) this; + } + + public Criteria andOperatorIsNotNull() { + addCriterion("operator is not null"); + return (Criteria) this; + } + + public Criteria andOperatorEqualTo(Long value) { + addCriterion("operator =", value, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorNotEqualTo(Long value) { + addCriterion("operator <>", value, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorGreaterThan(Long value) { + addCriterion("operator >", value, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorGreaterThanOrEqualTo(Long value) { + addCriterion("operator >=", value, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorLessThan(Long value) { + addCriterion("operator <", value, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorLessThanOrEqualTo(Long value) { + addCriterion("operator <=", value, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorIn(List values) { + addCriterion("operator in", values, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorNotIn(List values) { + addCriterion("operator not in", values, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorBetween(Long value1, Long value2) { + addCriterion("operator between", value1, value2, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorNotBetween(Long value1, Long value2) { + addCriterion("operator not between", value1, value2, "operator"); + return (Criteria) this; + } + + public Criteria andCreatedAtIsNull() { + addCriterion("created_at is null"); + return (Criteria) this; + } + + public Criteria andCreatedAtIsNotNull() { + addCriterion("created_at is not null"); + return (Criteria) this; + } + + public Criteria andCreatedAtEqualTo(Date value) { + addCriterion("created_at =", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotEqualTo(Date value) { + addCriterion("created_at <>", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtGreaterThan(Date value) { + addCriterion("created_at >", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) { + addCriterion("created_at >=", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtLessThan(Date value) { + addCriterion("created_at <", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtLessThanOrEqualTo(Date value) { + addCriterion("created_at <=", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtIn(List values) { + addCriterion("created_at in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotIn(List values) { + addCriterion("created_at not in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtBetween(Date value1, Date value2) { + addCriterion("created_at between", value1, value2, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotBetween(Date value1, Date value2) { + addCriterion("created_at not between", value1, value2, "createdAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIsNull() { + addCriterion("updated_at is null"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIsNotNull() { + addCriterion("updated_at is not null"); + return (Criteria) this; + } + + public Criteria andUpdatedAtEqualTo(Date value) { + addCriterion("updated_at =", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotEqualTo(Date value) { + addCriterion("updated_at <>", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtGreaterThan(Date value) { + addCriterion("updated_at >", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) { + addCriterion("updated_at >=", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtLessThan(Date value) { + addCriterion("updated_at <", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtLessThanOrEqualTo(Date value) { + addCriterion("updated_at <=", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIn(List values) { + addCriterion("updated_at in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotIn(List values) { + addCriterion("updated_at not in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtBetween(Date value1, Date value2) { + addCriterion("updated_at between", value1, value2, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotBetween(Date value1, Date value2) { + addCriterion("updated_at not between", value1, value2, "updatedAt"); + return (Criteria) this; + } + + public Criteria andRecStatusIsNull() { + addCriterion("rec_status is null"); + return (Criteria) this; + } + + public Criteria andRecStatusIsNotNull() { + addCriterion("rec_status is not null"); + return (Criteria) this; + } + + public Criteria andRecStatusEqualTo(Byte value) { + addCriterion("rec_status =", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotEqualTo(Byte value) { + addCriterion("rec_status <>", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusGreaterThan(Byte value) { + addCriterion("rec_status >", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusGreaterThanOrEqualTo(Byte value) { + addCriterion("rec_status >=", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusLessThan(Byte value) { + addCriterion("rec_status <", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusLessThanOrEqualTo(Byte value) { + addCriterion("rec_status <=", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusIn(List values) { + addCriterion("rec_status in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotIn(List values) { + addCriterion("rec_status not in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusBetween(Byte value1, Byte value2) { + addCriterion("rec_status between", value1, value2, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotBetween(Byte value1, Byte value2) { + addCriterion("rec_status not between", value1, value2, "recStatus"); + return (Criteria) this; + } + } + + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} \ No newline at end of file diff --git a/src/main/java/com/ccsens/yanyuan/bean/po/EvaluationOption.java b/src/main/java/com/ccsens/yanyuan/bean/po/EvaluationOption.java index 0c86181..e5782a6 100644 --- a/src/main/java/com/ccsens/yanyuan/bean/po/EvaluationOption.java +++ b/src/main/java/com/ccsens/yanyuan/bean/po/EvaluationOption.java @@ -6,7 +6,7 @@ import java.util.Date; public class EvaluationOption implements Serializable { private Long id; - private Long questionId; + private Long numId; private String content; @@ -20,8 +20,6 @@ public class EvaluationOption implements Serializable { private Byte col; - private Byte positon; - private Integer sort; private String remark; @@ -44,12 +42,12 @@ public class EvaluationOption implements Serializable { this.id = id; } - public Long getQuestionId() { - return questionId; + public Long getNumId() { + return numId; } - public void setQuestionId(Long questionId) { - this.questionId = questionId; + public void setNumId(Long numId) { + this.numId = numId; } public String getContent() { @@ -100,14 +98,6 @@ public class EvaluationOption implements Serializable { this.col = col; } - public Byte getPositon() { - return positon; - } - - public void setPositon(Byte positon) { - this.positon = positon; - } - public Integer getSort() { return sort; } @@ -163,14 +153,13 @@ public class EvaluationOption implements Serializable { sb.append(" ["); sb.append("Hash = ").append(hashCode()); sb.append(", id=").append(id); - sb.append(", questionId=").append(questionId); + sb.append(", numId=").append(numId); sb.append(", content=").append(content); sb.append(", score=").append(score); sb.append(", page=").append(page); sb.append(", showType=").append(showType); sb.append(", row=").append(row); sb.append(", col=").append(col); - sb.append(", positon=").append(positon); sb.append(", sort=").append(sort); sb.append(", remark=").append(remark); sb.append(", operator=").append(operator); diff --git a/src/main/java/com/ccsens/yanyuan/bean/po/EvaluationOptionExample.java b/src/main/java/com/ccsens/yanyuan/bean/po/EvaluationOptionExample.java index 26bf418..d11735d 100644 --- a/src/main/java/com/ccsens/yanyuan/bean/po/EvaluationOptionExample.java +++ b/src/main/java/com/ccsens/yanyuan/bean/po/EvaluationOptionExample.java @@ -165,63 +165,63 @@ public class EvaluationOptionExample { return (Criteria) this; } - public Criteria andQuestionIdIsNull() { - addCriterion("question_id is null"); + public Criteria andNumIdIsNull() { + addCriterion("num_id is null"); return (Criteria) this; } - public Criteria andQuestionIdIsNotNull() { - addCriterion("question_id is not null"); + public Criteria andNumIdIsNotNull() { + addCriterion("num_id is not null"); return (Criteria) this; } - public Criteria andQuestionIdEqualTo(Long value) { - addCriterion("question_id =", value, "questionId"); + public Criteria andNumIdEqualTo(Long value) { + addCriterion("num_id =", value, "numId"); return (Criteria) this; } - public Criteria andQuestionIdNotEqualTo(Long value) { - addCriterion("question_id <>", value, "questionId"); + public Criteria andNumIdNotEqualTo(Long value) { + addCriterion("num_id <>", value, "numId"); return (Criteria) this; } - public Criteria andQuestionIdGreaterThan(Long value) { - addCriterion("question_id >", value, "questionId"); + public Criteria andNumIdGreaterThan(Long value) { + addCriterion("num_id >", value, "numId"); return (Criteria) this; } - public Criteria andQuestionIdGreaterThanOrEqualTo(Long value) { - addCriterion("question_id >=", value, "questionId"); + public Criteria andNumIdGreaterThanOrEqualTo(Long value) { + addCriterion("num_id >=", value, "numId"); return (Criteria) this; } - public Criteria andQuestionIdLessThan(Long value) { - addCriterion("question_id <", value, "questionId"); + public Criteria andNumIdLessThan(Long value) { + addCriterion("num_id <", value, "numId"); return (Criteria) this; } - public Criteria andQuestionIdLessThanOrEqualTo(Long value) { - addCriterion("question_id <=", value, "questionId"); + public Criteria andNumIdLessThanOrEqualTo(Long value) { + addCriterion("num_id <=", value, "numId"); return (Criteria) this; } - public Criteria andQuestionIdIn(List values) { - addCriterion("question_id in", values, "questionId"); + public Criteria andNumIdIn(List values) { + addCriterion("num_id in", values, "numId"); return (Criteria) this; } - public Criteria andQuestionIdNotIn(List values) { - addCriterion("question_id not in", values, "questionId"); + public Criteria andNumIdNotIn(List values) { + addCriterion("num_id not in", values, "numId"); return (Criteria) this; } - public Criteria andQuestionIdBetween(Long value1, Long value2) { - addCriterion("question_id between", value1, value2, "questionId"); + public Criteria andNumIdBetween(Long value1, Long value2) { + addCriterion("num_id between", value1, value2, "numId"); return (Criteria) this; } - public Criteria andQuestionIdNotBetween(Long value1, Long value2) { - addCriterion("question_id not between", value1, value2, "questionId"); + public Criteria andNumIdNotBetween(Long value1, Long value2) { + addCriterion("num_id not between", value1, value2, "numId"); return (Criteria) this; } @@ -595,66 +595,6 @@ public class EvaluationOptionExample { return (Criteria) this; } - public Criteria andPositonIsNull() { - addCriterion("positon is null"); - return (Criteria) this; - } - - public Criteria andPositonIsNotNull() { - addCriterion("positon is not null"); - return (Criteria) this; - } - - public Criteria andPositonEqualTo(Byte value) { - addCriterion("positon =", value, "positon"); - return (Criteria) this; - } - - public Criteria andPositonNotEqualTo(Byte value) { - addCriterion("positon <>", value, "positon"); - return (Criteria) this; - } - - public Criteria andPositonGreaterThan(Byte value) { - addCriterion("positon >", value, "positon"); - return (Criteria) this; - } - - public Criteria andPositonGreaterThanOrEqualTo(Byte value) { - addCriterion("positon >=", value, "positon"); - return (Criteria) this; - } - - public Criteria andPositonLessThan(Byte value) { - addCriterion("positon <", value, "positon"); - return (Criteria) this; - } - - public Criteria andPositonLessThanOrEqualTo(Byte value) { - addCriterion("positon <=", value, "positon"); - return (Criteria) this; - } - - public Criteria andPositonIn(List values) { - addCriterion("positon in", values, "positon"); - return (Criteria) this; - } - - public Criteria andPositonNotIn(List values) { - addCriterion("positon not in", values, "positon"); - return (Criteria) this; - } - - public Criteria andPositonBetween(Byte value1, Byte value2) { - addCriterion("positon between", value1, value2, "positon"); - return (Criteria) this; - } - - public Criteria andPositonNotBetween(Byte value1, Byte value2) { - addCriterion("positon not between", value1, value2, "positon"); - return (Criteria) this; - } - public Criteria andSortIsNull() { addCriterion("sort is null"); return (Criteria) this; diff --git a/src/main/java/com/ccsens/yanyuan/bean/po/EvaluationQuestion.java b/src/main/java/com/ccsens/yanyuan/bean/po/EvaluationQuestion.java index dcf2a8a..27b183d 100644 --- a/src/main/java/com/ccsens/yanyuan/bean/po/EvaluationQuestion.java +++ b/src/main/java/com/ccsens/yanyuan/bean/po/EvaluationQuestion.java @@ -6,9 +6,7 @@ import java.util.Date; public class EvaluationQuestion implements Serializable { private Long id; - private String code; - - private Integer num; + private Long numId; private String content; @@ -16,7 +14,7 @@ public class EvaluationQuestion implements Serializable { private Byte page; - private Byte positon; + private Byte position; private Integer sort; @@ -40,20 +38,12 @@ public class EvaluationQuestion implements Serializable { this.id = id; } - public String getCode() { - return code; - } - - public void setCode(String code) { - this.code = code == null ? null : code.trim(); - } - - public Integer getNum() { - return num; + public Long getNumId() { + return numId; } - public void setNum(Integer num) { - this.num = num; + public void setNumId(Long numId) { + this.numId = numId; } public String getContent() { @@ -80,12 +70,12 @@ public class EvaluationQuestion implements Serializable { this.page = page; } - public Byte getPositon() { - return positon; + public Byte getPosition() { + return position; } - public void setPositon(Byte positon) { - this.positon = positon; + public void setPosition(Byte position) { + this.position = position; } public Integer getSort() { @@ -143,12 +133,11 @@ public class EvaluationQuestion implements Serializable { sb.append(" ["); sb.append("Hash = ").append(hashCode()); sb.append(", id=").append(id); - sb.append(", code=").append(code); - sb.append(", num=").append(num); + sb.append(", numId=").append(numId); sb.append(", content=").append(content); sb.append(", showType=").append(showType); sb.append(", page=").append(page); - sb.append(", positon=").append(positon); + sb.append(", position=").append(position); sb.append(", sort=").append(sort); sb.append(", remark=").append(remark); sb.append(", operator=").append(operator); diff --git a/src/main/java/com/ccsens/yanyuan/bean/po/EvaluationQuestionExample.java b/src/main/java/com/ccsens/yanyuan/bean/po/EvaluationQuestionExample.java index cabdb7c..794504c 100644 --- a/src/main/java/com/ccsens/yanyuan/bean/po/EvaluationQuestionExample.java +++ b/src/main/java/com/ccsens/yanyuan/bean/po/EvaluationQuestionExample.java @@ -165,133 +165,63 @@ public class EvaluationQuestionExample { return (Criteria) this; } - public Criteria andCodeIsNull() { - addCriterion("code is null"); + public Criteria andNumIdIsNull() { + addCriterion("num_id is null"); return (Criteria) this; } - public Criteria andCodeIsNotNull() { - addCriterion("code is not null"); + public Criteria andNumIdIsNotNull() { + addCriterion("num_id is not null"); return (Criteria) this; } - public Criteria andCodeEqualTo(String value) { - addCriterion("code =", value, "code"); + public Criteria andNumIdEqualTo(Long value) { + addCriterion("num_id =", value, "numId"); return (Criteria) this; } - public Criteria andCodeNotEqualTo(String value) { - addCriterion("code <>", value, "code"); + public Criteria andNumIdNotEqualTo(Long value) { + addCriterion("num_id <>", value, "numId"); return (Criteria) this; } - public Criteria andCodeGreaterThan(String value) { - addCriterion("code >", value, "code"); + public Criteria andNumIdGreaterThan(Long value) { + addCriterion("num_id >", value, "numId"); return (Criteria) this; } - public Criteria andCodeGreaterThanOrEqualTo(String value) { - addCriterion("code >=", value, "code"); + public Criteria andNumIdGreaterThanOrEqualTo(Long value) { + addCriterion("num_id >=", value, "numId"); return (Criteria) this; } - public Criteria andCodeLessThan(String value) { - addCriterion("code <", value, "code"); + public Criteria andNumIdLessThan(Long value) { + addCriterion("num_id <", value, "numId"); return (Criteria) this; } - public Criteria andCodeLessThanOrEqualTo(String value) { - addCriterion("code <=", value, "code"); + public Criteria andNumIdLessThanOrEqualTo(Long value) { + addCriterion("num_id <=", value, "numId"); return (Criteria) this; } - public Criteria andCodeLike(String value) { - addCriterion("code like", value, "code"); + public Criteria andNumIdIn(List values) { + addCriterion("num_id in", values, "numId"); return (Criteria) this; } - public Criteria andCodeNotLike(String value) { - addCriterion("code not like", value, "code"); + public Criteria andNumIdNotIn(List values) { + addCriterion("num_id not in", values, "numId"); return (Criteria) this; } - public Criteria andCodeIn(List values) { - addCriterion("code in", values, "code"); + public Criteria andNumIdBetween(Long value1, Long value2) { + addCriterion("num_id between", value1, value2, "numId"); return (Criteria) this; } - public Criteria andCodeNotIn(List values) { - addCriterion("code not in", values, "code"); - return (Criteria) this; - } - - public Criteria andCodeBetween(String value1, String value2) { - addCriterion("code between", value1, value2, "code"); - return (Criteria) this; - } - - public Criteria andCodeNotBetween(String value1, String value2) { - addCriterion("code not between", value1, value2, "code"); - return (Criteria) this; - } - - public Criteria andNumIsNull() { - addCriterion("num is null"); - return (Criteria) this; - } - - public Criteria andNumIsNotNull() { - addCriterion("num is not null"); - return (Criteria) this; - } - - public Criteria andNumEqualTo(Integer value) { - addCriterion("num =", value, "num"); - return (Criteria) this; - } - - public Criteria andNumNotEqualTo(Integer value) { - addCriterion("num <>", value, "num"); - return (Criteria) this; - } - - public Criteria andNumGreaterThan(Integer value) { - addCriterion("num >", value, "num"); - return (Criteria) this; - } - - public Criteria andNumGreaterThanOrEqualTo(Integer value) { - addCriterion("num >=", value, "num"); - return (Criteria) this; - } - - public Criteria andNumLessThan(Integer value) { - addCriterion("num <", value, "num"); - return (Criteria) this; - } - - public Criteria andNumLessThanOrEqualTo(Integer value) { - addCriterion("num <=", value, "num"); - return (Criteria) this; - } - - public Criteria andNumIn(List values) { - addCriterion("num in", values, "num"); - return (Criteria) this; - } - - public Criteria andNumNotIn(List values) { - addCriterion("num not in", values, "num"); - return (Criteria) this; - } - - public Criteria andNumBetween(Integer value1, Integer value2) { - addCriterion("num between", value1, value2, "num"); - return (Criteria) this; - } - - public Criteria andNumNotBetween(Integer value1, Integer value2) { - addCriterion("num not between", value1, value2, "num"); + public Criteria andNumIdNotBetween(Long value1, Long value2) { + addCriterion("num_id not between", value1, value2, "numId"); return (Criteria) this; } @@ -485,63 +415,63 @@ public class EvaluationQuestionExample { return (Criteria) this; } - public Criteria andPositonIsNull() { - addCriterion("positon is null"); + public Criteria andPositionIsNull() { + addCriterion("position is null"); return (Criteria) this; } - public Criteria andPositonIsNotNull() { - addCriterion("positon is not null"); + public Criteria andPositionIsNotNull() { + addCriterion("position is not null"); return (Criteria) this; } - public Criteria andPositonEqualTo(Byte value) { - addCriterion("positon =", value, "positon"); + public Criteria andPositionEqualTo(Byte value) { + addCriterion("position =", value, "position"); return (Criteria) this; } - public Criteria andPositonNotEqualTo(Byte value) { - addCriterion("positon <>", value, "positon"); + public Criteria andPositionNotEqualTo(Byte value) { + addCriterion("position <>", value, "position"); return (Criteria) this; } - public Criteria andPositonGreaterThan(Byte value) { - addCriterion("positon >", value, "positon"); + public Criteria andPositionGreaterThan(Byte value) { + addCriterion("position >", value, "position"); return (Criteria) this; } - public Criteria andPositonGreaterThanOrEqualTo(Byte value) { - addCriterion("positon >=", value, "positon"); + public Criteria andPositionGreaterThanOrEqualTo(Byte value) { + addCriterion("position >=", value, "position"); return (Criteria) this; } - public Criteria andPositonLessThan(Byte value) { - addCriterion("positon <", value, "positon"); + public Criteria andPositionLessThan(Byte value) { + addCriterion("position <", value, "position"); return (Criteria) this; } - public Criteria andPositonLessThanOrEqualTo(Byte value) { - addCriterion("positon <=", value, "positon"); + public Criteria andPositionLessThanOrEqualTo(Byte value) { + addCriterion("position <=", value, "position"); return (Criteria) this; } - public Criteria andPositonIn(List values) { - addCriterion("positon in", values, "positon"); + public Criteria andPositionIn(List values) { + addCriterion("position in", values, "position"); return (Criteria) this; } - public Criteria andPositonNotIn(List values) { - addCriterion("positon not in", values, "positon"); + public Criteria andPositionNotIn(List values) { + addCriterion("position not in", values, "position"); return (Criteria) this; } - public Criteria andPositonBetween(Byte value1, Byte value2) { - addCriterion("positon between", value1, value2, "positon"); + public Criteria andPositionBetween(Byte value1, Byte value2) { + addCriterion("position between", value1, value2, "position"); return (Criteria) this; } - public Criteria andPositonNotBetween(Byte value1, Byte value2) { - addCriterion("positon not between", value1, value2, "positon"); + public Criteria andPositionNotBetween(Byte value1, Byte value2) { + addCriterion("position not between", value1, value2, "position"); return (Criteria) this; } diff --git a/src/main/java/com/ccsens/yanyuan/bean/po/MentalQuestion.java b/src/main/java/com/ccsens/yanyuan/bean/po/MentalQuestion.java index 84158db..9648a31 100644 --- a/src/main/java/com/ccsens/yanyuan/bean/po/MentalQuestion.java +++ b/src/main/java/com/ccsens/yanyuan/bean/po/MentalQuestion.java @@ -8,7 +8,7 @@ public class MentalQuestion implements Serializable { private Long mentalTestId; - private Long questionId; + private Long numId; private String remark; @@ -38,12 +38,12 @@ public class MentalQuestion implements Serializable { this.mentalTestId = mentalTestId; } - public Long getQuestionId() { - return questionId; + public Long getNumId() { + return numId; } - public void setQuestionId(Long questionId) { - this.questionId = questionId; + public void setNumId(Long numId) { + this.numId = numId; } public String getRemark() { @@ -94,7 +94,7 @@ public class MentalQuestion implements Serializable { sb.append("Hash = ").append(hashCode()); sb.append(", id=").append(id); sb.append(", mentalTestId=").append(mentalTestId); - sb.append(", questionId=").append(questionId); + sb.append(", numId=").append(numId); sb.append(", remark=").append(remark); sb.append(", operator=").append(operator); sb.append(", createdAt=").append(createdAt); diff --git a/src/main/java/com/ccsens/yanyuan/bean/po/MentalQuestionExample.java b/src/main/java/com/ccsens/yanyuan/bean/po/MentalQuestionExample.java index 7c52953..b753b27 100644 --- a/src/main/java/com/ccsens/yanyuan/bean/po/MentalQuestionExample.java +++ b/src/main/java/com/ccsens/yanyuan/bean/po/MentalQuestionExample.java @@ -225,63 +225,63 @@ public class MentalQuestionExample { return (Criteria) this; } - public Criteria andQuestionIdIsNull() { - addCriterion("question_id is null"); + public Criteria andNumIdIsNull() { + addCriterion("num_id is null"); return (Criteria) this; } - public Criteria andQuestionIdIsNotNull() { - addCriterion("question_id is not null"); + public Criteria andNumIdIsNotNull() { + addCriterion("num_id is not null"); return (Criteria) this; } - public Criteria andQuestionIdEqualTo(Long value) { - addCriterion("question_id =", value, "questionId"); + public Criteria andNumIdEqualTo(Long value) { + addCriterion("num_id =", value, "numId"); return (Criteria) this; } - public Criteria andQuestionIdNotEqualTo(Long value) { - addCriterion("question_id <>", value, "questionId"); + public Criteria andNumIdNotEqualTo(Long value) { + addCriterion("num_id <>", value, "numId"); return (Criteria) this; } - public Criteria andQuestionIdGreaterThan(Long value) { - addCriterion("question_id >", value, "questionId"); + public Criteria andNumIdGreaterThan(Long value) { + addCriterion("num_id >", value, "numId"); return (Criteria) this; } - public Criteria andQuestionIdGreaterThanOrEqualTo(Long value) { - addCriterion("question_id >=", value, "questionId"); + public Criteria andNumIdGreaterThanOrEqualTo(Long value) { + addCriterion("num_id >=", value, "numId"); return (Criteria) this; } - public Criteria andQuestionIdLessThan(Long value) { - addCriterion("question_id <", value, "questionId"); + public Criteria andNumIdLessThan(Long value) { + addCriterion("num_id <", value, "numId"); return (Criteria) this; } - public Criteria andQuestionIdLessThanOrEqualTo(Long value) { - addCriterion("question_id <=", value, "questionId"); + public Criteria andNumIdLessThanOrEqualTo(Long value) { + addCriterion("num_id <=", value, "numId"); return (Criteria) this; } - public Criteria andQuestionIdIn(List values) { - addCriterion("question_id in", values, "questionId"); + public Criteria andNumIdIn(List values) { + addCriterion("num_id in", values, "numId"); return (Criteria) this; } - public Criteria andQuestionIdNotIn(List values) { - addCriterion("question_id not in", values, "questionId"); + public Criteria andNumIdNotIn(List values) { + addCriterion("num_id not in", values, "numId"); return (Criteria) this; } - public Criteria andQuestionIdBetween(Long value1, Long value2) { - addCriterion("question_id between", value1, value2, "questionId"); + public Criteria andNumIdBetween(Long value1, Long value2) { + addCriterion("num_id between", value1, value2, "numId"); return (Criteria) this; } - public Criteria andQuestionIdNotBetween(Long value1, Long value2) { - addCriterion("question_id not between", value1, value2, "questionId"); + public Criteria andNumIdNotBetween(Long value1, Long value2) { + addCriterion("num_id not between", value1, value2, "numId"); return (Criteria) this; } diff --git a/src/main/java/com/ccsens/yanyuan/bean/po/MentalRecord.java b/src/main/java/com/ccsens/yanyuan/bean/po/MentalRecord.java index 80365f6..989d0b3 100644 --- a/src/main/java/com/ccsens/yanyuan/bean/po/MentalRecord.java +++ b/src/main/java/com/ccsens/yanyuan/bean/po/MentalRecord.java @@ -8,12 +8,10 @@ public class MentalRecord implements Serializable { private Long testId; - private Long questionId; + private Long numId; private Long optionId; - private String code; - private String remark; private Long operator; @@ -42,12 +40,12 @@ public class MentalRecord implements Serializable { this.testId = testId; } - public Long getQuestionId() { - return questionId; + public Long getNumId() { + return numId; } - public void setQuestionId(Long questionId) { - this.questionId = questionId; + public void setNumId(Long numId) { + this.numId = numId; } public Long getOptionId() { @@ -58,14 +56,6 @@ public class MentalRecord implements Serializable { this.optionId = optionId; } - public String getCode() { - return code; - } - - public void setCode(String code) { - this.code = code == null ? null : code.trim(); - } - public String getRemark() { return remark; } @@ -114,9 +104,8 @@ public class MentalRecord implements Serializable { sb.append("Hash = ").append(hashCode()); sb.append(", id=").append(id); sb.append(", testId=").append(testId); - sb.append(", questionId=").append(questionId); + sb.append(", numId=").append(numId); sb.append(", optionId=").append(optionId); - sb.append(", code=").append(code); sb.append(", remark=").append(remark); sb.append(", operator=").append(operator); sb.append(", createdAt=").append(createdAt); diff --git a/src/main/java/com/ccsens/yanyuan/bean/po/MentalRecordExample.java b/src/main/java/com/ccsens/yanyuan/bean/po/MentalRecordExample.java index bc0dedb..ba4551b 100644 --- a/src/main/java/com/ccsens/yanyuan/bean/po/MentalRecordExample.java +++ b/src/main/java/com/ccsens/yanyuan/bean/po/MentalRecordExample.java @@ -225,63 +225,63 @@ public class MentalRecordExample { return (Criteria) this; } - public Criteria andQuestionIdIsNull() { - addCriterion("question_id is null"); + public Criteria andNumIdIsNull() { + addCriterion("num_id is null"); return (Criteria) this; } - public Criteria andQuestionIdIsNotNull() { - addCriterion("question_id is not null"); + public Criteria andNumIdIsNotNull() { + addCriterion("num_id is not null"); return (Criteria) this; } - public Criteria andQuestionIdEqualTo(Long value) { - addCriterion("question_id =", value, "questionId"); + public Criteria andNumIdEqualTo(Long value) { + addCriterion("num_id =", value, "numId"); return (Criteria) this; } - public Criteria andQuestionIdNotEqualTo(Long value) { - addCriterion("question_id <>", value, "questionId"); + public Criteria andNumIdNotEqualTo(Long value) { + addCriterion("num_id <>", value, "numId"); return (Criteria) this; } - public Criteria andQuestionIdGreaterThan(Long value) { - addCriterion("question_id >", value, "questionId"); + public Criteria andNumIdGreaterThan(Long value) { + addCriterion("num_id >", value, "numId"); return (Criteria) this; } - public Criteria andQuestionIdGreaterThanOrEqualTo(Long value) { - addCriterion("question_id >=", value, "questionId"); + public Criteria andNumIdGreaterThanOrEqualTo(Long value) { + addCriterion("num_id >=", value, "numId"); return (Criteria) this; } - public Criteria andQuestionIdLessThan(Long value) { - addCriterion("question_id <", value, "questionId"); + public Criteria andNumIdLessThan(Long value) { + addCriterion("num_id <", value, "numId"); return (Criteria) this; } - public Criteria andQuestionIdLessThanOrEqualTo(Long value) { - addCriterion("question_id <=", value, "questionId"); + public Criteria andNumIdLessThanOrEqualTo(Long value) { + addCriterion("num_id <=", value, "numId"); return (Criteria) this; } - public Criteria andQuestionIdIn(List values) { - addCriterion("question_id in", values, "questionId"); + public Criteria andNumIdIn(List values) { + addCriterion("num_id in", values, "numId"); return (Criteria) this; } - public Criteria andQuestionIdNotIn(List values) { - addCriterion("question_id not in", values, "questionId"); + public Criteria andNumIdNotIn(List values) { + addCriterion("num_id not in", values, "numId"); return (Criteria) this; } - public Criteria andQuestionIdBetween(Long value1, Long value2) { - addCriterion("question_id between", value1, value2, "questionId"); + public Criteria andNumIdBetween(Long value1, Long value2) { + addCriterion("num_id between", value1, value2, "numId"); return (Criteria) this; } - public Criteria andQuestionIdNotBetween(Long value1, Long value2) { - addCriterion("question_id not between", value1, value2, "questionId"); + public Criteria andNumIdNotBetween(Long value1, Long value2) { + addCriterion("num_id not between", value1, value2, "numId"); return (Criteria) this; } @@ -345,76 +345,6 @@ public class MentalRecordExample { return (Criteria) this; } - public Criteria andCodeIsNull() { - addCriterion("code is null"); - return (Criteria) this; - } - - public Criteria andCodeIsNotNull() { - addCriterion("code is not null"); - return (Criteria) this; - } - - public Criteria andCodeEqualTo(String value) { - addCriterion("code =", value, "code"); - return (Criteria) this; - } - - public Criteria andCodeNotEqualTo(String value) { - addCriterion("code <>", value, "code"); - return (Criteria) this; - } - - public Criteria andCodeGreaterThan(String value) { - addCriterion("code >", value, "code"); - return (Criteria) this; - } - - public Criteria andCodeGreaterThanOrEqualTo(String value) { - addCriterion("code >=", value, "code"); - return (Criteria) this; - } - - public Criteria andCodeLessThan(String value) { - addCriterion("code <", value, "code"); - return (Criteria) this; - } - - public Criteria andCodeLessThanOrEqualTo(String value) { - addCriterion("code <=", value, "code"); - return (Criteria) this; - } - - public Criteria andCodeLike(String value) { - addCriterion("code like", value, "code"); - return (Criteria) this; - } - - public Criteria andCodeNotLike(String value) { - addCriterion("code not like", value, "code"); - return (Criteria) this; - } - - public Criteria andCodeIn(List values) { - addCriterion("code in", values, "code"); - return (Criteria) this; - } - - public Criteria andCodeNotIn(List values) { - addCriterion("code not in", values, "code"); - return (Criteria) this; - } - - public Criteria andCodeBetween(String value1, String value2) { - addCriterion("code between", value1, value2, "code"); - return (Criteria) this; - } - - public Criteria andCodeNotBetween(String value1, String value2) { - addCriterion("code not between", value1, value2, "code"); - return (Criteria) this; - } - public Criteria andRemarkIsNull() { addCriterion("remark is null"); return (Criteria) this; diff --git a/src/main/java/com/ccsens/yanyuan/bean/po/MentalTest.java b/src/main/java/com/ccsens/yanyuan/bean/po/MentalTest.java index 8a0114f..0498d7c 100644 --- a/src/main/java/com/ccsens/yanyuan/bean/po/MentalTest.java +++ b/src/main/java/com/ccsens/yanyuan/bean/po/MentalTest.java @@ -13,7 +13,7 @@ public class MentalTest implements Serializable { private String userId; - private Integer finishStatus; + private Byte finishStatus; private BigDecimal memoryNum; @@ -81,11 +81,11 @@ public class MentalTest implements Serializable { this.userId = userId == null ? null : userId.trim(); } - public Integer getFinishStatus() { + public Byte getFinishStatus() { return finishStatus; } - public void setFinishStatus(Integer finishStatus) { + public void setFinishStatus(Byte finishStatus) { this.finishStatus = finishStatus; } diff --git a/src/main/java/com/ccsens/yanyuan/bean/po/MentalTestExample.java b/src/main/java/com/ccsens/yanyuan/bean/po/MentalTestExample.java index f4e962a..83d2d3f 100644 --- a/src/main/java/com/ccsens/yanyuan/bean/po/MentalTestExample.java +++ b/src/main/java/com/ccsens/yanyuan/bean/po/MentalTestExample.java @@ -376,52 +376,52 @@ public class MentalTestExample { return (Criteria) this; } - public Criteria andFinishStatusEqualTo(Integer value) { + public Criteria andFinishStatusEqualTo(Byte value) { addCriterion("finish_status =", value, "finishStatus"); return (Criteria) this; } - public Criteria andFinishStatusNotEqualTo(Integer value) { + public Criteria andFinishStatusNotEqualTo(Byte value) { addCriterion("finish_status <>", value, "finishStatus"); return (Criteria) this; } - public Criteria andFinishStatusGreaterThan(Integer value) { + public Criteria andFinishStatusGreaterThan(Byte value) { addCriterion("finish_status >", value, "finishStatus"); return (Criteria) this; } - public Criteria andFinishStatusGreaterThanOrEqualTo(Integer value) { + public Criteria andFinishStatusGreaterThanOrEqualTo(Byte value) { addCriterion("finish_status >=", value, "finishStatus"); return (Criteria) this; } - public Criteria andFinishStatusLessThan(Integer value) { + public Criteria andFinishStatusLessThan(Byte value) { addCriterion("finish_status <", value, "finishStatus"); return (Criteria) this; } - public Criteria andFinishStatusLessThanOrEqualTo(Integer value) { + public Criteria andFinishStatusLessThanOrEqualTo(Byte value) { addCriterion("finish_status <=", value, "finishStatus"); return (Criteria) this; } - public Criteria andFinishStatusIn(List values) { + public Criteria andFinishStatusIn(List values) { addCriterion("finish_status in", values, "finishStatus"); return (Criteria) this; } - public Criteria andFinishStatusNotIn(List values) { + public Criteria andFinishStatusNotIn(List values) { addCriterion("finish_status not in", values, "finishStatus"); return (Criteria) this; } - public Criteria andFinishStatusBetween(Integer value1, Integer value2) { + public Criteria andFinishStatusBetween(Byte value1, Byte value2) { addCriterion("finish_status between", value1, value2, "finishStatus"); return (Criteria) this; } - public Criteria andFinishStatusNotBetween(Integer value1, Integer value2) { + public Criteria andFinishStatusNotBetween(Byte value1, Byte value2) { addCriterion("finish_status not between", value1, value2, "finishStatus"); return (Criteria) this; } diff --git a/src/main/java/com/ccsens/yanyuan/bean/po/Tool.java b/src/main/java/com/ccsens/yanyuan/bean/po/Tool.java index abde1b0..d5a9755 100644 --- a/src/main/java/com/ccsens/yanyuan/bean/po/Tool.java +++ b/src/main/java/com/ccsens/yanyuan/bean/po/Tool.java @@ -12,6 +12,10 @@ public class Tool implements Serializable { private String description; + private Byte version; + + private String url; + private Long userId; private Long operator; @@ -56,6 +60,22 @@ public class Tool implements Serializable { this.description = description == null ? null : description.trim(); } + public Byte getVersion() { + return version; + } + + public void setVersion(Byte version) { + this.version = version; + } + + public String getUrl() { + return url; + } + + public void setUrl(String url) { + this.url = url == null ? null : url.trim(); + } + public Long getUserId() { return userId; } @@ -106,6 +126,8 @@ public class Tool implements Serializable { sb.append(", code=").append(code); sb.append(", name=").append(name); sb.append(", description=").append(description); + sb.append(", version=").append(version); + sb.append(", url=").append(url); sb.append(", userId=").append(userId); sb.append(", operator=").append(operator); sb.append(", createdAt=").append(createdAt); diff --git a/src/main/java/com/ccsens/yanyuan/bean/po/ToolExample.java b/src/main/java/com/ccsens/yanyuan/bean/po/ToolExample.java index 0b4fb13..05898c7 100644 --- a/src/main/java/com/ccsens/yanyuan/bean/po/ToolExample.java +++ b/src/main/java/com/ccsens/yanyuan/bean/po/ToolExample.java @@ -375,6 +375,136 @@ public class ToolExample { return (Criteria) this; } + public Criteria andVersionIsNull() { + addCriterion("version is null"); + return (Criteria) this; + } + + public Criteria andVersionIsNotNull() { + addCriterion("version is not null"); + return (Criteria) this; + } + + public Criteria andVersionEqualTo(Byte value) { + addCriterion("version =", value, "version"); + return (Criteria) this; + } + + public Criteria andVersionNotEqualTo(Byte value) { + addCriterion("version <>", value, "version"); + return (Criteria) this; + } + + public Criteria andVersionGreaterThan(Byte value) { + addCriterion("version >", value, "version"); + return (Criteria) this; + } + + public Criteria andVersionGreaterThanOrEqualTo(Byte value) { + addCriterion("version >=", value, "version"); + return (Criteria) this; + } + + public Criteria andVersionLessThan(Byte value) { + addCriterion("version <", value, "version"); + return (Criteria) this; + } + + public Criteria andVersionLessThanOrEqualTo(Byte value) { + addCriterion("version <=", value, "version"); + return (Criteria) this; + } + + public Criteria andVersionIn(List values) { + addCriterion("version in", values, "version"); + return (Criteria) this; + } + + public Criteria andVersionNotIn(List values) { + addCriterion("version not in", values, "version"); + return (Criteria) this; + } + + public Criteria andVersionBetween(Byte value1, Byte value2) { + addCriterion("version between", value1, value2, "version"); + return (Criteria) this; + } + + public Criteria andVersionNotBetween(Byte value1, Byte value2) { + addCriterion("version not between", value1, value2, "version"); + return (Criteria) this; + } + + public Criteria andUrlIsNull() { + addCriterion("url is null"); + return (Criteria) this; + } + + public Criteria andUrlIsNotNull() { + addCriterion("url is not null"); + return (Criteria) this; + } + + public Criteria andUrlEqualTo(String value) { + addCriterion("url =", value, "url"); + return (Criteria) this; + } + + public Criteria andUrlNotEqualTo(String value) { + addCriterion("url <>", value, "url"); + return (Criteria) this; + } + + public Criteria andUrlGreaterThan(String value) { + addCriterion("url >", value, "url"); + return (Criteria) this; + } + + public Criteria andUrlGreaterThanOrEqualTo(String value) { + addCriterion("url >=", value, "url"); + return (Criteria) this; + } + + public Criteria andUrlLessThan(String value) { + addCriterion("url <", value, "url"); + return (Criteria) this; + } + + public Criteria andUrlLessThanOrEqualTo(String value) { + addCriterion("url <=", value, "url"); + return (Criteria) this; + } + + public Criteria andUrlLike(String value) { + addCriterion("url like", value, "url"); + return (Criteria) this; + } + + public Criteria andUrlNotLike(String value) { + addCriterion("url not like", value, "url"); + return (Criteria) this; + } + + public Criteria andUrlIn(List values) { + addCriterion("url in", values, "url"); + return (Criteria) this; + } + + public Criteria andUrlNotIn(List values) { + addCriterion("url not in", values, "url"); + return (Criteria) this; + } + + public Criteria andUrlBetween(String value1, String value2) { + addCriterion("url between", value1, value2, "url"); + return (Criteria) this; + } + + public Criteria andUrlNotBetween(String value1, String value2) { + addCriterion("url not between", value1, value2, "url"); + return (Criteria) this; + } + public Criteria andUserIdIsNull() { addCriterion("user_id is null"); return (Criteria) this; diff --git a/src/main/java/com/ccsens/yanyuan/bean/vo/MentalTestVo.java b/src/main/java/com/ccsens/yanyuan/bean/vo/MentalTestVo.java new file mode 100644 index 0000000..3b912db --- /dev/null +++ b/src/main/java/com/ccsens/yanyuan/bean/vo/MentalTestVo.java @@ -0,0 +1,44 @@ +package com.ccsens.yanyuan.bean.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @description: 脑力测评-响应 + * @author: whj + * @time: 2021/11/10 16:50 + */ +public class MentalTestVo { + + @Data + @ApiModel("脑力测评ID-响应") + public static class Simple{ + @ApiModelProperty("脑力测评ID") + private Long mentalTestId; + @ApiModelProperty("是否为新的脑力测评 0：原有的脑力测评 1：新生成的脑力测评") + private byte newMentalTest; + } + @Data + @ApiModel("脑力测评结果-响应") + public static class Result { + @ApiModelProperty("记忆力") + private BigDecimal memoryNum; + @ApiModelProperty("语言能力") + private BigDecimal expressNum; + @ApiModelProperty("视空间") + private BigDecimal viewNum; + @ApiModelProperty("注意力") + private BigDecimal attentionNum; + @ApiModelProperty("定向力") + private BigDecimal directionNum; + @ApiModelProperty("计算能力") + private BigDecimal countNum; + @ApiModelProperty("逻辑执行") + private BigDecimal logicNum; + @ApiModelProperty("等级") + private Integer gradeResult; + } +} diff --git a/src/main/java/com/ccsens/yanyuan/bean/vo/QuestionVo.java b/src/main/java/com/ccsens/yanyuan/bean/vo/QuestionVo.java new file mode 100644 index 0000000..4ea263d --- /dev/null +++ b/src/main/java/com/ccsens/yanyuan/bean/vo/QuestionVo.java @@ -0,0 +1,83 @@ +package com.ccsens.yanyuan.bean.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @description:试题 + * @author: whj + * @time: 2021/11/11 17:37 + */ +public class QuestionVo { + @Data + @ApiModel("题目综合信息") + public static class QuestionMessage { + @ApiModelProperty("题目ID") + private Long id; + @ApiModelProperty("题号") + private int num; + @ApiModelProperty("题目页码") + private List questions; + @ApiModelProperty("选项") + private List