From d50faa74719f4d3f18ec9f99d99483f2c119c3a0 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 06 Sep 2023 14:47:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa
---
screen-api/src/main/java/com/moral/api/controller/SysTestController.java | 51 ++++++++++++++++++++++++++++++---------------------
1 files changed, 30 insertions(+), 21 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/SysTestController.java b/screen-api/src/main/java/com/moral/api/controller/SysTestController.java
index b010777..d026f33 100644
--- a/screen-api/src/main/java/com/moral/api/controller/SysTestController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/SysTestController.java
@@ -56,22 +56,21 @@
@GetMapping("resultWord")
public void adresultWordd(HttpServletResponse response,String time,String endTime) {
- String ks = "2023-06-22";
- endTime = "2023-08-06";
- Date ksDate = DateUtils.convertDate(ks);
- List<SysTest> listAll = sysTestService.listAll(ks,endTime,null);
- if(CollectionUtils.isEmpty(listAll)){
- return;
- }
- for(SysTest s : listAll){
- Date endTimes =s.getTime();
- String endTimeStr = DateUtils.dateToDateString(endTimes,DateUtils.yyyyMMdd_EN);
+ String ks = "2023-08-06";
+ for(int i =1;i<2;i++){
+ Date ksDate = DateUtils.convertDate(ks);
+ List<SysTest> listAll = sysTestService.listAll(ks,null,null);
+ if(CollectionUtils.isEmpty(listAll)){
+ return;
+ }
+ String endTimeStr = DateUtils.dateToDateString(ksDate,DateUtils.yyyyMMdd_EN);
String fileName = "������������������.docx";
Map<String,Object> map = resultMap(listAll);
downloadWord(fileName, map, response,"������������������"+endTimeStr+".docx");
- //time = DateUtils.dateToDateString(DateUtils.addDays(endTime,1),DateUtils.yyyy_MM_dd_EN);
+ ks = DateUtils.dateToDateString(DateUtils.addDays(ksDate,1),DateUtils.yyyy_MM_dd_EN);
}
}
+
@GetMapping("excelM")
public void excelM(HttpServletResponse response,String time,String endTime) {
@@ -117,9 +116,10 @@
@GetMapping("resultWordWeek")
public void resultWordWeek(HttpServletResponse response) {
- String ks = "2020-06-22";
+ String ks = "2023-06-19";
Date ksDate = DateUtils.convertDate(ks);
- for(int i = 0;i<157;i++){
+ int num = 157;
+ for(int i = 0;i<8;i++){
Date jsDate = DateUtils.addDays(ksDate,6);
String time = DateUtils.dateToDateString(ksDate,DateUtils.yyyy_MM_dd_EN);
String endTime = DateUtils.dateToDateString(jsDate,DateUtils.yyyy_MM_dd_EN);
@@ -130,9 +130,10 @@
String fileName = "������������������.docx";
String time1 = DateUtils.dateToDateString(ksDate,"yyyy.MM.dd");
String endTime1= DateUtils.dateToDateString(jsDate,"yyyy.MM.dd");
- Map<String,Object> map = resultWeekMap(listAll,i+1,time1+"-"+endTime1);
+ Map<String,Object> map = resultWeekMap(listAll,num,time1+"-"+endTime1);
downloadWord(fileName, map, response,"������������������"+time+".docx");
ksDate = DateUtils.addDays(ksDate,7);
+ num++;
}
}
@@ -164,7 +165,7 @@
String path = getPath(fileName);//��������� resources������
try {
//������������������
- OutputStream out = new FileOutputStream("E:\\home\\mon1\\" + newFileName);
+ OutputStream out = new FileOutputStream("E:\\home\\week1\\" + newFileName);
File rootFile = new File(ResourceUtils.getURL("classpath:").getPath());
File file= new File(rootFile, path);
XWPFDocument word = WordExportUtil.exportWord07(file.getPath(), params);
@@ -274,13 +275,13 @@
resultMap.put(name+"TV", StringUtils.isNotEmpty(s.getVoc())?s.getVoc():"--");
resultMap.put(name+"S", StringUtils.isNotEmpty(s.getSu())?s.getSu():"--");
}
- // String bodyName = stringButterStrWeek(listAll);
- HashMap<String, Integer> datas = new HashMap<>(3);
+ String bodyName = stringButterStrWeek(listAll);
+ /* HashMap<String, Integer> datas = new HashMap<>(3);
datas.put("������",10);
datas.put("������",20);
datas.put("������",40);
- ImageEntity imageEntity = pieChart("������",datas, 500, 300);
- resultMap.put("������������",imageEntity);
+ ImageEntity imageEntity = pieChart("������",datas, 500, 300);*/
+ resultMap.put("������������",bodyName);
return resultMap;
}
private Map<String,Object> resultWeekMap(List<SysTest> listAll,String weekTime,List<SysTest> listDay,int days){
@@ -796,15 +797,23 @@
}
public static void main(String[] args) {
- String ks = "2020-06-01";
+ /*String ks = "2020-06-01";
Date ksDate = DateUtils.convertDate(ks);
for(int i = 0;i<37;i++){
Date jsDate = DateUtils.getLastDayOfCurrMonth(ksDate);
System.out.println("���������"+DateUtils.dateToDateString(ksDate,DateUtils.yyyy_MM_dd_EN));
System.out.println("���������"+DateUtils.dateToDateString(jsDate,DateUtils.yyyy_MM_dd_EN));
ksDate = DateUtils.addMonths(ksDate,1);
- }
+ }*/
+ String ks = "2023-06-22";
+ for(int i =1;i<46;i++){
+ Date ksDate = DateUtils.convertDate(ks);
+ System.out.println("���������"+DateUtils.dateToDateString(ksDate,DateUtils.yyyy_MM_dd_EN));
+
+ ks = DateUtils.dateToDateString(DateUtils.addDays(ksDate,1),DateUtils.yyyy_MM_dd_EN);
+ System.out.println("���������"+ks);
+ }
/*String ks = "2020-06-22";
Date ksDate = DateUtils.convertDate(ks);
--
Gitblit v1.8.0