joylink/rt-sim-training-service
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 10 Wiki Activity

paper

Browse Source
This commit is contained in:
xzb 2022-10-09 13:34:28 +08:00
parent df77cfcc24
commit 7c9e57cd16
10 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/club/joylink/rtss/controller/paper/PaperApiTestController.java
View File

@ -59,7 +59,7 @@ public class PaperApiTestController {
rt.setScore(2);
rt.setType(PaperQType.GroupType.Common);
rt.setSubtype(PaperQType.SubType.Select);
rt.setSum(10);
rt.setAmount(10);
List<String> tags = new ArrayList<>();
tags.add("6");
tags.add("8");
@ -73,7 +73,7 @@ public class PaperApiTestController {
rt.setScore(2);
rt.setType(PaperQType.GroupType.Common);
rt.setSubtype(PaperQType.SubType.Select);
rt.setSum(10);
rt.setAmount(10);
List<String> tags = new ArrayList<>();
tags.add("6");
tags.add("8");

2
src/main/java/club/joylink/rtss/vo/paper/CreatePaperRuleReqVo.java
View File

@ -36,7 +36,7 @@ public class CreatePaperRuleReqVo {
* 该类型题目数量
*/
@NotNull
private Integer sum;
private Integer amount;
/**
* 每题分值

3
src/main/java/club/joylink/rtss/vo/paper/PaperCompositionVo.java
View File

@ -30,7 +30,8 @@ public class PaperCompositionVo {
/**
* 组织id
*/
private String companyId;
@JsonSerialize(using = ToStringSerializer.class)
private Long orgId;
/**
* 启用起始时间

2
src/main/java/club/joylink/rtss/vo/paper/PaperRuleVo.java
View File

@ -42,7 +42,7 @@ public class PaperRuleVo {
* 该类型题目数量
*/
@NotNull
private Integer sum;
private Integer amount;
/**
* 每题分值

3
src/main/java/club/joylink/rtss/vo/paper/PaperUserQuestionVo.java
View File

@ -28,7 +28,8 @@ public class PaperUserQuestionVo {
/**
* 组织id
*/
private String companyId;
@JsonSerialize(using = ToStringSerializer.class)
private Long orgId;
/**
* 试题类型：1-理论题，2-实训题

3
src/main/java/club/joylink/rtss/vo/paper/PaperUserVo.java
View File

@ -36,7 +36,8 @@ public class PaperUserVo {
/**
* 组织id
*/
private String companyId;
@JsonSerialize(using = ToStringSerializer.class)
private Long orgId;
/**
* 用户最终得分

2
src/main/java/club/joylink/rtss/vo/paper/convertor/PaperCompositionConvertor.java
View File

@ -14,7 +14,7 @@ public class PaperCompositionConvertor {
to.setId(from.getId());
to.setName(from.getName());
to.setProfile(from.getProfile());
to.setCompanyId(from.getCompanyId());
to.setOrgId(from.getOrgId());
to.setStartTime(from.getStartTime());
to.setEndTime(from.getEndTime());
to.setValidDuration(from.getValidDuration());

6
src/main/java/club/joylink/rtss/vo/paper/convertor/PaperRuleConvertor.java
View File

@ -19,7 +19,7 @@ public class PaperRuleConvertor {
to.setSubtype(PaperQType.SubType.getItem(from.getSubtype()));
to.setTags(JsonUtils.readCollection(from.getTags(),ArrayList.class,String.class));
to.setScore(from.getScore());
to.setSum(from.getSum());
to.setAmount(from.getAmount());
return to;
}
@ -35,7 +35,7 @@ public class PaperRuleConvertor {
to.setTags(JsonUtils.writeValueAsString(new ArrayList<String>()));
}
to.setScore(from.getScore());
to.setSum(from.getSum());
to.setAmount(from.getAmount());
return to;
}
@ -50,7 +50,7 @@ public class PaperRuleConvertor {
to.setTags(JsonUtils.writeValueAsString(new ArrayList<String>()));
}
to.setScore(from.getScore());
to.setSum(from.getSum());
to.setAmount(from.getAmount());
return to;
}
}

2
src/main/java/club/joylink/rtss/vo/paper/convertor/PaperUserConvertor.java
View File

@ -10,7 +10,7 @@ public class PaperUserConvertor {
to.setId(from.getId());
to.setUserId(from.getUserId());
to.setPcId(from.getPcId());
to.setCompanyId(from.getCompanyId());
to.setOrgId(from.getOrgId());
to.setScore(from.getScore());
to.setStartTime(from.getStartTime());
to.setEndTime(from.getEndTime());

2
src/main/java/club/joylink/rtss/vo/paper/convertor/PaperUserQuestionConvertor.java
View File

@ -10,7 +10,7 @@ public class PaperUserQuestionConvertor {
PaperUserQuestionVo to = new PaperUserQuestionVo();
to.setId(from.getId());
to.setPuId(from.getPuId());
to.setCompanyId(from.getCompanyId());
to.setOrgId(from.getOrgId());
to.setType(PaperQType.GroupType.getItem(from.getType()));
to.setQuestionId(from.getQuestionId());
to.setState(PaperQuestionState.getItem(from.getState()));