|
|
@ -1539,7 +1539,7 @@ public List<AnlsHstryDetailModel> listCntrlHstry(String id){ |
|
|
|
.from(bas) |
|
|
|
.from(bas) |
|
|
|
.leftJoin(area) |
|
|
|
.leftJoin(area) |
|
|
|
.on(bas.cntrlId.eq(area.cntrlId)) |
|
|
|
.on(bas.cntrlId.eq(area.cntrlId)) |
|
|
|
.on(area.actnType.eq("01")) |
|
|
|
.on(area.actnType.eq("99")) |
|
|
|
.where(area.area1.isNotNull()) |
|
|
|
.where(area.area1.isNotNull()) |
|
|
|
.where(formattedDate.eq(yyyymm)) |
|
|
|
.where(formattedDate.eq(yyyymm)) |
|
|
|
.groupBy(area.area1) |
|
|
|
.groupBy(area.area1) |
|
|
|