导出优化

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();
@@ -5476,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){
@@ -5505,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){
@@ -5516,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());
                     }
                 }

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

@@ -1005,13 +1005,14 @@ 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", "项目建设内容");