diff --git a/src/main/java/com/kospo/svcm/dto/req/ContSaveRequest.java b/src/main/java/com/kospo/svcm/dto/req/ContSaveRequest.java index 0353632..90594d7 100644 --- a/src/main/java/com/kospo/svcm/dto/req/ContSaveRequest.java +++ b/src/main/java/com/kospo/svcm/dto/req/ContSaveRequest.java @@ -41,6 +41,12 @@ public class ContSaveRequest implements Serializable { String reason; @Schema(name = "cateCd", description = "분야코드") String cateCd; + @Schema(name = "bizGubunCd", description = "기업구분코드") + String bizGubunCd; + @Schema(name = "bizGubunNm", description = "기업구분") + String bizGubunNm; + @Schema(name = "bizGubunEtc", description = "기업구분 기타") + String bizGubunEtc; List contAtts; @Getter diff --git a/src/main/java/com/kospo/svcm/dto/req/ContUpdateRequest.java b/src/main/java/com/kospo/svcm/dto/req/ContUpdateRequest.java index 27e7ad1..11604dd 100644 --- a/src/main/java/com/kospo/svcm/dto/req/ContUpdateRequest.java +++ b/src/main/java/com/kospo/svcm/dto/req/ContUpdateRequest.java @@ -43,6 +43,12 @@ public class ContUpdateRequest implements Serializable { String reason; @Schema(name = "cateCd", description = "분야코드") String cateCd; + @Schema(name = "bizGubunCd", description = "기업구분코드") + String bizGubunCd; + @Schema(name = "bizGubunNm", description = "기업구분") + String bizGubunNm; + @Schema(name = "bizGubunEtc", description = "기업구분 기타") + String bizGubunEtc; List contAtts; @Getter diff --git a/src/main/java/com/kospo/svcm/dto/res/ApprReqResponse.java b/src/main/java/com/kospo/svcm/dto/res/ApprReqResponse.java index ce6749e..5b0b32e 100644 --- a/src/main/java/com/kospo/svcm/dto/res/ApprReqResponse.java +++ b/src/main/java/com/kospo/svcm/dto/res/ApprReqResponse.java @@ -57,6 +57,8 @@ public class ApprReqResponse implements Serializable { .name(apprReq.getName()) .apprStatCd(apprReq.getApprStatCd()) .apprStat(apprReq.getApprStat()) + .attendCd(apprReq.getAttendCd()) + .attendNm(apprReq.getAttendNm()) .apprDt(apprReq.getApprDt()) .gubunCd(apprReq.getGubunCd()) .gubunNm(apprReq.getGubunNm()) diff --git a/src/main/java/com/kospo/svcm/dto/res/ContSaveResponse.java b/src/main/java/com/kospo/svcm/dto/res/ContSaveResponse.java index b028025..753c9f8 100644 --- a/src/main/java/com/kospo/svcm/dto/res/ContSaveResponse.java +++ b/src/main/java/com/kospo/svcm/dto/res/ContSaveResponse.java @@ -52,6 +52,12 @@ public class ContSaveResponse implements Serializable { boolean excYn; @Schema(name = "reason", description = "가격조사 예외사유") String reason; + @Schema(name = "bizGubunCd", description = "기업구분코드") + String bizGubunCd; + @Schema(name = "bizGubunNm", description = "기업구분") + String bizGubunNm; + @Schema(name = "bizGubunEtc", description = "기업구분 기타") + String bizGubunEtc; List contAtts; @@ -70,6 +76,9 @@ public class ContSaveResponse implements Serializable { .regSabun(cont.getRegSabun()) .regNm(cont.getRegNm()) .regDt(cont.getRegDt()) + .bizGubunCd(cont.getBizGubunCd()) + .bizGubunNm(cont.getBizGubunNm()) + .bizGubunEtc(cont.getBizGubunEtc()) .contAtts(cont.getContAtts().stream().map(ContAttResponse::from).collect(Collectors.toList())) .build(); } diff --git a/src/main/java/com/kospo/svcm/model/Cont.java b/src/main/java/com/kospo/svcm/model/Cont.java index ee2e0f1..f2e897c 100644 --- a/src/main/java/com/kospo/svcm/model/Cont.java +++ b/src/main/java/com/kospo/svcm/model/Cont.java @@ -87,6 +87,18 @@ public class Cont { @Column(name = "reason", length = 200) private String reason; + @Size(max = 4) + @Column(name = "biz_gubun_cd", length = 4) + private String bizGubunCd; + + @Size(max = 50) + @Column(name = "biz_gubun_nm", length = 50) + private String bizGubunNm; + + @Size(max = 50) + @Column(name = "biz_gubun_etc", length = 50) + private String bizGubunEtc; + @OneToMany(fetch = FetchType.LAZY) @JoinColumn(name = "cont_no", nullable = false, updatable = false, insertable = false) List contAtts; diff --git a/src/main/java/com/kospo/svcm/service/impl/ContServiceImpl.java b/src/main/java/com/kospo/svcm/service/impl/ContServiceImpl.java index f8e2af4..89fdcfa 100644 --- a/src/main/java/com/kospo/svcm/service/impl/ContServiceImpl.java +++ b/src/main/java/com/kospo/svcm/service/impl/ContServiceImpl.java @@ -121,6 +121,12 @@ public class ContServiceImpl implements ContService { .regDt(CommonUtils.dateFormat("yyyy-MM-dd HH:mm:ss")) .excYn(contSaveRequest.isExcYn()) .reason(contSaveRequest.getReason()) + .bizGubunCd(contSaveRequest.getBizGubunCd()) + .bizGubunNm(codeRepository.findById(CodeId.builder() + .id(15) + .cd(contSaveRequest.getBizGubunCd()) + .build()).get().getNm()) + .bizGubunEtc(contSaveRequest.getBizGubunEtc()) .build()); if(contSaveRequest.getContAtts() != null && contSaveRequest.getContAtts().size() > 0){ @@ -187,6 +193,13 @@ public class ContServiceImpl implements ContService { cont.setContEdat(contUpdateRequest.getContEdat()); cont.setExcYn(contUpdateRequest.isExcYn()); cont.setReason(contUpdateRequest.getReason()); + + cont.setBizGubunCd(contUpdateRequest.getBizGubunCd()); + cont.setBizGubunNm(codeRepository.findById(CodeId.builder() + .id(15) + .cd(contUpdateRequest.getBizGubunCd()) + .build()).get().getNm()); + cont.setBizGubunEtc(contUpdateRequest.getBizGubunEtc()); cont = contRepository.save(cont); if(contUpdateRequest.getContAtts() != null && contUpdateRequest.getContAtts().size() > 0){