diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineFeign.java index 8a5ea445dc..e9f9551894 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineFeign.java +++ b/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(放款资料审核)
- * File: LoanFileexamineFeign.java
- * Class: com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineFeign
- * Description: 放款资料审核.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2023-09-08 09:43:46
- * - * @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 selectOrderSidAndContract(@RequestParam("saleOrderSid") String saleOrderSid, @RequestParam(value = "loanContractSid",required = false) String loanContractSid); + ResultBean selectOrderSidAndContract(@RequestParam("saleOrderSid") String saleOrderSid, @RequestParam(value = "loanContractSid", required = false) String loanContractSid); @ApiOperation("手机端-查询本分公司下代办数量:切换机构") @GetMapping("/getToDoNum") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrestorereportapply/LoanRestoreReportApplyFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrestorereportapply/LoanRestoreReportApplyFeign.java index a07ef26483..cbfac9fd36 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrestorereportapply/LoanRestoreReportApplyFeign.java +++ b/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(车辆交回事前报备申请)
- * File: LoanRestoreReportApplyFeign.java
- * Class: com.yxt.anrui.riskcenter.api.loanrestorereportapply.LoanRestoreReportApplyFeign
- * Description: 车辆交回事前报备申请.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-01-08 11:43:57
- * - * @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 diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineMapper.xml index 3ea262c469..d140aeb2ef 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineMapper.xml @@ -5,26 +5,26 @@ 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' diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineRest.java index 4efe5b2db9..625b9135c5 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineRest.java +++ b/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(放款资料审核)
- * File: LoanFileexamineFeignFallback.java
- * Class: com.yxt.anrui.riskcenter.biz.loanfileexamine.LoanFileexamineRest
- * Description: 放款资料审核.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2023-09-08 09:43:46
- * - * @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> listPage(@RequestBody PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = loanFileexamineService.listPageVo(pq); - return rb.success().setData(pv); - } + @Override + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo 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 fetchDetailsBySid(@PathVariable("sid") String sid){ - ResultBean rb = ResultBean.fireFail(); - LoanFileexamineDetailsVo vo = loanFileexamineService.fetchDetailsVoBySid(sid); - return rb.success().setData(vo); - } + public ResultBean 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 selectOrderSidAndContract(String saleOrderSid, String loanContractSid) { - return loanFileexamineService.selectOrderSidAndContract(saleOrderSid,loanContractSid); - } + @Override + public ResultBean selectOrderSidAndContract(String saleOrderSid, String loanContractSid) { + return loanFileexamineService.selectOrderSidAndContract(saleOrderSid, loanContractSid); + } - @Override - public ResultBean getToDoNum(RiskToDoNumQuery riskToDoNumQuery) { - return loanFileexamineService.getToDoNum(riskToDoNumQuery); - } + @Override + public ResultBean getToDoNum(RiskToDoNumQuery riskToDoNumQuery) { + return loanFileexamineService.getToDoNum(riskToDoNumQuery); + } - @Override - public ResultBean selectOrderSid(String saleOrderSid) { - return loanFileexamineService.selectOrderSid(saleOrderSid); - } + @Override + public ResultBean selectOrderSid(String saleOrderSid) { + return loanFileexamineService.selectOrderSid(saleOrderSid); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineService.java index d92bf512cd..5bb44f599b 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineService.java +++ b/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(放款资料审核)
- * File: LoanFileexamineService.java
- * Class: com.yxt.anrui.riskcenter.biz.loanfileexamine.LoanFileexamineService
- * Description: 放款资料审核 业务逻辑.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2023-09-08 09:43:46
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Service public class LoanFileexamineService extends MybatisBaseService { @@ -108,8 +86,6 @@ public class LoanFileexamineService extends MybatisBaseService listPageVo(PagerQuery pq) { LoanFileexamineQuery query = pq.getParams(); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyService.java index 80567745a5..c9b77a0afb 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyService.java +++ b/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> listAll(@RequestBody ScmVehRebateQuery query); + @ApiOperation("统计") + @PostMapping("/statistics") + @ResponseBody + public ResultBean> statistics(@RequestBody PagerQuery pq); + @ApiOperation("单车返利未预提申请选择单车返利信息") @PostMapping("/withApplyGetVehRebate") @ResponseBody diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateFeignFallback.java index eb5bba0b85..90cee3fa14 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateFeignFallback.java +++ b/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(单车返利)
- * File: ScmVehRebateFeignFallback.java
- * Class: com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateFeignFallback
- * Description: 单车返利表.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-08-24 09:01:54
- * - * @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> statistics(PagerQuery pq) { + return null; + } + @Override public ResultBean> withApplyGetVehRebate(PagerQuery pq) { return null; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateStatQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateStatQuery.java new file mode 100644 index 0000000000..2c658fee20 --- /dev/null +++ b/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; +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateStatVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateStatVo.java new file mode 100644 index 0000000000..a6b9b87fb9 --- /dev/null +++ b/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; +} diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.java index 6c165dd023..0821c7ee9f 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.java +++ b/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(单车返利)
- * File: ScmVehRebateMapper.java
- * Class: com.yxt.anrui.scm.biz.scmvehrebate.ScmVehRebateMapper
- * Description: 单车返利表.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-08-24 09:01:54
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Mapper public interface ScmVehRebateMapper extends BaseMapper { IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + IPage statistics(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + IPage selectPageVoUpload(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); @Update("update scm_veh_rebate set state = #{state} where sid = #{sid}") diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml index e5532e7491..3b46fb57ac 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml @@ -19,6 +19,10 @@ + +