|
|
@@ -72,12 +72,12 @@ class PieceWorkSchedule extends Api
|
|
|
|
|
|
$rows = db()->table('db_wgjs')
|
|
|
->field('LEFT(wgjs_rq, 10) as wgjs_rq, UniqId,
|
|
|
- wgjs_bh1, CAST(wgjs_js1 AS SIGNED) as wgjs_js1, rtrim(wgjs_yy1) as wgjs_yy1,
|
|
|
- wgjs_bh2, CAST(wgjs_js2 AS SIGNED) as wgjs_js2, rtrim(wgjs_yy2) as wgjs_yy2,
|
|
|
- wgjs_bh3, CAST(wgjs_js3 AS SIGNED) as wgjs_js3, rtrim(wgjs_yy3) as wgjs_yy3,
|
|
|
- wgjs_bh4, CAST(wgjs_js4 AS SIGNED) as wgjs_js4, rtrim(wgjs_yy4) as wgjs_yy4,
|
|
|
- wgjs_bh5, CAST(wgjs_js5 AS SIGNED) as wgjs_js5, rtrim(wgjs_yy5) as wgjs_yy5,
|
|
|
- wgjs_bh6, CAST(wgjs_js6 AS SIGNED) as wgjs_js6, rtrim(wgjs_yy6) as wgjs_yy6')
|
|
|
+ wgjs_bh1, wgjs_js1, rtrim(wgjs_yy1) as wgjs_yy1,
|
|
|
+ wgjs_bh2, wgjs_js2, rtrim(wgjs_yy2) as wgjs_yy2,
|
|
|
+ wgjs_bh3, wgjs_js3, rtrim(wgjs_yy3) as wgjs_yy3,
|
|
|
+ wgjs_bh4, wgjs_js4, rtrim(wgjs_yy4) as wgjs_yy4,
|
|
|
+ wgjs_bh5, wgjs_js5, rtrim(wgjs_yy5) as wgjs_yy5,
|
|
|
+ wgjs_bh6, wgjs_js6, rtrim(wgjs_yy6) as wgjs_yy6')
|
|
|
->where($where)
|
|
|
->order('wgjs_rq desc, UniqId asc')
|
|
|
->page($page,$limit)
|
|
|
@@ -178,12 +178,12 @@ class PieceWorkSchedule extends Api
|
|
|
];
|
|
|
$rows = db()->table('db_wgjs')
|
|
|
->field('LEFT(db_wgjs.wgjs_rq, 10) as wgjs_rq,
|
|
|
- db_wgjs.wgjs_bh1,trim(rs1.所在部门) as 所在部门, CAST(db_wgjs.wgjs_js1 AS SIGNED) as wgjs_js1, rtrim(db_wgjs.wgjs_yy1) as wgjs_yy1,
|
|
|
- db_wgjs.wgjs_bh2, CAST(db_wgjs.wgjs_js2 AS SIGNED) as wgjs_js2, rtrim(db_wgjs.wgjs_yy2) as wgjs_yy2,
|
|
|
- db_wgjs.wgjs_bh3, CAST(db_wgjs.wgjs_js3 AS SIGNED) as wgjs_js3, rtrim(db_wgjs.wgjs_yy3) as wgjs_yy3,
|
|
|
- db_wgjs.wgjs_bh4, CAST(db_wgjs.wgjs_js4 AS SIGNED) as wgjs_js4, rtrim(db_wgjs.wgjs_yy4) as wgjs_yy4,
|
|
|
- db_wgjs.wgjs_bh5, CAST(db_wgjs.wgjs_js5 AS SIGNED) as wgjs_js5, rtrim(db_wgjs.wgjs_yy5) as wgjs_yy5,
|
|
|
- db_wgjs.wgjs_bh6, CAST(db_wgjs.wgjs_js6 AS SIGNED) as wgjs_js6, rtrim(db_wgjs.wgjs_yy6) as wgjs_yy6,
|
|
|
+ db_wgjs.wgjs_bh1,trim(rs1.所在部门) as 所在部门, db_wgjs.wgjs_js1, rtrim(db_wgjs.wgjs_yy1) as wgjs_yy1,
|
|
|
+ db_wgjs.wgjs_bh2, db_wgjs.wgjs_js2, rtrim(db_wgjs.wgjs_yy2) as wgjs_yy2,
|
|
|
+ db_wgjs.wgjs_bh3, db_wgjs.wgjs_js3, rtrim(db_wgjs.wgjs_yy3) as wgjs_yy3,
|
|
|
+ db_wgjs.wgjs_bh4, db_wgjs.wgjs_js4, rtrim(db_wgjs.wgjs_yy4) as wgjs_yy4,
|
|
|
+ db_wgjs.wgjs_bh5, db_wgjs.wgjs_js5, rtrim(db_wgjs.wgjs_yy5) as wgjs_yy5,
|
|
|
+ db_wgjs.wgjs_bh6, db_wgjs.wgjs_js6, rtrim(db_wgjs.wgjs_yy6) as wgjs_yy6,
|
|
|
rtrim(rs1.员工姓名) as name1,rtrim(rs2.员工姓名) as name2,rtrim(rs3.员工姓名) as name3,
|
|
|
rtrim(rs4.员工姓名) as name4,rtrim(rs5.员工姓名) as name5,rtrim(rs6.员工姓名) as name6,
|
|
|
db_wgjs.UniqId')
|
|
|
@@ -224,12 +224,12 @@ class PieceWorkSchedule extends Api
|
|
|
|
|
|
$rows = db('db_wgjs')
|
|
|
->field('LEFT(wgjs_rq, 10) as wgjs_rq, db_wgjs.UniqId,
|
|
|
- wgjs_bh1, CAST(wgjs_js1 AS SIGNED) as wgjs_js1, rtrim(wgjs_yy1) as wgjs_yy1,
|
|
|
- wgjs_bh2, CAST(wgjs_js2 AS SIGNED) as wgjs_js2, rtrim(wgjs_yy2) as wgjs_yy2,
|
|
|
- wgjs_bh3, CAST(wgjs_js3 AS SIGNED) as wgjs_js3, rtrim(wgjs_yy3) as wgjs_yy3,
|
|
|
- wgjs_bh4, CAST(wgjs_js4 AS SIGNED) as wgjs_js4, rtrim(wgjs_yy4) as wgjs_yy4,
|
|
|
- wgjs_bh5, CAST(wgjs_js5 AS SIGNED) as wgjs_js5, rtrim(wgjs_yy5) as wgjs_yy5,
|
|
|
- wgjs_bh6, CAST(wgjs_js6 AS SIGNED) as wgjs_js6, rtrim(wgjs_yy6) as wgjs_yy6,
|
|
|
+ wgjs_bh1, wgjs_js1, rtrim(wgjs_yy1) as wgjs_yy1,
|
|
|
+ wgjs_bh2, wgjs_js2, rtrim(wgjs_yy2) as wgjs_yy2,
|
|
|
+ wgjs_bh3, wgjs_js3, rtrim(wgjs_yy3) as wgjs_yy3,
|
|
|
+ wgjs_bh4, wgjs_js4, rtrim(wgjs_yy4) as wgjs_yy4,
|
|
|
+ wgjs_bh5, wgjs_js5, rtrim(wgjs_yy5) as wgjs_yy5,
|
|
|
+ wgjs_bh6, wgjs_js6, rtrim(wgjs_yy6) as wgjs_yy6,
|
|
|
rtrim(rs1.员工姓名) as name1,rtrim(rs2.员工姓名) as name2,rtrim(rs3.员工姓名)
|
|
|
as name3,rtrim(rs4.员工姓名) as name4,rtrim(rs5.员工姓名) as name5,rtrim(rs6.员工姓名)
|
|
|
as name6,wgjs_冲定额1,wgjs_冲定额2,wgjs_冲定额3,wgjs_冲定额4,wgjs_冲定额5,wgjs_冲定额6')
|