|
@@ -1,9 +1,11 @@
|
|
package com.qmth.distributed.print.business.bean.result.statistics;
|
|
package com.qmth.distributed.print.business.bean.result.statistics;
|
|
|
|
|
|
|
|
+import com.fasterxml.jackson.annotation.JsonInclude;
|
|
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
|
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
|
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
|
|
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
|
|
import com.qmth.distributed.print.business.enums.CardTypeEnum;
|
|
import com.qmth.distributed.print.business.enums.CardTypeEnum;
|
|
import com.qmth.distributed.print.business.enums.StatisticsStatusEnum;
|
|
import com.qmth.distributed.print.business.enums.StatisticsStatusEnum;
|
|
|
|
+import com.qmth.teachcloud.common.annotation.ExcelProperty;
|
|
import io.swagger.annotations.ApiModelProperty;
|
|
import io.swagger.annotations.ApiModelProperty;
|
|
|
|
|
|
import java.io.Serializable;
|
|
import java.io.Serializable;
|
|
@@ -16,6 +18,7 @@ import java.util.Objects;
|
|
* @Author: wangliang
|
|
* @Author: wangliang
|
|
* @Date: 2024/7/10
|
|
* @Date: 2024/7/10
|
|
*/
|
|
*/
|
|
|
|
+@JsonInclude(JsonInclude.Include.NON_NULL)
|
|
public class StatementResult implements Serializable {
|
|
public class StatementResult implements Serializable {
|
|
|
|
|
|
@ApiModelProperty(value = "主键")
|
|
@ApiModelProperty(value = "主键")
|
|
@@ -23,9 +26,11 @@ public class StatementResult implements Serializable {
|
|
private Long id;
|
|
private Long id;
|
|
|
|
|
|
@ApiModelProperty(value = "课程名称(代码)")
|
|
@ApiModelProperty(value = "课程名称(代码)")
|
|
|
|
+ @ExcelProperty(name = "课程(代码)", width = 20, index = 1)
|
|
private String courseNameCode;
|
|
private String courseNameCode;
|
|
|
|
|
|
@ApiModelProperty(value = "试卷编号")
|
|
@ApiModelProperty(value = "试卷编号")
|
|
|
|
+ @ExcelProperty(name = "试卷编号", width = 20, index = 2)
|
|
private String paperNumber;
|
|
private String paperNumber;
|
|
|
|
|
|
@ApiModelProperty(value = "题卡id")
|
|
@ApiModelProperty(value = "题卡id")
|
|
@@ -33,41 +38,64 @@ public class StatementResult implements Serializable {
|
|
private Long cardId;
|
|
private Long cardId;
|
|
|
|
|
|
@ApiModelProperty(value = "开课学院")
|
|
@ApiModelProperty(value = "开课学院")
|
|
|
|
+ @ExcelProperty(name = "开课学院", width = 20, index = 4)
|
|
private String college;
|
|
private String college;
|
|
|
|
|
|
@ApiModelProperty(value = "总考场数")
|
|
@ApiModelProperty(value = "总考场数")
|
|
private Integer totalExamination;
|
|
private Integer totalExamination;
|
|
|
|
|
|
@ApiModelProperty(value = "已生成")
|
|
@ApiModelProperty(value = "已生成")
|
|
- private Integer generate;
|
|
|
|
|
|
+ private int generate;
|
|
|
|
|
|
@ApiModelProperty(value = "未生成")
|
|
@ApiModelProperty(value = "未生成")
|
|
- private Integer unGenerated;
|
|
|
|
|
|
+ private int unGenerated;
|
|
|
|
|
|
@ApiModelProperty(value = "已印刷")
|
|
@ApiModelProperty(value = "已印刷")
|
|
- private Integer printed;
|
|
|
|
|
|
+ private int printed;
|
|
|
|
|
|
@ApiModelProperty(value = "未印刷")
|
|
@ApiModelProperty(value = "未印刷")
|
|
- private Integer unPrinted;
|
|
|
|
|
|
+ private int unPrinted;
|
|
|
|
|
|
@ApiModelProperty(value = "已作废")
|
|
@ApiModelProperty(value = "已作废")
|
|
- private Integer invalid;
|
|
|
|
|
|
+ private int invalid;
|
|
|
|
|
|
@ApiModelProperty(value = "已打回")
|
|
@ApiModelProperty(value = "已打回")
|
|
- private Integer reject;
|
|
|
|
|
|
+ private int reject;
|
|
|
|
|
|
@ApiModelProperty(value = "题卡类型")
|
|
@ApiModelProperty(value = "题卡类型")
|
|
private CardTypeEnum cardType;
|
|
private CardTypeEnum cardType;
|
|
|
|
|
|
@ApiModelProperty(value = "题卡类型str")
|
|
@ApiModelProperty(value = "题卡类型str")
|
|
|
|
+ @ExcelProperty(name = "题卡类型", width = 20, index = 3)
|
|
private String cardTypeStr;
|
|
private String cardTypeStr;
|
|
|
|
|
|
@ApiModelProperty(value = "状态,FINISH:已完成,UN_FINISH:未完成")
|
|
@ApiModelProperty(value = "状态,FINISH:已完成,UN_FINISH:未完成")
|
|
private StatisticsStatusEnum finishStatus;
|
|
private StatisticsStatusEnum finishStatus;
|
|
|
|
|
|
- @ApiModelProperty(value = "题卡类型str")
|
|
|
|
|
|
+ @ApiModelProperty(value = "状态str")
|
|
|
|
+ @ExcelProperty(name = "状态", width = 20, index = 8)
|
|
private String finishStatusStr;
|
|
private String finishStatusStr;
|
|
|
|
|
|
|
|
+ @ApiModelProperty(value = "已生成/未生成")
|
|
|
|
+ @ExcelProperty(name = "已生成/未生成", width = 40, index = 5)
|
|
|
|
+ private String generateStr;
|
|
|
|
+
|
|
|
|
+ @ApiModelProperty(value = "已印刷/未印刷")
|
|
|
|
+ @ExcelProperty(name = "已印刷/未印刷", width = 40, index = 6)
|
|
|
|
+ private String printedStr;
|
|
|
|
+
|
|
|
|
+ @ApiModelProperty(value = "已打回/已作废")
|
|
|
|
+ @ExcelProperty(name = "已印刷/未印刷", width = 40, index = 7)
|
|
|
|
+ private String rejectStr;
|
|
|
|
+
|
|
|
|
+ public String getGenerateStr() {
|
|
|
|
+ return generate + "/" + unGenerated;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public void setGenerateStr(String generateStr) {
|
|
|
|
+ this.generateStr = generateStr;
|
|
|
|
+ }
|
|
|
|
+
|
|
public Long getId() {
|
|
public Long getId() {
|
|
return id;
|
|
return id;
|
|
}
|
|
}
|
|
@@ -116,54 +144,70 @@ public class StatementResult implements Serializable {
|
|
this.totalExamination = totalExamination;
|
|
this.totalExamination = totalExamination;
|
|
}
|
|
}
|
|
|
|
|
|
- public Integer getGenerate() {
|
|
|
|
|
|
+ public int getGenerate() {
|
|
return generate;
|
|
return generate;
|
|
}
|
|
}
|
|
|
|
|
|
- public void setGenerate(Integer generate) {
|
|
|
|
|
|
+ public void setGenerate(int generate) {
|
|
this.generate = generate;
|
|
this.generate = generate;
|
|
}
|
|
}
|
|
|
|
|
|
- public Integer getUnGenerated() {
|
|
|
|
|
|
+ public int getUnGenerated() {
|
|
return unGenerated;
|
|
return unGenerated;
|
|
}
|
|
}
|
|
|
|
|
|
- public void setUnGenerated(Integer unGenerated) {
|
|
|
|
|
|
+ public void setUnGenerated(int unGenerated) {
|
|
this.unGenerated = unGenerated;
|
|
this.unGenerated = unGenerated;
|
|
}
|
|
}
|
|
|
|
|
|
- public Integer getPrinted() {
|
|
|
|
|
|
+ public int getPrinted() {
|
|
return printed;
|
|
return printed;
|
|
}
|
|
}
|
|
|
|
|
|
- public void setPrinted(Integer printed) {
|
|
|
|
|
|
+ public void setPrinted(int printed) {
|
|
this.printed = printed;
|
|
this.printed = printed;
|
|
}
|
|
}
|
|
|
|
|
|
- public Integer getUnPrinted() {
|
|
|
|
|
|
+ public int getUnPrinted() {
|
|
return unPrinted;
|
|
return unPrinted;
|
|
}
|
|
}
|
|
|
|
|
|
- public void setUnPrinted(Integer unPrinted) {
|
|
|
|
|
|
+ public void setUnPrinted(int unPrinted) {
|
|
this.unPrinted = unPrinted;
|
|
this.unPrinted = unPrinted;
|
|
}
|
|
}
|
|
|
|
|
|
- public Integer getInvalid() {
|
|
|
|
|
|
+ public int getInvalid() {
|
|
return invalid;
|
|
return invalid;
|
|
}
|
|
}
|
|
|
|
|
|
- public void setInvalid(Integer invalid) {
|
|
|
|
|
|
+ public void setInvalid(int invalid) {
|
|
this.invalid = invalid;
|
|
this.invalid = invalid;
|
|
}
|
|
}
|
|
|
|
|
|
- public Integer getReject() {
|
|
|
|
|
|
+ public int getReject() {
|
|
return reject;
|
|
return reject;
|
|
}
|
|
}
|
|
|
|
|
|
- public void setReject(Integer reject) {
|
|
|
|
|
|
+ public void setReject(int reject) {
|
|
this.reject = reject;
|
|
this.reject = reject;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ public String getPrintedStr() {
|
|
|
|
+ return printed + "/" + unPrinted;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public void setPrintedStr(String printedStr) {
|
|
|
|
+ this.printedStr = printedStr;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public String getRejectStr() {
|
|
|
|
+ return invalid + "/" + reject;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public void setRejectStr(String rejectStr) {
|
|
|
|
+ this.rejectStr = rejectStr;
|
|
|
|
+ }
|
|
|
|
+
|
|
public CardTypeEnum getCardType() {
|
|
public CardTypeEnum getCardType() {
|
|
return cardType;
|
|
return cardType;
|
|
}
|
|
}
|