前后:黑名单不能准入

src/dashoo.cn/backend/api/business/oilsupplier/supplier/oilsupplierService.go

@@ -397,3 +397,11 @@ func (s *OilSupplierService) GetCertIds(entitiesPtr interface{}, where string) {
 
 	s.DBE.SQL(sql).Get(entitiesPtr)
 }
+
+
+func (s *OilSupplierService) GetBlackList(entitiesPtr interface{}, where string) {
+
+	sql := "SELECT a.Id from BlackList a LEFT JOIN OilSupplier b on b.Id = a.SupplierId LEFT JOIN OilCorporateInfo c ON b.CommercialNo = c.CommercialNo where " + where
+
+	s.DBE.SQL(sql).Get(entitiesPtr)
+}

src/dashoo.cn/backend/api/controllers/oilsupplier/supplier.go

@@ -2,6 +2,7 @@ package oilsupplier
 
 import (
 	"dashoo.cn/backend/api/business/oilsupplier/annualaudit"
+	BlackList "dashoo.cn/backend/api/business/oilsupplier/blacklist"
 	"dashoo.cn/backend/api/business/oilsupplier/qualchange"
 	"dashoo.cn/backend/api/business/oilsupplier/suppliercertappendsub"
 	"dashoo.cn/backend/api/business/oilsupplier/suppliercertsub"
@@ -1557,6 +1558,19 @@ func (this *OilSupplierController) AddEntity() {
 		this.ServeJSON()
 		return
 	}
+
+	//判断在黑名单的不能申请准入
+	var black BlackList.BlackList
+	suppSvc := supplier.GetOilSupplierService(utils.DBE)
+	suppSvc.GetBlackList(&black, "c.CommercialNo = '" + registerUser.CommercialNo + "'")
+	if black.Id > 0 {
+		errinfo.Message = "在黑名单内,不可申请"
+		errinfo.Code = -1
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+		return
+	}
+
 	var list []supplier.OilSupplierView
 	service := supplier.GetOilSupplierService(utils.DBE)
 
@@ -2018,6 +2032,19 @@ func (this *OilSupplierController) IsCanApply() {
 	var registerUser register.OilCorporateInfo
 	sql := " UserName='" + this.User.Username + "'"
 	svc.GetEntity(&registerUser, sql)
+
+	//判断在黑名单的不能申请准入
+	var black BlackList.BlackList
+	suppSvc := supplier.GetOilSupplierService(utils.DBE)
+	suppSvc.GetBlackList(&black, "c.CommercialNo = '" + registerUser.CommercialNo + "'")
+	if black.Id > 0 {
+		errinfo.Message = "在黑名单内,不可申请"
+		errinfo.Code = -1
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+		return
+	}
+
 	canApply := svc.IsCanApplyByExtOrganizeUser(Type, registerUser.CommercialNo, this.User.Id, this.User.IsCompanyUser)
 
 	if canApply {

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-import/_opera/operation.vue

@@ -1094,6 +1094,9 @@ export default {
     addEntity () {
       this.addloading = true
       this.formData.EndDate = new Date(this.msToDate(this.formData.EndDate))
+      this.formData.OpenDate = this.formData.StartDate
+      this.formData.PlanFinishDate = this.formData.EndDate
+      this.formData.YearDate = this.formData.EndDate
       console.log('提交数据', this.formData)
       // this.formData.ContractClass = '02'
       // var data = {