dcs 9 달 전
부모
커밋
116a6baa18

+ 2 - 2
virgo.api/src/main/java/com/bosshand/virgo/api/job/JobProjectWeeklyQuartz.java

@@ -61,8 +61,8 @@ public class JobProjectWeeklyQuartz extends QuartzJobBean {
         if (max != null) {
             int number = max.getNumber();
             weekly.setNumber(number + 1);
-            weekly.setStartDate(DateUtil.formatDateTime(jobExecutionContext.getFireTime()));
-            weekly.setEndDate(DateUtil.formatDateTime(jobExecutionContext.getNextFireTime()));
+            weekly.setStartDate(max.getEndDate());
+            weekly.setEndDate(DateUtil.formatDateTime(jobExecutionContext.getFireTime()));
         } else {
             weekly.setNumber(1);
             weekly.setStartDate(DateUtil.formatDateTime(createDate));

+ 1 - 1
virgo.api/src/main/resources/mapper/WeeklyMapper.xml

@@ -45,7 +45,7 @@
     </select>
 
     <select id="getMax" resultMap="weeklyResult">
-        SELECT * FROM weekly WHERE number=(SELECT Max(number) FROM weekly) and projectId  = #{projectId}
+        SELECT * FROM weekly WHERE projectId  = #{projectId} ORDER BY number DESC LIMIT 1
     </select>
 
     <select id="get" resultMap="weeklyResult">