|
|
@@ -528,7 +528,7 @@ class ReportingWork extends Api
|
|
|
'b.Gy0_sj1' => ['>', '1900-01-01 00:00:00'],
|
|
|
])
|
|
|
->where('b.Gy0_sj1', '<', '2099-01-01 00:00:00')
|
|
|
- ->group('a.Gd_gdbh,b.Gy0_gxh')
|
|
|
+ ->group('a.Gd_gdbh,b.Gy0_yjno,b.Gy0_gxh')
|
|
|
->order('Gy0_sj1')
|
|
|
->select();
|
|
|
$start = date('Y-m-d H:i:s', time());
|