Browse Source

fix:准入申请-提交申请的参数检查接口

baichengfei 5 years ago
parent
commit
fa70ef43c2
1 changed files with 13 additions and 12 deletions
  1. 13 12
      src/dashoo.cn/backend/api/controllers/oilsupplier/suppliercert.go

+ 13 - 12
src/dashoo.cn/backend/api/controllers/oilsupplier/suppliercert.go

@@ -600,6 +600,7 @@ func (this *OilSupplierCertController) DeleteEntity() {
 		this.ServeJSON()
 	}
 }
+
 // @Title 启动工作流前,检查准入申请填入的项目是否完整,是否可提交
 // @Description 检查准入申请填入的项目是否完整
 // @Success	200	{object} ErrorDataInfo
@@ -626,7 +627,7 @@ func (this *OilSupplierCertController) CheckSupplierCertCanSubmit() {
 	certSrv := suppliercert.GetOilSupplierCertService(utils.DBE)
 	var supplierCertEntity suppliercert.OilSupplierCert
 	certSrv.GetEntityById(certId, &supplierCertEntity)
-	certSrv.IsSupplierCertCanSubmit(strconv.Itoa(supplierCertEntity.Id), certId)
+	certSrv.IsSupplierCertCanSubmit(strconv.Itoa(supplierCertEntity.SupplierId), certId)
 }
 
 // @Title 企业用户提交按钮  --启动工作流
@@ -708,7 +709,7 @@ func (this *OilSupplierCertController) CompanyAuditEntity() {
 	ActiComplete.ProcessKey = workflow.OIL_ENUSER_SUPPLIER_APPLY
 	ActiComplete.BusinessKey = businessKey
 	ActiComplete.UserId = this.User.Id
-	ActiComplete.Result =  "1" //提交给二级单位分办
+	ActiComplete.Result = "1" //提交给二级单位分办
 	ActiComplete.Remarks = AuditRemark
 	ActiComplete.CallbackUrl = utils.Cfg.MustValue("workflow", "callbackHost")
 
@@ -904,7 +905,7 @@ func (this *OilSupplierCertController) CommonAuditEntity() {
 	ActiComplete.ProcessKey = workflow.OIL_ENUSER_SUPPLIER_APPLY
 	ActiComplete.BusinessKey = supplierCertEntity.BusinessKey
 	ActiComplete.UserId = this.User.Id //审批人员
-	ActiComplete.Result = result //前台审批[同意、不同意]
+	ActiComplete.Result = result       //前台审批[同意、不同意]
 	ActiComplete.Remarks = AuditRemark
 	ActiComplete.CallbackUrl = utils.Cfg.MustValue("workflow", "callbackHost")
 	receiveVal := svcActiviti.TaskComplete(ActiComplete)
@@ -948,7 +949,7 @@ func (this *OilSupplierCertController) BusinessOfficeSeparateAuditEntity() {
 	ActiComplete.ProcessKey = workflow.OIL_ENUSER_SUPPLIER_APPLY
 	ActiComplete.BusinessKey = supplierCertEntity.BusinessKey
 	ActiComplete.UserId = this.User.Id //审批人员
-	ActiComplete.Result = "1" //前台审批[同意、不同意]
+	ActiComplete.Result = "1"          //前台审批[同意、不同意]
 	ActiComplete.UserNames = ProfessionalAudit
 	ActiComplete.Remarks = AuditRemark
 	ActiComplete.CallbackUrl = utils.Cfg.MustValue("workflow", "callbackHost")
@@ -1001,7 +1002,7 @@ func (this *OilSupplierCertController) ConcentrateAuditEntity() {
 	ActiComplete.ProcessKey = workflow.OIL_ENUSER_SUPPLIER_APPLY
 	ActiComplete.BusinessKey = supplierCertEntity.BusinessKey
 	ActiComplete.UserId = this.User.Id //审批人员
-	ActiComplete.Result = "1" //前台审批[同意、不同意]
+	ActiComplete.Result = "1"          //前台审批[同意、不同意]
 	ActiComplete.Remarks = AuditRemark
 	ActiComplete.CallbackUrl = utils.Cfg.MustValue("workflow", "callbackHost")
 	receiveVal := svcActiviti.TaskComplete(ActiComplete)
@@ -1227,7 +1228,7 @@ func (this *OilSupplierCertController) CreateAccessCardNo() {
 	//codecSvc.GetEntities(&model, "")
 	seqStr := ""
 	cols := []string{}
-	if (typeCode == "01") { // 物质
+	if typeCode == "01" { // 物质
 		has := true
 		for has {
 			seqStr = codecSvc.GetWZAccessCardNo(this.User.AccCode)
@@ -1336,8 +1337,8 @@ func (this *OilSupplierCertController) BackStatus() {
 
 		svcActiviti := workflow.GetActivitiService(utils.DBE)
 		var ActiComplete workflow.ActiCompleteVM
-		ActiComplete.ProcessKey = activity.ProcessKey //TODO: 获取工作流KEY
-		ActiComplete.BusinessKey = activity.BusinessKey  //TODO: 获取业务表ID
+		ActiComplete.ProcessKey = activity.ProcessKey   //TODO: 获取工作流KEY
+		ActiComplete.BusinessKey = activity.BusinessKey //TODO: 获取业务表ID
 		ActiComplete.UserId = this.User.Id
 		ActiComplete.Remarks = ""
 		ActiComplete.Result = "1"
@@ -1373,7 +1374,7 @@ func (this *OilSupplierCertController) SaveAccessCardNo() {
 	svc.GetEntities(&model, where)
 	supcols := []string{}
 	if model == nil || len(model) == 0 {
-		if (typeCode == "01") { // 物质
+		if typeCode == "01" { // 物质
 			supplier.WZAccessCardNo = accessCardNo
 			supcols = []string{"WZAccessCardNo"}
 		} else if typeCode == "03" { //技术服务
@@ -1981,7 +1982,7 @@ func (this *OilSupplierCertController) UpdatePayStatus() {
 	}
 
 	if len(paymentInfoEntities) == 1 {
-		for _, item := range  paymentInfoEntities {
+		for _, item := range paymentInfoEntities {
 			if item.IsPay == "1" {
 				errinfo.Message = "已确认交费!请耐心等待"
 				errinfo.Code = -1
@@ -1997,10 +1998,10 @@ func (this *OilSupplierCertController) UpdatePayStatus() {
 		}
 	}
 
-	sql :="UPDATE OilPaymentInfo SET IsPay ='1' where SrcId=" + certId + " and PayType='1'"
+	sql := "UPDATE OilPaymentInfo SET IsPay ='1' where SrcId=" + certId + " and PayType='1'"
 	supplierCertSrv.DBE.Exec(sql)
 	errinfo.Message = "确认交费成功!"
 	errinfo.Code = 0
 	this.Data["json"] = &errinfo
 	this.ServeJSON()
-}
+}