修改排序

jjt-biz/src/main/resources/mapper/calc/TwinCalcHourSpecMapper.xml

@@ -36,7 +36,7 @@
     <select id="selectTwinCalcHourSpecList" parameterType="TwinCalcHourSpec" resultMap="TwinCalcHourSpecResult">
         <include refid="selectTwinCalcHourSpecVo"/>
         <where>
-            <if test="dataDate != null ">and DATEADD(hour, -HOUR, DATA_DATE) = #{dataDate}</if>
+            <if test="dataDate != null ">and FORMAT(DATEADD(hour, HOUR - 7, DATA_DATE), 'yyyy-MM-dd') = #{dataDate}</if>
             <if test="hour != null ">and HOUR = #{hour}</if>
             <if test="deviceId != null ">and DEVICE_ID = #{deviceId}</if>
             <if test="length != null ">and LENGTH = #{length}</if>

jjt-biz/src/main/resources/mapper/emp/TwinEmpCalcMapper.xml

@@ -53,6 +53,7 @@
             <if test="price != null ">and PRICE = #{price}</if>
             <if test="totalPrice != null ">and TOTAL_PRICE = #{totalPrice}</if>
         </where>
+        order by EMP_DATE desc,EMP_TEAM,EMP_NAME,DEVICE_ID
     </select>
 
     <select id="selectTwinEmpCalcByCalcId" parameterType="Long" resultMap="TwinEmpCalcResult">