Merge branch 'develop' of http://code.dashoo.cn/dashoo/supplier_system into develop

src/dashoo.cn/backend/api/business/oilsupplier/goodsaptitude/oilgoodsaptitudeService.go

@@ -196,5 +196,301 @@ func (s *OilGoodsAptitudeService) GetNumOfPass(ismanf string) (total int64) {
 		}
 	}
 
+	return total
+}
+
+func (s *OilGoodsAptitudeService) TruncateTable(tableName string) error {
+	sql := "TRUNCATE TABLE " + tableName
+	_,err := s.DBE.Query(sql)
+	return err
+}
+
+func (s *OilGoodsAptitudeService) InsertGoodsAptitude(fromTableName, toTableName string) error {
+	sql := "INSERT INTO " + toTableName + " SELECT * FROM " + fromTableName
+	_,err := s.DBE.Query(sql)
+	return err
+}
+
+func (s *OilGoodsAptitudeService) InsertTmpGoodsAptitude(parentId, fcode, val string) error {
+	sql := "INSERT INTO `tmp_OilGoodsAptitude` (Edition,ClassId," + fcode + ") "
+	sql += " VALUES ('1',"+ parentId +"," + val + ")"
+	_, err := s.DBE.Query(sql)
+	return err
+}
+
+func (s *OilGoodsAptitudeService) GetPagingCheckedEntities(pageIndex, itemsPerPage int64, orderby string,
+	asc bool, entitiesPtr interface{}, having string) (total int64) {
+
+	var sql string
+	sql = `SELECT 
+		 a.Id,a.SupplierName,
+		 b.SupplierTypeCode, b.SupplierTypeName,
+		 b.AccessCardNo,b.SupplierTypeCode, a.DepositBank,a.HseTraining,
+		 a.CompanyType,a.SetupTime,a.Address,a.Province,a.City,a.Street,
+		a.LegalPerson,a.RegCapital,a.Mobile,b.AuditDate,b.ApplyTime,b.InFlag,
+		a.ContactName,a.CommercialNo,a.LinkAddress,a.LinkProvince,
+		a.LinkCity,a.LinkStreet,a.BusinessScope,b.InStyle, b.Id CertId, 
+		COUNT(sub.Id) AS subCnt,
+		group_concat(DISTINCT header.Code) AS headerCodes,
+		group_concat(distinct sub.Name) AS subNames,
+		group_concat(distinct sub.Code) certSubCodes,
+		group_concat(DISTINCT sub.SubClassId) AS subClassIds,
+		max(goods.F01) AS F01,
+		max(goods.F02) AS F02,
+		max(goods.F03) AS F03,
+		max(goods.F04) AS F04,
+		max(goods.F05) AS F05,
+		max(goods.F06) AS F06,
+		max(goods.F07) AS F07,
+		max(goods.F08) AS F08,
+		max(goods.F09) AS F09,
+		max(goods.F10) AS F10,
+		max(goods.F11) AS F11,
+		max(goods.F12) AS F12,
+		max(goods.F13) AS F13,
+		max(goods.F14) AS F14,
+		max(goods.F15) AS F15,
+		max(goods.F16) AS F16,
+		max(goods.F17) AS F17,
+		max(goods.F18) AS F18,
+		max(goods.F19) AS F19,
+		max(goods.F20) AS F20,
+		max(goods.F21) AS F21,
+		max(goods.F22) AS F22,
+		max(goods.F23) AS F23,
+		max(goods.F24) AS F24,
+		max(goods.F25) AS F25,
+		max(goods.F26) AS F26,
+		max(goods.F27) AS F27,
+		max(goods.F28) AS F28,
+		max(goods.F29) AS F29,
+		max(goods.F30) AS F30,
+		max(goods.F31) AS F31,
+		max(goods.F32) AS F32,
+		max(goods.F33) AS F33,
+		max(goods.F34) AS F34,
+		max(goods.F35) AS F35,
+		max(goods.F36) AS F36,
+		max(goods.F37) AS F37,
+		max(goods.F38) AS F38,
+		max(goods.F39) AS F39,
+		max(goods.F40) AS F40,
+		max(goods.F41) AS F41,
+		max(goods.F42) AS F42,
+		max(goods.F43) AS F43,
+		max(goods.F44) AS F44,
+		max(goods.F45) AS F45,
+		max(goods.F46) AS F46,
+		
+		(
+		if((max(goods.F01)='1' AND LOCATE('F01', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND 
+		if((max(goods.F02)='1' AND LOCATE('F02', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+		if((max(goods.F03)='1' AND LOCATE('F03', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+		if((max(goods.F04)='1' AND LOCATE('F04', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+		if((max(goods.F05)='1' AND LOCATE('F05', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+		if((max(goods.F06)='1' AND LOCATE('F06', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+		if((max(goods.F07)='1' AND LOCATE('F07', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+		if((max(goods.F08)='1' AND LOCATE('F08', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+		if((max(goods.F09)='1' AND LOCATE('F09', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+		if((max(goods.F10)='1' AND LOCATE('F10', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+		if((max(goods.F11)='1' AND LOCATE('F12', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+		if((max(goods.F13)='1' AND LOCATE('F13', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+		if((max(goods.F14)='1' AND LOCATE('F14', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+		if((max(goods.F15)='1' AND LOCATE('F15', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+		if((max(goods.F16)='1' AND LOCATE('F16', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+		if((max(goods.F17)='1' AND LOCATE('F17', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+		if((max(goods.F18)='1' AND LOCATE('F18', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+		if((max(goods.F19)='1' AND LOCATE('F19', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+		if((max(goods.F20)='1' AND LOCATE('F20', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+		if((max(goods.F21)='1' AND LOCATE('F21', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+		if((max(goods.F22)='1' AND LOCATE('F22', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+		if((max(goods.F23)='1' AND LOCATE('F23', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+		if((max(goods.F24)='1' AND LOCATE('F24', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+		if((max(goods.F25)='1' AND LOCATE('F25', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+		if((max(goods.F26)='1' AND LOCATE('F26', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+		if((max(goods.F27)='1' AND LOCATE('F27', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+		if((max(goods.F28)='1' AND LOCATE('F28', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+		if((max(goods.F29)='1' AND LOCATE('F29', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+		if((max(goods.F30)='1' AND LOCATE('F30', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+		if((max(goods.F31)='1' AND LOCATE('F31', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+		if((max(goods.F32)='1' AND LOCATE('F32', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+		if((max(goods.F33)='1' AND LOCATE('F33', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+		if((max(goods.F34)='1' AND LOCATE('F34', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+		if((max(goods.F35)='1' AND LOCATE('F35', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+		if((max(goods.F36)='1' AND LOCATE('F36', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+		if((max(goods.F37)='1' AND LOCATE('F37', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+		if((max(goods.F38)='1' AND LOCATE('F38', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+		if((max(goods.F39)='1' AND LOCATE('F39', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+		if((max(goods.F40)='1' AND LOCATE('F40', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+		if((max(goods.F41)='1' AND LOCATE('F41', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+		if((max(goods.F42)='1' AND LOCATE('F42', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+		if((max(goods.F43)='1' AND LOCATE('F43', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+		if((max(goods.F44)='1' AND LOCATE('F44', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+		if((max(goods.F45)='1' AND LOCATE('F45', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+		if((max(goods.F46)='1' AND LOCATE('F46', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) 
+		) AS checked
+		
+		 FROM OilSupplier a
+		 LEFT JOIN OilSupplierCert b ON a.Id=b.SupplierId
+		 LEFT JOIN OilSupplierCertSub sub ON b.Id=sub.SupplierCertId
+		 LEFT JOIN OilSupplierFile files ON a.Id=files.SupplierId
+		 LEFT JOIN Base_TableHeader header ON files.NeedFileType=header.Name
+		 LEFT JOIN OilGoodsAptitude goods ON sub.SubClassId=goods.ClassId
+		 WHERE b.SupplierTypeCode='03'
+		 GROUP BY a.Id, b.Id`
+	sql += having
+	if asc {
+		sql += ` order by ` + orderby + ` ASC `
+	} else {
+		sql += ` order by ` + orderby + ` DESC `
+	}
+	sql += ` limit ` + utils.ToStr((pageIndex-1)*itemsPerPage) + "," + utils.ToStr(itemsPerPage)
+
+	sqlCount := "SELECT count(*) as total FROM OilSupplier a LEFT JOIN OilSupplierCert b ON a.Id=b.SupplierId WHERE b.SupplierTypeCode='03'"
+
+	var totalResult TotalResult
+	s.DBE.SQL(sql).Find(entitiesPtr)
+	s.DBE.SQL(sqlCount).Get(&totalResult)
+	total = totalResult.Total
+
+	return total
+}
+
+func (s *OilGoodsAptitudeService) GetPagingTmpCheckedEntities(pageIndex, itemsPerPage int64, orderby string,
+	asc bool, entitiesPtr interface{}, having string) (total int64) {
+
+	var sql string
+	sql = `SELECT 
+			 a.Id,a.SupplierName,
+			 b.SupplierTypeCode, b.SupplierTypeName,
+			 b.AccessCardNo,b.SupplierTypeCode, a.DepositBank,a.HseTraining,
+			 a.CompanyType,a.SetupTime,a.Address,a.Province,a.City,a.Street,
+			a.LegalPerson,a.RegCapital,a.Mobile,b.AuditDate,b.ApplyTime,b.InFlag,
+			a.ContactName,a.CommercialNo,a.LinkAddress,a.LinkProvince,
+			a.LinkCity,a.LinkStreet,a.BusinessScope,b.InStyle, b.Id CertId, 
+			COUNT(sub.Id) AS subCnt,
+			group_concat(DISTINCT header.Code) AS headerCodes,
+			group_concat(distinct sub.Name) AS subNames,
+			group_concat(distinct sub.Code) certSubCodes,
+			group_concat(DISTINCT sub.SubClassId) AS subClassIds,
+			max(goods.F01) AS F01,
+			max(goods.F02) AS F02,
+			max(goods.F03) AS F03,
+			max(goods.F04) AS F04,
+			max(goods.F05) AS F05,
+			max(goods.F06) AS F06,
+			max(goods.F07) AS F07,
+			max(goods.F08) AS F08,
+			max(goods.F09) AS F09,
+			max(goods.F10) AS F10,
+			max(goods.F11) AS F11,
+			max(goods.F12) AS F12,
+			max(goods.F13) AS F13,
+			max(goods.F14) AS F14,
+			max(goods.F15) AS F15,
+			max(goods.F16) AS F16,
+			max(goods.F17) AS F17,
+			max(goods.F18) AS F18,
+			max(goods.F19) AS F19,
+			max(goods.F20) AS F20,
+			max(goods.F21) AS F21,
+			max(goods.F22) AS F22,
+			max(goods.F23) AS F23,
+			max(goods.F24) AS F24,
+			max(goods.F25) AS F25,
+			max(goods.F26) AS F26,
+			max(goods.F27) AS F27,
+			max(goods.F28) AS F28,
+			max(goods.F29) AS F29,
+			max(goods.F30) AS F30,
+			max(goods.F31) AS F31,
+			max(goods.F32) AS F32,
+			max(goods.F33) AS F33,
+			max(goods.F34) AS F34,
+			max(goods.F35) AS F35,
+			max(goods.F36) AS F36,
+			max(goods.F37) AS F37,
+			max(goods.F38) AS F38,
+			max(goods.F39) AS F39,
+			max(goods.F40) AS F40,
+			max(goods.F41) AS F41,
+			max(goods.F42) AS F42,
+			max(goods.F43) AS F43,
+			max(goods.F44) AS F44,
+			max(goods.F45) AS F45,
+			max(goods.F46) AS F46,
+			
+			(
+			if((max(goods.F01)='1' AND LOCATE('F01', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND 
+			if((max(goods.F02)='1' AND LOCATE('F02', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+			if((max(goods.F03)='1' AND LOCATE('F03', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+			if((max(goods.F04)='1' AND LOCATE('F04', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+			if((max(goods.F05)='1' AND LOCATE('F05', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+			if((max(goods.F06)='1' AND LOCATE('F06', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+			if((max(goods.F07)='1' AND LOCATE('F07', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+			if((max(goods.F08)='1' AND LOCATE('F08', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+			if((max(goods.F09)='1' AND LOCATE('F09', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+			if((max(goods.F10)='1' AND LOCATE('F10', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+			if((max(goods.F11)='1' AND LOCATE('F12', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+			if((max(goods.F13)='1' AND LOCATE('F13', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+			if((max(goods.F14)='1' AND LOCATE('F14', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+			if((max(goods.F15)='1' AND LOCATE('F15', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+			if((max(goods.F16)='1' AND LOCATE('F16', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+			if((max(goods.F17)='1' AND LOCATE('F17', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+			if((max(goods.F18)='1' AND LOCATE('F18', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+			if((max(goods.F19)='1' AND LOCATE('F19', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+			if((max(goods.F20)='1' AND LOCATE('F20', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+			if((max(goods.F21)='1' AND LOCATE('F21', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+			if((max(goods.F22)='1' AND LOCATE('F22', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+			if((max(goods.F23)='1' AND LOCATE('F23', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+			if((max(goods.F24)='1' AND LOCATE('F24', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+			if((max(goods.F25)='1' AND LOCATE('F25', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+			if((max(goods.F26)='1' AND LOCATE('F26', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+			if((max(goods.F27)='1' AND LOCATE('F27', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+			if((max(goods.F28)='1' AND LOCATE('F28', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+			if((max(goods.F29)='1' AND LOCATE('F29', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+			if((max(goods.F30)='1' AND LOCATE('F30', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+			if((max(goods.F31)='1' AND LOCATE('F31', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+			if((max(goods.F32)='1' AND LOCATE('F32', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+			if((max(goods.F33)='1' AND LOCATE('F33', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+			if((max(goods.F34)='1' AND LOCATE('F34', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+			if((max(goods.F35)='1' AND LOCATE('F35', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+			if((max(goods.F36)='1' AND LOCATE('F36', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+			if((max(goods.F37)='1' AND LOCATE('F37', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+			if((max(goods.F38)='1' AND LOCATE('F38', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+			if((max(goods.F39)='1' AND LOCATE('F39', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+			if((max(goods.F40)='1' AND LOCATE('F40', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+			if((max(goods.F41)='1' AND LOCATE('F41', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+			if((max(goods.F42)='1' AND LOCATE('F42', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+			if((max(goods.F43)='1' AND LOCATE('F43', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+			if((max(goods.F44)='1' AND LOCATE('F44', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+			if((max(goods.F45)='1' AND LOCATE('F45', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) AND
+			if((max(goods.F46)='1' AND LOCATE('F46', group_concat(DISTINCT header.Code)) > 0), TRUE, FALSE) 
+			) AS checked
+			
+			 FROM OilSupplier a
+			 LEFT JOIN OilSupplierCert b ON a.Id=b.SupplierId
+			 LEFT JOIN OilSupplierCertSub sub ON b.Id=sub.SupplierCertId
+			 LEFT JOIN OilSupplierFile files ON a.Id=files.SupplierId
+			 LEFT JOIN Base_TableHeader header ON files.NeedFileType=header.Name
+			 LEFT JOIN tmp_OilGoodsAptitudeClass class ON sub.Code=class.Code
+			 LEFT JOIN tmp_OilGoodsAptitude goods ON class.Id=goods.ClassId
+			 WHERE b.SupplierTypeCode='01'
+			 GROUP BY a.Id, b.Id `
+	sql += having
+	if asc {
+		sql += ` order by ` + orderby + ` ASC `
+	} else {
+		sql += ` order by ` + orderby + ` DESC `
+	}
+	sql += ` limit ` + utils.ToStr((pageIndex-1)*itemsPerPage) + "," + utils.ToStr(itemsPerPage)
+
+	sqlCount := "SELECT count(*) as total FROM OilSupplier a LEFT JOIN OilSupplierCert b ON a.Id=b.SupplierId WHERE b.SupplierTypeCode='03'"
+
+	var totalResult TotalResult
+	s.DBE.SQL(sql).Find(entitiesPtr)
+	s.DBE.SQL(sqlCount).Get(&totalResult)
+	total = totalResult.Total
+
 	return total
 }

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

@@ -2054,6 +2054,115 @@ func (this *OilGoodsAptitudeController) DelTmpSupplierCertSub() {
 	}
 }
 
+
+// @Title 新导入资质后，比对不合格的准入用户
+// @Description get compare tmp supplier
+// @Success 200 {object} []supplier.OilSupplierSelect
+// @router /get-compare-tmp-supplier [get]
+func (this *OilGoodsAptitudeController) GetCompareTmpSupplier() {
+	//获取分页信息
+	page := this.GetPageInfoForm()
+	where := " 1=1 "
+	orderby := "Id"
+	asc := false
+	Order := this.GetString("Order")
+	Prop := this.GetString("Prop")
+	if Order != "" && Prop != "" {
+		orderby = Prop
+		if Order == "asc" {
+			asc = true
+		}
+	}
+	Id := this.GetString("Id")
+	SupplierId := this.GetString("SupplierId")
+	SupplierCertId := this.GetString("SupplierCertId")
+	SupplierTypeCode := this.GetString("SupplierTypeCode")
+	Code := this.GetString("Code")
+	Name := this.GetString("Name")
+	Remark := this.GetString("Remark")
+	IsDelete := this.GetString("IsDelete")
+	CreateOn := this.GetString("CreateOn")
+	CreateUserId := this.GetString("CreateUserId")
+	CreateBy := this.GetString("CreateBy")
+	ModifiedOn := this.GetString("ModifiedOn")
+	ModifiedUserId := this.GetString("ModifiedUserId")
+	ModifiedBy := this.GetString("ModifiedBy")
+
+	if Id != "" {
+		where = where + " and Id like '%" + Id + "%'"
+	}
+
+	if SupplierId != "" {
+		where = where + " and SupplierId like '%" + SupplierId + "%'"
+	}
+
+	if SupplierCertId != "" {
+		where = where + " and SupplierCertId = '" + SupplierCertId + "'"
+	}
+
+	if SupplierTypeCode != "" {
+		where = where + " and SupplierTypeCode = '" + SupplierTypeCode + "'"
+	}
+
+	if Code != "" {
+		where = where + " and Code like '%" + Code + "%'"
+	}
+
+	if Name != "" {
+		where = where + " and Name like '%" + Name + "%'"
+	}
+
+	if Remark != "" {
+		where = where + " and Remark like '%" + Remark + "%'"
+	}
+
+	if IsDelete != "" {
+		where = where + " and IsDelete like '%" + IsDelete + "%'"
+	}
+
+	if CreateUserId != "" {
+		where = where + " and CreateUserId like '%" + CreateUserId + "%'"
+	}
+
+	if CreateBy != "" {
+		where = where + " and CreateBy like '%" + CreateBy + "%'"
+	}
+
+	if ModifiedOn != "" {
+		where = where + " and ModifiedOn like '%" + ModifiedOn + "%'"
+	}
+
+	if ModifiedUserId != "" {
+		where = where + " and ModifiedUserId like '%" + ModifiedUserId + "%'"
+	}
+
+	if ModifiedBy != "" {
+		where = where + " and ModifiedBy like '%" + ModifiedBy + "%'"
+	}
+
+	if CreateOn != "" {
+		dates := strings.Split(CreateOn, ",")
+		if len(dates) == 2 {
+			minDate := dates[0]
+			maxDate := dates[1]
+			where = where + " and CreateOn>='" + minDate + "' and CreateOn<='" + maxDate + "'"
+		}
+	}
+	where = where + " and Type in (1, 3)"
+	svc := goodsaptitude.GetOilGoodsAptitudeService(utils.DBE)
+	var list []supplier.OilSupplierSelect
+	total := svc.GetPagingTmpCheckedEntities(page.CurrentPage, page.Size, orderby, asc, &list, where)
+	var datainfo DataInfo
+	datainfo.Items = list
+	datainfo.CurrentItemCount = total
+	datainfo.PageIndex = page.CurrentPage
+	datainfo.ItemsPerPage = page.Size
+	this.Data["json"] = &datainfo
+	this.ServeJSON()
+}
+
+
+
 // @Title 修改资质后找出不符合的准入
 // @Description 修改实体
 // @Success	200	{object} controllers.Request

src/dashoo.cn/frontend_web/src/api/oilsupplier/goodsaptitude.js

@@ -152,5 +152,12 @@ export default {
       url: '/goodsaptitude/exportpdf/' + tbid + '/' + typecode,
       method: 'post'
     })
+  },
+  getCompareTmpSupplier (params, myAxios) {
+    return myAxios({
+      url: '/goodsaptitude/get-compare-tmp-supplier',
+      method: 'get',
+      params: params
+    })
   }
 }

src/dashoo.cn/frontend_web/src/pages/oilsupplier/goodsaptitude/_opera/showdelcertsub.vue

@@ -249,10 +249,6 @@
   </div>
 </template>
 
-
-
-
-
 <script>
 import api from '@/api/oilsupplier/goodsaptitude'
 import FileSaver from 'file-saver'

src/dashoo.cn/frontend_web/src/pages/oilsupplier/goodsaptitude/index.vue

@@ -17,10 +17,10 @@
           </el-button>
 
 
-          <el-button type="primary" size="mini" style="margin-left:20px; margin-top: -4px;" @click="showimport">更新物资编码
+          <el-button type="warning" plain size="mini" style="margin-left:20px; margin-top: -4px;" @click="showimport">更新物资编码
           </el-button>
           <router-link :to="'/oilsupplier/goodsaptitude/_opera/showdelcertsub'">
-            <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;">查看待删除准入项</el-button>
+            <el-button type="warning" plain size="mini" style="margin-left:10px; margin-top: -4px;">查看待删除准入项</el-button>
           </router-link>
 
         </span>
@@ -383,84 +383,12 @@
       </el-card>
     </el-dialog>
     <el-dialog title="对比列表"  width="95%" top="5vh" :visible.sync="contrastListvisible">
-      <el-card class="box-card" v-loading="importloading">
-        <div>
-          <!--内框顶部显示-->
-          <el-card class="box-card" style="height: calc(100vh - 115px);position:relative">
-            <div slot="header">
-        <span>
-          <i class="icon icon-table2"></i> 对比列表
-        </span>
-
-              <el-form :model="searchForm" ref="searchformRef" :inline="true" style="float: right;position:absolute;right:15px;top:10.5px" >
-                <el-form-item label="准入编码">
-                  <el-input size="mini" v-model="searchForm.AccessCardNo" placeholder="请输入内容"></el-input>
-                </el-form-item>
-                <el-form-item label="企业名称">
-                  <el-input size="mini" v-model="searchForm.SupplierName" placeholder="请输入内容"></el-input>
-                </el-form-item>
-
-                <el-form-item>
-                  <el-dropdown split-button type="primary" size="mini" @click="initDatas($event)" @command="searchCommand">
-                    查询
-                    <el-dropdown-menu slot="dropdown">
-                      <el-dropdown-item command="search">高级查询</el-dropdown-item>
-                      <el-dropdown-item command="clear">查询重置</el-dropdown-item>
-                    </el-dropdown-menu>
-                  </el-dropdown>
-                </el-form-item>
-                <el-form-item>
-                  <el-button type="warning" size="mini" @click="delSupplierCertSub">导出</el-button>
-                </el-form-item>
-              </el-form>
-            </div>
-
-            <!--内框表格显示-->
-            <el-table id="rebateSetTable1" :data="conList" size="mini" v-loading="loading" border height="calc(100vh - 243px)"
-                      style="width: 100%" @sort-change="orderby" >
-              <el-table-column label="操作" width="260px" align="center" fixed="right" show-overflow-tooltip>
-                <template slot-scope="scope">
-                  <el-button type="text" @click="opencertsub(scope.row)" title="查看待删除准入范围" size="mini" icon="el-icon-document" width="120px">待删除准入范围</el-button>
-                </template>
-              </el-table-column>
-              <!--内框表格剩余栏显示-->
-              <el-table-column label="状态" prop="InFlag" width="100px" align="center">
-                <template slot-scope="scope">
-                  <el-alert v-if="scope.row.InFlag=='1'" :closable="false" style="background:rgba(255,255,255,0.2)" title="准入" type="success" ></el-alert>
-                  <el-alert v-if="scope.row.InFlag=='2'" :closable="false" style="background:rgba(255,255,255,0.2)" title="暂停" type="warning" ></el-alert>
-                  <el-alert v-if="scope.row.InFlag=='3'" :closable="false" style="background:rgba(255,255,255,0.2)" title="取消" type="error"></el-alert>
-                </template>
-              </el-table-column>
-              <el-table-column label="准入编码" width="100px" prop="AccessCardNo" sortable align="center">
-                <template slot-scope="scope" >
-                  <span style="font-family:'黑体';font-size:13px">{{scope.row.AccessCardNo}}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="企业名称" min-width="300px" prop="SupplierName" sortable align="center"></el-table-column>
-              <el-table-column label="准入类别" prop="SupplierTypeCode" align="center">
-                <template slot-scope="scope">
-                  {{transferStr(scope.row.SupplierTypeCode)}}
-                </template>
-              </el-table-column>
-              <el-table-column label="法人代表"  width="100px" prop="LegalPerson" align="center"></el-table-column>
-              <el-table-column label="注册资金（万元）"  width="170px" prop="RegCapital" sortable align="center"></el-table-column>
-              <el-table-column label="移动电话"  width="120px" prop="Mobile" align="center"></el-table-column>
-              <!--<el-table-column label="最后一次年审" width="100px" prop="AuditDate" align="center">-->
-              <!--<template slot-scope="scope">{{ jstimehandle(scope.row.AuditDate) }}</template>-->
-              <!--</el-table-column>-->
-            </el-table>
-
-            <!-- 分页 -->
-            <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage" :page-sizes="[10, 15, 20, 25]" :page-size="size"
-                           layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount"></el-pagination>
-          </el-card>
-        </div>
-      </el-card>
+      <tmp-supplier-check v-if="contrastListvisible"></tmp-supplier-check>
     </el-dialog>
+
     <el-dialog title="高级查询" :visible.sync="importDialogVisible" width="720px">
       <el-form ref="advancedsearchForm" label-width="110px">
         <el-row>
-
           <el-col :span="12">
             <el-form-item label="编码">
               <el-input size="mini" v-model="searchImportForm.Code" style="width:100%" placeholder="请输入"></el-input>
@@ -547,8 +475,12 @@
   import setapi from '@/api/oilsupplier/oilclassorgset'
   import axios from 'axios'
   import uploadajax from '@/assets/js/uploadajax.js'
+  import tmpSupplierCheck from './tmpsuppliercheck'
 
   export default {
+    components: {
+      tmpSupplierCheck
+    },
     computed: {
       ...mapGetters({
         authUser: 'authUser'

src/dashoo.cn/frontend_web/src/pages/oilsupplier/goodsaptitude/tmpsuppliercheck.vue

@@ -0,0 +1,198 @@
+<template>
+  <div>
+    <el-card class="box-card" shadow="never" style="height: calc(100vh - 115px);position:relative">
+      <div slot="header">
+        <span>
+          <i class="icon icon-table2"></i> 对比列表
+        </span>
+        <el-form :model="searchForm" ref="searchformRef" :inline="true" style="float: right;position:absolute;right:15px;top:10.5px" >
+          <el-form-item label="准入编码">
+            <el-input size="mini" v-model="searchForm.AccessCardNo" placeholder="请输入内容"></el-input>
+          </el-form-item>
+          <el-form-item label="企业名称">
+            <el-input size="mini" v-model="searchForm.SupplierName" placeholder="请输入内容"></el-input>
+          </el-form-item>
+
+          <el-form-item>
+            <el-dropdown split-button type="primary" size="mini" @click="initDatas($event)" @command="searchCommand">
+              查询
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item command="search">高级查询</el-dropdown-item>
+                <el-dropdown-item command="clear">查询重置</el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="warning" size="mini">导出</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+
+      <!--内框表格显示-->
+      <el-table id="rebateSetTable1" highlight-current-row :data="conList" size="mini" v-loading="loading" border height="calc(100vh - 243px)"
+                style="width: 100%" @sort-change="orderby" >
+        <el-table-column label="操作" width="260px" align="center" fixed="right" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <el-button type="text" @click="opencertsub(scope.row)" title="查看待删除准入范围" size="mini" icon="el-icon-document" width="120px">待删除准入范围</el-button>
+          </template>
+        </el-table-column>
+        <!--内框表格剩余栏显示-->
+        <el-table-column label="状态" prop="InFlag" width="100px" align="center">
+          <template slot-scope="scope">
+            <el-alert v-if="scope.row.InFlag=='1'" :closable="false" style="background:rgba(255,255,255,0.2)" title="准入" type="success" ></el-alert>
+            <el-alert v-if="scope.row.InFlag=='2'" :closable="false" style="background:rgba(255,255,255,0.2)" title="暂停" type="warning" ></el-alert>
+            <el-alert v-if="scope.row.InFlag=='3'" :closable="false" style="background:rgba(255,255,255,0.2)" title="取消" type="error"></el-alert>
+          </template>
+        </el-table-column>
+        <el-table-column label="准入编码" width="100px" prop="AccessCardNo" sortable align="center">
+          <template slot-scope="scope" >
+            <span style="font-family:'黑体';font-size:13px">{{scope.row.AccessCardNo}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="企业名称" min-width="300px" prop="SupplierName" sortable align="center"></el-table-column>
+        <el-table-column label="准入类别" prop="SupplierTypeCode" align="center">
+          <template slot-scope="scope">
+            {{transferStr(scope.row.SupplierTypeCode)}}
+          </template>
+        </el-table-column>
+        <el-table-column label="法人代表"  width="100px" prop="LegalPerson" align="center"></el-table-column>
+        <el-table-column label="注册资金（万元）"  width="170px" prop="RegCapital" sortable align="center"></el-table-column>
+        <el-table-column label="移动电话"  width="120px" prop="Mobile" align="center"></el-table-column>
+        <!--<el-table-column label="最后一次年审" width="100px" prop="AuditDate" align="center">-->
+        <!--<template slot-scope="scope">{{ jstimehandle(scope.row.AuditDate) }}</template>-->
+        <!--</el-table-column>-->
+      </el-table>
+
+      <!-- 分页 -->
+      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage" :page-sizes="[10, 15, 20, 25]" :page-size="size"
+                     layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount"></el-pagination>
+    </el-card>
+  </div>
+</template>
+
+<script>
+  import api from '@/api/oilsupplier/goodsaptitude'
+  export default {
+    name: 'compareTmpSupplier',
+    created () {
+      // Object.assign(this.searchFormReset, this.searchForm)
+      this.initDatas()
+    },
+    data () {
+      return {
+        // 分页参数
+        size: 10,
+        currentPage: 1,
+        currentItemCount: 0,
+        // 列表排序
+        Column: {
+          Order: '',
+          Prop: ''
+        },
+        conList: [],
+        loading: false,
+        searchForm: {
+          AccessCardNo: '',
+          SupplierName: '',
+          SupplierTypeCode: '',
+          InFlag: '',
+          LegalPerson: '',
+          ContactName: '',
+          CommercialNo: '',
+          RegCapital1: '',
+          RegCapital2: '',
+          CompanyType: '',
+          Province: '',
+          City: '',
+          Street: '',
+          Address: '',
+          LinkProvince: '',
+          LinkCity: '',
+          LinkStreet: '',
+          LinkAddress: '',
+          DepositBank: '',
+          BusinessScope: '',
+          OldSupplierName: '',
+          HseTraining: '',
+          // NeedFileType: [],
+          NeedFileType: '',
+          CerSubName: '',
+          FullName: '',
+          CheckUserName: '',
+          CheckUserId: ''
+        }
+      }
+    },
+
+    methods: {
+      searchCommand (command) {
+        if (command === 'search') {
+          this.dialogVisible = true
+        } else if (command === 'clear') {
+          this.clearSearch()
+        }
+      },
+      // 列表排序功能
+      orderby (column) {
+        if (column.order === 'ascending') {
+          this.Column.Order = 'asc'
+        } else if (column.order === 'descending') {
+          this.Column.Order = 'desc'
+        }
+        this.Column.Prop = column.prop
+        this.initDatas()
+      },
+      clearSearch () {
+        Object.assign(this.searchForm, this.searchFormReset)
+        // this.searchForm = this.searchFormReset;
+        this.CreateOn = ''
+        this.initDatas()
+      },
+      handleSearch () {
+        this.currentPage = 1
+        this.dialogVisible = false
+        this.initDatas()
+      },
+      handleCurrentChange (value) {
+        this.currentPage = value
+        this.initDatas()
+      },
+      handleSizeChange (value) {
+        this.size = value
+        this.currentPage = 1
+        this.initDatas()
+      },
+      initDatas () {
+        // 分页及列表条件
+        let params = {
+          _currentPage: this.currentPage,
+          _size: this.size,
+          Order: this.Column.Order,
+          Prop: this.Column.Prop,
+          Edition: '1'
+        }
+        let myCreateOn = []
+        // 解析时间
+
+        if (this.CreateOn != null && this.CreateOn.length === 2) {
+          this.CreateOn[1].setHours(23)
+          this.CreateOn[1].setMinutes(59)
+          this.CreateOn[1].setSeconds(59)
+          myCreateOn.push(this.formatDateTime(this.CreateOn[0]))
+          myCreateOn.push(this.formatDateTime(this.CreateOn[1]))
+        }
+        // 查询条件
+        Object.assign(params, this.searchForm)
+        // 访问接口
+        api.getCompareTmpSupplier(params, this.$axios).then(res => {
+          this.entityList = res.data.items
+          this.currentItemCount = res.data.currentItemCount
+        }).catch(err => {
+          console.error(err)
+        })
+      }
+
+    }
+
+  }
+</script>