Browse Source

修改

zhanglei
ligaode 4 weeks ago
parent
commit
35a061c8a2
  1. 6
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyService.java
  2. 8
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateFeign.java
  3. 143
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateFeignFallback.java
  4. 110
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateStatMxVo.java
  5. 2
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateStatVo.java
  6. 2
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.java
  7. 75
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml
  8. 7
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateRest.java
  9. 38
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java

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

@ -307,7 +307,9 @@ public class LoanRestoreReportApplyService extends MybatisBaseService<LoanRestor
vo.setCsjlSid(entity.getSaleVehSid());
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(entity.getSaleVehSid()).getData();
LoanSolutions loanSolutions = loanSolutionsService.selectBySaleOrderSid(busSalesOrderVehicle.getSalesOrderSid());
vo.setJrfaSid(loanSolutions.getSid());
if (loanSolutions != null) {
vo.setJrfaSid(loanSolutions.getSid());
}
return vo;
}
@ -336,7 +338,7 @@ public class LoanRestoreReportApplyService extends MybatisBaseService<LoanRestor
loanRestoreReportApplyDetailsVo.setCsjlSid(saleVehSid);
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(saleVehSid).getData();
LoanSolutions loanSolutions = loanSolutionsService.selectBySaleOrderSid(busSalesOrderVehicle.getSalesOrderSid());
if (loanSolutions != null){
if (loanSolutions != null) {
loanRestoreReportApplyDetailsVo.setJrfaSid(loanSolutions.getSid());
}
loanRestoreReportApplyDetailsVo.setSaleVehSid(saleVehSid);

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

@ -42,8 +42,7 @@ import java.util.List;
@FeignClient(
contextId = "anrui-scm-ScmVehRebate",
name = "anrui-scm",
path = "v1/scmvehrebate",
fallback = ScmVehRebateFeignFallback.class)
path = "v1/scmvehrebate")
public interface ScmVehRebateFeign {
@ApiOperation("根据条件分页查询数据的列表")
@ -61,6 +60,11 @@ public interface ScmVehRebateFeign {
@ResponseBody
public ResultBean<PagerVo<ScmVehRebateStatVo>> statistics(@RequestBody PagerQuery<ScmVehRebateStatQuery> pq);
@ApiOperation("统计明细")
@GetMapping("/getDetail/{sid}")
@ResponseBody
public ResultBean<List<ScmVehRebateStatMxVo>> getDetail(@PathVariable("sid") String sid);
@ApiOperation("单车返利未预提申请选择单车返利信息")
@PostMapping("/withApplyGetVehRebate")
@ResponseBody

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

@ -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<PagerVo<ScmVehRebateVo>> listPage(PagerQuery<ScmVehRebateQuery> pq){
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-scm/scmvehrebate/listPage无法访问");
}
@Override
public ResultBean<List<ScmVehRebateVo>> listAll(ScmVehRebateQuery query) {
return null;
}
@Override
public ResultBean<PagerVo<ScmVehRebateStatVo>> statistics(PagerQuery<ScmVehRebateStatQuery> pq) {
return null;
}
@Override
public ResultBean<PagerVo<ScmVehRebateVo>> withApplyGetVehRebate(PagerQuery<ScmVehRebateQuery> pq) {
return null;
}
@Override
public ResultBean<PagerVo<ScmVehRebateVo>> checkApplyGetVehRebate(PagerQuery<ScmVehRebateQuery> pq) {
return null;
}
@Override
public ResultBean<List<ScmVehRebateVo>> 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<PagerVo<ScmVehRebateVo>> checkApplyGetAlreadyUploadVehRebate(PagerQuery<ScmVehRebateQuery> 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<ScmVehRebateDetailsVo> 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;
}
}

110
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;
}

2
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("车型名称")

2
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<ScmVehRebate> {
List<ScmVehRebateVo> listAll(@Param(Constants.WRAPPER) QueryWrapper<ScmVehRebate> qw);
int delByVehSid2(@Param("vehSid") String vehSid, @Param("useOrgSid") String useOrgSid, @Param("key") String key);
List<ScmVehRebateStatMxVo> getDetail(String vehSid);
}

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

@ -20,7 +20,34 @@
</select>
<select id="statistics" resultType="com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateStatVo">
SELECT
r.purchaseSystemName,
r.vehModelName,
r.vehSid,
r.vinNo,
v.salesDate AS saleDate,
SUM(r.estimateRebate) AS estimateRebate,
SUM(r.uploadMoney) AS uploadMoney,
SUM(r.secondaryUploadMoney) AS secondaryUploadMoney,
SUM(r.stayDetermineMoney) AS stayDetermineMoney,
SUM(r.adjustmentMoney) AS adjustmentMoney,
SUM(r.estimateRebate) - IFNULL(SUM(r.uploadMoney),0) - IFNULL(SUM(r.secondaryUploadMoney),0) + IFNULL(SUM(r.adjustmentMoney),0) AS notUploadMoney,
SUM(r.expectTreatCost) + SUM(r.expectSuppCost) AS expectCost,
SUM(r.onceTreatCost) + SUM(r.onceSuppCost) + SUM(r.secondTreatCost) + SUM(r.secondSuppCost) AS money,
r.brandName,
r.useOrgName,
o.name AS division
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
GROUP BY r.vehSid
</select>
<select id="selectPageVoUpload" resultType="com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateVo">
@ -212,4 +239,50 @@
and useOrgSid = #{useOrgSid}
and rebateTypeKey = #{key}
</delete>
<select id="getDetail" resultType="com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateStatMxVo">
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}
</select>
</mapper>

7
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<List<ScmVehRebateStatMxVo>> getDetail(String sid) {
ResultBean rb = ResultBean.fireFail();
List<ScmVehRebateStatMxVo> scmVehRebateStatMxVos = scmVehRebateService.getDetail(sid);
return rb.success().setData(scmVehRebateStatMxVos);
}
@ApiOperation("导出")
@PostMapping("/excelList")
public void excelList(@RequestBody ScmVehRebateQuery query) {

38
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<ScmVehRebateMapper,
String orgLevelKey = defaultIdReltBean.getData();
if ("1".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i1);
qw.like("orgPath", orgSidPath);
qw.like("r.orgPath", orgSidPath);
} else if ("2".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i2);
qw.like("orgPath", orgSidPath);
qw.like("r.orgPath", orgSidPath);
} else if ("3".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i3);
qw.like("orgPath", orgSidPath);
qw.like("r.orgPath", orgSidPath);
} else if ("4".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i4);
qw.like("orgPath", orgSidPath);
qw.like("r.orgPath", orgSidPath);
} else if ("5".equals(orgLevelKey)) {
qw.eq("createBySid", query.getUserSid());
qw.eq("r.createBySid", query.getUserSid());
} else {
PagerVo<ScmVehRebateStatVo> p = new PagerVo<>();
return p;
@ -397,42 +397,44 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
}
}
if (StringUtils.isNotBlank(query.getDivision())) {
qw.like("division", query.getDivision());
qw.like("o.name", query.getDivision());
}
if (StringUtils.isNotBlank(query.getUseOrgName())) {
qw.like("useOrgName", query.getUseOrgName());
qw.like("r.useOrgName", query.getUseOrgName());
}
if (StringUtils.isNotBlank(query.getPurchaseSystemName())) {
qw.like("purchaseSystemName", query.getPurchaseSystemName());
qw.like("r.purchaseSystemName", query.getPurchaseSystemName());
}
if (StringUtils.isNotBlank(query.getBrandName())) {
qw.like("brandName", query.getBrandName());
qw.like("r.brandName", query.getBrandName());
}
if (StringUtils.isNotBlank(query.getVinNo())) {
qw.like("vinNo", query.getVinNo());
qw.like("r.vinNo", query.getVinNo());
}
if (StringUtils.isNotBlank(query.getVehModelName())) {
qw.like("vehModelName", query.getVehModelName());
qw.like("r.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')"
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<ScmVehRebate> page = PagerUtil.queryToPage(pq);
IPage<ScmVehRebateStatVo> pagging = baseMapper.statistics(page, qw);
PagerVo<ScmVehRebateStatVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public List<ScmVehRebateStatMxVo> getDetail(String vehSid) {
return baseMapper.getDetail(vehSid);
}
public PagerVo<ScmVehRebateVo> withApplyGetVehRebate(PagerQuery<ScmVehRebateQuery> pq) {
ScmVehRebateQuery query = pq.getParams();
QueryWrapper<ScmVehRebate> qw = new QueryWrapper<>();

Loading…
Cancel
Save