diff --git a/src/main/java/cn/lihongjie/coal/coalWashingMonthReport/dto/CoalWashingMonthReportDto.java b/src/main/java/cn/lihongjie/coal/coalWashingMonthReport/dto/CoalWashingMonthReportDto.java index 064785b2..e0c6d445 100644 --- a/src/main/java/cn/lihongjie/coal/coalWashingMonthReport/dto/CoalWashingMonthReportDto.java +++ b/src/main/java/cn/lihongjie/coal/coalWashingMonthReport/dto/CoalWashingMonthReportDto.java @@ -17,5 +17,6 @@ public class CoalWashingMonthReportDto extends OrgCommonDto { private String remark2; private String remark3; private String remark4; + private Integer days; } diff --git a/src/main/java/cn/lihongjie/coal/coalWashingMonthReport/entity/CoalWashingMonthReportEntity.java b/src/main/java/cn/lihongjie/coal/coalWashingMonthReport/entity/CoalWashingMonthReportEntity.java index 29bdf7b1..c548db21 100644 --- a/src/main/java/cn/lihongjie/coal/coalWashingMonthReport/entity/CoalWashingMonthReportEntity.java +++ b/src/main/java/cn/lihongjie/coal/coalWashingMonthReport/entity/CoalWashingMonthReportEntity.java @@ -37,7 +37,8 @@ select d.organization_id, date_trunc('month', d.date) as update_time, '' as create_user_id, '' as update_user_id, - null as file_ids + null as file_ids, + count(distinct d.date) as days from t_coal_washing_daily_analysis d group by d.organization_id, d.name, date_trunc('month', d.date) @@ -53,4 +54,6 @@ public class CoalWashingMonthReportEntity extends OrgCommonEntity { private String remark3; private String remark4; + private Integer days; + }