更新时间字段更新
This commit is contained in:
parent
7fb5fc3d53
commit
1eee9bfe05
|
|
@ -49,7 +49,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
m1.qc_user AS qcUser,
|
||||
m1.qc_time AS qcTime,
|
||||
su.nick_name AS createBy,
|
||||
m1.create_time AS createTime
|
||||
m1.create_time AS updateTime,
|
||||
aa.create_time AS createTime
|
||||
FROM
|
||||
ma_dev_qc m1
|
||||
LEFT JOIN ma_dev_info m2 ON m1.ma_id = m2.ma_id
|
||||
|
|
@ -57,6 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
LEFT JOIN sys_user su ON su.user_id = m1.create_by
|
||||
INNER JOIN ( SELECT count(*) as num, ma_id, MAX( qc_time ) AS max_qc_time FROM ma_dev_qc GROUP BY ma_id ) latest_qc ON m1.ma_id = latest_qc.ma_id
|
||||
AND m1.qc_time = latest_qc.max_qc_time
|
||||
INNER JOIN ( SELECT ma_id, min( create_time ) AS create_time FROM ma_dev_qc GROUP BY ma_id ) aa ON m1.ma_id = aa.ma_id
|
||||
<where>
|
||||
<if test="deviceCode != null and deviceCode != ''">
|
||||
and m2.code like concat('%',#{deviceCode},'%')
|
||||
|
|
@ -74,11 +76,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
and DATE_FORMAT(m1.qc_time,'%Y-%m-%d') between #{qcStartTime} and #{qcEndTime}
|
||||
</if>
|
||||
<if test="createStartTime != null and createStartTime != '' and createEndTime != null and createEndTime != ''">
|
||||
and DATE_FORMAT(m1.update_time,'%Y-%m-%d') between #{createStartTime} and #{createEndTime}
|
||||
and DATE_FORMAT(m1.create_time,'%Y-%m-%d') between #{createStartTime} and #{createEndTime}
|
||||
</if>
|
||||
</where>
|
||||
ORDER BY
|
||||
m1.qc_time DESC
|
||||
</select>
|
||||
<select id="selectQcList" resultType="com.bonus.material.device.domain.MaDevQc">
|
||||
SELECT
|
||||
|
|
|
|||
Loading…
Reference in New Issue