Commit 3fcdfc49 by jiangyun

修改

parent 45dd7f45
...@@ -2387,7 +2387,7 @@ public class SjDjjcController extends BaseController { ...@@ -2387,7 +2387,7 @@ public class SjDjjcController extends BaseController {
JsonObject root = gson.fromJson(body, JsonObject.class); JsonObject root = gson.fromJson(body, JsonObject.class);
int code = root.get("code").getAsInt(); int code = root.get("code").getAsInt();
if (code == 1) { if (code == 1) {
// JsonObject outerData = root.getAsJsonObject("message"); sjSjzlErrorLogMapper.add(SjSjzlErrorLog.builder().jh(id).body(root.get("message").getAsString()).build());
String s = root.get("excelb64").getAsString(); String s = root.get("excelb64").getAsString();
if (StringUtils.isNotEmpty(s)) { if (StringUtils.isNotEmpty(s)) {
long time = new Date().getTime(); long time = new Date().getTime();
...@@ -2397,7 +2397,8 @@ public class SjDjjcController extends BaseController { ...@@ -2397,7 +2397,8 @@ public class SjDjjcController extends BaseController {
FileBase64Converter.base64ToExcel(s, outPath); FileBase64Converter.base64ToExcel(s, outPath);
File testFile = new File(outPath); File testFile = new File(outPath);
MultipartFile multipartFile = FileToMultipartFileConverter.convert(testFile); MultipartFile multipartFile = FileToMultipartFileConverter.convert(testFile);
importData(multipartFile, false, sjDjjcnew); AjaxResult ajaxResult = importData(multipartFile, false, sjDjjcnew);
sjSjzlErrorLogMapper.add(SjSjzlErrorLog.builder().jh(id).body(ajaxResult.get("msg").toString()).build());
} }
} else { } else {
sjSjzlErrorLogMapper.add(SjSjzlErrorLog.builder().jh(id).body(body).build()); sjSjzlErrorLogMapper.add(SjSjzlErrorLog.builder().jh(id).body(body).build());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment