导出优化

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgGuaranteeLetterAssignUserController.java

@@ -1,7 +1,6 @@
 package com.daqing.financial.guarantee.controller;
 
 
-import com.daqing.financial.guarantee.model.request.GuaranteeLetterListRequest;
 import com.daqing.financial.guarantee.model.request.GuaranteeLetterQueryRequest;
 import com.daqing.financial.guarantee.model.request.GuaranteeLetterUpdateStatusRequest;
 import com.daqing.financial.guarantee.model.response.GuaranteeLetterListResponse;
@@ -9,7 +8,6 @@ import com.daqing.financial.guarantee.service.IDgGuaranteeLetterAssignUserServic
 import com.daqing.framework.domain.guarantee.DgGuaranteeLetterAssignUser;
 import com.daqing.framework.model.response.ResponseResult;
 import com.daqing.framework.utils.PageUtils;
-import com.daqing.framework.utils.excel.EasyExcelUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -18,7 +16,6 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -47,7 +44,6 @@ public class DgGuaranteeLetterAssignUserController {
         return ResponseResult.SUCCESS(data);
     }
 
-
     @ApiOperation(value = "导出担保函列表数据")
     @GetMapping("/guaranteeLetterListExport")
     public void guaranteeLetterListExport(
@@ -69,7 +65,6 @@ public class DgGuaranteeLetterAssignUserController {
         return result ? ResponseResult.SUCCESS("添加成功！"):ResponseResult.FAIL(40005,"添加失败！");
     }
 
-
     @ApiOperation(value = "更新角色或用户确认状态及审核意见")
     @PostMapping("/updateStatus")
     public ResponseResult updateStatus(

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgLoanNoticeController.java

@@ -3,21 +3,14 @@ package com.daqing.financial.guarantee.controller;
 
 import com.daqing.financial.guarantee.model.request.*;
 import com.daqing.financial.guarantee.model.response.LoanNoticeListResponse;
-import com.daqing.financial.guarantee.model.response.PaymentConfirmationListResponse;
 import com.daqing.financial.guarantee.service.IDgLoanNoticeService;
-import com.daqing.financial.guarantee.service.impl.DgLoanNoticeServiceImpl;
 import com.daqing.framework.model.response.ResponseResult;
 import com.daqing.framework.utils.PageUtils;
-import com.daqing.framework.utils.excel.EasyExcelUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
@@ -48,17 +41,13 @@ public class DgLoanNoticeController {
         return new ResponseResult<PageUtils>().SUCCESS(data);
     }
 
-
     @ApiOperation(value = "导出放款通知列表数据")
-    @PostMapping("/loanNoticeListExport")
+    @GetMapping("/loanNoticeListExport")
     public void loanNoticeListExport(
-            @ApiParam(name = "loanNoticeListRequest", value = "放款通知列表数据", required = true)
+            @ApiParam(name = "ids", value = "多个id", required = true)
-            @RequestBody LoanNoticeListRequest loanNoticeListRequest, HttpServletResponse response){
+            @RequestParam("ids") List<String> ids, HttpServletResponse response){
-        //获取放款通知列表数据
-        List<LoanNoticeListResponse> loanNoticeListResponseList = loanNoticeListRequest.getLoanNoticeListResponseList();
         try {
-            //导出excel文件
+            loanNoticeService.batchExport(response,ids);
-            EasyExcelUtil.download(response, LoanNoticeListResponse.class, loanNoticeListResponseList,"放款通知列表","第一页");
         } catch (IOException e) {
             e.printStackTrace();
         }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgPaymentConfirmationConsiderController.java

@@ -1,23 +1,17 @@
 package com.daqing.financial.guarantee.controller;
 
 
-import com.daqing.financial.guarantee.model.request.PaymentConfirmationListRequest;
 import com.daqing.financial.guarantee.model.request.PaymentConfirmationQueryRequest;
 import com.daqing.financial.guarantee.model.request.PaymentConfirmationUpdateRequest;
 import com.daqing.financial.guarantee.model.response.PaymentConfirmationListResponse;
 import com.daqing.financial.guarantee.service.IDgPaymentConfirmationConsiderService;
 import com.daqing.framework.model.response.ResponseResult;
 import com.daqing.framework.utils.PageUtils;
-import com.daqing.framework.utils.excel.EasyExcelUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
@@ -48,17 +42,13 @@ public class DgPaymentConfirmationConsiderController {
         return new ResponseResult<PageUtils>().SUCCESS(data);
     }
 
-
     @ApiOperation(value = "导出回款确认列表数据")
-    @PostMapping("/paymentConfirmationListExport")
+    @GetMapping("/paymentConfirmationListExport")
     public void paymentConfirmationListExport(
-            @ApiParam(name = "paymentConfirmationListRequest", value = "回款确认列表数据", required = true)
+            @ApiParam(name = "ids", value = "多个id", required = true)
-            @RequestBody PaymentConfirmationListRequest paymentConfirmationListRequest, HttpServletResponse response){
+            @RequestParam("ids") List<String> ids, HttpServletResponse response){
-        //获取担保函列表数据
-        List<PaymentConfirmationListResponse> paymentConfirmationListResponseList = paymentConfirmationListRequest.getPaymentConfirmationListResponseList();
         try {
-            //导出excel文件
+            paymentConfirmationConsiderService.batchExport(response,ids);
-            EasyExcelUtil.download(response, PaymentConfirmationListResponse.class, paymentConfirmationListResponseList,"回款确认列表","第一页");
         } catch (IOException e) {
             e.printStackTrace();
         }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgLoanNoticeMapper.java

@@ -7,6 +7,8 @@ import com.daqing.financial.guarantee.model.response.LoanNoticeListResponse;
 import com.daqing.framework.domain.guarantee.DgLoanNotice;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * <p>
  * 放款通知 Mapper 接口
@@ -20,4 +22,5 @@ public interface DgLoanNoticeMapper extends BaseMapper<DgLoanNotice> {
 
     IPage<LoanNoticeListResponse> pageByCondition(Page page, String roleIds, Integer userId, Integer status, String customerNumberOrName);
 
+    List<LoanNoticeListResponse> selectBatchData(List<String> ids);
 }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgPaymentConfirmationConsiderMapper.java

@@ -22,4 +22,5 @@ public interface DgPaymentConfirmationConsiderMapper extends BaseMapper<DgPaymen
 
     IPage<PaymentConfirmationListResponse> pageByCondition(Page page, List<String> roleIdList , Integer userId , Integer status, String customerNumberOrName);
 
+    List<PaymentConfirmationListResponse> selectBatchData(List<String> ids);
 }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/LoanNoticeListResponse.java

@@ -1,5 +1,6 @@
 package com.daqing.financial.guarantee.model.response;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.daqing.framework.utils.excel.ApprovalStatusConverter;
 import com.daqing.framework.utils.excel.BusinessStatusConverter;
@@ -19,12 +20,15 @@ import java.util.Date;
 @Data
 public class LoanNoticeListResponse {
 
+    @ExcelIgnore
     @ApiModelProperty("唯一标识")
     private Integer id;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "审核意见")
     private String auditOpinion;
 
+    @ExcelIgnore
     @ApiModelProperty("银行名称")
     private String bank;
 
@@ -44,12 +48,12 @@ public class LoanNoticeListResponse {
     @ExcelProperty(value = "业务类别",index = 3)
     private String businessType;
 
-    @ApiModelProperty("金额")
+    @ApiModelProperty("申请额度")
-    @ExcelProperty(value = "金额",index = 4)
+    @ExcelProperty(value = "申请额度",index = 4)
     private Double loanMoney;
 
-    @ApiModelProperty("期数")
+    @ApiModelProperty("申请期限")
-    @ExcelProperty(value = "期数",index = 5)
+    @ExcelProperty(value = "申请期限",index = 5)
     private String loanTern;
 
     @ApiModelProperty("申请日期")

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/PaymentConfirmationListResponse.java

@@ -1,5 +1,6 @@
 package com.daqing.financial.guarantee.model.response;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.daqing.framework.utils.excel.ApprovalStatusConverter;
 import com.daqing.framework.utils.excel.BusinessStatusConverter;
@@ -19,19 +20,24 @@ import java.util.Date;
 @Data
 public class PaymentConfirmationListResponse {
 
+    @ExcelIgnore
     @ApiModelProperty("唯一标识")
     private Integer id;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "审核意见")
     private String auditOpinion;
 
+    @ExcelIgnore
     @ApiModelProperty("银行名称")
     private String bank;
 
+    @ExcelIgnore
     @ApiModelProperty("贷审会同意时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date passingTime;
 
+    @ExcelIgnore
     @ApiModelProperty("附件（会议记录）")
     private String file;
 
@@ -51,12 +57,12 @@ public class PaymentConfirmationListResponse {
     @ExcelProperty(value = "业务类别",index = 3)
     private String businessType;
 
-    @ApiModelProperty("金额")
+    @ApiModelProperty("申请额度")
-    @ExcelProperty(value = "金额",index = 4)
+    @ExcelProperty(value = "申请额度",index = 4)
     private Double loanMoney;
 
-    @ApiModelProperty("期限")
+    @ApiModelProperty("申请期限")
-    @ExcelProperty(value = "期数",index = 5)
+    @ExcelProperty(value = "申请期限",index = 5)
     private String loanTern;
 
     @ApiModelProperty("申请日期")

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgLoanNoticeService.java

@@ -6,6 +6,10 @@ import com.daqing.financial.guarantee.model.request.LoanNoticeUpdateRequest;
 import com.daqing.framework.domain.guarantee.DgLoanNotice;
 import com.daqing.framework.utils.PageUtils;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
 /**
  * <p>
  * 放款通知 服务类
@@ -19,4 +23,6 @@ public interface IDgLoanNoticeService extends IService<DgLoanNotice> {
     PageUtils queryPage(LoanNoticeQueryRequest loanNoticeQueryRequest);
 
     boolean updateLoanNotice(LoanNoticeUpdateRequest loanNoticeUpdateRequest);
+
+    void batchExport(HttpServletResponse response, List<String> ids) throws IOException;
 }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgPaymentConfirmationConsiderService.java

@@ -6,6 +6,10 @@ import com.daqing.financial.guarantee.model.request.PaymentConfirmationUpdateReq
 import com.daqing.framework.domain.guarantee.DgPaymentConfirmationConsider;
 import com.daqing.framework.utils.PageUtils;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
 /**
  * <p>
  * 回款确认 服务类
@@ -19,4 +23,6 @@ public interface IDgPaymentConfirmationConsiderService extends IService<DgPaymen
     PageUtils queryPage(PaymentConfirmationQueryRequest paymentConfirmationQueryRequest);
 
     boolean updatePaymentConfirmation(PaymentConfirmationUpdateRequest paymentConfirmationUpdateRequest);
+
+    void batchExport(HttpServletResponse response, List<String> ids) throws IOException;
 }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeLetterAssignUserServiceImpl.java

@@ -51,7 +51,6 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
     @Autowired
     private DgLoanCommitteeConsiderMapper dgLoanCommitteeConsiderMapper;
 
-
     /**
      * 获取当前登录用户信息
      */

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgLoanNoticeServiceImpl.java

@@ -7,6 +7,7 @@ import com.daqing.financial.guarantee.mapper.DgLoanNoticeMapper;
 import com.daqing.financial.guarantee.mapper.DgPaymentConfirmationConsiderMapper;
 import com.daqing.financial.guarantee.model.request.LoanNoticeQueryRequest;
 import com.daqing.financial.guarantee.model.request.LoanNoticeUpdateRequest;
+import com.daqing.financial.guarantee.model.response.GuaranteeLetterListResponse;
 import com.daqing.financial.guarantee.model.response.LoanNoticeListResponse;
 import com.daqing.financial.guarantee.model.response.PaymentConfirmationListResponse;
 import com.daqing.financial.guarantee.service.IDgLoanNoticeService;
@@ -17,6 +18,7 @@ import com.daqing.framework.model.StatusCode;
 import com.daqing.framework.model.response.PromptSuccess;
 import com.daqing.framework.util.RedisUtil;
 import com.daqing.framework.utils.PageUtils;
+import com.daqing.framework.utils.excel.EasyExcelUtil;
 import jdk.nashorn.internal.ir.IfNode;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,6 +27,8 @@ import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
 
@@ -75,6 +79,12 @@ public class DgLoanNoticeServiceImpl extends ServiceImpl<DgLoanNoticeMapper, DgL
         return new PageUtils(loanNoticeVO);
     }
 
+    @Override
+    public void batchExport(HttpServletResponse response, List<String> ids) throws IOException {
+        List<LoanNoticeListResponse> excelDataList = baseMapper.selectBatchData(ids);
+        EasyExcelUtil.download(response,LoanNoticeListResponse.class,excelDataList,"LoanNoticeList","第一页");
+    }
+
     @Override
     public boolean updateLoanNotice(LoanNoticeUpdateRequest loanNoticeUpdateRequest) {
         // TODO 所有操作待添加业务流程数据

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgPaymentConfirmationConsiderServiceImpl.java

@@ -8,6 +8,7 @@ import com.daqing.financial.guarantee.mapper.DgLoanNoticeMapper;
 import com.daqing.financial.guarantee.mapper.DgPaymentConfirmationConsiderMapper;
 import com.daqing.financial.guarantee.model.request.PaymentConfirmationQueryRequest;
 import com.daqing.financial.guarantee.model.request.PaymentConfirmationUpdateRequest;
+import com.daqing.financial.guarantee.model.response.LoanNoticeListResponse;
 import com.daqing.financial.guarantee.model.response.PaymentConfirmationListResponse;
 import com.daqing.financial.guarantee.service.IDgPaymentConfirmationConsiderService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -18,6 +19,7 @@ import com.daqing.framework.model.StatusCode;
 import com.daqing.framework.model.response.PromptSuccess;
 import com.daqing.framework.util.RedisUtil;
 import com.daqing.framework.utils.PageUtils;
+import com.daqing.framework.utils.excel.EasyExcelUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -25,6 +27,8 @@ import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
 
@@ -75,10 +79,15 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl<DgPaym
             //分页条件查询
             paymentConfirmationVO = baseMapper.pageByCondition(new Page(page,size),roleIdList,userId,status,customerNumberOrName);
         }
-
         return new PageUtils(paymentConfirmationVO);
     }
 
+    @Override
+    public void batchExport(HttpServletResponse response, List<String> ids) throws IOException {
+        List<PaymentConfirmationListResponse> excelDataList = baseMapper.selectBatchData(ids);
+        EasyExcelUtil.download(response,PaymentConfirmationListResponse.class,excelDataList,"PaymentConfirmationList","第一页");
+    }
+
     @Override
     public boolean updatePaymentConfirmation(PaymentConfirmationUpdateRequest paymentConfirmationUpdateRequest) {
         // TODO 所有操作待添加业务流程数据

dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanNoticeMapper.xml

@@ -55,4 +55,20 @@
         </where>
     </select>
 
+    <select id="selectBatchData" resultMap="LoanNoticeListResponseMap">
+        select ln.id,aai.business_code,cc.name,cc.phone,aai.business_type,lcc.loan_tern,lcc.loan_money,
+        aai.create_time,ln.status,ln.operating_status,bps.business_status
+        from dg_loan_notice ln
+        left join dg_apply_amount_info aai on ln.business_id = aai.id
+        left join crms_company_customer ccc on ln.company_id = ccc.id
+        left join crms_customer cc on ccc.customer_id = cc.id
+        left join dg_loan_committee_consider lcc on ln.business_id = lcc.business_id
+        left join dg_business_process_status bps on ln.business_id = bps.business_id
+        where ln.id in
+        <foreach collection="list" close=")" open="(" item="id" separator=",">
+            #{id}
+        </foreach>
+    </select>
+
+
 </mapper>

dq-financial-guarantee/src/main/resources/mapper/guarantee/DgPaymentConfirmationConsiderMapper.xml

@@ -58,4 +58,20 @@
         </where>
     </select>
 
+
+    <select id="selectBatchData" resultMap="PaymentConfirmationListResponseMap">
+        select pcc.id,aai.business_code,cc.name,cc.phone,aai.business_type,lcc.loan_money,
+        lcc.loan_tern,aai.create_time,pcc.status,pcc.operating_status,bps.business_status
+        from dg_payment_confirmation_consider pcc
+        left join dg_apply_amount_info aai on pcc.business_id = aai.id
+        left join crms_company_customer ccc on pcc.company_id = ccc.id
+        left join crms_customer cc on ccc.customer_id = cc.id
+        left join dg_loan_committee_consider lcc on pcc.business_id = lcc.business_id
+        left join dg_business_process_status bps on pcc.business_id = bps.business_id
+        where pcc.id in
+        <foreach collection="list" close=")" open="(" item="id" separator=",">
+            #{id}
+        </foreach>
+    </select>
+
 </mapper>