From 36e192f20803e0504b20ec068656a1ac579eeb5f Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 11 八月 2023 09:06:54 +0800
Subject: [PATCH] 1
---
src/main/resources/templates/month.xlsx | 0
src/main/java/com/yssh/entity/xls/WeekExcel.java | 17 +----------------
src/main/resources/templates/week.xlsx | 0
src/main/java/com/yssh/entity/xls/MonthExcel.java | 17 +----------------
src/main/java/com/yssh/service/XlsReportService.java | 4 ++--
5 files changed, 4 insertions(+), 34 deletions(-)
diff --git a/src/main/java/com/yssh/entity/xls/MonthExcel.java b/src/main/java/com/yssh/entity/xls/MonthExcel.java
index 4c85d21..2ab3667 100644
--- a/src/main/java/com/yssh/entity/xls/MonthExcel.java
+++ b/src/main/java/com/yssh/entity/xls/MonthExcel.java
@@ -27,11 +27,6 @@
private String ytb;
/**
- * 鏈堢幆姣�2
- */
- private String yhb2;
-
- /**
* 绱
*/
private String lj;
@@ -76,7 +71,6 @@
* @param yhb 鏈堢幆姣�
* @param ytq 鏈堝悓鏈�
* @param ytb 鏈堝悓姣�
- * @param yhb2 鏈堢幆姣�2
* @param lj 绱
* @param ljtb 绱鍚屾瘮
* @param qyn 杈冨墠涓�骞村潎鍊煎彉鍖栧箙搴�
@@ -85,12 +79,11 @@
* @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) {
+ public MonthExcel(String sy, String yhb, String ytq, String ytb, String lj, String ljtb, String qyn, String ys, String fs, String fx, String wd) {
this.sy = sy;
this.yhb = yhb;
this.ytq = ytq;
this.ytb = ytb;
- this.yhb2 = yhb2;
this.lj = lj;
this.ljtb = ljtb;
this.qyn = qyn;
@@ -130,14 +123,6 @@
public void setYtb(String ytb) {
this.ytb = ytb;
- }
-
- public String getYhb2() {
- return yhb2;
- }
-
- public void setYhb2(String yhb2) {
- this.yhb2 = yhb2;
}
public String getLj() {
diff --git a/src/main/java/com/yssh/entity/xls/WeekExcel.java b/src/main/java/com/yssh/entity/xls/WeekExcel.java
index e47351f..bb0646d 100644
--- a/src/main/java/com/yssh/entity/xls/WeekExcel.java
+++ b/src/main/java/com/yssh/entity/xls/WeekExcel.java
@@ -27,11 +27,6 @@
private String ztb;
/**
- * 鍛ㄧ幆姣�2
- */
- private String zhb2;
-
- /**
* 绱
*/
private String lj;
@@ -76,7 +71,6 @@
* @param zhb 鍛ㄧ幆姣�
* @param ztq 鍛ㄥ悓鏈�
* @param ztb 鍛ㄥ悓姣�
- * @param zhb2 鍛ㄧ幆姣�2
* @param lj 绱
* @param ljtb 绱鍚屾瘮
* @param syn 杈冧笂涓�骞村害鍙樺寲骞呭害
@@ -85,12 +79,11 @@
* @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) {
+ public WeekExcel(String sz, String zhb, String ztq, String ztb, String lj, String ljtb, String syn, String ys, String fs, String fx, String wd) {
this.sz = sz;
this.zhb = zhb;
this.ztq = ztq;
this.ztb = ztb;
- this.zhb2 = zhb2;
this.lj = lj;
this.ljtb = ljtb;
this.syn = syn;
@@ -130,14 +123,6 @@
public void setZtb(String ztb) {
this.ztb = ztb;
- }
-
- public String getZhb2() {
- return zhb2;
- }
-
- public void setZhb2(String zhb2) {
- this.zhb2 = zhb2;
}
public String getLj() {
diff --git a/src/main/java/com/yssh/service/XlsReportService.java b/src/main/java/com/yssh/service/XlsReportService.java
index 1d65fab..b3e0393 100644
--- a/src/main/java/com/yssh/service/XlsReportService.java
+++ b/src/main/java/com/yssh/service/XlsReportService.java
@@ -220,7 +220,7 @@
List<SuYuan700> suList = mapper.selectSuYuanByStartAndEnd(id, name, yjz, intMon, intSun);
String ys = getYs(suList);
- list.add(new WeekExcel("" + sz, zhb + "%", "", ztb + "%", "", "" + lj, "" + ljtb, "", ys, "", "", ""));
+ list.add(new WeekExcel("" + sz, zhb + "%", "", ztb + "%", "" + lj, "" + ljtb, "", ys, "", "", ""));
}
saveResult("week", sun, list);
} catch (Exception ex) {
@@ -229,7 +229,7 @@
}
/**
- * 鍒涘缓鏈堟姤锛歯ew MonthExcel("AI-" + (i < 10 ? "0" : "") + i, "yhb", "ytq", "ytb", "yhb2", "lj", "ljtb", "qyn", "ys", "fs", "fx", "掳c");
+ * 鍒涘缓鏈堟姤锛歯ew MonthExcel("AI-" + (i < 10 ? "0" : "") + i, "yhb", "ytq", "ytb", "lj", "ljtb", "qyn", "ys", "fs", "fx", "掳c");
*/
public void createMonthReport(Date date) {
try {
diff --git a/src/main/resources/templates/month.xlsx b/src/main/resources/templates/month.xlsx
index 450a828..8bbacd8 100644
--- a/src/main/resources/templates/month.xlsx
+++ b/src/main/resources/templates/month.xlsx
Binary files differ
diff --git a/src/main/resources/templates/week.xlsx b/src/main/resources/templates/week.xlsx
index 2c4aaaf..ec94854 100644
--- a/src/main/resources/templates/week.xlsx
+++ b/src/main/resources/templates/week.xlsx
Binary files differ
--
Gitblit v1.9.3