실태조사 로직 변경
This commit is contained in:
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -98,9 +98,9 @@ public class GukYuinStbltJobRepositoryImpl implements GukYuinStbltJobRepositoryC
|
|||||||
.update(mapSheetAnalDataInferenceGeomEntity)
|
.update(mapSheetAnalDataInferenceGeomEntity)
|
||||||
.set(
|
.set(
|
||||||
mapSheetAnalDataInferenceGeomEntity.fitState,
|
mapSheetAnalDataInferenceGeomEntity.fitState,
|
||||||
stbResult.getStbltYn().equals("Y")
|
stbResult.getStbltYn().equals("N")
|
||||||
? ImageryFitStatus.UNFIT.getId()
|
? ImageryFitStatus.UNFIT.getId()
|
||||||
: ImageryFitStatus.FIT.getId()) // 적합여부가 Y 이면 부적합인 것, N 이면 적합한 것이라고 함
|
: ImageryFitStatus.FIT.getId()) // 적합여부가 N 이면 부적합인 것, Y 이면 적합한 것이라고 함
|
||||||
.set(mapSheetAnalDataInferenceGeomEntity.fitStateDttm, ZonedDateTime.now())
|
.set(mapSheetAnalDataInferenceGeomEntity.fitStateDttm, ZonedDateTime.now())
|
||||||
.set(mapSheetAnalDataInferenceGeomEntity.fitStateCmmnt, stbResult.getIncyCmnt())
|
.set(mapSheetAnalDataInferenceGeomEntity.fitStateCmmnt, stbResult.getIncyCmnt())
|
||||||
.where(mapSheetAnalDataInferenceGeomEntity.resultUid.eq(resultUid))
|
.where(mapSheetAnalDataInferenceGeomEntity.resultUid.eq(resultUid))
|
||||||
|
|||||||
@@ -183,18 +183,21 @@ public class GukYuinApiStbltJobService {
|
|||||||
resultUid,
|
resultUid,
|
||||||
pnuList == null ? 0 : pnuList.size());
|
pnuList == null ? 0 : pnuList.size());
|
||||||
|
|
||||||
boolean hasY = pnuList.stream().anyMatch(v -> "Y".equals(v.getStbltYn()));
|
boolean hasN = pnuList.stream().anyMatch(v -> "N".equals(v.getStbltYn()));
|
||||||
String fitYn = hasY ? "Y" : "N";
|
String fitYn = hasN ? "N" : "Y";
|
||||||
|
log.info("=== 한 객체에 여러 개 pnu 있을 때, 하나라도 부적합 N이 있으면 N");
|
||||||
|
log.info("=== N이 없으면 적합 Y");
|
||||||
|
|
||||||
log.info("=== 적합여부 fitYn={}", fitYn);
|
log.info("=== 적합여부 fitYn={}", fitYn);
|
||||||
|
|
||||||
RlbDtctMastDto selected =
|
RlbDtctMastDto selected =
|
||||||
hasY
|
hasN
|
||||||
? pnuList.stream()
|
? pnuList.stream()
|
||||||
.filter(v -> "Y".equals(v.getStbltYn()))
|
.filter(v -> "N".equals(v.getStbltYn()))
|
||||||
.findFirst()
|
.findFirst()
|
||||||
.orElse(null)
|
.orElse(null)
|
||||||
: pnuList.stream()
|
: pnuList.stream()
|
||||||
.filter(v -> "N".equals(v.getStbltYn()))
|
.filter(v -> "Y".equals(v.getStbltYn()))
|
||||||
.findFirst()
|
.findFirst()
|
||||||
.orElse(null);
|
.orElse(null);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user