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 e0c6d445..e17f5c6e 100644 --- a/src/main/java/cn/lihongjie/coal/coalWashingMonthReport/dto/CoalWashingMonthReportDto.java +++ b/src/main/java/cn/lihongjie/coal/coalWashingMonthReport/dto/CoalWashingMonthReportDto.java @@ -17,6 +17,6 @@ public class CoalWashingMonthReportDto extends OrgCommonDto { private String remark2; private String remark3; private String remark4; - private Integer days; + private Double 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 ca231ddb..22069368 100644 --- a/src/main/java/cn/lihongjie/coal/coalWashingMonthReport/entity/CoalWashingMonthReportEntity.java +++ b/src/main/java/cn/lihongjie/coal/coalWashingMonthReport/entity/CoalWashingMonthReportEntity.java @@ -40,7 +40,7 @@ select gen_random_uuid()::text as id, '' as create_user_id, '' as update_user_id, null as file_ids, - sum(d.xx) as days + round(sum(d.xx), 2) as days from ((select 1.0 / count(1) over (partition by date_trunc('day', date)) as xx , * from t_coal_washing_daily_analysis)) d group by d.organization_id, d.name, date_trunc('month', d.date) @@ -55,6 +55,6 @@ public class CoalWashingMonthReportEntity extends OrgCommonEntity { private String remark3; private String remark4; - private Integer days; + private Double days; }