|
@@ -44,12 +44,21 @@ const updateStageTimes = async function (stage, times) {
|
|
|
for (const ad of auditData) {
|
|
|
if (ad.audit_order) {
|
|
|
if (filterIds.indexOf(ad.aid) < 0) filterIds.push(ad.aid);
|
|
|
- } else if (auditIds.indexOf(ad.aid) < 0) auditIds.push(ad.aid);
|
|
|
+ } else {
|
|
|
+ const auditId = auditIds.find(x => { return x.aid === ad.aid});
|
|
|
+ if (auditId) {
|
|
|
+ auditId.ids.push(ad.id);
|
|
|
+ } else {
|
|
|
+ auditIds.push({ aid: ad.aid, ids: [ad.id] });
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
if (auditIds.length === 0) return;
|
|
|
if (filterIds.length > 0 && auditIds.length > 0) errorStageTimes.push({ tid: stage.tid, sid: stage.id, times });
|
|
|
for (const [i, aid] of auditIds.entries()) {
|
|
|
- await querySql('UPDATE zh_stage_audit SET audit_order = ? WHERE sid = ? AND times = ? AND aid = ?', [i+1, stage.id, times, aid]);
|
|
|
+ for (const id of aid.ids) {
|
|
|
+ await querySql('UPDATE zh_stage_audit SET audit_order = ? WHERE id = ?', [i+1, id]);
|
|
|
+ }
|
|
|
}
|
|
|
};
|
|
|
|
|
@@ -61,7 +70,7 @@ const updateStage = async function (stage) {
|
|
|
|
|
|
const doCompleteTest = async function(id) {
|
|
|
try {
|
|
|
- const tender = await querySql('Select * From zh_tender where id = ?', [id]);
|
|
|
+ const tender = await querySql('Select * From zh_tender where id > ?', [id]);
|
|
|
for (const t of tender) {
|
|
|
console.log(`Update Tender ${t.name}(${t.id}):`);
|
|
|
await updateShenpi(t);
|