From bab4adf858317cd6e2763425cb00101ef623d460 Mon Sep 17 00:00:00 2001 From: 13693261870 <252740454@qq.com> Date: 星期四, 10 八月 2023 17:58:45 +0800 Subject: [PATCH] 1 --- src/main/java/com/yssh/entity/xls/DayExcel.java | 11 +++++++++++ src/main/java/com/yssh/entity/xls/WeekExcel.java | 16 ++++++++++++++++ src/main/java/com/yssh/entity/xls/MonthExcel.java | 16 ++++++++++++++++ src/main/java/com/yssh/service/XlsReportService.java | 9 +++++++-- 4 files changed, 50 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/yssh/entity/xls/DayExcel.java b/src/main/java/com/yssh/entity/xls/DayExcel.java index 4231dc5..7b3a580 100644 --- a/src/main/java/com/yssh/entity/xls/DayExcel.java +++ b/src/main/java/com/yssh/entity/xls/DayExcel.java @@ -44,6 +44,17 @@ public DayExcel() { } + /** + * 鏃ユ姤Excel + * + * @param rjz 鏃ュ潎鍊� + * @param lj 绱 + * @param ljtb 绱鍚屾瘮 + * @param ys 鍙楀奖鍝嶅洜绱犲強鍘熷洜 + * @param fs 椋庨�� + * @param fx 椋庡悜 + * @param wd 娓╁害 + */ public DayExcel(String rjz, String lj, String ljtb, String ys, String fs, String fx, String wd) { this.rjz = rjz; this.lj = lj; diff --git a/src/main/java/com/yssh/entity/xls/MonthExcel.java b/src/main/java/com/yssh/entity/xls/MonthExcel.java index 8ed3075..4c85d21 100644 --- a/src/main/java/com/yssh/entity/xls/MonthExcel.java +++ b/src/main/java/com/yssh/entity/xls/MonthExcel.java @@ -69,6 +69,22 @@ public MonthExcel() { } + /** + * 鏈堟姤Excel + * + * @param sy 涓婃湀 + * @param yhb 鏈堢幆姣� + * @param ytq 鏈堝悓鏈� + * @param ytb 鏈堝悓姣� + * @param yhb2 鏈堢幆姣�2 + * @param lj 绱 + * @param ljtb 绱鍚屾瘮 + * @param qyn 杈冨墠涓�骞村潎鍊煎彉鍖栧箙搴� + * @param ys 鍙楀奖鍝嶅洜绱犲強鍘熷洜 + * @param fs 椋庨�� + * @param fx 椋庡悜 + * @param wd 娓╁害 + */ public MonthExcel(String sy, String yhb, String ytq, String ytb, String yhb2, String lj, String ljtb, String qyn, String ys, String fs, String fx, String wd) { this.sy = sy; this.yhb = yhb; diff --git a/src/main/java/com/yssh/entity/xls/WeekExcel.java b/src/main/java/com/yssh/entity/xls/WeekExcel.java index 9135633..e47351f 100644 --- a/src/main/java/com/yssh/entity/xls/WeekExcel.java +++ b/src/main/java/com/yssh/entity/xls/WeekExcel.java @@ -69,6 +69,22 @@ public WeekExcel() { } + /** + * 鍛ㄦ姤Excel + * + * @param sz 涓婂懆 + * @param zhb 鍛ㄧ幆姣� + * @param ztq 鍛ㄥ悓鏈� + * @param ztb 鍛ㄥ悓姣� + * @param zhb2 鍛ㄧ幆姣�2 + * @param lj 绱 + * @param ljtb 绱鍚屾瘮 + * @param syn 杈冧笂涓�骞村害鍙樺寲骞呭害 + * @param ys 鍙楀奖鍝嶅洜绱犲強鍘熷洜 + * @param fs 椋庨�� + * @param fx 椋庡悜 + * @param wd 娓╁害 + */ public WeekExcel(String sz, String zhb, String ztq, String ztb, String zhb2, String lj, String ljtb, String syn, String ys, String fs, String fx, String wd) { this.sz = sz; this.zhb = zhb; diff --git a/src/main/java/com/yssh/service/XlsReportService.java b/src/main/java/com/yssh/service/XlsReportService.java index eb649d1..1d65fab 100644 --- a/src/main/java/com/yssh/service/XlsReportService.java +++ b/src/main/java/com/yssh/service/XlsReportService.java @@ -167,6 +167,7 @@ double lj = mapper.selectAccumulate(yearStart, end, name); // 绱 double lastLj = mapper.selectYearAccumulate(lastYear + "%", name); // 鍘诲勾绱 double ljtb = CalculateUtils.round2((lj - lastLj) / lastLj * 100); // 绱鍚屾瘮 + MonitorPointPosition point = commonService.select3dCheckPointByName(name); String id = point.getId().substring(0, point.getId().lastIndexOf("_") + 1) + "0"; // List<SuYuan700> suList = mapper.selectSuYuanByTime(id, yyyy_mm_dd + " 00:00:00", yyyy_mm_dd + " 23:00:00"); @@ -213,10 +214,12 @@ double lj = mapper.selectAccumulate(yearStart, intSun, name); // 绱 double lastLj = mapper.selectYearAccumulate(lastYear + "%", name); // 鍘诲勾绱 double ljtb = CalculateUtils.round2((lj - lastLj) / lastLj * 100); // 绱鍚屾瘮 + MonitorPointPosition point = commonService.select3dCheckPointByName(name); String id = point.getId().substring(0, point.getId().lastIndexOf("_") + 1) + "0"; List<SuYuan700> suList = mapper.selectSuYuanByStartAndEnd(id, name, yjz, intMon, intSun); String ys = getYs(suList); + list.add(new WeekExcel("" + sz, zhb + "%", "", ztb + "%", "", "" + lj, "" + ljtb, "", ys, "", "", "")); } saveResult("week", sun, list); @@ -236,10 +239,12 @@ List<MonthExcel> list = new ArrayList<>(); for (int i = 1; i < 47; i++) { + String name = "AI-" + (i < 10 ? "0" : "") + i; // - } - String filePath = createExcel("month", end, list); + list.add(new MonthExcel()); + } + saveResult("month", end, list); } catch (Exception ex) { logger.error(ex.getMessage(), ex); } -- Gitblit v1.9.3