fix: 优化锚点缓存数据显示
This commit is contained in:
parent
b119e07eb6
commit
90a87128d4
@ -4633,7 +4633,7 @@ public class FbStationServiceImpl implements FbStationService {
|
||||
.append("NVL(along.ORDER_INDEX, 999999) AS rvcdStepSort, ")
|
||||
.append("NVL(rstSort.SORT, 999999) AS rstcdStepSort, ")
|
||||
.append("NVL(hb.ORDER_INDEX, 999999) AS baseStepSort, ")
|
||||
.append("'" + sttp + "' AS anchoPointState, ")
|
||||
.append("'" + sttp.toLowerCase() + "' AS anchoPointState, ")
|
||||
.append("CASE WHEN b.lcjStatus IS NOT NULL THEN 1 ELSE 2 END AS lcjStatus ")
|
||||
.append("FROM SD_FBRD_B_H a ")
|
||||
.append("LEFT JOIN SD_ENGINFO_B_H eng ON eng.STCD = a.RSTCD AND NVL(eng.IS_DELETED, 0) = 0 ")
|
||||
|
||||
@ -255,11 +255,11 @@ public class FpBuildServiceImpl implements FpBuildService {
|
||||
"eng.BASE_ID AS baseId, " +
|
||||
"fp.STTP AS sttp, " +
|
||||
"CASE " +
|
||||
"WHEN fp.STTP = 'FP_1' THEN 'GY_1' " +
|
||||
"WHEN fp.STTP = 'FP_2' THEN 'GY_2' " +
|
||||
"WHEN fp.STTP = 'FP_3' THEN 'GY_3' " +
|
||||
"WHEN fp.STTP = 'FP_4' THEN 'GY_4' " +
|
||||
"ELSE 'GY_5' END AS anchoPointState, " +
|
||||
"WHEN fp.STTP = 'FP_1' THEN 'gy_1' " +
|
||||
"WHEN fp.STTP = 'FP_2' THEN 'gy_2' " +
|
||||
"WHEN fp.STTP = 'FP_3' THEN 'gy_3' " +
|
||||
"WHEN fp.STTP = 'FP_4' THEN 'gy_4' " +
|
||||
"ELSE 'gy_5' END AS anchoPointState, " +
|
||||
"fp.MWAY AS mway, " +
|
||||
"fp.DTIN AS dtin, " +
|
||||
"state.STD_SSTATE AS stdSstate, " +
|
||||
@ -1304,15 +1304,15 @@ public class FpBuildServiceImpl implements FpBuildService {
|
||||
for (FpAnchoPointVo vo : resultList) {
|
||||
String sttp = vo.getSttp();
|
||||
if ("FP_1".equals(sttp)) {
|
||||
vo.setAnchoPointState("GY_1_BUILT");
|
||||
vo.setAnchoPointState("gy_1_built");
|
||||
} else if ("FP_2".equals(sttp)) {
|
||||
vo.setAnchoPointState("GY_2_BUILT");
|
||||
vo.setAnchoPointState("gy_2_built");
|
||||
} else if ("FP_3".equals(sttp)) {
|
||||
vo.setAnchoPointState("GY_3_BUILT");
|
||||
vo.setAnchoPointState("gy_3_built");
|
||||
} else if ("FP_4".equals(sttp)) {
|
||||
vo.setAnchoPointState("GY_4_BUILT");
|
||||
vo.setAnchoPointState("gy_4_built");
|
||||
} else {
|
||||
vo.setAnchoPointState("GY_5_BUILT");
|
||||
vo.setAnchoPointState("gy_5_built");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -1980,15 +1980,24 @@ public class VpConstructionServiceImpl implements VpConstructionService {
|
||||
List<FhvapBuiltPointVo> resultList = microservicDynamicSQLMapper.pageAllListWithResultType(page, sql.toString(), paramMap, FhvapBuiltPointVo.class);
|
||||
|
||||
for (FhvapBuiltPointVo vo : resultList) {
|
||||
String sttp = vo.getSttp();
|
||||
if ("VP".equals(sttp)) {
|
||||
vo.setAnchoPointState("GY_1_BUILT");
|
||||
} else if ("VA".equals(sttp)) {
|
||||
vo.setAnchoPointState("GY_2_BUILT");
|
||||
} else if ("FH".equals(sttp)) {
|
||||
vo.setAnchoPointState("GY_3_BUILT");
|
||||
} else {
|
||||
vo.setAnchoPointState("GY_4_BUILT");
|
||||
// String sttp = vo.getSttp();
|
||||
// if ("VP".equals(sttp)) {
|
||||
// vo.setAnchoPointState("gy_1_built");
|
||||
// } else if ("VA".equals(sttp)) {
|
||||
// vo.setAnchoPointState("gy_2_built");
|
||||
// } else if ("FH".equals(sttp)) {
|
||||
// vo.setAnchoPointState("gy_3_built");
|
||||
// } else {
|
||||
// vo.setAnchoPointState("gy_4_built");
|
||||
// }
|
||||
// 设置在建栖息地/珍稀植物园/动物救助站
|
||||
if ("1".equals(vo.getBldsttCcode())) {
|
||||
if ("FP".equals(vo.getSttp())) {
|
||||
vo.setAnchoPointState("VP_built");
|
||||
}
|
||||
if ("VA".equals(vo.getSttp())) {
|
||||
vo.setAnchoPointState("VA_built");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user