2
3
baichengfei 5 лет назад
Родитель
Сommit
9f7c46436a

+ 6 - 3
src/dashoo.cn/backend/api/business/oilsupplier/badrecord/badrecordservice.go

@@ -58,17 +58,20 @@ func (s *BadRecordService) GetMyPagingEntitiesWithOrderBytbl1(TableName, supTabl
 	var resultsSlice []map[string][]byte
 
 	//获取总记录数
-	sqlCount := `select count(*) from ` + TableName
-	//sqlCount += ` left join ` + supTableName + " b on (b.SupplierId = a.Id)"
+	sqlCount := `select count(*) from ` + TableName + ` a `
+	sqlCount += ` left join ` + supTableName + " b on (b.SupplierId = a.CompanyCode)"
 	sqlCount += ` where ` + where
+	sqlCount += ` AND b.CertSubStatus = '2' `
+	sqlCount += ` GROUP BY a.Id `
 
 	var sql string
 	sql = `select a.Id, a.CompanyName, a.CompanyCode, a.CategoryName, a.CategoryCode, a.Record, a.Bak2, a.Bak3, 
 			a.Bak4, a.WZStatus, a.WZRecord, a.JJStatus, a.JJRecord, a.JFStatus, a.JFRecord, a.CertRecord
 			, a.Remark, a.CreateOn, a.CreateUserId, a.CreateBy,count(b.Id) as Bak1 `
 	sql += ` from ` + TableName + ` a `
-	sql += ` left join ` + supTableName + " b on (b.SupplierId = a.CompanyCode AND b.CertSubStatus = '2')"
+	sql += ` left join ` + supTableName + " b on (b.SupplierId = a.CompanyCode)"
 	sql += ` where ` + where
+	sql += ` AND b.CertSubStatus = '2' `
 	sql += ` GROUP BY a.Id `
 	if asc {
 		sql += ` order by ` + orderby + ` ASC `

+ 2 - 2
src/dashoo.cn/backend/api/controllers/oilsupplier/badrecord.go

@@ -50,10 +50,10 @@ func (this *BadRecordController) GetTList() {
 		if len(dates) == 2 {
 			minDate := dates[0]
 			maxDate := dates[1]
-			where = where + " and CreateOn>='" + minDate + "' and CreateOn<='" + maxDate + "'"
+			where = where + " and a.CreateOn >= '" + minDate + "' and a.CreateOn <= '" + maxDate + "'"
 		}
 	}
-	orderby := "Id"
+	orderby := "a.Id"
 	asc := false
 
 	svc := BadRecord.GetBadRecordService(utils.DBE) //获得数据库引擎