Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
yunuo970428 2 years ago
parent
commit
4280bdbc84
  1. 3
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java
  2. 6
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.xml
  3. 18
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java
  4. 2
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryVehiclePageVo.java
  5. 16
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformation/BusVehicleInformationVo.java
  6. 3
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/BusVehicleInformationHandoverDetailsVo.java
  7. 3
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/BusVehicleInformationHandoverQuery.java
  8. 28
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.xml
  9. 16
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java
  10. 2
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsMapper.java
  11. 4
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsMapper.xml
  12. 4
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsService.java
  13. 35
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverService.java
  14. 16
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
  15. 8
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java
  16. 3
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoicePageVo.java
  17. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/ArrearsCarryVehiclePageVo.java
  18. 4
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/AppVehicleInformationHandoverDetailsVo.java
  19. 3
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/AppVehicleInformationHandoverQuery.java
  20. 19
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/AppVehicleInformationVo.java
  21. 2
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java
  22. 23
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/vehicleinformationhandover/VehicleInformationHandoverService.java

3
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java

@ -670,6 +670,9 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
scmEntryVehicleExamineDto.setVinNo(""); scmEntryVehicleExamineDto.setVinNo("");
scmEntryVehicleExamineDto.setPrice(""); scmEntryVehicleExamineDto.setPrice("");
scmEntryVehicleExamineDto.setInspectionResult("1"); scmEntryVehicleExamineDto.setInspectionResult("1");
//外采申请分公司sid及分公司名称
scmEntryVehicleExamineDto.setUseOrgSid(booad.getUseOrgSid());
scmEntryVehicleExamineDto.setUseOrgName(booad.getUseOrgName());
ResultBean<String> resultBean1 = scmVehicleExamineFeign.saveEntryCarInspectedInfo(scmEntryVehicleExamineDto); ResultBean<String> resultBean1 = scmVehicleExamineFeign.saveEntryCarInspectedInfo(scmEntryVehicleExamineDto);
return resultBean1; return resultBean1;
} }

6
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.xml

@ -39,8 +39,10 @@
ON bvoa.`sid` = bvo.`mainSid` ON bvoa.`sid` = bvo.`mainSid`
LEFT JOIN base_vehicle bv LEFT JOIN base_vehicle bv
ON bv.sid = bvo.vinSid ON bv.sid = bvo.vinSid
LEFT JOIN base_vehmodel_config bvc ON bv.modelSid = bvc.modelSid AND bv.modelConfigSid = LEFT JOIN base_vehmodel_config bvc
bvc.configurationItemsSid AND bv.createOrgSid = bvc.useOrgSid ON bv.modelSid = bvc.modelSid
AND bv.modelConfigSid = bvc.configurationItemsSid
AND bv.createOrgSid = bvc.useOrgSid
<where> <where>
${ew.sqlSegment} ${ew.sqlSegment}
</where> </where>

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

@ -70,7 +70,7 @@ public class BaseVehicleOutApplyService extends MybatisBaseService<BaseVehicleOu
orgSidPath = orgSidPath.substring(0, 73); orgSidPath = orgSidPath.substring(0, 73);
qw.like("so.orgSidPath", orgSidPath); qw.like("so.orgSidPath", orgSidPath);
} else if ("3".equals(orgLevelKey)) { } else if ("3".equals(orgLevelKey)) {
qw.eq("bvo.createOrgSid", params.getCreateOrgSid()); qw.eq("bvoa.createOrgSid", params.getCreateOrgSid());
} }
//车架号 //车架号
if (StringUtils.isNotBlank(params.getMaterialCode())) { if (StringUtils.isNotBlank(params.getMaterialCode())) {
@ -78,34 +78,34 @@ public class BaseVehicleOutApplyService extends MybatisBaseService<BaseVehicleOu
} }
//销售类型 //销售类型
if (StringUtils.isNotBlank(params.getTypeKey())) { if (StringUtils.isNotBlank(params.getTypeKey())) {
qw.eq("bvo.typeKey", params.getTypeKey()); qw.eq("bvoa.saleTypeKey", params.getTypeKey());
} }
//销售日期开始-销售日期结束 //销售日期开始-销售日期结束
qw.apply(StringUtils.isNotBlank(params.getSaleDateStart()), "date_format (bvo.saleDate,'%Y-%m-%d') >= date_format('" + params.getSaleDateStart() + "','%Y-%m-%d')"). qw.apply(StringUtils.isNotBlank(params.getSaleDateStart()), "date_format (bvoa.saleDate,'%Y-%m-%d') >= date_format('" + params.getSaleDateStart() + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(params.getSaleDateEnd()), "date_format (bvo.saleDate,'%Y-%m-%d') <= date_format('" + params.getSaleDateEnd() + "','%Y-%m-%d')" apply(StringUtils.isNotBlank(params.getSaleDateEnd()), "date_format (bvoa.saleDate,'%Y-%m-%d') <= date_format('" + params.getSaleDateEnd() + "','%Y-%m-%d')"
); );
//合同编号 //合同编号
if (StringUtils.isNotBlank(params.getConcatNo())) { if (StringUtils.isNotBlank(params.getConcatNo())) {
qw.like("bvo.concatNo", params.getConcatNo()); qw.like("bvoa.contractNo", params.getConcatNo());
} }
//客户名称 //客户名称
if (StringUtils.isNotBlank(params.getCustomerName())) { if (StringUtils.isNotBlank(params.getCustomerName())) {
qw.like("bvo.customerName", params.getCustomerName()); qw.like("bvoa.customerName", params.getCustomerName());
} }
//销售部门 //销售部门
if (StringUtils.isNotBlank(params.getOrgDeptSid())) { if (StringUtils.isNotBlank(params.getOrgDeptSid())) {
qw.eq("bvo.orgSid", params.getOrgDeptSid()); qw.eq("bvoa.orgSid", params.getOrgDeptSid());
} }
//销售人员 //销售人员
if (StringUtils.isNotBlank(params.getStaffSid())) { if (StringUtils.isNotBlank(params.getStaffSid())) {
qw.eq("bvo.staffSid", params.getStaffSid()); qw.eq("bvoa.staffSid", params.getStaffSid());
} }
//内部编码 //内部编码
if (StringUtils.isNotBlank(params.getInsideCode())) { if (StringUtils.isNotBlank(params.getInsideCode())) {
qw.like("bv.insideCode", params.getInsideCode()); qw.like("bv.insideCode", params.getInsideCode());
} }
if (StringUtils.isNotBlank(params.getOrgSid())) { if (StringUtils.isNotBlank(params.getOrgSid())) {
qw.eq("bvo.createOrgSid", params.getOrgSid()); qw.eq("bvoa.createOrgSid", params.getOrgSid());
} }
} }
return qw; return qw;

2
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryVehiclePageVo.java

@ -35,4 +35,6 @@ public class AppArrearsCarryVehiclePageVo implements Vo {
private boolean showUpdateBtn; private boolean showUpdateBtn;
@ApiModelProperty("是否显示删除") @ApiModelProperty("是否显示删除")
private boolean showDeleteBtn; private boolean showDeleteBtn;
@ApiModelProperty("车辆")
private String vinNo;
} }

16
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformation/BusVehicleInformationVo.java

@ -13,20 +13,20 @@ import lombok.Data;
public class BusVehicleInformationVo implements Vo { public class BusVehicleInformationVo implements Vo {
@ApiModelProperty("车钥匙个数") @ApiModelProperty("车钥匙个数")
private Integer vehicleKeyNum; // 车钥匙个数 private String vehicleKeyNum; // 车钥匙个数
// @ApiModelProperty("发票0无1有") // @ApiModelProperty("发票0无1有")
// private Integer invoice; // 发票 // private Integer invoice; // 发票
// @ApiModelProperty("一致性证书0无1有") @ApiModelProperty("一致性证书0无1有")
// private Integer certificate; // 一致性证书0无1有 private String certificate; // 一致性证书0无1有
@ApiModelProperty("申请表0无1有") @ApiModelProperty("申请表0无1有")
private Integer applyForm; // 申请表0无1有 private String applyForm; // 申请表0无1有
@ApiModelProperty("保修手册、说明书0无1有") @ApiModelProperty("保修手册、说明书0无1有")
private Integer manual; // 保修手册、说明书0无1有 private String manual; // 保修手册、说明书0无1有
@ApiModelProperty("环保清单0无1有") @ApiModelProperty("环保清单0无1有")
private Integer environmentalList; // 环保清单0无1有 private String environmentalList; // 环保清单0无1有
@ApiModelProperty("驾驶员卡0无1有") @ApiModelProperty("驾驶员卡0无1有")
private Integer dirverCard; // 驾驶员卡0无1有 private String dirverCard; // 驾驶员卡0无1有
@ApiModelProperty("气瓶产品质量证明书(燃气车)0无1有") @ApiModelProperty("气瓶产品质量证明书(燃气车)0无1有")
private Integer gasCertificate; // 气瓶产品质量证明书(燃气车)0无1有 private String gasCertificate; // 气瓶产品质量证明书(燃气车)0无1有
} }

3
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/BusVehicleInformationHandoverDetailsVo.java

@ -17,6 +17,9 @@ import java.util.Date;
@Data @Data
public class BusVehicleInformationHandoverDetailsVo implements Vo { public class BusVehicleInformationHandoverDetailsVo implements Vo {
private String sid;
@ApiModelProperty("车辆sid")
private String vehicleSid; // 车辆sid
@ApiModelProperty("车架号") @ApiModelProperty("车架号")
private String vinNo; private String vinNo;
@ApiModelProperty("车型") @ApiModelProperty("车型")

3
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/BusVehicleInformationHandoverQuery.java

@ -19,6 +19,7 @@ public class BusVehicleInformationHandoverQuery implements Query {
private String contractNo; private String contractNo;
@ApiModelProperty("客户名称") @ApiModelProperty("客户名称")
private String customerName; private String customerName;
@ApiModelProperty("交接状态")
private String handoverState; // 交接状态
private String name; private String name;
} }

28
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.xml

@ -60,24 +60,24 @@
<select id="getAdvanceInvoiceList" <select id="getAdvanceInvoiceList"
resultType="com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.AppArrearsCarryVehiclePageVo"> resultType="com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.AppArrearsCarryVehiclePageVo">
SELECT sid, SELECT ba.sid,
if(length(nodeState) > 0, nodeState, '待提交') as nodeState, if(length(ba.nodeState) > 0, nodeState, '待提交') as nodeState,
if(length(nodeState) > 0, false, true ) as showUpdateBtn, if(length(ba.nodeState) > 0, false, true ) as showUpdateBtn,
if(length(nodeState) > 0, false, true ) as showDeleteBtn, if(length(ba.nodeState) > 0, false, true ) as showDeleteBtn,
contractNo, ba.contractNo,
modelName, ba.modelName,
customerName, ba.customerName,
arrearsMoney, ba.arrearsMoney,
commitmentMoneyDate, ba.commitmentMoneyDate,
applyName, ba.applyName,
DATE_FORMAT(createTime,'%Y-%m-%d') as applyDate DATE_FORMAT(ba.createTime,'%Y-%m-%d') as applyDate
FROM bus_arrears_carry_vehicle_apply FROM bus_arrears_carry_vehicle_apply ba
<where> <where>
${ew.sqlSegment} ${ew.sqlSegment}
<if test="name != null and name != ''"> <if test="name != null and name != ''">
and concat(IFNULL(contractNo and concat(IFNULL(ba.contractNo
, '') , '')
, ifnull(customerName , ifnull(ba.customerName
, '')) LIKE concat('%' , '')) LIKE concat('%'
, #{name} , #{name}
, '%') , '%')

16
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java

@ -505,7 +505,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
AppArrearsCarryVehicleQuery params = pagerQuery.getParams(); AppArrearsCarryVehicleQuery params = pagerQuery.getParams();
QueryWrapper<AppArrearsCarryVehicleQuery> qw = new QueryWrapper<>(); QueryWrapper<AppArrearsCarryVehicleQuery> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(params.getUserSid())) { if (StringUtils.isNotBlank(params.getUserSid())) {
qw.eq("createBySid", params.getUserSid()); qw.eq("ba.createBySid", params.getUserSid());
} }
/*if (StringUtils.isNotBlank(params.getType())) { /*if (StringUtils.isNotBlank(params.getType())) {
qw.eq("type", params.getType()); qw.eq("type", params.getType());
@ -513,15 +513,25 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
if (StringUtils.isNotBlank(params.getType())) { if (StringUtils.isNotBlank(params.getType())) {
//待办理 //待办理
if ("1".equals(params.getType())) { if ("1".equals(params.getType())) {
qw.isNull("nodeState"); qw.isNull("ba.nodeState");
} }
//已办理 //已办理
if ("2".equals(params.getType())) { if ("2".equals(params.getType())) {
qw.isNotNull("nodeState"); qw.isNotNull("ba.nodeState");
} }
} }
IPage<AppArrearsCarryVehicleQuery> page = PagerUtil.queryToPage(pagerQuery); IPage<AppArrearsCarryVehicleQuery> page = PagerUtil.queryToPage(pagerQuery);
IPage<AppArrearsCarryVehiclePageVo> iPage = baseMapper.getAdvanceInvoiceList(page, qw, params.getName()); IPage<AppArrearsCarryVehiclePageVo> iPage = baseMapper.getAdvanceInvoiceList(page, qw, params.getName());
List<AppArrearsCarryVehiclePageVo> records = iPage.getRecords();
records.removeAll(Collections.singleton(null));
if(!records.isEmpty()){
for(AppArrearsCarryVehiclePageVo v : records){
//根据sid查找车辆信息
List<String> stringList = busArrearsCarryVehicleDetailsService.selectByApplySidOne(v.getSid());
v.setVinNo(String.join(",",stringList));
}
}
iPage.setRecords(records);
return iPage; return iPage;
} }

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

@ -65,4 +65,6 @@ public interface BusArrearsCarryVehicleDetailsMapper extends BaseMapper<BusArrea
* @return * @return
*/ */
List<BusArrearsCarryVehicleDetails> selectDetailsByApplySid(String sid); List<BusArrearsCarryVehicleDetails> selectDetailsByApplySid(String sid);
List<String> selectByApplySidOne(String sid);
} }

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

@ -33,4 +33,8 @@
from bus_arrears_carry_vehicle_details from bus_arrears_carry_vehicle_details
where applySid = #{sid} where applySid = #{sid}
</select> </select>
<select id="selectByApplySidOne" resultType="java.lang.String">
select vinNo from bus_arrears_carry_vehicle_details where applySid = #{sid}
</select>
</mapper> </mapper>

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

@ -131,4 +131,8 @@ public class BusArrearsCarryVehicleDetailsService extends MybatisBaseService<Bus
public List<BusArrearsCarryVehicleDetails> selectDetailsByApplySid(String sid) { public List<BusArrearsCarryVehicleDetails> selectDetailsByApplySid(String sid) {
return baseMapper.selectDetailsByApplySid(sid); return baseMapper.selectDetailsByApplySid(sid);
} }
public List<String> selectByApplySidOne(String sid) {
return baseMapper.selectByApplySidOne(sid);
}
} }

35
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverService.java

@ -115,6 +115,9 @@ public class BusVehicleInformationHandoverService extends MybatisBaseService<Bus
if (StringUtils.isNotBlank(query.getName())) { if (StringUtils.isNotBlank(query.getName())) {
qw.and(wrapper -> wrapper.like("contractNo", query.getName()).or().like("vinNo", query.getName()).or().like("customerName", query.getName())); qw.and(wrapper -> wrapper.like("contractNo", query.getName()).or().like("vinNo", query.getName()).or().like("customerName", query.getName()));
} }
if (StringUtils.isNotBlank(query.getHandoverState())) {
qw.eq("handoverState", query.getHandoverState());
}
qw.eq("useOrgSid", query.getUseOrgSid()); qw.eq("useOrgSid", query.getUseOrgSid());
qw.eq("isDelete", 0); qw.eq("isDelete", 0);
qw.orderByDesc("createTime"); qw.orderByDesc("createTime");
@ -232,10 +235,42 @@ public class BusVehicleInformationHandoverService extends MybatisBaseService<Bus
BusVehicleInformationHandover informationHandover = fetchBySid(sid); BusVehicleInformationHandover informationHandover = fetchBySid(sid);
BusVehicleInformationHandoverDetailsVo vo = new BusVehicleInformationHandoverDetailsVo(); BusVehicleInformationHandoverDetailsVo vo = new BusVehicleInformationHandoverDetailsVo();
BeanUtil.copyProperties(informationHandover, vo, "id", "sid"); BeanUtil.copyProperties(informationHandover, vo, "id", "sid");
vo.setSid(sid);
BusVehicleInformation informationServiceByHandoverSid = busVehicleInformationService.getByHandoverSid(sid); BusVehicleInformation informationServiceByHandoverSid = busVehicleInformationService.getByHandoverSid(sid);
if (null != informationServiceByHandoverSid) { if (null != informationServiceByHandoverSid) {
BusVehicleInformationVo informationVo = new BusVehicleInformationVo(); BusVehicleInformationVo informationVo = new BusVehicleInformationVo();
BeanUtil.copyProperties(informationServiceByHandoverSid, informationVo, "id", "sid"); BeanUtil.copyProperties(informationServiceByHandoverSid, informationVo, "id", "sid");
if (null == informationServiceByHandoverSid.getApplyForm()) {
informationVo.setApplyForm("");
}
if (null == informationServiceByHandoverSid.getCertificate()) {
informationVo.setCertificate("");
}
if (null == informationServiceByHandoverSid.getVehicleKeyNum()) {
informationVo.setVehicleKeyNum("");
}
if (null == informationServiceByHandoverSid.getManual()) {
informationVo.setManual("");
}
if (null == informationServiceByHandoverSid.getEnvironmentalList()) {
informationVo.setEnvironmentalList("");
}
if (null == informationServiceByHandoverSid.getDirverCard()) {
informationVo.setDirverCard("");
}
if (null == informationServiceByHandoverSid.getGasCertificate()) {
informationVo.setGasCertificate("");
}
vo.setBusVehicleInformation(informationVo);
} else {
BusVehicleInformationVo informationVo = new BusVehicleInformationVo();
informationVo.setApplyForm("");
informationVo.setVehicleKeyNum("");
informationVo.setCertificate("");
informationVo.setManual("");
informationVo.setEnvironmentalList("");
informationVo.setDirverCard("");
informationVo.setGasCertificate("");
vo.setBusVehicleInformation(informationVo); vo.setBusVehicleInformation(informationVo);
} }
return rb.success().setData(vo); return rb.success().setData(vo);

16
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

@ -2220,6 +2220,14 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
} else { } else {
record.setIsExistQKLP(false); record.setIsExistQKLP(false);
} }
String sid = record.getSid();
List<FinBillVehicleVo> finBillVehicleVos = finBillVehicleService.fetchByMainSid(sid);
String vinNos = "";
for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) {
String vinNo = finBillVehicleVo.getVinNo();
vinNos = vinNos + vinNo + ",";
}
record.setVinNo(vinNos.substring(0, vinNos.lastIndexOf(",")));
} }
PagerVo<FinBillApplicationVo> p = PagerUtil.pageToVo(pagging, null); PagerVo<FinBillApplicationVo> p = PagerUtil.pageToVo(pagging, null);
return p; return p;
@ -2276,6 +2284,14 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
} else { } else {
record.setIsExistQKLP(false); record.setIsExistQKLP(false);
} }
String sid = record.getSid();
List<FinBillVehicleVo> finBillVehicleVos = finBillVehicleService.fetchByMainSid(sid);
String vinNos = "";
for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) {
String vinNo = finBillVehicleVo.getVinNo();
vinNos = vinNos + vinNo + ",";
}
record.setVinNo(vinNos.substring(0, vinNos.lastIndexOf(",")));
} }
PagerVo<FinBillApplicationVo> p = PagerUtil.pageToVo(pagging, null); PagerVo<FinBillApplicationVo> p = PagerUtil.pageToVo(pagging, null);
return p; return p;

8
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java

@ -469,13 +469,7 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
ScmVehicleExamine scmVehicleExamine = new ScmVehicleExamine(); ScmVehicleExamine scmVehicleExamine = new ScmVehicleExamine();
BeanUtil.copyProperties(scmEntryVehicleExamineDto, scmVehicleExamine, "sid"); BeanUtil.copyProperties(scmEntryVehicleExamineDto, scmVehicleExamine, "sid");
if (StringUtils.isBlank(scmEntryVehicleExamineDto.getUseOrgSid()) && StringUtils.isBlank(scmEntryVehicleExamineDto.getUseOrgName())) { scmVehicleExamine.setCreateBySid(scmEntryVehicleExamineDto.getUserSid());
String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(scmEntryVehicleExamineDto.getUserSid()).getData();
SysOrganizationVo data = sysOrganizationFeign.fetchBySid(useOrgSid).getData();
scmVehicleExamine.setCreateBySid(scmEntryVehicleExamineDto.getUserSid());
scmVehicleExamine.setUseOrgSid(useOrgSid);
scmVehicleExamine.setUseOrgName(data.getName());
}
save(scmVehicleExamine); save(scmVehicleExamine);
return rb.success().setData(scmVehicleExamine.getSid()); return rb.success().setData(scmVehicleExamine.getSid());
} }

3
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoicePageVo.java

@ -39,5 +39,6 @@ public class AdvanceInvoicePageVo implements Vo {
private String model; private String model;
@ApiModelProperty("销售类型") @ApiModelProperty("销售类型")
private String type; private String type;
@ApiModelProperty("车架号(拼接)")
private String vinNo;
} }

2
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/ArrearsCarryVehiclePageVo.java

@ -38,5 +38,7 @@ public class ArrearsCarryVehiclePageVo implements Vo {
private boolean showUpdateBtn; private boolean showUpdateBtn;
@ApiModelProperty("是否显示删除") @ApiModelProperty("是否显示删除")
private boolean showDeleteBtn; private boolean showDeleteBtn;
@ApiModelProperty("车架号")
private String vinNo;
} }

4
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/AppVehicleInformationHandoverDetailsVo.java

@ -15,6 +15,10 @@ import java.util.Date;
*/ */
@Data @Data
public class AppVehicleInformationHandoverDetailsVo implements Vo { public class AppVehicleInformationHandoverDetailsVo implements Vo {
private String sid;
@ApiModelProperty("车辆sid")
private String vehicleSid; // 车辆sid
@ApiModelProperty("车架号") @ApiModelProperty("车架号")
private String vinNo; private String vinNo;
@ApiModelProperty("车型") @ApiModelProperty("车型")

3
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/AppVehicleInformationHandoverQuery.java

@ -1,6 +1,7 @@
package com.yxt.anrui.terminal.api.autoservice.vehicleinformationhandover; package com.yxt.anrui.terminal.api.autoservice.vehicleinformationhandover;
import com.yxt.common.core.query.Query; import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
/** /**
@ -11,5 +12,7 @@ import lombok.Data;
@Data @Data
public class AppVehicleInformationHandoverQuery implements Query { public class AppVehicleInformationHandoverQuery implements Query {
private String useOrgSid; private String useOrgSid;
@ApiModelProperty("交接状态")
private String handoverState; // 交接状态
private String name; // 车架号 合同编号 客户名称 private String name; // 车架号 合同编号 客户名称
} }

19
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/AppVehicleInformationVo.java

@ -12,20 +12,19 @@ import lombok.Data;
@Data @Data
public class AppVehicleInformationVo implements Vo { public class AppVehicleInformationVo implements Vo {
@ApiModelProperty("车钥匙个数") @ApiModelProperty("车钥匙个数")
private Integer vehicleKeyNum; // 车钥匙个数 private String vehicleKeyNum; // 车钥匙个数
// @ApiModelProperty("发票0无1有") // @ApiModelProperty("发票0无1有")
// private Integer invoice; // 发票 // private Integer invoice; // 发票
// @ApiModelProperty("一致性证书0无1有") @ApiModelProperty("一致性证书0无1有")
// private Integer certificate; // 一致性证书0无1有 private Integer certificate; // 一致性证书0无1有
@ApiModelProperty("申请表0无1有") @ApiModelProperty("申请表0无1有")
private Integer applyForm; // 申请表0无1有 private String applyForm; // 申请表0无1有
@ApiModelProperty("保修手册、说明书0无1有") @ApiModelProperty("保修手册、说明书0无1有")
private Integer manual; // 保修手册、说明书0无1有 private String manual; // 保修手册、说明书0无1有
@ApiModelProperty("环保清单0无1有") @ApiModelProperty("环保清单0无1有")
private Integer environmentalList; // 环保清单0无1有 private String environmentalList; // 环保清单0无1有
@ApiModelProperty("驾驶员卡0无1有") @ApiModelProperty("驾驶员卡0无1有")
private Integer dirverCard; // 驾驶员卡0无1有 private String dirverCard; // 驾驶员卡0无1有
@ApiModelProperty("气瓶产品质量证明书(燃气车)0无1有") @ApiModelProperty("气瓶产品质量证明书(燃气车)0无1有")
private Integer gasCertificate; // 气瓶产品质量证明书(燃气车)0无1有 private String gasCertificate; // 气瓶产品质量证明书(燃气车)0无1有
} }

2
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java

@ -129,6 +129,7 @@ public class AppBusAdvanceGinvoiceapplyService {
advanceInvoicePageVo.setModel(record.getModelName()); advanceInvoicePageVo.setModel(record.getModelName());
advanceInvoicePageVo.setType(record.getSaleTypeValue()); advanceInvoicePageVo.setType(record.getSaleTypeValue());
advanceInvoicePageVo.setContractType(record.getNodeState()); advanceInvoicePageVo.setContractType(record.getNodeState());
advanceInvoicePageVo.setVinNo(record.getVinNo());
if (record.getNodeState().equals("待提交")) { if (record.getNodeState().equals("待提交")) {
advanceInvoicePageVo.setShowUpdateBtn(true); advanceInvoicePageVo.setShowUpdateBtn(true);
advanceInvoicePageVo.setShowDeleteBtn(true); advanceInvoicePageVo.setShowDeleteBtn(true);
@ -181,6 +182,7 @@ public class AppBusAdvanceGinvoiceapplyService {
advanceInvoicePageVo.setModel(record.getModelName()); advanceInvoicePageVo.setModel(record.getModelName());
advanceInvoicePageVo.setType(record.getSaleTypeValue()); advanceInvoicePageVo.setType(record.getSaleTypeValue());
advanceInvoicePageVo.setContractType(record.getNodeState()); advanceInvoicePageVo.setContractType(record.getNodeState());
advanceInvoicePageVo.setVinNo(record.getVinNo());
if (record.getNodeState().equals("待提交")) { if (record.getNodeState().equals("待提交")) {
advanceInvoicePageVo.setShowUpdateBtn(true); advanceInvoicePageVo.setShowUpdateBtn(true);
advanceInvoicePageVo.setShowDeleteBtn(true); advanceInvoicePageVo.setShowDeleteBtn(true);

23
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/vehicleinformationhandover/VehicleInformationHandoverService.java

@ -5,6 +5,7 @@ import com.yxt.anrui.base.api.commoncontract.CommonContractFeign;
import com.yxt.anrui.base.api.commoncontract.ContractBusVechileDataHandoverQuery; import com.yxt.anrui.base.api.commoncontract.ContractBusVechileDataHandoverQuery;
import com.yxt.anrui.base.api.commoncontract.ContractBusVechileDataHandoverVo; import com.yxt.anrui.base.api.commoncontract.ContractBusVechileDataHandoverVo;
import com.yxt.anrui.buscenter.api.busvehicledatahandover.*; import com.yxt.anrui.buscenter.api.busvehicledatahandover.*;
import com.yxt.anrui.buscenter.api.busvehicleinformation.BusVehicleInformationVo;
import com.yxt.anrui.buscenter.api.busvehicleinformationhandover.*; import com.yxt.anrui.buscenter.api.busvehicleinformationhandover.*;
import com.yxt.anrui.terminal.api.autoservice.vehicleinformationhandover.*; import com.yxt.anrui.terminal.api.autoservice.vehicleinformationhandover.*;
import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.query.PagerQuery;
@ -88,6 +89,28 @@ public class VehicleInformationHandoverService {
AppVehicleInformationHandoverDetailsVo vo = new AppVehicleInformationHandoverDetailsVo(); AppVehicleInformationHandoverDetailsVo vo = new AppVehicleInformationHandoverDetailsVo();
if (null != detailsVo) { if (null != detailsVo) {
BeanUtil.copyProperties(detailsVo, vo); BeanUtil.copyProperties(detailsVo, vo);
if (null != vo.getBusVehicleInformation()) {
BusVehicleInformationVo informationServiceByHandoverSid = detailsVo.getBusVehicleInformation();
AppVehicleInformationVo informationVo = vo.getBusVehicleInformation();
if (null == informationServiceByHandoverSid.getApplyForm()) {
informationVo.setApplyForm("");
}
if (null == informationServiceByHandoverSid.getVehicleKeyNum()) {
informationVo.setVehicleKeyNum("");
}
if (null == informationServiceByHandoverSid.getManual()) {
informationVo.setManual("");
}
if (null == informationServiceByHandoverSid.getEnvironmentalList()) {
informationVo.setEnvironmentalList("");
}
if (null == informationServiceByHandoverSid.getDirverCard()) {
informationVo.setDirverCard("");
}
if (null == informationServiceByHandoverSid.getGasCertificate()) {
informationVo.setGasCertificate("");
}
}
} }
return rb.success().setData(vo); return rb.success().setData(vo);
} }

Loading…
Cancel
Save