报表应收统计

src/main/java/com/ydtech/modules/fnc/dao/InsPlySettleMapper.java

@@ -63,6 +63,8 @@ public interface InsPlySettleMapper extends BaseMapper<InsPlySettle> {
 
     List<InsPlySettleReportResVo> getInsPlySettleReport(@Param("reportReqVo")InsPlySettleReportReqVo insPlySettleReportReqVo);
 
+    List<InsPlySettle> getInsPlySettleReportList(@Param("reportReqVo")InsPlySettleReportReqVo insPlySettleReportReqVo);
+
     Long getInsPlySettleReportCount(@Param("reportReqVo") InsPlySettleReportReqVo insPlySettleReportReqVo);
 
 }

src/main/java/com/ydtech/modules/fnc/entity/InsPlySettle.java

@@ -34,6 +34,7 @@ public class InsPlySettle implements Serializable {
     @ApiModelProperty("保险公司")
     @TableField("company_id")
     private String companyId;
+
     @ApiModelProperty("保险公司名称")
     @TableField(exist = false)
     private String companyName;

src/main/java/com/ydtech/modules/fnc/service/InsPlySettleService.java

@@ -48,4 +48,11 @@ public interface InsPlySettleService extends IService<InsPlySettle> {
      */
     public HttpResult<String> exportInsPlySettleReport(InsPlySettleReportReqVo insPlySettleReportReqVo) ;
 
+    /**
+     * 报表-月度结算清单-导出明细
+     * @param insPlySettleReportReqVo
+     * @return
+     */
+    public HttpResult<String> exportInsPlySettleReportList(InsPlySettleReportReqVo insPlySettleReportReqVo);
+
 }

src/main/java/com/ydtech/modules/fnc/service/impl/InsPlySettleServiceImpl.java

@@ -222,9 +222,14 @@ public class InsPlySettleServiceImpl extends ServiceImpl<InsPlySettleMapper, Ins
 
     @Override
     public HttpResult<String> exportInsPlySettleReport(InsPlySettleReportReqVo insPlySettleReportReqVo) {
-        List<InsPlySettleReportResVo> policyInsuranceReportResVoPage = baseMapper.getInsPlySettleReport(insPlySettleReportReqVo);
-        String s = EasyExcelUtils.downExcel(uploadFilePath, PolicyInsuranceReportResVo.class, policyInsuranceReportResVoPage);
+        List<InsPlySettleReportResVo> insPlySettleReportResVoList = baseMapper.getInsPlySettleReport(insPlySettleReportReqVo);
+        String s = EasyExcelUtils.downExcel(uploadFilePath, InsPlySettleReportResVo.class, insPlySettleReportResVoList);
+        return HttpResult.ok("", s);
+    }
+    @Override
+    public HttpResult<String> exportInsPlySettleReportList(InsPlySettleReportReqVo insPlySettleReportReqVo) {
+        List<InsPlySettle> insPlySettleReportList = baseMapper.getInsPlySettleReportList(insPlySettleReportReqVo);
+        String s = EasyExcelUtils.downExcel(uploadFilePath, InsPlySettle.class, insPlySettleReportList);
         return HttpResult.ok("", s);
     }
-
 }

src/main/java/com/ydtech/modules/report/controller/ReportController.java

@@ -212,4 +212,22 @@ public class ReportController extends BaseController {
     public HttpResult<String> exportInsPlySettleReport(@RequestBody InsPlySettleReportReqVo insPlySettleReportReqVo) {
         return insPlySettleService.exportInsPlySettleReport(insPlySettleReportReqVo);
     }
+
+    @PostMapping("/exportOrderAndCostListData")
+    @ApiOperation(value = "报表-出单量及费用统计-导出清单")
+    public HttpResult<String> exportInsPlySettleReportListData(@RequestBody InsPlySettleReportReqVo insPlySettleReportReqVo) {
+        return insPlySettleService.exportInsPlySettleReportList(insPlySettleReportReqVo);
+    }
+
+   /* @PostMapping("/getInsPlySettleReport")
+    @ApiOperation(value = "分页获取应付统计清单数据")
+    public HttpResult<BasePageResult<InsPlySettleReportResVo>> getPayApplyReport(@RequestBody PayApplyReportReqVo payApplyReportReqVo) {
+        BasePageResult<InsPlySettleReportResVo> quoteResult = insPlySettleService.getInsPlySettleReport(payApplyReportReqVo);
+        return HttpResult.ok("success", quoteResult);
+    }
+    @PostMapping("/exportInsPlySettleReport")
+    @ApiOperation(value = "导出应付统计清单数据")
+    public HttpResult<String> exportPayApplyReport(@RequestBody PayApplyReportReqVo payApplyReportReqVo) {
+        return insPlySettleService.exportInsPlySettleReport(payApplyReportReqVo);
+    }*/
 }

src/main/java/com/ydtech/modules/report/model/vo/InsPlySettleReportReqVo.java

@@ -1,10 +1,12 @@
 package com.ydtech.modules.report.model.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 /**
@@ -20,8 +22,13 @@ public class InsPlySettleReportReqVo {
     @ApiModelProperty("状态")
     private String status;
 
-    @ApiModelProperty("结算单生成时间")
-    private LocalDateTime createTime;
+    @ApiModelProperty(value = "结算单生成开始时间")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private LocalDate quoteStartDate;
+
+    @ApiModelProperty(value = "结算单生成结束时间")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private LocalDate quoteEndDate;
 
     @ApiModelProperty(value = "每页页数")
     @Min(value = 20, message = "页数最小为20")

src/main/java/com/ydtech/modules/report/model/vo/InsPlySettleReportResVo.java

@@ -1,5 +1,6 @@
 package com.ydtech.modules.report.model.vo;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -14,24 +15,27 @@ import java.time.LocalDateTime;
 @Data
 public class InsPlySettleReportResVo {
 
-    @ApiModelProperty("保险公司")
-    private String companyId;
-
-    @ApiModelProperty("保险公司名称")
+    @TableField(value = "company_name")
+    @ExcelProperty(value = "保险公司")
     private String companyName;
 
-    @ApiModelProperty("结算批次")
+    @TableField(value = "settle_month")
+    @ExcelProperty(value = "账单属期")
     private String settleBatch;
 
-    @ApiModelProperty("手续费")
+    @TableField(value = "commission_feevalue")
+    @ExcelProperty(value = "手续费")
     private BigDecimal commissionFeevalue;
 
-    @ApiModelProperty("其他费")
+    @TableField(value = "other_feevalue")
+    @ExcelProperty(value = "跟单费")
     private BigDecimal otherFeevalue;
 
-    @ApiModelProperty("总费用")
+    @TableField(value = "all_fee_value")
+    @ExcelProperty(value = "费用合计")
     private BigDecimal allFeeValue;
 
-    @ApiModelProperty("状态")
+    @TableField(value = "status")
+    @ExcelProperty(value = "账单状态")
     private String status;
 }

src/main/resources/mapper/modules/fnc/InsPlySettleMapper.xml

@@ -29,7 +29,6 @@
     </resultMap>
 
     <select id="getInsPlySettleReport"  resultMap="SettleReportDataMap">
-
         SELECT
         ''company_name,
         ''settle_month,
@@ -42,7 +41,19 @@
         <if test="reportReqVo.companyId != null and reportReqVo.companyId != ''">
             and p.company_id = #{reportReqVo.companyId}
         </if>
-        GROUP BY p.`company_id`
+        <if test="reportReqVo.status != null and reportReqVo.status != ''">
+            and p.status = #{reportReqVo.status}
+        </if>
+        <if test="reportReqVo.quoteStartDate != null and reportReqVo.quoteEndDate != null">
+            and p.create_time  between #{reportReqVo.quoteStartDate} AND #{reportReqVo.quoteEndDate}
+        </if>
+        GROUP BY p.`settle_month`
+        <if test="reportReqVo.companyId != null and reportReqVo.companyId != ''">
+            ,p.company_id
+        </if>
+        <if test="reportReqVo.status != null and reportReqVo.status != ''">
+            ,p.status
+        </if>
     </select>
     <select id="getInsPlySettleReportCount" resultType="Long">
         select
@@ -60,7 +71,45 @@
         <if test="reportReqVo.companyId != null and reportReqVo.companyId != ''">
             and p.company_id = #{reportReqVo.companyId}
         </if>
-        GROUP BY p.`company_id`
+        <if test="reportReqVo.status != null and reportReqVo.status != ''">
+            and p.status = #{reportReqVo.status}
+        </if>
+        <if test="reportReqVo.quoteStartDate != null and reportReqVo.quoteEndDate != null">
+            and p.create_time  between #{reportReqVo.quoteStartDate} AND #{reportReqVo.quoteEndDate}
+        </if>
+        GROUP BY p.`settle_month`
+        <if test="reportReqVo.companyId != null and reportReqVo.companyId != ''">
+            ,p.company_id
+        </if>
+        <if test="reportReqVo.status != null and reportReqVo.status != ''">
+            ,p.status
+        </if>
         ) as s
     </select>
+    <select id="getInsPlySettleReportList" resultType="BaseResultMap">
+        SELECT
+        p.settleno,
+        p.company_id,
+        (select name from esm_ins_company where id = p.company_id)company_name,
+        p.settle_month,
+        p.settle_batch,
+        p.status,
+        p.`commission_feevalue`,
+        p.`other_feevalue`,
+        p.`all_fee_value`,
+        p.create_time,
+        p.dept_id,
+        p.operator
+        FROM
+        ins_ply_settle p WHERE 1=1
+        <if test="reportReqVo.companyId != null and reportReqVo.companyId != ''">
+            and p.company_id = #{reportReqVo.companyId}
+        </if>
+        <if test="reportReqVo.status != null and reportReqVo.status != ''">
+            and p.status = #{reportReqVo.status}
+        </if>
+        <if test="reportReqVo.quoteStartDate != null and reportReqVo.quoteEndDate != null">
+            and p.create_time  between #{reportReqVo.quoteStartDate} AND #{reportReqVo.quoteEndDate}
+        </if>
+    </select>
 </mapper>