Merge remote-tracking branch 'origin/master'

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/CustomerBillDetailedListExportVo.java

@@ -0,0 +1,40 @@
+package com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed;
+
+import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo;
+import com.yxt.common.core.utils.ExportEntityMap;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/5/10 13:38
+ */
+@Data
+public class CustomerBillDetailedListExportVo {
+
+    @ExportEntityMap(CnName = "序号", EnName = "rankNo")
+    private Integer rankNo;
+    @ExportEntityMap(CnName = "合同编号", EnName = "contractNo")
+    private String contractNo; // 合同编号
+    @ExportEntityMap(CnName = "车架号", EnName = "vinNo")
+    private String vinNo; // 车架号
+    @ExportEntityMap(CnName = "款项名称", EnName = "receivablesName")
+    private String receivablesName; // 款项名称
+    @ExportEntityMap(CnName = "销售类型", EnName = "payType")
+    private String payType;
+    @ExportEntityMap(CnName = "应收款项状态", EnName = "kxState")
+    private String kxState; // 应收款项状态 01正常，02作废
+    @ExportEntityMap(CnName = "应收金额", EnName = "reveivableMoney")
+    private String reveivableMoney; // 应收金额
+    @ExportEntityMap(CnName = "实收金额", EnName = "subscriptionMoney")
+    private String subscriptionMoney;
+    @ExportEntityMap(CnName = "未收金额", EnName = "noSubscriptionMoney")
+    private String noSubscriptionMoney;
+    @ExportEntityMap(CnName = "生成时间", EnName = "createTime")
+    private String createTime;
+    @ExportEntityMap(CnName = "备注", EnName = "remarks")
+    private String remarks;
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java

@@ -76,6 +76,11 @@ public interface FinUncollectedReceivablesDetailedFeign {
     @PostMapping("/customerBillDetailedListPage")
     public ResultBean<PagerVo<FinUncollectedReceivablesDetailedVo>> customerBillDetailedListPage(@RequestBody PagerQuery<FinUncollectedReceivablesDetailedQuery> pq);
 
+    @PostMapping("/exportExcel")
+    @ApiOperation(value = "客户账单明细列表导出")
+    public void exportExcel(@RequestBody FinUncollectedReceivablesDetailedQuery query);
+
+
     @ApiOperation("app获取客户账单列表")
     @PostMapping("/getCustomerBillList")
     public ResultBean<PagerVo<AppCustomerBillSummaryDetailsVo>> getCustomerBillList(@RequestBody PagerQuery<AppFinUncollectedReceivablesDetailedQuery> pq);
@@ -131,4 +136,4 @@ public interface FinUncollectedReceivablesDetailedFeign {
     @ApiOperation("根据销售订单车辆sid查询")
     @PostMapping("/selectByBusVinSid")
     ResultBean<String> selectByBusVinSid(@RequestParam("busVinSid") String busVinSid);
-}
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeignFallback.java

@@ -75,6 +75,11 @@ public class FinUncollectedReceivablesDetailedFeignFallback implements FinUncoll
 		return null;
 	}
 
+	@Override
+	public void exportExcel(FinUncollectedReceivablesDetailedQuery query) {
+
+	}
+
 	@Override
 	public ResultBean<PagerVo<AppCustomerBillSummaryDetailsVo>> getCustomerBillList(PagerQuery<AppFinUncollectedReceivablesDetailedQuery> pq) {
 		return null;
@@ -146,4 +151,4 @@ public class FinUncollectedReceivablesDetailedFeignFallback implements FinUncoll
 		return null;
 	}
 
-}
+}

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java

@@ -122,4 +122,6 @@ public interface FinUncollectedReceivablesDetailedMapper extends BaseMapper<FinU
     String selectOtherReceivableMoneyByBusVinSid(String busVinSid);
 
     IPage<FinUncollectedReceivablesDetailedVo> selectPageVo2(IPage<FinUncollectedReceivablesDetailed> page, @Param(Constants.WRAPPER)QueryWrapper<FinUncollectedReceivablesDetailed> qw);
+
+    List<CustomerBillDetailedListExportVo> exportExcel( @Param(Constants.WRAPPER) QueryWrapper<FinUncollectedReceivablesDetailed> qw);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml

@@ -435,4 +435,92 @@
         </where>
 
     </select>
+    <select id="exportExcel"
+            resultType="com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.CustomerBillDetailedListExportVo">
+        SELECT
+        b.*,
+        @row_number := @row_number + 1 AS rankNo
+        FROM
+        (
+        SELECT
+        a.sid,
+        a.customerName,
+        a.contractNo,
+        a.linkNo as vinNo,
+        a.receivablesName,
+        a.payType,
+        a.kxState,
+        a.reveivableMoney,
+        a.subscriptionMoney,
+        ( a.reveivableMoney - a.subscriptionMoney ) AS noSubscriptionMoney,
+        a.createTime,
+        a.remarks,
+        a.orgSidPath,
+        a.createBySid,
+        a.useOrgSid,
+        a.busVinSid
+        FROM
+        (
+        SELECT
+        u.sid,
+        u.useOrgSid,
+        u.busVinSid,
+        u.customerName,
+        u.contractNo,
+        RIGHT(v.linkNo,8) as linkNo,
+        u.receivablesName,
+        u.payType,
+        u.orgSidPath,
+        u.createBySid,
+        CASE
+        u.kxState
+        WHEN '01' THEN
+        '正常'
+        WHEN '02' THEN
+        '作废'
+        END AS kxState,
+        u.reveivableMoney,
+        u.createTime,
+        u.remarks,
+        (
+        SELECT
+        ifnull( sum( dbalance ), 0 ) AS subscriptionMoney
+        FROM
+        (
+        SELECT
+        d.receivablesSid,
+        cast((
+        d.`subscriptionMoney` - COALESCE ( SUM( f.`thisUseMoney` ), 0 )) AS DECIMAL ( 10, 2 )) AS dbalance
+        FROM
+        fin_selected_receivables_detailed d
+        LEFT JOIN (
+        SELECT
+        f.busSid,
+        f.thisUseMoney
+        FROM
+        fin_funds_carried_forward_veh f
+        LEFT JOIN `fin_funds_carried_forward_apply` fa ON f.mainSid = fa.sid
+        WHERE
+        fa.`nodeState` = '已办结'
+        ) f ON f.`busSid` = d.`sid`
+        WHERE
+        d.auditState = 3
+        GROUP BY
+        d.`sid`
+        ) d
+        WHERE
+        d.receivablesSid = u.sid
+        ) AS subscriptionMoney
+        FROM
+        fin_uncollected_receivables_detailed AS u
+        LEFT JOIN anrui_buscenter.bus_sales_order_vehicle AS v ON u.busVinSid = v.sid
+        ) a
+        ) AS b,(
+        SELECT
+        @row_number := 0
+        ) AS t
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
 </mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java

@@ -26,6 +26,7 @@
 package com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailed;
 
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.*;
+import com.yxt.common.base.utils.ExportExcelUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -34,6 +35,9 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
 import java.util.List;
 
 /**
@@ -56,7 +60,8 @@ public class FinUncollectedReceivablesDetailedRest implements FinUncollectedRece
 
     @Autowired
     private FinUncollectedReceivablesDetailedService finUncollectedReceivablesDetailedService;
-
+    @Autowired
+    private HttpServletResponse response;
     @Override
     @ApiOperation("根据条件查询所有数据列表")
     @PostMapping("/listAll")
@@ -96,6 +101,22 @@ public class FinUncollectedReceivablesDetailedRest implements FinUncollectedRece
         return rb.success().setData(pv);
     }
 
+    @Override
+    public void exportExcel(FinUncollectedReceivablesDetailedQuery query) {
+        //得到所有要导出的数据
+        List<CustomerBillDetailedListExportVo> list = finUncollectedReceivablesDetailedService.exportExcel(query);
+        //定义导出的excel名字
+        String excelName = "客户账单明细列表";
+        String fileNameURL = "";
+        try {
+            fileNameURL = URLEncoder.encode(excelName, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        //导出车辆管理列表
+        ExportExcelUtils.export(fileNameURL, list, CustomerBillDetailedListExportVo.class, response);
+    }
+
     @Override
     public ResultBean<PagerVo<AppCustomerBillSummaryDetailsVo>> getCustomerBillList(PagerQuery<AppFinUncollectedReceivablesDetailedQuery> pq) {
         ResultBean rb = ResultBean.fireFail();

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java

@@ -504,6 +504,82 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
         return p;
     }
 
+
+    public List<CustomerBillDetailedListExportVo> exportExcel(FinUncollectedReceivablesDetailedQuery params) {
+        //==============================分页开始====================================
+        String orgPath = params.getOrgPath();
+        String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
+        params.setUseOrgSid(useOrgSid);
+        QueryWrapper<FinUncollectedReceivablesDetailed> qw = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(params.getMenuUrl())) {
+            //授权
+            PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+            privilegeQuery.setOrgPath(params.getOrgPath());
+            privilegeQuery.setMenuUrl(params.getMenuUrl());
+            privilegeQuery.setUserSid(params.getCreateBySid());
+            ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
+            if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
+                //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
+                orgPath = orgPath + "/";
+                int i1 = orgPath.indexOf("/");
+                int i2 = orgPath.indexOf("/", i1 + 1);
+                int i3 = orgPath.indexOf("/", i2 + 1);
+                int i4 = orgPath.indexOf("/", i3 + 1);
+                String orgLevelKey = defaultIdReltBean.getData();
+                if ("1".equals(orgLevelKey)) {
+                    orgPath = orgPath.substring(0, i1);
+                    qw.like("b.orgSidPath", orgPath);
+                } else if ("2".equals(orgLevelKey)) {
+                    orgPath = orgPath.substring(0, i2);
+                    qw.like("b.orgSidPath", orgPath);
+                } else if ("3".equals(orgLevelKey)) {
+                    orgPath = orgPath.substring(0, i3);
+                    qw.like("b.orgSidPath", orgPath);
+                } else if ("4".equals(orgLevelKey)) {
+                    orgPath = orgPath.substring(0, i4);
+                    qw.like("b.orgSidPath", orgPath);
+                } else if ("5".equals(orgLevelKey)) {
+                    qw.eq("b.createBySid", params.getCreateBySid());
+                } else {
+                    return new ArrayList<>();
+                }
+            } else {
+                return new ArrayList<>();
+            }
+        } else {
+            qw.eq("b.useOrgSid", params.getUseOrgSid());
+        }
+        //车架号查询
+        if (StringUtils.isNotBlank(params.getVinNo())) {
+            qw.like("b.vinNo", params.getVinNo());
+        }
+        if (StringUtils.isNotBlank(params.getKxState())) {
+            qw.like("b.kxState", params.getKxState());
+        }
+        if (StringUtils.isNotBlank(params.getContractNo())) {
+            qw.like("b.contractNo", params.getContractNo());
+        }
+        if (StringUtils.isNotBlank(params.getCustomerName())) {
+            qw.like("b.customerName", params.getCustomerName());
+        }
+        if (StringUtils.isNotBlank(params.getReceivablesName())) {
+            qw.like("b.receivablesName", params.getReceivablesName());
+        }
+        String createStartTime = params.getCreateStartTime();
+        String createEndTime = params.getCreateEndTime();
+        qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (b.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
+                apply(StringUtils.isNotEmpty(createEndTime), "date_format (b.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
+                );
+        String noMoneyStart = params.getNoMoneyStart();
+        String noMoneyEnd = params.getNoMoneyEnd();
+        qw.apply(StringUtils.isNotEmpty(noMoneyStart), "b.noSubscriptionMoney >=" + noMoneyStart).
+                apply(StringUtils.isNotEmpty(noMoneyEnd), "b.noSubscriptionMoney <=" + noMoneyEnd
+                );
+        qw.orderByDesc("b.createTime");
+        List<CustomerBillDetailedListExportVo> list = baseMapper.exportExcel(qw);
+        return list;
+    }
+
     public PagerVo<FinUncollectedReceivablesDetailedVo> detailedListPageVo(PagerQuery<FinUncollectedReceivablesDetailedQuery> pq) {
         //==============================分页开始====================================
         FinUncollectedReceivablesDetailedQuery params = pq.getParams();
@@ -1144,4 +1220,6 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
         String otherReceivableMoney = baseMapper.selectOtherReceivableMoneyByBusVinSid(busVinSid);
         return rb.success().setData(otherReceivableMoney);
     }
+
+
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyService.java

@@ -1404,7 +1404,7 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
             String targetPath = docPdfComponent.getUploadTemplateUrl();
             try {
                 //获取模板
-                InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/vouchers/dhsp.ftl");
+                InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/vouchers/dhspnew.ftl");
                 //生成word文件名
                 String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
                 long seconds = System.currentTimeMillis();

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyService.java

@@ -1368,7 +1368,7 @@ public class LoanBuckleApplyService extends MybatisBaseService<LoanBuckleApplyMa
             String targetPath = docPdfComponent.getUploadTemplateUrl();
             try {
                 //获取模板
-                InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/vouchers/newBuckle.ftl");
+                InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/vouchers/yyhk.ftl");
                 //生成word文件名
                 String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
                 long seconds = System.currentTimeMillis();

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyService.java

@@ -1184,7 +1184,7 @@ public class LoanMonthlyAccrualApplyService extends MybatisBaseService<LoanMonth
             String targetPath = docPdfComponent.getUploadTemplateUrl();
             try {
                 //获取模板
-                InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/vouchers/monthacc.ftl");
+                InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/vouchers/yhjt.ftl");
                 //生成word文件名
                 String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
                 long seconds = System.currentTimeMillis();

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduefin/LoanOverdueFinService.java

@@ -1036,7 +1036,7 @@ public class LoanOverdueFinService extends MybatisBaseService<LoanOverdueFinMapp
             String targetPath = docPdfComponent.getUploadTemplateUrl();
             try {
                 //获取模板
-                InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/vouchers/finoverdue.ftl");
+                InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/vouchers/yqdz.ftl");
                 //生成word文件名
                 String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
                 long seconds = System.currentTimeMillis();

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyService.java

@@ -1453,7 +1453,7 @@ public class LoanTransferPaymentApplyService extends MybatisBaseService<LoanTran
             String targetPath = docPdfComponent.getUploadTemplateUrl();
             try {
                 //获取模板
-                InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/vouchers/dsdfrsk.ftl");
+                InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/vouchers/dsdfnew.ftl");
                 //生成word文件名
                 String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
                 long seconds = System.currentTimeMillis();

工作内容需要的文档/单据模板/财务凭证打印模板/代付审批/代收代付.docx

@@ -19,7 +19,6 @@ ${filePath!}
   审批流程
 ${lc.comment!}
 ${lc.name!}
-
                                                                     ${lc.spsj!}
   代付明细
                                     序号

工作内容需要的文档/单据模板/财务凭证打印模板/划扣/月还划扣.docx

@@ -13,7 +13,6 @@ ${filePath!}
   审批流程
 ${lc.comment!}
 ${lc.name!}
-
                                                                     ${lc.spsj!}
   划扣明细
                                     序号

工作内容需要的文档/单据模板/财务凭证打印模板/垫还/垫还审批.docx

@@ -19,7 +19,6 @@ ${filePath!}
   审批流程
 ${lc.comment!}
 ${lc.name!}
-
                                                                     ${lc.spsj!}
   垫还明细
                                     序号

工作内容需要的文档/单据模板/财务凭证打印模板/月还计提/月还计提.docx

@@ -13,7 +13,6 @@ ${filePath!}
   审批流程
 ${lc.comment!}
 ${lc.name!}
-
                                                                     ${lc.spsj!}
  本月应还记录
                                     序号

工作内容需要的文档/单据模板/财务凭证打印模板/逾期对账/逾期对账.docx

@@ -15,7 +15,6 @@ ${filePath!}
   审批流程
 ${lc.comment!}
 ${lc.name!}
-
                                                                     ${lc.spsj!}
   逾期客户列表
                                     序号