修改bug
This commit is contained in:
parent
1231dcc594
commit
80bca0599e
|
@ -129,4 +129,6 @@ public class TFwdtBkjxtkpj implements Serializable {
|
|||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
@ApiModelProperty(value = "时间戳")
|
||||
private Date timestamps;
|
||||
|
||||
private String kbbh;
|
||||
}
|
||||
|
|
|
@ -134,4 +134,6 @@ public class Xxhbbkjxtkpj implements Serializable {
|
|||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
@ApiModelProperty(value = "时间戳")
|
||||
private java.util.Date timestamps;
|
||||
|
||||
private String kbbh;
|
||||
}
|
||||
|
|
|
@ -410,7 +410,7 @@
|
|||
tingketime, tkrq, shijian, hq, mq,
|
||||
tk.kcmc, tk.ketangbiaoid, tk.skjs, tk.kkdw, tk.userid, tk.hh, tk.WEEK,
|
||||
ev.evaluationid, ev.evaluationver, ev.score, suibi.id as suibiId ,suibi.notes as suibiNotes ,
|
||||
tk.skdd, tk.skrq, tkpj.bh
|
||||
tk.skdd, tk.skrq, tkpj.bh,kt.kcbh
|
||||
FROM
|
||||
(
|
||||
SELECT
|
||||
|
@ -418,7 +418,7 @@
|
|||
IF (CURDATE()= DATE_FORMAT( tk.tingketime, '%Y/%m/%d' ),'',DATE_FORMAT( tk.tingketime, '%Y-%m-%d' )) AS tkrq,
|
||||
DATE_FORMAT( tk.tingketime, '%H:%i:%s' ) AS shijian,
|
||||
TIMESTAMPDIFF( HOUR, tk.tingketime, NOW() ) AS hq,
|
||||
TIMESTAMPDIFF( MINUTE, tk.tingketime, NOW() ) AS mq,
|
||||
TIMESTAMPDIFF( MINUTE, tk.tingketime, NOW() ) AS mq,kt.kcbh,
|
||||
kt.kcmc, kt.id AS ketangbiaoid, kt.skjs, kt.kkdw, tk.userid, kt.hh, kt.WEEK, kt.skdd, kt.skrq
|
||||
FROM
|
||||
kc_tingke tk,
|
||||
|
@ -468,9 +468,7 @@
|
|||
ORDER BY create_time DESC ) a
|
||||
GROUP BY user_id, ketangbiao_id
|
||||
) suibi on suibi.ketangbiao_id = tk.ketangbiaoid
|
||||
LEFT JOIN xxhbbkjxtkpj tkpj on tk.kcmc = tkpj.tkkcmc and tk.skdd = tkpj.tkjs
|
||||
and tk.skrq = replace(replace(substring(tkpj.tksjxq,instr(tkpj.tksjxq,'(')+1,10),'年','-'),'月','-')
|
||||
and tk.skjs = tkpj.rkjs
|
||||
LEFT JOIN xxhbbkjxtkpj tkpj on tk.kcbh = tkpj.kbbh
|
||||
|
||||
|
||||
<where>
|
||||
|
|
Loading…
Reference in New Issue