修改数据

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

@@ -53,6 +53,7 @@ import org.springblade.resource.feign.NewIOSSClient;
 import org.springblade.resource.vo.NewBladeFile;
 import org.springblade.system.cache.ParamCache;
 import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.log.exception.ServiceException;
@@ -636,6 +637,12 @@ public class ExcelTabController extends BladeController {
                     System.out.println(element.parent());
                     element.parent().attr("gscolor", "11");
                 }
+
+                Elements datecolor = doc.select("el-date-picker[keyname~=^" + key + "]");
+                for (Element element : datecolor) {
+                    System.out.println(element.parent());
+                    element.parent().attr("gscolor", "11");
+                }
             }
         }
         doc.select("Col").remove();

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/TextdictInfoController.java

@@ -249,7 +249,7 @@ public class TextdictInfoController extends BladeController {
                     jsonObject.put("name",optionList.get(i).getDictValue());
                     objs.add(jsonObject);
                 }
-                String checkbox = "<hc-form-checkbox-group :objs="+objs+"  @change='checkboxGroupChange' :val=" + vmode + " v-model=" + vmode + " keyname=" + keyname + " weighing=" + weighing + " placeholder=" + placeholder + " trIndex=" + trindex + " tdIndex=" + tdindex + "  x1=" + x1 + " x2=" + x2 + " y1=" + y1 + " y2=" + y2 + "> </hc-form-checkbox-group>";
+                String checkbox = "<hc-form-checkbox-group :objs='"+objs+"'  @change='checkboxGroupChange' :val=" + vmode + " v-model=" + vmode + " keyname=" + keyname + " weighing=" + weighing + " placeholder=" + placeholder + " trIndex=" + trindex + " tdIndex=" + tdindex + "  x1=" + x1 + " x2=" + x2 + " y1=" + y1 + " y2=" + y2 + "> </hc-form-checkbox-group>";
                 element.empty().append(checkbox);
             }
         } else if (textdictInfo.getTextId().equals("date")) { // 日期--年月日时分秒

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsTreePrivateMapper.xml

@@ -397,7 +397,7 @@
                wt.sort,
                wt.status,
                wt.fill_rate AS "fillRate",
-               (SELECT count(1) FROM m_wbs_form_element WHERE f_id = wt.id) AS "elementTotal"
+               (SELECT count(1) FROM m_wbs_form_element WHERE f_id = wt.id and is_deleted=0) AS "elementTotal"
         FROM m_wbs_tree_private AS wt
         WHERE wt.type = 2
           AND wt.is_deleted = 0

blade-service/blade-manager/src/main/java/org/springblade/manager/service/IExcelTabService.java

@@ -30,6 +30,7 @@ import org.springblade.manager.vo.ExcelTabWbsTypeVO;
 import org.springblade.manager.vo.WbsTreeVO;
 
 import java.io.FileNotFoundException;
+import java.sql.SQLException;
 import java.util.List;
 import java.util.Map;
 
@@ -95,7 +96,7 @@ public interface IExcelTabService extends BaseService<ExcelTab> {
 	/**
 	 *  结果信息持久化
 	 */
-	void saveOrUpdateInfo(List<TableInfo> tableInfoList);
+	void saveOrUpdateInfo(List<TableInfo> tableInfoList) throws SQLException;
 
 	 Map<String,String> getTablbCols(String pkeyid, String colkey) throws FileNotFoundException;
 

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

@@ -58,15 +58,20 @@ import org.springblade.manager.vo.WbsTreeVO;
 import org.springblade.resource.feign.NewIOSSClient;
 import org.springblade.system.cache.ParamCache;
 import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.datasource.DataSourceUtils;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.imageio.ImageIO;
+import javax.sql.DataSource;
 import java.awt.*;
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
+import java.sql.Connection;
+import java.sql.SQLException;
 import java.util.*;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -191,7 +196,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
             tableInfo.setFirstFileName(dataInfo2.getString("firstFileName"));
         }
         //关联的信息
-        if(dataInfo2.containsKey("linkProcessList")){
+        if (dataInfo2.containsKey("linkProcessList")) {
             tableInfo.setLinkProcessList(dataInfo2.getJSONArray("linkProcessList"));
         }
     }
@@ -317,7 +322,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
     }
 
     @Override
-    public void formulaFillData(List<TableInfo> tableInfoList,Long nodeId) {
+    public void formulaFillData(List<TableInfo> tableInfoList, Long nodeId) {
         if (Func.isNotEmpty(tableInfoList)) {
             StopWatch stopWatch = new StopWatch();
             String ids = tableInfoList.stream().map(TableInfo::getPkeyId).filter(Func::isNotEmpty).collect(Collectors.joining(","));
@@ -522,57 +527,56 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
     }
 
     @Override
-    public void saveOrUpdateInfo(List<TableInfo> tableInfoList) {
+    @Transactional
+    public void saveOrUpdateInfo(List<TableInfo> tableInfoList) throws SQLException {
+
         if (ListUtils.isNotEmpty(tableInfoList)) {
             //施工资料填报
-            for (TableInfo tableInfo : tableInfoList) {
-                WbsTreeContract wbsTreeContract = wbsTreeContractService.getBaseMapper().selectOne(Wrappers.<WbsTreeContract>query().lambda()
-                        .eq(WbsTreeContract::getPKeyId, tableInfo.getPkeyId()));
-                if (wbsTreeContract == null) {
-                    continue;
-                }
-
-                String tabName = wbsTreeContract.getInitTableName();
+            try {
+                for (TableInfo tableInfo : tableInfoList) {
+                    WbsTreeContract wbsTreeContract = wbsTreeContractService.getBaseMapper().selectOne(Wrappers.<WbsTreeContract>query().lambda()
+                            .eq(WbsTreeContract::getPKeyId, tableInfo.getPkeyId()));
+                    if (wbsTreeContract == null) {
+                        continue;
+                    }
 
-                // 判读修改还是 添加
-                String delSql = "delete from " + tabName + " where p_key_id=" + tableInfo.getPkeyId();
-                jdbcTemplate.execute(delSql);
+                    String tabName = wbsTreeContract.getInitTableName();
+                    // 判读修改还是 添加
+                    String delSql = "delete from " + tabName + " where p_key_id=" + tableInfo.getPkeyId();
+                    jdbcTemplate.execute(delSql);
+
+                    String sqlInfo = "";
+                    LinkedHashMap<String, String> dataMap2 = tableInfo.getDataMap();
+                    sqlInfo = "INSERT INTO " + tabName + " ( ";
+                    String keyStr = "id,";
+                    String valStr = SnowFlakeUtil.getId() + ",";
+                    for (String keys : dataMap2.keySet()) {
+                        keyStr += keys + ",";
+                        valStr += "'" + dataMap2.get(keys) + "',";
+                    }
+                    keyStr = keyStr.substring(0, keyStr.lastIndexOf(","));
+                    valStr = valStr.substring(0, valStr.lastIndexOf(","));
+                    sqlInfo = sqlInfo + keyStr + ") VALUES (" + valStr + ")";
 
-                String sqlInfo = "";
-                LinkedHashMap<String, String> dataMap2 = tableInfo.getDataMap();
-                sqlInfo = "INSERT INTO " + tabName + " ( ";
-                String keyStr = "id,";
-                String valStr = SnowFlakeUtil.getId() + ",";
-                for (String keys : dataMap2.keySet()) {
-                    keyStr += keys + ",";
-                    valStr += "'" + dataMap2.get(keys) + "',";
-                }
-                keyStr = keyStr.substring(0, keyStr.lastIndexOf(","));
-                valStr = valStr.substring(0, valStr.lastIndexOf(","));
-                sqlInfo = sqlInfo + keyStr + ") VALUES (" + valStr + ")";
+                    WbsTreeContract wbsTreeContractByP = wbsTreeContractService.getBaseMapper().selectOne(Wrappers.<WbsTreeContract>query().lambda()
+                            .eq(WbsTreeContract::getId, wbsTreeContract.getParentId()).eq(WbsTreeContract::getContractId, tableInfo.getContractId()));
 
-                WbsTreeContract wbsTreeContractByP = wbsTreeContractService.getBaseMapper().selectOne(Wrappers.<WbsTreeContract>query().lambda()
-                        .eq(WbsTreeContract::getId, wbsTreeContract.getParentId()).eq(WbsTreeContract::getContractId, tableInfo.getContractId()));
+                    if (wbsTreeContractByP != null) {
+                        //处理文件提名
+                        String fileName = this.wbsParamService.createFileTitle(Func.isNotEmpty(wbsTreeContractByP.getOldId()) ? Long.valueOf(wbsTreeContractByP.getOldId()) : wbsTreeContractByP.getId(), Long.parseLong(wbsTreeContractByP.getContractId()), wbsTreeContractByP);
+                        fileName = StringUtils.isNotEmpty(fileName) ? fileName : "缺少文件提名配置";
 
-                if (wbsTreeContractByP != null) {
-                    //处理文件提名
-                    String fileName = this.wbsParamService.createFileTitle(Func.isNotEmpty(wbsTreeContractByP.getOldId()) ? Long.valueOf(wbsTreeContractByP.getOldId()) : wbsTreeContractByP.getId(), Long.parseLong(wbsTreeContractByP.getContractId()), wbsTreeContractByP);
-                    fileName = StringUtils.isNotEmpty(fileName) ? fileName : "缺少文件提名配置";
+                        //huangjn 保存成功后调用生成资料查询列表数据
+                        this.informationQueryClient.saveOrUpdateInformationQueryData(wbsTreeContractByP.getPKeyId() + "", "首件使用字段", "业务ID(主要将来给首件使用)", fileName, Integer.parseInt(tableInfo.getClassify()), 2, "是否是首件(临时，暂时没用到)", "源文件（首件字段）", "pdf文件（首件字段）", "首件上传总结报告名称", new ArrayList<>());
+                    }
 
-                    //huangjn 保存成功后调用生成资料查询列表数据
-                    this.informationQueryClient.saveOrUpdateInformationQueryData(wbsTreeContractByP.getPKeyId() + "", "首件使用字段", "业务ID(主要将来给首件使用)", fileName, Integer.parseInt(tableInfo.getClassify()), 2, "是否是首件(临时，暂时没用到)", "源文件（首件字段）", "pdf文件（首件字段）", "首件上传总结报告名称", new ArrayList<>());
+                    UpdateWrapper<WbsTreeContract> updateWrapper = new UpdateWrapper<>();
+                    updateWrapper.in("p_key_id", tableInfo.getPkeyId());
+                    updateWrapper.set("is_tab_pdf", 2);
+                    wbsTreeContractService.update(updateWrapper);
+                    jdbcTemplate.execute(sqlInfo);
                 }
 
-                UpdateWrapper<WbsTreeContract> updateWrapper = new UpdateWrapper<>();
-                updateWrapper.in("p_key_id", tableInfo.getPkeyId());
-                updateWrapper.set("is_tab_pdf", 2);
-                wbsTreeContractService.update(updateWrapper);
-                jdbcTemplate.execute(sqlInfo);
-                // pdf 预览添加
-                //this.getBussPdfInfo(Long.parseLong(tableInfo.getPkeyId()));
-            }
-
-            try {
                 //获取节点
                 WbsTreeContract wbsTreeContract = this.wbsTreeContractService.getOne(Wrappers.<WbsTreeContract>lambdaQuery().eq(WbsTreeContract::getPKeyId, tableInfoList.get(0).getPkeyId()));
 
@@ -618,8 +622,6 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
             for (int j = 0; j < tds.size(); j++) {
                 Element data = tds.get(j);
                 if (!data.children().isEmpty()) {
-                    //	String x1 = data.children().get(0).attr("x1");
-                    //	String y1 = data.children().get(0).attr("y1");
                     String keyVal = i + "_" + j;
                     String keyname = data.children().get(0).attr("keyname");
                     if (StringUtils.isNotEmpty(keyname)) {
@@ -672,9 +674,9 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
         // 标题添加
         ProjectInfo projectInfo = projectInfoService.getById(wbsTreeContract.getProjectId());
         CellRange[] columns = sheet.getMergedCells();
-        for (int i = 0; i< columns.length; i++){
+        for (int i = 0; i < columns.length; i++) {
             CellRange cellRange = columns[i];
-            if(cellRange.getStyle().getFont().getSize()>=17){
+            if (cellRange.getStyle().getFont().getSize() >= 17) {
                 cellRange.setText(projectInfo.getProjectName());
                 cellRange.getStyle().getFont().setSize(20);
                 break;
@@ -743,20 +745,20 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                                     int picHeight = 0;
                                     int picWidth = 0;
 
-                                    if(rowspan==0){
+                                    if (rowspan == 0) {
                                         String dataInfo = trs.get(y1).attr("height");
-                                        if(StringUtils.isEmpty(dataInfo)){
-                                             Element firstTd = trs.get(y1-1).children().get(0);
-                                            String heg[] =firstTd.attr("style").split(";");
-                                            for (String str:heg){
-                                                if(str.indexOf("height:")>=0){
-                                                    picHeight = Integer.parseInt(str.split(":")[1].replaceAll("px",""));
+                                        if (StringUtils.isEmpty(dataInfo)) {
+                                            Element firstTd = trs.get(y1 - 1).children().get(0);
+                                            String heg[] = firstTd.attr("style").split(";");
+                                            for (String str : heg) {
+                                                if (str.indexOf("height:") >= 0) {
+                                                    picHeight = Integer.parseInt(str.split(":")[1].replaceAll("px", ""));
                                                 }
                                             }
-                                        }else{
+                                        } else {
                                             picHeight = Integer.parseInt(dataInfo);
                                         }
-                                    }else{
+                                    } else {
                                         for (int i = y1; i <= (y1 + rowspan); i++) { // 跨列处理
                                             String dataInfo = trs.get(i).attr("height");
                                             if (StringUtils.isNotEmpty(dataInfo)) {
@@ -765,7 +767,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                                         }
                                     }
 
-                                    if (colspan >=1) {
+                                    if (colspan >= 1) {
                                         for (int i = x1 - 1; i < x1 + colspan - 1; i++) {
                                             String dataInfo = cols.get(i).attr("width").replaceAll("px", "");
                                             if (StringUtils.isNotEmpty(dataInfo)) {
@@ -778,16 +780,17 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                                     pic.setAutoSize(true);
                                     pic.setWidth(picWidth - 10);
 
-                                    System.out.println(sheet.get(y1,x1).getRowHeight());
-                                    System.out.println(sheet.get(y1,x1).getRows());
+                                    System.out.println(sheet.get(y1, x1).getRowHeight());
+                                    System.out.println(sheet.get(y1, x1).getRows());
                                     pic.setHeight(picHeight);
                                     pic.setLeft(5);
                                 } else {
                                     CellRange cellRange = sheet.getCellRange(y1, x1);
                                     cellRange.getCellStyle().getExcelFont().setFontName("EUDC");
                                     cellRange.setText(myData);
-                                    System.out.println(cellRange.getStyle().getFont().getFontName());;
-                                    System.out.println("后"+cellRange.getText());
+                                    System.out.println(cellRange.getStyle().getFont().getFontName());
+                                    ;
+                                    System.out.println("后" + cellRange.getText());
                                 }
                             }
                         }
@@ -801,7 +804,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
 
                 List<TextdictInfo> textdictInfos = textdictInfoService.getBaseMapper().selectList(queryWrapper);
                 if (textdictInfos != null && !textdictInfos.isEmpty()) {
-                    for(TextdictInfo e : textdictInfos){
+                    for (TextdictInfo e : textdictInfos) {
                         String key = e.getColKey();
                         String keys[] = key.split("__");
                         String[] trtd = keys[1].split("_");
@@ -816,17 +819,18 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                         cellRange.setText(e.getId() + "");
                         cellRange.getCellStyle().getFont().setColor(Color.white);
 
-                    };
+                    }
+                    ;
                 }
             }
         }
 
         wb.saveToFile(excelPath, ExcelVersion.Version2010);
-        FileUtils.excelToPdf(excelPath,pdfPath);
+        FileUtils.excelToPdf(excelPath, pdfPath);
         BladeFile bladeFile = newIOSSClient.uploadFile(pkeyId + ".pdf", pdfPath);
         //
         TableFile tableFile1 = tableFileService.getBaseMapper().selectOne(Wrappers.<TableFile>query().lambda()
-                .eq(TableFile::getTabId, pkeyId+"").eq(TableFile::getType, 1));
+                .eq(TableFile::getTabId, pkeyId + "").eq(TableFile::getType, 1));
         if (tableFile1 != null) {
             tableFile1.setDomainPdfUrl(bladeFile.getLink());
             tableFileService.saveOrUpdate(tableFile1);
@@ -843,7 +847,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
             tableFileService.saveOrUpdate(tableFile);
         }
 
-        List<TableFile> tableFileList = tableFileService.getBaseMapper().selectList(Wrappers.<TableFile>query().lambda().eq(TableFile::getTabId, pkeyId+"").eq(TableFile::getIsDeleted, 0));
+        List<TableFile> tableFileList = tableFileService.getBaseMapper().selectList(Wrappers.<TableFile>query().lambda().eq(TableFile::getTabId, pkeyId + "").eq(TableFile::getIsDeleted, 0));
         tableFileList.sort(Comparator.comparing(TableFile::getType));
 
 
@@ -861,7 +865,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
         BladeFile bladeFile2 = newIOSSClient.uploadFile(pkeyId + "2.pdf", pdfPath2);
 
         UpdateWrapper<WbsTreeContract> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.in("p_key_id", pkeyId+"");
+        updateWrapper.in("p_key_id", pkeyId + "");
         updateWrapper.set("pdf_url", bladeFile2.getLink());
         wbsTreeContractService.update(updateWrapper);
         wb.dispose();
@@ -877,7 +881,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
         if (wbsTreeContractList != null && wbsTreeContractList.size() >= 1) {
             for (WbsTreeContract wbsInfo : wbsTreeContractList) {
                 // 隐藏的不生成pdf
-                if ( wbsInfo.getIsBussShow()==null || wbsInfo.getIsBussShow() != 2  ) { //
+                if (wbsInfo.getIsBussShow() == null || wbsInfo.getIsBussShow() != 2) { //
                     if (StringUtils.isNotEmpty(wbsInfo.getPdfUrl())) {
                         data.add(wbsInfo.getPdfUrl());
                     } else {
@@ -936,7 +940,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
         // 匹配关联
 
         try {
-            File  file1 = ResourceUtil.getFile(wbsTreeContract.getHtmlUrl());
+            File file1 = ResourceUtil.getFile(wbsTreeContract.getHtmlUrl());
             String htmlString = IoUtil.readToString(new FileInputStream(file1));
             Document doc = Jsoup.parse(htmlString);
             //解析
@@ -946,7 +950,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
             Elements jltitle = doc.select("el-input[placeholder~=^监理单位]");
             Elements bhtitle = doc.select("el-input[placeholder~=^编号]");
 
-           // Elements title = doc.select("el-input[placeholder~=^编号]");
+            // Elements title = doc.select("el-input[placeholder~=^编号]");
 
             /**
              * 承包单位、施工单位：引用施工单位名称
@@ -956,28 +960,28 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
 
             ContractInfo contractInfo = contractInfoService.getById(wbsTreeContract.getContractId());
             // 施工单位名称
-            if(dwtitle.size()>=1 ){
-                reData.put(dwtitle.attr("keyName"),contractInfo.getConstructionUnitName());
+            if (dwtitle.size() >= 1) {
+                reData.put(dwtitle.attr("keyName"), contractInfo.getConstructionUnitName());
             }
-            if(sgtitle.size()>=1){
-                reData.put(sgtitle.attr("keyName"),contractInfo.getConstructionUnitName());
+            if (sgtitle.size() >= 1) {
+                reData.put(sgtitle.attr("keyName"), contractInfo.getConstructionUnitName());
             }
 
             // 合同段编号
-            if(htdtitle.size()>=1){
-                for (Element element:htdtitle){
+            if (htdtitle.size() >= 1) {
+                for (Element element : htdtitle) {
                     int trindex = Integer.parseInt(element.attr("tdindex"));
-                    if(trindex<=8){
-                        reData.put(htdtitle.attr("keyName"),contractInfo.getContractNumber());
+                    if (trindex <= 8) {
+                        reData.put(htdtitle.attr("keyName"), contractInfo.getContractNumber());
                     }
                 }
             }
             // 监理单位名称
-            if(jltitle.size()>=1) {
+            if (jltitle.size() >= 1) {
                 reData.put(jltitle.attr("keyName"), contractInfo.getSupervisionUnitName());
             }
             // 编号
-            if(bhtitle.size()>=1 && contractInfo.getIsReferenceNumber()==1) {
+            if (bhtitle.size() >= 1 && contractInfo.getIsReferenceNumber() == 1) {
                 reData.put(bhtitle.attr("keyName"), contractInfo.getConstructionUnitName());
             }
 
@@ -1007,23 +1011,23 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                         sql = sql.replaceAll("]", "\']");
                         sql = sql.replaceAll("000Z,", "000Z\',");
                         sql = sql.replaceAll(", 20", ", \'20");
-                     //   sql = sql.replaceAll("'", "");
-                        if(StringUtils.isNotEmpty(tabData[0])) {
+                        //   sql = sql.replaceAll("'", "");
+                        if (StringUtils.isNotEmpty(tabData[0])) {
                             reData.put(key + "__" + tabData[1], sql);
                         }
                     } else if (tabVal.indexOf("T") >= 0 && tabVal.indexOf(".000Z") >= 0) { //时间
                         // 时间和字符串合作
-                        if(tabVal.indexOf("☆")>=0){
+                        if (tabVal.indexOf("☆") >= 0) {
                             String mysql[] = tabVal.split("☆");
                             for (String data : mysql) {
                                 String tabData[] = data.split("_\\^_");
-                                if(StringUtils.isNotEmpty(tabData[0])){
+                                if (StringUtils.isNotEmpty(tabData[0])) {
                                     reData.put(key + "__" + tabData[1], tabData[0]);
                                 }
                             }
-                        }else{
+                        } else {
                             String tabData[] = tabVal.split("_\\^_");
-                            if(StringUtils.isNotEmpty(tabData[0])) {
+                            if (StringUtils.isNotEmpty(tabData[0])) {
                                 reData.put(key + "__" + tabData[1], tabData[0]);
                             }
                         }
@@ -1031,13 +1035,13 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                         String mysql[] = tabVal.split("☆");
                         for (String data : mysql) {
                             String tabData[] = data.split("_\\^_");
-                            if(StringUtils.isNotEmpty(tabData[0])){
+                            if (StringUtils.isNotEmpty(tabData[0])) {
                                 reData.put(key + "__" + tabData[1], tabData[0]);
                             }
                         }
                     } else if (tabVal.indexOf("_^_") >= 0) {
                         String tabData[] = tabVal.split("_\\^_");
-                        if(StringUtils.isNotEmpty(tabData[0])){
+                        if (StringUtils.isNotEmpty(tabData[0])) {
                             reData.put(key + "__" + tabData[1], tabData[0]);
                         }
                     } else {