Merge remote-tracking branch 'origin/master'

zss

2024-07-22 c0fd46ed9c7ddf7a3ea4e6a972474e9a62c68a1a

 performance-server/src/main/resources/mapper/PerformanceShiftMapper.xml

@@ -26,6 +26,7 @@
            </if>
        </where>
        GROUP BY u.id
        order by s.create_time
    </select>

    <select id="performanceShiftYearPage" resultType="map">
@@ -43,6 +44,7 @@
        </if>
        <if test="laboratory != null and laboratory != ''">
        </if>
        order by s.create_time
    </select>

    <select id="performanceShiftYear" resultType="java.util.Map">
@@ -63,7 +65,7 @@
        <if test="laboratory != null and laboratory != ''">
        </if>
        GROUP BY u.id
        order by s.work_time
        order by s.create_time
    </select>

    <select id="performanceShiftYearList" resultType="map">
@@ -84,7 +86,7 @@
        <if test="laboratory != null and laboratory != ''">
        </if>
        GROUP BY u.id
        order by s.work_time
        order by s.create_time
    </select>

    <select id="performanceShiftList" resultMap="performanceShiftPageMap">
@@ -104,5 +106,6 @@
            </if>
        </where>
        GROUP BY u.id
        order by s.create_time
    </select>
</mapper>