亮灯记录

app/record/dao/lightRecordDao.go

@@ -50,11 +50,11 @@ func (l LightRecord) BatchCreate(record []edge_service.RecordLightUpData) error
 }
 
 // GetRecords 查记录
-func (c LightRecord) GetRecords(offset int, limit int, start, end string) ([]LightRecord, error) {
+func (c LightRecord) GetRecords(offset int, limit int, start, end, searchValue string) ([]LightRecord, error) {
 	var LightRecords []LightRecord
 	db := Db.Debug().Model(&c)
-	if c.LightControlSn != "" {
-		db = db.Where("light_control_sn like ? or lamp_pole_name like ?", "%"+c.LightControlSn+"%", "%"+c.LampPoleName+"%")
+	if searchValue != "" {
+		db = db.Where("light_control_sn like ? or lamp_pole_name like ?", "%"+searchValue+"%", "%"+searchValue+"%")
 	}
 	if start != "" {
 		start = start + " 00:00:00"

app/record/service/lightRecordService.go

@@ -13,13 +13,9 @@ type lightRecordService struct{}
 
 func (s *lightRecordService) List(searchValue, start, end string, id int, current int, size int) ([]dao.LightRecord, *common.Errors) {
 	var record dao.LightRecord
-	if searchValue != "" {
-		record.LampPoleSn = searchValue
-		record.LampPoleName = searchValue
-	}
 	offset := (current - 1) * size
 	limit := size
-	records, err := record.GetRecords(offset, limit, start, end)
+	records, err := record.GetRecords(offset, limit, start, end, searchValue)
 	if err != nil {
 		return nil, common.FailResponse(err.Error(), nil)
 	}