admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug修复

Browse Source
This commit is contained in:
guo 2023-11-13 10:03:57 +08:00
parent 93be1cc35c
commit a08501c5bd
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/zhgd/xmgl/modules/taskprogress/entity/TaskProgress.java
View File

@ -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;
}

2
src/main/java/com/zhgd/xmgl/modules/taskprogress/mapper/xml/TaskProgressMapper.xml
View File

@ -95,6 +95,7 @@
<if test="beginWarning != null">
begin_warning = #{beginWarning,jdbcType=INTEGER},
</if>
level = #{level,jdbcType=INTEGER}
</set>
where project_sn = #{projectSn}
and task_name = #{taskName}
@ -115,6 +116,7 @@
begin_warning = #{beginWarning},
end_warning = #{endWarning},
status = #{status},
level = #{level,jdbcType=INTEGER},
</set>
where id = #{id}
</update>

7
src/main/java/com/zhgd/xmgl/modules/taskprogress/service/impl/TaskProgressServiceImpl.java
View File

@ -115,6 +115,7 @@ public class TaskProgressServiceImpl extends ServiceImpl<TaskProgressMapper, Tas
.eq(TaskProgress::getId, taskProgress.getParentId()));
taskProgress.setPredecessorIds(tp.getPredecessorIds() + "," + taskProgress.getParentId());
}
setStatusRel(taskProgress);
save(taskProgress);
addWarning(taskProgress);
@ -126,6 +127,10 @@ public class TaskProgressServiceImpl extends ServiceImpl<TaskProgressMapper, Tas
* @param taskProgress
*/
private void setStatusRel(TaskProgress taskProgress) {
if (Objects.equals(taskProgress.getParentId(), 0L)) {
taskProgress.setLevel(1);
}
if (taskProgress.getActualStartDate() != null && taskProgress.getStartDate().compareTo(taskProgress.getActualStartDate()) < 0) {
taskProgress.setBeginWarning(3);
} else if (taskProgress.getActualStartDate() != null && taskProgress.getStartDate().compareTo(taskProgress.getActualStartDate()) > 0) {
@ -327,6 +332,8 @@ public class TaskProgressServiceImpl extends ServiceImpl<TaskProgressMapper, Tas
progressTask.setDuration(task.getDuration().getDuration());
// 父节点id
progressTask.setParentId(parentId);
// 当前深度
progressTask.setLevel(task.getOutlineLevel());
// 进度比例
double progressRatio = task.getPercentageComplete().doubleValue();
progressTask.setProgressRatio(progressRatio);