Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

pqbug解决

Browse Source
This commit is contained in:
wr
2023-05-22 15:59:51 +08:00
parent ded7f0f447
commit 682b40c849
4 changed files with 32 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/AuditServiceImpl.java
View File

@@ -129,8 +129,8 @@ public class AuditServiceImpl extends ServiceImpl<UserLogMapper, UserLog> implem
aa.le("sys_user_log.update_time", endTime);
String nowTime = date + "至" + endTime;
//必须放到循环外，否则会刷新流
ExcelWriter excelWriter = EasyExcel.write(generalInfo.getBusinessTempPath() + "//" + nowTime + ExcelTypeEnum.CSV.getValue(), UserLogExcel.class)
.excelType(ExcelTypeEnum.CSV)
ExcelWriter excelWriter = EasyExcel.write(generalInfo.getBusinessTempPath() + "//" + nowTime + ExcelTypeEnum.XLSX.getValue(), UserLogExcel.class)
// .excelType(ExcelTypeEnum.CSV)
.build();
try {
@@ -201,7 +201,7 @@ public class AuditServiceImpl extends ServiceImpl<UserLogMapper, UserLog> implem
try {
in = new FileInputStream(newFile);
String name = newFile.getName();
String[] split = name.split(ExcelTypeEnum.CSV.getValue());
String[] split = name.split(ExcelTypeEnum.XLSX.getValue());
String[] splitTime = split[0].split("至");
if (StrUtil.isBlank(splitTime[0]) || StrUtil.isBlank(splitTime[1])) {
@@ -212,7 +212,7 @@ public class AuditServiceImpl extends ServiceImpl<UserLogMapper, UserLog> implem
.le(UserLog::getCreateTime, splitTime[1].replace("_", ":"));
this.remove(le);
EasyExcel.read(newFile, UserLogExcel.class, new DemoDataListener(this.getBaseMapper()))
.excelType(ExcelTypeEnum.CSV).doReadAll();
.excelType(ExcelTypeEnum.XLSX).doReadAll();
} catch (Exception e) {
e.printStackTrace();