Browse Source

解决线上无法导出的问题

master
HY 2 months ago
parent
commit
bd75d2cfaf
2 changed files with 6 additions and 4 deletions
  1. +2
    -1
      admin-hanhai-vue/src/api/manage.js
  2. +4
    -3
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockinlog/controller/ClockinLogController.java

+ 2
- 1
admin-hanhai-vue/src/api/manage.js View File

@ -125,7 +125,8 @@ export function downFile(url,parameter){
url: url,
params: parameter,
method:'get' ,
responseType: 'blob'
responseType: 'blob',
timeout: 6000000,
})
}


+ 4
- 3
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockinlog/controller/ClockinLogController.java View File

@ -205,9 +205,10 @@ public class ClockinLogController extends JeecgController<ClockinLog, IClockinLo
// int day = Integer.parseInt(DateUtils2.getNowMonthMaxDay());
String nowYearMonth = clockStartTimes[0];
if(StringUtils.isBlank(clockStartTimes[0])){
nowYearMonth = DateUtils2.getNowYearMonth();
String nowYearMonth = DateUtils2.getNowYearMonth();
if(clockStartTimes!=null && clockStartTimes.length!=0 && StringUtils.isNotBlank(clockStartTimes[0])){
nowYearMonth = clockStartTimes[0];
}
YearMonth yearMonth = YearMonth.parse(nowYearMonth);
int day = yearMonth.lengthOfMonth();


Loading…
Cancel
Save