后端: 通过统一信用代码获取列表时添加主表的的查询条件为已注册审核通过的 CheckStatus = 11

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

@@ -106,7 +106,8 @@ func (this *AnnualAuditController) GetEntityList() {
 	}
 	svc := annualaudit.GetOilAnnualAuditService(utils.DBE)
 	var registerUser register.OilCorporateInfo
-	sql := " UserName='" + this.User.Username + "'"
+	// TODO 这里应该从主表取企业信息，增项 年审和信息变更可能会改变企业信用代码(或者在申请通过后同步更新注册表)
+	sql := " UserName='" + this.User.Username + "' and CheckStatus = 11 "
 	svc.GetEntity(&registerUser, sql)
 	//企业用户必须加创建人条件
 	if this.User.IsCompanyUser == 1 {
@@ -323,7 +324,7 @@ func (this *AnnualAuditController) GetSupplier() {
 		where = " WHERE b.Id is NOT NULL AND (a.InFlag='1' or a.InFlag='2')"
 	}
 	var registerUser register.OilCorporateInfo
-	sql := " UserName='" + this.User.Username + "'"
+	sql := " UserName='" + this.User.Username + "' and CheckStatus = 11 "
 	svc.GetEntity(&registerUser, sql)
 	//企业用户必须加创建人条件
 	if this.User.IsCompanyUser == 1 {
@@ -355,7 +356,7 @@ func (this *AnnualAuditController) GetSupplierForChange() {
 		where = " WHERE b.Id is NOT NULL AND (a.InFlag='1' or a.InFlag='2' or a.Status='6' or a.Status='7')"
 	}
 	var registerUser register.OilCorporateInfo
-	sql := " UserName='" + this.User.Username + "'"
+	sql := " UserName='" + this.User.Username + "' and CheckStatus = 11 "
 	svc.GetEntity(&registerUser, sql)
 	//企业用户必须加创建人条件
 	if this.User.IsCompanyUser == 1 {

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

@@ -394,7 +394,7 @@ func (this *InfoChangeController) GetSuppList() {
 	}
 	svc := infochange.GetInfoChangeService(utils.DBE)
 	var registerUser register.OilCorporateInfo
-	sql := " UserName='" + this.User.Username + "'"
+	sql := " UserName='" + this.User.Username + "' and CheckStatus = 11 "
 	svc.GetEntity(&registerUser, sql)
 	//企业用户必须加创建人条件
 	if this.User.IsCompanyUser == 1 {

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

@@ -44,23 +44,20 @@ func (this *PaymentSelectController) GetEntityList() {
 		}
 	}
 	var registerUser register.OilCorporateInfo
-	sql := " UserName='" + this.User.Username + "'"
-	svc.GetEntity(&registerUser,sql)
+	sql := " UserName='" + this.User.Username + "' and CheckStatus = 11 "
+	svc.GetEntity(&registerUser, sql)
 	if this.User.IsCompanyUser == 1 {
-		where= where +" and s.CommercialNo='"+registerUser.CommercialNo+"'"
+		where = where + " and s.CommercialNo='" + registerUser.CommercialNo + "'"
 	}
 
-
 	//svc := suppliercert.GetOilSupplierCertService(utils.DBE)
 	//var list []suppliercert.OilSupplierCert
 
 	var list []paymentselect.PaymentselectList
 
-
-	total := svc.GetPaymentselectList( page.CurrentPage, page.Size, orderby, asc, &list, where)
+	total := svc.GetPaymentselectList(page.CurrentPage, page.Size, orderby, asc, &list, where)
 	//total := svc.GetPagingEntitiesWithOrderBytbl("", page.CurrentPage, page.Size, orderby, asc, &list, where)
 
-
 	var datainfo DataInfo
 	datainfo.Items = list
 	datainfo.CurrentItemCount = total
@@ -82,10 +79,10 @@ func (this *PaymentSelectController) GetEntitySumList() {
 	CreateOn := this.GetString("CreateOn")
 	svc := paymentselect.GetPaymentSelectService(utils.DBE)
 	var registerUser register.OilCorporateInfo
-	sql := " UserName='" + this.User.Username + "'"
-	svc.GetEntity(&registerUser,sql)
+	sql := " UserName='" + this.User.Username + "' and CheckStatus = 11 "
+	svc.GetEntity(&registerUser, sql)
 	if this.User.IsCompanyUser == 1 {
-		where= where +" and s.CommercialNo='"+registerUser.CommercialNo+"' "
+		where = where + " and s.CommercialNo='" + registerUser.CommercialNo + "' "
 	}
 	if CreateOn != "" {
 		dates := strings.Split(CreateOn, ",")
@@ -103,4 +100,4 @@ func (this *PaymentSelectController) GetEntitySumList() {
 	datainfo.Items = list
 	this.Data["json"] = &datainfo
 	this.ServeJSON()
-}
+}

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

@@ -490,7 +490,7 @@ func (this *SelectController) GetProcessAuditList() {
 
 	//企业用户必须加创建人条件
 	var registerUser register.OilCorporateInfo
-	sql := " UserName='" + this.User.Username + "'"
+	sql := " UserName='" + this.User.Username + "' and CheckStatus = 11 "
 	svc.GetEntity(&registerUser, sql)
 	var processinfolist []Processinfo
 	if this.User.IsCompanyUser == 1 {
@@ -644,7 +644,7 @@ func (this *SelectController) ZrfwSelect() {
 	var registerUser register.OilCorporateInfo
 	var company supplier.OilSupplier
 
-	sql := " UserName='" + this.User.Username + "'"
+	sql := " UserName='" + this.User.Username + "' and CheckStatus = 11 "
 	svc.GetEntity(&registerUser, sql)
 	if this.User.IsCompanyUser == 1 {
 		sql1 := " CreateUserId = '" + this.User.Id + "' or CommercialNo='" + registerUser.CommercialNo + "'"
@@ -709,7 +709,7 @@ func (this *SelectController) GetAllBusinesList() {
 		zrsvc := supplier.GetOilSupplierService(utils.DBE)
 		if this.User.IsCompanyUser == 1 {
 			var registerUser register.OilCorporateInfo
-			sql := " UserName='" + this.User.Username + "'"
+			sql := " UserName='" + this.User.Username + "' and CheckStatus = 11 "
 			zrsvc.GetEntity(&registerUser, sql)
 			where = where + " and (b.CreateUserId = '" + this.User.Id + "' or a.CommercialNo='" + registerUser.CommercialNo + "')"
 		}
@@ -745,7 +745,7 @@ func (this *SelectController) GetAllBusinesList() {
 
 		if this.User.IsCompanyUser == 1 {
 			var registerUser register.OilCorporateInfo
-			sql := " UserName='" + this.User.Username + "'"
+			sql := " UserName='" + this.User.Username + "' and CheckStatus = 11 "
 			zxsvc.GetEntity(&registerUser, sql)
 			where = where + " and (b.CreateUserId = '" + this.User.Id + "' or a.CommercialNo='" + registerUser.CommercialNo + "')"
 		}

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

@@ -485,7 +485,7 @@ func (this *OilSupplierCertAppendSubController) AddGoodsBus() {
 			}*/
 
 		} else {
-			log.Print("增项【不可】添加不存在的准入范围，SupplierId: " + strconv.Itoa(datamain.SupplierId) + "AppendId: " + strconv.Itoa(datamain.SupplierCertAppendId) + "Code: " + datamain.Code)
+			log.Print("增项【不可】再次添加已添加过的准入范围，SupplierId: " + strconv.Itoa(datamain.SupplierId) + "AppendId: " + strconv.Itoa(datamain.SupplierCertAppendId) + "Code: " + datamain.Code)
 		}
 	}