djb-eapim/elink-portal-common
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'devs/obp' into jenkins_with_weblogic

Browse Source
This commit is contained in:
Rinjae
2025-12-01 11:56:24 +09:00
parent 25d46ed5d2 44f50d0d21
commit df75d01a1f
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/eactive/apim/portal/portalorg/entity/OrgCodeGenerator.java
+4
View File
@@ -12,6 +12,10 @@ import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
/**
* 25.11.26 - 광주은행에서는 기관코드를 OBP 파트너코드와 매칭 시킴. 즉, 자동 생성 사용안함
*/
@Deprecated
@Slf4j @Slf4j
public class OrgCodeGenerator implements ValueGenerator<String> { public class OrgCodeGenerator implements ValueGenerator<String> {
private static final String TABLE_NAME = "PTL_ID"; private static final String TABLE_NAME = "PTL_ID";
src/main/java/com/eactive/apim/portal/portalorg/entity/PortalOrg.java
+5 -11
View File
@@ -3,18 +3,12 @@ package com.eactive.apim.portal.portalorg.entity;
import com.eactive.apim.portal.common.entity.Auditable; import com.eactive.apim.portal.common.entity.Auditable;
import com.eactive.apim.portal.portalorg.entity.PortalOrgEnums.ApprovalStatus; import com.eactive.apim.portal.portalorg.entity.PortalOrgEnums.ApprovalStatus;
import com.eactive.apim.portal.portalorg.entity.PortalOrgEnums.OrgStatus; import com.eactive.apim.portal.portalorg.entity.PortalOrgEnums.OrgStatus;
import java.io.Serializable;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
import javax.persistence.Id;
import javax.persistence.Table;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.hibernate.annotations.Comment; import org.hibernate.annotations.Comment;
import org.hibernate.annotations.GenerationTime;
import org.hibernate.annotations.GeneratorType; import javax.persistence.*;
import java.io.Serializable;
@Data @Data
@EqualsAndHashCode(onlyExplicitlyIncluded = true, callSuper = true) @EqualsAndHashCode(onlyExplicitlyIncluded = true, callSuper = true)
@@ -40,8 +34,8 @@ public class PortalOrg extends Auditable implements Serializable, com.eactive.ea
private String orgName; private String orgName;
@Column(name = "org_code") @Column(name = "org_code")
@Comment("제휴기관코드") @Comment("제휴기관코드 - OBP 파트너코드")
@GeneratorType(type = OrgCodeGenerator.class, when = GenerationTime.INSERT) // @GeneratorType(type = OrgCodeGenerator.class, when = GenerationTime.INSERT)
private String orgCode; private String orgCode;
@Column(name = "org_desc", length = 255) @Column(name = "org_desc", length = 255)