|
@@ -141,7 +141,7 @@ module.exports = app => {
|
|
});
|
|
});
|
|
if (stages.length !== 0) {
|
|
if (stages.length !== 0) {
|
|
const lastStage = stages[0];
|
|
const lastStage = stages[0];
|
|
- if (lastStage.status !== auditConst.stage.status.checked) {
|
|
|
|
|
|
+ if (lastStage.status === auditConst.stage.status.uncheck && lastStage.user_id !== this.ctx.session.sessionUser.accountId) {
|
|
stages.splice(0, 1);
|
|
stages.splice(0, 1);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -470,7 +470,7 @@ module.exports = app => {
|
|
const beginTime = moment(times[0], 'YYYY-MM');
|
|
const beginTime = moment(times[0], 'YYYY-MM');
|
|
const endTime = moment(times[1], 'YYYY-MM');
|
|
const endTime = moment(times[1], 'YYYY-MM');
|
|
|
|
|
|
- const stages = await this._getValidStages(tender.id);
|
|
|
|
|
|
+ const stages = await this._getValidStages(tender.id, true);
|
|
for (const stage of stages) {
|
|
for (const stage of stages) {
|
|
const sTime = moment(stage.s_time, 'YYYY-MM');
|
|
const sTime = moment(stage.s_time, 'YYYY-MM');
|
|
if (sTime.isBetween(beginTime, endTime, null, '[]')) {
|
|
if (sTime.isBetween(beginTime, endTime, null, '[]')) {
|