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

- K8sUtil 파일 삭제

Browse Source 
- 승인관리 완전삭제 기능 추가
- DJBank로 명칭 업데이트
This commit is contained in:
Rinjae
2026-05-21 09:51:38 +09:00
parent 5cb490722c
commit 9725a19b35
7 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/eactive/apim/portal/approval/entity/Approver.java
+5 -4
View File
@@ -5,9 +5,10 @@ import com.eactive.eai.data.converter.LocalDateTimeToStringConverter17;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
import org.hibernate.annotations.NotFound;
import org.hibernate.annotations.NotFoundAction;
import javax.persistence.*;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.time.LocalDateTime;
@@ -25,12 +26,12 @@ public class Approver implements Serializable, com.eactive.eai.data.Data {
@ManyToOne
@MapsId("approval")
@JoinColumn(name = "APPROVAL_ID", nullable = false)
@JoinColumn(name = "APPROVAL_ID", nullable = false, foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
private Approval approval;
@NotNull
@ManyToOne
@JoinColumn(name = "USER_ID", nullable = false)
@JoinColumn(name = "USER_ID", foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
@NotFound(action = NotFoundAction.IGNORE)
private UserInfo user;
@Enumerated(value = STRING)
src/main/java/com/eactive/apim/portal/approval/statemachine/ProcessingState.java
+2 -2
View File
@@ -45,7 +45,7 @@ public class ProcessingState implements ApprovalState {
boolean statusChanged = false;
// Update current approver status and track if it changed
for (Approver approver : approval.getApprovers()) {
if (approver.getUser().getId().equals(approverId) && !ApproverStatus.APPROVED.equals(approver.getApproverStatus())) {
if (approver.getUser() != null && approverId.equals(approver.getUser().getId()) && !ApproverStatus.APPROVED.equals(approver.getApproverStatus())) {
approver.setApproverStatus(ApproverStatus.APPROVED);
approver.setApprovedDate(LocalDateTime.now());
statusChanged = true;
@@ -76,7 +76,7 @@ public class ProcessingState implements ApprovalState {
String approverId = (String) options.getOrDefault(ApprovalConstants.APPROVER, "");
if (isAuthorizedApprover(approval, approverId, options)) {
approval.getApprovers().forEach(approver -> {
if(approver.getUser().getId().equals(approverId)) {
if(approver.getUser() != null && approverId.equals(approver.getUser().getId())) {
approver.setApproverStatus(ApproverStatus.DENIED);
approver.setApprovedDate(LocalDateTime.now());
String message = (String) options.getOrDefault("message", "");
src/main/java/com/eactive/apim/portal/approval/statemachine/RequestedState.java
+3 -3
View File
@@ -48,7 +48,7 @@ public class RequestedState implements ApprovalState {
// Update current approver status and track if it changed
for (Approver approver : approval.getApprovers()) {
if (approver.getUser().getId().equals(approverId) && !ApproverStatus.APPROVED.equals(approver.getApproverStatus())) {
if (approver.getUser() != null && approverId.equals(approver.getUser().getId()) && !ApproverStatus.APPROVED.equals(approver.getApproverStatus())) {
approver.setApproverStatus(ApproverStatus.APPROVED);
approver.setApprovedDate(LocalDateTime.now());
statusChanged = true;
@@ -78,7 +78,7 @@ public class RequestedState implements ApprovalState {
String approverId = (String) options.getOrDefault(ApprovalConstants.APPROVER, "");
if (isAuthorizedApprover(approval, approverId, options)) {
approval.getApprovers().forEach(approver -> {
if (approver.getUser().getId().equals(approverId)) {
if (approver.getUser() != null && approverId.equals(approver.getUser().getId())) {
approver.setApproverStatus(ApproverStatus.DENIED);
approver.setApprovedDate(LocalDateTime.now());
String message = (String) options.getOrDefault("message", "");
@@ -97,7 +97,7 @@ public class RequestedState implements ApprovalState {
String approverId = (String) options.getOrDefault(ApprovalConstants.APPROVER, "");
if (isAuthorizedApprover(approval, approverId, options)) {
approval.getApprovers().forEach(approver -> {
if (approver.getUser().getId().equals(approverId)) {
if (approver.getUser() != null && approverId.equals(approver.getUser().getId())) {
approver.setApproverStatus(ApproverStatus.CANCELED);
approver.setApprovedDate(LocalDateTime.now());
}
src/main/java/com/eactive/apim/portal/file/service/FileSystemBinaryStorage.java
+1
View File
@@ -3,6 +3,7 @@ package com.eactive.apim.portal.file.service;
import static com.eactive.apim.portal.file.service.StorageType.FILESYSTEM;
import com.eactive.apim.portal.portalproperty.service.PortalPropertyService;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
src/main/java/com/eactive/apim/portal/qna/entity/Inquiry.java
+2 -1
View File
@@ -79,7 +79,8 @@ public class Inquiry extends Auditable {
* 응답자
*/
@ManyToOne
@JoinColumn(name = "RESPONDER_ID")
@JoinColumn(name = "RESPONDER_ID", foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
@NotFound(action = NotFoundAction.IGNORE)
private UserInfo responder;
@Column(name = "ATTACH_FILE")
src/main/java/com/eactive/apim/portal/template/service/MessageRecipient.java
-3
View File
@@ -1,11 +1,8 @@
package com.eactive.apim.portal.template.service;
import com.eactive.apim.portal.portaluser.entity.PortalUser;
import kjb.safedb.KjbNotRnnoJpaAttributeConverter;
import lombok.*;
import javax.persistence.Convert;
@Data
@ToString
@EqualsAndHashCode