Merge remote-tracking branch 'origin/master'

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/program/configuration/projectList/controller/ProjectListController.java

@@ -195,14 +195,13 @@ public class ProjectListController {
     /**
      * 导出
      *
-     * @param info
      * @param response
      * @throws Exception
      */
     @GetMapping("/exportFile")
     @ApiOperation(value = "导出")
-    public void exportFileUploadList(ProgramProjectListInfo info, HttpServletResponse response) throws Exception {
-        List<ExportFileDto> infos = projectListService.exportList(info);
+    public void exportFileUploadList(HttpServletResponse response) {
+        List<ExportFileDto> infos = projectListService.exportList();
         EasyPoiUtil.exportExcel(infos, "项目登记列表信息",  "项目登记列表信息", ExportFileDto.class, "", response );
     }
 

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/program/configuration/projectList/mapper/ProjectListMapper.java

@@ -22,7 +22,7 @@ public interface ProjectListMapper extends BaseMapper<ProgramProjectListInfo> {
     IPage<ProgramProjectListInfo> findPageList(Page<ProgramProjectListInfo> page, @Param(Constants.WRAPPER) QueryWrapper<ProgramProjectListInfo> wrapper);
 
 
-    List<ExportFileDto> findList(@Param(Constants.WRAPPER) QueryWrapper<ProgramProjectListInfo> wrapper);
+    List<ExportFileDto> findList();
 
     IPage<ProgramProjectListInfo> findPage(Page<ProgramProjectListInfo> page, @Param(Constants.WRAPPER) QueryWrapper<ProgramProjectListInfo> wrapper);
 

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/program/configuration/projectList/mapper/xml/ProjectListMapper.xml

@@ -236,18 +236,46 @@
 
     <select id="findList" resultType="com.jeeplus.test.program.configuration.projectList.service.dto.ExportFileDto">
         SELECT
-           (DATE_FORMAT(a.create_date,'%Y-%m-%d')) AS create_date,
-           a.contract_name,
-           a.client_name,
-           a.name,
-           a.no,
-           a.project_manager_name,
-           a.status
+            (@i:=@i+1) AS `no`,
+            tab.*
         FROM
-            program_project_list_info a
-            LEFT JOIN sys_user b ON a.create_by = b.id
-            ${ew.customSqlSegment}
-            ORDER BY a.update_date DESC
+            (SELECT
+                b.`year`,
+                d.`name` AS client_name,
+                a.`name`,
+                a.assessment_objective,
+                b.program_type,
+                DATE_FORMAT(a.assessment_date,"%y-%m-%d") AS assessment_date,
+                DATE_FORMAT(b.evaluation_report_date,"%y-%m-%d") AS evaluation_report_date,
+                b.protocol_num,
+                e.report_no,
+                f.`name` AS project_manager_name,
+                g.`name` AS signature_evaluator_first,
+                h.`name` AS signature_evaluator_second,
+                b.wayst_evaluation,
+                b.fixed_assets_evaluation,
+                b.net_assets_evaluation,
+                b.rent_evaluation,
+                b.forensics,
+                b.report_charges,
+                b.current_dispose_person,
+                b.is_invoice,
+                b.invoice_date,
+                b.is_contract_archive,
+                b.is_papers_intact,
+                b.is_papers_archive
+            FROM
+                program_project_list_info a
+                LEFT JOIN program_archive b ON a.id = b.program_id
+                LEFT JOIN work_contract_info c ON a.contract_id = c.id
+                LEFT JOIN work_client_info d ON c.client_id = d.id
+                LEFT JOIN program_report_no e ON a.id = e.program_id
+                LEFT JOIN sys_user f ON a.project_manager = f.id
+                LEFT JOIN sys_user g ON b.signature_evaluator_first = g.id
+                LEFT JOIN sys_user h ON b.signature_evaluator_second = h.id
+            WHERE a.del_flag = 0
+            ORDER BY a.update_date DESC) AS tab
+            ,(SELECT @i:=0) AS itable
     </select>
 
     <resultMap id="BaseResultMap" type="com.jeeplus.test.program.configuration.projectList.domain.ProgramProjectListInfo">

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/program/configuration/projectList/service/ProjectListService.java

@@ -394,36 +394,8 @@ public class ProjectListService {
         return pageList;
     }
 
-    public List<ExportFileDto> exportList(ProgramProjectListInfo info) throws Exception{
-        QueryWrapper<ProgramProjectListInfo> wrapper = QueryWrapperGenerator.buildQueryCondition(info, ProgramProjectListInfo.class);
-        wrapper.eq("a.del_flag", "0");
-        if (info.getCreateDates() != null) {
-            wrapper.between("a.create_date", info.getCreateDates()[0], info.getCreateDates()[1]);
-        }
-        List<ExportFileDto> list = projectListMapper.findList(wrapper);
-        // 状态值处理
-        if (CollectionUtils.isNotEmpty(list)) {
-            for(ExportFileDto i : list) {
-                if ("0".equals(i.getStatus())) {
-                    i.setStatus("未登记");
-                }
-                if ("1".equals(i.getStatus())) {
-                    i.setStatus("暂存");
-                }
-                if ("2".equals(i.getStatus())) {
-                    i.setStatus("登记中");
-                }
-                if ("3".equals(i.getStatus())) {
-                    i.setStatus("撤回");
-                }
-                if ("4".equals(i.getStatus())) {
-                    i.setStatus("驳回");
-                }
-                if ("5".equals(i.getStatus())) {
-                    i.setStatus("登记完成");
-                }
-            }
-        }
+    public List<ExportFileDto> exportList(){
+        List<ExportFileDto> list = projectListMapper.findList();
         return list;
     }
 

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/program/configuration/projectList/service/dto/ExportFileDto.java

@@ -7,39 +7,153 @@ import lombok.Data;
 public class ExportFileDto {
 
     /**
-     * 创建日期
+     * 序号(自动生成)
      */
-    @Excel(name = "创建时间", width = 30, orderNum = "6")
-    private String createDate;
+    @Excel(name = "序号", width = 10, orderNum = "1")
+    private Integer no;
 
     /**
-     * 合同名称
+     * 年份(归档表)
      */
-    @Excel(name = "合同名称", width = 30, orderNum = "3")
-    private String contractName;
+    @Excel(name = "年份", width = 10, orderNum = "2")
+    private String year;
 
-    @Excel(name = "委托方", width = 30, orderNum = "5")
+    /**
+     * 客户名称(关联查询)
+     */
+    @Excel(name = "客户名称", width = 30, orderNum = "3")
     private String clientName;
 
     /**
-     * 项目名称
+     * 项目名称(项目表)
      */
-    @Excel(name = "项目名称", width = 30, orderNum = "1")
+    @Excel(name = "项目名称", width = 30, orderNum = "4")
     private String name;
 
     /**
-     * 项目编号
+     * 评估目的(项目表)
+     */
+    @Excel(name = "评估目的", width = 30, orderNum = "5")
+    private String assessmentObjective;
+
+    /**
+     * 项目类型(归档表)
+     */
+    @Excel(name = "项目类型", width = 20, orderNum = "6")
+    private String programType;
+
+    /**
+     * 评估基准日(项目表)
      */
-    @Excel(name = "项目编号", width = 20, orderNum = "2")
-    private String no;
+    @Excel(name = "评估基准日", width = 20, orderNum = "7")
+    private String assessmentDate;
 
-    @Excel(name = "项目经理", width = 20, orderNum = "4")
+    /**
+     * 评估报告日(归档表)
+     */
+    @Excel(name = "评估报告日", width = 20, orderNum = "8")
+    private String evaluationReportDate;
+
+    /**
+     * 协议号(归档表)
+     */
+    @Excel(name = "协议号", width = 20, orderNum = "9")
+    private String protocolNum;
+
+    /**
+     * 文号(报告号表)
+     */
+    @Excel(name = "文号", width = 20, orderNum = "10")
+    private String reportNo;
+
+    /**
+     * 项目负责人(项目表)
+     */
+    @Excel(name = "项目负责人", width = 20, orderNum = "11")
     private String projectManagerName;
 
     /**
-     * 状态
+     * 签字评估师1(归档表)
+     */
+    @Excel(name = "签字评估师1", width = 20, orderNum = "12")
+    private String signatureEvaluatorFirst;
+
+    /**
+     * 签字评估师2(归档表)
+     */
+    @Excel(name = "签字评估师2", width = 20, orderNum = "13")
+    private String signatureEvaluatorSecond;
+
+    /**
+     * 废旧物资评估（万元）(归档表)
+     */
+    @Excel(name = "废旧物资评估（万元）", width = 20, orderNum = "14")
+    private String waystEvaluation;
+
+    /**
+     * 固定资产评估（万元）(归档表)
+     */
+    @Excel(name = "固定资产评估（万元）", width = 20, orderNum = "15")
+    private String fixedAssetsEvaluation;
+
+    /**
+     * 净资产评估(归档表)
+     */
+    @Excel(name = "净资产评估", width = 20, orderNum = "16")
+    private String netAssetsEvaluation;
+
+    /**
+     * 租金评估（万/年）(归档表)
+     */
+    @Excel(name = "租金评估（万/年）", width = 20, orderNum = "17")
+    private String rentEvaluation;
+
+    /**
+     * 司法鉴定(归档表)
+     */
+    @Excel(name = "司法鉴定", width = 20, orderNum = "18")
+    private String forensics;
+
+    /**
+     * 报告收费（元）(归档表)
+     */
+    @Excel(name = "报告收费（元）", width = 20, orderNum = "19")
+    private String reportCharges;
+
+    /**
+     * 当前处理人(归档表)
+     */
+    @Excel(name = "当前处理人", width = 20, orderNum = "20")
+    private String currentDisposePerson;
+
+    /**
+     * 是否开票(归档表)
+     */
+    @Excel(name = "是否开票", width = 20, orderNum = "21")
+    private String isInvoice;
+
+    /**
+     * 开票日期(归档表)
+     */
+    @Excel(name = "开票日期", width = 20, orderNum = "22")
+    private String invoiceDate;
+
+    /**
+     * 合同是否存档(归档表)
+     */
+    @Excel(name = "合同是否存档", width = 20, orderNum = "23")
+    private String isContractArchive;
+
+    /**
+     * 底稿是否完好(归档表)
+     */
+    @Excel(name = "底稿是否完好", width = 20, orderNum = "24")
+    private String isPapersIntact;
+
+    /**
+     * 底稿是否归档(归档表)
      */
-    @Excel(name = "状态", width = 20, orderNum = "7")
-    private String status;
+    @Excel(name = "底稿是否归档", width = 20, orderNum = "25")
+    private String isPapersArchive;
 
 }