导出优化

projects-service/src/main/java/com/rtrh/projects/modules/projects/service/impl/SubInfoServiceImpl.java

@@ -5452,8 +5452,6 @@ public class SubInfoServiceImpl implements SubInfoService {
                 e.setSubjectId("");
             }
 
-            //将万元转换为亿元
-            e.setAmtTotal(e.getAmtTotal().divide(new BigDecimal("10000"), 2, RoundingMode.HALF_UP));
         });
 
         return dataList;
@@ -5544,12 +5542,12 @@ public class SubInfoServiceImpl implements SubInfoService {
 
                 // 判断id，id不能为空
                 if (StringUtil.isEmpty(smzkDetailVo.getId())){
-                    throw new RuntimeException("导入失败，第" + (i+3) + "行，项目编号不能为空");
+                    throw new RuntimeException("导入失败，第" + (i+3) + "行，项目Id不能为空");
                 }else {
                     // 查找sub_info表，根据id查询，如果不存在报错
                     Integer count = subInfoMapper.selectById(smzkDetailVo.getId());
                     if (count == 0){
-                        throw new RuntimeException("导入失败，第" + (i+3) + "行，项目编号不存在");
+                        throw new RuntimeException("导入失败，第" + (i+3) + "行，项目Id不存在");
                     }
                 }
 
@@ -5579,8 +5577,6 @@ public class SubInfoServiceImpl implements SubInfoService {
                     throw new RuntimeException("导入失败，第" + (i+3) + "行，项目金额不能为空");
                 }else if (smzkDetailVo.getAmtTotal().compareTo(new BigDecimal("0")) == 0){
                     throw new RuntimeException("导入失败，第" + (i+3) + "行，项目金额不能为0");
-                }else {
-                    smzkDetailVo.setAmtTotal(smzkDetailVo.getAmtTotal().multiply(new BigDecimal("1000")));
                 }
 
                 // 行业分类不能为空，判断行业必须存在，存在后取id保存

projects/src/main/java/com/rtrh/projects/web/controller/subject/SubInfoExportController.java

@@ -21,6 +21,7 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.poi.excel.ExcelReader;
 import cn.hutool.poi.excel.ExcelUtil;
+import cn.hutool.poi.excel.StyleSet;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.EasyExcelFactory;
 import com.alibaba.excel.ExcelWriter;
@@ -1014,7 +1015,7 @@ public class SubInfoExportController extends BaseController {
             writer.addHeaderAlias("subName", "项目名称");
             writer.addHeaderAlias("subjectId", "项目所在地");
             writer.addHeaderAlias("content", "项目建设内容");
-            writer.addHeaderAlias("amtTotal", "计划总投资(亿元)");
+            writer.addHeaderAlias("amtTotal", "计划总投资(万元)");
             writer.addHeaderAlias("indusKind", "行业分类");
             writer.addHeaderAlias("cbStatus", "状态[正在谋划,正在洽谈,已签约,已备案/已核准]");
             writer.addHeaderAlias("beginDate", "计划开始日期");
@@ -1023,8 +1024,14 @@ public class SubInfoExportController extends BaseController {
             writer.addHeaderAlias("remark", "备注");
 
 
+            // 设置单元格样式
+            SXSSFWorkbook workbook = (SXSSFWorkbook) writer.getWorkbook();
+            SXSSFSheet sheet = workbook.getSheetAt(0);
+            CellStyle cellStyle=writer.getStyleSet().getCellStyle();
+            cellStyle.setWrapText(true);
+            cellStyle.setAlignment(HorizontalAlignment.LEFT);
+
             // 设置每列的默认宽度
-            SXSSFSheet sheet = ((SXSSFWorkbook) writer.getWorkbook()).getSheetAt(0);
             int defaultColumnWidth = 40; // 默认宽度为20个字符
             for (int i = 0; i < 11; i++) {
                 if (i == 0) {

projects/src/main/resources/dbconfig.properties

@@ -12,12 +12,12 @@
 
 #\u4E3B\u6570\u636E\u6E90\uFF0C\u9ED8\u8BA4\u67E5\u8BE2\u8FD9\u4E2A\u5E93
 jdbc.driver=com.mysql.jdbc.Driver
-jdbc.url=jdbc:mysql://139.155.7.62:3306/subject_gxj?useUnicode=true&useSSL=false&characterEncoding=UTF-8&autoReconnect=true
+jdbc.url=jdbc:mysql://139.155.7.62:3306/subject_gxj?useUnicode=true&useSSL=false&characterEncoding=UTF-8&autoReconnect=true&allowMultiQueries=true
 jdbc.username=root
 jdbc.password=Chaoliu@0917!@#
 
 #\u4ECE\u6570\u636E\u6E90\uFF0C\u5728mybatis\u67E5\u8BE2\u7684\u65B9\u6CD5\u4E0A\u6DFB\u52A0\u6CE8\u89E3@TargetDataSource("secondary")\u5219\u4F7F\u7528\u8BE5\u6570\u636E\u6E90\u8FDB\u884C\u67E5\u8BE2
 jdbc.secondary.driver=com.mysql.jdbc.Driver
-jdbc.secondary.url=jdbc:mysql://139.155.7.62:3306/subject?useUnicode=true&useSSL=false&characterEncoding=UTF-8&autoReconnect=true
+jdbc.secondary.url=jdbc:mysql://139.155.7.62:3306/subject?useUnicode=true&useSSL=false&characterEncoding=UTF-8&autoReconnect=true&allowMultiQueries=true
 jdbc.secondary.username=root
 jdbc.secondary.password=Chaoliu@0917!@#