diff --git a/src/main/java/com/kospo/svcm/controller/ApprController.java b/src/main/java/com/kospo/svcm/controller/ApprController.java index 9f6a18a..9878b7d 100644 --- a/src/main/java/com/kospo/svcm/controller/ApprController.java +++ b/src/main/java/com/kospo/svcm/controller/ApprController.java @@ -25,6 +25,7 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import java.security.Principal; +import java.util.HashMap; import java.util.List; @Tag(name = "Approval Api", description = "결재 관리") @@ -55,6 +56,26 @@ public class ApprController { return ResponseEntity.ok(apprService.findByPrcsNo(prcsNo)); } + + @Operation(summary = "결재번호를 가격조사 번호로 변경", description = "결재번호 To 가격조사번호") + @ApiResponses({ + @ApiResponse(description = "Success", responseCode = "200", + content = @Content(mediaType = "application/json", + schema = @Schema(oneOf = + {HashMap.class}))), + @ApiResponse(description = "Not found", responseCode = "404", + content = @Content(mediaType = "text/plain", schema = @Schema(oneOf = + {String.class}))), + @ApiResponse(description = "Internal Error", responseCode = "500", + content = @Content(mediaType = "application/json", schema = @Schema(oneOf = + {CustomErrorResponse.class }))) + }) + @GetMapping("/appr/conveter/{apprNo}") + public ResponseEntity apprNoToPrcsNo( + @Parameter(description = "결재번호") @PathVariable(required = false) String apprNo + ) { + return ResponseEntity.ok(apprService.apprNoToPrcsNo(apprNo)); + } // @Operation(summary = "본인 결재목록 조회", description = "가격조사 결재 조회") // @ApiResponses({ // @ApiResponse(description = "Success", responseCode = "200", diff --git a/src/main/java/com/kospo/svcm/controller/PrcsController.java b/src/main/java/com/kospo/svcm/controller/PrcsController.java index 252d304..1502174 100644 --- a/src/main/java/com/kospo/svcm/controller/PrcsController.java +++ b/src/main/java/com/kospo/svcm/controller/PrcsController.java @@ -28,6 +28,7 @@ import org.yaml.snakeyaml.util.UriEncoder; import java.io.IOException; import java.net.MalformedURLException; import java.security.Principal; +import java.util.HashMap; @Tag(name = "PriceSurvey Api", description = "가격조사 관리") @RestController diff --git a/src/main/java/com/kospo/svcm/service/ApprService.java b/src/main/java/com/kospo/svcm/service/ApprService.java index 780996e..7a115d1 100644 --- a/src/main/java/com/kospo/svcm/service/ApprService.java +++ b/src/main/java/com/kospo/svcm/service/ApprService.java @@ -9,11 +9,15 @@ import jakarta.transaction.Transactional; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; +import java.util.HashMap; import java.util.List; public interface ApprService { ApprMstResponse findByPrcsNo(String prcsNo); + @Transactional + HashMap apprNoToPrcsNo(String apprNo); + PageResponse findByApprBySabun(String sabun, Pageable pageable) ; ApprMstResponse stateUpdate(String sabun, ApprReqRequest apprReqRequest); diff --git a/src/main/java/com/kospo/svcm/service/PrcsService.java b/src/main/java/com/kospo/svcm/service/PrcsService.java index 035d447..2e1e5a7 100644 --- a/src/main/java/com/kospo/svcm/service/PrcsService.java +++ b/src/main/java/com/kospo/svcm/service/PrcsService.java @@ -10,6 +10,7 @@ import com.kospo.svcm.model.PrcsAtt; import org.springframework.data.domain.Pageable; import org.springframework.transaction.annotation.Transactional; +import java.util.HashMap; import java.util.List; public interface PrcsService { diff --git a/src/main/java/com/kospo/svcm/service/impl/ApprServiceImpl.java b/src/main/java/com/kospo/svcm/service/impl/ApprServiceImpl.java index a4a87eb..3c47c32 100644 --- a/src/main/java/com/kospo/svcm/service/impl/ApprServiceImpl.java +++ b/src/main/java/com/kospo/svcm/service/impl/ApprServiceImpl.java @@ -5,7 +5,6 @@ import com.kospo.svcm.config.utils.CommonUtils; import com.kospo.svcm.config.utils.MailUtils; import com.kospo.svcm.dto.req.ApprReqRequest; import com.kospo.svcm.dto.res.ApprMstResponse; -import com.kospo.svcm.dto.res.GrpCodeResponse; import com.kospo.svcm.dto.res.PageResponse; import com.kospo.svcm.exception.CustomException; import com.kospo.svcm.exception.CustomMessageException; @@ -17,11 +16,9 @@ import lombok.RequiredArgsConstructor; import org.apache.poi.util.StringUtil; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; -import org.springframework.security.core.context.SecurityContext; -import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.stereotype.Service; -import java.util.Date; +import java.util.HashMap; import java.util.List; @Service @@ -49,6 +46,15 @@ public class ApprServiceImpl implements ApprService { return apprMstResponse; } + @Transactional + @Override + public HashMap apprNoToPrcsNo(String apprNo) { + ApprMst apprMst = apprMstRepository.findByApprNo(apprNo); + HashMap map = new HashMap(); + map.put("prcsNo", apprMst.getPrcsNo()); + return map; + } + @Transactional @Override public PageResponse findByApprBySabun(String sabun, Pageable pageable) { diff --git a/src/main/java/com/kospo/svcm/service/impl/PrcsServiceImpl.java b/src/main/java/com/kospo/svcm/service/impl/PrcsServiceImpl.java index b31ed7d..00aa460 100644 --- a/src/main/java/com/kospo/svcm/service/impl/PrcsServiceImpl.java +++ b/src/main/java/com/kospo/svcm/service/impl/PrcsServiceImpl.java @@ -26,6 +26,7 @@ import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Optional; import java.util.concurrent.atomic.AtomicBoolean;