liupeng 4 years ago
parent
commit
049a249b9a

+ 3 - 1
code/sapparent/sapcms/src/main/java/org/fouram/controller/ApiController.java

@@ -16,6 +16,7 @@ import org.fouram.core.plugin.weixin.cp.core.WXCpMailList;
 import org.fouram.core.util.AppUtil;
 import org.fouram.core.util.AppUtil.ResultConstant;
 import org.fouram.core.util.ConfConfig;
+import org.fouram.core.util.DateUtil;
 import org.fouram.core.util.ExcelExportUtil;
 import org.fouram.core.util.LoggerUtil;
 import org.fouram.core.util.ResultUtil;
@@ -259,7 +260,8 @@ public class ApiController extends BaseController {
 					dto.getName(), dto.getState(), null, null);
 			List<Map<String, Object>> dataList = (List<Map<String, Object>>) object;
 			String haveFilePath = "/public/excel/userReport.xlsx";
-			ExcelExportUtil.exportExcelStream(getRootPath() + haveFilePath, dataList, 1, response);
+			String filePath = "/public/excel/userReport" + DateUtil.getTimeStamp() + ".xlsx";
+			ExcelExportUtil.exportExcelFile(getRootPath() + haveFilePath, dataList, getRootPath() + filePath, 1);
 		} catch (Exception e) {
 			LoggerUtil.error(e);
 		}

+ 4 - 4
code/sapparent/sapservice/src/main/java/org/fouram/service/CheckTaskService.java

@@ -24,12 +24,12 @@ public class CheckTaskService {
 	private SapApprovalInfoService sapApprovalInfoService;
 
 	public void taskBiz() {
-		LoggerUtil.info(DateUtil.getDate());
+		LoggerUtil.info(DateUtil.getTime());
 		try {
 			if (DateUtil.getHour().equals("10") || DateUtil.getHour().equals("17") || DateUtil.getHour().equals("20")) {
-				LoggerUtil.info("执行开始:" + DateUtil.getDate());
-				executeBiz(DateUtil.getDate());
-				LoggerUtil.info("执行结束:"  + DateUtil.getDate());
+				LoggerUtil.info("执行开始:" + DateUtil.getTime());
+				executeBiz(DateUtil.getTime());
+				LoggerUtil.info("执行结束:"  + DateUtil.getTime());
 			}
 		} catch (Exception e) {
 			LoggerUtil.error(e);