后端: 集中评审列表显示推荐单位

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

@@ -140,6 +140,7 @@ func (s *OilSupplierService) GetMyPagingEntitiesWithOrderBytbl3(supplierTableNam
 	sql += ` b.DesignerTotal, `
 	sql += ` b.SkillerTotal, `
 	sql += ` b.Status, `
+	sql += ` b.RecUnitName, `
 	sql += ` GROUP_CONCAT(CONCAT(c.Code, ':', c.Name)) as CodeName, `
 	sql += ` b.WorkflowId, b.CreateOn ,b.ProcessKey,b.BusinessKey,b.BackRemark,b.IsRestrict,b.Remark`
 	sql += ` from ` + supplierTableName + ` a `

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

@@ -589,6 +589,7 @@ func (this *OilSupplierController) GetJZPSJoinCertEntityList() {
 	RegCapital1 := this.GetString("RegCapital1")
 	RegCapital2 := this.GetString("RegCapital2")
 	BusinessScope := this.GetString("BusinessScope")
+	RecUnitName := this.GetString("RecUnitName")
 
 	if SupplierName != "" {
 		where = where + " and a.SupplierName like '%" + SupplierName + "%'"
@@ -675,6 +676,10 @@ func (this *OilSupplierController) GetJZPSJoinCertEntityList() {
 		where = where + " and a.BusinessScope like '%" + BusinessScope + "%'"
 	}
 
+	if RecUnitName != "" {
+		where = where + " and b.RecUnitName like '%" + RecUnitName + "%'"
+	}
+
 	status := this.GetString("Status")
 	if status != "" {
 		where = where + " and b.Status='" + status + "'"
@@ -1561,7 +1566,7 @@ func (this *OilSupplierController) AddEntity() {
 
 	//判断在黑名单的不能申请准入
 	var black BlackList.BlackList
-	serviceCert.GetEntityByWhere("BlackList", "CommercialNo = '" + model.CommercialNo + "'", &black)
+	serviceCert.GetEntityByWhere("BlackList", "CommercialNo = '"+model.CommercialNo+"'", &black)
 	if black.Id > 0 {
 		errinfo.Message = "在黑名单内,不可申请"
 		errinfo.Code = -1
@@ -2668,7 +2673,7 @@ func (this *OilSupplierController) CheckSupplierFile() {
 			}
 		} else if cert.SupplierTypeCode == "02" {
 			needList = filesvc.GetBasicNeedFileListNew(ids.Id)
-		} else if cert.SupplierTypeCode == "03"{
+		} else if cert.SupplierTypeCode == "03" {
 			needList = filesvc.GetTechNeedFileListNew(ids.Id)
 		}
 
@@ -2729,7 +2734,7 @@ func (this *OilSupplierController) CheckSupplierFile() {
 // @Description
 // @Success	200	{object} controllers.Request
 // @router /checkSupplierFileNew [post]
-func (this *OilSupplierController) CheckSupplierFileNew(){
+func (this *OilSupplierController) CheckSupplierFileNew() {
 	var file supplierfile.CheckFile
 	var jsonBlob = this.Ctx.Input.RequestBody
 	json.Unmarshal(jsonBlob, &file)
@@ -2802,7 +2807,7 @@ func (this *OilSupplierController) CheckSupplierFileNew(){
 		}
 	} else if cert.SupplierTypeCode == "02" {
 		needList = filesvc.GetBasicNeedFileListNew(ids.Id)
-	} else if cert.SupplierTypeCode == "03"{
+	} else if cert.SupplierTypeCode == "03" {
 		needList = filesvc.GetTechNeedFileListNew(ids.Id)
 	}
 
@@ -2828,7 +2833,7 @@ func (this *OilSupplierController) CheckSupplierFileNew(){
 			continue
 		}
 		var fileist1 supplierfile.OilSupplierFile
-		where1 := " SupplierId = '" + strconv.Itoa(file.SupplierId ) + "' and NeedFileType = '" + needHeader.FileName + "'"
+		where1 := " SupplierId = '" + strconv.Itoa(file.SupplierId) + "' and NeedFileType = '" + needHeader.FileName + "'"
 		filesvc.GetEntityByWhere("OilSupplierFile", where1, &fileist1)
 
 		if !strings.Contains(companyHasHeaders, needHeader.FileName+",") {