|
@@ -175,7 +175,7 @@ class Decision extends Api
|
|
|
'rtrim(d.版距)' => '版距'
|
|
'rtrim(d.版距)' => '版距'
|
|
|
])
|
|
])
|
|
|
->where($where)
|
|
->where($where)
|
|
|
- ->group('a.sczl_gdbh,a.sczl_yjno,a.sczl_gxh,a.sczl_rq')
|
|
|
|
|
|
|
+ ->group('a.sczl_gdbh,a.sczl_yjno,a.sczl_gxh,a.sczl_rq,a.sczl_bzdh')
|
|
|
->order('工作日期')
|
|
->order('工作日期')
|
|
|
->select();
|
|
->select();
|
|
|
if (!empty($list)){
|
|
if (!empty($list)){
|
|
@@ -308,7 +308,7 @@ class Decision extends Api
|
|
|
'rtrim(d.版距)' => '版距'
|
|
'rtrim(d.版距)' => '版距'
|
|
|
])
|
|
])
|
|
|
->where($where)
|
|
->where($where)
|
|
|
- ->group('a.sczl_rq,a.sczl_gdbh,a.sczl_rq')
|
|
|
|
|
|
|
+ ->group('a.sczl_rq,a.sczl_gdbh,a.sczl_rq,a.sczl_jtbh')
|
|
|
->order('a.sczl_rq')
|
|
->order('a.sczl_rq')
|
|
|
->select();
|
|
->select();
|
|
|
if (!empty($list)){
|
|
if (!empty($list)){
|
