yangjun
/
dbsd_kczx_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改bug

This commit is contained in:
yangjun 2023-05-13 10:23:00 +08:00
parent 1231dcc594
commit 80bca0599e
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TFwdtBkjxtkpj.java
View File

@ -129,4 +129,6 @@ public class TFwdtBkjxtkpj implements Serializable {
@DateTimeFormat(pattern="yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "时间戳") @ApiModelProperty(value = "时间戳")
private Date timestamps; private Date timestamps;
private String kbbh;
} }

2
jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbbkjxtkpj.java
View File

@ -134,4 +134,6 @@ public class Xxhbbkjxtkpj implements Serializable {
@DateTimeFormat(pattern="yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "时间戳") @ApiModelProperty(value = "时间戳")
private java.util.Date timestamps; private java.util.Date timestamps;
private String kbbh;
} }

8
jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/mapper/xml/KcTingkeMapper.xml
View File

@ -410,7 +410,7 @@
tingketime, tkrq, shijian, hq, mq, tingketime, tkrq, shijian, hq, mq,
tk.kcmc, tk.ketangbiaoid, tk.skjs, tk.kkdw, tk.userid, tk.hh, tk.WEEK, 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 , 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 FROM
( (
SELECT SELECT
@ -418,7 +418,7 @@
IF (CURDATE()= DATE_FORMAT( tk.tingketime, '%Y/%m/%d' ),'',DATE_FORMAT( tk.tingketime, '%Y-%m-%d' )) AS tkrq, 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, DATE_FORMAT( tk.tingketime, '%H:%i:%s' ) AS shijian,
TIMESTAMPDIFF( HOUR, tk.tingketime, NOW() ) AS hq, 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 kt.kcmc, kt.id AS ketangbiaoid, kt.skjs, kt.kkdw, tk.userid, kt.hh, kt.WEEK, kt.skdd, kt.skrq
FROM FROM
kc_tingke tk, kc_tingke tk,
@ -468,9 +468,7 @@
ORDER BY create_time DESC ) a ORDER BY create_time DESC ) a
GROUP BY user_id, ketangbiao_id GROUP BY user_id, ketangbiao_id
) suibi on suibi.ketangbiao_id = tk.ketangbiaoid ) suibi on suibi.ketangbiao_id = tk.ketangbiaoid
LEFT JOIN xxhbbkjxtkpj tkpj on tk.kcmc = tkpj.tkkcmc and tk.skdd = tkpj.tkjs LEFT JOIN xxhbbkjxtkpj tkpj on tk.kcbh = tkpj.kbbh
and tk.skrq = replace(replace(substring(tkpj.tksjxq,instr(tkpj.tksjxq,'(')+1,10),'年','-'),'月','-')
and tk.skjs = tkpj.rkjs
<where> <where>