diff --git a/inventory-dao/src/main/java/com/rzyc/bean/user/dto/ChangePerformDto.java b/inventory-dao/src/main/java/com/rzyc/bean/user/dto/ChangePerformDto.java index b6bcc24..c27b155 100644 --- a/inventory-dao/src/main/java/com/rzyc/bean/user/dto/ChangePerformDto.java +++ b/inventory-dao/src/main/java/com/rzyc/bean/user/dto/ChangePerformDto.java @@ -39,6 +39,17 @@ public class ChangePerformDto { @ApiModelProperty("地区id") private String areaCode; + @ApiModelProperty("党政同责考核类型 1、直属部门 2、其他有关部门 3、属地 4、不考核") + private Integer examineState; + + public Integer getExamineState() { + return examineState; + } + + public void setExamineState(Integer examineState) { + this.examineState = examineState; + } + public String getAreaCode() { return areaCode; } diff --git a/inventory-dao/src/main/java/com/rzyc/enums/ExamineState.java b/inventory-dao/src/main/java/com/rzyc/enums/ExamineState.java index b9e9145..57c61f4 100644 --- a/inventory-dao/src/main/java/com/rzyc/enums/ExamineState.java +++ b/inventory-dao/src/main/java/com/rzyc/enums/ExamineState.java @@ -8,10 +8,15 @@ package com.rzyc.enums; */ public enum ExamineState { + //审核中 AUDITING(1), + //已发布 RELEASE(2), + //上传资料 UPLOAD(3), + //评分中 SCOREING(4), + //评分完成 COMPLETE(5); private Integer state; diff --git a/inventory-dao/src/main/java/com/rzyc/enums/ExamineStatus.java b/inventory-dao/src/main/java/com/rzyc/enums/ExamineStatus.java new file mode 100644 index 0000000..e91ecd5 --- /dev/null +++ b/inventory-dao/src/main/java/com/rzyc/enums/ExamineStatus.java @@ -0,0 +1,35 @@ +package com.rzyc.enums; + +import io.swagger.annotations.ApiModel; + +/** + * 党政同责考核类型 1、直属部门 2、其他有关部门 3、属地 4、不考核 + * @version v1.0 + * @author dong + * @date 2024/4/7 14:59 + */ +public enum ExamineStatus { + + //负有安全生产监管职责的部门 + SAFE_UNIT(1), + //其他有关部门 + OTHER_UNIT(2), + //属地 + AREA(3), + //不考核 + NOT_EXAMINE(4); + + private Integer state; + + ExamineStatus(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/user/ListPerform.java b/inventory-dao/src/main/java/com/rzyc/model/user/ListPerform.java index 28a4884..81a08cc 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/user/ListPerform.java +++ b/inventory-dao/src/main/java/com/rzyc/model/user/ListPerform.java @@ -128,7 +128,7 @@ public class ListPerform implements Serializable { @TableField("position_type") private Integer positionType; - @ApiModelProperty("党政同责考核类型 1、负有安全生产监管职责的部门 2、其他有关部门 3、属地") + @ApiModelProperty("党政同责考核类型 1、直属部门 2、其他有关部门 3、属地 4、不考核") @TableField("examine_state") private Integer examineState; diff --git a/inventory-dao/src/main/resources/mapper/user/ListPerformMapper.xml b/inventory-dao/src/main/resources/mapper/user/ListPerformMapper.xml index 5670b10..8d997df 100644 --- a/inventory-dao/src/main/resources/mapper/user/ListPerformMapper.xml +++ b/inventory-dao/src/main/resources/mapper/user/ListPerformMapper.xml @@ -163,6 +163,7 @@ area_path, area_path_name, position_type, + examine_state, SupClassCode, viewJurisdiction,SupClassName, CreatedOn, CreatedBy, ModifiedOn, @@ -178,6 +179,7 @@ #{areaPath,jdbcType=VARCHAR}, #{areaPathName,jdbcType=VARCHAR}, #{positionType,jdbcType=INTEGER}, + #{examineState,jdbcType=INTEGER}, #{supclasscode,jdbcType=VARCHAR}, #{viewJurisdiction,jdbcType=VARCHAR}, #{supclassname,jdbcType=VARCHAR}, @@ -627,6 +629,7 @@ + @@ -673,6 +676,7 @@ area_path = #{record.areaPath,jdbcType=VARCHAR}, position_type = #{record.positionType,jdbcType=INTEGER}, area_path_name = #{record.areaPathName,jdbcType=VARCHAR}, + examine_state = #{record.examineState,jdbcType=INTEGER}, SupClassCode = #{record.supclasscode,jdbcType=VARCHAR}, viewJurisdiction = #{record.viewJurisdiction,jdbcType=VARCHAR}, WorkDivision = #{record.workdivision,jdbcType=VARCHAR},