feat : 거주자/장애인 심사자 심사 반영

dev
minuk926 3 years ago
parent 3c58460afd
commit cad34d48bb

@ -37,13 +37,13 @@ public class GnRecallScDto {
@Schema(required = true, title = "접수방법코드", example = " ", description = "접수방법코드") @Schema(required = true, title = "접수방법코드", example = " ", description = "접수방법코드")
private String scIngb; private String scIngb;
@Schema(required = true, title = " ", example = " ", description = " ") @Schema(required = true, title = "위반일자", example = " ", description = "위반일자")
private String scWdate; private String scWdate;
@Schema(required = true, title = " ", example = " ", description = " ") @Schema(required = true, title = " ", example = " ", description = " ")
private String scJbtime; private String scJbtime;
@Schema(required = true, title = " ", example = " ", description = " ") @Schema(required = true, title = "위반장소", example = " ", description = "위반장소")
private String scPos; private String scPos;
@Schema(title = "진술서파일1", example = " ", description = " ") @Schema(title = "진술서파일1", example = " ", description = " ")

@ -60,5 +60,10 @@ public class JudgeListDto {
@Schema(title = "심사일", example = " ", description = "심사일") @Schema(title = "심사일", example = " ", description = "심사일")
private LocalDate msuIndate; private LocalDate msuIndate;
@Schema(required = true, title = "위반일자", example = " ", description = "위반일자")
private String scWdate;
@Schema(required = true, title = "위반장소", example = " ", description = "위반장소")
private String scPos;
} }

@ -335,7 +335,6 @@ public class IResidentAndDisabledRepositoryImpl implements IResidentAndDisabledR
minSimsa680Sc.msSeq, minSimsa680Sc.msSeq,
minSimsa680Sc.msCarnum, minSimsa680Sc.msCarnum,
minSimsa680Sc.msResult, minSimsa680Sc.msResult,
minSimsaUser680Sc.msuResult,
minSimsa680Sc.msYear, minSimsa680Sc.msYear,
minSimsa680Sc.msChasu, minSimsa680Sc.msChasu,
minSimsa680Sc.msSdate, minSimsa680Sc.msSdate,
@ -344,11 +343,17 @@ public class IResidentAndDisabledRepositoryImpl implements IResidentAndDisabledR
minSimsa680Sc.msCdate, minSimsa680Sc.msCdate,
minSimsa680Sc.msClosesi, minSimsa680Sc.msClosesi,
minSimsa680Sc.msDatagb, minSimsa680Sc.msDatagb,
minSimsaUser680Sc.msuCode minSimsaUser680Sc.msuCode,
minSimsaUser680Sc.msuResult,
minSimsaUser680Sc.msuReason,
gnRecallSc.scWdate,
gnRecallSc.scPos
)) ))
.from(minSimsa680Sc) .from(minSimsa680Sc)
.join(minSimsaUser680Sc) .join(minSimsaUser680Sc)
.on(minSimsa680Sc.msMaincode.eq(minSimsaUser680Sc.msuMaincode)) .on(minSimsa680Sc.msMaincode.eq(minSimsaUser680Sc.msuMaincode))
.join(gnRecallSc)
.on(minSimsa680Sc.msMaincode.eq(gnRecallSc.scCode))
.where(builder) .where(builder)
//.groupBy(minSimsa680Sc.msDatagb, minSimsa680Sc.msYear, minSimsaUser680Sc.msuUserid, minSimsa680Sc.msChasu, minSimsa680Sc.msSdate, minSimsa680Sc.msStartsi, minSimsa680Sc.msEdate, minSimsa680Sc.msCdate, minSimsa680Sc.msClosesi) //.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()) .orderBy(minSimsa680Sc.msSdate.asc(), minSimsa680Sc.msEdate.asc(), minSimsa680Sc.msSeq.asc())

Loading…
Cancel
Save