2
3
Эх сурвалжийг харах

thirdAudit 专业处室ID

yuedefeng 5 жил өмнө
parent
commit
b9ef847b62

+ 7 - 1
src/dashoo.cn/backend/api/controllers/oilsupplier/suppliercert.go

@@ -693,9 +693,10 @@ func (this *OilSupplierCertController) UnitAuditEntity() {
 	certId := this.Ctx.Input.Param(":id")
 	firstAudit := this.GetString("FirstAudit")
 	secondAudit := this.GetString("SecondAudit")
-	unitId := this.GetString("UnitId")
+	thirdAudit := this.GetString("ThirdAudit")
 	// typeCode := this.GetString("TypeCode")
 	AuditRemark := this.GetString("AuditRemark")
+	unitId := this.User.Uint
 
 	var errinfo ErrorDataInfo
 	defer func() { //finally处理失败的异常
@@ -732,6 +733,7 @@ func (this *OilSupplierCertController) UnitAuditEntity() {
 		"Id",
 		"FirstAudit",
 		"SecondAudit",
+		"thirdAudit",
 		"WorkflowId",
 		"BusinessKey",
 		"ProcessKey",
@@ -743,6 +745,7 @@ func (this *OilSupplierCertController) UnitAuditEntity() {
 	supplierCertEntity.WorkflowId = processInstanceId
 	supplierCertEntity.FirstAudit, _ = strconv.Atoi(firstAudit)
 	supplierCertEntity.SecondAudit, _ = strconv.Atoi(secondAudit)
+	supplierCertEntity.ThirdAudit, _ = strconv.Atoi(thirdAudit)
 	supplierCertEntity.CommitComId = unitId
 	supplierCertEntity.AuditIndex += 1
 	certSrv.UpdateEntityByIdCols(certId, supplierCertEntity, cols)
@@ -769,6 +772,7 @@ func (this *OilSupplierCertController) SeparateAuditEntity() {
 	certId := this.Ctx.Input.Param(":id")
 	firstAudit := this.GetString("FirstAudit")
 	secondAudit := this.GetString("SecondAudit")
+	thirdAudit := this.GetString("ThirdAudit")
 	// typeCode := this.GetString("TypeCode")
 	AuditRemark := this.GetString("AuditRemark")
 
@@ -796,9 +800,11 @@ func (this *OilSupplierCertController) SeparateAuditEntity() {
 	cols := []string{
 		"FirstAudit",
 		"SecondAudit",
+		"thirdAudit",
 	}
 	supplierCertEntity.FirstAudit, _ = strconv.Atoi(firstAudit)
 	supplierCertEntity.SecondAudit, _ = strconv.Atoi(secondAudit)
+	supplierCertEntity.ThirdAudit, _ = strconv.Atoi(thirdAudit)
 	certSrv.UpdateEntityByIdCols(certId, supplierCertEntity, cols)
 
 	svcActiviti := workflow.GetActivitiService(utils.DBE)

+ 2 - 2
src/dashoo.cn/frontend_web/src/api/oilsupplier/suppliercert.js

@@ -53,14 +53,14 @@ export default {
   },
   firstAuditEntity (entityId, params, myAxios) {
     return myAxios({
-      url: '/suppliercert/first-audit/' + entityId,
+      url: '/suppliercert/company-audit/' + entityId,
       method: 'post',
       params: params
     })
   },
   auditEntity (entityId, params, myAxios) {
     return myAxios({
-      url: '/suppliercert/audit/' + entityId,
+      url: '/suppliercert/unit-audit/' + entityId,
       method: 'post',
       params: params
     })