crovadmin/SISVECOM
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- APARTADO PARA CAPTURAR EL IDENTIFICADOR DE FOLIOS POR EMPLEADO EN EL REGISTRO

Browse Source 
- APARTADO PARA PODER EDITAR EL IDENTIFICADOR DE FOLIOS. 
- ACTUALIZACIÓN DEL WEB SERVIRSE PARA EL MANEJO DE LOS NUEVOS DATOS DE CAPTURA PARA LAS VENTAS "FACHADA DE LA CASA", "DESCRIPCIÓN", "LONGITUD" Y "LATITUD
- CORRECCIÓN DE ERROR AL CAPTURAR LOS PAGOS POR TRANSFERENCIA
- INVENTARIO DE PRODUCTOS SE AGREGARÁ USUARIO QUE HIZO EL MOVIMIENTO Y FECHA. TENDRA UNA EXPORTACION EN EXCEL.
This commit is contained in:
Brayan.Gonzalez 2025-07-28 12:19:25 -06:00
parent c25d8fb371
commit 0d10bf21e2
26 changed files with 3518 additions and 2836 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2413
apc-controller-mobile/src/main/java/com/arrebol/apc/controller/mobile/controller/loan/LoanController.java
View File

File diff suppressed because it is too large Load Diff

89
apc-controller-mobile/src/main/java/com/arrebol/apc/controller/mobile/controller/login/LoginWSController.java
View File

@ -1,8 +1,8 @@
/* /*
* Arrebol Consultancy copyright. * Arrebol Consultancy copyright.
* *
* This code belongs to Arrebol Consultancy * This code belongs to Arrebol Consultancy
* its use, redistribution or modification are prohibited * its use, redistribution or modification are prohibited
* without written authorization from Arrebol Consultancy. * without written authorization from Arrebol Consultancy.
*/ */
package com.arrebol.apc.controller.mobile.controller.login; package com.arrebol.apc.controller.mobile.controller.login;
@ -24,57 +24,58 @@ import org.apache.logging.log4j.Logger;
*/ */
public class LoginWSController implements Serializable { public class LoginWSController implements Serializable {
public UserMxy login(String userName, String password) throws Exception { public UserMxy login(String userName, String password) throws Exception {
logger.debug("login"); logger.debug("login");
UserMxy userMxy; UserMxy userMxy;
List<UserPreferenceMxy> preferenceLst; List<UserPreferenceMxy> preferenceLst;
try { try {
MobileUser mobileUser = getAuthenticationRepository().findUser(userName, password); MobileUser mobileUser = getAuthenticationRepository().findUser(userName, password);
if (null == mobileUser) { if (null == mobileUser) {
throw new Exception("Access denied"); throw new Exception("Access denied");
} else { } else {
userMxy = new UserMxy( userMxy = new UserMxy(
mobileUser.getId(), mobileUser.getId(),
mobileUser.getUserName(), mobileUser.getUserName(),
mobileUser.getAvatar(), mobileUser.getAvatar(),
mobileUser.getOfficeId(), mobileUser.getOfficeId(),
mobileUser.getRouteId(), mobileUser.getRouteId(),
mobileUser.getCertifier(), mobileUser.getCertifier(),
mobileUser.getManagement().toString() mobileUser.getManagement().toString(),
); mobileUser.getIdentificadorFolio()
} );
}
List<UserMobilePreference> userMobilePreferences = getAuthenticationRepository().findAllMobilePreferenceByUser(userMxy.getId()); List<UserMobilePreference> userMobilePreferences = getAuthenticationRepository().findAllMobilePreferenceByUser(userMxy.getId());
if (!userMobilePreferences.isEmpty()) { if (!userMobilePreferences.isEmpty()) {
preferenceLst = new ArrayList<>(); preferenceLst = new ArrayList<>();
userMobilePreferences.forEach((preference) -> { userMobilePreferences.forEach((preference) -> {
preferenceLst.add(new UserPreferenceMxy(preference.getPreferenceName(), preference.getPreferenceValue())); preferenceLst.add(new UserPreferenceMxy(preference.getPreferenceName(), preference.getPreferenceValue()));
}); });
userMxy.setPreferences(preferenceLst); userMxy.setPreferences(preferenceLst);
} }
} catch (Exception e) { } catch (Exception e) {
logger.error("login", e); logger.error("login", e);
throw e; throw e;
} }
return userMxy; return userMxy;
} }
public LoginWSController() { public LoginWSController() {
this.authenticationRepository = new AuthenticationRepository(); this.authenticationRepository = new AuthenticationRepository();
} }
public AuthenticationRepository getAuthenticationRepository() { public AuthenticationRepository getAuthenticationRepository() {
return authenticationRepository; return authenticationRepository;
} }
private static final long serialVersionUID = 2795964728722199660L; private static final long serialVersionUID = 2795964728722199660L;
final Logger logger = LogManager.getLogger(LoginWSController.class); final Logger logger = LogManager.getLogger(LoginWSController.class);
private final AuthenticationRepository authenticationRepository; private final AuthenticationRepository authenticationRepository;
} }

183
apc-controller-mobile/src/main/java/com/arrebol/apc/controller/mobile/moxy/login/UserMxy.java
View File

@ -1,8 +1,8 @@
/* /*
* Arrebol Consultancy copyright. * Arrebol Consultancy copyright.
* *
* This code belongs to Arrebol Consultancy * This code belongs to Arrebol Consultancy
* its use, redistribution or modification are prohibited * its use, redistribution or modification are prohibited
* without written authorization from Arrebol Consultancy. * without written authorization from Arrebol Consultancy.
*/ */
package com.arrebol.apc.controller.mobile.moxy.login; package com.arrebol.apc.controller.mobile.moxy.login;
@ -16,106 +16,117 @@ import java.util.List;
*/ */
public class UserMxy extends PersonMxy { public class UserMxy extends PersonMxy {
private String userName; private String userName;
private String officeId; private String officeId;
private String routeId; private String routeId;
private String certifier; private String certifier;
private String management; private String management;
private String identificadorFolio;
private List<UserPreferenceMxy> preferences; private List<UserPreferenceMxy> preferences;
public UserMxy() { public UserMxy() {
} }
/** /**
* *
* @param id * @param id
* @param userName * @param userName
* @param thumbnail * @param thumbnail
* @param officeId * @param officeId
* @param routeId * @param routeId
* @param certifier * @param certifier
*/ */
public UserMxy(String id, String userName, String thumbnail, String officeId, String routeId, String certifier) { public UserMxy(String id, String userName, String thumbnail, String officeId, String routeId, String certifier) {
this.id = id; this.id = id;
this.userName = userName; this.userName = userName;
this.thumbnail = thumbnail; this.thumbnail = thumbnail;
this.officeId = officeId; this.officeId = officeId;
this.routeId = routeId; this.routeId = routeId;
this.certifier = certifier; this.certifier = certifier;
} }
/** /**
* *
* @param id * @param id
* @param userName * @param userName
* @param thumbnail * @param thumbnail
* @param officeId * @param officeId
* @param routeId * @param routeId
* @param certifier * @param certifier
* @param management * @param management
*/ * @param identificadorFolio
public UserMxy(String id, String userName, String thumbnail, String officeId, String routeId, String certifier, String management) { */
this.id = id; public UserMxy(String id, String userName, String thumbnail, String officeId, String routeId, String certifier, String management, String identificadorFolio) {
this.userName = userName; this.id = id;
this.thumbnail = thumbnail; this.userName = userName;
this.officeId = officeId; this.thumbnail = thumbnail;
this.routeId = routeId; this.officeId = officeId;
this.certifier = certifier; this.routeId = routeId;
this.management = management; this.certifier = certifier;
} this.management = management;
this.identificadorFolio = identificadorFolio;
}
public String getUserName() { public String getUserName() {
return userName; return userName;
} }
public void setUserName(String userName) { public void setUserName(String userName) {
this.userName = userName; this.userName = userName;
} }
public String getOfficeId() { public String getOfficeId() {
return officeId; return officeId;
} }
public void setOfficeId(String officeId) { public void setOfficeId(String officeId) {
this.officeId = officeId; this.officeId = officeId;
} }
public void setPreferences(List<UserPreferenceMxy> preferences) { public void setPreferences(List<UserPreferenceMxy> preferences) {
this.preferences = preferences; this.preferences = preferences;
} }
public List<UserPreferenceMxy> getPreferences() { public List<UserPreferenceMxy> getPreferences() {
return preferences; return preferences;
} }
public String getRouteId() { public String getRouteId() {
return routeId; return routeId;
} }
public void setRouteId(String routeId) { public void setRouteId(String routeId) {
this.routeId = routeId; this.routeId = routeId;
} }
public String getCertifier() { public String getCertifier() {
return certifier; return certifier;
} }
public void setCertifier(String certifier) { public void setCertifier(String certifier) {
this.certifier = certifier; this.certifier = certifier;
} }
public String getManagement() { public String getManagement() {
return management; return management;
} }
public void setManagement(String management) { public void setManagement(String management) {
this.management = management; this.management = management;
} }
@Override public String getIdentificadorFolio() {
public String toString() { return identificadorFolio;
return "UserMxy{" + "userName=" + userName + ", preferences=" + preferences + '}'; }
}
public void setIdentificadorFolio(String identificadorFolio) {
this.identificadorFolio = identificadorFolio;
}
@Override
public String toString() {
return "UserMxy{" + "userName=" + userName + ", preferences=" + preferences + '}';
}
} }

75
apc-controller-mobile/src/main/java/com/arrebol/apc/controller/mobile/repository/views/LoanApprovedDetailViewRepository.java
View File

@ -12,9 +12,14 @@ import com.arrebol.apc.model.ModelParameter;
import com.arrebol.apc.model.enums.LoanDetailsType; import com.arrebol.apc.model.enums.LoanDetailsType;
import com.arrebol.apc.model.views.LoanApprovedDetailView; import com.arrebol.apc.model.views.LoanApprovedDetailView;
import com.arrebol.apc.model.ws.parsed.LoanDetailJaxb; import com.arrebol.apc.model.ws.parsed.LoanDetailJaxb;
import com.arrebol.apc.model.ws.parsed.LoanRequestedJaxb;
import com.arrebol.apc.model.ws.parsed.PersonJaxb;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.security.Timestamp;
import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date;
import java.util.List; import java.util.List;
import javax.persistence.Tuple; import javax.persistence.Tuple;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
@ -145,7 +150,8 @@ public class LoanApprovedDetailViewRepository extends GenericRepository implemen
tuple.get("fullNameVendedor", String.class), tuple.get("fullNameVendedor", String.class),
tuple.get("fullNameCliente", String.class), tuple.get("fullNameCliente", String.class),
tuple.get("numeroCuenta", String.class), tuple.get("numeroCuenta", String.class),
tuple.get("fullNameCrobrador", String.class) tuple.get("fullNameCrobrador", String.class),
tuple.get("folio", String.class)
); );
results.add(detail); results.add(detail);
@ -158,6 +164,73 @@ public class LoanApprovedDetailViewRepository extends GenericRepository implemen
} }
} }
/**
*
* @param xmlQuery
* @param parameters
* @return
* @throws Exception
*/
public LoanRequestedJaxb findLoanById(String xmlQuery, List<ModelParameter> parameters) throws Exception {
logger.debug("Consulta actual recibida: {}", xmlQuery);
logger.debug("findLoanById");
try {
List<Tuple> tuples = xmlQueryTuple(xmlQuery, parameters);
logger.info("Número de resultados: {}", tuples.size());
if (tuples.isEmpty()) {
return null;
}
Tuple tuple = tuples.get(0);
PersonJaxb customer = new PersonJaxb(tuple.get("customerName", String.class));
PersonJaxb endorsement = new PersonJaxb(tuple.get("endorsementName", String.class));
Object dateValue = tuple.get("strDate");
String formattedDate = null;
if (dateValue != null) {
if (dateValue instanceof Timestamp) {
formattedDate = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")
.format((Timestamp) dateValue);
} else if (dateValue instanceof Date) {
formattedDate = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")
.format((Date) dateValue);
} else if (dateValue instanceof String) {
formattedDate = (String) dateValue;
} else {
formattedDate = dateValue.toString();
}
}
String fachadaCasa = tuple.get("fachadaCasa") != null
? tuple.get("fachadaCasa", String.class) : "";
String descripcion = tuple.get("descripcion") != null
? tuple.get("descripcion", String.class) : "";
String latitud = tuple.get("latitud") != null
? tuple.get("latitud", String.class) : "";
String longitud = tuple.get("longitud") != null
? tuple.get("longitud", String.class) : "";
return new LoanRequestedJaxb(
customer,
endorsement,
formattedDate,
fachadaCasa,
descripcion,
latitud,
longitud,
tuple.get("loanDescription", String.class)
);
} catch (Exception e) {
logger.error("findLoanById", e);
throw e;
}
}
/** /**
* *
* @param idLoan * @param idLoan

5
apc-controller/src/main/java/com/arrebol/apc/controller/system/employee/EmployeeController.java
View File

@ -105,6 +105,11 @@ public class EmployeeController implements Serializable {
return humanResourceRepository.updateByHumanResourceId(hr, updateAvatar); return humanResourceRepository.updateByHumanResourceId(hr, updateAvatar);
} }
public boolean updateHumanResource(HumanResource hr) {
logger.debug("updateHumanResource");
return genericEntityRepository.updateAPCEntity(hr);
}
/** /**
* *
* @param status * @param status

38
apc-model/src/main/java/com/arrebol/apc/model/core/HumanResource.java
View File

@ -115,6 +115,20 @@ public class HumanResource implements Serializable {
@Column(name = "created_by", nullable = false, length = 36) @Column(name = "created_by", nullable = false, length = 36)
private String createdBy; private String createdBy;
@Column(name = "identificador_folio", nullable = false, length = 36)
private String identificadorFolio;
@Temporal(TemporalType.TIMESTAMP)
@Column(name = "ultima_modificacion_folio", length = 19)
private Date ultimaModificacionFolio;
@OneToOne(fetch = FetchType.LAZY)
@JoinColumn(
name = "usuario_ultima_modificacion_folio",
referencedColumnName = "id"
)
private User usuarioUltimaModificacionFolio;
@Temporal(TemporalType.TIMESTAMP) @Temporal(TemporalType.TIMESTAMP)
@Column(name = "created_on", length = 19) @Column(name = "created_on", length = 19)
private Date createdOn; private Date createdOn;
@ -420,6 +434,30 @@ public class HumanResource implements Serializable {
this.fullName = fullName; this.fullName = fullName;
} }
public String getIdentificadorFolio() {
return identificadorFolio;
}
public void setIdentificadorFolio(String identificadorFolio) {
this.identificadorFolio = identificadorFolio;
}
public Date getUltimaModificacionFolio() {
return ultimaModificacionFolio;
}
public void setUltimaModificacionFolio(Date ultimaModificacionFolio) {
this.ultimaModificacionFolio = ultimaModificacionFolio;
}
public User getUsuarioUltimaModificacionFolio() {
return usuarioUltimaModificacionFolio;
}
public void setUsuarioUltimaModificacionFolio(User usuarioUltimaModificacionFolio) {
this.usuarioUltimaModificacionFolio = usuarioUltimaModificacionFolio;
}
@Override @Override
public String toString() { public String toString() {
return "HumanResource{" + "firstName=" + firstName + ", secondName=" + secondName + ", lastName=" + lastName + ", middleName=" + middleName + '}'; return "HumanResource{" + "firstName=" + firstName + ", secondName=" + secondName + ", lastName=" + lastName + ", middleName=" + middleName + '}';

95
apc-model/src/main/java/com/arrebol/apc/model/core/constance/LoanCfg.java
View File

@ -1,8 +1,8 @@
/* /*
* Arrebol Consultancy copyright. * Arrebol Consultancy copyright.
* *
* This code belongs to Arrebol Consultancy * This code belongs to Arrebol Consultancy
* its use, redistribution or modification are prohibited * its use, redistribution or modification are prohibited
* without written authorization from Arrebol Consultancy. * without written authorization from Arrebol Consultancy.
*/ */
package com.arrebol.apc.model.core.constance; package com.arrebol.apc.model.core.constance;
@ -13,51 +13,52 @@ package com.arrebol.apc.model.core.constance;
*/ */
public interface LoanCfg extends GenericCfg { public interface LoanCfg extends GenericCfg {
String QUERY_UPDATE_LOAN_BY_ID = "updateLoanById"; String QUERY_UPDATE_LOAN_BY_ID = "updateLoanById";
String QUERY_UPDATE_LOAN_FROM_RENOVATION = "updateLoanFromRenovation"; String QUERY_UPDATE_LOAN_FROM_RENOVATION = "updateLoanFromRenovation";
String QUERY_UPDATE_LOAN_STATUS_WHERE_ID_IN = "updateLoanStatusWhereIdIn"; String QUERY_UPDATE_LOAN_STATUS_WHERE_ID_IN = "updateLoanStatusWhereIdIn";
String QUERY_UPDATE_LOAN_FROM_WEB = "updateLoanFromWeb"; String QUERY_UPDATE_LOAN_FROM_WEB = "updateLoanFromWeb";
String QUERY_FIND_LOAN_BY_CUSTOMER = "findLoansByCustomer"; String QUERY_FIND_LOAN_BY_ID = "findLoansById";
String QUERY_FIND_LOAN_JURIDICAL = "findLoansJuridical"; String QUERY_FIND_LOAN_BY_CUSTOMER = "findLoansByCustomer";
String QUERY_FIND_LOAN_ZERO = "findLoansZero"; String QUERY_FIND_LOAN_JURIDICAL = "findLoansJuridical";
String QUERY_FIND_LOAN_FINISHED = "findLoansFinished"; String QUERY_FIND_LOAN_ZERO = "findLoansZero";
String QUERY_FIND_LOAN_BY_ENDORSEMENT = "findLoansByEndorsement"; String QUERY_FIND_LOAN_FINISHED = "findLoansFinished";
String QUERY_UPDATE_LOAN_BY_ID_FROM_CERTIFIER_VIEW = "updateLoanByIdFromCertifiedView"; String QUERY_FIND_LOAN_BY_ENDORSEMENT = "findLoansByEndorsement";
String QUERY_UPDATE_LOAN_WITH_CREATED_ON_BY_ID_FROM_CERTIFIER_VIEW = "updateLoanWithCreatedOnByIdFromCertifiedView"; String QUERY_UPDATE_LOAN_BY_ID_FROM_CERTIFIER_VIEW = "updateLoanByIdFromCertifiedView";
String QUERY_UPDATE_AND_FINISH_LOAN_BY_ID = "updateAndFinishLoanById"; String QUERY_UPDATE_LOAN_WITH_CREATED_ON_BY_ID_FROM_CERTIFIER_VIEW = "updateLoanWithCreatedOnByIdFromCertifiedView";
String QUERY_UPDATE_DISCOUNT_AND_LOAN_BY_ID_FROM_CERTIFIER_VIEW = "updateDiscountAndLoanByIdFromCertifiedView"; String QUERY_UPDATE_AND_FINISH_LOAN_BY_ID = "updateAndFinishLoanById";
String QUERY_FIND_LOAN_DETAILS_CURDATE_BY_LOAN = "findLoanDetailsPaymentCurdateByLoan"; String QUERY_UPDATE_DISCOUNT_AND_LOAN_BY_ID_FROM_CERTIFIER_VIEW = "updateDiscountAndLoanByIdFromCertifiedView";
String QUERY_DELETE_LOAN_DETAILS_CURDATE_BY_LOAN = "deleteLoanDetailsPaymentCurdateByLoan"; String QUERY_FIND_LOAN_DETAILS_CURDATE_BY_LOAN = "findLoanDetailsPaymentCurdateByLoan";
String QUERY_SEARCH_PAYMENT_DETAILS = "searchPaymentDetails"; String QUERY_DELETE_LOAN_DETAILS_CURDATE_BY_LOAN = "deleteLoanDetailsPaymentCurdateByLoan";
String QUERY_UPDATE_ROUTE_BY_ID = "updateRouteFromLoan"; String QUERY_SEARCH_PAYMENT_DETAILS = "searchPaymentDetails";
String QUERY_FIND_LOAN_DETAILS_FEE_CURDATE_BY_LOAN = "findLoanDetailsFeeCurdateByLoan"; String QUERY_UPDATE_ROUTE_BY_ID = "updateRouteFromLoan";
String QUERY_DELETE_LOAN_DETAILS_FEE_CURDATE_BY_LOAN = "deleteLoanDetailsFeeCurdateByLoan"; String QUERY_FIND_LOAN_DETAILS_FEE_CURDATE_BY_LOAN = "findLoanDetailsFeeCurdateByLoan";
String QUERY_DELETE_LOAN_FEE_NOTIFICATION_CURDATE_BY_LOAN = "deleteLoanFeeNotificationCurdateByLoan"; String QUERY_DELETE_LOAN_DETAILS_FEE_CURDATE_BY_LOAN = "deleteLoanDetailsFeeCurdateByLoan";
String QUERY_DELETE_LOAN_FEE_NOTIFICATION_BY_LOAN = "deleteLoanFeeNotificationByLoan"; String QUERY_DELETE_LOAN_FEE_NOTIFICATION_CURDATE_BY_LOAN = "deleteLoanFeeNotificationCurdateByLoan";
String QUERY_UPDATE_LOAN_BONUS_NEW_CUSTOMER = "updateBonusNewCustomer"; String QUERY_DELETE_LOAN_FEE_NOTIFICATION_BY_LOAN = "deleteLoanFeeNotificationByLoan";
String QUERY_FIND_LAST_REFERENCE_NUMBER_BY_LOAN = "findLastReferenceNumberByLoan"; String QUERY_UPDATE_LOAN_BONUS_NEW_CUSTOMER = "updateBonusNewCustomer";
String QUERY_COUNT_LOAN_IN_STATUSES = "countLoanInStatuses"; String QUERY_FIND_LAST_REFERENCE_NUMBER_BY_LOAN = "findLastReferenceNumberByLoan";
String QUERY_COUNT_LOAN_BY_CUSTOMER_IN_STATUSES = "countLoanByCustomerInStatuses"; String QUERY_COUNT_LOAN_IN_STATUSES = "countLoanInStatuses";
String QUERY_SELECT_LOAN_ID_BY_CUSTOMER_IN_STATUSES = "selectLoanIdByCustomerInStatuses"; String QUERY_COUNT_LOAN_BY_CUSTOMER_IN_STATUSES = "countLoanByCustomerInStatuses";
String QUERY_SELECT_LOAN_ID_BY_CUSTOMER_IN_STATUSES = "selectLoanIdByCustomerInStatuses";
String QUERY_FIND_LOAN_BY_STATUS_PENDING = "findLoansByStatusPending"; String QUERY_FIND_LOAN_BY_STATUS_PENDING = "findLoansByStatusPending";
String QUERY_FIND_ALL_LOANS = "findAllLoans"; String QUERY_FIND_ALL_LOANS = "findAllLoans";
String QUERY_FIND_ALL_LOANS_VIEW = "findAllLoansView"; String QUERY_FIND_ALL_LOANS_VIEW = "findAllLoansView";
String QUERY_FIND_ALL_LOANS_VIEW_BY_START_AND_END_DATE = "findAllLoansViewByStartAndEndDate"; String QUERY_FIND_ALL_LOANS_VIEW_BY_START_AND_END_DATE = "findAllLoansViewByStartAndEndDate";
String QUERY_FIND_ALL_LOANS_JURIDICAL_VIEW_BY_START_AND_END_DATE = "findAllLoansJuridicalViewByStartAndEndDate"; String QUERY_FIND_ALL_LOANS_JURIDICAL_VIEW_BY_START_AND_END_DATE = "findAllLoansJuridicalViewByStartAndEndDate";
String QUERY_FIND_LOAN_DETAILS_BY_ID = "findLoansDetailById"; String QUERY_FIND_LOAN_DETAILS_BY_ID = "findLoansDetailById";
String FIELD_AMOUNT_PAID = "amountPaid"; String FIELD_AMOUNT_PAID = "amountPaid";
String FIELD_AMOUNT_TO_PAY = "amountToPay"; String FIELD_AMOUNT_TO_PAY = "amountToPay";
String FIELD_LAST_REFERENCE_NUMBER = "lastReferenceNumber"; String FIELD_LAST_REFERENCE_NUMBER = "lastReferenceNumber";
String FIELD_LOAN_STATUS = "loanStatus"; String FIELD_LOAN_STATUS = "loanStatus";
String FIELD_NEW_CUSTOMER = "newCustomer"; String FIELD_NEW_CUSTOMER = "newCustomer";
String FIELD_CUSTOMER = "customer"; String FIELD_CUSTOMER = "customer";
String FIELD_ENDORSEMENT = "endorsement"; String FIELD_ENDORSEMENT = "endorsement";
String FIELD_CUSTOMER_OFFICE = "customer.office"; String FIELD_CUSTOMER_OFFICE = "customer.office";
String FIELD_DETAILS_LOAN = "loan"; String FIELD_DETAILS_LOAN = "loan";
String FIELD_COMMENTS = "comments"; String FIELD_COMMENTS = "comments";
String FIELD_ROUTE = "routeCtlg"; String FIELD_ROUTE = "routeCtlg";
String FIELD_CREATED_ON = "createdOn"; String FIELD_CREATED_ON = "createdOn";
String FIELD_USER = "idUser"; String FIELD_USER = "idUser";
} }

39
apc-model/src/main/java/com/arrebol/apc/model/core/constance/LoanDetailsCfg.java
View File

@ -1,8 +1,8 @@
/* /*
* Arrebol Consultancy copyright. * Arrebol Consultancy copyright.
* *
* This code belongs to Arrebol Consultancy * This code belongs to Arrebol Consultancy
* its use, redistribution or modification are prohibited * its use, redistribution or modification are prohibited
* without written authorization from Arrebol Consultancy. * without written authorization from Arrebol Consultancy.
*/ */
package com.arrebol.apc.model.core.constance; package com.arrebol.apc.model.core.constance;
@ -13,23 +13,24 @@ package com.arrebol.apc.model.core.constance;
*/ */
public interface LoanDetailsCfg extends GenericCfg { public interface LoanDetailsCfg extends GenericCfg {
String QUERY_FIND_LOAN_DETAILS_BY_LOAN = "findLoanDetailsByLoan"; String QUERY_FIND_LOAN_DETAILS_BY_LOAN = "findLoanDetailsByLoan";
String QUERY_FIND_LOAN_DETAILS_FROM_TIKET_BY_LOAN = "findLoanDetailsFromTikedByLoan"; String QUERY_FIND_LOAN_DETAILS_FROM_TIKET_BY_LOAN = "findLoanDetailsFromTikedByLoan";
String QUERY_FIND_FEES_TO_PAY_BY_LOAN_ID = "findFeesToPayByLoanId"; String QUERY_FIND_LAST_LOAN_BY_USER = "findLatestFolioByUser";
String QUERY_FIND_ALL_FEES_BY_LOAN_ID = "findAllFeesByLoanId"; String QUERY_FIND_FEES_TO_PAY_BY_LOAN_ID = "findFeesToPayByLoanId";
String QUERY_UPDATE_PAID_FEES_STATUS_IN_LOAN_DETAILS_IDS = "updatePaidFeesStatusInLoanDetailIds"; String QUERY_FIND_ALL_FEES_BY_LOAN_ID = "findAllFeesByLoanId";
String QUERY_COUNT_LOAN_DETAILS_IN_CURRDATE = "countLoanDetailsInCurrdate"; String QUERY_UPDATE_PAID_FEES_STATUS_IN_LOAN_DETAILS_IDS = "updatePaidFeesStatusInLoanDetailIds";
String QUERY_FIND_ALL_TRANSFERS_LOAN_DETAIL = "findAllTransfersLoanDetail"; String QUERY_COUNT_LOAN_DETAILS_IN_CURRDATE = "countLoanDetailsInCurrdate";
String UPDATE_AUTHORIZE_LOAN_DETAIL = "updateAuthorizeTransferStatusInLoanDetailIds"; String QUERY_FIND_ALL_TRANSFERS_LOAN_DETAIL = "findAllTransfersLoanDetail";
String UPDATE_TRANSFER_STATUS_WHERE_ID_IN = "updateTransferStatusWhereIdIn"; String UPDATE_AUTHORIZE_LOAN_DETAIL = "updateAuthorizeTransferStatusInLoanDetailIds";
String UPDATE_REJECT_LOAN_DETAIL = "updateRejectTransferStatusInLoanDetailIds"; String UPDATE_TRANSFER_STATUS_WHERE_ID_IN = "updateTransferStatusWhereIdIn";
String COUNT_LOAN_DETAILS_AUTHORIZE = "countLoanDetailsAuthorize"; String UPDATE_REJECT_LOAN_DETAIL = "updateRejectTransferStatusInLoanDetailIds";
String COUNT_LOAN_DETAILS_AUTHORIZE = "countLoanDetailsAuthorize";
String FIELD_ID_LOAN = "loan"; String FIELD_ID_LOAN = "loan";
String FIELD_LOAN_DETAILS_TYPE = "loanDetailsType"; String FIELD_LOAN_DETAILS_TYPE = "loanDetailsType";
String FIELD_FEE_STATUS = "feeStatus"; String FIELD_FEE_STATUS = "feeStatus";
String FIELD_USER = "user"; String FIELD_USER = "user";
String FIELD_COMMENS = "comments"; String FIELD_COMMENS = "comments";
String FIELD_TRANSFER_STATUS = "transferStatus"; String FIELD_TRANSFER_STATUS = "transferStatus";
} }

82
apc-model/src/main/java/com/arrebol/apc/model/loan/Loan.java
View File

@ -121,6 +121,18 @@ public class Loan implements Serializable {
@Column(name = "frozen") @Column(name = "frozen")
private ActiveStatus frozen; private ActiveStatus frozen;
@Column(name = "fachada_casa", length = 200)
private String fachadaCasa;
@Column(name = "descripcion", length = 200)
private String descripcion;
@Column(name = "latitud", length = 200)
private String latitud;
@Column(name = "longitud", length = 200)
private String longitud;
@OneToMany( @OneToMany(
mappedBy = "loan", mappedBy = "loan",
cascade = CascadeType.ALL, cascade = CascadeType.ALL,
@ -230,6 +242,44 @@ public class Loan implements Serializable {
this.frozen = frozen; this.frozen = frozen;
} }
/**
*
* @param loanType
* @param customer
* @param endorsement
* @param routeCtlg
* @param loanStatus
* @param amountPaid
* @param amountToPay
* @param lastReferenceNumber
* @param createdBy
* @param createdOn
* @param newCustomer
* @param frozen
* @param fachadaCasa
* @param descripcion
* @param latitud
* @param longitud
*/
public Loan(LoanType loanType, People customer, People endorsement, RouteCtlg routeCtlg, LoanStatus loanStatus, BigDecimal amountPaid, BigDecimal amountToPay, Integer lastReferenceNumber, String createdBy, Date createdOn, ActiveStatus newCustomer, ActiveStatus frozen, String fachadaCasa, String descripcion, String latitud, String longitud) {
this.loanType = loanType;
this.customer = customer;
this.endorsement = endorsement;
this.routeCtlg = routeCtlg;
this.loanStatus = loanStatus;
this.amountPaid = amountPaid;
this.amountToPay = amountToPay;
this.lastReferenceNumber = lastReferenceNumber;
this.createdBy = createdBy;
this.createdOn = createdOn;
this.newCustomer = newCustomer;
this.fachadaCasa = fachadaCasa;
this.frozen = frozen;
this.descripcion = descripcion;
this.latitud = latitud;
this.longitud = longitud;
}
/** /**
* *
* @param id * @param id
@ -511,6 +561,38 @@ public class Loan implements Serializable {
this.frozen = frozen; this.frozen = frozen;
} }
public String getFachadaCasa() {
return fachadaCasa;
}
public void setFachadaCasa(String fachadaCasa) {
this.fachadaCasa = fachadaCasa;
}
public String getDescripcion() {
return descripcion;
}
public void setDescripcion(String descripcion) {
this.descripcion = descripcion;
}
public String getLatitud() {
return latitud;
}
public void setLatitud(String latitud) {
this.latitud = latitud;
}
public String getLongitud() {
return longitud;
}
public void setLongitud(String longitud) {
this.longitud = longitud;
}
@Override @Override
public String toString() { public String toString() {
return "Loan{" + "loanType=" + loanType + ", createdBy=" + createdBy + '}'; return "Loan{" + "loanType=" + loanType + ", createdBy=" + createdBy + '}';

572
apc-model/src/main/java/com/arrebol/apc/model/loan/LoanDetails.java
View File

@ -1,8 +1,8 @@
/* /*
* Arrebol Consultancy copyright. * Arrebol Consultancy copyright.
* *
* This code belongs to Arrebol Consultancy * This code belongs to Arrebol Consultancy
* its use, redistribution or modification are prohibited * its use, redistribution or modification are prohibited
* without written authorization from Arrebol Consultancy. * without written authorization from Arrebol Consultancy.
*/ */
package com.arrebol.apc.model.loan; package com.arrebol.apc.model.loan;
@ -38,308 +38,376 @@ import org.hibernate.annotations.GenericGenerator;
@Entity @Entity
@Table(name = "APC_LOAN_DETAIL", @Table(name = "APC_LOAN_DETAIL",
uniqueConstraints = { uniqueConstraints = {
@UniqueConstraint(columnNames = {"id", "reference_number"}, name = "apc_loan_details_uk") @UniqueConstraint(columnNames = {"id", "reference_number"}, name = "apc_loan_details_uk")
}) })
public class LoanDetails implements Serializable { public class LoanDetails implements Serializable {
private static final long serialVersionUID = -6757564734339598051L; private static final long serialVersionUID = -6757564734339598051L;
@Id @Id
@GeneratedValue(generator = "uuid") @GeneratedValue(generator = "uuid")
@GenericGenerator(name = "uuid", strategy = "uuid2") @GenericGenerator(name = "uuid", strategy = "uuid2")
@Column(name = "id", length = 36) @Column(name = "id", length = 36)
private String id; private String id;
@ManyToOne(fetch = FetchType.LAZY, optional = false) @ManyToOne(fetch = FetchType.LAZY, optional = false)
@JoinColumn( @JoinColumn(
name = "id_loan", name = "id_loan",
referencedColumnName = "id", referencedColumnName = "id",
nullable = false nullable = false
) )
private Loan loan; private Loan loan;
@ManyToOne(fetch = FetchType.LAZY, optional = false) @ManyToOne(fetch = FetchType.LAZY, optional = false)
@JoinColumn( @JoinColumn(
name = "id_user", name = "id_user",
referencedColumnName = "id", referencedColumnName = "id",
nullable = false nullable = false
) )
private User user; private User user;
@Enumerated(EnumType.STRING) @Enumerated(EnumType.STRING)
@Column(name = "people_type", nullable = false) @Column(name = "people_type", nullable = false)
private PeopleType peopleType; private PeopleType peopleType;
@Column(name = "payment_amount", nullable = false) @Column(name = "payment_amount", nullable = false)
private BigDecimal paymentAmount; private BigDecimal paymentAmount;
@Column(name = "reference_number") @Column(name = "reference_number")
private Integer referenceNumber; private Integer referenceNumber;
@Enumerated(EnumType.STRING) @Enumerated(EnumType.STRING)
@Column(name = "loan_details_type", nullable = false) @Column(name = "loan_details_type", nullable = false)
private LoanDetailsType loanDetailsType; private LoanDetailsType loanDetailsType;
@Column(name = "loan_comments", length = 150) @Column(name = "loan_comments", length = 150)
private String comments; private String comments;
@Enumerated(EnumType.STRING) @Column(name = "folio", length = 150)
@Column(name = "fee_status") private String folio;
private FeeStatus feeStatus;
@Enumerated(EnumType.STRING) @Enumerated(EnumType.STRING)
@Column(name = "transfer_status") @Column(name = "fee_status")
private TransferStatus transferStatus; private FeeStatus feeStatus;
@Column(name = "transfer_number", length = 150) @Enumerated(EnumType.STRING)
private String transferNumber; @Column(name = "transfer_status")
private TransferStatus transferStatus;
@Column(name = "created_by", nullable = false, length = 36) @Column(name = "transfer_number", length = 150)
private String createdBy; private String transferNumber;
@Temporal(TemporalType.TIMESTAMP) @Column(name = "created_by", nullable = false, length = 36)
@Column(name = "created_on", length = 19) private String createdBy;
private Date createdOn;
@Transient @Temporal(TemporalType.TIMESTAMP)
private BigDecimal saldoInsoluto; @Column(name = "created_on", length = 19)
private Date createdOn;
public LoanDetails() { @Transient
} private BigDecimal saldoInsoluto;
/** public LoanDetails() {
* }
* @param id
* @param createdOn
* @param feeStatus
*/
public LoanDetails(String id, Date createdOn, FeeStatus feeStatus) {
this.id = id;
this.createdOn = createdOn;
this.feeStatus = feeStatus;
}
/** /**
* Complete constructor. *
* * @param id
* @param id * @param createdOn
* @param loan * @param feeStatus
* @param peopleType */
* @param paymentAmount public LoanDetails(String id, Date createdOn, FeeStatus feeStatus) {
* @param loanDetailsType this.id = id;
* @param comments this.createdOn = createdOn;
* @param createdBy this.feeStatus = feeStatus;
* @param createdOn }
*/
public LoanDetails(String id, Loan loan, PeopleType peopleType, BigDecimal paymentAmount, LoanDetailsType loanDetailsType, String comments, String createdBy, Date createdOn) {
this.id = id;
this.loan = loan;
this.peopleType = peopleType;
this.paymentAmount = paymentAmount;
this.loanDetailsType = loanDetailsType;
this.comments = comments;
this.createdBy = createdBy;
this.createdOn = createdOn;
}
/** /**
* * Complete constructor.
* @param id *
* @param loan * @param id
* @param user * @param loan
* @param peopleType * @param peopleType
* @param referenceNumber * @param paymentAmount
* @param paymentAmount * @param loanDetailsType
* @param loanDetailsType * @param comments
* @param comments * @param createdBy
* @param createdBy * @param createdOn
* @param createdOn */
*/ public LoanDetails(String id, Loan loan, PeopleType peopleType, BigDecimal paymentAmount, LoanDetailsType loanDetailsType, String comments, String createdBy, Date createdOn) {
public LoanDetails(String id, Loan loan, User user, PeopleType peopleType, Integer referenceNumber, BigDecimal paymentAmount, LoanDetailsType loanDetailsType, String comments, String createdBy, Date createdOn) { this.id = id;
this.id = id; this.loan = loan;
this.loan = loan; this.peopleType = peopleType;
this.user = user; this.paymentAmount = paymentAmount;
this.peopleType = peopleType; this.loanDetailsType = loanDetailsType;
this.referenceNumber = referenceNumber; this.comments = comments;
this.paymentAmount = paymentAmount; this.createdBy = createdBy;
this.loanDetailsType = loanDetailsType; this.createdOn = createdOn;
this.comments = comments; }
this.createdBy = createdBy;
this.createdOn = createdOn;
}
/** /**
* Add new amount. *
* * @param id
* @param loan * @param loan
* @param user * @param user
* @param peopleType * @param peopleType
* @param paymentAmount * @param referenceNumber
* @param referenceNumber * @param paymentAmount
* @param loanDetailsType * @param loanDetailsType
* @param createdBy * @param comments
* @param createdOn * @param createdBy
* @param comments * @param createdOn
*/ */
public LoanDetails(Loan loan, User user, PeopleType peopleType, BigDecimal paymentAmount, Integer referenceNumber, LoanDetailsType loanDetailsType, String createdBy, Date createdOn, String comments) { public LoanDetails(String id, Loan loan, User user, PeopleType peopleType, Integer referenceNumber, BigDecimal paymentAmount, LoanDetailsType loanDetailsType, String comments, String createdBy, Date createdOn) {
this.loan = loan; this.id = id;
this.user = user; this.loan = loan;
this.peopleType = peopleType; this.user = user;
this.paymentAmount = paymentAmount; this.peopleType = peopleType;
this.referenceNumber = referenceNumber; this.referenceNumber = referenceNumber;
this.loanDetailsType = loanDetailsType; this.paymentAmount = paymentAmount;
this.createdBy = createdBy; this.loanDetailsType = loanDetailsType;
this.createdOn = createdOn; this.comments = comments;
this.comments = comments; this.createdBy = createdBy;
} this.createdOn = createdOn;
}
/** /**
* * Add new amount.
* @param loan *
* @param user * @param loan
* @param peopleType * @param user
* @param paymentAmount * @param peopleType
* @param referenceNumber * @param paymentAmount
* @param loanDetailsType * @param referenceNumber
* @param createdBy * @param loanDetailsType
* @param createdOn * @param createdBy
* @param comments * @param createdOn
* @param transferNumber * @param comments
* @param transferStatus */
*/ public LoanDetails(Loan loan, User user, PeopleType peopleType, BigDecimal paymentAmount, Integer referenceNumber, LoanDetailsType loanDetailsType, String createdBy, Date createdOn, String comments) {
public LoanDetails(Loan loan, User user, PeopleType peopleType, BigDecimal paymentAmount, Integer referenceNumber, LoanDetailsType loanDetailsType, String createdBy, Date createdOn, String comments, String transferNumber, TransferStatus transferStatus) { this.loan = loan;
this.loan = loan; this.user = user;
this.user = user; this.peopleType = peopleType;
this.peopleType = peopleType; this.paymentAmount = paymentAmount;
this.paymentAmount = paymentAmount; this.referenceNumber = referenceNumber;
this.referenceNumber = referenceNumber; this.loanDetailsType = loanDetailsType;
this.loanDetailsType = loanDetailsType; this.createdBy = createdBy;
this.createdBy = createdBy; this.createdOn = createdOn;
this.createdOn = createdOn; this.comments = comments;
this.comments = comments; }
this.transferNumber = transferNumber;
this.transferStatus = transferStatus;
}
public String getId() { /**
return id; * Add new amount.
} *
* @param loan
* @param user
* @param peopleType
* @param paymentAmount
* @param referenceNumber
* @param loanDetailsType
* @param createdBy
* @param createdOn
* @param comments
* @param folio
*/
public LoanDetails(Loan loan, User user, PeopleType peopleType, BigDecimal paymentAmount, Integer referenceNumber, LoanDetailsType loanDetailsType, String createdBy, Date createdOn, String comments, String folio) {
this.loan = loan;
this.user = user;
this.peopleType = peopleType;
this.paymentAmount = paymentAmount;
this.referenceNumber = referenceNumber;
this.loanDetailsType = loanDetailsType;
this.createdBy = createdBy;
this.createdOn = createdOn;
this.comments = comments;
this.folio = folio;
}
public void setId(String id) { /**
this.id = id; *
} * @param loan
* @param user
* @param peopleType
* @param paymentAmount
* @param referenceNumber
* @param loanDetailsType
* @param createdBy
* @param createdOn
* @param comments
* @param transferNumber
* @param transferStatus
*/
public LoanDetails(Loan loan, User user, PeopleType peopleType, BigDecimal paymentAmount, Integer referenceNumber, LoanDetailsType loanDetailsType, String createdBy, Date createdOn, String comments, String transferNumber, TransferStatus transferStatus) {
this.loan = loan;
this.user = user;
this.peopleType = peopleType;
this.paymentAmount = paymentAmount;
this.referenceNumber = referenceNumber;
this.loanDetailsType = loanDetailsType;
this.createdBy = createdBy;
this.createdOn = createdOn;
this.comments = comments;
this.transferNumber = transferNumber;
this.transferStatus = transferStatus;
}
public Loan getLoan() { /**
return loan; *
} * @param loan
* @param user
* @param peopleType
* @param paymentAmount
* @param referenceNumber
* @param loanDetailsType
* @param createdBy
* @param createdOn
* @param comments
* @param transferNumber
* @param transferStatus
* @param folio
*/
public LoanDetails(Loan loan, User user, PeopleType peopleType, BigDecimal paymentAmount, Integer referenceNumber, LoanDetailsType loanDetailsType, String createdBy, Date createdOn, String comments, String transferNumber, TransferStatus transferStatus, String folio) {
this.loan = loan;
this.user = user;
this.peopleType = peopleType;
this.paymentAmount = paymentAmount;
this.referenceNumber = referenceNumber;
this.loanDetailsType = loanDetailsType;
this.createdBy = createdBy;
this.createdOn = createdOn;
this.comments = comments;
this.transferNumber = transferNumber;
this.transferStatus = transferStatus;
this.folio = folio;
}
public void setLoan(Loan loan) { public String getId() {
this.loan = loan; return id;
} }
public PeopleType getPeopleType() { public void setId(String id) {
return peopleType; this.id = id;
} }
public void setPeopleType(PeopleType peopleType) { public Loan getLoan() {
this.peopleType = peopleType; return loan;
} }
public BigDecimal getPaymentAmount() { public void setLoan(Loan loan) {
return paymentAmount; this.loan = loan;
} }
public void setPaymentAmount(BigDecimal paymentAmount) { public PeopleType getPeopleType() {
this.paymentAmount = paymentAmount; return peopleType;
} }
public Integer getReferenceNumber() { public void setPeopleType(PeopleType peopleType) {
return referenceNumber; this.peopleType = peopleType;
} }
public void setReferenceNumber(Integer referenceNumber) { public BigDecimal getPaymentAmount() {
this.referenceNumber = referenceNumber; return paymentAmount;
} }
public LoanDetailsType getLoanDetailsType() { public void setPaymentAmount(BigDecimal paymentAmount) {
return loanDetailsType; this.paymentAmount = paymentAmount;
} }
public void setLoanDetailsType(LoanDetailsType loanDetailsType) { public Integer getReferenceNumber() {
this.loanDetailsType = loanDetailsType; return referenceNumber;
} }
public String getComments() { public void setReferenceNumber(Integer referenceNumber) {
return comments; this.referenceNumber = referenceNumber;
} }
public void setComments(String comments) { public LoanDetailsType getLoanDetailsType() {
this.comments = comments; return loanDetailsType;
} }
public FeeStatus getFeeStatus() { public void setLoanDetailsType(LoanDetailsType loanDetailsType) {
return feeStatus; this.loanDetailsType = loanDetailsType;
} }
public void setFeeStatus(FeeStatus feeStatus) { public String getComments() {
this.feeStatus = feeStatus; return comments;
} }
public TransferStatus getTransferStatus() { public void setComments(String comments) {
return transferStatus; this.comments = comments;
} }
public void setTransferStatus(TransferStatus transferStatus) { public FeeStatus getFeeStatus() {
this.transferStatus = transferStatus; return feeStatus;
} }
public String getTransferNumber() { public void setFeeStatus(FeeStatus feeStatus) {
return transferNumber; this.feeStatus = feeStatus;
} }
public void setTransferNumber(String transferNumber) { public TransferStatus getTransferStatus() {
this.transferNumber = transferNumber; return transferStatus;
} }
public String getCreatedBy() { public void setTransferStatus(TransferStatus transferStatus) {
return createdBy; this.transferStatus = transferStatus;
} }
public void setCreatedBy(String createdBy) { public String getTransferNumber() {
this.createdBy = createdBy; return transferNumber;
} }
public Date getCreatedOn() { public void setTransferNumber(String transferNumber) {
return createdOn; this.transferNumber = transferNumber;
} }
public void setCreatedOn(Date createdOn) { public String getCreatedBy() {
this.createdOn = createdOn; return createdBy;
} }
public User getUser() { public void setCreatedBy(String createdBy) {
return user; this.createdBy = createdBy;
} }
public void setUser(User user) { public Date getCreatedOn() {
this.user = user; return createdOn;
} }
public BigDecimal getSaldoInsoluto() { public void setCreatedOn(Date createdOn) {
return saldoInsoluto; this.createdOn = createdOn;
} }
public void setSaldoInsoluto(BigDecimal saldoInsoluto) { public User getUser() {
this.saldoInsoluto = saldoInsoluto; return user;
} }
public Double getAbonoD() { public void setUser(User user) {
return getPaymentAmount().doubleValue(); this.user = user;
} }
@Override public BigDecimal getSaldoInsoluto() {
public String toString() { return saldoInsoluto;
return "LoanDetails{" + "referenceNumber=" + referenceNumber + ", comments=" + comments + ", createdBy=" + createdBy + '}'; }
}
public void setSaldoInsoluto(BigDecimal saldoInsoluto) {
this.saldoInsoluto = saldoInsoluto;
}
public Double getAbonoD() {
return getPaymentAmount().doubleValue();
}
public String getFolio() {
return folio;
}
public void setFolio(String folio) {
this.folio = folio;
}
@Override
public String toString() {
return "LoanDetails{" + "referenceNumber=" + referenceNumber + ", comments=" + comments + ", createdBy=" + createdBy + '}';
}
} }

19
apc-model/src/main/java/com/arrebol/apc/model/loan/LoanType.java
View File

@ -8,6 +8,7 @@
package com.arrebol.apc.model.loan; package com.arrebol.apc.model.loan;
import com.arrebol.apc.model.core.Office; import com.arrebol.apc.model.core.Office;
import com.arrebol.apc.model.core.User;
import com.arrebol.apc.model.enums.ActiveStatus; import com.arrebol.apc.model.enums.ActiveStatus;
import com.arrebol.apc.model.enums.DaysInWeekend; import com.arrebol.apc.model.enums.DaysInWeekend;
import java.io.Serializable; import java.io.Serializable;
@ -120,6 +121,16 @@ public class LoanType implements Serializable {
@Column(name = "last_updated_by", length = 36) @Column(name = "last_updated_by", length = 36)
private String lastUpdatedBy; private String lastUpdatedBy;
@ManyToOne(fetch = FetchType.LAZY, optional = true)
@JoinColumn(
name = "last_updated_by",
referencedColumnName = "id",
nullable = true,
insertable = false,
updatable = false
)
private User lastUserModified;
@Temporal(TemporalType.TIMESTAMP) @Temporal(TemporalType.TIMESTAMP)
@Column(name = "last_updated_on", length = 19) @Column(name = "last_updated_on", length = 19)
private Date lastUpdatedOn; private Date lastUpdatedOn;
@ -325,6 +336,14 @@ public class LoanType implements Serializable {
this.lastUpdatedBy = lastUpdatedBy; this.lastUpdatedBy = lastUpdatedBy;
} }
public User getLastUserModified() {
return lastUserModified;
}
public void setLastUserModified(User lastUserModified) {
this.lastUserModified = lastUserModified;
}
public Date getLastUpdatedOn() { public Date getLastUpdatedOn() {
return lastUpdatedOn; return lastUpdatedOn;
} }

169
apc-model/src/main/java/com/arrebol/apc/model/mobile/access/MobileUser.java
View File

@ -1,8 +1,8 @@
/* /*
* Arrebol Consultancy copyright. * Arrebol Consultancy copyright.
* *
* This code belongs to Arrebol Consultancy * This code belongs to Arrebol Consultancy
* its use, redistribution or modification are prohibited * its use, redistribution or modification are prohibited
* without written authorization from Arrebol Consultancy. * without written authorization from Arrebol Consultancy.
*/ */
package com.arrebol.apc.model.mobile.access; package com.arrebol.apc.model.mobile.access;
@ -26,109 +26,120 @@ import org.hibernate.annotations.Immutable;
@Table(name = "APC_SECURITY_AUTHENTICATION_MOBILE") @Table(name = "APC_SECURITY_AUTHENTICATION_MOBILE")
public class MobileUser implements Serializable { public class MobileUser implements Serializable {
private static final long serialVersionUID = -6025180801746858060L; private static final long serialVersionUID = -6025180801746858060L;
@Id @Id
@Column(name = "id", length = 36) @Column(name = "id", length = 36)
private String id; private String id;
@Column(name = "user_name", length = 36) @Column(name = "user_name", length = 36)
private String userName; private String userName;
@Column(name = "pwd", length = 100) @Column(name = "pwd", length = 100)
private String password; private String password;
@Column(name = "avatar", length = 150) @Column(name = "avatar", length = 150)
private String avatar; private String avatar;
@Column(name = "id_office", length = 36) @Column(name = "id_office", length = 36)
private String officeId; private String officeId;
@Column(name = "id_route", length = 36) @Column(name = "id_route", length = 36)
private String routeId; private String routeId;
@Column(name = "certifier", length = 25) @Column(name = "certifier", length = 25)
private String certifier; private String certifier;
@Enumerated(EnumType.STRING) @Enumerated(EnumType.STRING)
@Column(name = "management", nullable = false) @Column(name = "management", nullable = false)
private ActiveStatus management; private ActiveStatus management;
public MobileUser() { @Column(name = "identificador_folio", length = 25)
} private String identificadorFolio;
public MobileUser(String userName, String password) { public MobileUser() {
this.userName = userName; }
this.password = password;
}
public String getId() { public MobileUser(String userName, String password) {
return id; this.userName = userName;
} this.password = password;
}
public void setId(String id) { public String getId() {
this.id = id; return id;
} }
public String getUserName() { public void setId(String id) {
return userName; this.id = id;
} }
public void setUserName(String userName) { public String getUserName() {
this.userName = userName; return userName;
} }
public String getPassword() { public void setUserName(String userName) {
return password; this.userName = userName;
} }
public void setPassword(String password) { public String getPassword() {
this.password = password; return password;
} }
public String getAvatar() { public void setPassword(String password) {
return avatar; this.password = password;
} }
public void setAvatar(String avatar) { public String getAvatar() {
this.avatar = avatar; return avatar;
} }
public String getOfficeId() { public void setAvatar(String avatar) {
return officeId; this.avatar = avatar;
} }
public void setOfficeId(String officeId) { public String getOfficeId() {
this.officeId = officeId; return officeId;
} }
public String getRouteId() { public void setOfficeId(String officeId) {
return routeId; this.officeId = officeId;
} }
public void setRouteId(String routeId) { public String getRouteId() {
this.routeId = routeId; return routeId;
} }
public String getCertifier() { public void setRouteId(String routeId) {
return certifier; this.routeId = routeId;
} }
public void setCertifier(String certifier) { public String getCertifier() {
this.certifier = certifier; return certifier;
} }
public ActiveStatus getManagement() { public void setCertifier(String certifier) {
return management; this.certifier = certifier;
} }
public void setManagement(ActiveStatus management) { public ActiveStatus getManagement() {
this.management = management; return management;
} }
@Override public void setManagement(ActiveStatus management) {
public String toString() { this.management = management;
return "Authentication{" + "userName=" + userName + '}'; }
}
public String getIdentificadorFolio() {
return identificadorFolio;
}
public void setIdentificadorFolio(String identificadorFolio) {
this.identificadorFolio = identificadorFolio;
}
@Override
public String toString() {
return "Authentication{" + "userName=" + userName + '}';
}
} }

13
apc-model/src/main/java/com/arrebol/apc/model/ws/parsed/LoanDetailJaxb.java
View File

@ -28,6 +28,7 @@ public class LoanDetailJaxb {
private String fullNameCliente; private String fullNameCliente;
private String numeroCuenta; private String numeroCuenta;
private String fullNameCrobrador; private String fullNameCrobrador;
private String folio;
public LoanDetailJaxb() { public LoanDetailJaxb() {
} }
@ -45,7 +46,7 @@ public class LoanDetailJaxb {
* @param numeroCuenta * @param numeroCuenta
* @param fullNameCrobrador * @param fullNameCrobrador
*/ */
public LoanDetailJaxb(String paymentDate, double paymentOfDay, double toPay, String comment, String paymentType, String fullNameVendedor, String fullNameCliente, String numeroCuenta, String fullNameCrobrador) { public LoanDetailJaxb(String paymentDate, double paymentOfDay, double toPay, String comment, String paymentType, String fullNameVendedor, String fullNameCliente, String numeroCuenta, String fullNameCrobrador, String folio) {
this.paymentDate = paymentDate; this.paymentDate = paymentDate;
this.paymentOfDay = paymentOfDay; this.paymentOfDay = paymentOfDay;
this.toPay = toPay; this.toPay = toPay;
@ -55,6 +56,7 @@ public class LoanDetailJaxb {
this.fullNameCliente = fullNameCliente; this.fullNameCliente = fullNameCliente;
this.numeroCuenta = numeroCuenta; this.numeroCuenta = numeroCuenta;
this.fullNameCrobrador = fullNameCrobrador; this.fullNameCrobrador = fullNameCrobrador;
this.folio = folio;
} }
/** /**
@ -180,6 +182,15 @@ public class LoanDetailJaxb {
this.fullNameCrobrador = fullNameCrobrador; this.fullNameCrobrador = fullNameCrobrador;
} }
@XmlElement(name = "folio")
public String getFolio() {
return folio;
}
public void setFolio(String folio) {
this.folio = folio;
}
@Override @Override
public String toString() { public String toString() {
return "LoanDetailJaxb{" + "paymentDate=" + paymentDate + ", paymentOfDay=" + paymentOfDay + ", toPay=" + toPay + ", payment=" + payment + '}'; return "LoanDetailJaxb{" + "paymentDate=" + paymentDate + ", paymentOfDay=" + paymentOfDay + ", toPay=" + toPay + ", payment=" + payment + '}';

211
apc-model/src/main/java/com/arrebol/apc/model/ws/parsed/LoanRequestedJaxb.java
View File

@ -1,8 +1,8 @@
/* /*
* Arrebol Consultancy copyright. * Arrebol Consultancy copyright.
* *
* This code belongs to Arrebol Consultancy * This code belongs to Arrebol Consultancy
* its use, redistribution or modification are prohibited * its use, redistribution or modification are prohibited
* without written authorization from Arrebol Consultancy. * without written authorization from Arrebol Consultancy.
*/ */
package com.arrebol.apc.model.ws.parsed; package com.arrebol.apc.model.ws.parsed;
@ -17,96 +17,157 @@ import javax.xml.bind.annotation.XmlRootElement;
@XmlRootElement(name = "loanRequested") @XmlRootElement(name = "loanRequested")
public class LoanRequestedJaxb { public class LoanRequestedJaxb {
private String loanTypeId; private String loanTypeId;
private String officeId; private String officeId;
private String userId; private String userId;
private String routeId; private String routeId;
private PersonJaxb customer; private PersonJaxb customer;
private PersonJaxb endorsement; private PersonJaxb endorsement;
private String strDate; private String strDate;
private String routeIdNewClient; private String routeIdNewClient;
private String fachadaCasa;
private String descripcion;
private String latitud;
private String longitud;
private String loanDescription;
public LoanRequestedJaxb() { public LoanRequestedJaxb(PersonJaxb customer, PersonJaxb endorsement, String strDate, String fachadaCasa, String descripcion, String latitud, String longitud, String loanDescription) {
} this.customer = customer;
this.endorsement = endorsement;
this.strDate = strDate;
this.fachadaCasa = fachadaCasa;
this.descripcion = descripcion;
this.latitud = latitud;
this.longitud = longitud;
this.loanDescription = loanDescription;
}
@XmlElement(name = "loanTypeId") public LoanRequestedJaxb() {
public String getLoanTypeId() { }
return loanTypeId;
}
public void setLoanTypeId(String loanTypeId) { @XmlElement(name = "loanTypeId")
this.loanTypeId = loanTypeId; public String getLoanTypeId() {
} return loanTypeId;
}
@XmlElement(name = "officeId") public void setLoanTypeId(String loanTypeId) {
public String getOfficeId() { this.loanTypeId = loanTypeId;
return officeId; }
}
public void setOfficeId(String officeId) { @XmlElement(name = "officeId")
this.officeId = officeId; public String getOfficeId() {
} return officeId;
}
@XmlElement(name = "userId") public void setOfficeId(String officeId) {
public String getUserId() { this.officeId = officeId;
return userId; }
}
public void setUserId(String userId) { @XmlElement(name = "userId")
this.userId = userId; public String getUserId() {
} return userId;
}
@XmlElement(name = "routeId") public void setUserId(String userId) {
public String getRouteId() { this.userId = userId;
return routeId; }
}
public void setRouteId(String routeId) { @XmlElement(name = "routeId")
this.routeId = routeId; public String getRouteId() {
} return routeId;
}
@XmlElement(name = "customer") public void setRouteId(String routeId) {
public PersonJaxb getCustomer() { this.routeId = routeId;
return customer; }
}
public void setCustomer(PersonJaxb customer) { @XmlElement(name = "customer")
this.customer = customer; public PersonJaxb getCustomer() {
} return customer;
}
@XmlElement(name = "endorsement") public void setCustomer(PersonJaxb customer) {
public PersonJaxb getEndorsement() { this.customer = customer;
return endorsement; }
}
public void setEndorsement(PersonJaxb endorsement) { @XmlElement(name = "endorsement")
this.endorsement = endorsement; public PersonJaxb getEndorsement() {
} return endorsement;
}
@XmlElement(name = "strDate") public void setEndorsement(PersonJaxb endorsement) {
public String getStrDate() { this.endorsement = endorsement;
return strDate; }
}
public void setStrDate(String strDate) { @XmlElement(name = "strDate")
this.strDate = strDate; public String getStrDate() {
} return strDate;
}
@XmlElement(name = "routeIdNewClient") public void setStrDate(String strDate) {
public String getRouteIdNewClient() { this.strDate = strDate;
return routeIdNewClient; }
}
public String chooseRouteId() { @XmlElement(name = "routeIdNewClient")
try { public String getRouteIdNewClient() {
return null == getRouteIdNewClient() || "".equals(getRouteIdNewClient()) ? getRouteId() : getRouteIdNewClient(); return routeIdNewClient;
} catch (Exception e) { }
return getRouteId();
}
}
public void setRouteIdNewClient(String routeIdNewClient) { public String chooseRouteId() {
this.routeIdNewClient = routeIdNewClient; try {
} return null == getRouteIdNewClient() || "".equals(getRouteIdNewClient()) ? getRouteId() : getRouteIdNewClient();
} catch (Exception e) {
return getRouteId();
}
}
public void setRouteIdNewClient(String routeIdNewClient) {
this.routeIdNewClient = routeIdNewClient;
}
@XmlElement(name = "fachadaCasa")
public String getFachadaCasa() {
return fachadaCasa;
}
public void setFachadaCasa(String fachadaCasa) {
this.fachadaCasa = fachadaCasa;
}
@XmlElement(name = "descripcion")
public String getDescripcion() {
return descripcion;
}
public void setDescripcion(String descripcion) {
this.descripcion = descripcion;
}
@XmlElement(name = "latitud")
public String getLatitud() {
return latitud;
}
public void setLatitud(String latitud) {
this.latitud = latitud;
}
@XmlElement(name = "longitud")
public String getLongitud() {
return longitud;
}
public void setLongitud(String longitud) {
this.longitud = longitud;
}
@XmlElement(name = "loanDescription")
public String getLoanDescription() {
return loanDescription;
}
public void setLoanDescription(String loanDescription) {
this.loanDescription = loanDescription;
}
} }

168
apc-model/src/main/java/com/arrebol/apc/model/ws/parsed/NewAmountJaxb.java
View File

@ -1,8 +1,8 @@
/* /*
* Arrebol Consultancy copyright. * Arrebol Consultancy copyright.
* *
* This code belongs to Arrebol Consultancy * This code belongs to Arrebol Consultancy
* its use, redistribution or modification are prohibited * its use, redistribution or modification are prohibited
* without written authorization from Arrebol Consultancy. * without written authorization from Arrebol Consultancy.
*/ */
package com.arrebol.apc.model.ws.parsed; package com.arrebol.apc.model.ws.parsed;
@ -18,101 +18,111 @@ import javax.xml.bind.annotation.XmlRootElement;
@XmlRootElement(name = "newAmount") @XmlRootElement(name = "newAmount")
public class NewAmountJaxb { public class NewAmountJaxb {
private String loanId; private String loanId;
private String userId; private String userId;
private String officeId; private String officeId;
private boolean customer; private boolean customer;
private BigDecimal amount; private BigDecimal amount;
private String strDate; private String strDate;
private boolean fee; private boolean fee;
private String comments; private String comments;
private Boolean manager; private Boolean manager;
private String folio;
public NewAmountJaxb() { public NewAmountJaxb() {
} }
@XmlAttribute(name = "loanId") @XmlAttribute(name = "loanId")
public String getLoanId() { public String getLoanId() {
return loanId; return loanId;
} }
public void setLoanId(String loanId) { public void setLoanId(String loanId) {
this.loanId = loanId; this.loanId = loanId;
} }
@XmlAttribute(name = "userId") @XmlAttribute(name = "userId")
public String getUserId() { public String getUserId() {
return userId; return userId;
} }
public void setUserId(String userId) { public void setUserId(String userId) {
this.userId = userId; this.userId = userId;
} }
@XmlAttribute(name = "officeId") @XmlAttribute(name = "officeId")
public String getOfficeId() { public String getOfficeId() {
return officeId; return officeId;
} }
public void setOfficeId(String officeId) { public void setOfficeId(String officeId) {
this.officeId = officeId; this.officeId = officeId;
} }
@XmlAttribute(name = "customer") @XmlAttribute(name = "customer")
public boolean isCustomer() { public boolean isCustomer() {
return customer; return customer;
} }
public void setCustomer(boolean customer) { public void setCustomer(boolean customer) {
this.customer = customer; this.customer = customer;
} }
@XmlAttribute(name = "amount") @XmlAttribute(name = "amount")
public BigDecimal getAmount() { public BigDecimal getAmount() {
return amount; return amount;
} }
public void setAmount(BigDecimal amount) { public void setAmount(BigDecimal amount) {
this.amount = amount; this.amount = amount;
} }
@XmlAttribute(name = "strDate") @XmlAttribute(name = "strDate")
public String getStrDate() { public String getStrDate() {
return strDate; return strDate;
} }
public void setStrDate(String strDate) { public void setStrDate(String strDate) {
this.strDate = strDate; this.strDate = strDate;
} }
@XmlAttribute(name = "fee") @XmlAttribute(name = "fee")
public boolean isFee() { public boolean isFee() {
return fee; return fee;
} }
public void setFee(boolean fee) { public void setFee(boolean fee) {
this.fee = fee; this.fee = fee;
} }
@XmlAttribute(name = "comments") @XmlAttribute(name = "comments")
public String getComments() { public String getComments() {
return comments; return comments;
} }
public void setComments(String comments) { public void setComments(String comments) {
this.comments = comments; this.comments = comments;
} }
@XmlAttribute(name = "manager") @XmlAttribute(name = "manager")
public Boolean getManager() { public Boolean getManager() {
if (null == manager) { if (null == manager) {
manager = false; manager = false;
} }
return manager; return manager;
} }
public void setManager(Boolean manager) { public void setManager(Boolean manager) {
this.manager = manager; this.manager = manager;
} }
@XmlAttribute(name = "folio")
public String getFolio() {
return folio;
}
public void setFolio(String folio) {
this.folio = folio;
}
} }

135
apc-model/src/main/java/com/arrebol/apc/model/ws/parsed/NewTransferAccountJaxb.java
View File

@ -1,8 +1,8 @@
/* /*
* Arrebol Consultancy copyright. * Arrebol Consultancy copyright.
* *
* This code belongs to Arrebol Consultancy * This code belongs to Arrebol Consultancy
* its use, redistribution or modification are prohibited * its use, redistribution or modification are prohibited
* without written authorization from Arrebol Consultancy. * without written authorization from Arrebol Consultancy.
*/ */
package com.arrebol.apc.model.ws.parsed; package com.arrebol.apc.model.ws.parsed;
@ -18,81 +18,90 @@ import javax.xml.bind.annotation.XmlRootElement;
@XmlRootElement(name = "newTransferAccount") @XmlRootElement(name = "newTransferAccount")
public class NewTransferAccountJaxb { public class NewTransferAccountJaxb {
private String loanId; private String loanId;
private String userId; private String userId;
private String officeId; private String officeId;
private BigDecimal amount; private BigDecimal amount;
private String comments; private String comments;
private String transferReference; private String transferReference;
private Boolean manager; private Boolean manager;
private String folio;
public NewTransferAccountJaxb() { public NewTransferAccountJaxb() {
} }
@XmlAttribute(name = "loanId") @XmlAttribute(name = "loanId")
public String getLoanId() { public String getLoanId() {
return loanId; return loanId;
} }
public void setLoanId(String loanId) { public void setLoanId(String loanId) {
this.loanId = loanId; this.loanId = loanId;
} }
@XmlAttribute(name = "userId") @XmlAttribute(name = "userId")
public String getUserId() { public String getUserId() {
return userId; return userId;
} }
public void setUserId(String userId) { public void setUserId(String userId) {
this.userId = userId; this.userId = userId;
} }
@XmlAttribute(name = "officeId") @XmlAttribute(name = "officeId")
public String getOfficeId() { public String getOfficeId() {
return officeId; return officeId;
} }
public void setOfficeId(String officeId) { public void setOfficeId(String officeId) {
this.officeId = officeId; this.officeId = officeId;
} }
@XmlAttribute(name = "amount") @XmlAttribute(name = "amount")
public BigDecimal getAmount() { public BigDecimal getAmount() {
return amount; return amount;
} }
public void setAmount(BigDecimal amount) { public void setAmount(BigDecimal amount) {
this.amount = amount; this.amount = amount;
} }
@XmlAttribute(name = "comments") @XmlAttribute(name = "comments")
public String getComments() { public String getComments() {
return comments; return comments;
} }
public void setComments(String comments) { public void setComments(String comments) {
this.comments = comments; this.comments = comments;
} }
@XmlAttribute(name = "transferReference") @XmlAttribute(name = "transferReference")
public String getTransferReference() { public String getTransferReference() {
return transferReference; return transferReference;
} }
public void setTransferReference(String transferReference) { public void setTransferReference(String transferReference) {
this.transferReference = transferReference; this.transferReference = transferReference;
} }
@XmlAttribute(name = "manager") @XmlAttribute(name = "manager")
public Boolean getManager() { public Boolean getManager() {
if (null == manager) { if (null == manager) {
manager = false; manager = false;
} }
return manager; return manager;
} }
public void setManager(Boolean manager) { public void setManager(Boolean manager) {
this.manager = manager; this.manager = manager;
} }
@XmlAttribute(name = "folio")
public String getFolio() {
return folio;
}
public void setFolio(String folio) {
this.folio = folio;
}
} }

204
apc-model/src/main/java/com/arrebol/apc/model/ws/parsed/PersonJaxb.java
View File

@ -1,8 +1,8 @@
/* /*
* Arrebol Consultancy copyright. * Arrebol Consultancy copyright.
* *
* This code belongs to Arrebol Consultancy * This code belongs to Arrebol Consultancy
* its use, redistribution or modification are prohibited * its use, redistribution or modification are prohibited
* without written authorization from Arrebol Consultancy. * without written authorization from Arrebol Consultancy.
*/ */
package com.arrebol.apc.model.ws.parsed; package com.arrebol.apc.model.ws.parsed;
@ -17,128 +17,132 @@ import javax.xml.bind.annotation.XmlRootElement;
@XmlRootElement(name = "person") @XmlRootElement(name = "person")
public class PersonJaxb { public class PersonJaxb {
private String id; private String id;
private String firstName; private String firstName;
private String secondName; private String secondName;
private String lastName; private String lastName;
private String middleName; private String middleName;
private String addressHome; private String addressHome;
private String addressWork; private String addressWork;
private String phoneHome; private String phoneHome;
private String phoneWork; private String phoneWork;
private String thumbnail; private String thumbnail;
private String companyName; private String companyName;
private boolean createPerson; private boolean createPerson;
public PersonJaxb() { public PersonJaxb(String firstName) {
} this.firstName = firstName;
}
@XmlElement(name = "id") public PersonJaxb() {
public String getId() { }
return id;
}
public void setId(String id) { @XmlElement(name = "id")
this.id = id; public String getId() {
} return id;
}
@XmlElement(name = "firstName") public void setId(String id) {
public String getFirstName() { this.id = id;
return firstName; }
}
public void setFirstName(String firstName) { @XmlElement(name = "firstName")
this.firstName = firstName; public String getFirstName() {
} return firstName;
}
@XmlElement(name = "secondName") public void setFirstName(String firstName) {
public String getSecondName() { this.firstName = firstName;
return secondName; }
}
public void setSecondName(String secondName) { @XmlElement(name = "secondName")
this.secondName = secondName; public String getSecondName() {
} return secondName;
}
@XmlElement(name = "lastName") public void setSecondName(String secondName) {
public String getLastName() { this.secondName = secondName;
return lastName; }
}
public void setLastName(String lastName) { @XmlElement(name = "lastName")
this.lastName = lastName; public String getLastName() {
} return lastName;
}
@XmlElement(name = "middleName") public void setLastName(String lastName) {
public String getMiddleName() { this.lastName = lastName;
return middleName; }
}
public void setMiddleName(String middleName) { @XmlElement(name = "middleName")
this.middleName = middleName; public String getMiddleName() {
} return middleName;
}
@XmlElement(name = "addressHome") public void setMiddleName(String middleName) {
public String getAddressHome() { this.middleName = middleName;
return addressHome; }
}
public void setAddressHome(String addressHome) { @XmlElement(name = "addressHome")
this.addressHome = addressHome; public String getAddressHome() {
} return addressHome;
}
@XmlElement(name = "addressWork") public void setAddressHome(String addressHome) {
public String getAddressWork() { this.addressHome = addressHome;
return addressWork; }
}
public void setAddressWork(String addressWork) { @XmlElement(name = "addressWork")
this.addressWork = addressWork; public String getAddressWork() {
} return addressWork;
}
@XmlElement(name = "phoneHome") public void setAddressWork(String addressWork) {
public String getPhoneHome() { this.addressWork = addressWork;
return phoneHome; }
}
public void setPhoneHome(String phoneHome) { @XmlElement(name = "phoneHome")
this.phoneHome = phoneHome; public String getPhoneHome() {
} return phoneHome;
}
@XmlElement(name = "phoneWork") public void setPhoneHome(String phoneHome) {
public String getPhoneWork() { this.phoneHome = phoneHome;
return phoneWork; }
}
public void setPhoneWork(String phoneWork) { @XmlElement(name = "phoneWork")
this.phoneWork = phoneWork; public String getPhoneWork() {
} return phoneWork;
}
@XmlElement(name = "thumbnail") public void setPhoneWork(String phoneWork) {
public String getThumbnail() { this.phoneWork = phoneWork;
return thumbnail; }
}
public void setThumbnail(String thumbnail) { @XmlElement(name = "thumbnail")
this.thumbnail = thumbnail; public String getThumbnail() {
} return thumbnail;
}
@XmlElement(name = "companyName") public void setThumbnail(String thumbnail) {
public String getCompanyName() { this.thumbnail = thumbnail;
return companyName; }
}
public void setCompanyName(String companyName) { @XmlElement(name = "companyName")
this.companyName = companyName; public String getCompanyName() {
} return companyName;
}
@XmlElement(name = "createPerson") public void setCompanyName(String companyName) {
public boolean isCreatePerson() { this.companyName = companyName;
return createPerson; }
}
public void setCreatePerson(boolean createPerson) { @XmlElement(name = "createPerson")
this.createPerson = createPerson; public boolean isCreatePerson() {
} return createPerson;
}
public void setCreatePerson(boolean createPerson) {
this.createPerson = createPerson;
}
} }

45
apc-model/src/main/resources/com/arrebol/apc/model/queries/loan/loan.details.queries.hbm.xml
View File

@ -23,7 +23,7 @@
]]> ]]>
</query> </query>
<query name="findLoanDetailsFromTikedByLoan"> <query name="findLoanDetailsFromTikedByLoan">
<![CDATA[ <![CDATA[
SELECT SELECT
DATE_FORMAT(ld.createdOn, '%d-%m-%Y') AS createdOn, DATE_FORMAT(ld.createdOn, '%d-%m-%Y') AS createdOn,
@ -43,7 +43,8 @@
CONCAT(perv.firstName, ' ', CONCAT(perv.firstName, ' ',
IFNULL(CONCAT(perv.secondName, ' '), ''), IFNULL(CONCAT(perv.secondName, ' '), ''),
perv.lastName, ' ', perv.lastName, ' ',
perv.middleName) AS fullNameCrobrador perv.middleName) AS fullNameCrobrador,
ld.folio AS folio
FROM FROM
LoanDetails ld LoanDetails ld
INNER JOIN Loan l ON ld.loan = l.id INNER JOIN Loan l ON ld.loan = l.id
@ -62,6 +63,46 @@
]]> ]]>
</query> </query>
<query name="findLatestFolioByUser">
<![CDATA[
SELECT
DATE_FORMAT(ld.createdOn, '%d-%m-%Y') AS createdOn,
ld.paymentAmount AS paymentAmount,
ld.loanDetailsType AS loanDetailsType,
lt.paymentTotal AS amountToPay,
ld.comments AS comments,
CONCAT(per.firstName, ' ',
IFNULL(CONCAT(per.secondName, ' '), ''),
per.lastName, ' ',
per.middleName) AS fullNameVendedor,
CONCAT(peo.firstName, ' ',
IFNULL(CONCAT(peo.secondName, ' '), ''),
peo.lastName, ' ',
IFNULL(peo.middleName, '')) AS fullNameCliente,
CONCAT(IFNULL(peo.contrato, ''), ' - ', IFNULL(rut.route, '')) AS numeroCuenta,
CONCAT(perv.firstName, ' ',
IFNULL(CONCAT(perv.secondName, ' '), ''),
perv.lastName, ' ',
perv.middleName) AS fullNameCrobrador,
ld.folio AS folio
FROM
LoanDetails ld
INNER JOIN Loan l ON ld.loan = l.id
INNER JOIN LoanType lt ON l.loanType = lt.id
INNER JOIN People peo ON l.customer.id = peo.id
INNER JOIN RouteCtlg rut ON peo.routeCtlg.id = rut.id
INNER JOIN User us ON ld.user.id = us.id
LEFT JOIN HumanResource per ON us.humanResource.id = per.id
INNER JOIN User ven ON ld.createdBy = ven.id
LEFT JOIN HumanResource perv ON ven.humanResource.id = perv.id
WHERE
ld.user = :user
ORDER BY
ld.createdOn,
ld.referenceNumber
]]>
</query>
<query name="findLoanDetailsPaymentCurdateByLoan"> <query name="findLoanDetailsPaymentCurdateByLoan">
<![CDATA[ <![CDATA[
SELECT SELECT

65
apc-model/src/main/resources/com/arrebol/apc/model/queries/loan/loan.queries.hbm.xml
View File

@ -272,6 +272,71 @@
]]> ]]>
</query> </query>
<query name="findLoansById">
<![CDATA[
SELECT
CONCAT(
CASE
WHEN cstmr.firstName IS NOT NULL
THEN CONCAT(SUBSTR(UPPER(cstmr.firstName), 1, 1),SUBSTR(LOWER(cstmr.firstName), 2), ' ')
ELSE ''
END,
CASE
WHEN cstmr.secondName IS NOT NULL
THEN CONCAT(SUBSTR(UPPER(cstmr.secondName), 1, 1),SUBSTR(LOWER(cstmr.secondName), 2), ' ')
ELSE ''
END,
CASE
WHEN cstmr.lastName IS NOT NULL
THEN CONCAT(SUBSTR(UPPER(cstmr.lastName), 1, 1),SUBSTR(LOWER(cstmr.lastName), 2), ' ')
ELSE ''
END,
CASE
WHEN cstmr.middleName IS NOT NULL
THEN CONCAT(SUBSTR(UPPER(cstmr.middleName), 1, 1),SUBSTR(LOWER(cstmr.middleName), 2))
ELSE ''
END
) AS customerName,
CONCAT(
CASE
WHEN ndrsmnt.firstName IS NOT NULL
THEN CONCAT(SUBSTR(UPPER(ndrsmnt.firstName), 1, 1),SUBSTR(LOWER(ndrsmnt.firstName), 2), ' ')
ELSE ''
END,
CASE
WHEN ndrsmnt.secondName IS NOT NULL
THEN CONCAT(SUBSTR(UPPER(ndrsmnt.secondName), 1, 1),SUBSTR(LOWER(ndrsmnt.secondName), 2), ' ')
ELSE ''
END,
CASE
WHEN ndrsmnt.lastName IS NOT NULL
THEN CONCAT(SUBSTR(UPPER(ndrsmnt.lastName), 1, 1),SUBSTR(LOWER(ndrsmnt.lastName), 2), ' ')
ELSE ''
END,
CASE
WHEN ndrsmnt.middleName IS NOT NULL
THEN CONCAT(SUBSTR(UPPER(ndrsmnt.middleName), 1, 1),SUBSTR(LOWER(ndrsmnt.middleName), 2))
ELSE ''
END
) AS endorsementName,
lo.createdOn AS strDate,
lo.fachadaCasa AS fachadaCasa,
lo.descripcion AS descripcion,
lo.latitud AS latitud,
lo.longitud AS longitud,
CONCAT(CAST(lt.payment AS string), ' - ', lt.loanTypeName) AS loanDescription
FROM
Loan lo
INNER JOIN LoanType lt ON lo.loanType = lt.id
INNER JOIN People cstmr ON lo.customer = cstmr.id
INNER JOIN People ndrsmnt ON lo.endorsement = ndrsmnt.id
WHERE
lo.id = :id
ORDER BY
lo.createdOn
]]>
</query>
<query name="searchPaymentDetails"> <query name="searchPaymentDetails">
<![CDATA[ <![CDATA[
SELECT SELECT

128
apc-web/src/main/java/com/arrebol/apc/web/beans/admin/EmployeeListBean.java
View File

@ -7,17 +7,18 @@ package com.arrebol.apc.web.beans.admin;
import com.arrebol.apc.controller.system.employee.EmployeeController; import com.arrebol.apc.controller.system.employee.EmployeeController;
import com.arrebol.apc.model.core.HumanResource; import com.arrebol.apc.model.core.HumanResource;
import com.arrebol.apc.model.core.Office;
import com.arrebol.apc.model.enums.HumanResourceStatus; import com.arrebol.apc.model.enums.HumanResourceStatus;
import com.arrebol.apc.web.beans.Datatable; import com.arrebol.apc.web.beans.Datatable;
import com.arrebol.apc.web.beans.GenericBean; import com.arrebol.apc.web.beans.GenericBean;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.util.Date;
import java.util.List; import java.util.List;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;
import javax.faces.application.FacesMessage; import javax.faces.application.FacesMessage;
import javax.faces.view.ViewScoped; import javax.faces.view.ViewScoped;
import javax.inject.Named; import javax.inject.Named;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.primefaces.event.ReorderEvent; import org.primefaces.event.ReorderEvent;
import org.primefaces.event.RowEditEvent; import org.primefaces.event.RowEditEvent;
@ -27,74 +28,87 @@ import org.primefaces.event.RowEditEvent;
*/ */
@Named("employeeListManager") @Named("employeeListManager")
@ViewScoped @ViewScoped
public class EmployeeListBean extends GenericBean implements Serializable, Datatable { public class EmployeeListBean extends GenericBean implements Serializable, Datatable {
public void editarIndetificadorDeFolios() {
try {
public List<HumanResource> fillDatatableEmployee() { getSelectedHumanResource().setUltimaModificacionFolio(new Date());
return getController().findEmployeesByType( getSelectedHumanResource().setUsuarioUltimaModificacionFolio(getLoggedUser().getUser());
getLoggedUser().getOffice(), getController().updateHumanResource(getSelectedHumanResource());
HumanResourceStatus.ENEBLED, logger.info("Se actualizó el identificador de folios correctamente");
getLoggedUser().getUser().getHumanResource().getId()); showMessage(FacesMessage.SEVERITY_INFO, "Registro actualizado", "Se actualizó el identificador de folios correctamente");
} setSelectedHumanResource(null);
fillDatatableEmployee();
} catch (Exception e) {
@Override logger.error("editarIndetificadorDeFolios(): " + e);
public void editRow(RowEditEvent event) { showMessage(FacesMessage.SEVERITY_ERROR, "Error", "Ocurrió un error al tratar de editar el identificador de  folios");
throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. }
} }
@Override public List<HumanResource> fillDatatableEmployee() {
public void onRowCancel(RowEditEvent event) { return getController().findEmployeesByType(getLoggedUser().getOffice(), HumanResourceStatus.ENEBLED, getLoggedUser().getUser().getHumanResource().getId());
throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. }
}
@Override @Override
public void onRowReorder(ReorderEvent event) { public void editRow(RowEditEvent event) {
showMessage(FacesMessage.SEVERITY_INFO, "Registro Movido", "De columna: " + (event.getFromIndex() + 1) + " a columna: " + (event.getToIndex() + 1)); throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
} }
@Override @Override
public void addRow() { public void onRowCancel(RowEditEvent event) {
throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
} }
@Override @Override
public void deleteRow() { public void onRowReorder(ReorderEvent event) {
throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. showMessage(FacesMessage.SEVERITY_INFO, "Registro Movido", "De columna: " + (event.getFromIndex() + 1) + " a columna: " + (event.getToIndex() + 1));
} }
public EmployeeController getController() { @Override
return controller; public void addRow() {
} throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
}
public void setController(EmployeeController controller) { @Override
this.controller = controller; public void deleteRow() {
} throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
}
public List<HumanResource> getHumanResource() { public EmployeeController getController() {
return humanResource; return controller;
} }
public void setHumanResource(List<HumanResource> humanResource) { public void setController(EmployeeController controller) {
this.humanResource = humanResource; this.controller = controller;
} }
public List<HumanResource> getHumanResource() {
return humanResource;
}
private EmployeeController controller; public void setHumanResource(List<HumanResource> humanResource) {
this.humanResource = humanResource;
}
private List<HumanResource> humanResource; public HumanResource getSelectedHumanResource() {
return selectedHumanResource;
}
@PostConstruct() public void setSelectedHumanResource(HumanResource selectedHumanResource) {
public void init() { this.selectedHumanResource = selectedHumanResource;
loadBundlePropertyFile(); }
controller = new EmployeeController();
setHumanResource(fillDatatableEmployee()); final Logger logger = LogManager.getLogger(EmployeeListBean.class);
}
private EmployeeController controller;
private List<HumanResource> humanResource;
private HumanResource selectedHumanResource;
@PostConstruct()
public void init() {
loadBundlePropertyFile();
controller = new EmployeeController();
setHumanResource(fillDatatableEmployee());
}
} }

21
apc-web/src/main/java/com/arrebol/apc/web/beans/system/employee/EmployeeBean.java
View File

@ -47,6 +47,18 @@ public class EmployeeBean extends GenericBean implements Serializable {
getSaveHumanResource().setCreatedBy(getLoggedUser().getUser().getId()); getSaveHumanResource().setCreatedBy(getLoggedUser().getUser().getId());
getSaveHumanResource().setBalance(BigDecimal.ZERO); getSaveHumanResource().setBalance(BigDecimal.ZERO);
//Se valida si el identificador del folio
if (getSaveHumanResource().getIdentificadorFolio() == null || !getSaveHumanResource().getIdentificadorFolio().equals(getIdentificadorFolio())) {
if (getController().verificarIdentificadorFolio(getIdentificadorFolio())) {
logger.error("Identificador de folio ya asignado");
buildAndSendMessage(null, "El identificador del folio ya ha sido asignado a otro usuario", FacesMessage.SEVERITY_WARN, "Error");
return;
}
getSaveHumanResource().setIdentificadorFolio(getIdentificadorFolio());
getSaveHumanResource().setUltimaModificacionFolio(new Date());
getSaveHumanResource().setUsuarioUltimaModificacionFolio(getLoggedUser().getUser());
}
if (getSaveHumanResource().getEmployeeSaving() == null) { if (getSaveHumanResource().getEmployeeSaving() == null) {
getSaveHumanResource().setEmployeeSaving(BigDecimal.ZERO); getSaveHumanResource().setEmployeeSaving(BigDecimal.ZERO);
} }
@ -398,6 +410,7 @@ public class EmployeeBean extends GenericBean implements Serializable {
private String bonusId; private String bonusId;
private List<Bonus> bonuses; private List<Bonus> bonuses;
private String identificadorFolio;
private String updateBonusId; private String updateBonusId;
@PostConstruct() @PostConstruct()
@ -619,4 +632,12 @@ public class EmployeeBean extends GenericBean implements Serializable {
this.updateBonusId = updateBonusId; this.updateBonusId = updateBonusId;
} }
public String getIdentificadorFolio() {
return identificadorFolio;
}
public void setIdentificadorFolio(String identificadorFolio) {
this.identificadorFolio = identificadorFolio;
}
} }

19
apc-web/src/main/webapp/app/catalog/loanType/index.xhtml
View File

@ -28,6 +28,15 @@
<f:facet name="header"> <f:facet name="header">
<p:commandButton id="toggler" type="button" value="Columnas" style="float:left;" styleClass="amber-btn flat" icon="ui-icon-calendar"/> <p:commandButton id="toggler" type="button" value="Columnas" style="float:left;" styleClass="amber-btn flat" icon="ui-icon-calendar"/>
<p:columnToggler datasource="dtLoanType" trigger="toggler" /> <p:columnToggler datasource="dtLoanType" trigger="toggler" />
<div style="float:right;padding-top: 5px;padding-left: 5px;padding-right: 5px">
<h:commandLink title="Exportar a Excel">
<p:graphicImage name="images/excel-xls-icon.png" library="serenity-layout" width="48"/>
<p:dataExporter type="xls" target="dtLoanType" fileName="Listado de productos" />
</h:commandLink>
</div>
<p:button outcome="#{i18n['outcome.catalog.typeLoan.add']}" value="#{i18n['button.add']}" styleClass="amber-btn flat" style="float: right;" icon="ui-icon-plus" rendered="#{loginBean.isUserInRole('catalog.typeLoan.add')}"/> <p:button outcome="#{i18n['outcome.catalog.typeLoan.add']}" value="#{i18n['button.add']}" styleClass="amber-btn flat" style="float: right;" icon="ui-icon-plus" rendered="#{loginBean.isUserInRole('catalog.typeLoan.add')}"/>
<p:outputPanel> <p:outputPanel>
@ -93,6 +102,16 @@
<h:outputText value="#{loanType.cantidadExistente}" /> <h:outputText value="#{loanType.cantidadExistente}" />
</p:column> </p:column>
<p:column headerText="Última modificación" sortBy="#{loanType.lastUpdatedOn}" style="width: 7em; text-align: center" filterBy="#{loanType.lastUpdatedOn}">
<h:outputText value="#{loanType.lastUpdatedOn}">
<f:convertDateTime type="date" locale="es" pattern="dd - MMMM - yyyy"/>
</h:outputText>
</p:column>
<p:column headerText="Usuario modifico" sortBy="#{loanType.lastUserModified.userName}" style="width: 7em; text-align: center" filterBy="#{loanType.lastUserModified.userName}">
<h:outputText value="#{loanType.lastUserModified.userName}" />
</p:column>
<p:column style="width:40px" headerText="Editar"> <p:column style="width:40px" headerText="Editar">
<p:rowEditor editTitle="#{i18n['button.edit']}" rendered="#{loginBean.isUserInRole('catalog.typeLoan.updated')}"/> <p:rowEditor editTitle="#{i18n['button.edit']}" rendered="#{loginBean.isUserInRole('catalog.typeLoan.updated')}"/>
</p:column> </p:column>

70
apc-web/src/main/webapp/app/system/employee/employeeList.xhtml
View File

@ -25,21 +25,24 @@
<!-- Top Side --> <!-- Top Side -->
<div class="ui-g-12" style="display: #{loginBean.isUserInRole('system.employee') ? 'block' : 'none'}"> <div class="ui-g-12" style="display: #{loginBean.isUserInRole('system.employee') ? 'block' : 'none'}">
<div class="card card-w-title"> <div class="card card-w-title">
<h1> <h1>
<h:outputFormat value="#{i18n['office.selected']}"> <h:outputFormat value="#{i18n['office.selected']}">
<f:param value="#{employeeBean.loggedUser.office.officeName}" /> <f:param value="#{employeeBean.loggedUser.office.officeName}" />
</h:outputFormat> </h:outputFormat>
</h1> </h1>
<h:form id="form" rendered="#{loginBean.isUserInRole('system.employee')}"> <h:form id="form" rendered="#{loginBean.isUserInRole('system.employee')}">
<p:growl id="msgs" showDetail="true"/> <p:growl id="msgs" showDetail="true"/>
<p:panelGrid columns="3" layout="grid" styleClass="ui-panelgrid-blank form-group"> <p:panelGrid columns="3" layout="grid" styleClass="ui-panelgrid-blank form-group">
</p:panelGrid> </p:panelGrid>
<p:dataTable widgetVar="dtEmployee" id="dtEmployee" var="humanResource" value="#{employeeListManager.humanResource}" style="margin-bottom:20px" reflow="true" rowsPerPageTemplate="5,10,25,50,100" emptyMessage="#{i18n['admin.loans.datatable.empty']}" <p:dataTable widgetVar="dtEmployee" id="dtEmployee" var="humanResource" value="#{employeeListManager.humanResource}"
rowKey="#{humanResource.id}" editable="true" paginator="true" rows="10" paginatorTemplate="{RowsPerPageDropdown} {FirstPageLink} {PreviousPageLink} {CurrentPageReport} {NextPageLink} {LastPageLink}"> selection="#{employeeListManager.selectedHumanResource}"
style="margin-bottom:20px" reflow="true" rowsPerPageTemplate="5,10,25,50,100" emptyMessage="#{i18n['admin.loans.datatable.empty']}"
rowKey="#{humanResource.id}" editable="true" paginator="true" rows="10"
paginatorTemplate="{RowsPerPageDropdown} {FirstPageLink} {PreviousPageLink} {CurrentPageReport} {NextPageLink} {LastPageLink}">
<f:facet name="header"> <f:facet name="header">
<p:commandButton id="toggler" type="button" value="Columnas" style="float:left;" styleClass="amber-btn flat" icon="ui-icon-calendar"/> <p:commandButton id="toggler" type="button" value="Columnas" style="float:left;" styleClass="amber-btn flat" icon="ui-icon-calendar"/>
@ -63,32 +66,55 @@
<p:column headerText="Nombre" sortBy="#{humanResource.firstName} #{humanResource.lastName}" filterBy="#{humanResource.firstName} #{humanResource.lastName}" filterMatchMode="contains"> <p:column headerText="Nombre" sortBy="#{humanResource.firstName} #{humanResource.lastName}" filterBy="#{humanResource.firstName} #{humanResource.lastName}" filterMatchMode="contains">
<h:outputText value="#{humanResource.firstName} #{humanResource.lastName}" /> <h:outputText value="#{humanResource.firstName} #{humanResource.lastName}" />
</p:column> </p:column>
<p:column headerText="Fecha de cumpleaños" sortBy="#{humanResource.birthdate}" filterBy="#{humanResource.birthdate}"> <p:column headerText="Fecha de cumpleaños" sortBy="#{humanResource.birthdate}" filterBy="#{humanResource.birthdate}">
<h:outputText value="#{humanResource.birthdate}" /> <h:outputText value="#{humanResource.birthdate}" />
</p:column> </p:column>
<p:column headerText="Fecha de admision" sortBy="#{humanResource.admissionDate}" filterBy="#{humanResource.admissionDate}"> <p:column headerText="Fecha de admision" sortBy="#{humanResource.admissionDate}" filterBy="#{humanResource.admissionDate}">
<h:outputText value="#{humanResource.admissionDate}" /> <h:outputText value="#{humanResource.admissionDate}" />
</p:column> </p:column>
<p:column headerText="Puesto" sortBy="#{humanResource.roleCtlg.role}" filterBy="#{humanResource.roleCtlg.role}"> <p:column headerText="Puesto" sortBy="#{humanResource.roleCtlg.role}" filterBy="#{humanResource.roleCtlg.role}">
<h:outputText value="#{humanResource.roleCtlg.role}" /> <h:outputText value="#{humanResource.roleCtlg.role}" />
</p:column> </p:column>
<p:column headerText="Identificador de folios" sortBy="#{humanResource.identificadorFolio}" filterBy="#{humanResource.identificadorFolio}">
<h:outputText value="#{humanResource.identificadorFolio}" />
</p:column>
<p:column headerText="Acciones" style="text-align: center">
<p:commandButton
icon="ui-icon-pencil"
title="Folios"
value="Editar identificador de folios"
id="ctxMenuItem3"
update="editarFolioForm"
oncomplete="PF('editarFolioDialog').show();">
<f:setPropertyActionListener value="#{humanResource}" target="#{employeeListManager.selectedHumanResource}" />
</p:commandButton>
</p:column>
</p:dataTable> </p:dataTable>
</h:form> </h:form>
<h:form id="editarFolioForm">
<p:growl id="msgsDialog" showDetail="true"/>
<p:dialog widgetVar="editarFolioDialog" width="30em" height="6em" id="editarFolioDialog" header="Editar identificador de folios" modal="true" responsive="true" showEffect="clip" hideEffect="clip">
<h:panelGroup styleClass="md-inputfield" style="margin-top: 1em">
<p:inputText id="identificadorFolio" value="#{employeeListManager.selectedHumanResource.identificadorFolio}" style="width: 100%;"/>
<label>Identificador de folios</label>
<p:message for="identificadorFolio" display="text"/>
</h:panelGroup>
<h:panelGroup styleClass="md-inputfield" >
<p:commandButton id="addButton" value="Actualizar" actionListener="#{employeeListManager.editarIndetificadorDeFolios()}" update="editarFolioForm,form"/>
</h:panelGroup>
</p:dialog>
</h:form>
</div> </div>
</div> </div>
<!-- Left Side -->
<!-- Popup -->
</div> </div>
</ui:define> </ui:define>

8
apc-web/src/main/webapp/app/system/employee/main.xhtml
View File

@ -77,6 +77,14 @@
<label>#{i18n['middle.name']}</label> <label>#{i18n['middle.name']}</label>
<p:message for="middleName" display="icon"/> <p:message for="middleName" display="icon"/>
</h:panelGroup> </h:panelGroup>
<h:panelGroup id="identificadorFolioPnlGrp" styleClass="md-inputfield">
<p:inputText id="identificadorFolio"
style="width: 100%"
value="#{employeeBean.identificadorFolio}"
autocomplete="off"/>
<label>Identificador de folios </label>
<p:message for="middleName" display="icon"/>
</h:panelGroup>
</p:panelGrid> </p:panelGrid>
<p:panelGrid columns="4" layout="grid" styleClass="ui-panelgrid-blank form-group"> <p:panelGrid columns="4" layout="grid" styleClass="ui-panelgrid-blank form-group">

4
apc-ws-rest/pom.xml
View File

@ -195,8 +195,8 @@
<id>Localhost</id> <id>Localhost</id>
<properties> <properties>
<hibernate.connection.url>jdbc:mysql://localhost:3306/apo_pro_com_april_ten?serverTimezone=UTC</hibernate.connection.url> <hibernate.connection.url>jdbc:mysql://localhost:3306/apo_pro_com_april_ten?serverTimezone=UTC</hibernate.connection.url>
<hibernate.connection.username>root</hibernate.connection.username> <hibernate.connection.username>apoprocomlocalhost</hibernate.connection.username>
<hibernate.connection.password>Saladeespera2_</hibernate.connection.password> <hibernate.connection.password>Yj$2Da0z!</hibernate.connection.password>
</properties> </properties>
</profile> </profile>
<profile> <profile>

1484
apc-ws-rest/src/main/java/com/arrebol/apc/ws/loan/LoanWS.java
View File

File diff suppressed because it is too large Load Diff