diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/crackdownStatus/CrackdownStatus.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/crackdownStatus/CrackdownStatus.java index d464526f..f314a4df 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/crackdownStatus/CrackdownStatus.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/crackdownStatus/CrackdownStatus.java @@ -83,6 +83,8 @@ public class CrackdownStatus extends CrackdownStatusBaseEntity { @Transient private String year; @Transient + private String month; + @Transient @DateTimeFormat(pattern = "yyyy-MM-dd") private LocalDate napoDate; @Transient diff --git a/src/main/resources/mybatisMapper/CrackdownStatustMapper.xml b/src/main/resources/mybatisMapper/CrackdownStatustMapper.xml index 79e2fd35..7e32d1c1 100644 --- a/src/main/resources/mybatisMapper/CrackdownStatustMapper.xml +++ b/src/main/resources/mybatisMapper/CrackdownStatustMapper.xml @@ -7,7 +7,10 @@ - And EXTRACT(YEAR FROM pr.wrt_dt) = EXTRACT(YEAR FROM CAST(#{year} AS DATE)::TIMESTAMP) + And EXTRACT(YEAR FROM pr.wrt_dt) = #{year}::NUMERIC + + + And EXTRACT(MONTH FROM pr.wrt_dt) = #{month}::NUMERIC AND caseNum = #{caseNum} diff --git a/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatus.html b/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatus.html index e93dbce3..91660ab6 100644 --- a/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatus.html +++ b/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatus.html @@ -26,7 +26,15 @@ + +
+