@@ -2399,9 +2399,9 @@ module.exports = app => {
if (exist) {
throw '该审核人已存在,请勿重复添加';
}
- const shenpiInfo = await ctx.service.shenpiAudit.getDataByCondition({ tid: ctx.tender.id, sp_type: shenpiConst.sp_type.change, sp_status: shenpiConst.sp_status.gdzs });
- const is_gdzs = shenpiInfo && ctx.tender.info.shenpi.change === shenpiConst.sp_status.gdzs ? 1 : 0;
- const result = await ctx.service.changeProjectAudit.addAuditor(ctx.change.id, id, ctx.change.times, is_gdzs);
+ // const shenpiInfo = await ctx.service.shenpiAudit.getDataByCondition({ tid: ctx.tender.id, sp_type: shenpiConst.sp_type.change, sp_status: shenpiConst.sp_status.gdzs });
+ // const is_gdzs = shenpiInfo && ctx.tender.info.shenpi.change === shenpiConst.sp_status.gdzs ? 1 : 0;
+ const result = await ctx.service.changeProjectAudit.addAuditor(ctx.change.id, id, ctx.change.times);
if (!result) {
throw '添加审核人失败';
@@ -811,7 +811,9 @@ module.exports = app => {
- const result = await ctx.service.qualityInspectionAudit.addAuditor(ctx.inspection.id, id, ctx.inspection.times);
+ const shenpiInfo = await ctx.service.shenpiAudit.getDataByCondition({ tid: ctx.tender.id, sp_type: shenpiConst.sp_type.inspection, sp_status: shenpiConst.sp_status.gdzs });
+ const is_gdzs = shenpiInfo && ctx.tender.info.shenpi.inspection === shenpiConst.sp_status.gdzs ? 1 : 0;
+ const result = await ctx.service.qualityInspectionAudit.addAuditor(ctx.inspection.id, id, ctx.inspection.times, is_gdzs);
@@ -821,7 +821,9 @@ module.exports = app => {
- const result = await ctx.service.safeInspectionAudit.addAuditor(ctx.inspection.id, id, ctx.inspection.times);
+ const shenpiInfo = await ctx.service.shenpiAudit.getDataByCondition({ tid: ctx.tender.id, sp_type: shenpiConst.sp_type.safe_inspection, sp_status: shenpiConst.sp_status.gdzs });
+ const is_gdzs = shenpiInfo && ctx.tender.info.shenpi.safe_inspection === shenpiConst.sp_status.gdzs ? 1 : 0;
+ const result = await ctx.service.safeInspectionAudit.addAuditor(ctx.inspection.id, id, ctx.inspection.times, is_gdzs);
@@ -1373,7 +1373,7 @@ module.exports = app => {
updateData.push({ id: x.id, order: x.order - 1, audit_order: x.audit_order - 1 });
});
if (updateData.length > 0) {
- await transaction.updateRows(updateData);
+ await transaction.updateRows(this.tableName, updateData);
order = order - 1;
@@ -403,7 +403,7 @@ module.exports = app => {
updateData.push({id: x.id, usite: x.usite - 1, usort: x.usort - 1, audit_order: x.audit_order - 1});
audit_order = audit_order - 1;
@@ -1444,7 +1444,7 @@ module.exports = app => {
@@ -1509,7 +1509,7 @@ module.exports = app => {
@@ -997,7 +997,7 @@ module.exports = app => {
updateData.push({id: x.id, audit_order: x.audit_order - 1});
@@ -1197,7 +1197,7 @@ module.exports = app => {
updateData.push({id: x.id, order: x.order - 1, audit_order: x.audit_order - 1});
@@ -273,7 +273,7 @@ module.exports = app => {
updateData.push({id: x.id, active_order: x.active_order - 1, audit_order: x.audit_order - 1});
auditOrder = auditOrder - 1;
@@ -381,7 +381,7 @@ module.exports = app => {
@@ -1117,7 +1117,7 @@ module.exports = app => {
@@ -399,7 +399,7 @@ module.exports = app => {
@@ -295,7 +295,7 @@ module.exports = app => {
@@ -2046,7 +2046,7 @@ module.exports = app => {