diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/AppServiceImpl.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/AppServiceImpl.java index f010cf9..72a31a6 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/AppServiceImpl.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/AppServiceImpl.java @@ -144,9 +144,9 @@ public class AppServiceImpl implements IAppService { BigDecimal value2 = new BigDecimal("0"); BigDecimal multipleValue = new BigDecimal("100"); for (int i = 0; i < v.size(); i++) { - if (Objects.nonNull(v.get(i).get("planId")) && Objects.nonNull(v.get(i).get("gxProgress")) && Objects.nonNull(v.get(i).get("gxWeight"))) { + if (Objects.nonNull(v.get(i).get("planId")) && Objects.nonNull(v.get(i).get("planProgress")) && Objects.nonNull(v.get(i).get("gxWeight"))) { BigDecimal bigDecimal = new BigDecimal(String.valueOf(v.get(i).get("gxWeight"))); - BigDecimal bigDecimal2 = new BigDecimal(String.valueOf(v.get(i).get("gxProgress"))); + BigDecimal bigDecimal2 = new BigDecimal(String.valueOf(v.get(i).get("planProgress"))); value = value.add(bigDecimal.multiply(bigDecimal2).divide(multipleValue, 3, BigDecimal.ROUND_HALF_UP)); } } diff --git a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/AppMapper.xml b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/AppMapper.xml index adf6297..8c9efc5 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/AppMapper.xml +++ b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/AppMapper.xml @@ -68,15 +68,9 @@ tp.plan_end_time AS planEndTime, tgp.plan_id AS planId, tgp.gx_weight AS gxWeight, - a.gxProgress + tgp.plan_progress AS planProgress FROM tb_project tp LEFT JOIN tb_gx_plan tgp ON tp.bid_code = tgp.bid_code AND tgp.del_flag = 0 - LEFT JOIN ( - SELECT tpp.plan_id AS planId, - tpp.gx_progress AS gxProgress - FROM tb_project_progress tpp - INNER JOIN (SELECT MAX( create_time ) AS create_time FROM tb_project_progress GROUP BY plan_id) tpp2 ON tpp.create_time = tpp2.create_time - )a ON tgp.plan_id = a.planId WHERE tp.del_flag = 0 AND tp.bid_code = #{bidCode} diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/ScIndexServiceImpl.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/ScIndexServiceImpl.java index 3075496..4b4ca6c 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/ScIndexServiceImpl.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/ScIndexServiceImpl.java @@ -291,9 +291,9 @@ public class ScIndexServiceImpl implements IScIndexService { BigDecimal value = new BigDecimal("0"); BigDecimal multipleValue = new BigDecimal("100"); for (int i = 0; i < v.size(); i++) { - if (Objects.nonNull(v.get(i).get("planId")) && Objects.nonNull(v.get(i).get("gxProgress")) && Objects.nonNull(v.get(i).get("gxWeight"))) { + if (Objects.nonNull(v.get(i).get("planId")) && Objects.nonNull(v.get(i).get("planProgress")) && Objects.nonNull(v.get(i).get("gxWeight"))) { BigDecimal bigDecimal = new BigDecimal(String.valueOf(v.get(i).get("gxWeight"))); - BigDecimal bigDecimal2 = new BigDecimal(String.valueOf(v.get(i).get("gxProgress"))); + BigDecimal bigDecimal2 = new BigDecimal(String.valueOf(v.get(i).get("planProgress"))); value = value.add(bigDecimal.multiply(bigDecimal2).divide(multipleValue, 3, BigDecimal.ROUND_HALF_UP)); } } diff --git a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/ScIndexMapper.xml b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/ScIndexMapper.xml index 487a4ed..11547f9 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/ScIndexMapper.xml +++ b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/ScIndexMapper.xml @@ -120,15 +120,9 @@ tp.pro_name AS proName, tgp.plan_id AS planId, tgp.gx_weight AS gxWeight, - a.gxProgress + IFNULL(tgp.plan_progress,'0') AS planProgress FROM tb_project tp LEFT JOIN tb_gx_plan tgp ON tp.bid_code = tgp.bid_code AND tgp.del_flag = 0 - LEFT JOIN ( - SELECT tpp.plan_id AS planId, - tpp.gx_progress AS gxProgress - FROM tb_project_progress tpp - INNER JOIN (SELECT MAX( create_time ) AS create_time FROM tb_project_progress GROUP BY plan_id) tpp2 ON tpp.create_time = tpp2.create_time - )a ON tgp.plan_id = a.planId WHERE tp.del_flag = 0