diff --git a/src/main/java/com/zhgd/xmgl/modules/taskprogress/entity/TaskProgress.java b/src/main/java/com/zhgd/xmgl/modules/taskprogress/entity/TaskProgress.java index 5a42ac324..89f845547 100644 --- a/src/main/java/com/zhgd/xmgl/modules/taskprogress/entity/TaskProgress.java +++ b/src/main/java/com/zhgd/xmgl/modules/taskprogress/entity/TaskProgress.java @@ -177,6 +177,7 @@ public class TaskProgress implements Serializable { @TableField(exist = false) @ApiModelProperty(value = "合并预警:1提前2正常3逾期【优先级:逾期>提前>正常】") private java.lang.Integer mergeWarning; - + @ApiModelProperty(value = "任务级别") + private Integer level; } diff --git a/src/main/java/com/zhgd/xmgl/modules/taskprogress/mapper/xml/TaskProgressMapper.xml b/src/main/java/com/zhgd/xmgl/modules/taskprogress/mapper/xml/TaskProgressMapper.xml index 2b84ad705..ecfefdd69 100644 --- a/src/main/java/com/zhgd/xmgl/modules/taskprogress/mapper/xml/TaskProgressMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/taskprogress/mapper/xml/TaskProgressMapper.xml @@ -95,6 +95,7 @@ begin_warning = #{beginWarning,jdbcType=INTEGER}, + level = #{level,jdbcType=INTEGER} where project_sn = #{projectSn} and task_name = #{taskName} @@ -115,6 +116,7 @@ begin_warning = #{beginWarning}, end_warning = #{endWarning}, status = #{status}, + level = #{level,jdbcType=INTEGER}, where id = #{id} diff --git a/src/main/java/com/zhgd/xmgl/modules/taskprogress/service/impl/TaskProgressServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/taskprogress/service/impl/TaskProgressServiceImpl.java index c2b9ae4f4..d3b6cd438 100644 --- a/src/main/java/com/zhgd/xmgl/modules/taskprogress/service/impl/TaskProgressServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/taskprogress/service/impl/TaskProgressServiceImpl.java @@ -115,6 +115,7 @@ public class TaskProgressServiceImpl extends ServiceImpl 0) { @@ -327,6 +332,8 @@ public class TaskProgressServiceImpl extends ServiceImpl