DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '0.8.X' of http://49.232.154.205:10100/DeXun/klp-oa into 0.8.X

Browse Source
This commit is contained in:
砂糖
2026-06-03 14:53:14 +08:00
parent 53b991242c 7b80ef035a
commit 6fe1f668d3
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
klp-mes/src/main/resources/mapper/roll/MesRollGrindMapper.xml
View File

@@ -10,7 +10,7 @@
operator, remark, create_time operator, remark, create_time
FROM mes_roll_grind FROM mes_roll_grind
WHERE del_flag = 0 AND roll_id = #{rollId} WHERE del_flag = 0 AND roll_id = #{rollId}
ORDER BY grind_time ASC, grind_id ASC ORDER BY grind_time Desc
</select> </select>
<select id="selectList" resultType="com.klp.mes.roll.domain.vo.MesRollGrindVo"> <select id="selectList" resultType="com.klp.mes.roll.domain.vo.MesRollGrindVo">
@@ -29,7 +29,7 @@
<if test="endTime != null and endTime != ''">AND g.grind_time &lt;= #{endTime}</if> <if test="endTime != null and endTime != ''">AND g.grind_time &lt;= #{endTime}</if>
<if test="team != null and team != ''">AND g.team = #{team}</if> <if test="team != null and team != ''">AND g.team = #{team}</if>
<if test="rollType != null and rollType != ''">AND ri.roll_type = #{rollType}</if> <if test="rollType != null and rollType != ''">AND ri.roll_type = #{rollType}</if>
ORDER BY g.grind_time DESC, g.grind_id ASC ORDER BY g.grind_time DESC
</select> </select>
<select id="selectMonthlyStats" resultType="map"> <select id="selectMonthlyStats" resultType="map">