diff --git a/build.gradle b/build.gradle index 01b23ee..780c826 100644 --- a/build.gradle +++ b/build.gradle @@ -174,6 +174,10 @@ dependencies { // 스프링 부트 개발 도구 - 자동 재시작, 라이브 리로드 등 developmentOnly 'org.springframework.boot:spring-boot-devtools' + // 맵스트럭쳐 - 엔티티 <-> VO,DTO 변환 도구 + implementation 'org.mapstruct:mapstruct:1.5.5.Final' + annotationProcessor 'org.mapstruct:mapstruct-processor:1.5.5.Final' + // ===== 테스트 의존성 ===== // 스프링 부트 테스트 스타터 - JUnit, Mockito 등 테스트 도구 포함 testImplementation 'org.springframework.boot:spring-boot-starter-test' diff --git a/src/main/java/egovframework/config/EgovConfigInterceptor.java b/src/main/java/egovframework/config/EgovConfigInterceptor.java index 85bf4b8..6674eb0 100644 --- a/src/main/java/egovframework/config/EgovConfigInterceptor.java +++ b/src/main/java/egovframework/config/EgovConfigInterceptor.java @@ -2,6 +2,8 @@ package egovframework.config; import egovframework.configProperties.InterceptorProperties; import egovframework.interceptor.AuthInterceptor; +import go.kr.project.domain.entity.CpSetinfo; +import go.kr.project.domain.repo.cp.CpSetinfoRepository; import go.kr.project.system.login.service.LoginService; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Bean; @@ -17,6 +19,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; public class EgovConfigInterceptor implements WebMvcConfigurer { private final LoginService loginService; + private final CpSetinfoRepository cpSetinfoRepository; private final InterceptorProperties interceptorProperties; @@ -27,8 +30,8 @@ public class EgovConfigInterceptor implements WebMvcConfigurer { @Override public void addInterceptors(InterceptorRegistry registry) { registry.addInterceptor(authInterceptor()) -// .addPathPatterns("/**") // 모든 경로에 적용 - .addPathPatterns("/__disabled__/**") // 인터셉터 미적용 임시 우회 + .addPathPatterns("/**") // 모든 경로에 적용 +// .addPathPatterns("/__disabled__/**") // 인터셉터 미적용 임시 우회 .excludePathPatterns(interceptorProperties.getInterceptorExclude()); // 접근 제어 예외 URL 패턴 제외 } @@ -38,6 +41,6 @@ public class EgovConfigInterceptor implements WebMvcConfigurer { */ @Bean public AuthInterceptor authInterceptor() { - return new AuthInterceptor(loginService); + return new AuthInterceptor(loginService, cpSetinfoRepository); } } \ No newline at end of file diff --git a/src/main/java/egovframework/config/JPAConf/JPAConfig.java b/src/main/java/egovframework/config/JPAConf/JPAConfig.java index a2b2594..d4b7aba 100644 --- a/src/main/java/egovframework/config/JPAConf/JPAConfig.java +++ b/src/main/java/egovframework/config/JPAConf/JPAConfig.java @@ -3,10 +3,12 @@ package egovframework.config.JPAConf; import com.querydsl.jpa.impl.JPAQueryFactory; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.orm.jpa.JpaTransactionManager; import org.springframework.orm.jpa.JpaVendorAdapter; import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter; import javax.persistence.EntityManager; +import javax.persistence.EntityManagerFactory; import javax.persistence.PersistenceContext; @Configuration @@ -20,6 +22,11 @@ public class JPAConfig { return new JPAQueryFactory(em); } + @Bean(name = "transactionManager") + public JpaTransactionManager transactionManager(EntityManagerFactory emf) { + return new JpaTransactionManager(emf); + } + // @Bean // public JpaVendorAdapter jpaVendorAdapter() { // HibernateJpaVendorAdapter adapter = new HibernateJpaVendorAdapter(); diff --git a/src/main/java/egovframework/interceptor/AuthInterceptor.java b/src/main/java/egovframework/interceptor/AuthInterceptor.java index ca86781..bbc5f50 100644 --- a/src/main/java/egovframework/interceptor/AuthInterceptor.java +++ b/src/main/java/egovframework/interceptor/AuthInterceptor.java @@ -8,6 +8,8 @@ import egovframework.filter.XssUtil; import egovframework.util.ApiResponseEntity; import egovframework.util.HttpServletUtil; import egovframework.constant.SessionConstants; +import go.kr.project.domain.entity.CpSetinfoId; +import go.kr.project.domain.repo.cp.CpSetinfoRepository; import go.kr.project.system.login.mapper.LoginMapper; import go.kr.project.system.login.model.SessionVO; import go.kr.project.system.login.model.UserSessionVO; @@ -47,6 +49,9 @@ public class AuthInterceptor implements HandlerInterceptor { private final LoginService loginService; + // 세션에 업로드 경로를 담아놓기 위한 setinfo 인젝션 + private final CpSetinfoRepository cpSetinfoRepository; + // URL 패턴 매칭을 위한 AntPathMatcher private final AntPathMatcher pathMatcher = new AntPathMatcher(); @@ -137,6 +142,8 @@ public class AuthInterceptor implements HandlerInterceptor { userSessionVO.setLastAccessDttm(LocalDateTime.now()); loginMapper.updateUserSession(userSessionVO); log.debug("세션 정보 업데이트 (동시 접속 제한): {}", sessionId); + + } } } @@ -187,6 +194,10 @@ public class AuthInterceptor implements HandlerInterceptor { // 로그인 상태인 경우 접근 권한 확인 if (hasAccess(sessionVO, requestURI)) { + //여기서 사진 업로드 패스를 세션에 저장하면 좋을듯. + cpSetinfoRepository.findById(new CpSetinfoId("WORKER", "INFO", "LOCAL")) + .ifPresent(info -> sessionVO.setImgPath(info.getStrValue5())); + log.info(sessionVO.getImgPath()); return true; } diff --git a/src/main/java/go/kr/project/biz/minwon/init/controller/MinwonInitController.java b/src/main/java/go/kr/project/biz/minwon/init/controller/MinwonInitController.java index 863f5a8..1bdb24e 100644 --- a/src/main/java/go/kr/project/biz/minwon/init/controller/MinwonInitController.java +++ b/src/main/java/go/kr/project/biz/minwon/init/controller/MinwonInitController.java @@ -42,7 +42,7 @@ public class MinwonInitController { dto.setTotalCount(totalCount); // 페이징 처리를 위한 설정 - dto.setPagingYn("Y"); + dto.setPagingYn("N"); // 리스트 조회 List result = minwonInitService.findInitAnswers(dto); diff --git a/src/main/java/go/kr/project/biz/totalInfo/controller/TotalInfoController.java b/src/main/java/go/kr/project/biz/totalInfo/controller/TotalInfoController.java index fa283a2..5074b1e 100644 --- a/src/main/java/go/kr/project/biz/totalInfo/controller/TotalInfoController.java +++ b/src/main/java/go/kr/project/biz/totalInfo/controller/TotalInfoController.java @@ -1,14 +1,26 @@ package go.kr.project.biz.totalInfo.controller; +import egovframework.constant.SessionConstants; import egovframework.constant.TilesConstants; import egovframework.util.ApiResponseUtil; import go.kr.project.biz.totalInfo.model.TotalInfoDto; import go.kr.project.biz.totalInfo.service.TotalInfoService; +import go.kr.project.system.login.model.SessionVO; import lombok.RequiredArgsConstructor; +import org.springframework.core.io.Resource; +import org.springframework.core.io.UrlResource; +import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; +import javax.mail.Session; +import javax.servlet.http.HttpSession; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; + @Controller @RequiredArgsConstructor public class TotalInfoController { @@ -16,8 +28,7 @@ public class TotalInfoController { private final TotalInfoService totalInfoService; @GetMapping("/total/info.do") - public String totalInfoViewPopup(){ - + public String totalInfoViewPopup(HttpSession session){ return "biz/totalInfo/totalInfo_popup" + TilesConstants.POPUP; } @@ -25,11 +36,30 @@ public class TotalInfoController { @ResponseBody public ResponseEntity findTotalInfo(@PathVariable String mmCode) { - TotalInfoDto.Response.TotalInfo result = totalInfoService.findTotalInfo(mmCode); + TotalInfoDto.Response.TotalInfoResult result = totalInfoService.findTotalInfo(mmCode); return ApiResponseUtil.success(result); } + @GetMapping("/images/{fileName}") + public ResponseEntity getImage(@PathVariable String fileName, HttpSession session) throws IOException { + + SessionVO sessionVO = (SessionVO) session.getAttribute(SessionConstants.SESSION_KEY); + String basePath = sessionVO.getImgPath(); + String ssgCode = fileName.substring(0, 5); + String year = fileName.substring(5, 9); + Path path = Paths.get(basePath, ssgCode, year, fileName); + if (!Files.exists(path)) return ResponseEntity.notFound().build(); + + Resource resource = new UrlResource(path.toUri()); + String contentType = Files.probeContentType(path); + if (contentType == null) contentType = MediaType.APPLICATION_OCTET_STREAM_VALUE; + + return ResponseEntity.ok() + .contentType(MediaType.parseMediaType(contentType)) + .body(resource); + } + } diff --git a/src/main/java/go/kr/project/biz/totalInfo/model/TotalInfoDto.java b/src/main/java/go/kr/project/biz/totalInfo/model/TotalInfoDto.java index daf8d7e..24b9bd5 100644 --- a/src/main/java/go/kr/project/biz/totalInfo/model/TotalInfoDto.java +++ b/src/main/java/go/kr/project/biz/totalInfo/model/TotalInfoDto.java @@ -1,9 +1,11 @@ package go.kr.project.biz.totalInfo.model; +import go.kr.project.domain.entity.*; +import go.kr.project.vo.*; +import lombok.Builder; import lombok.Getter; import lombok.Setter; -import javax.persistence.Column; public class TotalInfoDto { @@ -29,75 +31,33 @@ public class TotalInfoDto { @Getter @Setter - public static class TotalInfo { - //CP_MAIN - private String mmCode; - private String mmSggcode; - private String mmDlgb; - private String mmIngb; - private String mmDate; - private String mmTime; - private String mmLawgb; - private String mmSgnm; - private String mmSgtel; - private String mmSgcont; - private String mmSgpos; - private String mmBdcode; - private String mmGpsX; - private String mmGpsY; - private String mmTrac; - private String mmSno; - private Integer mmImagecnt; - private String mmImagegb; - private String mmCarno; - private String mmVhmno; - private String mmCargb; - private String mmCarkind; - private String mmOmcode; - private String mmSdate; - private String mmEdate; - private Integer mmKeum1; - private Integer mmKeum2; - private Integer mmSukeum; - private Integer mmMinusKeum; - private Integer mmAddKeum; - private String mmRecall; - private Integer mmInuser; - private String mmIndt; - private String mmState; - private String mmStateDt; - private String mmCarcheck; - private String mmPrecode; - private String mmEtc; - private String mmVideofilenm; - private String mmSafezone; - private String mmViorcnt; - private String mmTime2; - private String mmCarname; - private String mmCarcolor; - private String mmCarfuel; - private String mmTransmitSgg; - private String mmTransmitTeam; - - - - - - - - - //CP_ANSWER - - //CP_OWNER - - //CP_INSTRUCT - - //CP_INSTRUCT_ANSWER - - //CP_VIOLATION + public static class TotalInfoResultEntities { + + private CpMain cpMain; + private CpAnswer cpAnswer; + private CpOwner cpOwner; + private CpInstruct cpInstruct; + private CpInstructAnswer cpInstructAnswer; + private CpViolation cpViolation; + + } + + @Getter + @Setter + @Builder + public static class TotalInfoResult { + + private CpMainVO cpMain; + private CpAnswerVO cpAnswer; + private CpOwnerVO cpOwner; + private CpInstructVO cpInstruct; + private CpInstructAnswerVO cpInstructAnswer; + private CpViolationVO cpViolation; + } } + } diff --git a/src/main/java/go/kr/project/biz/totalInfo/repository/TotalInfoQueryDslRepository.java b/src/main/java/go/kr/project/biz/totalInfo/repository/TotalInfoQueryDslRepository.java index 33f5c91..7fe46d2 100644 --- a/src/main/java/go/kr/project/biz/totalInfo/repository/TotalInfoQueryDslRepository.java +++ b/src/main/java/go/kr/project/biz/totalInfo/repository/TotalInfoQueryDslRepository.java @@ -2,15 +2,18 @@ package go.kr.project.biz.totalInfo.repository; import com.querydsl.core.types.Projections; import com.querydsl.jpa.impl.JPAQueryFactory; -import go.kr.project.biz.minwon.init.dto.SampleDto; import go.kr.project.biz.totalInfo.model.TotalInfoDto; +import go.kr.project.vo.mapper.EntityVoMapper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Repository; -import java.util.List; - +import static go.kr.project.domain.entity.QCpAnswer.cpAnswer; +import static go.kr.project.domain.entity.QCpInstruct.cpInstruct; +import static go.kr.project.domain.entity.QCpInstructAnswer.cpInstructAnswer; import static go.kr.project.domain.entity.QCpMain.cpMain; +import static go.kr.project.domain.entity.QCpOwner.cpOwner; +import static go.kr.project.domain.entity.QCpViolation.cpViolation; @Repository @RequiredArgsConstructor @@ -18,73 +21,56 @@ import static go.kr.project.domain.entity.QCpMain.cpMain; public class TotalInfoQueryDslRepository { private final JPAQueryFactory queryFactory; + private final EntityVoMapper mapper; + + + public TotalInfoDto.Response.TotalInfoResult findTotalInfo(String mmCode) { - public TotalInfoDto.Response.TotalInfo findTotalInfo(String mmCode) { + String jobGroup = ""; //해당 QueryDsl문법이 어렵다면, sql문을 ChatGpt에 붙여넣고 QueryDsl로 바꿔달라고 하면 바꿔준다. //읽어보고 맞다면 붙여넣으면 된다. - TotalInfoDto.Response.TotalInfo result = queryFactory + TotalInfoDto.Response.TotalInfoResultEntities result = queryFactory .select( Projections.fields( - TotalInfoDto.Response.TotalInfo.class, - cpMain.mmCode, - cpMain.mmSggcode, - cpMain.mmDlgb, - cpMain.mmIngb, - cpMain.mmDate, - cpMain.mmTime, - cpMain.mmLawgb, - cpMain.mmSgnm, - cpMain.mmSgtel, - cpMain.mmSgcont, - cpMain.mmSgpos, - cpMain.mmBdcode, - cpMain.mmGpsX, - cpMain.mmGpsY, - cpMain.mmTrac, - cpMain.mmSno, - cpMain.mmImagecnt, - cpMain.mmImagegb, - cpMain.mmCarno, - cpMain.mmVhmno, - cpMain.mmCargb, - cpMain.mmCarkind, - cpMain.mmOmcode, - cpMain.mmSdate, - cpMain.mmEdate, - cpMain.mmKeum1, - cpMain.mmKeum2, - cpMain.mmSukeum, - cpMain.mmMinusKeum, - cpMain.mmAddKeum, - cpMain.mmRecall, - cpMain.mmInuser, - cpMain.mmIndt, - cpMain.mmState, - cpMain.mmStateDt, - cpMain.mmCarcheck, - cpMain.mmPrecode, - cpMain.mmEtc, - cpMain.mmVideofilenm, - cpMain.mmSafezone, - cpMain.mmViorcnt, - cpMain.mmTime2, - cpMain.mmCarname, - cpMain.mmCarcolor, - cpMain.mmCarfuel, - cpMain.mmTransmitSgg, - cpMain.mmTransmitTeam + TotalInfoDto.Response.TotalInfoResultEntities.class, + cpMain, + cpAnswer, + cpOwner, + cpInstruct, + cpInstructAnswer, + cpViolation ) ) .from(cpMain) + .leftJoin(cpAnswer).on(cpAnswer.asMmcode.eq(cpMain.mmCode)) + .leftJoin(cpOwner).on(cpOwner.omCode.eq(cpMain.mmOmcode)) + .leftJoin(cpInstruct).on(cpInstruct.itMmcode.eq(cpMain.mmCode)) + .leftJoin(cpInstructAnswer).on( + cpInstructAnswer.id.iaSggcode.eq(cpInstruct.itSggcode), + cpInstructAnswer.id.iaCode.eq(cpInstruct.itCause) + ) + .leftJoin(cpViolation).on( + cpViolation.id.vlSggcode.eq(cpMain.mmSggcode), + cpViolation.id.vlCode.eq(cpMain.mmLawgb), + cpViolation.id.vlJobgroup.eq(jobGroup) + ) .where( cpMain.mmCode.eq(mmCode) ) .fetchOne(); + if (result == null) return null; - return result; + return TotalInfoDto.Response.TotalInfoResult.builder() + .cpMain(mapper.toCpMainVO(result.getCpMain())) + .cpAnswer(mapper.toCpAnswerVO(result.getCpAnswer())) + .cpOwner(mapper.toCpOwnerVO(result.getCpOwner())) + .cpInstruct(mapper.toCpInstructVO(result.getCpInstruct())) + .cpInstructAnswer(mapper.toCpInstructAnswerVO(result.getCpInstructAnswer())) + .cpViolation(mapper.toCpViolationVO(result.getCpViolation())) + .build(); } } diff --git a/src/main/java/go/kr/project/biz/totalInfo/service/TotalInfoService.java b/src/main/java/go/kr/project/biz/totalInfo/service/TotalInfoService.java index 42b86b2..a588ea3 100644 --- a/src/main/java/go/kr/project/biz/totalInfo/service/TotalInfoService.java +++ b/src/main/java/go/kr/project/biz/totalInfo/service/TotalInfoService.java @@ -4,6 +4,6 @@ import go.kr.project.biz.totalInfo.model.TotalInfoDto; public interface TotalInfoService { - TotalInfoDto.Response.TotalInfo findTotalInfo(String mmCode); + TotalInfoDto.Response.TotalInfoResult findTotalInfo(String mmCode); } diff --git a/src/main/java/go/kr/project/biz/totalInfo/service/impl/TotalInfoServiceImpl.java b/src/main/java/go/kr/project/biz/totalInfo/service/impl/TotalInfoServiceImpl.java index 5d7ccdf..65abb91 100644 --- a/src/main/java/go/kr/project/biz/totalInfo/service/impl/TotalInfoServiceImpl.java +++ b/src/main/java/go/kr/project/biz/totalInfo/service/impl/TotalInfoServiceImpl.java @@ -15,7 +15,7 @@ public class TotalInfoServiceImpl implements TotalInfoService { private final TotalInfoQueryDslRepository totalInfoQueryDslRepository; @Override - public TotalInfoDto.Response.TotalInfo findTotalInfo(String mmCode) { + public TotalInfoDto.Response.TotalInfoResult findTotalInfo(String mmCode) { return totalInfoQueryDslRepository.findTotalInfo(mmCode); } diff --git a/src/main/java/go/kr/project/system/common/model/PagingVO.java b/src/main/java/go/kr/project/system/common/model/PagingVO.java index 0900408..ee5f49a 100644 --- a/src/main/java/go/kr/project/system/common/model/PagingVO.java +++ b/src/main/java/go/kr/project/system/common/model/PagingVO.java @@ -35,7 +35,7 @@ public class PagingVO extends DefaultVO { private Integer totalPages; /** 기본 페이지당 항목 수 */ - private static final int DEFAULT_PER_PAGE = 10; + private static final int DEFAULT_PER_PAGE = 30; /** * 페이징 처리를 위한 시작 인덱스와 끝 인덱스를 계산합니다. diff --git a/src/main/java/go/kr/project/system/login/model/SessionVO.java b/src/main/java/go/kr/project/system/login/model/SessionVO.java index b9d50f9..a81b4e1 100644 --- a/src/main/java/go/kr/project/system/login/model/SessionVO.java +++ b/src/main/java/go/kr/project/system/login/model/SessionVO.java @@ -58,4 +58,7 @@ public class SessionVO implements Serializable { // 마지막 접근 시간 private long lastAccessedTime; + + //이미지 경로 + private String imgPath; } \ No newline at end of file diff --git a/src/main/java/go/kr/project/vo/CpAnswerVO.java b/src/main/java/go/kr/project/vo/CpAnswerVO.java new file mode 100644 index 0000000..d85313c --- /dev/null +++ b/src/main/java/go/kr/project/vo/CpAnswerVO.java @@ -0,0 +1,35 @@ +package go.kr.project.vo; + +import lombok.*; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class CpAnswerVO { + + private String asMmcode; + private String asSggcode; + private String asIngb; + private String asJsdate; + private String asJsno; + private String asJsnoM; + private String asBbsNo; + private String asLimitDt; + private String asUser; + private String asTel; + private String asCell; + private String asEmail; + private String asState; + private String asPostCd; + private String asPostDt; + private String asStateDt; + private String asText; + private Integer asReuser; + private String asInline; + private String asSysGubunC; + private String asPetiAncCodeV; + private String asPetiNoC; + +} diff --git a/src/main/java/go/kr/project/vo/CpBdongVO.java b/src/main/java/go/kr/project/vo/CpBdongVO.java new file mode 100644 index 0000000..70d91a3 --- /dev/null +++ b/src/main/java/go/kr/project/vo/CpBdongVO.java @@ -0,0 +1,17 @@ +package go.kr.project.vo; + +import lombok.*; + + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class CpBdongVO { + + private String bdCode; + private String bdSggName; + private String bdDongName; + private String bdEnable; +} diff --git a/src/main/java/go/kr/project/vo/CpCancelVO.java b/src/main/java/go/kr/project/vo/CpCancelVO.java new file mode 100644 index 0000000..00dec9d --- /dev/null +++ b/src/main/java/go/kr/project/vo/CpCancelVO.java @@ -0,0 +1,20 @@ +package go.kr.project.vo; + +import lombok.*; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class CpCancelVO { + + private Long ccCode; + private String ccSggcode; + private String ccMmcode; + private String ccDate; + private String ccCause; + private String ccEtc; + private String ccIndt; + private Integer ccInuser; +} diff --git a/src/main/java/go/kr/project/vo/CpGojiPrtVO.java b/src/main/java/go/kr/project/vo/CpGojiPrtVO.java new file mode 100644 index 0000000..5dc328a --- /dev/null +++ b/src/main/java/go/kr/project/vo/CpGojiPrtVO.java @@ -0,0 +1,76 @@ +package go.kr.project.vo; + +import lombok.*; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class CpGojiPrtVO { + + private Long gpCode; + private String gpLawgb; + private String gpPrtgb; + private Long gpTtcode; + private Long gpGtcode; + private String gpSggcode; + private String gpMmcode; + private String gpMmCarno; + private String gpMmWdatetime; + private String gpMmSgpos; + private String gpLvyKey; + private String gpAccYear; + private String gpLvyNo; + private String gpAccountNo; + private String gpErcNo; + private String gpSdate; + private String gpEdate; + private Integer gpKeumT; + private Integer gpKeumA; + private Integer gpKeumB; + private String gpName; + private String gpJno; + private String gpJuso; + private String gpBunji; + private String gpZip; + private String gpRegistNo; + private String gpSendDate; + private String gpSendTime; + private String gpReturnCd; + private String gpRecvName; + private String gpRecvRelt; + private String gpState; + private String gpStateOld; + private String gpSendDateOld; + private String gpSendTimeOld; + private String gpSunap; + private String gpAddrUpdate; + private String gpKeum; + private String gpConKey; + private String gpAccountNo2; + private String gpAccountNo3; + private String gpBankNm; + private String gpBankNm2; + private String gpBankNm3; + private String gpAccountNo4; + private String gpAccountNo5; + private String gpAccountNo6; + private String gpAccountNo7; + private String gpAccountNo8; + private String gpAccountNo9; + private String gpAccountNo10; + private String gpAccountNo11; + private String gpBankNm4; + private String gpBankNm5; + private String gpBankNm6; + private String gpBankNm7; + private String gpBankNm8; + private String gpBankNm9; + private String gpBankNm10; + private String gpBankNm11; + private String gpTaxno; + private String gpPayOutDate; + private String gpElpostState; + +} diff --git a/src/main/java/go/kr/project/vo/CpGojiSendHistVO.java b/src/main/java/go/kr/project/vo/CpGojiSendHistVO.java new file mode 100644 index 0000000..680c96e --- /dev/null +++ b/src/main/java/go/kr/project/vo/CpGojiSendHistVO.java @@ -0,0 +1,25 @@ +package go.kr.project.vo; + +import lombok.*; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class CpGojiSendHistVO { + + private String ghCode; // PK + private Integer ghGpcode; // int(10) + private String ghSggcode; // varchar(5) + private String ghConKey; // varchar(30) + private String ghRegino; // varchar(13) + private String ghSendDate; // varchar(8) (yyyyMMdd) + private String ghSendTime; // varchar(4) (HHmm) + private String ghReturnCdStr; // varchar(100) + private String ghRecvName; // varchar(70) + private String ghRecvRelt; // varchar(100) + private String ghResultCd; // varchar(2) + private String ghReturnCd; // varchar(2) + private String ghRecvReltCd; // varchar(2) +} diff --git a/src/main/java/go/kr/project/vo/CpGojitVO.java b/src/main/java/go/kr/project/vo/CpGojitVO.java new file mode 100644 index 0000000..55a2dd4 --- /dev/null +++ b/src/main/java/go/kr/project/vo/CpGojitVO.java @@ -0,0 +1,39 @@ +package go.kr.project.vo; + +import lombok.*; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class CpGojitVO { + + private Long tgCode; + private String tgSggCode; + private String tgLawGb; + private String tgGb; + private String tgDlgb; + private String tgSrcSdate; + private String tgSrcEdate; + private String tgSdate; + private String tgEdate; + private String tgTitle; + private String tgDocno; + private String tgEtc; + private Integer tgTotcount; + private Long tgTotkeum; + private String tgIndt; + private Integer tgInuser; + private String tgConKey; + private String tgPostSeCd; + private String tgIsResend; + private String tgNoticeKey; + private String tgPostProcStt; + private String tgUnitySndngMastrId; + private String tgDelete; + private String tgPostYn; + private String tgElpostYn; + + +} diff --git a/src/main/java/go/kr/project/vo/CpImagesizeVO.java b/src/main/java/go/kr/project/vo/CpImagesizeVO.java new file mode 100644 index 0000000..34fdc23 --- /dev/null +++ b/src/main/java/go/kr/project/vo/CpImagesizeVO.java @@ -0,0 +1,22 @@ +package go.kr.project.vo; + +import lombok.*; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class CpImagesizeVO { + + private String isMmcode; + private Integer isImage1; + private Integer isImage2; + private Integer isImage3; + private Integer isImage4; + private Integer isVideo; + private Integer isRecall1; + private Integer isRecall2; + private Integer isRecall3; + +} diff --git a/src/main/java/go/kr/project/vo/CpInstructAnswerVO.java b/src/main/java/go/kr/project/vo/CpInstructAnswerVO.java new file mode 100644 index 0000000..7f1df81 --- /dev/null +++ b/src/main/java/go/kr/project/vo/CpInstructAnswerVO.java @@ -0,0 +1,19 @@ +package go.kr.project.vo; + +import lombok.*; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class CpInstructAnswerVO { + + private String iaSggcode; + private String iaCode; + private String iaId; + private String iaAnswerText; + private String iaMailtitle; + private String iaMailtext; + +} \ No newline at end of file diff --git a/src/main/java/go/kr/project/vo/CpInstructVO.java b/src/main/java/go/kr/project/vo/CpInstructVO.java new file mode 100644 index 0000000..f308304 --- /dev/null +++ b/src/main/java/go/kr/project/vo/CpInstructVO.java @@ -0,0 +1,23 @@ +package go.kr.project.vo; + +import lombok.*; + + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class CpInstructVO { + + private Long itCode; + private String itSggcode; + private String itMmcode; + private String itDate; + private String itCause; + private String itEtc; + private String itIndt; + private Integer itInuser; + +} + diff --git a/src/main/java/go/kr/project/vo/CpMainEtc1VO.java b/src/main/java/go/kr/project/vo/CpMainEtc1VO.java new file mode 100644 index 0000000..baafeeb --- /dev/null +++ b/src/main/java/go/kr/project/vo/CpMainEtc1VO.java @@ -0,0 +1,17 @@ +package go.kr.project.vo; + +import lombok.*; + + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class CpMainEtc1VO { + + private String mmCode; + private String mmJsdate; + private String mmKey; + private String mmText; +} \ No newline at end of file diff --git a/src/main/java/go/kr/project/vo/CpMainVO.java b/src/main/java/go/kr/project/vo/CpMainVO.java new file mode 100644 index 0000000..263e52b --- /dev/null +++ b/src/main/java/go/kr/project/vo/CpMainVO.java @@ -0,0 +1,61 @@ +package go.kr.project.vo; + +import lombok.*; + + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class CpMainVO { + + private String mmCode; + private String mmSggcode; + private String mmDlgb; + private String mmIngb; + private String mmDate; + private String mmTime; + private String mmLawgb; + private String mmSgnm; + private String mmSgtel; + private String mmSgcont; + private String mmSgpos; + private String mmBdcode; + private String mmGpsX; + private String mmGpsY; + private String mmTrac; + private String mmSno; + private Integer mmImagecnt; + private String mmImagegb; + private String mmCarno; + private String mmVhmno; + private String mmCargb; + private String mmCarkind; + private String mmOmcode; + private String mmSdate; + private String mmEdate; + private Integer mmKeum1; + private Integer mmKeum2; + private Integer mmSukeum; + private Integer mmMinusKeum; + private Integer mmAddKeum; + private String mmRecall; + private Integer mmInuser; + private String mmIndt; + private String mmState; + private String mmStateDt; + private String mmCarcheck; + private String mmPrecode; + private String mmEtc; + private String mmVideofilenm; + private String mmSafezone; + private String mmViorcnt; + private String mmTime2; + private String mmCarname; + private String mmCarcolor; + private String mmCarfuel; + private String mmTransmitSgg; + private String mmTransmitTeam; + +} diff --git a/src/main/java/go/kr/project/vo/CpMatchVO.java b/src/main/java/go/kr/project/vo/CpMatchVO.java new file mode 100644 index 0000000..e292755 --- /dev/null +++ b/src/main/java/go/kr/project/vo/CpMatchVO.java @@ -0,0 +1,53 @@ +package go.kr.project.vo; + + +import lombok.*; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class CpMatchVO { + + private Long mcCode; + private String mcMmcode; + private String mcMmWdatetime; + private String mcMmSgpos; + private String mcBdong; + private String mcLvyKey0; + private String mcLvyKey; + private String mcAccYear; + private String mcLvyNo; + private String mcAccountNo; + private String mcErcNo; + private String mcKeumT; + private String mcKeumA; + private String mcKeumB; + private String mcIndt; + private String mcEditdt; + private String mcState; + private String mcAccountNo2; + private String mcAccountNo3; + private String mcBankNm; + private String mcBankNm2; + private String mcBankNm3; + private String mcAccountNo4; + private String mcAccountNo5; + private String mcAccountNo6; + private String mcAccountNo7; + private String mcAccountNo8; + private String mcAccountNo9; + private String mcAccountNo10; + private String mcAccountNo11; + private String mcBankNm4; + private String mcBankNm5; + private String mcBankNm6; + private String mcBankNm7; + private String mcBankNm8; + private String mcBankNm9; + private String mcBankNm10; + private String mcBankNm11; + + +} diff --git a/src/main/java/go/kr/project/vo/CpOwnerVO.java b/src/main/java/go/kr/project/vo/CpOwnerVO.java new file mode 100644 index 0000000..c66dcc3 --- /dev/null +++ b/src/main/java/go/kr/project/vo/CpOwnerVO.java @@ -0,0 +1,29 @@ +package go.kr.project.vo; + +import lombok.*; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class CpOwnerVO { + + private String omCode; + private String omSggcode; + private String omName; + private String omNo1; + private String omJno; + private String omNOGb; + private String omJuso; + private String omBunji; + private String omZip; + private String omDoroCode; + private String omBldPosition; + private String omBldNo1; + private String omBldNo2; + private String omBldAdmno; + private String omIngb; + private String omIndt; + private String omBdcode; +} diff --git a/src/main/java/go/kr/project/vo/CpSeallOneVO.java b/src/main/java/go/kr/project/vo/CpSeallOneVO.java new file mode 100644 index 0000000..7887d9b --- /dev/null +++ b/src/main/java/go/kr/project/vo/CpSeallOneVO.java @@ -0,0 +1,21 @@ +package go.kr.project.vo; + +import lombok.*; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class CpSeallOneVO { + + private String soSggcode; + private String soInDt; + private String soInGb; + private String soJsdate; + private String soBbsNo; + private String soMmcode; + private String soState; + private Integer soUser; + private String soPutDt; +} \ No newline at end of file diff --git a/src/main/java/go/kr/project/vo/CpSetinfoVO.java b/src/main/java/go/kr/project/vo/CpSetinfoVO.java new file mode 100644 index 0000000..73ebd56 --- /dev/null +++ b/src/main/java/go/kr/project/vo/CpSetinfoVO.java @@ -0,0 +1,32 @@ +package go.kr.project.vo; + +import lombok.*; + + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class CpSetinfoVO { + + private String codeName; + private String groupCode; + private String detailCode; + private Integer intValue1; + private Integer intValue2; + private Integer intValue3; + private Integer intValue4; + private Integer intValue5; + private String strValue1; + private String strValue2; + private String strValue3; + private String strValue4; + private String strValue5; + private String strValue6; + private String strValue7; + private String strValue8; + private String strValue9; + private String strValue10; + private String strValue11; +} diff --git a/src/main/java/go/kr/project/vo/CpSggVO.java b/src/main/java/go/kr/project/vo/CpSggVO.java new file mode 100644 index 0000000..e49118a --- /dev/null +++ b/src/main/java/go/kr/project/vo/CpSggVO.java @@ -0,0 +1,17 @@ +package go.kr.project.vo; + +import lombok.*; + + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class CpSggVO { + + private String sgSggcode; + private String sgSggName; + private String sgEnable; + private String sgDepCode; +} \ No newline at end of file diff --git a/src/main/java/go/kr/project/vo/CpUserVO.java b/src/main/java/go/kr/project/vo/CpUserVO.java new file mode 100644 index 0000000..25d9359 --- /dev/null +++ b/src/main/java/go/kr/project/vo/CpUserVO.java @@ -0,0 +1,31 @@ +package go.kr.project.vo; + +import lombok.*; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class CpUserVO { + + private Integer umCode; + private String umSggcode; + private String umLevelcd; + private String umLevel; + private String umName; + private String umTelno; + private String umEmail; + private String umHwpdirc; + private String umPass; + private String umPermision; + private String umSeallUser; + private String umTaxeUser; + private String umIndt; + private String umEnable; + private String umJobGroup; + private String umDeldt; + private String umIp; + private String umPassUpdt; + private String umCarUser; +} \ No newline at end of file diff --git a/src/main/java/go/kr/project/vo/CpViolationVO.java b/src/main/java/go/kr/project/vo/CpViolationVO.java new file mode 100644 index 0000000..3960ff8 --- /dev/null +++ b/src/main/java/go/kr/project/vo/CpViolationVO.java @@ -0,0 +1,26 @@ +package go.kr.project.vo; + +import lombok.*; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class CpViolationVO { + + + private String vlSggcode; + private String vlJobgroup; + private String vlCode; + private String vlId; + private String vlLaw1; + private String vlLaw2; + private String vlLaw3; + private String vlEnable; + private String vlSemok1; + private String vlSemok2; + private Integer vlKeum; + private String vlAnswer; + private String vlSemok3; +} diff --git a/src/main/java/go/kr/project/vo/EpostDelivResultVO.java b/src/main/java/go/kr/project/vo/EpostDelivResultVO.java new file mode 100644 index 0000000..d719a29 --- /dev/null +++ b/src/main/java/go/kr/project/vo/EpostDelivResultVO.java @@ -0,0 +1,24 @@ +package go.kr.project.vo; + +import lombok.*; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class EpostDelivResultVO { + + private Long seqKey; + private String conKey; + private String regino; + private String delivYmd; + private String delivHhmi; + private String outsidUserId; + private String delivRsltCd; + private String nonDelivReasnCd; + private String nonDelivReasnCdNm; + private String subRecPrsnNm; + private String relRecPrsnCd; + private String relRecPrsnCdNm; +} diff --git a/src/main/java/go/kr/project/vo/EpostMakeResultVO.java b/src/main/java/go/kr/project/vo/EpostMakeResultVO.java new file mode 100644 index 0000000..d11dd8b --- /dev/null +++ b/src/main/java/go/kr/project/vo/EpostMakeResultVO.java @@ -0,0 +1,17 @@ +package go.kr.project.vo; + +import lombok.*; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class EpostMakeResultVO { + + private String conKey; + private String rgstNmbr; + private String reletcData; + private String dataCd; + private String mailCnt; +} diff --git a/src/main/java/go/kr/project/vo/EpostRceptResultVO.java b/src/main/java/go/kr/project/vo/EpostRceptResultVO.java new file mode 100644 index 0000000..be45fcf --- /dev/null +++ b/src/main/java/go/kr/project/vo/EpostRceptResultVO.java @@ -0,0 +1,25 @@ +package go.kr.project.vo; + +import lombok.*; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class EpostRceptResultVO { + + private Long rrCode; + private String conOrg; + private String relOrSectCd; + private String reletcData; + private String extriRegYmd; + private String rceptYmd; + private String rceptId; + private String divKb; + private Integer rceptCnt; + private Integer rceptAmt; + private Integer usefeeAmt; + private Integer totpostPrc; + private Integer jobCd; +} diff --git a/src/main/java/go/kr/project/vo/EpostRgstNmbrVO.java b/src/main/java/go/kr/project/vo/EpostRgstNmbrVO.java new file mode 100644 index 0000000..4dc8ed2 --- /dev/null +++ b/src/main/java/go/kr/project/vo/EpostRgstNmbrVO.java @@ -0,0 +1,15 @@ +package go.kr.project.vo; + +import lombok.*; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class EpostRgstNmbrVO { + + private String rgstNmbr; + private String rgstNmbrNext; + private String pcursor; +} \ No newline at end of file diff --git a/src/main/java/go/kr/project/vo/EpostSenderDetailVO.java b/src/main/java/go/kr/project/vo/EpostSenderDetailVO.java new file mode 100644 index 0000000..a24dd88 --- /dev/null +++ b/src/main/java/go/kr/project/vo/EpostSenderDetailVO.java @@ -0,0 +1,74 @@ +package go.kr.project.vo; + +import lombok.*; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class EpostSenderDetailVO { + + private String conKey; + private String rgstNmbr; + private String recevSeq; + private String recevCode; + private String recevBar1d; + private String recevBar2d; + private String recevBillNumber; + private String recevDocCd1; + private String recevDocCd2; + private String recevDocCd3; + private String recevDocCd4; + private String recevDocCd5; + private String recevSubj1; + private String recevSubj2; + private String recevSubj3; + private String recevViolateDt; + private String recevViolateDong; + private String recevViolatePlace; + private String recevLaws; + private String recevPayNumber1; + private String recevPayNumber2; + private String recevOcr0; + private String recevOcr1; + private String recevOcr2; + private String recevOnlinePayNumber; + private String recevVaccountNumber; + private String recevVaccountNumber2; + private String recevVaccountNumber3; + private String recevVaccountNumber4; + private String recevVaccountNumber5; + private String recevVaccountNumber6; + private String recevVaccountNumber7; + private String recevVaccountNumber8; + private String recevVaccountNumber9; + private String recevVaccountNumber10; + private String recevVaccountNumber11; + private String recevFinePrice; + private String recevPayPrice; + private String recevPayDt; + private String recevPayInDate; + private String recevPayInPrice; + private String recevPayInAddPrice; + private String recevPayInDefaultPrice; + private String recevPayOutDate; + private String recevPayOutPrice; + private String recevPayOutAddPrice; + private String recevPayOutDefaultPrice; + private String recevCarNumber; + private String recevCarOwnerZipcode; + private String recevCarOwnerAddr; + private String recevCarOwnerDetailaddr; + private String recevCarOwnerNm; + private String recevCarOwnerSsn; + private String recevEvidenceNumber; + private Integer recevPhotoCnt; // int(2) + private String recevPhotoFile1; + private String recevPhotoFile2; + private String recevPhotoFile3; + private String recevPhotoFile4; + private Integer delivResultCode; // int(10) + private String makeResultCd; + private String postSendState; +} diff --git a/src/main/java/go/kr/project/vo/EpostSenderRegVO.java b/src/main/java/go/kr/project/vo/EpostSenderRegVO.java new file mode 100644 index 0000000..d911eeb --- /dev/null +++ b/src/main/java/go/kr/project/vo/EpostSenderRegVO.java @@ -0,0 +1,55 @@ +package go.kr.project.vo; + +import lombok.*; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class EpostSenderRegVO { + + private String conKey; + private String rceptId; + private String dataCd; + private String divKb; + private String dfpayyn; + private String rcptKb; + private String sealCd; + private String wordKb; + private Integer mailCnt; // int(5) + private Integer recevCnt; // int(7) + private String envCd; + private String colorYn; + private String mmYn; + private String flexCd; + private Integer dmCnt; // int(2) + private String sbFg; + private String apvlNb; + private String sendDate; + private String sendTime; + private String relorsectCd; + private String recevSenderOrgCode; + private String recevSenderNm; + private String recevSenderZipcode; + private String recevSenderAddr; + private String recevSenderDetailAddr; + private String recevSenderDepartTel; + private String recevSenderDepartNm; + private String recevDivCd; + private String recevPrintDt; + private String recevPrintYear; + private String recevPrintMonth; + private String recevPrintDay; + private String recevSenderFax; + private String recevSerderStaff; + private String recevSenderEmail; + private String jobCd; + private String postProcStt; + private String deleteAt; + private String regYmd; + private String rceptYmd; + private String regSysSe; + private String tgCode; + +} \ No newline at end of file diff --git a/src/main/java/go/kr/project/vo/TbCntcSndngDetailVO.java b/src/main/java/go/kr/project/vo/TbCntcSndngDetailVO.java new file mode 100644 index 0000000..4244362 --- /dev/null +++ b/src/main/java/go/kr/project/vo/TbCntcSndngDetailVO.java @@ -0,0 +1,36 @@ +package go.kr.project.vo; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.time.LocalDateTime; + +@Getter +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class TbCntcSndngDetailVO { + + private String unitySndngDetailId; // 통합 발송 상세 ID (PK) + private String unitySndngMastrId; // 통합 발송 마스터 ID + private String signguCode; // 시군구 코드 + private String ffnlgCode; // 과태료 코드 + private String mainCode; // 메인 코드 + private String vhcleNo; // 차량 번호 + private String ihidnum; // 주민등록번호 + private String moblphonNo; // 핸드폰 번호 + private String nm; // 성명 + private String adres; // 주소 + private String detailAdres; // 상세 주소 + private String zip; // 우편번호 + private String tmpltMsgData; // 템플릿 메시지 데이터 (LONGTEXT) + private String mobilePageCn; // 모바일 페이지 내용 (LONGTEXT) + private String useInsttIdntfcId; // 이용 기관 식별 ID + private String externalDocumentUuid; // 외부 문서 식별 번호 + private LocalDateTime registDt; // 등록일자 + private String register; // 등록자 + private LocalDateTime updtDt; // 수정일자 + private String updusr; // 수정자 +} \ No newline at end of file diff --git a/src/main/java/go/kr/project/vo/TbCntcSndngResultVO.java b/src/main/java/go/kr/project/vo/TbCntcSndngResultVO.java new file mode 100644 index 0000000..ff6ae5c --- /dev/null +++ b/src/main/java/go/kr/project/vo/TbCntcSndngResultVO.java @@ -0,0 +1,28 @@ +package go.kr.project.vo; + +import lombok.*; + +import java.time.LocalDateTime; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class TbCntcSndngResultVO { + + private String unitySndngDetailId; // PK1 + private String sndngSeCode; // PK2 + private String signguCode; // 시군구 코드 + private String ffnlgCode; // 과태료 코드 + private String sndngResultSttus; // 발송 결과 상태 + private String requstDt; // 요청 일시 (문자열 컬럼 정의대로 String) + private String inqireDt; // 조회 일시 + private String readngDt; // 열람 일시 + private String errorCn; // 오류 내용 + private String rgistNo; // 등기번호 + private LocalDateTime registDt; // 등록일자 + private String register; // 등록자 + private LocalDateTime updtDt; // 수정일자 + private String updusr; // 수정자 +} diff --git a/src/main/java/go/kr/project/vo/mapper/EntityVoMapper.java b/src/main/java/go/kr/project/vo/mapper/EntityVoMapper.java new file mode 100644 index 0000000..2b4e858 --- /dev/null +++ b/src/main/java/go/kr/project/vo/mapper/EntityVoMapper.java @@ -0,0 +1,96 @@ +package go.kr.project.vo.mapper; + +import go.kr.project.domain.entity.*; +import go.kr.project.vo.*; +import org.mapstruct.Mapper; + +@Mapper(componentModel = "spring") +public interface EntityVoMapper { + + //:todo 멀티 pk 관련 작업 해야됨. 엔티티 id키로 되어있는거 + + + // ===== CP 계열 ===== + CpAnswerVO toCpAnswerVO(CpAnswer entity); + CpAnswer toCpAnswer(CpAnswerVO vo); + + CpBdongVO toCpBdongVO(CpBdong entity); + CpBdong toCpBdong(CpBdongVO vo); + + CpCancelVO toCpCancelVO(CpCancel entity); + CpCancel toCpCancel(CpCancelVO vo); + + CpGojiPrtVO toCpGojiPrtVO(CpGojiPrt entity); + CpGojiPrt toCpGojiPrt(CpGojiPrtVO vo); + + CpGojiSendHistVO toCpGojiSendHistVO(CpGojiSendHist entity); + CpGojiSendHist toCpGojiSendHist(CpGojiSendHistVO vo); + + CpGojitVO toCpGojitVO(CpGojit entity); + CpGojit toCpGojit(CpGojitVO vo); + + CpImagesizeVO toCpImagesizeVO(CpImagesize entity); + CpImagesize toCpImagesize(CpImagesizeVO vo); + + CpInstructVO toCpInstructVO(CpInstruct entity); + CpInstruct toCpInstruct(CpInstructVO vo); + + CpInstructAnswerVO toCpInstructAnswerVO(CpInstructAnswer entity); + CpInstructAnswer toCpInstructAnswer(CpInstructAnswerVO vo); + + CpMainVO toCpMainVO(CpMain entity); + CpMain toCpMain(CpMainVO vo); + + CpMainEtc1VO toCpMainEtc1VO(CpMainEtc1 entity); + CpMainEtc1 toCpMainEtc1(CpMainEtc1VO vo); + + CpMatchVO toCpMatchVO(CpMatch entity); + CpMatch toCpMatch(CpMatchVO vo); + + CpOwnerVO toCpOwnerVO(CpOwner entity); + CpOwner toCpOwner(CpOwnerVO vo); + + CpSeallOneVO toCpSeallOneVO(CpSeallOne entity); + CpSeallOne toCpSeallOne(CpSeallOneVO vo); + + CpSetinfoVO toCpSetinfoVO(CpSetinfo entity); + CpSetinfo toCpSetinfo(CpSetinfoVO vo); + + CpSggVO toCpSggVO(CpSgg entity); + CpSgg toCpSgg(CpSggVO vo); + + CpUserVO toCpUserVO(CpUser entity); + CpUser toCpUser(CpUserVO vo); + + CpViolationVO toCpViolationVO(CpViolation entity); + CpViolation toCpViolation(CpViolationVO vo); + + + // ===== EPOST 계열 ===== + EpostDelivResultVO toEpostDelivResultVO(EpostDelivResult entity); + EpostDelivResult toEpostDelivResult(EpostDelivResultVO vo); + + EpostMakeResultVO toEpostMakeResultVO(EpostMakeResult entity); + EpostMakeResult toEpostMakeResult(EpostMakeResultVO vo); + +// EpostRecptResultVO toEpostRecptResultVO(EpostRecptResult entity); +// EpostRecptResult toEpostRecptResult(EpostRecptResultVO vo); + + EpostRgstNmbrVO toEpostRgstNmbrVO(EpostRgstNmbr entity); + EpostRgstNmbr toEpostRgstNmbr(EpostRgstNmbrVO vo); + + EpostSenderDetailVO toEpostSenderDetailVO(EpostSenderDetail entity); + EpostSenderDetail toEpostSenderDetail(EpostSenderDetailVO vo); + + EpostSenderRegVO toEpostSenderRegVO(EpostSenderReg entity); + EpostSenderReg toEpostSenderReg(EpostSenderRegVO vo); + + + // ===== TB_CNTC 계열 ===== + TbCntcSndngDetailVO toTbCntcSndngDetailVO(TbCntcSndngDetail entity); + TbCntcSndngDetail toTbCntcSndngDetail(TbCntcSndngDetailVO vo); + + TbCntcSndngResultVO toTbCntcSndngResultVO(TbCntcSndngResult entity); + TbCntcSndngResult toTbCntcSndngResult(TbCntcSndngResultVO vo); + +} diff --git a/src/main/webapp/WEB-INF/views/biz/minwon/init/init.jsp b/src/main/webapp/WEB-INF/views/biz/minwon/init/init.jsp index 5dd4d2d..cb93fb7 100644 --- a/src/main/webapp/WEB-INF/views/biz/minwon/init/init.jsp +++ b/src/main/webapp/WEB-INF/views/biz/minwon/init/init.jsp @@ -11,7 +11,6 @@ -
    @@ -49,8 +48,8 @@
  • / Pages
  • @@ -123,7 +122,7 @@ // 그리드 설정 객체 생성 var gridConfig = new XitTuiGridConfig(); - // 기본 설정 + // 기본 설정w gridConfig.setOptDataSource(dataSource); // 데이터소스 연결 gridConfig.setOptGridId('grid'); // 그리드를 출력할 Element ID gridConfig.setOptGridHeight(390); // 그리드 높이(단위: px) @@ -132,34 +131,38 @@ // 페이징 옵션 설정 gridConfig.setOptPageOptions({ - useClient: false, // 클라이언트 페이징 여부(false: 서버 페이징) + useClient: true, // 클라이언트 페이징 여부(false: 서버 페이징) perPage: perPage // 페이지당 표시 건수 }); - gridConfig.setOptUseClientSort(false); // 서버사이드 정렬 false + gridConfig.setOptUseClientSort(true); // 서버사이드 정렬 false // 컬럼 정보 설정 gridConfig.setOptColumns([ { header: '등록구분', name: 'mmIngb', + sortable: true, width: 50, align: 'center' }, { header: '목록번호', name: 'asBbsNo', + sortable: true, width: 70, align: 'center' }, { header: '신고자', name: 'mmSgnm', + sortable: true, width: 100, align: 'center' }, { header: '담당자', name: 'mmSgtel', + sortable: true, width: 100, align: 'center' }, @@ -172,18 +175,21 @@ { header: '접수일자', name: 'asJsdate', + sortable: true, width: 70, align: 'center' }, { header: '처리기한', name: 'asLimitDt', + sortable: true, width: 70, align: 'center' }, { header: '위반일자', name: 'mmDate', + sortable: true, width: 150, align: 'center' }, @@ -208,18 +214,21 @@ { header: '접수번호', name: 'asJsno', + sortable: true, width: 150, align: 'center' }, { header: '차량번호', name: 'mmCarno', + sortable: true, width: 150, align: 'center' }, { header: 'mmCode', name: 'mmCode', + sortable: true, width: 150, align: 'center', hidden: false @@ -279,8 +288,8 @@ this.instance.on('successResponse', function(ev) { var responseObj = JSON.parse(ev.xhr.response); //$('.totCnt').text(responseObj.data.pagination.totalCount); - $("#currentPage").text(responseObj.data.pagination.page); - $("#totalPages").text(responseObj.data.pagination.totalPages); + // $("#currentPage").text(responseObj.data.pagination.page); + // $("#totalPages").text(responseObj.data.pagination.totalPages); }); // 행 더블클릭 이벤트 - 게시물 상세 페이지로 이동 @@ -290,9 +299,13 @@ var popOption = "width=1400px, height=900px, resizable=yes, scrollbars=yes, location=no, top=100px, left=100px"; // 팝업 띄우기 - const mmCode = this.instance.getValue(ev.rowKey, 'mmCode'); // tuiGrid의 해당 행 컬럼값 + let cursor = this.instance.getValue(ev.rowKey, 'mmCode'); // 선택한 mmCode + let mmCodes = this.instance.getData().map(row => row.mmCode); // 리스트업 된 자료 mmCode 리스트 const $openPop = window.open(popUrl, popTitle, popOption); - $($openPop).prop('mmCode', mmCode); + $($openPop).prop('cursor', cursor); + $($openPop).prop('mmCodes', mmCodes); + + }); diff --git a/src/main/webapp/WEB-INF/views/biz/totalInfo/totalInfo_popup.jsp b/src/main/webapp/WEB-INF/views/biz/totalInfo/totalInfo_popup.jsp index af20c5a..19a938f 100644 --- a/src/main/webapp/WEB-INF/views/biz/totalInfo/totalInfo_popup.jsp +++ b/src/main/webapp/WEB-INF/views/biz/totalInfo/totalInfo_popup.jsp @@ -5,11 +5,11 @@ Time: 오후 5:34 To change this template use File | Settings | File Templates. --%> -<%@ page contentType="text/html;charset=UTF-8" language="java" %> -<%----%> +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +
    - 요거슨 개별 총 정보
    • 위반정보
    • @@ -33,10 +33,13 @@
      <%-- 부모창에서 받아오는 리스트 배열 --%> + <%-- 부모창에서 받아오는 리스크 커서 --%> + +
      2 of 4