IS_Trebic/isspst
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Refactor výpočtu vyúčtování služební cesty.

Browse Source 
closes #126
This commit is contained in:
Josef Rokos
2014-08-24 11:09:47 +02:00
parent ecd065eb51
commit 882e2d71c8
2 changed files with 34 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/info/bukova/isspst/services/tripbill/TripBillServiceImpl.java
+27 -37
View File
@@ -12,12 +12,14 @@ import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.concurrent.TimeUnit;
import org.hibernate.LazyInitializationException;
import org.hibernate.Query;
import org.joda.time.DateTime;
import org.joda.time.Days;
import org.joda.time.Hours;
import org.joda.time.LocalTime;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.transaction.annotation.Transactional;
@@ -33,7 +35,9 @@ public class TripBillServiceImpl extends AbstractOwnedService<TripBill> implemen
TripBill bill = new TripBill();
bill.setRequirement(requirement);
long daysCount = TimeUnit.DAYS.convert(requirement.getEndDate().getTime() - requirement.getTripDate().getTime(), TimeUnit.MILLISECONDS) + 1;
int daysCount = Days.daysBetween((new DateTime(requirement.getTripDate())).withTimeAtStartOfDay(),
(new DateTime(requirement.getEndDate())).withTimeAtStartOfDay()).getDays() + 1;
for (int i = 0 ; i < daysCount ; i++) {
TripBillItem item = new TripBillItem();
@@ -91,49 +95,35 @@ public class TripBillServiceImpl extends AbstractOwnedService<TripBill> implemen
}
private void calculateItem(TripBillItem item) {
Calendar cal = Calendar.getInstance();
Date to = item.getToArrival();
if (to == null) {
to = new Date();
cal.setTime(to);
cal.set(Calendar.HOUR_OF_DAY, 0);
cal.set(Calendar.MINUTE, 0);
} else {
cal.setTime(to);
}
LocalTime timeTo;
LocalTime timeBack;
boolean allDay = false;
cal.set(Calendar.DAY_OF_MONTH, 1);
cal.set(Calendar.MONTH, 1);
cal.set(Calendar.YEAR, 2000);
to.setTime(cal.getTimeInMillis());
Date back = item.getBackDeparture();
if (item.getToArrival() == null) {
timeTo = (new LocalTime()).withHourOfDay(0).withMinuteOfHour(0);
} else {
timeTo = new LocalTime(item.getToArrival());
}
if (back == null) {
back = new Date(to.getTime());
if (item.getBackDeparture() == null) {
timeBack = (new LocalTime()).withHourOfDay(23).withMinuteOfHour(59);
allDay = true;
} else {
timeBack = new LocalTime(item.getBackDeparture());
}
cal.setTime(back);
if (back.equals(to)) {
cal.set(Calendar.HOUR_OF_DAY, 23);
cal.set(Calendar.MINUTE, 59);
}
cal.set(Calendar.DAY_OF_MONTH, 1);
cal.set(Calendar.MONTH, 1);
cal.set(Calendar.YEAR, 2000);
back.setTime(cal.getTimeInMillis());
if (to.getTime() > back.getTime()) {
if (timeTo.isAfter(timeBack)) {
item.setTotal(BigDecimal.ZERO);
return;
}
SettingsData settings = globalSettings.getSettings();
long hours = TimeUnit.HOURS.convert(back.getTime() - to.getTime(), TimeUnit.MILLISECONDS);
int hours = Hours.hoursBetween(timeTo, timeBack).getHours();
if (allDay) {
++hours;
}
int refundHour = 0;
List<Integer> refundHours = new ArrayList<Integer>(settings.getRefunds().keySet());
Collections.sort(refundHours);