Explorar o código

截止上期取值调整

MaiXinRong hai 1 ano
pai
achega
7e47575585
Modificáronse 1 ficheiros con 11 adicións e 6 borrados
  1. 11 6
      app/service/stage.js

+ 11 - 6
app/service/stage.js

@@ -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) {