修改

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineFeign.java

@@ -35,21 +35,6 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
-/**
- * Project: anrui-riskcenter(放款资料审核) <br/>
- * File: LoanFileexamineFeign.java <br/>
- * Class: com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineFeign <br/>
- * Description: 放款资料审核. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2023-09-08 09:43:46 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Api(tags = "放款资料审核")
 @FeignClient(
         contextId = "anrui-riskcenter-LoanFileexamine",
@@ -67,12 +52,12 @@ public interface LoanFileexamineFeign {
     @PostMapping("/save")
     @ResponseBody
     public ResultBean save(@RequestBody LoanFileexamineDto dto);
-        
+
     @ApiOperation("根据sid删除记录")
     @DeleteMapping("/delBySids")
     @ResponseBody
     public ResultBean delBySids(@RequestBody String[] sids);
-      
+
     @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
     @ResponseBody
@@ -86,7 +71,7 @@ public interface LoanFileexamineFeign {
     @ApiOperation("根据销售订单和消贷合同sid查询资料审核信息")
     @GetMapping("/selectOrderSidAndContract")
     @ResponseBody
-    ResultBean<LoanFileexamine> selectOrderSidAndContract(@RequestParam("saleOrderSid") String saleOrderSid, @RequestParam(value = "loanContractSid",required = false) String loanContractSid);
+    ResultBean<LoanFileexamine> selectOrderSidAndContract(@RequestParam("saleOrderSid") String saleOrderSid, @RequestParam(value = "loanContractSid", required = false) String loanContractSid);
 
     @ApiOperation("手机端-查询本分公司下代办数量:切换机构")
     @GetMapping("/getToDoNum")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrestorereportapply/LoanRestoreReportApplyFeign.java

@@ -25,8 +25,6 @@
  *********************************************************/
 package com.yxt.anrui.riskcenter.api.loanrestorereportapply;
 
-import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionApplyDetailsVo;
-import com.yxt.anrui.riskcenter.api.loanbecollectionapply.flowable.*;
 import com.yxt.anrui.riskcenter.api.loanrestorereportapply.flowable.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -40,19 +38,6 @@ import org.springframework.web.bind.annotation.*;
 import javax.validation.Valid;
 import java.util.List;
 
-/**
- * Project: anrui-riskcenter(车辆交回事前报备申请) <br/>
- * File: LoanRestoreReportApplyFeign.java <br/>
- * Class: com.yxt.anrui.riskcenter.api.loanrestorereportapply.LoanRestoreReportApplyFeign <br/>
- * Description: 车辆交回事前报备申请. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-01-08 11:43:57 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Api(tags = "车辆交回事前报备申请")
 @FeignClient(
         contextId = "anrui-riskcenter-LoanRestoreReportApply",
@@ -70,12 +55,12 @@ public interface LoanRestoreReportApplyFeign {
     @PostMapping("/save")
     @ResponseBody
     public ResultBean save(@RequestBody LoanRestoreReportApplyDto dto);
-        
+
     @ApiOperation("根据sid删除记录")
     @DeleteMapping("/delBySids")
     @ResponseBody
     public ResultBean delBySids(@RequestBody String[] sids);
-      
+
     @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
     @ResponseBody

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineMapper.xml

@@ -5,26 +5,26 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineVo">
         SELECT
-        lf.`sid`,
+        lf.sid,
         bo.sid AS saleOrderSid,
-        bo.`useOrgName`,
-        bo.`orgName`,
-        bo.`staffName`,
-        lf.`bankStateValue`,
-        IF(lf.`zlState` = 0, '未齐全', '已齐全') AS zlState,
+        bo.useOrgName,
+        bo.orgName,
+        bo.staffName,
+        lf.bankStateValue,
+        IF(lf.zlState = 0, '未齐全', '已齐全') AS zlState,
         bl.sid AS loanContractSid,
-        bl.`loanContractNo`,
-        bl.`vehCount` AS num,
-        bl.`borrowerName`,
-        bl.`bankName`,
-        bl.`policyName`,
-        bl.`bankContractNo`
+        bl.loanContractNo,
+        bl.vehCount AS num,
+        bl.borrowerName,
+        bl.bankName,
+        bl.policyName,
+        bl.bankContractNo
         FROM
         loan_fileexamine lf
-        LEFT JOIN anrui_buscenter.`bus_sales_order` bo
-        ON lf.`saleOrderSid` = bo.`sid`
-        LEFT JOIN anrui_buscenter.`bus_sales_order_loancontract` bl
-        ON lf.`loanContractSid` = bl.`sid`
+        LEFT JOIN anrui_buscenter.bus_sales_order bo
+        ON lf.saleOrderSid = bo.sid
+        LEFT JOIN anrui_buscenter.bus_sales_order_loancontract bl
+        ON lf.loanContractSid = bl.sid
         <where>
             ${ew.sqlSegment}
         </where>
@@ -44,11 +44,11 @@
     <select id="getToDoNum" resultType="int">
         SELECT COUNT(*)
         FROM loan_fileexamine lf
-                     LEFT JOIN anrui_buscenter.`bus_sales_order` bo
-                ON lf.`saleOrderSid` = bo.`sid`
+                     LEFT JOIN anrui_buscenter.bus_sales_order bo
+                ON lf.saleOrderSid = bo.sid
         WHERE bo.createBySid = #{userSid}
           AND bo.orgSidPath = #{orgPath}
-          AND lf.`zlState` = '0'
+          AND lf.zlState = '0'
     </select>
 
     <update id="setState">

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineRest.java

@@ -37,82 +37,69 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
-/**
- * Project: anrui-riskcenter(放款资料审核) <br/>
- * File: LoanFileexamineFeignFallback.java <br/>
- * Class: com.yxt.anrui.riskcenter.biz.loanfileexamine.LoanFileexamineRest <br/>
- * Description: 放款资料审核. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2023-09-08 09:43:46 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Api(tags = "放款资料审核")
-@RestController("com.yxt.anrui.riskcenter.biz.loanfileexamine.LoanFileexamineRest")
+@RestController
 @RequestMapping("v1/loanfileexamine")
 public class LoanFileexamineRest implements LoanFileexamineFeign {
 
-	@Autowired
-	private LoanFileexamineService loanFileexamineService;
+    @Autowired
+    private LoanFileexamineService loanFileexamineService;
 
-	@Override
-	@ApiOperation("根据条件分页查询数据的列表")
-	@PostMapping("/listPage")
-	public ResultBean<PagerVo<LoanFileexamineVo>> listPage(@RequestBody PagerQuery<LoanFileexamineQuery> pq){
-		ResultBean rb = ResultBean.fireFail();
-		PagerVo<LoanFileexamineVo> pv = loanFileexamineService.listPageVo(pq);
-		return rb.success().setData(pv);
-	}
+    @Override
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<LoanFileexamineVo>> listPage(@RequestBody PagerQuery<LoanFileexamineQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<LoanFileexamineVo> pv = loanFileexamineService.listPageVo(pq);
+        return rb.success().setData(pv);
+    }
 
-	@Override
-	@ApiOperation("新增或修改")
-	@PostMapping("/save")
-	public ResultBean save(@RequestBody LoanFileexamineDto dto){
-		ResultBean rb = ResultBean.fireFail();
-		loanFileexamineService.saveOrUpdateDto(dto);
-		return rb.success();
-	}
+    @Override
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody LoanFileexamineDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        loanFileexamineService.saveOrUpdateDto(dto);
+        return rb.success();
+    }
 
-	@Override
-	@ApiOperation("根据sid批量删除")
+    @Override
+    @ApiOperation("根据sid批量删除")
     @PostMapping("/delBySids")
-    public ResultBean delBySids(@RequestBody String[] sids){
-		ResultBean rb = ResultBean.fireFail();
-		loanFileexamineService.delBySids(sids);
-		return rb.success();
-	}
+    public ResultBean delBySids(@RequestBody String[] sids) {
+        ResultBean rb = ResultBean.fireFail();
+        loanFileexamineService.delBySids(sids);
+        return rb.success();
+    }
 
-	@Override
-	@ApiOperation("根据SID获取一条记录")
+    @Override
+    @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
-    public ResultBean<LoanFileexamineDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
-		ResultBean rb = ResultBean.fireFail();
-		LoanFileexamineDetailsVo vo = loanFileexamineService.fetchDetailsVoBySid(sid);
-		return rb.success().setData(vo);
-	}
+    public ResultBean<LoanFileexamineDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        LoanFileexamineDetailsVo vo = loanFileexamineService.fetchDetailsVoBySid(sid);
+        return rb.success().setData(vo);
+    }
 
-	@Override
-	public ResultBean uploadFile(LoanFileDto loanFileDto) {
-		ResultBean rb = ResultBean.fireFail();
-		loanFileexamineService.uploadFile(loanFileDto);
-		return rb.success();
-	}
+    @Override
+    public ResultBean uploadFile(LoanFileDto loanFileDto) {
+        ResultBean rb = ResultBean.fireFail();
+        loanFileexamineService.uploadFile(loanFileDto);
+        return rb.success();
+    }
 
-	@Override
-	public ResultBean<LoanFileexamine> selectOrderSidAndContract(String saleOrderSid, String loanContractSid) {
-		return loanFileexamineService.selectOrderSidAndContract(saleOrderSid,loanContractSid);
-	}
+    @Override
+    public ResultBean<LoanFileexamine> selectOrderSidAndContract(String saleOrderSid, String loanContractSid) {
+        return loanFileexamineService.selectOrderSidAndContract(saleOrderSid, loanContractSid);
+    }
 
-	@Override
-	public ResultBean<String> getToDoNum(RiskToDoNumQuery riskToDoNumQuery) {
-		return loanFileexamineService.getToDoNum(riskToDoNumQuery);
-	}
+    @Override
+    public ResultBean<String> getToDoNum(RiskToDoNumQuery riskToDoNumQuery) {
+        return loanFileexamineService.getToDoNum(riskToDoNumQuery);
+    }
 
-	@Override
-	public ResultBean<String> selectOrderSid(String saleOrderSid) {
-		return loanFileexamineService.selectOrderSid(saleOrderSid);
-	}
+    @Override
+    public ResultBean<String> selectOrderSid(String saleOrderSid) {
+        return loanFileexamineService.selectOrderSid(saleOrderSid);
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineService.java

@@ -33,28 +33,19 @@ import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateFeign
 import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
-import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrower;
-import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontract;
 import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontractDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontractFeign;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
-import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrderFeign;
-import com.yxt.anrui.buscenter.api.bustransferrecords.BusTransferRecords;
-import com.yxt.anrui.buscenter.api.bustransferrecords.BusTransferRecordsFeign;
 import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceFeign;
 import com.yxt.anrui.fin.api.finvehicleinvoice.VehicleInvoiceVo;
 import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
-import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum;
 import com.yxt.anrui.riskcenter.api.loanfileexamine.*;
-import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineVo;
-import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigate;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.RiskToDoNumQuery;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanAttachTypeEnum;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileDetailsVo;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileDto;
-import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileFeign;
 import com.yxt.anrui.riskcenter.biz.loancapitalcreditresult.LoanCapitalCreditResultService;
 import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigate.LoanHomevisitInvestigateService;
 import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileService;
@@ -72,19 +63,6 @@ import org.springframework.stereotype.Service;
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * Project: anrui-riskcenter(放款资料审核) <br/>
- * File: LoanFileexamineService.java <br/>
- * Class: com.yxt.anrui.riskcenter.biz.loanfileexamine.LoanFileexamineService <br/>
- * Description: 放款资料审核 业务逻辑. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2023-09-08 09:43:46 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Service
 public class LoanFileexamineService extends MybatisBaseService<LoanFileexamineMapper, LoanFileexamine> {
 
@@ -108,8 +86,6 @@ public class LoanFileexamineService extends MybatisBaseService<LoanFileexamineMa
     private FinVehicleInvoiceFeign finVehicleInvoiceFeign;
     @Autowired
     private LoanCapitalCreditResultService loanCapitalCreditResultService;
-    @Autowired
-    private LoanHomevisitInvestigateService loanHomevisitInvestigateService;
 
     public PagerVo<LoanFileexamineVo> listPageVo(PagerQuery<LoanFileexamineQuery> pq) {
         LoanFileexamineQuery query = pq.getParams();

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyService.java

@@ -336,7 +336,9 @@ public class LoanRestoreReportApplyService extends MybatisBaseService<LoanRestor
         loanRestoreReportApplyDetailsVo.setCsjlSid(saleVehSid);
         BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(saleVehSid).getData();
         LoanSolutions loanSolutions = loanSolutionsService.selectBySaleOrderSid(busSalesOrderVehicle.getSalesOrderSid());
-        loanRestoreReportApplyDetailsVo.setJrfaSid(loanSolutions.getSid());
+        if (loanSolutions != null){
+            loanRestoreReportApplyDetailsVo.setJrfaSid(loanSolutions.getSid());
+        }
         loanRestoreReportApplyDetailsVo.setSaleVehSid(saleVehSid);
         AlrepaidAndArrVo alrepaidAndArr = getAlrepaidAndArr2(saleVehSid);
         loanRestoreReportApplyDetailsVo.setAlRepaidMoney(alrepaidAndArr.getAlRepaidMoney());

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateFeign.java

@@ -56,6 +56,11 @@ public interface ScmVehRebateFeign {
     @ResponseBody
     public ResultBean<List<ScmVehRebateVo>> listAll(@RequestBody ScmVehRebateQuery query);
 
+    @ApiOperation("统计")
+    @PostMapping("/statistics")
+    @ResponseBody
+    public ResultBean<PagerVo<ScmVehRebateStatVo>> statistics(@RequestBody PagerQuery<ScmVehRebateStatQuery> pq);
+
     @ApiOperation("单车返利未预提申请选择单车返利信息")
     @PostMapping("/withApplyGetVehRebate")
     @ResponseBody

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateFeignFallback.java

@@ -36,19 +36,6 @@ import java.io.IOException;
 import java.text.ParseException;
 import java.util.List;
 
-/**
- * Project: anrui-scm(单车返利) <br/>
- * File: ScmVehRebateFeignFallback.java <br/>
- * Class: com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateFeignFallback <br/>
- * Description: 单车返利表. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2022-08-24 09:01:54 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Component
 public class ScmVehRebateFeignFallback implements ScmVehRebateFeign {
 
@@ -63,6 +50,11 @@ public class ScmVehRebateFeignFallback implements ScmVehRebateFeign {
 		return null;
 	}
 
+	@Override
+	public ResultBean<PagerVo<ScmVehRebateStatVo>> statistics(PagerQuery<ScmVehRebateStatQuery> pq) {
+		return null;
+	}
+
 	@Override
 	public ResultBean<PagerVo<ScmVehRebateVo>> withApplyGetVehRebate(PagerQuery<ScmVehRebateQuery> pq) {
 		return null;

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateStatQuery.java

@@ -0,0 +1,59 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehrebate;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class ScmVehRebateStatQuery implements Query {
+
+    @ApiModelProperty("事业部")
+    private String division;
+    @ApiModelProperty("分公司")
+    private String useOrgName;
+    @ApiModelProperty("采购系统")
+    private String purchaseSystemName;
+    @ApiModelProperty("品牌名称")
+    private String brandName;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("车型名称")
+    private String vehModelName;
+
+    @ApiModelProperty("销售日期")
+    private String saleDateStart;
+    private String saleDateEnd;
+    @ApiModelProperty("实销日期")
+    private String acSaleDateStart;
+    private String acSaleDateEnd;
+
+    private String userSid;
+    private String orgPath;
+    private String menuUrl;
+    private String menuSid;
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateStatVo.java

@@ -0,0 +1,76 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehrebate;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class ScmVehRebateStatVo implements Vo {
+
+    private String sid;
+
+    @ApiModelProperty("采购系统")
+    private String purchaseSystemName;
+    @ApiModelProperty("车型名称")
+    private String vehModelName;
+    @ApiModelProperty("车辆sid")
+    private String vehSid;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("销售日期")
+    private String saleDate;
+    @ApiModelProperty("实销日期")
+    private String acSaleDate;
+
+    @ApiModelProperty("预计返利")
+    private BigDecimal estimateRebate;
+    @ApiModelProperty("上传金额")
+    private BigDecimal uploadMoney;
+    @ApiModelProperty("二次上传金额")
+    private BigDecimal secondaryUploadMoney;
+    @ApiModelProperty("待确定金额")
+    private BigDecimal stayDetermineMoney;
+    @ApiModelProperty("调整金额")
+    private BigDecimal adjustmentMoney;
+    @ApiModelProperty("未上传金额")
+    private BigDecimal notUploadMoney;
+
+    @ApiModelProperty("其中预计费用")
+    private BigDecimal expectCost;
+    @ApiModelProperty("其中费用")
+    private BigDecimal money;
+
+    @ApiModelProperty("品牌名称")
+    private String brandName;
+    @ApiModelProperty("分公司")
+    private String useOrgName;
+    @ApiModelProperty("事业部")
+    private String division;
+}

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.java

@@ -35,24 +35,13 @@ import org.apache.ibatis.annotations.*;
 
 import java.util.List;
 
-/**
- * Project: anrui-scm(单车返利) <br/>
- * File: ScmVehRebateMapper.java <br/>
- * Class: com.yxt.anrui.scm.biz.scmvehrebate.ScmVehRebateMapper <br/>
- * Description: 单车返利表. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2022-08-24 09:01:54 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Mapper
 public interface ScmVehRebateMapper extends BaseMapper<ScmVehRebate> {
 
     IPage<ScmVehRebateVo> selectPageVo(IPage<ScmVehRebate> page, @Param(Constants.WRAPPER) Wrapper<ScmVehRebate> qw);
 
+    IPage<ScmVehRebateStatVo> statistics(IPage<ScmVehRebate> page, @Param(Constants.WRAPPER) QueryWrapper<ScmVehRebate> qw);
+
     IPage<ScmVehRebateVo> selectPageVoUpload(IPage<ScmVehRebate> page, @Param(Constants.WRAPPER) QueryWrapper<ScmVehRebate> qw);
 
     @Update("update scm_veh_rebate set state = #{state} where sid = #{sid}")

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml

@@ -19,6 +19,10 @@
         </where>
     </select>
 
+    <select id="statistics" resultType="com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateStatVo">
+
+    </select>
+
     <select id="selectPageVoUpload" resultType="com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateVo">
         SELECT
         *,

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateRest.java

@@ -74,6 +74,13 @@ public class ScmVehRebateRest implements ScmVehRebateFeign {
         return rb.success().setData(scmVehRebateVoList);
     }
 
+    @Override
+    public ResultBean<PagerVo<ScmVehRebateStatVo>> statistics(PagerQuery<ScmVehRebateStatQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<ScmVehRebateStatVo> pv = scmVehRebateService.statistics(pq);
+        return rb.success().setData(pv);
+    }
+
     @ApiOperation("导出")
     @PostMapping("/excelList")
     public void excelList(@RequestBody ScmVehRebateQuery query) {

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java

@@ -353,6 +353,86 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
         return scmVehRebateVoList;
     }
 
+    public PagerVo<ScmVehRebateStatVo> statistics(PagerQuery<ScmVehRebateStatQuery> pq) {
+        ScmVehRebateStatQuery query = pq.getParams();
+        QueryWrapper<ScmVehRebate> qw = new QueryWrapper<>();
+        //========================================数据授权开始
+        if (StringUtils.isNotBlank(query.getMenuUrl())) {
+            PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+            privilegeQuery.setOrgPath(query.getOrgPath());
+            privilegeQuery.setMenuUrl(query.getMenuUrl());
+            privilegeQuery.setMenuSid(query.getMenuSid());
+            privilegeQuery.setUserSid(query.getUserSid());
+            ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
+            if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
+                //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
+                String orgSidPath = query.getOrgPath();
+                orgSidPath = orgSidPath + "/";
+                int i1 = orgSidPath.indexOf("/");
+                int i2 = orgSidPath.indexOf("/", i1 + 1);
+                int i3 = orgSidPath.indexOf("/", i2 + 1);
+                int i4 = orgSidPath.indexOf("/", i3 + 1);
+                String orgLevelKey = defaultIdReltBean.getData();
+                if ("1".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i1);
+                    qw.like("orgPath", orgSidPath);
+                } else if ("2".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i2);
+                    qw.like("orgPath", orgSidPath);
+                } else if ("3".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i3);
+                    qw.like("orgPath", orgSidPath);
+                } else if ("4".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i4);
+                    qw.like("orgPath", orgSidPath);
+                } else if ("5".equals(orgLevelKey)) {
+                    qw.eq("createBySid", query.getUserSid());
+                } else {
+                    PagerVo<ScmVehRebateStatVo> p = new PagerVo<>();
+                    return p;
+                }
+            } else {
+                PagerVo<ScmVehRebateStatVo> p = new PagerVo<>();
+                return p;
+            }
+        }
+        if (StringUtils.isNotBlank(query.getDivision())) {
+            qw.like("division", query.getDivision());
+        }
+        if (StringUtils.isNotBlank(query.getUseOrgName())) {
+            qw.like("useOrgName", query.getUseOrgName());
+        }
+        if (StringUtils.isNotBlank(query.getPurchaseSystemName())) {
+            qw.like("purchaseSystemName", query.getPurchaseSystemName());
+        }
+        if (StringUtils.isNotBlank(query.getBrandName())) {
+            qw.like("brandName", query.getBrandName());
+        }
+        if (StringUtils.isNotBlank(query.getVinNo())) {
+            qw.like("vinNo", query.getVinNo());
+        }
+        if (StringUtils.isNotBlank(query.getVehModelName())) {
+            qw.like("vehModelName", query.getVehModelName());
+        }
+
+
+        String saleDateStart = query.getSaleDateStart();
+        String saleDateEnd = query.getSaleDateEnd();
+        qw.apply(StringUtils.isNotBlank(saleDateStart), "date_format (createTime,'%Y-%m-%d') >= date_format('" + saleDateStart + "','%Y-%m-%d')").
+                apply(StringUtils.isNotBlank(saleDateEnd), "date_format (createTime,'%Y-%m-%d') <= date_format('" + saleDateEnd + "','%Y-%m-%d')"
+                );
+        String acSaleDateStart = query.getAcSaleDateStart();
+        String acSaleDateEnd = query.getAcSaleDateEnd();
+        qw.apply(StringUtils.isNotBlank(acSaleDateStart), "date_format (createTime,'%Y-%m-%d') >= date_format('" + acSaleDateStart + "','%Y-%m-%d')").
+                apply(StringUtils.isNotBlank(acSaleDateEnd), "date_format (createTime,'%Y-%m-%d') <= date_format('" + acSaleDateEnd + "','%Y-%m-%d')"
+                );
+        qw.orderByDesc("createTime");
+        IPage<ScmVehRebate> page = PagerUtil.queryToPage(pq);
+        IPage<ScmVehRebateStatVo> pagging = baseMapper.statistics(page, qw);
+        PagerVo<ScmVehRebateStatVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
     public PagerVo<ScmVehRebateVo> withApplyGetVehRebate(PagerQuery<ScmVehRebateQuery> pq) {
         ScmVehRebateQuery query = pq.getParams();
         QueryWrapper<ScmVehRebate> qw = new QueryWrapper<>();

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/fileexamine/FileexamineFeign.java

@@ -33,19 +33,6 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
-/**
- * Project: anrui-riskcenter(放款资料审核) <br/>
- * File: LoanFileexamineFeign.java <br/>
- * Class: com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineFeign <br/>
- * Description: 放款资料审核. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2023-09-08 09:43:46 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Api(tags = "放款资料审核")
 @FeignClient(
         contextId = "terminal-Fileexamine",
@@ -63,7 +50,7 @@ public interface FileexamineFeign {
     @PostMapping("/saveLoanDataInfo")
     @ResponseBody
     public ResultBean save(@RequestBody FileexamineDto dto);
-      
+
     @ApiOperation("根据SID获取一条记录")
     @GetMapping("/getLoanDataInfo")
     @ResponseBody

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/fileexamine/FileexamineRest.java

@@ -25,29 +25,14 @@
  *********************************************************/
 package com.yxt.anrui.terminal.biz.risk.fileexamine;
 
-import com.yxt.anrui.riskcenter.api.loanfileexamine.*;
 import com.yxt.anrui.terminal.api.risk.fileexamine.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-/**
- * Project: anrui-riskcenter(放款资料审核) <br/>
- * File: LoanFileexamineFeignFallback.java <br/>
- * Class: com.yxt.anrui.riskcenter.biz.loanfileexamine.LoanFileexamineRest <br/>
- * Description: 放款资料审核. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2023-09-08 09:43:46 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Api(tags = "放款资料审核")
 @RestController
 @RequestMapping("riskcenter/v1/loanData")

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/fileexamine/FileexamineService.java

@@ -54,6 +54,7 @@ public class FileexamineService {
         LoanFileexamineQuery params1 = new LoanFileexamineQuery();
         params1.setOrgSidPath(params.getOrgPath());
         params1.setUserSid(params.getUserSid());
+        params1.setMenuSid(params.getMenuSid());
         params1.setNames(params.getNames());
         params1.setType(params.getType());
         pq.setParams(params1);