Browse Source

Merge remote-tracking branch 'origin/master'

master
yunuo970428 2 years ago
parent
commit
843f3155f1
  1. 7
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyVoNew.java
  2. 20
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java
  3. 4
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsFeign.java
  4. 5
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsFeignFallback.java
  5. 13
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java
  6. 1
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/AppNotCompleteRecordVo.java
  7. 2
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/AppVinListVo.java
  8. 2
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsMapper.java
  9. 17
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsMapper.xml
  10. 5
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsRest.java
  11. 7
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsService.java
  12. 3
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java
  13. 135
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml
  14. 12
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
  15. 5
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java
  16. 2
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicledatahandover/BusVehicleDataHandoverMapper.xml
  17. 42
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicledatahandover/BusVehicleDataHandoverService.java
  18. 1
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/NotCompleteRecordVo.java
  19. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/VinListVo.java

7
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyVoNew.java

@ -125,5 +125,12 @@ public class BaseVehicleOutApplyVoNew implements Vo {
private String distributorPriceAll;
@ApiModelProperty("开票类型")
private String kpType;
@ApiModelProperty("业务sid")
private String busSid;
@ApiModelProperty("出库类型")
private String ckType;
@ApiModelProperty("欠款时长(天)")
private String qkDate;
}

20
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java

@ -32,6 +32,11 @@ import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutVo;
import com.yxt.anrui.base.api.basevehicleoutapply.*;
import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService;
import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.BusArrearsCarryVehicleApplyFeign;
import com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetailsFeign;
import com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApplyDetailQuery;
import com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApplyDetailVo;
import com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApplyFeign;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoice;
@ -79,6 +84,12 @@ public class BaseVehicleOutApplyService extends MybatisBaseService<BaseVehicleOu
private LoanSolutionsFeign loanSolutionsFeign;
@Autowired
private FinVehicleInvoiceFeign finVehicleInvoiceFeign;
@Autowired
private BusArrearsCarryVehicleApplyFeign busArrearsCarryVehicleApplyFeign;
@Autowired
private BusArrearsCarryVehicleDetailsFeign busArrearsCarryVehicleDetailsFeign;
@Autowired
private BusDeliveredApplyFeign busDeliveredApplyFeign;
private QueryWrapper<BaseVehicleOutApply> createQueryWrapper(BaseVehicleOutApplyQueryNew params) {
QueryWrapper<BaseVehicleOutApply> qw = new QueryWrapper<>();
@ -187,6 +198,15 @@ public class BaseVehicleOutApplyService extends MybatisBaseService<BaseVehicleOu
if (finVehicleInvoice != null) {
record.setKpType(finVehicleInvoice.getBusinessState());
}
//出库类型
Integer i = busArrearsCarryVehicleDetailsFeign.selByVinSidAndYBJ(vinSid).getData();
if (i > 0){
record.setCkType("欠款出库");
//欠款时长(天)
String saleDate = record.getSaleDate();
}else {
record.setCkType("正常出库");
}
}
PagerVo<BaseVehicleOutApplyVoNew> p = PagerUtil.pageToVo(pagging, null);
//p.setTotal(countTotal);

4
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsFeign.java

@ -62,4 +62,8 @@ public interface BusArrearsCarryVehicleDetailsFeign {
@ApiOperation("获取一条记录")
@GetMapping("/fetchSid/{sid}")
public ResultBean<BusArrearsCarryVehicleDetailsVo> fetchSid(@PathVariable("sid") String sid);
@ApiOperation("根据车辆sid和已办结流程状态查询是否为欠款提车")
@GetMapping("/selByVinSidAndYBJ/{vinSid}")
ResultBean<Integer> selByVinSidAndYBJ(String vinSid);
}

5
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsFeignFallback.java

@ -66,4 +66,9 @@ public class BusArrearsCarryVehicleDetailsFeignFallback implements BusArrearsCar
public ResultBean<BusArrearsCarryVehicleDetailsVo> fetchSid(String sid) {
return null;
}
@Override
public ResultBean<Integer> selByVinSidAndYBJ(String vinSid) {
return null;
}
}

13
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java

@ -184,4 +184,17 @@ public class AppBusSalesOrderVo implements Vo {
private String factoryDiscount;
@ApiModelProperty("中介返利")
private String distributorPriceAll;
@ApiModelProperty("单台指导价")
private String guildPrice;
@ApiModelProperty("单台成交价")
private String finalPrice;
@ApiModelProperty("中介人1")
private String distributorName;
@ApiModelProperty("单车中介服务费")
private String distributorPrice;
@ApiModelProperty("中介人2")
private String distributorNameTwo;
@ApiModelProperty("单车中介服务费2")
private String distributorPriceTwo;
}

1
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/AppNotCompleteRecordVo.java

@ -19,7 +19,6 @@ public class AppNotCompleteRecordVo implements Vo {
private String customerName;
private String createInfo;
private String carModel;
private String billId;
private List<AppVinListVo> vinList = new ArrayList<>();
private String createName;
@ApiModelProperty("创建日期")

2
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/AppVinListVo.java

@ -15,6 +15,8 @@ import java.util.List;
public class AppVinListVo implements Vo {
private String vin;
private String recordSid;
private String billId;
private int viewType;
private List<String> urls = new ArrayList<>();
}

2
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsMapper.java

@ -70,4 +70,6 @@ public interface BusArrearsCarryVehicleDetailsMapper extends BaseMapper<BusArrea
List<String> selectByApplySidOne(String sid);
List<AdCarListVo> selectByApplySidVehicle(String sid);
int selByVinSidAndYBJ(String vinSid);
}

17
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsMapper.xml

@ -35,11 +35,24 @@
</select>
<select id="selectByApplySidOne" resultType="java.lang.String">
select RIGHT(vinNo,8) from bus_arrears_carry_vehicle_details where applySid = #{sid}
select RIGHT (vinNo, 8)
from bus_arrears_carry_vehicle_details
where applySid = #{sid}
</select>
<select id="selectByApplySidVehicle"
resultType="com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.AdCarListVo">
select vinSid as carSid,vinNo as vin from bus_arrears_carry_vehicle_details where applySid = #{sid}
select vinSid as carSid, vinNo as vin
from bus_arrears_carry_vehicle_details
where applySid = #{sid}
</select>
<select id="selByVinSidAndYBJ" resultType="int">
SELECT COUNT(bacvd.*)
FROM bus_arrears_carry_vehicle_details bacvd
LEFT JOIN bus_arrears_carry_vehicle_apply bacva
ON bacvd.`applySid` = bacva.`sid`
WHERE bacvd.`vinSid` = #{vinSid}
AND bacva.`nodeState` = "已办结"
</select>
</mapper>

5
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsRest.java

@ -91,5 +91,10 @@ public class BusArrearsCarryVehicleDetailsRest implements BusArrearsCarryVehicle
return rb.success().setData(vo);
}
@Override
public ResultBean<Integer> selByVinSidAndYBJ(String vinSid) {
return busArrearsCarryVehicleDetailsService.selByVinSidAndYBJ(vinSid);
}
}

7
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsService.java

@ -8,6 +8,7 @@ import com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarry
import com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetailsDto;
import com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetailsQuery;
import com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetailsVo;
import com.yxt.common.core.result.ResultBean;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
@ -140,4 +141,10 @@ public class BusArrearsCarryVehicleDetailsService extends MybatisBaseService<Bus
public List<AdCarListVo> selectByApplySidVehicle(String sid) {
return baseMapper.selectByApplySidVehicle(sid);
}
public ResultBean<Integer> selByVinSidAndYBJ(String vinSid) {
ResultBean rb = ResultBean.fireFail();
int i = baseMapper.selByVinSidAndYBJ(vinSid);
return rb.success().setData(i);
}
}

3
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java

@ -76,6 +76,8 @@ public interface BusSalesOrderMapper extends BaseMapper<BusSalesOrder> {
*/
IPage<AppBusSalesOrderVo> getSaleOrders(IPage<BusSalesOrder> page, @Param(Constants.WRAPPER) QueryWrapper<BusSalesOrder> qw, @Param("name") String name, @Param("typeState") String typeState);
IPage<AppBusSalesOrderVo> getSaleOrdersByOrgPath(IPage<BusSalesOrder> page, @Param(Constants.WRAPPER) QueryWrapper<BusSalesOrder> qw, @Param("name") String name, @Param("typeState") String typeState, @Param("vinNo") String vinNo, @Param("orderingNo") String orderingNo);
/**
* 根据销售订单sid查询车型信息
*
@ -197,6 +199,7 @@ public interface BusSalesOrderMapper extends BaseMapper<BusSalesOrder> {
/**
* 根据车辆sid查询销售订单的数据
*
* @param vinSid 车辆sid
* @return
*/

135
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml

@ -39,8 +39,56 @@
</update>
<!--app查询销售订单列表-->
<select id="getSaleOrders" resultType="com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppBusSalesOrderVo">
SELECT DISTINCT
bo.sid AS saleOrderSid,
SELECT bo.sid as saleOrderSid,
bo.billNo as saleOrderId,
bo.customerClassKey as customerType,
bo.customerSid,
bo.customerName,
bo.customerPhoto as customerImage,
bo.mobile,
bo.payType as carPurchaseType,
bo.payTypeKey as carPurchaseKey,
bd.depositAll,
bo.nodeState as saleOrderState,
DATE_FORMAT(bo.createDate, '%Y-%m-%d') as createdDate,
case bo.isInsurance
when 0 then '否'
when 1 then '是' end as insuranceInfo,
if(bo.nodeState = '已办结', true, false) as showStopBtn,
bo.nodeState is null as showUpdateBtn,
bo.nodeState is null as showDeleteBtn,
0 as showFinancialBtn,
bo.type,
bo.contractNo as contractId,
bo.staffName as saler,
bo.procDefId,
bo.procInstId
FROM bus_sales_order bo
left join bus_sales_order_price bp on bp.salesOrderSid = bo.sid
left join bus_sales_order_deposit bd on bd.salesOrderSid = bo.sid
<where>
${ew.sqlSegment}
<if test="name != null and name != ''">
and concat(IFNULL(bo.customerName
, '')
, IFNULL(bo.staffName
, '')
, ifnull(bo.billNo
, '')) LIKE concat('%'
, #{name}
, '%')
</if>
<if test="typeState != null and typeState != ''">
and LENGTH(bo.nodeState)
>0
</if>
</where>
order by bo.id desc
</select>
<select id="getSaleOrdersByOrgPath"
resultType="com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppBusSalesOrderVo">
SELECT bo.sid AS saleOrderSid,
bo.billNo AS saleOrderId,
bo.customerClassKey AS customerType,
bo.customerSid,
@ -52,18 +100,10 @@
bd.depositAll,
bo.nodeState AS saleOrderState,
DATE_FORMAT(bo.createDate, '%Y-%m-%d') AS createdDate,
CASE
bo.isInsurance
WHEN 0
THEN '否'
WHEN 1
THEN '是'
END AS insuranceInfo,
IF(
bo.nodeState = '已办结',
TRUE,
FALSE
) AS showStopBtn,
CASE bo.isInsurance
WHEN 0 THEN '否'
WHEN 1 THEN '是' END AS insuranceInfo,
IF(bo.nodeState = '已办结', TRUE, FALSE) AS showStopBtn,
bo.nodeState IS NULL AS showUpdateBtn,
bo.nodeState IS NULL AS showDeleteBtn,
0 AS showFinancialBtn,
@ -72,37 +112,36 @@
bo.staffName AS saler,
bo.procDefId,
bo.procInstId,
bo.useOrgSid,
bo.useOrgName,
bo.purchaseSystemName,
bo.orgName,
bm.modelName,
bsos.distributorPriceAll,
ls.`factoryDiscount`,
GROUP_CONCAT(
IF(bsov.linkNo = '', NULL, bsov.linkNo)
) AS vinNo,
GROUP_CONCAT(IF(ov.`linkNo` = '', NULL, ov.`linkNo`)) AS vinNo,
GROUP_CONCAT(
IF(
bsov.orderingNo = '',
ov.orderingNo = '',
NULL,
bsov.orderingNo
ov.orderingNo
)
) AS orderingNo
FROM
bus_sales_order bo
LEFT JOIN bus_sales_order_price bp
ON bp.salesOrderSid = bo.sid
LEFT JOIN bus_sales_order_deposit bd
ON bd.salesOrderSid = bo.sid
LEFT JOIN bus_sales_order_model bm
ON bm.salesOrderSid = bo.sid
LEFT JOIN bus_sales_order_vehicle bsov
ON bsov.salesOrderSid = bo.sid
LEFT JOIN bus_sales_order_submit bsos
ON bsos.salesOrderSid = bo.sid
) AS orderingNo,
bm.guildPrice,
bm.finalPrice,
bsos.distributorName,
bsos.distributorPrice,
bsos.distributorNameTwo,
bsos.distributorPriceTwo,
bm.modelName,
bo.useOrgName,
bo.purchaseSystemName,
bo.orgName
FROM bus_sales_order bo
LEFT JOIN bus_sales_order_price bp ON bp.salesOrderSid = bo.sid
LEFT JOIN bus_sales_order_deposit bd ON bd.salesOrderSid = bo.sid
LEFT JOIN bus_sales_order_vehicle ov ON ov.salesOrderSid=bo.sid
LEFT JOIN anrui_riskcenter.`loan_solutions` ls
ON ls.`salesOrderSid` = bo.sid
LEFT JOIN `bus_sales_vehicle_order` bso ON bo.sid = bso.salesOrderSid
LEFT JOIN bus_sales_order_submit bsos
ON bsos.salesOrderSid = bo.sid
LEFT JOIN bus_sales_order_model bm
ON bm.salesOrderSid = bo.sid
<where>
${ew.sqlSegment}
<if test="name != null and name != ''">
@ -119,6 +158,22 @@
and LENGTH(bo.nodeState)
>0
</if>
GROUP BY bo.sid
<if test="vinNo != null and vinNo != '' and orderingNo != null and orderingNo != ''">
HAVING vinNo like concat('%',#{vinNo},'%')
AND orderingNo like concat('%',#{orderingNo},'%')
</if>
<if test="vinNo != null and vinNo != ''">
<if test="orderingNo == null or orderingNo == ''">
HAVING vinNo like concat('%',#{vinNo},'%')
</if>
</if>
<if test="vinNo == null or vinNo == ''">
<if test="orderingNo != null and orderingNo != ''">
HAVING orderingNo like concat('%',#{orderingNo},'%')
</if>
</if>
</where>
order by bo.id desc
</select>
@ -478,6 +533,8 @@
</select>
<select id="selectByContractNos" resultType="com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder">
select * from bus_sales_order where contractNo = #{contractNo}
select *
from bus_sales_order
where contractNo = #{contractNo}
</select>
</mapper>

12
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@ -5807,18 +5807,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
if (StringUtils.isNotBlank(pagerQuery.getFactoryDiscount())) {
qw.like("ls.factoryDiscount", pagerQuery.getFactoryDiscount());
}
//根据销售订单sid分组
qw.groupBy("bo.sid");
//车架号
if (StringUtils.isNotBlank(pagerQuery.getVinNo())){
qw.having("vinNo LIKE %",pagerQuery.getVinNo(),"%");
}
//排产订单编号
if (StringUtils.isNotBlank(pagerQuery.getOrderingNo())){
qw.having("orderingNo LIKE %",pagerQuery.getOrderingNo(),"%");
}
String typeState = "getSaleOrdersByOrgPath";//查询接口的标识
IPage<AppBusSalesOrderVo> pagging = baseMapper.getSaleOrders(page, qw, pq.getParams().getName(), typeState);
IPage<AppBusSalesOrderVo> pagging = baseMapper.getSaleOrdersByOrgPath(page, qw, pq.getParams().getName(), typeState, pagerQuery.getVinNo(), pagerQuery.getOrderingNo());
for (AppBusSalesOrderVo record : pagging.getRecords()) {
record.setShowStopBtn(false);
record.setShowContractBtn(false);

5
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java

@ -200,10 +200,13 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
BeanUtil.copyProperties(dto, entity, "id", "sid");
entity.setNodeState("待提交");
String applyNo = "";
String orgPath = dto.getOrgPath();
String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
if (StringUtils.isNotBlank(dto.getUseOrgSid())) {
applyNo = getXSDDTCSQApplyCode(dto.getUseOrgSid());
} else {
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.getUseOrgByUserSid(dto.getCreateBySid()).getData();
//SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.getUseOrgByUserSid(dto.getCreateBySid()).getData();
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData();
applyNo = getXSDDTCSQApplyCode(sysOrganizationVo.getSid());
entity.setUseOrgSid(sysOrganizationVo.getSid());
entity.setUseOrgName(sysOrganizationVo.getName());

2
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicledatahandover/BusVehicleDataHandoverMapper.xml

@ -50,7 +50,7 @@
ORDER BY bvh.createTime DESC
</select>
<select id="selectByNo" resultType="com.yxt.anrui.buscenter.api.busvehicledatahandover.AppVinListVo">
select vinNo as vin, sid as recordSid
select vinNo as vin, sid as recordSid,billNo as billId
from bus_vehicle_data_handover
where contractNo = #{contractNo}
and completeStateKey = '001'

42
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicledatahandover/BusVehicleDataHandoverService.java

@ -580,31 +580,57 @@ public class BusVehicleDataHandoverService extends MybatisBaseService<BusVehicle
IPage<AppNotCompleteRecordVo> pagging = baseMapper.notCompletePageVo(page, qw);
List<AppNotCompleteRecordVo> records = pagging.getRecords();
records.removeAll(Collections.singleton(null));
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
// 组装的map
Map<String, List<AppVinListVo>> map = new HashMap<>();
// 最后返回的list
for (AppNotCompleteRecordVo record : records) {
List<AppVinListVo> forMapList = new ArrayList<>();
// 外层
String createName = record.getCreateName();
Date createTime = record.getCreateTime();
String createTimeFormat = sdf.format(createTime);
record.setCreateInfo(createName + "," + createTimeFormat);
record.setCreateInfo(createName);
String contractNo = record.getContractId();
// 根据合同编号查询车辆列表
List<AppVinListVo> vinListVos = baseMapper.selectByNo(contractNo);
vinListVos.removeAll(Collections.singleton(null));
map.clear();
if (!vinListVos.isEmpty()) {
// 组装
for (AppVinListVo vinVo : vinListVos) {
String recordSid = vinVo.getRecordSid();
BusVehicleDataHandover handover = fetchBySid(recordSid);
// 循环当前合同下的车架号
String billId = vinVo.getBillId();
// 取出来
List<AppVinListVo> vinListVos1 = map.get(billId);
if (vinListVos1 == null)
vinListVos1 = new ArrayList<>();
vinListVos1.add(vinVo);
map.put(billId, vinListVos1);
}
for (Map.Entry<String, List<AppVinListVo>> m : map.entrySet()) {
List<AppVinListVo> value = m.getValue();
for (int i = 0; i < value.size(); i++) {
// 当前单据编号下的所有车架号
AppVinListVo appVinListVo = value.get(i);
if (i == 0) {
AppVinListVo appVinListVo1 = new AppVinListVo();
appVinListVo1.setViewType(0);
appVinListVo1.setBillId(appVinListVo.getBillId());
BusVehicleDataHandover handover = fetchBySid(appVinListVo.getRecordSid());
String linkSid = handover.getLinkSid();
//交车资料确认单
List<BuscenterFile> fileList = buscenterFileService.selectByLinkSid(linkSid, BuscenterFileEnum.ENTRUST_CONFIRM_IMAGES.getAttachType());
fileList.removeAll(Collections.singleton(null));
if (!fileList.isEmpty()) {
List<String> entrustConfirmImages = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()).collect(Collectors.toList());
vinVo.setUrls(entrustConfirmImages);
appVinListVo1.setUrls(entrustConfirmImages);
}
forMapList.add(appVinListVo1);
}
appVinListVo.setViewType(1);
forMapList.add(appVinListVo);
}
}
}
record.setVinList(vinListVos);
record.setVinList(forMapList);
}
PagerVo<AppNotCompleteRecordVo> p = PagerUtil.pageToVo(pagging, null);
return rb.success().setData(p);

1
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/NotCompleteRecordVo.java

@ -20,7 +20,6 @@ public class NotCompleteRecordVo implements Vo {
private String customerName;
private String createInfo;
private String carModel;
private String billId;
private List<VinListVo> vinList = new ArrayList<>();

2
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/VinListVo.java

@ -15,5 +15,7 @@ import java.util.List;
public class VinListVo implements Vo {
private String vin;
private String recordSid;
private String billId;
private int viewType;
private List<String> urls = new ArrayList<>();
}

Loading…
Cancel
Save