|
|
@@ -110,11 +110,12 @@ class MachineProductionReport extends Api
|
|
|
$this->error('请求方式错误');
|
|
|
}
|
|
|
|
|
|
+ $date = date('Y-m-d',strtotime("-1 year"));
|
|
|
$sql = 'SELECT t1.`sczl_gdbh`,t2.`yj_yjmc`
|
|
|
FROM (
|
|
|
- SELECT DISTINCT `sczl_gdbh`, sczl_yjno FROM `db_sczl`
|
|
|
+ SELECT DISTINCT `sczl_gdbh`, sczl_yjno FROM `db_sczl` where sys_rq >"'.$date.'"
|
|
|
UNION
|
|
|
- SELECT DISTINCT `sczl_gdbh`, sczl_yjno FROM `设备_产量计酬` where sys_rq >"2023-01-01"
|
|
|
+ SELECT DISTINCT `sczl_gdbh`, sczl_yjno FROM `设备_产量计酬` where sys_rq >"'.$date.'"
|
|
|
) AS t1
|
|
|
JOIN `工单_印件资料` AS t2 ON t1.`sczl_gdbh` = t2.`Yj_Gdbh`
|
|
|
WHERE t1.sczl_yjno = t2.yj_Yjno
|