diff --git a/src/main/java/com/xit/biz/ctgy/dto/MinSimsaTargetDto.java b/src/main/java/com/xit/biz/ctgy/dto/MinSimsaTargetDto.java index 087abfa..df70c2c 100644 --- a/src/main/java/com/xit/biz/ctgy/dto/MinSimsaTargetDto.java +++ b/src/main/java/com/xit/biz/ctgy/dto/MinSimsaTargetDto.java @@ -22,40 +22,47 @@ public class MinSimsaTargetDto { @Schema(title = "접수번호", example = " ", description = "Input Description...") private String rcSeq; - @Schema(required = true, title = "차량번호", example = " ", description = "Input Description...") - private String msCarnum; + @Schema(title = "차량번호", example = " ", description = "Input Description...") + private String mmQcarno; - @Schema(required = true, title = "년도", example = " ", description = "Input Description...") - private String msYear; + @Schema(title = "차량번호", example = " ", description = "Input Description...") + private String mmNcarno; - @Schema(required = true, title = "차수", example = " ", description = "Input Description...") - private Long msChasu; + @Schema(title = "", example = " ", description = "Input Description...") + private String rcName; - @Schema(required = true, title = "심사시작일시", example = " ", description = "Input Description...") + @Schema(title = "진술유형토드", example = " ", description = "Input Description...") + private String rcContDoc; + + @Schema(title = "진술유형코드명", example = " ", description = "Input Description...") + private String rcContDocStr; + + @Schema(title = "접수방법코드", example = " ", description = "Input Description...") + private String rcIngb; + + @Schema(title = "접수방법코드명", example = " ", description = "Input Description...") + private String rcIngbStr; + + @Schema(title = "접수일자", example = " ", description = "Input Description...") + private java.sql.Date rcDate; + + @Schema(title = "심사시작일", example = " ", description = "Input Description...") private java.sql.Date msSdate; - @Schema(required = true, title = "심사시작시간", example = " ", description = "Input Description...") + @Schema(title = "심사시작시간", example = " ", description = "Input Description...") private String msStartsi; - @Schema(required = true, title = "심사종료일시", example = " ", description = "Input Description...") + @Schema(title = "심사종료일", example = " ", description = "Input Description...") private java.sql.Date msEdate; - @Schema(required = true, title = "심사마감일시", example = " ", description = "Input Description...") + @Schema(title = "심사마감일", example = " ", description = "Input Description...") private java.sql.Date msCdate; - @Schema(required = true, title = "심사마감시간", example = " ", description = "Input Description...") - private String msClosesi; - - @Schema(required = false, title = "단속일자", example = " ", description = "Input Description...") - private java.sql.Date msWdate; - - @Schema(required = false, title = "단속장소", example = " ", description = "Input Description...") - private String msPos; + @Schema(title = "접수번호", example = " ", description = "Input Description...") + private String rcSeq1; - @Schema(required = false, title = "결과코드", example = " ", description = "Input Description...") - private String msResult; + @Schema(title = "접수번호", example = " ", description = "Input Description...") + private String rcSeq2; - @Schema(required = false, title = "단속시간", example = " ", description = "Input Description...") - private String msJbtime; } diff --git a/src/main/java/com/xit/biz/ctgy/entity/Tf680Recall.java b/src/main/java/com/xit/biz/ctgy/entity/Tf680Recall.java index f88111c..c98c179 100644 --- a/src/main/java/com/xit/biz/ctgy/entity/Tf680Recall.java +++ b/src/main/java/com/xit/biz/ctgy/entity/Tf680Recall.java @@ -21,11 +21,11 @@ public class Tf680Recall implements Serializable { private Long rcCode; @Schema(required = false, title = "메인코드", example = " ", description = "Input Description...") -// @Column(name = "RC_MAINCODE", nullable = true) - @OneToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "mm_code") -// private Long rcMaincode; - private Tf680Main tf680Main; + @Column(name = "rc_maincode", nullable = true) + //@OneToOne(fetch = FetchType.LAZY) + //@JoinColumn(name = "mm_code") + private Long rcMaincode; + //private Tf680Main tf680Main; @Schema(required = false, title = "민원구분(1:의견진술, 2:이의신청)", example = " ", description = "Input Description...") @Column(name = "rc_gb", nullable = true) diff --git a/src/main/java/com/xit/biz/ctgy/repository/IParkingRepositoryImpl.java b/src/main/java/com/xit/biz/ctgy/repository/IParkingRepositoryImpl.java index 1322be0..ede7ebc 100644 --- a/src/main/java/com/xit/biz/ctgy/repository/IParkingRepositoryImpl.java +++ b/src/main/java/com/xit/biz/ctgy/repository/IParkingRepositoryImpl.java @@ -7,6 +7,7 @@ import com.querydsl.core.types.dsl.CaseBuilder; import com.querydsl.jpa.impl.JPAQueryFactory; import com.xit.biz.ctgy.dto.MinSimsa680GroupDto; import com.xit.biz.ctgy.dto.MinSimsaReviewGroupDto; +import com.xit.biz.ctgy.dto.MinSimsaTargetDto; import com.xit.biz.ctgy.entity.MinSimsa680; import com.xit.core.util.Checks; import lombok.RequiredArgsConstructor; @@ -19,6 +20,8 @@ import java.util.List; import static com.xit.biz.ctgy.entity.QMinSimsa680.minSimsa680; import static com.xit.biz.ctgy.entity.QMinSimsaUser680.minSimsaUser680; import static com.xit.biz.ctgy.entity.QMinUserinfo.minUserinfo; +import static com.xit.biz.ctgy.entity.QTf680Main.tf680Main; +import static com.xit.biz.ctgy.entity.QTf680Recall.tf680Recall; @RequiredArgsConstructor public class IParkingRepositoryImpl implements IParkingRepositoryCustom { @@ -44,7 +47,8 @@ public class IParkingRepositoryImpl implements IParkingRepositoryCustom { builder.and(minSimsa680.msChasu.like(String.valueOf(pMinSimsa680GroupDto.getMsChasu()))); } QueryResults rslt = - queryFactory.select(Projections.fields( + queryFactory + .select(Projections.fields( MinSimsa680GroupDto.class, minSimsa680.msYear, minSimsa680.msChasu, @@ -99,7 +103,7 @@ public class IParkingRepositoryImpl implements IParkingRepositoryCustom { } //@Override - //public List findSimsaTargets() { + public List findSimsaTargets() { /* SELECT TM.MM_CODE, TR.RC_CODE, @@ -162,9 +166,37 @@ public class IParkingRepositoryImpl implements IParkingRepositoryCustom { */ + BooleanBuilder builder = new BooleanBuilder(); + builder.and(tf680Main.mmDbgb.eq("11")); + //builder.and(tf680Main.mmLstate.ne("75")); + builder.and(tf680Recall.rcGb.eq("1")); + builder.and(tf680Recall.rcState.eq("0")); + builder.and(tf680Recall.rcIrTransfer.eq("1")); + //builder.and(tf680Recall.rcSeq.gt("1")); + //builder.and(tf680Recall.rcSeq.lt("1")); - // return null; - //} + + List rslt = + queryFactory + .select(Projections.fields(MinSimsaTargetDto.class, + tf680Main.mmCode, + tf680Recall.rcCode, + tf680Recall.rcSeq, + tf680Main.mmOcarno, + tf680Main.mmNcarno, + tf680Recall.rcName, + tf680Recall.rcContDoc, + tf680Recall.rcIngb + )) + .from(tf680Main) + .join(tf680Recall) + .on(tf680Main.mmCode.eq(tf680Recall.rcMaincode)) + .where(builder) + .orderBy(tf680Recall.rcSeq.asc()) + .fetch(); + + return rslt; + } @Override @@ -181,7 +213,8 @@ public class IParkingRepositoryImpl implements IParkingRepositoryCustom { // .when(minSimsaUser680.msuResult.eq("0")).then(0L) // .otherwise(1L).sum().as("clcnt"); QueryResults rslt = - queryFactory.select(Projections.fields( + queryFactory + .select(Projections.fields( MinSimsaReviewGroupDto.class, minSimsa680.msEdate, minSimsaUser680.msuTeam,