dev
parent
fd242d0693
commit
8022a8e04a
|
|
@ -39,6 +39,7 @@ import org.qinan.safetyeval.infrastructure.mapper.EvalInternalReviewMapper;
|
||||||
import org.qinan.safetyeval.infrastructure.mapper.EvalProjectMemberMapper;
|
import org.qinan.safetyeval.infrastructure.mapper.EvalProjectMemberMapper;
|
||||||
import org.qinan.safetyeval.infrastructure.mapper.EvalSignTaskMapper;
|
import org.qinan.safetyeval.infrastructure.mapper.EvalSignTaskMapper;
|
||||||
import org.qinan.safetyeval.infrastructure.persistence.queryservice.EvalReviewItemQueryService;
|
import org.qinan.safetyeval.infrastructure.persistence.queryservice.EvalReviewItemQueryService;
|
||||||
|
import org.qinan.safetyeval.infrastructure.support.InsertFieldDefaults;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
|
|
@ -198,6 +199,7 @@ public class EvalInternalReviewExecutor implements EvalInternalReviewApi {
|
||||||
update.setId(existTask.getId());
|
update.setId(existTask.getId());
|
||||||
update.setSignerPersonnelId(person.getSignerPersonnelId());
|
update.setSignerPersonnelId(person.getSignerPersonnelId());
|
||||||
update.setTaskStatusCode(1);
|
update.setTaskStatusCode(1);
|
||||||
|
InsertFieldDefaults.applyForUpdate(update);
|
||||||
evalSignTaskMapper.updateById(update);
|
evalSignTaskMapper.updateById(update);
|
||||||
} else {
|
} else {
|
||||||
EvalSignTaskDO task = new EvalSignTaskDO();
|
EvalSignTaskDO task = new EvalSignTaskDO();
|
||||||
|
|
@ -208,6 +210,7 @@ public class EvalInternalReviewExecutor implements EvalInternalReviewApi {
|
||||||
task.setSignerPersonnelId(person.getSignerPersonnelId());
|
task.setSignerPersonnelId(person.getSignerPersonnelId());
|
||||||
task.setTaskTitle(stage.getMsg() + "签字任务");
|
task.setTaskTitle(stage.getMsg() + "签字任务");
|
||||||
task.setTaskStatusCode(1);
|
task.setTaskStatusCode(1);
|
||||||
|
InsertFieldDefaults.apply(task);
|
||||||
evalSignTaskMapper.insert(task);
|
evalSignTaskMapper.insert(task);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -221,6 +221,7 @@ public class EvalProcessControlExecutor implements EvalProcessControlApi {
|
||||||
update.setId(existTask.getId());
|
update.setId(existTask.getId());
|
||||||
update.setSignerPersonnelId(person.getSignerPersonnelId());
|
update.setSignerPersonnelId(person.getSignerPersonnelId());
|
||||||
update.setTaskStatusCode(1);
|
update.setTaskStatusCode(1);
|
||||||
|
InsertFieldDefaults.applyForUpdate(update);
|
||||||
evalSignTaskMapper.updateById(update);
|
evalSignTaskMapper.updateById(update);
|
||||||
} else {
|
} else {
|
||||||
EvalSignTaskDO task = new EvalSignTaskDO();
|
EvalSignTaskDO task = new EvalSignTaskDO();
|
||||||
|
|
@ -231,6 +232,7 @@ public class EvalProcessControlExecutor implements EvalProcessControlApi {
|
||||||
task.setSignerPersonnelId(person.getSignerPersonnelId());
|
task.setSignerPersonnelId(person.getSignerPersonnelId());
|
||||||
task.setTaskTitle(stage.getMsg() + "签字任务");
|
task.setTaskTitle(stage.getMsg() + "签字任务");
|
||||||
task.setTaskStatusCode(1);
|
task.setTaskStatusCode(1);
|
||||||
|
InsertFieldDefaults.apply(task);
|
||||||
evalSignTaskMapper.insert(task);
|
evalSignTaskMapper.insert(task);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -36,6 +36,7 @@ import org.qinan.safetyeval.infrastructure.mapper.EvalProjectMemberMapper;
|
||||||
import org.qinan.safetyeval.infrastructure.mapper.EvalSignTaskMapper;
|
import org.qinan.safetyeval.infrastructure.mapper.EvalSignTaskMapper;
|
||||||
import org.qinan.safetyeval.infrastructure.mapper.EvalTechReviewMapper;
|
import org.qinan.safetyeval.infrastructure.mapper.EvalTechReviewMapper;
|
||||||
import org.qinan.safetyeval.infrastructure.persistence.queryservice.EvalReviewItemQueryService;
|
import org.qinan.safetyeval.infrastructure.persistence.queryservice.EvalReviewItemQueryService;
|
||||||
|
import org.qinan.safetyeval.infrastructure.support.InsertFieldDefaults;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
|
|
@ -201,6 +202,7 @@ public class EvalTechReviewExecutor implements EvalTechReviewApi {
|
||||||
update.setId(existTask.getId());
|
update.setId(existTask.getId());
|
||||||
update.setSignerPersonnelId(person.getSignerPersonnelId());
|
update.setSignerPersonnelId(person.getSignerPersonnelId());
|
||||||
update.setTaskStatusCode(1);
|
update.setTaskStatusCode(1);
|
||||||
|
InsertFieldDefaults.applyForUpdate(update);
|
||||||
evalSignTaskMapper.updateById(update);
|
evalSignTaskMapper.updateById(update);
|
||||||
} else {
|
} else {
|
||||||
EvalSignTaskDO task = new EvalSignTaskDO();
|
EvalSignTaskDO task = new EvalSignTaskDO();
|
||||||
|
|
@ -211,6 +213,7 @@ public class EvalTechReviewExecutor implements EvalTechReviewApi {
|
||||||
task.setSignerPersonnelId(person.getSignerPersonnelId());
|
task.setSignerPersonnelId(person.getSignerPersonnelId());
|
||||||
task.setTaskTitle(stage.getMsg() + "签字任务");
|
task.setTaskTitle(stage.getMsg() + "签字任务");
|
||||||
task.setTaskStatusCode(1);
|
task.setTaskStatusCode(1);
|
||||||
|
InsertFieldDefaults.apply(task);
|
||||||
evalSignTaskMapper.insert(task);
|
evalSignTaskMapper.insert(task);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
package org.qinan.safetyeval.infrastructure.dataobject;
|
package org.qinan.safetyeval.infrastructure.dataobject;
|
||||||
|
|
||||||
|
import com.baomidou.mybatisplus.annotation.TableLogic;
|
||||||
import com.baomidou.mybatisplus.annotation.TableName;
|
import com.baomidou.mybatisplus.annotation.TableName;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
|
|
@ -19,7 +20,12 @@ public class EvalSignTaskDO {
|
||||||
private Integer taskStatusCode;
|
private Integer taskStatusCode;
|
||||||
private LocalDateTime issueTime;
|
private LocalDateTime issueTime;
|
||||||
private String signerUrl;
|
private String signerUrl;
|
||||||
private String deleteEnum;
|
@TableLogic(
|
||||||
|
value = "false",
|
||||||
|
delval = "true"
|
||||||
|
)
|
||||||
|
protected String deleteEnum;
|
||||||
|
|
||||||
private String remarks;
|
private String remarks;
|
||||||
private String createName;
|
private String createName;
|
||||||
private String updateName;
|
private String updateName;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue