diff --git a/src/main/java/com/xit/biz/ctgy/dto/GnRecallScDto.java b/src/main/java/com/xit/biz/ctgy/dto/GnRecallScDto.java index b8223fc..8958d21 100644 --- a/src/main/java/com/xit/biz/ctgy/dto/GnRecallScDto.java +++ b/src/main/java/com/xit/biz/ctgy/dto/GnRecallScDto.java @@ -37,13 +37,13 @@ public class GnRecallScDto { @Schema(required = true, title = "접수방법코드", example = " ", description = "접수방법코드") private String scIngb; - @Schema(required = true, title = " ", example = " ", description = " ") + @Schema(required = true, title = "위반일자", example = " ", description = "위반일자") private String scWdate; @Schema(required = true, title = " ", example = " ", description = " ") private String scJbtime; - @Schema(required = true, title = " ", example = " ", description = " ") + @Schema(required = true, title = "위반장소", example = " ", description = "위반장소") private String scPos; @Schema(title = "진술서파일1", example = " ", description = " ") diff --git a/src/main/java/com/xit/biz/ctgy/dto/JudgeListDto.java b/src/main/java/com/xit/biz/ctgy/dto/JudgeListDto.java index e7359ea..d118203 100644 --- a/src/main/java/com/xit/biz/ctgy/dto/JudgeListDto.java +++ b/src/main/java/com/xit/biz/ctgy/dto/JudgeListDto.java @@ -60,5 +60,10 @@ public class JudgeListDto { @Schema(title = "심사일", example = " ", description = "심사일") private LocalDate msuIndate; + @Schema(required = true, title = "위반일자", example = " ", description = "위반일자") + private String scWdate; + @Schema(required = true, title = "위반장소", example = " ", description = "위반장소") + private String scPos; + } diff --git a/src/main/java/com/xit/biz/ctgy/repository/IResidentAndDisabledRepositoryImpl.java b/src/main/java/com/xit/biz/ctgy/repository/IResidentAndDisabledRepositoryImpl.java index 90bf13d..c9d1405 100644 --- a/src/main/java/com/xit/biz/ctgy/repository/IResidentAndDisabledRepositoryImpl.java +++ b/src/main/java/com/xit/biz/ctgy/repository/IResidentAndDisabledRepositoryImpl.java @@ -335,7 +335,6 @@ public class IResidentAndDisabledRepositoryImpl implements IResidentAndDisabledR minSimsa680Sc.msSeq, minSimsa680Sc.msCarnum, minSimsa680Sc.msResult, - minSimsaUser680Sc.msuResult, minSimsa680Sc.msYear, minSimsa680Sc.msChasu, minSimsa680Sc.msSdate, @@ -344,11 +343,17 @@ public class IResidentAndDisabledRepositoryImpl implements IResidentAndDisabledR minSimsa680Sc.msCdate, minSimsa680Sc.msClosesi, minSimsa680Sc.msDatagb, - minSimsaUser680Sc.msuCode + minSimsaUser680Sc.msuCode, + minSimsaUser680Sc.msuResult, + minSimsaUser680Sc.msuReason, + gnRecallSc.scWdate, + gnRecallSc.scPos )) .from(minSimsa680Sc) .join(minSimsaUser680Sc) .on(minSimsa680Sc.msMaincode.eq(minSimsaUser680Sc.msuMaincode)) + .join(gnRecallSc) + .on(minSimsa680Sc.msMaincode.eq(gnRecallSc.scCode)) .where(builder) //.groupBy(minSimsa680Sc.msDatagb, minSimsa680Sc.msYear, minSimsaUser680Sc.msuUserid, minSimsa680Sc.msChasu, minSimsa680Sc.msSdate, minSimsa680Sc.msStartsi, minSimsa680Sc.msEdate, minSimsa680Sc.msCdate, minSimsa680Sc.msClosesi) .orderBy(minSimsa680Sc.msSdate.asc(), minSimsa680Sc.msEdate.asc(), minSimsa680Sc.msSeq.asc())