|
|
@@ -670,8 +670,8 @@ func (this *AnnualAuditController) AddAuditEntity() {
|
|
|
svc := annualaudit.GetOilAnnualAuditService(utils.DBE)
|
|
|
annualId := this.GetString("AnnualId")
|
|
|
firstAudit := this.GetString("FirstAuditName")
|
|
|
- //secondAudit := this.GetString("SecondAudit")
|
|
|
- //thirdAudit := this.GetString("ThirdAudit")
|
|
|
+ secondAudit := this.GetString("SecondAudit")
|
|
|
+ thirdAudit := this.GetString("ThirdAudit")
|
|
|
json.Unmarshal(jsonBlob, &model)
|
|
|
//where := "CerId = " + utils.ToStr(model.SupplierId) + " and SupplierTypeName = " + model.SupplierTypeName
|
|
|
var auditentity annualaudit.OilAnnualAudit
|
|
|
@@ -719,12 +719,23 @@ func (this *AnnualAuditController) AddAuditEntity() {
|
|
|
audithistoryentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
|
|
|
svc.InsertEntity(audithistoryentity)
|
|
|
}
|
|
|
- auditmodel.Status = suppliercert.FEN_TRIAL_STATUS //二级单位初审
|
|
|
+ if this.User.IsCompanyUser == 1 {
|
|
|
+ auditmodel.Status = suppliercert.FEN_TRIAL_STATUS //二级单位分办
|
|
|
+ } else {
|
|
|
+ auditmodel.Status = suppliercert.FIRST_TRIAL_STATUS
|
|
|
+ }
|
|
|
auditmodel.FenbanAudit,_ = strconv.Atoi(firstAudit)
|
|
|
+ auditmodel.FirstAudit,_ = strconv.Atoi(firstAudit)
|
|
|
+ auditmodel.SecondAudit,_ = strconv.Atoi(secondAudit)
|
|
|
+ auditmodel.ThirdAudit,_ = strconv.Atoi(thirdAudit)
|
|
|
+
|
|
|
cols := []string{
|
|
|
"Id",
|
|
|
"WorkflowId",
|
|
|
"FenbanAudit",
|
|
|
+ "FirstAudit",
|
|
|
+ "SecondAudit",
|
|
|
+ "ThirdAudit",
|
|
|
"Status",
|
|
|
"BusinessKey",
|
|
|
}
|
lining