Przeglądaj źródła

解决点小报错

wukai 2 miesięcy temu
rodzic
commit
9f51ebcfa5

+ 2 - 2
jjt-admin/src/test/java/com/jjt/dye/DyeTest.java

@@ -29,10 +29,10 @@ public class DyeTest {
     @Resource
     private IDyeHourLineService hourLineService;
     String st = "2025-11-04";
-    String ed = "2025-11-06";
+    String ed = "2025-11-07";
     LocalDate localDate = LocalDate.parse(st);
     LocalDate endDate = LocalDate.parse(ed);
-    LocalDateTime start = LocalDateTime.of(localDate, LocalTime.MIN).plusHours(18);
+    LocalDateTime start = LocalDateTime.of(localDate, LocalTime.MIN).plusHours(0);
 
     @Test
     public void calc() {

+ 10 - 7
jjt-biz/src/main/java/com/jjt/dye/mapper/DyeCalcHourMapper.java

@@ -1,8 +1,10 @@
 package com.jjt.dye.mapper;
 
+import com.jjt.dye.domain.DyeCalcHour;
+import org.apache.ibatis.annotations.Param;
+
 import java.util.Date;
 import java.util.List;
-import com.jjt.dye.domain.DyeCalcHour;
 
 /**
  * 小时统计数据Mapper接口
@@ -10,8 +12,7 @@ import com.jjt.dye.domain.DyeCalcHour;
  * @author wukai
  * @date 2025-11-01
  */
-public interface DyeCalcHourMapper
-{
+public interface DyeCalcHourMapper {
     /**
      * 查询小时统计数据
      *
@@ -59,17 +60,19 @@ public interface DyeCalcHourMapper
      * @return 结果
      */
     public int deleteDyeCalcHourByChId(Long chId);
-    
+
     /**
      * 按小时删除数据
+     *
      * @param date 时间
      * @param hour 小时
      */
-    void deleteByHour(Date date, int hour);
-    
+    void deleteByHour(@Param("date") Date date, @Param("hour") int hour);
+
     /**
      * 查询最后一条记录
+     *
      * @return DyeCalcHour
      */
     DyeCalcHour lastRecord();
-}
+}

+ 1 - 0
jjt-biz/src/main/resources/mapper/dye/DyeCalcHourMapper.xml

@@ -41,6 +41,7 @@
             <if test="paraValue != null ">and PARA_VALUE = #{paraValue}</if>
             <if test="paraMValue != null  and paraMValue != ''">and PARA_M_VALUE = #{paraMValue}</if>
         </where>
+        order by DATA_DATE, HOUR
     </select>
 
     <select id="selectDyeCalcHourByChId" parameterType="Long" resultMap="DyeCalcHourResult">