diff --git a/pav-server/src/main/java/com/palnet/biz/api/bas/laanc/model/BasLaancAprvRs.java b/pav-server/src/main/java/com/palnet/biz/api/bas/laanc/model/BasLaancAprvRs.java index e4505f4f..44136c90 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/bas/laanc/model/BasLaancAprvRs.java +++ b/pav-server/src/main/java/com/palnet/biz/api/bas/laanc/model/BasLaancAprvRs.java @@ -62,6 +62,8 @@ public class BasLaancAprvRs { private FltPurpose fltPurpose; @ApiParam(name = "상업/비사업 구분") private FltType fltType; + @ApiParam(name = "상업/비사업 구분 코드") + private String fltTypeNm; @ApiParam(name = "승인여부") private String aprvlYn; @ApiParam(name = "승인일자") diff --git a/pav-server/src/main/java/com/palnet/biz/api/bas/laanc/service/BasLaancAprvMapper.java b/pav-server/src/main/java/com/palnet/biz/api/bas/laanc/service/BasLaancAprvMapper.java index 45754174..38248fb2 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/bas/laanc/service/BasLaancAprvMapper.java +++ b/pav-server/src/main/java/com/palnet/biz/api/bas/laanc/service/BasLaancAprvMapper.java @@ -2,9 +2,11 @@ package com.palnet.biz.api.bas.laanc.service; import com.palnet.biz.api.bas.laanc.model.BasLaancAprvListRq; import com.palnet.biz.api.bas.laanc.model.BasLaancAprvRs; +import com.palnet.biz.api.bas.laanc.service.mapping.FltTypeToCode; import com.palnet.biz.jpa.model.LaancAprvSearchDto; import com.palnet.biz.jpa.model.LaancPlanDto; import org.mapstruct.Mapper; +import org.mapstruct.Mapping; import org.mapstruct.NullValuePropertyMappingStrategy; import org.mapstruct.ReportingPolicy; import org.mapstruct.factory.Mappers; @@ -22,14 +24,16 @@ import java.util.List; * ----------------------------------------------------------- * 2023-09-22(022) dhji 최초 생성 */ -@Mapper(unmappedSourcePolicy = ReportingPolicy.IGNORE, unmappedTargetPolicy = ReportingPolicy.IGNORE, nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE) +@Mapper(uses = FltTypeToCode.class, unmappedSourcePolicy = ReportingPolicy.IGNORE, unmappedTargetPolicy = ReportingPolicy.IGNORE, nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE) public interface BasLaancAprvMapper { BasLaancAprvMapper MAPPER = Mappers.getMapper(BasLaancAprvMapper.class); LaancAprvSearchDto toDto(BasLaancAprvListRq rq); + @Mapping(source = "fltType", target = "fltTypeNm") BasLaancAprvRs toRs(LaancPlanDto dto); + List toRsList(List dto); } diff --git a/pav-server/src/main/java/com/palnet/biz/api/bas/laanc/service/mapping/FltTypeToCode.java b/pav-server/src/main/java/com/palnet/biz/api/bas/laanc/service/mapping/FltTypeToCode.java new file mode 100644 index 00000000..741b3e59 --- /dev/null +++ b/pav-server/src/main/java/com/palnet/biz/api/bas/laanc/service/mapping/FltTypeToCode.java @@ -0,0 +1,21 @@ +package com.palnet.biz.api.bas.laanc.service.mapping; + +import com.palnet.biz.jpa.entity.type.FltType; + +/** + * packageName : com.palnet.biz.api.bas.laanc.service.mapping + * fileName : Test + * author : dhji + * date : 2023-10-23(023) + * description : + * =========================================================== + * DATE AUTHOR NOTE + * ----------------------------------------------------------- + * 2023-10-23(023) dhji 최초 생성 + */ +public class FltTypeToCode { + public String mapEnumCode(FltType inEnum) { + if(inEnum == null) return null; + return inEnum.getValue(); + } +} diff --git a/pav-server/src/main/java/com/palnet/biz/api/cns/qna/model/QnaBasModel.java b/pav-server/src/main/java/com/palnet/biz/api/cns/qna/model/QnaBasModel.java index 2bae43a2..7fba13fb 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/cns/qna/model/QnaBasModel.java +++ b/pav-server/src/main/java/com/palnet/biz/api/cns/qna/model/QnaBasModel.java @@ -17,6 +17,8 @@ public class QnaBasModel { private String content; + private String contact; + private String anserContent; private String anserUserNm; diff --git a/pav-server/src/main/java/com/palnet/biz/api/cns/qna/model/QnaDetailRSModel.java b/pav-server/src/main/java/com/palnet/biz/api/cns/qna/model/QnaDetailRSModel.java index 71466d49..92d85437 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/cns/qna/model/QnaDetailRSModel.java +++ b/pav-server/src/main/java/com/palnet/biz/api/cns/qna/model/QnaDetailRSModel.java @@ -19,6 +19,8 @@ public class QnaDetailRSModel { private String content; + private String contact; + private String anserContent; private String anserUserNm; diff --git a/pav-server/src/main/java/com/palnet/biz/api/cns/qna/model/QnaInsertRQModel.java b/pav-server/src/main/java/com/palnet/biz/api/cns/qna/model/QnaInsertRQModel.java index 813227b4..08b6e2c2 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/cns/qna/model/QnaInsertRQModel.java +++ b/pav-server/src/main/java/com/palnet/biz/api/cns/qna/model/QnaInsertRQModel.java @@ -20,6 +20,8 @@ public class QnaInsertRQModel { private String content; + private String contact; + private List fileInfos; private List files; diff --git a/pav-server/src/main/java/com/palnet/biz/api/cns/qna/service/CnsQnaService.java b/pav-server/src/main/java/com/palnet/biz/api/cns/qna/service/CnsQnaService.java index a1d5b3a7..80805c70 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/cns/qna/service/CnsQnaService.java +++ b/pav-server/src/main/java/com/palnet/biz/api/cns/qna/service/CnsQnaService.java @@ -1,6 +1,5 @@ package com.palnet.biz.api.cns.qna.service; -import com.palnet.biz.api.acnt.jwt.model.JwtUserModel; import com.palnet.biz.api.acnt.jwt.utils.JwtTokenUtil; import com.palnet.biz.api.cns.qna.model.*; import com.palnet.biz.api.comn.file.model.ComnFileModel; @@ -23,7 +22,6 @@ import org.springframework.web.multipart.MultipartFile; import javax.transaction.Transactional; import java.time.Instant; import java.util.List; -import java.util.Optional; import java.util.stream.Collectors; @Service @@ -36,7 +34,6 @@ public class CnsQnaService { private final CnsQnaQueryRepository cnsQnaQueryRepository; private final PtyCstmrBasRepository ptyCstmrBasRepository; private final PtyCstmrDtlRepository ptyCstmrDtlRepository; - private final ComFileBasRepository comFileBasRepository; private final ComnFileService comnFileService; diff --git a/pav-server/src/main/java/com/palnet/biz/jpa/entity/CnsQnaBas.java b/pav-server/src/main/java/com/palnet/biz/jpa/entity/CnsQnaBas.java index 3f88fe37..47b3e568 100644 --- a/pav-server/src/main/java/com/palnet/biz/jpa/entity/CnsQnaBas.java +++ b/pav-server/src/main/java/com/palnet/biz/jpa/entity/CnsQnaBas.java @@ -34,6 +34,9 @@ public class CnsQnaBas implements Serializable { @Column(name = "CONTENT") private String content; + @Column(name = "CONTACT") + private String contact; + @Column(name = "ANSER_CONTENT") private String anserContent; diff --git a/pav-server/src/main/java/com/palnet/biz/jpa/entity/FltPlanBas.java b/pav-server/src/main/java/com/palnet/biz/jpa/entity/FltPlanBas.java index 48f4605a..fd4c7b07 100644 --- a/pav-server/src/main/java/com/palnet/biz/jpa/entity/FltPlanBas.java +++ b/pav-server/src/main/java/com/palnet/biz/jpa/entity/FltPlanBas.java @@ -1,6 +1,5 @@ package com.palnet.biz.jpa.entity; -import com.palnet.biz.jpa.entity.converter.ArcrftTypeCdConverter; import com.palnet.biz.jpa.entity.converter.FltPurposeConverter; import com.palnet.biz.jpa.entity.converter.FltTypeConverter; import com.palnet.biz.jpa.entity.type.FltPurpose; diff --git a/pav-server/src/main/java/com/palnet/biz/jpa/repository/cns/CnsQnaQueryRepository.java b/pav-server/src/main/java/com/palnet/biz/jpa/repository/cns/CnsQnaQueryRepository.java index faee96c0..ce31845c 100644 --- a/pav-server/src/main/java/com/palnet/biz/jpa/repository/cns/CnsQnaQueryRepository.java +++ b/pav-server/src/main/java/com/palnet/biz/jpa/repository/cns/CnsQnaQueryRepository.java @@ -65,6 +65,7 @@ public class CnsQnaQueryRepository { bas.category, bas.title, bas.content, + bas.contact, bas.fileGroupNo, bas.anserStatus, bas.anserContent, diff --git a/pav-server/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java b/pav-server/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java index 2ab24d42..3593b49c 100644 --- a/pav-server/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java +++ b/pav-server/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java @@ -772,6 +772,7 @@ public class FltPlanQueryRepository { bas.groupId, bas.cstmrSno, bas.memberName, + bas.fltType, bas.email, bas.hpno, bas.clncd, @@ -904,6 +905,7 @@ public class FltPlanQueryRepository { bas.groupId, bas.cstmrSno, bas.memberName, + bas.fltType, bas.email, bas.hpno, bas.clncd, @@ -1001,6 +1003,7 @@ public class FltPlanQueryRepository { bas.groupId, bas.cstmrSno, bas.memberName, + bas.fltType, bas.email, bas.hpno, bas.clncd,