diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalInternalReviewExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalInternalReviewExecutor.java index 8703c51..038084b 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalInternalReviewExecutor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalInternalReviewExecutor.java @@ -39,6 +39,7 @@ import org.qinan.safetyeval.infrastructure.mapper.EvalInternalReviewMapper; import org.qinan.safetyeval.infrastructure.mapper.EvalProjectMemberMapper; import org.qinan.safetyeval.infrastructure.mapper.EvalSignTaskMapper; import org.qinan.safetyeval.infrastructure.persistence.queryservice.EvalReviewItemQueryService; +import org.qinan.safetyeval.infrastructure.support.InsertFieldDefaults; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -198,6 +199,7 @@ public class EvalInternalReviewExecutor implements EvalInternalReviewApi { update.setId(existTask.getId()); update.setSignerPersonnelId(person.getSignerPersonnelId()); update.setTaskStatusCode(1); + InsertFieldDefaults.applyForUpdate(update); evalSignTaskMapper.updateById(update); } else { EvalSignTaskDO task = new EvalSignTaskDO(); @@ -208,6 +210,7 @@ public class EvalInternalReviewExecutor implements EvalInternalReviewApi { task.setSignerPersonnelId(person.getSignerPersonnelId()); task.setTaskTitle(stage.getMsg() + "签字任务"); task.setTaskStatusCode(1); + InsertFieldDefaults.apply(task); evalSignTaskMapper.insert(task); } } diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalProcessControlExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalProcessControlExecutor.java index 5412b63..812c6b7 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalProcessControlExecutor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalProcessControlExecutor.java @@ -221,6 +221,7 @@ public class EvalProcessControlExecutor implements EvalProcessControlApi { update.setId(existTask.getId()); update.setSignerPersonnelId(person.getSignerPersonnelId()); update.setTaskStatusCode(1); + InsertFieldDefaults.applyForUpdate(update); evalSignTaskMapper.updateById(update); } else { EvalSignTaskDO task = new EvalSignTaskDO(); @@ -231,6 +232,7 @@ public class EvalProcessControlExecutor implements EvalProcessControlApi { task.setSignerPersonnelId(person.getSignerPersonnelId()); task.setTaskTitle(stage.getMsg() + "签字任务"); task.setTaskStatusCode(1); + InsertFieldDefaults.apply(task); evalSignTaskMapper.insert(task); } } diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalTechReviewExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalTechReviewExecutor.java index 1d3d85b..1d58c24 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalTechReviewExecutor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalTechReviewExecutor.java @@ -36,6 +36,7 @@ import org.qinan.safetyeval.infrastructure.mapper.EvalProjectMemberMapper; import org.qinan.safetyeval.infrastructure.mapper.EvalSignTaskMapper; import org.qinan.safetyeval.infrastructure.mapper.EvalTechReviewMapper; import org.qinan.safetyeval.infrastructure.persistence.queryservice.EvalReviewItemQueryService; +import org.qinan.safetyeval.infrastructure.support.InsertFieldDefaults; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -201,6 +202,7 @@ public class EvalTechReviewExecutor implements EvalTechReviewApi { update.setId(existTask.getId()); update.setSignerPersonnelId(person.getSignerPersonnelId()); update.setTaskStatusCode(1); + InsertFieldDefaults.applyForUpdate(update); evalSignTaskMapper.updateById(update); } else { EvalSignTaskDO task = new EvalSignTaskDO(); @@ -211,6 +213,7 @@ public class EvalTechReviewExecutor implements EvalTechReviewApi { task.setSignerPersonnelId(person.getSignerPersonnelId()); task.setTaskTitle(stage.getMsg() + "签字任务"); task.setTaskStatusCode(1); + InsertFieldDefaults.apply(task); evalSignTaskMapper.insert(task); } } diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/EvalSignTaskDO.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/EvalSignTaskDO.java index 5725ba2..36f55f1 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/EvalSignTaskDO.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/EvalSignTaskDO.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.infrastructure.dataobject; +import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -19,7 +20,12 @@ public class EvalSignTaskDO { private Integer taskStatusCode; private LocalDateTime issueTime; private String signerUrl; - private String deleteEnum; + @TableLogic( + value = "false", + delval = "true" + ) + protected String deleteEnum; + private String remarks; private String createName; private String updateName;