Compare commits

..

5 Commits

3 changed files with 6 additions and 2 deletions

View File

@@ -35,7 +35,7 @@ public final class KfpaDashConstant {
BRIDGE_PLATFORM_PKEY, List.of("Q2", "Q4", "Q5", "Q6"), BRIDGE_PLATFORM_PKEY, List.of("Q2", "Q4", "Q5", "Q6"),
CONSULTING_PKEY, List.of("Q10", "Q8", "Q12", "Q15"), CONSULTING_PKEY, List.of("Q10", "Q8", "Q12", "Q15"),
INSURANCE_OPERATIONS_PKEY, List.of("Q3", "Q4", "Q5", "Q6"), INSURANCE_OPERATIONS_PKEY, List.of("Q3", "Q4", "Q5", "Q6"),
FIRE_INVESTIGATION_PKEY, List.of("Q1", "Q3", "Q5", "Q14") FIRE_INVESTIGATION_PKEY, List.of("Q1", "Q3", "Q5", "Q4")
); );
public static final Map<String, Map<String, Double>> WEIGHTS = Map.of( public static final Map<String, Map<String, Double>> WEIGHTS = Map.of(
SAFETY_INSPECTION_PKEY, Map.of("q1", 0.4,"q2", 0.4,"q4", 0.1,"q5", 0.1), SAFETY_INSPECTION_PKEY, Map.of("q1", 0.4,"q2", 0.4,"q4", 0.1,"q5", 0.1),

View File

@@ -20,7 +20,7 @@ public class AdminService {
private static final List<String> REQUIRED_COMMENT_KEYS = List.of( private static final List<String> REQUIRED_COMMENT_KEYS = List.of(
"performance25", "performance25",
"plan26", //"plan26",
"performance26" "performance26"
); );

View File

@@ -70,6 +70,10 @@
<if test="pkey == '2601009_A'"> <if test="pkey == '2601009_A'">
AND JSON_VALUE(DATJSON, '$.Q16.Q16') != '99' AND JSON_VALUE(DATJSON, '$.Q16.Q16') != '99'
</if> </if>
<if test="pkey == '2601009_A'">
AND JSON_VALUE(DATJSON, '$.Q20.Q20_1') != ''
AND JSON_VALUE(DATJSON, '$.Q20.Q20_1') IS NOT NULL
</if>
GROUP BY DA.IDKEY GROUP BY DA.IDKEY
</sql> </sql>