Ver Fonte

修改资料填报连续日期显示错误

qianxb há 2 anos atrás
pai
commit
bcf405521e

+ 4 - 2
blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ExcelTabController.java

@@ -618,7 +618,8 @@ public class ExcelTabController extends BladeController {
         if (wbsTreeContract.getHtmlUrl() == null) {
             return R.fail("暂无表单!");
         }
-        File file1 = ResourceUtil.getFile(wbsTreeContract.getHtmlUrl());
+//        File file1 = ResourceUtil.getFile(wbsTreeContract.getHtmlUrl());
+        File file1 = ResourceUtil.getFile("C:\\Users\\泓创研发01\\Desktop\\privateUrl\\1578963584895942656.html");
         FileInputStream fileInputStream = new FileInputStream(file1);
 
         String htmlString = IoUtil.readToString(fileInputStream);
@@ -3039,7 +3040,8 @@ public class ExcelTabController extends BladeController {
             return R.fail("暂无表单!");
         }
 
-        File file1 = ResourceUtil.getFile(wbsTreeContract.getHtmlUrl());
+//        File file1 = ResourceUtil.getFile(wbsTreeContract.getHtmlUrl());
+        File file1 = ResourceUtil.getFile("C:\\Users\\泓创研发01\\Desktop\\privateUrl\\1578963584895942656.html");
         FileInputStream fileInputStream = new FileInputStream(file1);
         String htmlString = IoUtil.readToString(fileInputStream);
         // 解析 style

+ 5 - 0
blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ExcelTabServiceImpl.java

@@ -2,6 +2,7 @@ package org.springblade.manager.service.impl;
 
 import cn.hutool.core.date.StopWatch;
 import cn.hutool.log.StaticLog;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -309,6 +310,10 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                     } else {
                         String dataVal = dataInfo2.getString(dataMap.get(k).get(0));
                         if (StringUtils.isNotEmpty(dataVal)) {
+                            if (dataVal.contains("Ljava")){
+                                Object o = dataInfo2.get(dataMap.get(k).get(0));
+                                dataVal = JSON.toJSONString(o).replace("\"","");
+                            }
                             dataMap2.put(k, dataVal + "_^_" + dataMap.get(k).get(0).split("__")[1]);
                         }
                     }