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