下载功能开发

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/invoice/controller/CwFinanceInvoiceController.java

@@ -5,13 +5,20 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jeeplus.aop.demo.annotation.DemoMode;
 import com.jeeplus.aop.logging.annotation.ApiLog;
 import com.jeeplus.common.utils.ResponseUtil;
+import com.jeeplus.core.excel.ExcelOptions;
+import com.jeeplus.core.excel.ExportMode;
 import com.jeeplus.core.excel.utils.EasyPoiUtil;
 import com.jeeplus.sys.constant.enums.LogTypeEnum;
+import com.jeeplus.sys.utils.DictUtils;
 import com.jeeplus.sys.utils.StringUtils;
 import com.jeeplus.test.cw.invoice.service.CwFinanceInvoiceService;
 import com.jeeplus.test.cw.invoice.service.dto.CwFinanceDTO;
 import com.jeeplus.test.cw.invoice.service.dto.CwFinanceInvoiceDTO;
 import com.jeeplus.test.cw.invoice.service.dto.CwFinanceInvoiceDetailDTO;
+import com.jeeplus.test.cw.projectRecords.service.dto.CwProjectRecordsDTO;
+import com.jeeplus.test.cw.reimbursementApproval.approvalInfo.service.dto.QueryListDto;
+import com.jeeplus.test.cw.reimbursementApproval.approvalInfo.service.dto.RetureListDto;
+import com.jeeplus.test.zs.zsReimbursement.approvalInfo.service.dto.ZsRetureListDto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.http.ResponseEntity;
@@ -30,6 +37,7 @@ import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import static com.jeeplus.test.jobPosion.utils.BeanUtils.objectCheckIsNull;
 
@@ -293,4 +301,26 @@ public class CwFinanceInvoiceController {
         return ResponseEntity.ok(cwFinanceDTO);
     }
 
+    @ApiLog(value = "导出发票数据", type = LogTypeEnum.EXPORT)
+    @GetMapping("export")
+    @PreAuthorize ("hasAuthority('cwProjectRecords:export')")
+    @ApiOperation(value = "导出发票数据")
+    public void exportFile(CwFinanceInvoiceDTO cwFinanceInvoiceDTO, Page <CwFinanceInvoiceDTO> page, ExcelOptions options, HttpServletResponse response) throws Exception {
+        String fileName = options.getFilename();
+        String sheetName = options.getSheetName();
+        List<CwFinanceInvoiceDTO> result = new ArrayList<>();
+        if ( ExportMode.current.equals ( options.getMode() ) ) {
+            result = cwFinanceInvoiceService.findList (page,cwFinanceInvoiceDTO).getRecords();
+        } else if (ExportMode.selected.equals ( options.getMode() )) {
+            result = cwFinanceInvoiceService.findList (page,cwFinanceInvoiceDTO).getRecords().stream ( ).filter ( item ->
+                    options.getSelectIds ( ).contains ( item.getId ( ) )
+            ).collect ( Collectors.toList ( ) );
+        } else {
+            page.setSize (-1);
+            page.setCurrent (0);
+            result = cwFinanceInvoiceService.findList (page,cwFinanceInvoiceDTO).getRecords();
+        }
+        EasyPoiUtil.exportExcel ( result, sheetName,  sheetName, CwFinanceInvoiceDTO.class, fileName, response );
+
+    }
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/invoice/mapper/xml/CwFinanceInvoiceMapper.xml

@@ -224,8 +224,18 @@
         DISTINCT
         <include refid="Base_Column_List"></include>,
         su.name as operator,
-        so.name as operator_office
+        so.name as operator_office,
+        (select
+        CASE
+        WHEN RIGHT( GROUP_CONCAT(case when program_id is null then 2 else 1 end),1) =2 THEN GROUP_CONCAT(concat('其他：',wipr1.program_name))
+        WHEN RIGHT( GROUP_CONCAT(case when program_id is null then 2 else 1 end),1) =1 THEN GROUP_CONCAT(rpr1.project_name)
+        ELSE '' END
+        FROM cw_finance_invoice_base wipr1
+        LEFT JOIN cw_project_records rpr1 ON wipr1.program_id = rpr1.id
+        WHERE wipr1.invoice_id = fi.id) as programName,
+        cfid.number as "number"
         from cw_finance_invoice fi
+        left join cw_finance_invoice_detail cfid on cfid.invoice_id = fi.id
         left join sys_user su on fi.create_by = su.id and su.del_flag = '0'
         left join sys_user_manage_office sumo on sumo.office_id = su.office_id
         left join sys_office so on su.office_id = so.id and so.del_flag = '0'

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/invoice/service/dto/CwFinanceInvoiceDTO.java

@@ -1,5 +1,6 @@
 package com.jeeplus.test.cw.invoice.service.dto;
 
+import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jeeplus.core.service.dto.BaseDTO;
 import com.jeeplus.test.workContract.service.dto.WorkAttachmentDto;
@@ -20,30 +21,99 @@ public class CwFinanceInvoiceDTO extends BaseDTO {
 
     public static final String BIZ_CODE = "4";
 
+
     /**
-     * 备注信息
+     * 发票申请编号
      */
-    private String remarks;
+    @Excel(name = "开票申请编号",width = 16)
+    private String no;
+
+    /**
+     * 项目名称
+     */
+    @Excel(name = "项目名称",width = 25)
+    private String programName;
+
+    /**
+     * 实际开票单位
+     */
+    @Excel(name = "实际开票单位",width = 25)
+    private String billingWorkplaceReal;
+
+    /**
+     * 经办人
+     */
+    @Excel(name = "经办人",width = 16)
+    private String operator;
+
+    /**
+     * 经办人部门
+     */
+    @Excel(name = "经办人部门",width = 16)
+    private String operatorOffice;
+
+    /**
+     * 发票号
+     */
+    @Excel(name = "发票号",width = 16)
+    private String number;
+
+    /**
+     * 发票金额(元)
+     */
+    @Excel(name = "发票金额（元）",width = 16,type = 10)
+    private String account;
+
+    /**
+     * 开票内容
+     */
+    @Excel(name = "开票内容",width = 30,dict = "invoice_billing_content")
+    private String billingContent;
 
     /**
      * 发票类型
      */
+    @Excel(name = "发票类型",width = 20,dict = "invoice_type")
     private String type;
 
     /**
-     * 发票申请编号
+     * 开票时间
      */
-    private String no;
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @Excel(name = "开票日期",width = 20,exportFormat = "yyyy-MM-dd")
+    private Date billingDate;
 
     /**
-     * 开票类型
+     * 状态
      */
-    private String billingType;
+    @Excel(name = "开票状态",width = 20,dict = "invoice_status")
+    private String status;
 
     /**
-     * 实际开票单位
+     * 收款日期
      */
-    private String billingWorkplaceReal;
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @Excel(name = "收款日期",width = 20,exportFormat = "yyyy-MM-dd")
+    private Date receivablesDate;
+
+    /**
+     * 是否确认收款
+     */
+    @Excel(name = "是否确认收款",width = 14, replace = {"是_1", "否_0"})
+    private String receivablesStatus;
+
+    /**
+     * 备注信息
+     */
+    private String remarks;
+
+    /**
+     * 开票类型
+     */
+    private String billingType;
+
 
     /**
      * 纳税人识别号
@@ -81,16 +151,6 @@ public class CwFinanceInvoiceDTO extends BaseDTO {
     private String receivablesType;
 
     /**
-     * 开票内容
-     */
-    private String billingContent;
-
-    /**
-     * 发票金额(元)
-     */
-    private String account;
-
-    /**
      * 开票内容要求
      */
     private String billingContentTerms;
@@ -100,12 +160,6 @@ public class CwFinanceInvoiceDTO extends BaseDTO {
      */
     private String billingPeople;
 
-    /**
-     * 开票时间
-     */
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    private Date billingDate;
 
     /**
      * 领票时间
@@ -145,11 +199,6 @@ public class CwFinanceInvoiceDTO extends BaseDTO {
     private String billingPeopleId;
 
     /**
-     * 状态
-     */
-    private String status;
-
-    /**
      * 流程id
      */
     private String procInsId;
@@ -160,23 +209,11 @@ public class CwFinanceInvoiceDTO extends BaseDTO {
     private String processDefinitionId;
 
     /**
-     * 是否确认收款
-     */
-    private String receivablesStatus;
-
-    /**
      * 是否作废
      */
     private String invalidStatus;
 
     /**
-     * 收款日期
-     */
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    private Date receivablesDate;
-
-    /**
      * 基础项目信息
      */
     private List<CwProjectRecordsDTO> projectRecordsDTOList;
@@ -207,11 +244,6 @@ public class CwFinanceInvoiceDTO extends BaseDTO {
     private CwFinanceInvoiceInvalidDTO financeInvoiceInvalidDTO;
 
     /**
-     * 发票号
-     */
-    private String number;
-
-    /**
      * 开票总金额 Begin
      */
     private String accountBegin;
@@ -242,24 +274,9 @@ public class CwFinanceInvoiceDTO extends BaseDTO {
     private String remittanceDateEnd;
 
     /**
-     * 项目名称
-     */
-    private String programName;
-
-    /**
      * 项目id
      */
     private String programId;
 
-    /**
-     * 经办人
-     */
-    private String operator;
-
-    /**
-     * 经办人部门
-     */
-    private String operatorOffice;
-
     private static final long serialVersionUID = 1L;
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/reimbursementApproval/approvalInfo/controller/CwReimbursementInfoController.java

@@ -2,11 +2,16 @@ package com.jeeplus.test.cw.reimbursementApproval.approvalInfo.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jeeplus.aop.logging.annotation.ApiLog;
 import com.jeeplus.common.utils.ResponseUtil;
+import com.jeeplus.core.excel.ExcelOptions;
+import com.jeeplus.core.excel.ExportMode;
 import com.jeeplus.core.excel.utils.EasyPoiUtil;
+import com.jeeplus.sys.constant.enums.LogTypeEnum;
 import com.jeeplus.test.cw.reimbursementApproval.approvalInfo.service.CwReimbursementInfoService;
 import com.jeeplus.test.cw.reimbursementApproval.approvalInfo.service.dto.*;
 import com.jeeplus.test.program.configuration.projectList.domain.ProgramProjectListInfo;
+import com.jeeplus.test.zs.zsReimbursement.approvalInfo.service.dto.ZsRetureListDto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
@@ -14,7 +19,9 @@ import org.springframework.http.ResponseEntity;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @author: 王强
@@ -125,11 +132,27 @@ public class CwReimbursementInfoController {
         return ResponseEntity.ok(list);
     }
 
-    @ApiOperation(value = "文件下载")
-    @GetMapping(value = "/exportFile")
-    public void exportFileUploadList(QueryListDto dto, HttpServletResponse response) throws Exception {
-        List<RetureListDto> infos = service.exportList(dto);
-        EasyPoiUtil.exportExcel(infos, "报销申请列表信息",  "报销申请列表信息", RetureListDto.class, "", response );
+
+    @ApiLog(value = "财务报销数据", type = LogTypeEnum.EXPORT)
+    @GetMapping("exportFile")
+    @ApiOperation(value = "财务报销数据")
+    public void exportFile(QueryListDto cwDTO, Page <RetureListDto> page, ExcelOptions options, HttpServletResponse response) throws Exception {
+        String fileName = options.getFilename();
+        String sheetName = options.getSheetName();
+        List<RetureListDto> result = new ArrayList<>();
+        if ( ExportMode.current.equals ( options.getMode() ) ) {
+            result = service.list (page,cwDTO).getRecords();
+        } else if (ExportMode.selected.equals ( options.getMode() )) {
+            result = service.list (page,cwDTO).getRecords().stream ( ).filter ( item ->
+                    options.getSelectIds ( ).contains ( item.getId ( ) )
+            ).collect ( Collectors.toList ( ) );
+        } else {
+            page.setSize (-1);
+            page.setCurrent (0);
+            result = service.list (page,cwDTO).getRecords();
+        }
+        EasyPoiUtil.exportExcel ( result, sheetName,  sheetName, RetureListDto.class, fileName, response );
+
     }
 
     @ApiOperation(value = "关联报销")

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/reimbursementApproval/approvalInfo/service/dto/RetureListDto.java

@@ -83,13 +83,13 @@ public class RetureListDto {
     /**
      * 报销金额
      */
-    @Excel(name = "报销金额", width = 30, orderNum = "11")
+    @Excel(name = "报销金额", width = 30, orderNum = "11",type = 10)
     private BigDecimal number;
 
     /**
      * 报销状态
      */
-    @Excel(name = "报销状态", width = 30, orderNum = "12")
+    @Excel(name = "报销状态", width = 30, orderNum = "12",dict = "status")
     private String type;
 
     /**
@@ -109,7 +109,7 @@ public class RetureListDto {
      */
     private String createId;
 
-    @Excel(name = "报销类型", width = 30, orderNum = "2")
+    @Excel(name = "报销类型", width = 30, orderNum = "2",dict = "cw_reimbursement_source_type")
     private String sourceType;
 
     private String purchaseNo;

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursement/reimbursementInfo/controller/ReimbursementInfoController.java

@@ -2,8 +2,12 @@ package com.jeeplus.test.reimbursement.reimbursementInfo.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jeeplus.aop.logging.annotation.ApiLog;
 import com.jeeplus.common.utils.ResponseUtil;
+import com.jeeplus.core.excel.ExcelOptions;
+import com.jeeplus.core.excel.ExportMode;
 import com.jeeplus.core.excel.utils.EasyPoiUtil;
+import com.jeeplus.sys.constant.enums.LogTypeEnum;
 import com.jeeplus.test.program.configuration.projectList.domain.ProgramProjectListInfo;
 import com.jeeplus.test.program.configuration.projectList.service.dto.ExportFileDto;
 import com.jeeplus.test.reimbursement.reimbursementInfo.service.ReimbursementInfoService;
@@ -18,7 +22,9 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @RestController
 @Api(tags ="报销申请")
@@ -99,11 +105,27 @@ public class ReimbursementInfoController {
         return ResponseEntity.ok(list);
     }
 
-    @ApiOperation(value = "文件下载")
-    @GetMapping(value = "/exportFile")
-    public void exportFileUploadList(QueryListDto dto, HttpServletResponse response) throws Exception {
-        List<RetureListDto> infos = service.exportList(dto);
-        EasyPoiUtil.exportExcel(infos, "报销申请列表信息",  "报销申请列表信息", RetureListDto.class, "", response );
+
+    @ApiLog(value = "评估报销数据", type = LogTypeEnum.EXPORT)
+    @GetMapping("exportFile")
+    @ApiOperation(value = "评估报销数据")
+    public void exportFile(QueryListDto cwDTO, Page <RetureListDto> page, ExcelOptions options, HttpServletResponse response) throws Exception {
+        String fileName = options.getFilename();
+        String sheetName = options.getSheetName();
+        List<RetureListDto> result = new ArrayList<>();
+        if ( ExportMode.current.equals ( options.getMode() ) ) {
+            result = service.list (page,cwDTO).getRecords();
+        } else if (ExportMode.selected.equals ( options.getMode() )) {
+            result = service.list (page,cwDTO).getRecords().stream ( ).filter ( item ->
+                    options.getSelectIds ( ).contains ( item.getId ( ) )
+            ).collect ( Collectors.toList ( ) );
+        } else {
+            page.setSize (-1);
+            page.setCurrent (0);
+            result = service.list (page,cwDTO).getRecords();
+        }
+        EasyPoiUtil.exportExcel ( result, sheetName,  sheetName, RetureListDto.class, fileName, response );
+
     }
 
     @ApiOperation(value = "关联报销")

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursement/reimbursementInfo/service/dto/RetureListDto.java

@@ -78,13 +78,13 @@ public class RetureListDto {
     /**
      * 报销金额
      */
-    @Excel(name = "报销金额", width = 30, orderNum = "9")
+    @Excel(name = "报销金额", width = 30, orderNum = "9",type = 10)
     private BigDecimal number;
 
     /**
      * 报销状态
      */
-    @Excel(name = "报销状态", width = 30, orderNum = "10")
+    @Excel(name = "报销状态", width = 30, orderNum = "10",dict = "status")
     private String type;
 
     /**
@@ -97,6 +97,9 @@ public class RetureListDto {
      */
     private String processDefinitionId;
 
+    @Excel(name = "报销类型", width = 30, orderNum = "2",dict = "cw_reimbursement_source_type")
+    private String sourceType;
+
     private String taskId;
 
     /**

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/zs/zsReimbursement/approvalInfo/controller/ZsReimbursementInfoController.java

@@ -2,8 +2,13 @@ package com.jeeplus.test.zs.zsReimbursement.approvalInfo.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jeeplus.aop.logging.annotation.ApiLog;
 import com.jeeplus.common.utils.ResponseUtil;
+import com.jeeplus.core.excel.ExcelOptions;
+import com.jeeplus.core.excel.ExportMode;
 import com.jeeplus.core.excel.utils.EasyPoiUtil;
+import com.jeeplus.sys.constant.enums.LogTypeEnum;
+import com.jeeplus.test.cw.invoice.service.dto.CwFinanceInvoiceDTO;
 import com.jeeplus.test.cw.reimbursementApproval.approvalInfo.service.dto.*;
 import com.jeeplus.test.program.configuration.projectList.domain.ProgramProjectListInfo;
 import com.jeeplus.test.zs.zsReimbursement.approvalInfo.service.ZsReimbursementInfoService;
@@ -13,12 +18,15 @@ import com.jeeplus.test.zs.zsReimbursement.approvalInfo.service.dto.ZsSaveInfoDt
 import com.jeeplus.test.zs.zsReimbursement.approvalInfo.service.dto.ZsTreeUserDto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.http.ResponseEntity;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @author: 王强
@@ -129,13 +137,32 @@ public class ZsReimbursementInfoController {
         return ResponseEntity.ok(list);
     }
 
-    @ApiOperation(value = "文件下载")
-    @GetMapping(value = "/exportFile")
-    public void exportFileUploadList(QueryListDto dto, HttpServletResponse response) throws Exception {
-        List<ZsRetureListDto> infos = service.exportList(dto);
-        EasyPoiUtil.exportExcel(infos, "报销申请列表信息",  "报销申请列表信息", RetureListDto.class, "", response );
+
+
+    @ApiLog(value = "中审报销数据", type = LogTypeEnum.EXPORT)
+    @GetMapping("exportFile")
+    @ApiOperation(value = "中审报销数据")
+    public void exportFile(QueryListDto cwFinanceInvoiceDTO, Page <ZsRetureListDto> page, ExcelOptions options, HttpServletResponse response) throws Exception {
+        String fileName = options.getFilename();
+        String sheetName = options.getSheetName();
+        List<ZsRetureListDto> result = new ArrayList<>();
+        if ( ExportMode.current.equals ( options.getMode() ) ) {
+            result = service.list (page,cwFinanceInvoiceDTO).getRecords();
+        } else if (ExportMode.selected.equals ( options.getMode() )) {
+            result = service.list (page,cwFinanceInvoiceDTO).getRecords().stream ( ).filter ( item ->
+                    options.getSelectIds ( ).contains ( item.getId ( ) )
+            ).collect ( Collectors.toList ( ) );
+        } else {
+            page.setSize (-1);
+            page.setCurrent (0);
+            result = service.list (page,cwFinanceInvoiceDTO).getRecords();
+        }
+        EasyPoiUtil.exportExcel ( result, sheetName,  sheetName, ZsRetureListDto.class, fileName, response );
+
     }
 
+
+
     @ApiOperation(value = "关联报销")
     @GetMapping(value = "/relationReimbursementList")
     public ResponseEntity<IPage<ZsRetureListDto>> relationReimbursementList(Page<ZsRetureListDto> page, @RequestParam("id") String id) {

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/zs/zsReimbursement/approvalInfo/mapper/xml/ZsReimbursementInfoMapper.xml

@@ -10,7 +10,7 @@
 	<select id="findList"
             resultType="com.jeeplus.test.zs.zsReimbursement.approvalInfo.service.dto.ZsRetureListDto">
         SELECT
-	a.id,
+	DISTINCT a.id,
 	a.`no`,
 	(
 	CASE

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/zs/zsReimbursement/approvalInfo/service/dto/ZsRetureListDto.java

@@ -83,13 +83,13 @@ public class ZsRetureListDto {
     /**
      * 报销金额
      */
-    @Excel(name = "报销金额", width = 30, orderNum = "11")
+    @Excel(name = "报销金额", width = 30, orderNum = "11",type = 10)
     private BigDecimal number;
 
     /**
      * 报销状态
      */
-    @Excel(name = "报销状态", width = 30, orderNum = "12")
+    @Excel(name = "报销状态", width = 30, orderNum = "12",dict = "status")
     private String type;
 
     /**
@@ -109,7 +109,7 @@ public class ZsRetureListDto {
      */
     private String createId;
 
-    @Excel(name = "报销类型", width = 30, orderNum = "2")
+    @Excel(name = "报销类型", width = 30, orderNum = "2",dict = "cw_reimbursement_source_type")
     private String sourceType;
 
     private String purchaseNo;

jeeplus-platform/jeeplus-admin/src/main/java/com/jeeplus/sys/utils/ip/IpUtils.java

@@ -26,6 +26,7 @@ public class IpUtils
             return "unknown";
         }
         String ip = request.getHeader("x-forwarded-for");
+        System.out.println("获取到的IP为：" + ip);
         if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip))
         {
             ip = request.getHeader("Proxy-Client-IP");