|
|
@ -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())
|
|
|
|