yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

移动端二次销售审批部分接口

master
dimengzhe 1 year ago
parent
6f9153e606
commit
da36a2534b
7 changed files with 40 additions and 35 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/LoanSecondarySalesApplyDetailsVo.java
  2. 2
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/LoanSecondarySalesApplyDto.java
  3. 2
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyMapper.java
  4. 15
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyMapper.xml
  5. 42
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java
  6. 4
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/secondarysales/SecondarySalesAppVos.java
  7. 8
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/secondarysales/SecondarySalesService.java

2
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/LoanSecondarySalesApplyDetailsVo.java
View File

@ -57,7 +57,7 @@ public class LoanSecondarySalesApplyDetailsVo {
@ApiModelProperty("其他车况说明")
private String illustrate;
@ApiModelProperty("车辆照片")
private List<UrlQuery> filesList = new ArrayList<>();
private List<String> filesList = new ArrayList<>();
@ApiModelProperty("已还金额")
private String alRepaidMoney;
@ApiModelProperty("当前逾期金额")

2
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/LoanSecondarySalesApplyDto.java
View File

@ -57,7 +57,7 @@ public class LoanSecondarySalesApplyDto {
@ApiModelProperty("其他车况说明")
private String illustrate;
@ApiModelProperty("车辆照片")
private List<UrlQuery> filesList = new ArrayList<>();
private List<String> filesList = new ArrayList<>();
@ApiModelProperty("已还金额")
private String alRepaidMoney;
@ApiModelProperty("当前逾期金额")

2
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyMapper.java
View File

@ -20,7 +20,7 @@ import java.util.Map;
**/
@Mapper
public interface LoanSecondarySalesApplyMapper extends BaseMapper<LoanSecondarySalesApply> {
IPage<LoanSecondarySalesApplyVo> selectPageVo(IPage<LoanSecondarySalesApply> page, @Param(Constants.WRAPPER) QueryWrapper<LoanSecondarySalesApply> qw);
IPage<LoanSecondarySalesApplyVo> selectPageVo(IPage<LoanSecondarySalesApply> page, @Param(Constants.WRAPPER) QueryWrapper<LoanSecondarySalesApply> qw,@Param("vinNo") String vinNo,@Param("vehMark") String vehMark);
int updateFlowFiled(Map<String, Object> beanToMap);

15
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyMapper.xml
View File

@ -11,8 +11,10 @@
DATE_FORMAT(la.createTime, '%Y-%m-%d') as createDate,
la.closeDate,
la.loanContractNo,
(select group_concat(lv.vinNo) from loan_secondary_sales_veh lv where lv.mainSid = la.sid) as vinNo,
(select group_concat(lv.vehMark) from loan_secondary_sales_veh lv where lv.mainSid = la.sid) as vehMark,
ss.vinNo,
ss.vehmark,
<!-- (select group_concat(lv.vinNo) from loan_secondary_sales_veh lv where lv.mainSid = la.sid) as vinNo,
(select group_concat(lv.vehMark) from loan_secondary_sales_veh lv where lv.mainSid = la.sid) as vehMark,-->
la.bankName,
la.bankContractNo,
la.customerName,
@ -25,9 +27,18 @@
la.procInstId
from loan_secondary_sales_apply la
left join loan_secondary_sales_cost lc on lc.mainSid = la.sid
left join (select group_concat(lv.vinNo) as vinNo,group_concat(lv.vehMark) as vehmark,lv.mainSid from loan_secondary_sales_veh lv) ss on ss.mainSid = la.sid
<where>
${ew.sqlSegment}
</where>
having 1 = 1
<if test="vinNo != null and vinNo != ''">
and ss.vinNo like concat('%', #{vinNo}, '%')
</if>
<if test="vehMark != null and vehMark != ''">
and ss.vehMark like concat('%', #{vehMark}, '%')
</if>
order by la.createTime desc
</select>
<update id="updateFlowFiled">

42
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java
View File

@ -130,13 +130,6 @@ public class LoanSecondarySalesApplyService extends MybatisBaseService<LoanSecon
if (StringUtils.isNotBlank(query.getLoanContractNo())) {
qw.like("la.loanContractNo", query.getLoanContractNo());
}
//ToDo:车架号
if (StringUtils.isNotBlank(query.getVinNo())) {
}
//车牌号
if (StringUtils.isNotBlank(query.getVehMark())) {
}
//贷款人
if (StringUtils.isNotBlank(query.getLoanName())) {
qw.like("la.loanName", query.getLoanName());
@ -162,6 +155,9 @@ public class LoanSecondarySalesApplyService extends MybatisBaseService<LoanSecon
qw.apply(StringUtils.isNotBlank(query.getCreateTimeStart()), "date_format (la.createTime,'%Y-%m-%d') >= date_format('" + query.getCreateTimeStart() + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(query.getCreateTimeEnd()), "date_format (la.createTime,'%Y-%m-%d') <= date_format('" + query.getCreateTimeEnd() + "','%Y-%m-%d')"
);
if(StringUtils.isNotBlank(query.getArrearsAll())){
qw.like("lc.arrearsAll",query.getArrearsAll());
}
//========================================数据授权开始
if (StringUtils.isNotBlank(query.getMenuUrl())) {
//=======================
@ -203,9 +199,8 @@ public class LoanSecondarySalesApplyService extends MybatisBaseService<LoanSecon
}
}
}
qw.orderByDesc("la.createTime");
IPage<LoanSecondarySalesApply> page = PagerUtil.queryToPage(pq);
IPage<LoanSecondarySalesApplyVo> pagging = baseMapper.selectPageVo(page, qw);
IPage<LoanSecondarySalesApplyVo> pagging = baseMapper.selectPageVo(page, qw,query.getVinNo(),query.getVehMark());
List<LoanSecondarySalesApplyVo> paggingRecords = pagging.getRecords();
paggingRecords.removeAll(Collections.singleton(null));
if (!paggingRecords.isEmpty()) {
@ -601,11 +596,11 @@ public class LoanSecondarySalesApplyService extends MybatisBaseService<LoanSecon
return rb.setMsg(userVoResultBean.getMsg());
}
loanSecondarySalesApply.setCreateByName(userVoResultBean.getData().getName());
List<UrlQuery> filss = dto.getFilesList();
List<String> filss = dto.getFilesList();
filss.removeAll(Collections.singleton(null));
if (filss.size() > 0) {
List<String> filesList = filss.stream().map(v -> v.getUrl()).collect(Collectors.toList());
if (!filesList.isEmpty()) {
String files = String.join(",", filesList).replaceAll(fileUploadComponent.getUrlPrefix(), "");
if (!filss.isEmpty()) {
String files = String.join(",", filss).replaceAll(fileUploadComponent.getUrlPrefix(), "");
loanSecondarySalesApply.setFiles(files);
}
}
@ -628,11 +623,10 @@ public class LoanSecondarySalesApplyService extends MybatisBaseService<LoanSecon
}
dto.setUserSid(loanSecondarySalesApply.getCreateBySid());
BeanUtil.copyProperties(dto, loanSecondarySalesApply, "sid");
List<UrlQuery> filss = dto.getFilesList();
List<String> filss = dto.getFilesList();
if (!filss.isEmpty()) {
List<String> filesList = filss.stream().map(v -> v.getUrl()).collect(Collectors.toList());
if (!filesList.isEmpty()) {
String files = String.join(",", filesList).replaceAll(fileUploadComponent.getUrlPrefix(), "");
if (!filss.isEmpty()) {
String files = String.join(",", filss).replaceAll(fileUploadComponent.getUrlPrefix(), "");
loanSecondarySalesApply.setFiles(files);
}
} else {
@ -743,12 +737,7 @@ public class LoanSecondarySalesApplyService extends MybatisBaseService<LoanSecon
List<UrlQuery> list = new ArrayList<>();
if (StringUtils.isNotBlank(loanReturnInboundApply.getFiles())) {
List<String> fileList = Arrays.asList(loanReturnInboundApply.getFiles().split(",")).stream().map(c -> fileUploadComponent.getUrlPrefix() + c).collect(Collectors.toList());
for (int j = 0; j < fileList.size(); j++) {
UrlQuery urlQuery = new UrlQuery();
urlQuery.setUrl(fileList.get(j));
list.add(urlQuery);
}
loanSecondarySalesApplyDetailsVo.setFilesList(list);
loanSecondarySalesApplyDetailsVo.setFilesList(fileList);
}
}
LoanSecondarySalesCostVo loanSecondarySalesCost = new LoanSecondarySalesCostVo();
@ -873,12 +862,7 @@ public class LoanSecondarySalesApplyService extends MybatisBaseService<LoanSecon
List<UrlQuery> list = new ArrayList<>();
if (StringUtils.isNotBlank(files)) {
List<String> fileList = Arrays.asList(files.split(",")).stream().map(c -> fileUploadComponent.getUrlPrefix() + c).collect(Collectors.toList());
for (int i = 0; i < fileList.size(); i++) {
UrlQuery urlQuery = new UrlQuery();
urlQuery.setUrl(fileList.get(i));
list.add(urlQuery);
}
loanSecondarySalesApplyDetailsVo.setFilesList(list);
loanSecondarySalesApplyDetailsVo.setFilesList(fileList);
}
loanSecondarySalesApplyDetailsVo.setOrgPath(loanSecondarySalesApply.getOrgSidPath());

4
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/secondarysales/SecondarySalesAppVos.java
View File

@ -2,6 +2,8 @@ package com.yxt.anrui.terminal.api.risk.secondarysales;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.anrui.terminal.api.base.common.CarModelVo;
import com.yxt.common.core.result.ResultBean;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -94,4 +96,6 @@ public class SecondarySalesAppVos {
@ApiModelProperty("销售订单sid")
private String salesOrderSid;
private CarModelVo jrfa;
}

8
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/secondarysales/SecondarySalesService.java
View File

@ -7,6 +7,7 @@ import com.yxt.anrui.riskcenter.api.loanreturninboundapply.ReturnAppVo;
import com.yxt.anrui.riskcenter.api.loansecondarysalesapply.LoanSecondarySalesApplyFeign;
import com.yxt.anrui.riskcenter.api.loansecondarysalesapply.SecondarySalesAppVo;
import com.yxt.anrui.riskcenter.api.loansecondarysalesapply.flowable.*;
import com.yxt.anrui.terminal.api.base.common.CarModelVo;
import com.yxt.anrui.terminal.api.risk.returninbound.ReturnInboundAppVo;
import com.yxt.anrui.terminal.api.risk.secondarysales.SecondarySalesAppVos;
import com.yxt.anrui.terminal.api.risk.secondarysales.SecondarySalesCostAppVo;
@ -15,6 +16,7 @@ import com.yxt.anrui.terminal.api.risk.secondarysales.flowable.SecondarySalesDto
import com.yxt.anrui.terminal.api.risk.secondarysales.flowable.SecondarySalesQuery;
import com.yxt.anrui.terminal.api.risk.secondarysales.flowable.SecondarySalesTaskQuery;
import com.yxt.anrui.terminal.api.supplychain.vehicleApply.VehicleApplyCarPageVo;
import com.yxt.anrui.terminal.biz.base.common.CommonService;
import com.yxt.common.core.result.ResultBean;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@ -35,6 +37,8 @@ public class SecondarySalesService {
@Autowired
private LoanSecondarySalesApplyFeign loanSecondarySalesApplyFeign;
@Autowired
private CommonService commonService;
public ResultBean agreeSecondarySales(SecondarySalesDto dto) {
ResultBean rb = ResultBean.fireFail();
@ -188,8 +192,10 @@ public class SecondarySalesService {
otherCostAssumeDetails = otherCostAssumeDetails + secondarySalesCostAppVo.getOtherCostAssume() + "承担";
}
secondarySalesCostAppVo.setOtherCostAssumeDetails(otherCostAssumeDetails);
}
ResultBean<CarModelVo> getLoanSolution = commonService.getLoanSolution(secondarySalesAppVos.getSalesOrderSid());
CarModelVo carModelVo = getLoanSolution.getData();
secondarySalesAppVos.setJrfa(carModelVo);
return rb.success().setData(secondarySalesAppVos);
}

Write Preview
Loading…
Cancel
Save