|
@@ -128,15 +128,20 @@ module.exports = app => {
|
|
|
|
|
|
async loadPreCheckedStage(stage) {
|
|
|
if (stage.order > 1) {
|
|
|
- const preCheckedStages = await this.ctx.service.stage.getAllDataByCondition({
|
|
|
- where: { tid: stage.tid, status: auditConst.stage.status.checked },
|
|
|
- orders: [['order', 'desc']],
|
|
|
- });
|
|
|
- stage.preCheckedStage = preCheckedStages[0];
|
|
|
+ if (stage.status === auditConst.stage.status.checked) {
|
|
|
+ stage.preCheckedStage = await this.getDataByCondition({ tid: stage.tid, order: stage.order - 1 });
|
|
|
+ } else {
|
|
|
+ const preCheckedStages = await this.getAllDataByCondition({
|
|
|
+ where: { tid: stage.tid, status: auditConst.stage.status.checked },
|
|
|
+ orders: [['order', 'desc']],
|
|
|
+ });
|
|
|
+ stage.preCheckedStage = preCheckedStages[0];
|
|
|
+ }
|
|
|
+ stage.isCheckFirst = stage.order > 1 ? (stage.preCheckedStage ? stage.preCheckedStage.order === stage.order - 1 : false) : true;
|
|
|
} else {
|
|
|
stage.preCheckedStage = undefined;
|
|
|
+ stage.isCheckFirst = false;
|
|
|
}
|
|
|
- stage.isCheckFirst = stage.order > 1 ? (stage.preCheckedStage ? stage.preCheckedStage.order === stage.order - 1 : false) : true;
|
|
|
}
|
|
|
|
|
|
async doCheckStage(stage, force = false) {
|