svnno****@sourc*****
svnno****@sourc*****
2008年 12月 1日 (月) 23:26:07 JST
Revision: 1492
http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1492
Author: shinsuke
Date: 2008-12-01 23:26:07 +0900 (Mon, 01 Dec 2008)
Log Message:
-----------
skipped update sql.
Modified Paths:
--------------
timecard/trunk/src/main/java/jp/sf/pal/timecard/service/ReportService.java
-------------- next part --------------
Modified: timecard/trunk/src/main/java/jp/sf/pal/timecard/service/ReportService.java
===================================================================
--- timecard/trunk/src/main/java/jp/sf/pal/timecard/service/ReportService.java 2008-12-01 14:25:20 UTC (rev 1491)
+++ timecard/trunk/src/main/java/jp/sf/pal/timecard/service/ReportService.java 2008-12-01 14:26:07 UTC (rev 1492)
@@ -189,17 +189,28 @@
&& dailyReport.getDayOfWeek() != 6
&& !TimecardUtil.checkHoliday(year, month, dailyReport
.getDate())) {
- dailyReport
- .setDateType(TimecardConstants.DATE_TYPE_WORKING);
- dailyReport
- .setWorkingType(TimecardConstants.WORKING_TYPE_WORK);
+ if (TimecardConstants.DATE_TYPE_WORKING != dailyReport
+ .getDateType()
+ || TimecardConstants.WORKING_TYPE_WORK != dailyReport
+ .getWorkingType()) {
+ dailyReport
+ .setDateType(TimecardConstants.DATE_TYPE_WORKING);
+ dailyReport
+ .setWorkingType(TimecardConstants.WORKING_TYPE_WORK);
+ dailyReportBhv.update(dailyReport);
+ }
} else {
- dailyReport
- .setDateType(TimecardConstants.DATE_TYPE_HOLIDAY);
- dailyReport
- .setWorkingType(TimecardConstants.WORKING_TYPE_HOLIDAY);
+ if (TimecardConstants.DATE_TYPE_HOLIDAY != dailyReport
+ .getDateType()
+ || TimecardConstants.WORKING_TYPE_HOLIDAY != dailyReport
+ .getWorkingType()) {
+ dailyReport
+ .setDateType(TimecardConstants.DATE_TYPE_HOLIDAY);
+ dailyReport
+ .setWorkingType(TimecardConstants.WORKING_TYPE_HOLIDAY);
+ dailyReportBhv.update(dailyReport);
+ }
}
- dailyReportBhv.update(dailyReport);
}
}
monthlyReport.setDailyReportList(dailyReportList);