4库导出

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

@@ -56,6 +56,8 @@ public interface SubInfoMapper {
 
     List<SubInfoTotalExcel> getFixTotalExcel(@Param("stateFix") String stateFix,@Param("year") String year);
 
+    List<SubInfoTotalExcel> exportTotalExcelByStatus(@Param("status") String status);
+
     List<SubInfoFixDetail> exportFixDetailExcel(@Param("stateFix")String stateFix, @Param("year") String year);
 
     List<SubInfoFixDetailPreNew> selectSubPreNewBySubIds(@Param("subIdList")List<String> subIdList);

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

@@ -358,6 +358,18 @@
         LEFT JOIN sub_info ON sub_fix.sub_id = sub_info.id
         WHERE sub_fix.cat = #{stateFix} and sub_fix.year = #{year} and sub_info.logic_delete_flag = 0
     </select>
+    <select id="exportTotalExcelByStatus" resultType="com.rtrh.projects.modules.projects.vo.SubInfoTotalExcel">
+        SELECT sub_info.subject_id as subjectId,
+               sub_info.sub_name as subName,
+               sub_info.amt_total as amtTotal,
+               sub_info.indus_kind as indusKind
+               from sub_info
+        WHERE sub_info.logic_delete_flag = 0
+            <if test="status != null and status != ''">
+                and sub_info.status = #{status}
+            </if>
+
+    </select>
 
     <select id="exportFixDetailExcel" resultType="com.rtrh.projects.modules.projects.vo.export.SubInfoFixDetail">
         SELECT sub_info.id as id,

projects-service/src/main/java/com/rtrh/projects/modules/projects/service/SubInfoQueryService.java

@@ -7,6 +7,7 @@ import java.util.Map;
 import com.github.pagehelper.PageInfo;
 import com.rtrh.core.repository.Page;
 import com.rtrh.projects.modules.projects.dto.SubFixCbSearch;
+import com.rtrh.projects.modules.projects.po.SubInfoGxj;
 import com.rtrh.projects.modules.projects.vo.*;
 import com.rtrh.projects.modules.projects.vo.export.ExportQueryVO;
 import com.rtrh.projects.modules.projects.vo.export.SubInfoExportVO;
@@ -329,6 +330,8 @@ public interface SubInfoQueryService {
 
 	Page subFixCbAll(SubFixCbSearch subFixCbSearch);
 
+	List<SubInfoGxj> queryAll(LoginUserVO loginUser, SubInfoQueryTzVO queryVO);
+
 	Page queryPage(Page page, LoginUserVO loginUser, SubInfoQueryTzVO queryVO);
 
 	StatisticsVO queryStatistics(SubInfoQueryTzVO queryVO, LoginUserVO loginUser);

projects-service/src/main/java/com/rtrh/projects/modules/projects/service/SubInfoService.java

@@ -412,4 +412,6 @@ public interface SubInfoService {
 	List<SubInfoTotalExcel> getFixTotalExcel(SubInfoQueryTzVO vo);
 
     List<SubInfoFixDetail> exportFixDetailExcel(SubInfoQueryTzVO vo);
+
+	List<SubInfoTotalExcel> exportTotalExcelByStatus(SubInfoQueryTzVO vo);
 }

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

@@ -8,7 +8,6 @@ import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -19,7 +18,6 @@ import com.rtrh.projects.modules.projects.dto.SubFixCbSearch;
 import com.rtrh.projects.modules.projects.enums.RptContKindEnum;
 import com.rtrh.projects.modules.projects.po.*;
 import com.rtrh.projects.modules.projects.service.SubPreNewService;
-import com.rtrh.projects.modules.projects.service.SubRptContService;
 import com.rtrh.projects.modules.projects.vo.*;
 import com.rtrh.projects.modules.projects.vo.export.SubInfoFixVO;
 import com.rtrh.projects.modules.system.dao.JUnitDao;
@@ -27,14 +25,12 @@ import com.rtrh.projects.modules.system.enums.SysTableKind;
 import com.rtrh.projects.modules.system.po.JUnit;
 import com.rtrh.projects.modules.system.po.TSystable;
 import com.rtrh.projects.modules.system.service.TSysTableService;
-import com.rtrh.projects.modules.system.vo.PersonInfoVO;
 import com.rtrh.projects.modules.utils.DateUtils;
 import com.rtrh.projects.vo.statics.OtherQueryVO;
 import com.rtrh.projects.vo.statics.ProjectQueryVO;
 import org.apache.commons.lang3.StringUtils;
 import org.hibernate.Query;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
 import org.springframework.stereotype.Service;
 
 import com.google.common.base.CaseFormat;
@@ -164,6 +160,47 @@ public class SubInfoQueryServiceImpl implements SubInfoQueryService {
         return page;
     }
 
+    @Override
+    public List<SubInfoGxj> queryAll(LoginUserVO loginUser, SubInfoQueryTzVO queryVO) {
+        List<SubInfoGxj> data = subInfoMapper.queryPage(queryVO);
+        List<TSystable> byKind = tSysTableService.getByKind(SysTableKind.JSDD);
+        if (CollectionUtil.isNotEmpty(data)) {
+            for (SubInfoGxj e : data) {
+                // 查询月报中的建设进度
+                if (!Lists.newArrayList("1", "2").contains(e.getStatus())) {
+                    String hql = "FROM RptCont WHERE logicDeleteFlag = 0 AND subId = :subId AND kind = :kind AND content IS NOT NULL ORDER BY kjMonth DESC";
+                    Query query = rptContDao.createQuery(hql);
+                    query.setParameter("subId", e.getSubId());
+                    query.setParameter("kind", RptContKindEnum.MONTH.getCode());
+                    query.setMaxResults(1);
+                    Object result = query.uniqueResult();
+                    Optional.ofNullable(result).map(o -> (RptCont) o).ifPresent(o -> e.setProgress(o.getContent()));
+                }
+
+                byKind.stream()
+                        .filter(k -> e.getSubjectId().equals(k.getCode()))
+                        .findFirst()
+                        .ifPresent(k -> e.setSubjectName(k.getTitle()));
+                if ("2".equals(e.getStatus())) {
+                    // 新建库查询前期手续
+                    List<SubPreNewResultVO> preList = subPreNewService.listBySubId(e.getSubId());
+                    Map<String, Long> numMap = preList.stream().collect(Collectors.groupingBy(SubPreNewResultVO::getStatusConf, Collectors.counting()));
+                    e.setPreProceNum(numMap.getOrDefault("1", 0L) + "");
+                    e.setPreEndNum(numMap.getOrDefault("2", 0L) + "");
+                }
+                // 在建项目年度投资
+                if ("3".equals(e.getStatus())) {
+                    Object o = rptContDao.queryForObjectBySql("SELECT sum(src.amt) AS yearAmtSj FROM sub_rpt_cont src WHERE src.logic_delete_flag = 0 AND src.kj_month >= ? AND src.sub_id=? GROUP BY src.sub_id", DateUtil.thisYear() + "01", e.getSubId());
+                    if (o != null) {
+                        Object o1 = ((Map<String, Object>) o).get("yearAmtSj");
+                        e.setYearAmtSj(o1 != null ? o1.toString() : "");
+                    }
+                }
+            }
+        }
+        return data;
+    }
+
     @Override
     public Page queryPage(Page page, LoginUserVO loginUser, SubInfoQueryTzVO queryVO) {
         if (StringUtils.isBlank(queryVO.getAbc())) {
@@ -178,8 +215,7 @@ public class SubInfoQueryServiceImpl implements SubInfoQueryService {
         }
 
         List<SubInfoGxj> data = subInfoMapper.queryPage(queryVO);
-        PageInfo<SubInfoGxj> pageInfo = new PageInfo<>(data);
-        page.setList(data);
+
 
         List<TSystable> byKind = tSysTableService.getByKind(SysTableKind.JSDD);
         if (CollectionUtil.isNotEmpty(data)) {
@@ -216,6 +252,8 @@ public class SubInfoQueryServiceImpl implements SubInfoQueryService {
                 }
             }
         }
+        PageInfo<SubInfoGxj> pageInfo = new PageInfo<>(data);
+        page.setList(data);
         page.setTotalCount(pageInfo.getTotal());
         return page;
     }

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

@@ -4817,6 +4817,11 @@ public class SubInfoServiceImpl implements SubInfoService {
         return dataList;
     }
 
+    @Override
+    public List<SubInfoTotalExcel> exportTotalExcelByStatus(SubInfoQueryTzVO vo) {
+        return subInfoMapper.exportTotalExcelByStatus(vo.getStatus());
+    }
+
     @Override
     public boolean moveDb(MoveDbParamVo vo) {
         SubInfo subinfo = subInfoDao.findById(vo.getId());

projects-service/src/main/java/com/rtrh/projects/modules/projects/vo/export/SubInfoCbVO.java

@@ -0,0 +1,29 @@
+package com.rtrh.projects.modules.projects.vo.export;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class SubInfoCbVO {
+
+    @Excel(name = "项目名称")
+    private String subName;
+
+    @Excel(name = "项目所在地")
+    private String subjectName;
+
+    @Excel(name = "项目建设内容")
+    private String content;
+
+    @Excel(name = "计划总投资(亿元)")
+    private BigDecimal amtTotal;
+
+    @Excel(name = "进展情况")
+    private String progress;
+
+    @Excel(name = "备注")
+    private String remark;
+}

projects-service/src/main/java/com/rtrh/projects/modules/projects/vo/export/SubInfoTcVO.java

@@ -0,0 +1,34 @@
+package com.rtrh.projects.modules.projects.vo.export;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class SubInfoTcVO {
+
+    @Excel(name = "项目名称")
+    private String subName;
+
+    @Excel(name = "项目所在地")
+    private String subjectName;
+
+    @Excel(name = "项目建设内容")
+    private String content;
+
+    @Excel(name = "计划总投资（亿元）")
+    private Float amtTotal;
+
+    @Excel(name = "预计开工时间")
+    @JsonFormat(pattern="yyyy-MM-dd",timezone="GMT+8")
+    private Date beginDate;
+
+    @Excel(name = "前期手续办理情况")
+    private String preContent;
+
+    @Excel(name = "备注")
+    private String remark;
+}

projects-service/src/main/java/com/rtrh/projects/modules/projects/vo/export/SubInfoXjVO.java

@@ -0,0 +1,34 @@
+package com.rtrh.projects.modules.projects.vo.export;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class SubInfoXjVO {
+
+    @Excel(name = "项目名称")
+    private String subName;
+
+    @Excel(name = "项目所在地")
+    private String subjectName;
+
+    @Excel(name = "项目建设内容")
+    private String content;
+
+    @Excel(name = "计划总投资（亿元）")
+    private Float amtTotal;
+
+    @Excel(name = "预计开工时间")
+    @JsonFormat(pattern="yyyy-MM-dd",timezone="GMT+8")
+    private Date beginDate;
+
+    @Excel(name = "前期手续办理情况")
+    private String preContent;
+
+    @Excel(name = "备注")
+    private String remark;
+}

projects-service/src/main/java/com/rtrh/projects/modules/projects/vo/export/SubInfoZjVO.java

@@ -0,0 +1,36 @@
+package com.rtrh.projects.modules.projects.vo.export;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class SubInfoZjVO {
+    @Excel(name = "项目名称")
+    private String subName;
+
+    @Excel(name = "项目所在地")
+    private String subjectName;
+
+    @Excel(name = "项目建设内容")
+    private String content;
+
+    @Excel(name = "计划总投资（亿元）")
+    private Float amtTotal;
+
+    @Excel(name = "建成投产时间")
+    @JsonFormat(pattern="yyyy-MM-dd",timezone="GMT+8")
+    private Date endDate;
+
+    @Excel(name = "年度投资")
+    private String yearAmtSj;
+
+    @Excel(name = "进展情况")
+    private String progress;
+
+    @Excel(name = "备注")
+    private String remark;
+}

projects-service/src/main/java/com/rtrh/projects/modules/projects/vo/export/SubInfoZkVO.java

@@ -0,0 +1,41 @@
+package com.rtrh.projects.modules.projects.vo.export;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class SubInfoZkVO {
+
+    @Excel(name = "项目名称")
+    private String subName;
+
+    @Excel(name = "项目所在地")
+    private String subjectName;
+
+    @Excel(name = "项目建设内容")
+    private String content;
+
+    @Excel(name = "计划总投资（亿元）")
+    private Float amtTotal;
+
+    @Excel(name = "状态")
+    private String statusName;
+
+    @Excel(name = "计划开工时间")
+    @JsonFormat(pattern="yyyy-MM-dd",timezone="GMT+8")
+    private Date beginDate;
+
+    @Excel(name = "计划完工时间")
+    @JsonFormat(pattern="yyyy-MM-dd",timezone="GMT+8")
+    private Date endDate;
+
+    @Excel(name = "前期手续办理情况")
+    private String preContent;
+
+    @Excel(name = "备注")
+    private String remark;
+}

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

@@ -1,6 +1,7 @@
 package com.rtrh.projects.web.controller.subject;
 
 import java.io.IOException;
+import java.io.OutputStream;
 import java.math.BigDecimal;
 import java.net.URLEncoder;
 import java.text.SimpleDateFormat;
@@ -11,6 +12,7 @@ import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 
 import cn.afterturn.easypoi.excel.ExcelExportUtil;
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.poi.excel.ExcelUtil;
@@ -27,6 +29,7 @@ import com.rtrh.common.util.StringUtil;
 import com.rtrh.core.vo.ListMessage;
 import com.rtrh.projects.modules.projects.dao.SubSourceDao;
 import com.rtrh.projects.modules.projects.enums.ProjectStatusEnum;
+import com.rtrh.projects.modules.projects.po.SubInfoGxj;
 import com.rtrh.projects.modules.projects.vo.SubInfoTotalExcel;
 import com.rtrh.projects.modules.projects.vo.export.*;
 import com.rtrh.projects.modules.utils.CustomCellWriteWidthStrategy;
@@ -617,7 +620,7 @@ public class SubInfoExportController extends BaseController {
     }
 
     /**
-     * 导出重点项目汇总表
+     * 导出总表
      * @param response
      * @param vo
      */

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

@@ -103,9 +103,9 @@
                 储备项目库
             </div>
             <div class="layui-btn-container" style="margin-top: 20px;margin-left: 20px">
-                <button type="button" class="layui-btn">导出明细</button>
-                <button type="button" class="layui-btn">导出总表</button>
-                <button type="button" class="layui-btn">自定义导出</button>
+                <button type="button" class="layui-btn" @click="exportDetailExcel">导出明细</button>
+                <button type="button" class="layui-btn" @click="exportTotalExcel">导出总表</button>
+                <button type="button" class="layui-btn" @click="exportMoreExcel">自定义导出</button>
             </div>
             <div class="layui-collapse">
                 <div class="layui-colla-item">
@@ -1005,6 +1005,16 @@
                 var param = this.getSearchParams();
                 App.common.utils.downFile(App.getUrl("subInfoExport/exportSumExcel"), "POST", param, "项目情况表.xlsx", "导出失败");
             },
+            exportTotalExcel: function () {
+                var param = this.getSearchParams();
+                param.status = '1'
+                App.common.utils.downFile(App.getUrl("subInfoExport/exportTotalExcelByStatus"), "POST", param, "项目情况表(按所属行业统计).xlsx", "导出失败");
+            },
+            exportDetailExcel: function () {
+                var param = this.getSearchParams();
+                param.status = '1'
+                App.common.utils.downFile(App.getUrl("subInfoExport/exportDetailExcel"), "POST", param, "项目情况表(按所属行业统计).xlsx", "导出失败");
+            },
             exportExcelByIndusKind: function () {
                 var param = this.getSearchParams();
                 App.common.utils.downFile(App.getUrl("subInfoExport/exportExcelByIndusKind"), "POST", param, "项目情况表(按所属行业统计).xlsx", "导出失败");
@@ -1105,11 +1115,9 @@
             },
             openExport: function () {
                 this.showExport = true;
-                console.log('移入了')
             },
             choseExport: function () {
                 this.showExport = false;
-                console.log('移出了')
             }
         }
     });

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

@@ -77,9 +77,9 @@
         <div class="right_title">
             <div class="txt" style="width: 100%; font-size: 35px; font-family: '方正小标宋', '仿宋', sans-serif; text-align: center;font-weight: bold;">投产项目库</div>
      <div class="layui-btn-container" style="margin-top: 20px;margin-left: 20px">
-         <button type="button" class="layui-btn">导出明细</button>
-         <button type="button" class="layui-btn">导出总表</button>
-         <button type="button" class="layui-btn">自定义导出</button>
+         <button type="button" class="layui-btn" @click="exportDetailExcel">导出明细</button>
+         <button type="button" class="layui-btn" @click="exportTotalExcel">导出总表</button>
+         <button type="button" class="layui-btn" @click="exportMoreExcel">自定义导出</button>
      </div>
             <div class="layui-collapse">
                 <div class="layui-colla-item">
@@ -1244,6 +1244,16 @@
                     }
                 })
             },
+            exportTotalExcel: function () {
+                var param = this.getSearchParams();
+                param.status = '9'
+                App.common.utils.downFile(App.getUrl("subInfoExport/exportTotalExcelByStatus"), "POST", param, "项目情况表(按所属行业统计).xlsx", "导出失败");
+            },
+            exportDetailExcel: function () {
+                var param = this.getSearchParams();
+                param.status = '9'
+                App.common.utils.downFile(App.getUrl("subInfoExport/exportDetailExcel"), "POST", param, "项目情况表(按所属行业统计).xlsx", "导出失败");
+            },
             exportExcel: function () {
                 var param = this.getSearchParams();
                 App.common.utils.downFile(App.getUrl("subInfoExport/exportSummaryExcel"), "POST", param, "项目情况表.xlsx", "导出失败");

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

@@ -81,9 +81,9 @@
             <%--        <span class="txt" style="width: 100%;text-align: center">在建项目库</span>--%>
             <div class="txt" style="width: 100%; font-size: 35px; font-family: '方正小标宋', '仿宋', sans-serif; text-align: center;font-weight: bold;">在建项目库</div>
                 <div class="layui-btn-container" style="margin-top: 20px;margin-left: 20px">
-                    <button type="button" class="layui-btn">导出明细</button>
-                    <button type="button" class="layui-btn">导出总表</button>
-                    <button type="button" class="layui-btn">自定义导出</button>
+                    <button type="button" class="layui-btn" @click="exportDetailExcel">导出明细</button>
+                    <button type="button" class="layui-btn" @click="exportTotalExcel">导出总表</button>
+                    <button type="button" class="layui-btn" @click="exportMoreExcel">自定义导出</button>
                 </div>
             <div class="layui-collapse">
                 <div class="layui-colla-item">
@@ -1268,6 +1268,16 @@
                     }
                 })
             },
+            exportTotalExcel: function () {
+                var param = this.getSearchParams();
+                param.status = '3'
+                App.common.utils.downFile(App.getUrl("subInfoExport/exportTotalExcelByStatus"), "POST", param, "项目情况表(按所属行业统计).xlsx", "导出失败");
+            },
+            exportDetailExcel: function () {
+                var param = this.getSearchParams();
+                param.status = '3'
+                App.common.utils.downFile(App.getUrl("subInfoExport/exportDetailExcel"), "POST", param, "项目情况表(按所属行业统计).xlsx", "导出失败");
+            },
             exportExcel: function () {
                 var param = this.getSearchParams();
                 App.common.utils.downFile(App.getUrl("subInfoExport/exportSummaryExcel"), "POST", param, "项目情况表.xlsx", "导出失败");

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

@@ -100,9 +100,9 @@
         <div class="right_title">
             <div class="txt" style="width: 100%; font-size: 35px; font-family: '方正小标宋', '仿宋', sans-serif; text-align: center;font-weight: bold;">新建项目库</div>
             <div class="layui-btn-container" style="margin-top: 20px;margin-left: 20px">
-                <button type="button" class="layui-btn">导出明细</button>
-                <button type="button" class="layui-btn">导出总表</button>
-                <button type="button" class="layui-btn">自定义导出</button>
+                <button type="button" class="layui-btn" @click="exportDetailExcel">导出明细</button>
+                <button type="button" class="layui-btn" @click="exportTotalExcel">导出总表</button>
+                <button type="button" class="layui-btn" @click="exportMoreExcel">自定义导出</button>
             </div>
             <div class="layui-collapse">
                 <div class="layui-colla-item">
@@ -1223,6 +1223,16 @@
                     }
                 })
             },
+            exportTotalExcel: function () {
+                var param = this.getSearchParams();
+                param.status = '2'
+                App.common.utils.downFile(App.getUrl("subInfoExport/exportTotalExcelByStatus"), "POST", param, "项目情况表(按所属行业统计).xlsx", "导出失败");
+            },
+            exportDetailExcel: function () {
+                var param = this.getSearchParams();
+                param.status = '2'
+                App.common.utils.downFile(App.getUrl("subInfoExport/exportDetailExcel"), "POST", param, "项目情况表(按所属行业统计).xlsx", "导出失败");
+            },
             exportExcel: function () {
                 var param = this.getSearchParams();
                 App.common.utils.downFile(App.getUrl("subInfoExport/exportSummaryExcel"), "POST", param, "项目情况表.xlsx", "导出失败");