diff --git a/inventory-dao/src/main/java/com/rzyc/bean/ex/vo/StandardInfo.java b/inventory-dao/src/main/java/com/rzyc/bean/ex/vo/StandardInfo.java index 330b9d4..23f228f 100644 --- a/inventory-dao/src/main/java/com/rzyc/bean/ex/vo/StandardInfo.java +++ b/inventory-dao/src/main/java/com/rzyc/bean/ex/vo/StandardInfo.java @@ -78,9 +78,20 @@ public class StandardInfo { @ApiModelProperty("意见建议") private String opinion; + @ApiModelProperty("评分状态 1、已评分 2、未评分") + private Integer socreState; + @ApiModelProperty("附件") private List scoreFiles; + public Integer getSocreState() { + return socreState; + } + + public void setSocreState(Integer socreState) { + this.socreState = socreState; + } + public List getScoreFiles() { return scoreFiles; } diff --git a/inventory-dao/src/main/java/com/rzyc/enums/ScoreState.java b/inventory-dao/src/main/java/com/rzyc/enums/ScoreState.java new file mode 100644 index 0000000..c0deab1 --- /dev/null +++ b/inventory-dao/src/main/java/com/rzyc/enums/ScoreState.java @@ -0,0 +1,29 @@ +package com.rzyc.enums; + +/** + * 评分状态 1、已评分 2、未评分 + * @version v1.0 + * @author dong + * @date 2024/4/8 9:07 + */ +public enum ScoreState { + + //已评分 + SCOREED(1), + //未评分 + NOT_SCORE(2); + + private Integer state; + + ScoreState(Integer state) { + this.state = state; + } + + public Integer getState() { + return state; + } + + public void setState(Integer state) { + this.state = state; + } +} diff --git a/inventory-dao/src/main/java/com/rzyc/model/ex/ExScore.java b/inventory-dao/src/main/java/com/rzyc/model/ex/ExScore.java index bec97a0..0ab57b2 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/ex/ExScore.java +++ b/inventory-dao/src/main/java/com/rzyc/model/ex/ExScore.java @@ -50,6 +50,10 @@ public class ExScore implements Serializable { @TableField("user_id") private String userId; + @ApiModelProperty(value = "评分状态 1、已评分 2、未评分") + @TableField("socre_state") + private Integer socreState; + @ApiModelProperty(value = "创建时间") @TableField("create_time") private Date createTime; @@ -66,6 +70,14 @@ public class ExScore implements Serializable { @TableField("modify_by") private String modifyBy; + public Integer getSocreState() { + return socreState; + } + + public void setSocreState(Integer socreState) { + this.socreState = socreState; + } + public String getSocreId() { return socreId; } diff --git a/inventory-dao/src/main/resources/mapper/ex/ExScoreMapper.xml b/inventory-dao/src/main/resources/mapper/ex/ExScoreMapper.xml index e2b6bf1..03cba9d 100644 --- a/inventory-dao/src/main/resources/mapper/ex/ExScoreMapper.xml +++ b/inventory-dao/src/main/resources/mapper/ex/ExScoreMapper.xml @@ -11,6 +11,7 @@ + @@ -19,7 +20,8 @@ - socre_id, examine_id, standard_id, perform_id, socre_num, opinion, user_id, create_time, create_by, modify_time, modify_by + socre_id, examine_id, standard_id, perform_id, socre_num, + opinion, user_id, socre_state,create_time, create_by, modify_time, modify_by diff --git a/inventory-dao/src/main/resources/mapper/ex/ExStandardMapper.xml b/inventory-dao/src/main/resources/mapper/ex/ExStandardMapper.xml index de3f607..0db2291 100644 --- a/inventory-dao/src/main/resources/mapper/ex/ExStandardMapper.xml +++ b/inventory-dao/src/main/resources/mapper/ex/ExStandardMapper.xml @@ -90,6 +90,7 @@ + @@ -101,7 +102,7 @@