|
|
|
@ -57,6 +57,7 @@ import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
|
|
|
|
import java.util.ArrayList; |
|
|
|
import java.util.Collections; |
|
|
|
import java.util.List; |
|
|
|
|
|
|
|
/** |
|
|
|
@ -159,29 +160,57 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre |
|
|
|
save(busHandoverPrepare); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 手机端-获取交车准备申请列表 |
|
|
|
* @param pagerQuery |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
public IPage<AppHandoverPreparePageVo> getDeliveryPlanList(PagerQuery<AppHandoverPreparePageQuery> pagerQuery) { |
|
|
|
IPage<AppHandoverPreparePageQuery> page = PagerUtil.queryToPage(pagerQuery); |
|
|
|
AppHandoverPreparePageQuery params = pagerQuery.getParams(); |
|
|
|
String userSid = params.getUserSid(); |
|
|
|
String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData(); |
|
|
|
String useOrgSid = ""; |
|
|
|
if(StringUtils.isNotBlank(params.getOrgPath())){ |
|
|
|
useOrgSid = sysStaffOrgFeign.getOrgSidByPath(params.getOrgPath()).getData(); |
|
|
|
}else{ |
|
|
|
useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData(); |
|
|
|
} |
|
|
|
QueryWrapper<AppHandoverPreparePageVo> qw = new QueryWrapper<>(); |
|
|
|
if (StringUtils.isNotBlank(params.getType())) { |
|
|
|
if (StringUtils.isNotBlank(params.getType())) {//1待准备，2已准备
|
|
|
|
qw.eq("handoverPrepareStateKey", params.getType()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(useOrgSid)) { |
|
|
|
qw.eq("useOrgSid", useOrgSid); |
|
|
|
} |
|
|
|
if(StringUtils.isNotBlank(params.getContractNo())){ |
|
|
|
qw.like("contractNo",params.getContractNo()); |
|
|
|
} |
|
|
|
if(StringUtils.isNotBlank(params.getCustomerName())){ |
|
|
|
qw.like("customerName",params.getCustomerName()); |
|
|
|
} |
|
|
|
if(StringUtils.isNotBlank(params.getPayTypeKey())){ |
|
|
|
qw.eq("payTypeKey",params.getPayTypeKey()); |
|
|
|
} |
|
|
|
IPage<AppHandoverPreparePageVo> iPage = baseMapper.getDeliveryPlanList(page, qw, params.getName()); |
|
|
|
for (AppHandoverPreparePageVo record : iPage.getRecords()) { |
|
|
|
//根据sid查询子表数量
|
|
|
|
List<BusHandoverPrepareVehicle> list = busHandoverPrepareVehicleService.selectByApplySid(record.getSid()); |
|
|
|
list.removeAll(Collections.singleton(null)); |
|
|
|
record.setNum(String.valueOf(list.size())); |
|
|
|
if ("1".equals(record.getHandoverPrepareStateKey())) { |
|
|
|
record.setIsShowUpData(true); |
|
|
|
record.setShowUpData(true); |
|
|
|
} else if ("2".equals(record.getHandoverPrepareStateKey())) { |
|
|
|
record.setIsShowUpData(false); |
|
|
|
record.setShowUpData(false); |
|
|
|
} |
|
|
|
} |
|
|
|
return iPage; |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 手机端-初始化交车准备申请 |
|
|
|
* @param query |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
public ResultBean<AppBusHandoverPrepareInfoVo> getDeliveryPlanInfo(AppBusHandoverPrepareInfoQuery query) { |
|
|
|
ResultBean<AppBusHandoverPrepareInfoVo> rb = ResultBean.fireFail(); |
|
|
|
String sid = query.getSid(); |
|
|
|
@ -194,12 +223,22 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre |
|
|
|
return rb.success().setData(appBusHandoverPrepareInfoVo); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 修改交车准备 各资料状态修改 |
|
|
|
* @param dto |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
public ResultBean saveState(AppStateDateDto dto) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
busHandoverPrepareVehicleService.saveState(dto); |
|
|
|
return rb.success(); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 获取交车准备 发票信息 |
|
|
|
* @param query |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
public ResultBean<AppInvoicingInfoVo> getInvoiceInfo(AppInvoicingInfoQuery query) { |
|
|
|
ResultBean<AppInvoicingInfoVo> rb = new ResultBean(); |
|
|
|
String vin = query.getVin(); |
|
|
|
@ -211,6 +250,11 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre |
|
|
|
return rb.success().setData(vo); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 获取交车准备 合格证信息 |
|
|
|
* @param query |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
public ResultBean<AppCertificateInfoVo> getCertificateInfo(AppCertificateInfoQuery query) { |
|
|
|
ResultBean<AppCertificateInfoVo> rb = new ResultBean(); |
|
|
|
AppCertificateInfoVo vo = new AppCertificateInfoVo(); |
|
|
|
@ -223,6 +267,11 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre |
|
|
|
return rb.success().setData(vo); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 获取交车准备 保单信息 |
|
|
|
* @param query |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
public ResultBean<AppPolicyInfoVo> getPolicyInfo(AppPolicyInfoQuery query) { |
|
|
|
ResultBean<AppPolicyInfoVo> rb = new ResultBean<>(); |
|
|
|
AppPolicyInfoVo vo = new AppPolicyInfoVo(); |
|
|
|
@ -243,6 +292,11 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre |
|
|
|
return rb.success().setData(vo); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 修改交车准备 保单信息 |
|
|
|
* @param dto |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
public ResultBean savePolicyInfo(AppPolicyDto dto) { |
|
|
|
ResultBean rb = new ResultBean<>(); |
|
|
|
buscenterFile.delByLinkSidOrType(dto.getSid(), BuscenterFileEnum.HANDOVER_POLICY.getAttachType()); |
|
|
|
@ -252,6 +306,11 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre |
|
|
|
return rb.success(); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 获取交车准备 其他资料信息 |
|
|
|
* @param query |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
public ResultBean<AppOtherDataInfoVo> getOtherDataInfo(AppOtherDataInfoQuery query) { |
|
|
|
ResultBean<AppOtherDataInfoVo> rb = new ResultBean<>(); |
|
|
|
AppOtherDataInfoVo vo = new AppOtherDataInfoVo(); |
|
|
|
@ -266,6 +325,11 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre |
|
|
|
return rb.success().setData(vo); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 修改交车准备 其他资料信息 |
|
|
|
* @param dto |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
public ResultBean saveOtherDataInfo(AppOtherDataDto dto) { |
|
|
|
ResultBean rb = new ResultBean<>(); |
|
|
|
buscenterFile.delByLinkSidOrType(dto.getSid(), BuscenterFileEnum.HANDOVER_OTHRRDATA.getAttachType()); |
|
|
|
@ -273,6 +337,11 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre |
|
|
|
return rb.success(); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 保存交车准备信息 |
|
|
|
* @param dto |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
public ResultBean saveDeliveryPlanInfo(AppHandoverPrepareDto dto) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
BusHandoverPrepare busHandoverPrepare = fetchBySid(dto.getSid()); |
|
|
|
@ -292,6 +361,11 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre |
|
|
|
return rb.success(); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 交车准备详情 |
|
|
|
* @param query |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
public ResultBean<AppBusHandoverPrepareInfoVo> getDeliveryPlanInfoDetail(AppBusHandoverPrepareInfoQuery query) { |
|
|
|
ResultBean<AppBusHandoverPrepareInfoVo> rb = ResultBean.fireFail(); |
|
|
|
String sid = query.getSid(); |
|
|
|
@ -304,6 +378,11 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre |
|
|
|
return rb.success().setData(appBusHandoverPrepareInfoVo); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 提交交车准备信息 |
|
|
|
* @param dto |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
public ResultBean submitDeliveryPlanInfo(AppSubmitHandoverPrepareDto dto) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
BusHandoverPrepare busHandoverPrepare = fetchBySid(dto.getSid()); |
|
|
|
|
