Browse Source

优化

master
dimengzhe 2 years ago
parent
commit
a8f608337c
  1. 5
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredFeign.java
  2. 5
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredFeignFallback.java
  3. 29
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/UnDeliverQuery.java
  4. 26
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/UnDeliverVo.java
  5. 2
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.java
  6. 29
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml
  7. 7
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredRest.java
  8. 27
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java
  9. 3
      anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
  10. 9
      anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportFeign.java
  11. 14
      anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportQuery.java
  12. 113
      anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportVo.java
  13. 13
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java

5
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredFeign.java

@ -68,6 +68,11 @@ public interface BusDeliveredFeign {
@ResponseBody
public ResultBean<PagerVo<BusDeliveredVo>> listPage(@RequestBody PagerQuery<BusDeliveredQuery> pq);
@ApiOperation("可欠款出库车辆列表")
@PostMapping("/unListPage")
@ResponseBody
public ResultBean<PagerVo<UnDeliverVo>> unListPage(@RequestBody PagerQuery<UnDeliverQuery> pq);
@ApiOperation("新增或修改")
@PostMapping("/save")
@ResponseBody

5
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredFeignFallback.java

@ -55,6 +55,11 @@ public class BusDeliveredFeignFallback implements BusDeliveredFeign {
return rb.setMsg("接口anrui-buscenter/busdelivered/listPage无法访问");
}
@Override
public ResultBean<PagerVo<UnDeliverVo>> unListPage(PagerQuery<UnDeliverQuery> pq) {
return null;
}
@Override
public ResultBean save(BusDeliveredDto dto){
return ResultBean.fireFail().setMsg("接口anrui-buscenter/busdelivered/save无法访问");

29
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/UnDeliverQuery.java

@ -0,0 +1,29 @@
package com.yxt.anrui.buscenter.api.busdelivered;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* @description:
* @author: dimengzhe
* @date: 2023/9/27
**/
@Data
public class UnDeliverQuery implements Query {
private static final long serialVersionUID = 595613042527984116L;
@ApiModelProperty("销售类型")
private String paymentMethod;
@ApiModelProperty("合同编号")
private String contractNo;
@ApiModelProperty("客户名称")
private String name;
@ApiModelProperty("车架号")
private String vinNo;
@ApiModelProperty("已选择的车辆")
private List<String> list = new ArrayList<>();
}

26
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/UnDeliverVo.java

@ -0,0 +1,26 @@
package com.yxt.anrui.buscenter.api.busdelivered;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @description:
* @author: dimengzhe
* @date: 2023/9/27
**/
@Data
public class UnDeliverVo {
@ApiModelProperty("业务车辆sid")
private String busVinSid;
@ApiModelProperty("销售类型")
private String paymentMethod;
@ApiModelProperty("合同编号")
private String contractNo;
@ApiModelProperty("客户名称")
private String name;
@ApiModelProperty("车架号")
private String vinNo;
@ApiModelProperty("车辆sid")
private String vinSid;
}

2
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.java

@ -103,4 +103,6 @@ public interface BusDeliveredMapper extends BaseMapper<BusDelivered> {
IPage<AppBusDeliveredPageVo> getRetrievalNotLists(IPage<AppBusDeliveredPageVo> page, @Param(Constants.WRAPPER)QueryWrapper<AppBusDeliveredPageQuery> qw, @Param("name") String name);
IPage<AppBusDeliveredPageVo> getRetrievalNotListNew(IPage<AppBusDeliveredPageVo> page, @Param(Constants.WRAPPER)QueryWrapper<AppBusDeliveredPageQuery> qw, @Param("name") String name);
IPage<UnDeliverVo> unListPage(IPage<BusDelivered> page, @Param(Constants.WRAPPER)QueryWrapper<BusDelivered> qw);
}

29
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml

@ -400,4 +400,33 @@
busState = '401'
AND ( finState = '1' OR carryVehicleState = 1 ))
</select>
<select id="unListPage" resultType="com.yxt.anrui.buscenter.api.busdelivered.UnDeliverVo">
select a.* from(select DISTINCT
bo.contractNo,
bo.customerName as name,
bo.payType paymentMethod,
RIGHT(bv.linkNo, 8) as vinNo,
bv.linkSid vinSid,
bv.sid busVinSid
FROM
bus_sales_order bo
LEFT JOIN bus_sales_order_vehicle bv ON bo.sid = bv.salesOrderSid
LEFT JOIN anrui_base.base_vehicle bbv ON bbv.sid = bv.linkSid
LEFT JOIN anrui_base.base_vehicle_state bs ON bs.busSid = bv.sid
<where>
${ew.sqlSegment}
and length(bv.linkSid) > 0
AND bv.sid IN (
SELECT
busSid
FROM
anrui_base.base_vehicle_state
WHERE
busState = '401'
AND ( finState = '0')) and invoiceState = '1' and finSourceKey = '2' AND bbv.vehicleState != '0002'
</where>
order by bo.contractNo desc,bv.id desc) a
</select>
</mapper>

7
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredRest.java

@ -72,6 +72,13 @@ public class BusDeliveredRest implements BusDeliveredFeign {
return rb.success().setData(pv);
}
@Override
public ResultBean<PagerVo<UnDeliverVo>> unListPage(PagerQuery<UnDeliverQuery> pq) {
ResultBean<PagerVo<UnDeliverVo>> rb = ResultBean.fireFail();
PagerVo<UnDeliverVo> pv = busDeliveredService.unListPage(pq);
return rb.success().setData(pv);
}
@Override
@ApiOperation("新增或修改")
@PostMapping("/save")

27
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java

@ -767,4 +767,31 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
BusDelivered busDelivered = baseMapper.selectByBusVinSid(busVinSid);
return rb.success().setData(busDelivered);
}
public PagerVo<UnDeliverVo> unListPage(PagerQuery<UnDeliverQuery> pq) {
UnDeliverQuery query = pq.getParams();
QueryWrapper<BusDelivered> qw = new QueryWrapper<>();
if (query != null) {
//合同编号
if (StringUtils.isNotBlank(query.getContractNo())) {
qw.like("bo.contractNo", query.getContractNo());
}
//客户名称
if (StringUtils.isNotBlank(query.getName())) {
qw.like("bo.customerName", query.getName());
}
//车架号
if (StringUtils.isNotBlank(query.getVinNo())) {
qw.like("bv.linkNo", query.getVinNo());
}
//车架号集合
if (query.getList().size() > 0) {
qw.notIn("bv.linkSid", query.getList());
}
}
IPage<BusDelivered> page = PagerUtil.queryToPage(pq);
IPage<UnDeliverVo> pagging = baseMapper.unListPage(page, qw);
PagerVo<UnDeliverVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
}

3
anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java

@ -33,7 +33,8 @@ public enum ProcDefEnum {
BASEMODELMODPRICE("车型调价申请", "process_kydcif7k:10:4035008"),
BASEINTERNALPURCHASE("调车申请", "process_i6luw5xq:3:722516"),
BASEACCADJAPPLY("调账申请", "process_r6pyzqoz:4:1362508"),
BUSDELIVEREDAPPLY("出库申请", "process_wgt1n66l:10:1700004"),
// BUSDELIVEREDAPPLY("出库申请", "process_wgt1n66l:10:1700004"),
BUSDELIVEREDAPPLY("出库申请", "process_30ixry76:1:5320004"),
BASESHUNINVOICAPPLY("调车开票申请", "process_u4xrvaso:1:400008"),
BASEVEHINSTALLMODPRICE("上装调价申请", "process_s0a0svth:1:492508"),
SCMVEHREBATEWITHAPPLY("单车返利预提申请", "process_qegarc7r:1:535004"),

9
anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportFeign.java

@ -1,6 +1,11 @@
package com.yxt.anrui.reportcenter.api.dailyreport;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.ResponseBody;
/**
* @description:
@ -13,4 +18,8 @@ import org.springframework.cloud.openfeign.FeignClient;
path = "v1/DailyReport",
fallback = DailyReportFeignFallback.class)
public interface DailyReportFeign {
@PostMapping("listPage")
@ResponseBody
ResultBean<PagerVo<DailyReportVo>> listPage(PagerQuery<DailyReportQuery> pagerQuery);
}

14
anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportQuery.java

@ -0,0 +1,14 @@
package com.yxt.anrui.reportcenter.api.dailyreport;
import com.yxt.common.core.query.Query;
import lombok.Data;
/**
* @description:
* @author: dimengzhe
* @date: 2023/9/27
**/
@Data
public class DailyReportQuery implements Query {
private static final long serialVersionUID = -3990941897379861702L;
}

113
anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportVo.java

@ -0,0 +1,113 @@
package com.yxt.anrui.reportcenter.api.dailyreport;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @description:
* @author: dimengzhe
* @date: 2023/9/27
**/
@Data
public class DailyReportVo implements Vo {
private static final long serialVersionUID = -6566750408193997913L;
@ApiModelProperty("创建时间")
private String createTime;
@ApiModelProperty("事业部sid")
private String busOrgSid;
@ApiModelProperty("事业部名称")
private String busOrgName;
@ApiModelProperty("品牌sid")
private String brandSid;
@ApiModelProperty("品牌名称")
private String brandName;
@ApiModelProperty("分公司sid")
private String useOrgSid;
@ApiModelProperty("分公司名称")
private String useOrgName;
@ApiModelProperty("车型sid")
private String vehModelSid;
@ApiModelProperty("车型名称")
private String vehModeName;
@ApiModelProperty("配置sid")
private String vehMConfigSid;
@ApiModelProperty("配置名称")
private String vehMConfigName;
@ApiModelProperty("存销比")
private String saleOfStockRatio;
@ApiModelProperty("库存总计")
private int stock_total;
@ApiModelProperty("库存未定")
private int stock_unreserve;
@ApiModelProperty("库存已定")
private int stock_reserve;
@ApiModelProperty("库存小计")
private int stock_subtotal;
@ApiModelProperty("库存-买断未定")
private int stock_buyout_unreserve;
@ApiModelProperty("库存-买断已定")
private int stock_buyout_reserve;
@ApiModelProperty("库存-买断小计")
private int stock_buyout_subtotal;
@ApiModelProperty("排产-未定")
private int pcOrder_unreserve;
@ApiModelProperty("排产-已定")
private int pcOrder_reserve;
@ApiModelProperty("排产-小计")
private int pcOrder_subtotal;
@ApiModelProperty("简易订单-本日")
private int simpleOrder_day;
@ApiModelProperty("简易订单-本月")
private int simpleOrder_month;
@ApiModelProperty("销售订单-全款-本日")
private int saleOrder_full_day;
@ApiModelProperty("销售订单-贷款-本日")
private int saleOrder_loan_day;
@ApiModelProperty("销售订单-小计-本日")
private int saleOrder_subtotal_day;
@ApiModelProperty("销售订单-全款-本月")
private int saleOrder_full_month;
@ApiModelProperty("销售订单-贷款-本月")
private int saleOrder_loan_month;
@ApiModelProperty("销售订单-小计-本月")
private int saleOrder_subtotal_month;
@ApiModelProperty("销售订单-待交车累计")
private int saleOrder_waitVeh_total;
@ApiModelProperty("销售-全款-本日")
private int sale_full_day;
@ApiModelProperty("销售-贷款-本日")
private int sale_loan_day;
@ApiModelProperty("销售-小计-本日")
private int sale_subtotal_day;
@ApiModelProperty("销售-全款-本月")
private int sale_full_month;
@ApiModelProperty("销售-贷款-本月")
private int sale_loan_month;
@ApiModelProperty("销售-小计-本月")
private int sale_subtotal_month;
@ApiModelProperty("销售-全款-本年")
private int sale_full_year;
@ApiModelProperty("销售-贷款-本年")
private int sale_loan_year;
@ApiModelProperty("销售-小计-本年")
private int sale_subtotal_year;
@ApiModelProperty("厂家开票数-全年")
private int manufacturer_invoicing_year;
@ApiModelProperty("买断-本日")
private int buyout_day;
@ApiModelProperty("买断-本月")
private int buyout_month;
@ApiModelProperty("买断-本年")
private int buyout_year;
@ApiModelProperty("欠款提车-数量")
private int arrears_carry_veh_count;
@ApiModelProperty("欠款提车-金额")
private String arrears_carry_veh_amount;
@ApiModelProperty("金融未放款-数量")
private int loan_not_count;
@ApiModelProperty("金融未放款-金额")
private String loan_not_amount;
@ApiModelProperty("备注")
private String remarks;
}

13
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java

@ -33,6 +33,7 @@ import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign;
import com.yxt.anrui.base.api.commonappendix.CommonAppendixSelectQuery;
import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
import com.yxt.anrui.riskcenter.api.loancreditappealapply.LoanCreditAppealApply;
import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicy;
import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.*;
import com.yxt.anrui.riskcenter.api.loanpreloancreditpeo.LoanPreloanCreditPeoDetailsVo;
import com.yxt.anrui.riskcenter.api.loanpreloancreditpeo.LoanPreloanCreditPeoDto;
@ -41,6 +42,7 @@ import com.yxt.anrui.riskcenter.api.loantemplate.LoanTemplate;
import com.yxt.anrui.riskcenter.api.loantemplate.LoanTemplateQuery;
import com.yxt.anrui.riskcenter.api.loantemplate.LoanTemplateVo;
import com.yxt.anrui.riskcenter.biz.loancreditappealapply.LoanCreditAppealApplyService;
import com.yxt.anrui.riskcenter.biz.loanfinpolicy.LoanFinPolicyService;
import com.yxt.anrui.riskcenter.biz.loanpreloancreditpeo.LoanPreloanCreditPeoService;
import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
@ -74,6 +76,8 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService<LoanPreloa
private LoanCreditAppealApplyService loanCreditAppealApplyService;
@Autowired
private LoanSolutionsService loanSolutionsService;
@Autowired
private LoanFinPolicyService loanFinPolicyService;
public PagerVo<LoanPreloanCreditApplyVo> listPageVo(PagerQuery<LoanPreloanCreditApplyQuery> pq) {
LoanPreloanCreditApplyQuery query = pq.getParams();
@ -584,6 +588,15 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService<LoanPreloa
if (borrowSidList.size() > 0) {
qw.notIn("la.custSid", borrowSidList);
}
//根据销售订单sid查询资方
LoanSolutions loanSolutions = loanSolutionsService.selectByApplySid(query.getOrderSid());
if(loanSolutions != null){
//根据产品政策查询
LoanFinPolicy loanFinPolicy = loanFinPolicyService.fetchBySid(loanSolutions.getPolicySid());
if(loanFinPolicy != null){
qw.eq("la.capitalSid",loanFinPolicy.getBankSid());
}
}
}
IPage<LoanPreloanCreditApply> page = PagerUtil.queryToPage(pagerQuery);
IPage<LoanPreloanVo> pagging = baseMapper.getOrderLoanPagerList(page, qw, query.getName());

Loading…
Cancel
Save