- CORRECCIÓN DEL HORARIO EN EL GUARDADO DE GATOS Y TRASFERENCIAS POR SUMA DE +7HR
This commit is contained in:
parent
d44659160b
commit
78d9e09391
@ -22,6 +22,7 @@ import com.arrebol.apc.model.ws.parsed.Exchange;
|
||||
import com.arrebol.apc.model.ws.parsed.ExchangeJaxb;
|
||||
import java.io.Serializable;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Calendar;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
@ -109,7 +110,12 @@ public class ExchangeEnebledUsersController implements Serializable {
|
||||
|
||||
parameters.add(new ModelParameter(TransferCfg.FIELD_ACTION_STATUS, isApproved ? ActionStatus.APPROVED : ActionStatus.REJECTED));
|
||||
parameters.add(new ModelParameter(TransferCfg.FIELD_LAST_UPDATED_BY, userId));
|
||||
parameters.add(new ModelParameter(TransferCfg.FIELD_LAST_UPDATED_ON, new Date()));
|
||||
Date date = new Date();
|
||||
Calendar calendar = Calendar.getInstance();
|
||||
calendar.setTime(date);
|
||||
calendar.add(Calendar.HOUR, -7);
|
||||
date = calendar.getTime();
|
||||
parameters.add(new ModelParameter(TransferCfg.FIELD_LAST_UPDATED_ON, date));
|
||||
parameters.add(new ModelParameter(TransferCfg.FIELD_ID, transerId));
|
||||
|
||||
return transferRepository.updateTransfer(TransferCfg.QUERY_UPDATE_TRANSFER_BY_ACTION, parameters);
|
||||
|
@ -113,7 +113,7 @@ public class OtherExpense implements Serializable {
|
||||
Date date = new Date();
|
||||
Calendar calendar = Calendar.getInstance();
|
||||
calendar.setTime(date);
|
||||
calendar.add(Calendar.DAY_OF_YEAR, -1);
|
||||
calendar.add(Calendar.HOUR, -7);
|
||||
date = calendar.getTime();
|
||||
this.createdOn = date;
|
||||
}
|
||||
|
@ -13,8 +13,8 @@ import com.arrebol.apc.model.enums.ActionStatus;
|
||||
import com.arrebol.apc.model.enums.ActiveStatus;
|
||||
import java.io.Serializable;
|
||||
import java.math.BigDecimal;
|
||||
import java.text.ParseException;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.Calendar;
|
||||
import java.util.Date;
|
||||
import java.util.logging.Level;
|
||||
import java.util.logging.Logger;
|
||||
@ -120,7 +120,12 @@ public class Transfer implements Serializable {
|
||||
this.amountToTransfer = amountToTransfer;
|
||||
this.office = office;
|
||||
this.createdBy = createdBy;
|
||||
this.createdOn = new Date();
|
||||
Date date = new Date();
|
||||
Calendar calendar = Calendar.getInstance();
|
||||
calendar.setTime(date);
|
||||
calendar.add(Calendar.HOUR, -7);
|
||||
date = calendar.getTime();
|
||||
this.createdOn = date;
|
||||
}
|
||||
|
||||
/**
|
||||
@ -283,11 +288,12 @@ public class Transfer implements Serializable {
|
||||
}
|
||||
|
||||
public String conditionEnabled() {
|
||||
if(getActiveStatus() == ActiveStatus.DISABLED)
|
||||
if (getActiveStatus() == ActiveStatus.DISABLED) {
|
||||
return "grayRow";
|
||||
else
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
|
Loading…
Reference in New Issue
Block a user