Browse Source

费用详情列表导出新增节假日天数

anderx 5 months ago
parent
commit
16e9ae06e6

+ 1 - 1
src/main/java/com/goafanti/common/utils/DateUtils.java

@@ -423,7 +423,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
 	}
 
 	public static String formatDateYYYYMMdd(Date date) {
-		SimpleDateFormat format = new SimpleDateFormat(parsePatterns[1]);
+		SimpleDateFormat format = new SimpleDateFormat(parsePatterns[0]);
 		return format.format(date);
 	}
 	public static String formatDateChineseYYYYMMdd(Date date) {

+ 0 - 2
src/main/java/com/goafanti/expenseAccount/service/impl/ExpenseAccountServiceImpl.java

@@ -444,7 +444,6 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
         Integer statutoryDays = 0;
         //获取俩个日期之间的所有日期
         long days = DateUtils.getDaysBetween(e.getReleaseStart(),e.getReleaseEnd());
-        if (days>0){
             List<LegalHolidays> legalHolidays = legalHolidaysMapper.selectAll();
             //法定节假日
             Set<String> holidaysSet = legalHolidays.stream()
@@ -479,7 +478,6 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
                 }
             }
 
-        }
         return statutoryDays;
     }