projects-service/src/main/java/com/rtrh/projects/modules/projects/mapper/SubInfoMapper.xml

@@ -28,6 +28,7 @@
     <select id="exportSmzkDetailExcel" resultType="com.rtrh.projects.modules.projects.vo.export.SmzkDetailVo">
         SELECT sub_info.id as id,
         sub_info.sub_name as subName,
+        sub_info.status as status,
         sub_info.subject_id as subjectId,
         sub_info.content as content,
         sub_info.amt_total as amtTotal,

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

@@ -5425,6 +5425,22 @@ public class SubInfoServiceImpl implements SubInfoService {
 
             e.setCbStatus(SubInfoCbStatusEnum.getMessage(e.getCbStatus()));
 
+            //设置项目状态
+            if (StringUtil.isNotEmpty(e.getStatus())) {
+                String status = e.getStatus();
+                if (status.equals("1")) {
+                    e.setStatus("储备");
+                } else if (status.equals("2")) {
+                    e.setStatus("新建");
+                } else if (status.equals("3")) {
+                    e.setStatus("在建");
+                } else if (status.equals("9")) {
+                    e.setStatus("投产");
+                }else {
+                    e.setStatus("");
+                }
+            }
+
             //设置行业
             if (StringUtil.isNotEmpty(e.getIndusKind())) {
                 String induskind = e.getIndusKind();
@@ -5452,8 +5468,6 @@ public class SubInfoServiceImpl implements SubInfoService {
                 e.setSubjectId("");
             }
 
-            //将万元转换为亿元
-            e.setAmtTotal(e.getAmtTotal().divide(new BigDecimal("10000"), 2, RoundingMode.HALF_UP));
         });
 
         return dataList;
@@ -5478,26 +5492,37 @@ public class SubInfoServiceImpl implements SubInfoService {
                         xmzhtjDetailVo.setId(readAll.get(i).get(j).toString());
                     }
                     if (j == 2){
-                        xmzhtjDetailVo.setSubName(readAll.get(i).get(j).toString());
+                        xmzhtjDetailVo.setStatus(readAll.get(i).get(j).toString());
                     }
                     if (j == 3){
-                        xmzhtjDetailVo.setSubjectId(readAll.get(i).get(j).toString());
+                        xmzhtjDetailVo.setSubName(readAll.get(i).get(j).toString());
                     }
                     if (j == 4){
-                        xmzhtjDetailVo.setContent(readAll.get(i).get(j).toString());
+                        xmzhtjDetailVo.setSubjectId(readAll.get(i).get(j).toString());
                     }
                     if (j == 5){
-                        xmzhtjDetailVo.setAmtTotal(BigDecimal.valueOf((Double) readAll.get(i).get(j)));
+                        xmzhtjDetailVo.setContent(readAll.get(i).get(j).toString());
                     }
                     if (j == 6){
-                        xmzhtjDetailVo.setIndusKind(readAll.get(i).get(j).toString());
+                        if (StringUtil.isNotEmpty(readAll.get(i).get(j).toString())){
+                            try {
+                                xmzhtjDetailVo.setAmtTotal(BigDecimal.valueOf((Double) readAll.get(i).get(j)));
+                            }catch (Exception e){
+                                throw new RuntimeException("导入失败，第" + (i+1) + "行，金额格式有问题！" + readAll.get(i).get(j).toString());
+                            }
+                        }else {
+                            throw new RuntimeException("导入失败，第" + (i+1) + "行，金额不能为空！");
+                        }
                     }
                     if (j == 7){
-                        xmzhtjDetailVo.setCbStatus(readAll.get(i).get(j).toString());
+                        xmzhtjDetailVo.setIndusKind(readAll.get(i).get(j).toString());
                     }
                     if (j == 8){
+                        xmzhtjDetailVo.setCbStatus(readAll.get(i).get(j).toString());
+                    }
+                    if (j == 9){
                         // 如果不为null才进行解析
-                        if (readAll.get(i).get(j) != null) {
+                        if (StringUtil.isNotEmpty(readAll.get(i).get(j).toString())) {
                             try {
                                 xmzhtjDetailVo.setBeginDate(DateUtil.parseDate(readAll.get(i).get(j).toString()));
                             }catch (Exception e){
@@ -5507,8 +5532,8 @@ public class SubInfoServiceImpl implements SubInfoService {
                             xmzhtjDetailVo.setBeginDate(null);
                         }
                     }
-                    if (j == 9){
-                        if (readAll.get(i).get(j) != null) {
+                    if (j == 10){
+                        if (StringUtil.isNotEmpty(readAll.get(i).get(j).toString())) {
                             try {
                                 xmzhtjDetailVo.setEndDate(DateUtil.parseDate(readAll.get(i).get(j).toString()));
                             }catch (Exception e){
@@ -5518,10 +5543,10 @@ public class SubInfoServiceImpl implements SubInfoService {
                             xmzhtjDetailVo.setEndDate(null);
                         }
                     }
-                    if (j == 10){
+                    if (j == 11){
                         xmzhtjDetailVo.setProgress(readAll.get(i).get(j).toString());
                     }
-                    if (j == 11){
+                    if (j == 12){
                         xmzhtjDetailVo.setRemark(readAll.get(i).get(j).toString());
                     }
                 }
@@ -5544,12 +5569,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 +5604,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-service/src/main/java/com/rtrh/projects/modules/projects/vo/export/SmzkDetailVo.java

@@ -12,6 +12,8 @@ public class SmzkDetailVo {
 
     private String id;      //项目id
 
+    private String status;  //项目四库状态
+
     private String subName; //项目名称
 
     private String subjectId;   //项目所在地

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;
@@ -1004,17 +1005,18 @@ public class SubInfoExportController extends BaseController {
 
             // 写入标题行
             writer.writeHeadRow(CollUtil.newArrayList("“四个一批”工业项目表(项目总库)"));
-            writer.merge(0, 0, 0, 11, "“四个一批”工业项目表(项目总库)", true);
+            writer.merge(0, 0, 0, 12, "“四个一批”工业项目表(项目总库)", true);
 
             // 写入子标题行
 //            writer.writeHeadRow(CollUtil.newArrayList("序号", "项目id", "项目库", "项目代码", "项目名称", "总金额(亿元)", "计划开始日期", "计划投产日期", "行业名称", "状态"));
 
             writer.addHeaderAlias("number", "序号");
             writer.addHeaderAlias("id", "项目id");
+            writer.addHeaderAlias("status", "项目四库状态");
             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 +1025,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!@#

projects/src/main/webapp/vmodules/subject/subInfo/tz/cb.jsp

@@ -587,7 +587,7 @@
                         {type: 'numbers', align: 'center', width: 44, title: '序号', fixed: 'left'},
                         {field: 'subName', fixed: 'left', title: '项目名称', width: 200, templet: '#subName'},
                         {field: 'subjectName', title: '项目所在地', width: 100},
-                        {field: 'content', title: '项目建设内容', minWidth: 300,
+                        {field: 'content', title: '项目建设内容', minWidth: 100,
                             templet: function (row) {
                                 // row.content = row.content.replace(/(\d+)/g, '<span class="new-roman">$1</span>');
                                 return row.content ? '<span class="cut" title="' + row.content + '">' + row.content + '</span>' : '';
@@ -597,7 +597,7 @@
                                 return `<span class="new-roman">` + (d.amtTotal / 10000).toFixed(2) + `</span>` + "亿元";
                             }
                         },
-                        {field: 'progress', title: '进展情况', minWidth: 300,
+                        {field: 'progress', title: '进展情况', minWidth: 100,
                             templet: function (row) {
                                 return row.progress ? '<span class="cut" title="' + row.progress + '">' + row.progress + '</span>' : '';
                             }},

projects/src/main/webapp/vmodules/subject/subInfo/tz/end.jsp

@@ -886,12 +886,12 @@
                         {type: 'numbers', fixed: 'left', align: 'center', title: '序号', width: 44},
                         {field: 'subName', fixed: 'left', title: '项目名称', minWidth: 200, templet: '#subName'},
                         {field: 'subjectName', title: '项目所在地', width: 100},
-                        {field: 'content', title: '项目基本情况', minWidth: 300,
+                        {field: 'content', title: '项目基本情况', minWidth: 100,
                             templet: function (row) {
                                 return row.content ? '<span class="cut" title="' + row.content + '">' + row.content + '</span>' : '';
                             }},
                         {field: 'rtDate', title: '升规入统时间', minWidth: 160,templet: '#date'},
-                        {field: 'progress', title: '进展情况', minWidth: 300,
+                        {field: 'progress', title: '进展情况', minWidth: 100,
                             templet: function (row) {
                                 return row.progress ? '<span class="cut" title="' + row.progress + '">' + row.progress + '</span>' : '';
                             }},

projects/src/main/webapp/vmodules/subject/subInfo/tz/main.jsp

@@ -1149,7 +1149,7 @@
                         },
                         {field: 'subName', fixed: 'left', title: '项目名称', minWidth: 200, templet: '#subName'},
                         {field: 'subjectName', title: '项目所在地', width: 100},
-                        {field: 'content', title: '项目建设内容', width: 300,
+                        {field: 'content', title: '项目建设内容', minWidth: 100,
                             templet: function (row) {
                                 return row.content ? '<span class="cut" title="' + row.content + '">' + row.content + '</span>' : '';
                             }},
@@ -1162,7 +1162,7 @@
                         {field: 'yearPlanAmt', title: '年度投资(万元)', width: 100, templet: function (d) {
                                 return d.yearPlanAmt ? `<span class="new-roman">` +  d.yearPlanAmt + `</span>万元` : '';
                             }},
-                        {field: 'progress',  title: '进展情况', width: 300,
+                        {field: 'progress',  title: '进展情况', minWidth: 100,
                             templet: function (row) {
                                 return row.progress ? '<span class="cut" title="' + row.progress + '">' + row.progress + '</span>' : '';
                             }},

projects/src/main/webapp/vmodules/subject/subInfo/tz/new.jsp

@@ -989,7 +989,7 @@
                         {type: 'numbers',  align: 'center', width: 44, title: '序号',fixed: 'left'},
                         {field: 'subName',  title: '项目名称', minWidth: 200, templet: '#subName',fixed: 'left'},
                         {field: 'subjectName', title: '项目所在地', width: 100},
-                        {field: 'content', title: '项目建设内容', minWidth: 300,
+                        {field: 'content', title: '项目建设内容', minWidth: 100,
                             templet: function (row) {
                                 return row.content ? '<span class="cut" title="' + row.content + '">' + row.content + '</span>' : '';
                             }},

projects/src/main/webapp/vmodules/subject/subInfo/tz/xmzk.jsp

@@ -946,7 +946,7 @@
                         {type: 'numbers', align: 'center', width: 44, title: '序号',fixed: 'left'},
                         {field: 'subName', title: '项目名称', minWidth: 200, templet: '#subName',fixed: 'left'},
                         {field: 'subjectName', title: '项目所在地', width: 100},
-                        {field: 'content', title: '建设内容', minWidth: 300,
+                        {field: 'content', title: '建设内容', minWidth: 100,
                             templet: function (row) {
                                 return row.content ? '<span class="cut" title="' + row.content + '">' + row.content + '</span>' : '';
                             }},

projects/src/main/webapp/vmodules/subject/subInfo/tz/year_extend.jsp

@@ -930,13 +930,13 @@
                                     }
                                 }
                             },
-                            {field: 'subName', title: '项目名称', minWidth: 200},
-                            {field: 'subjectId', title: '项目所在地', minWidth: 200},
-                            {field: 'content', title: '项目建设内容', minWidth: 200},
-                            {field: 'amtTotal', title: '投资金额(亿元)', minWidth: 200},
-                            {field: 'endDate', title: '建成投产时间', minWidth: 200},
-                            {field: 'progress', title: '进展情况', minWidth: 200},
-                            {field: 'remark', title: '备注', minWidth: 200},
+                            {field: 'subName', title: '项目名称', minWidth: 100},
+                            {field: 'subjectId', title: '项目所在地', minWidth: 100},
+                            {field: 'content', title: '项目建设内容', minWidth: 100},
+                            {field: 'amtTotal', title: '投资金额(亿元)', minWidth: 100},
+                            {field: 'endDate', title: '建成投产时间', minWidth: 100},
+                            {field: 'progress', title: '进展情况', minWidth: 100},
+                            {field: 'remark', title: '备注', minWidth: 100},
                             {title: '操作', width: 180, toolbar: '#toolBar', fixed: 'right',},
                         ]],
                         fixed: true,

projects/src/main/webapp/vmodules/subject/subInfo/tz/year_new.jsp

@@ -926,17 +926,17 @@
                                     }
                                 }
                             },
-                            {field: 'subName', title: '项目名称', minWidth: 200},
-                            {field: 'subjectId', title: '项目所在地', minWidth: 200},
-                            {field: 'content', title: '项目建设内容', minWidth: 200},
-                            {field: 'amtTotal', title: '投资金额(亿元)', minWidth: 200,
+                            {field: 'subName', title: '项目名称', minWidth: 100},
+                            {field: 'subjectId', title: '项目所在地', minWidth: 100},
+                            {field: 'content', title: '项目建设内容', minWidth: 100},
+                            {field: 'amtTotal', title: '投资金额(亿元)', minWidth: 100,
                                 templet: d => `<span class="new-roman">` + d.amtTotal + `</span>`
                             },
-                            {field: 'beginDate', title: '预计开工时间', minWidth: 200,
+                            {field: 'beginDate', title: '预计开工时间', minWidth: 100,
                                 templet: d => `<span class="new-roman">` + d.beginDate + `</span>`
                             },
-                            {field: 'qqsxblqk', title: '前期手续办理情况', minWidth: 200},
-                            {field: 'remark', title: '备注', minWidth: 200},
+                            {field: 'qqsxblqk', title: '前期手续办理情况', minWidth: 100},
+                            {field: 'remark', title: '备注', minWidth: 100},
                             {title: '操作', width: 180, toolbar: '#toolBar', fixed: 'right',},
                         ]],
                         fixed: true,

projects/src/main/webapp/vmodules/subject/subInfo/tz/year_reserve.jsp

@@ -930,13 +930,13 @@
                                     }
                                 }
                             },
-                            {field: 'subName', title: '项目名称', minWidth: 200},
-                            {field: 'subjectId', title: '项目所在地', minWidth: 200},
-                            {field: 'content', title: '项目建设内容', minWidth: 300,},
-                            {field: 'amtTotal', title: '投资金额(亿元)', minWidth: 200,
+                            {field: 'subName', title: '项目名称', minWidth: 100},
+                            {field: 'subjectId', title: '项目所在地', minWidth: 100},
+                            {field: 'content', title: '项目建设内容', minWidth: 100,},
+                            {field: 'amtTotal', title: '投资金额(亿元)', minWidth: 100,
                                 templet: d => `<span class="new-roman">` + d.amtTotal + `</span>` + "亿元"
                             },
-                            {field: 'progress', title: '进展情况', minWidth: 200},
+                            {field: 'progress', title: '进展情况', minWidth: 100},
                             {field: 'remark', title: '备注', minWidth: 200},
                             {title: '操作', width: 180, toolbar: '#toolBar', fixed: 'right',},
                         ]],

projects/src/main/webapp/vmodules/subject/subInfo/tz/year_sum.jsp

@@ -942,14 +942,14 @@
                                     }
                                 }
                             },
-                            {field: 'subName', title: '项目名称', minWidth: 200},
-                            {field: 'subjectId', title: '项目所在地', minWidth: 200},
-                            {field: 'content', title: '项目基本情况', minWidth: 200},
-                            {field: 'rgDate', title: '升规入统时间', minWidth: 200,
+                            {field: 'subName', title: '项目名称', minWidth: 100},
+                            {field: 'subjectId', title: '项目所在地', minWidth: 100},
+                            {field: 'content', title: '项目基本情况', minWidth: 100},
+                            {field: 'rgDate', title: '升规入统时间', minWidth: 100,
                                 templet: d => `<span class="new-roman">` + d.rgDate + `</span>`
                             },
-                            {field: 'progress', title: '进展情况', minWidth: 200},
-                            {field: 'remark', title: '备注', minWidth: 200},
+                            {field: 'progress', title: '进展情况', minWidth: 100},
+                            {field: 'remark', title: '备注', minWidth: 100},
                             {title: '操作', width: 180, toolbar: '#toolBar', fixed: 'right',},
                         ]],
                         fixed: true,