diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index 494a7fba9b..0a76720b64 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -4769,7 +4769,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService> statistics(@RequestBody PagerQuery pq); + @ApiOperation("统计明细") + @GetMapping("/getDetail/{sid}") + @ResponseBody + public ResultBean> getDetail(@PathVariable("sid") String sid); + @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 deleted file mode 100644 index 90cee3fa14..0000000000 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateFeignFallback.java +++ /dev/null @@ -1,143 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.anrui.scm.api.scmvehrebate; - -import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; -import org.springframework.stereotype.Component; -import org.springframework.web.multipart.MultipartFile; - -import javax.servlet.http.HttpServletRequest; -import java.io.IOException; -import java.text.ParseException; -import java.util.List; - -@Component -public class ScmVehRebateFeignFallback implements ScmVehRebateFeign { - - @Override - public ResultBean> listPage(PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui-scm/scmvehrebate/listPage无法访问"); - } - - @Override - public ResultBean> listAll(ScmVehRebateQuery query) { - return null; - } - - @Override - public ResultBean> statistics(PagerQuery pq) { - return null; - } - - @Override - public ResultBean> withApplyGetVehRebate(PagerQuery pq) { - return null; - } - - @Override - public ResultBean> checkApplyGetVehRebate(PagerQuery pq) { - return null; - } - - @Override - public ResultBean> checkApplyGetVehRebateAll(ScmVehRebateQuery query) { - return null; - } - - @Override - public void excelListOne(ScmVehRebateQuery scmVehRebateQuery) { - - } - - @Override - public ResultBean getExcelOneInfo(MultipartFile file, HttpServletRequest request, String userSid, String orgPath) throws IOException, ParseException { - return null; - } - - @Override - public void excelListTwo(ScmVehRebateQuery scmVehRebateQuery) { - - } - - @Override - public ResultBean getExcelTwoInfo(MultipartFile file, HttpServletRequest request, String userSid, String orgPath) throws IOException, ParseException { - return null; - } - - @Override - public ResultBean> checkApplyGetAlreadyUploadVehRebate(PagerQuery pq) { - return null; - } - - @Override - public ResultBean save(ScmVehRebateDto dto){ - return ResultBean.fireFail().setMsg("接口anrui-scm/scmvehrebate/save无法访问"); - } - - @Override - public ResultBean update(ScmVehRebateVehDto dto) { - return null; - } - - @Override - public ResultBean adjustment(ScmVehRebateVehAdjDto dto) { - return null; - } - - @Override - public ResultBean delBySids( String[] sids){ - return ResultBean.fireFail().setMsg("接口anrui-scm/scmvehrebate/delBySids无法访问"); - } - - @Override - public ResultBean fetchDetailsBySid(String sid){ - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui-scm/scmvehrebate/fetchDetailsBySid无法访问"); - } - - @Override - public void downloadExcel() { - - } - - @Override - public ResultBean getExcelInfo(MultipartFile file, HttpServletRequest request, String userSid, String orgPath) throws IOException, ParseException { - return null; - } - - @Override - public ResultBean delByVehSid(String vehSid) { - return null; - } - - @Override - public ResultBean delByVehSid2(String vehSid, String useOrgSid, String key) { - return null; - } -} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateStatMxVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateStatMxVo.java new file mode 100644 index 0000000000..30227218f5 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateStatMxVo.java @@ -0,0 +1,110 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmvehrebate; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +@Data +public class ScmVehRebateStatMxVo implements Vo { + + private String sid; + + @ApiModelProperty("采购系统") + private String purchaseSystemName; + @ApiModelProperty("车型名称") + private String vehModelName; + @ApiModelProperty("车架号") + private String vinNo; + @ApiModelProperty("返利类型") + private String rebateTypeValue; + @ApiModelProperty("返利名称") + private String rebateName; + @ApiModelProperty("所属年月") + private String palceGenDate; + + @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("创建日期") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date createTime; + @ApiModelProperty("预提日期") + private String withholdingDate; + @ApiModelProperty("上传日期") + private String uploadDate; + @ApiModelProperty("二次上传日期") + private String secondaryUploadDate; + + @ApiModelProperty("状态") + private String state; + @ApiModelProperty("一次核对状态") + private String onceCheckState; + @ApiModelProperty("二次核对状态") + private String secondCheckState; + + @ApiModelProperty("品牌名称") + private String brandName; + @ApiModelProperty("分公司") + private String useOrgName; + @ApiModelProperty("事业部") + private String division; + @ApiModelProperty("厂家入库价") + private BigDecimal manufactorSettlementPrice; + + @ApiModelProperty("运费") + private BigDecimal freight; + @ApiModelProperty("上装金额") + private BigDecimal topAmount; + + @ApiModelProperty("计算方式") + private String calculationModeValue; + @ApiModelProperty("计算标准") + private String calculationStandard; + + @ApiModelProperty("备注") + private String remarks; +} 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 index a6b9b87fb9..09a91a4164 100644 --- 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 @@ -34,8 +34,6 @@ import java.math.BigDecimal; @Data public class ScmVehRebateStatVo implements Vo { - private String sid; - @ApiModelProperty("采购系统") private String purchaseSystemName; @ApiModelProperty("车型名称") 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 0821c7ee9f..95a6a4e4ed 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 @@ -78,4 +78,6 @@ public interface ScmVehRebateMapper extends BaseMapper { List listAll(@Param(Constants.WRAPPER) QueryWrapper qw); int delByVehSid2(@Param("vehSid") String vehSid, @Param("useOrgSid") String useOrgSid, @Param("key") String key); + + List getDetail(String vehSid); } \ No newline at end of file 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 3b46fb57ac..20b4f8e93a 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 @@ -20,7 +20,34 @@ + SELECT + r.sid, + r.purchaseSystemName, + r.vehModelName, + r.vinNo, + r.rebateTypeValue, + r.rebateName, + r.palceGenDate, + r.estimateRebate, + r.uploadMoney, + r.secondaryUploadMoney, + r.stayDetermineMoney, + r.adjustmentMoney, + r.estimateRebate - IFNULL(r.uploadMoney,0) - IFNULL(r.secondaryUploadMoney,0) + IFNULL(r.adjustmentMoney,0) AS notUploadMoney, + r.expectTreatCost + r.expectSuppCost AS expectCost, + r.onceTreatCost + r.onceSuppCost + r.secondTreatCost + r.secondSuppCost AS money, + r.createTime, + r.withholdingDate, + r.uploadDate, + r.secondaryUploadDate, + r.state, + r.onceCheckState, + r.secondCheckState, + r.brandName, + r.useOrgName, + o.name AS division, + r.manufactorSettlementPrice, + r.freight, + r.topAmount, + r.calculationModeValue, + r.calculationStandard, + r.remarks + FROM + scm_veh_rebate r + LEFT JOIN anrui_base.base_vehicle v + ON r.vehSid = v.sid + LEFT JOIN ( + SELECT o1.name,o2.sid FROM anrui_portal.sys_organization o1 + LEFT JOIN anrui_portal.sys_organization o2 + ON o1.sid = o2.psid + ) AS o + ON o.sid = r.useOrgSid + WHERE vehSid = #{vehSid} + diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateRest.java index 1003e031b8..567f208f97 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateRest.java @@ -81,6 +81,13 @@ public class ScmVehRebateRest implements ScmVehRebateFeign { return rb.success().setData(pv); } + @Override + public ResultBean> getDetail(String sid) { + ResultBean rb = ResultBean.fireFail(); + List scmVehRebateStatMxVos = scmVehRebateService.getDetail(sid); + return rb.success().setData(scmVehRebateStatMxVos); + } + @ApiOperation("导出") @PostMapping("/excelList") public void excelList(@RequestBody ScmVehRebateQuery query) { diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java index 6289b4231e..695752e606 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java @@ -375,18 +375,18 @@ public class ScmVehRebateService extends MybatisBaseService p = new PagerVo<>(); return p; @@ -397,42 +397,44 @@ public class ScmVehRebateService extends MybatisBaseService= date_format('" + saleDateStart + "','%Y-%m-%d')"). - apply(StringUtils.isNotBlank(saleDateEnd), "date_format (createTime,'%Y-%m-%d') <= date_format('" + saleDateEnd + "','%Y-%m-%d')" + qw.apply(StringUtils.isNotBlank(saleDateStart), "date_format (v.salesDate,'%Y-%m-%d') >= date_format('" + saleDateStart + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(saleDateEnd), "date_format (v.salesDate,'%Y-%m-%d') <= date_format('" + saleDateEnd + "','%Y-%m-%d')" ); - String acSaleDateStart = query.getAcSaleDateStart(); + /* 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"); + );*/ + qw.orderByDesc("r.createTime"); IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.statistics(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } + public List getDetail(String vehSid) { + return baseMapper.getDetail(vehSid); + } + public PagerVo withApplyGetVehRebate(PagerQuery pq) { ScmVehRebateQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>();