|
|
|
@ -46,6 +46,7 @@ import com.yxt.anrui.buscenter.api.busfile.BusFileDto; |
|
|
|
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; |
|
|
|
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; |
|
|
|
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; |
|
|
|
import com.yxt.anrui.buscenter.api.busvalcustfiling.*; |
|
|
|
import com.yxt.anrui.buscenter.api.busvalcustfiling.flowable.BusValcustFilingNodeQuery; |
|
|
|
import com.yxt.anrui.buscenter.api.busvalcustfiling.flowable.BusValcustFilingNodeVo; |
|
|
|
import com.yxt.anrui.buscenter.api.busvalcustfiling.flowable.BusValcustFilingTaskQuery; |
|
|
|
@ -84,6 +85,7 @@ import com.yxt.anrui.flowable.api.utils.ProcDefEnum; |
|
|
|
import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; |
|
|
|
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; |
|
|
|
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; |
|
|
|
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; |
|
|
|
import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; |
|
|
|
import com.yxt.anrui.portal.api.sysuser.SysUserFeign; |
|
|
|
import com.yxt.anrui.portal.api.sysuser.SysUserVo; |
|
|
|
@ -100,12 +102,6 @@ import com.yxt.common.base.utils.PagerUtil; |
|
|
|
import com.yxt.common.core.query.PagerQuery; |
|
|
|
import com.yxt.common.core.result.ResultBean; |
|
|
|
import com.yxt.common.core.vo.PagerVo; |
|
|
|
import com.yxt.anrui.buscenter.api.busvalcustfiling.BusValcustFiling; |
|
|
|
import com.yxt.anrui.buscenter.api.busvalcustfiling.BusValcustFilingQuery; |
|
|
|
import com.yxt.anrui.buscenter.api.busvalcustfiling.BusValcustFilingVo; |
|
|
|
import com.yxt.anrui.buscenter.api.busvalcustfiling.BusValcustFilingDetailsVo; |
|
|
|
import com.yxt.anrui.buscenter.api.busvalcustfiling.BusValcustFilingDto; |
|
|
|
import com.yxt.anrui.buscenter.api.busvalcustfiling.BusValcustFilingFeign; |
|
|
|
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
@ -174,6 +170,8 @@ public class BusValcustFilingService extends MybatisBaseService<BusValcustFiling |
|
|
|
private BusBillVehicleService busBillVehicleService; |
|
|
|
@Autowired |
|
|
|
private BusBillTrailerService busBillTrailerService; |
|
|
|
@Autowired |
|
|
|
private SysStaffOrgFeign sysStaffOrgFeign; |
|
|
|
|
|
|
|
public PagerVo<BusValcustFilingVo> listPageVo(PagerQuery<BusValcustFilingQuery> pq) { |
|
|
|
BusValcustFilingQuery query = pq.getParams(); |
|
|
|
@ -271,10 +269,10 @@ public class BusValcustFilingService extends MybatisBaseService<BusValcustFiling |
|
|
|
return rb.success().setData(sid); |
|
|
|
} |
|
|
|
String isGdk = dto.getIsGdk(); |
|
|
|
if ("0".equals(isGdk)){//高开
|
|
|
|
baseMapper.updateGkBySid(dto.getYsMoney(),dto.getSsMoney(),dto.getRemarks(),dtoSid); |
|
|
|
}else { |
|
|
|
baseMapper.updateDkBySid(dto.getRemarks(),dtoSid); |
|
|
|
if ("0".equals(isGdk)) {//高开
|
|
|
|
baseMapper.updateGkBySid(dto.getYsMoney(), dto.getSsMoney(), dto.getRemarks(), dtoSid); |
|
|
|
} else { |
|
|
|
baseMapper.updateDkBySid(dto.getRemarks(), dtoSid); |
|
|
|
} |
|
|
|
busFileService.delByLinkSid(dtoSid); |
|
|
|
for (String fjImage : fjImages) { |
|
|
|
@ -312,6 +310,13 @@ public class BusValcustFilingService extends MybatisBaseService<BusValcustFiling |
|
|
|
BusValcustFiling entity = fetchBySid(sid); |
|
|
|
BusValcustFilingDetailsVo vo = new BusValcustFilingDetailsVo(); |
|
|
|
BeanUtil.copyProperties(entity, vo); |
|
|
|
String vinNo = vo.getVinNo(); |
|
|
|
String[] vinNos = vinNo.split(","); |
|
|
|
String shortVinNo = ""; |
|
|
|
for (String no : vinNos) { |
|
|
|
shortVinNo = shortVinNo + no.substring(no.length() - 8) + ","; |
|
|
|
} |
|
|
|
vo.setVinNo(shortVinNo.substring(0, shortVinNo.lastIndexOf(","))); |
|
|
|
List<BusFileDto> busFileDtos = busFileService.getPathByLinkSid(sid); |
|
|
|
List<String> fjImages = new ArrayList<>(); |
|
|
|
for (BusFileDto busFileDto : busFileDtos) { |
|
|
|
@ -350,7 +355,7 @@ public class BusValcustFilingService extends MybatisBaseService<BusValcustFiling |
|
|
|
bv.setUserSid(busValcustFiling.getCreateBySid()); |
|
|
|
//若app移动端有此功能，则传递appMap参数
|
|
|
|
Map<String, Object> appMap = new HashMap<>(); |
|
|
|
appMap.put("sid",businessSid); |
|
|
|
appMap.put("sid", businessSid); |
|
|
|
//需和移动端沟通业务sid保存的属性具体值：appMap中sid不是固定的。移动端提供具体字段。
|
|
|
|
variables.put("app", appMap); |
|
|
|
//流程定义id
|
|
|
|
@ -428,7 +433,7 @@ public class BusValcustFilingService extends MybatisBaseService<BusValcustFiling |
|
|
|
BusValcustFiling busValcustFiling = fetchBySid(businessSid); |
|
|
|
Map<String, Object> variables = new HashMap<>(); |
|
|
|
Map<String, Object> appMap = new HashMap<>(); |
|
|
|
appMap.put("sid",businessSid); |
|
|
|
appMap.put("sid", businessSid); |
|
|
|
variables.put("app", appMap); |
|
|
|
FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery(); |
|
|
|
if (StringUtils.isBlank(busValcustFiling.getProcDefId())) { |
|
|
|
@ -483,7 +488,7 @@ public class BusValcustFilingService extends MybatisBaseService<BusValcustFiling |
|
|
|
finUncollectedReceivablesDetailedFeign.saveOrUpdate(finUncollectedReceivablesDetailedDto); |
|
|
|
} |
|
|
|
} else { |
|
|
|
if ("1".equals(busValcustFiling.getBusSource())){ |
|
|
|
if ("1".equals(busValcustFiling.getBusSource())) { |
|
|
|
BusBillApplication busBillApplication = busBillApplicationService.fetchBySid(busValcustFiling.getBusSid()); |
|
|
|
List<BusBillVehicleVo> busBillVehicleVos = busBillVehicleService.fetchVehBySid(busBillApplication.getSid()); |
|
|
|
List<BusBillTrailerVo> busBillTrailerVos = busBillTrailerService.fetchByMainSid(busBillApplication.getSid()); |
|
|
|
@ -508,10 +513,10 @@ public class BusValcustFilingService extends MybatisBaseService<BusValcustFiling |
|
|
|
finVehicleInvoiceDto.setInvoicingName(busBillVehicleVo.getOpenTickName()); |
|
|
|
finVehicleInvoiceDto.setCreateBySid(busBillApplication.getCreateBySid()); |
|
|
|
BusArrearsCarryVehicleApplyVo busArrearsCarryVehicleApplyVo = busArrearsCarryVehicleApplyService.selComByVehSid(busBillVehicleVo.getVehSid()).getData(); |
|
|
|
if (busArrearsCarryVehicleApplyVo == null){ |
|
|
|
if (busArrearsCarryVehicleApplyVo == null) { |
|
|
|
finVehicleInvoiceDto.setBusinessStateKey(busBillApplication.getBillStateKey()); |
|
|
|
finVehicleInvoiceDto.setBusinessState(busBillApplication.getBillStateValue()); |
|
|
|
}else { |
|
|
|
} else { |
|
|
|
finVehicleInvoiceDto.setBusinessStateKey("005"); |
|
|
|
finVehicleInvoiceDto.setBusinessState("欠款提车"); |
|
|
|
} |
|
|
|
@ -575,7 +580,7 @@ public class BusValcustFilingService extends MybatisBaseService<BusValcustFiling |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
}else { |
|
|
|
} else { |
|
|
|
FinBillApplication finBillApplication = finBillApplicationFeign.fetchBySid(busValcustFiling.getBusSid()).getData(); |
|
|
|
List<FinBillVehicleVo> finBillVehicleVos = finBillVehicleFeign.fetchVehBySid(busValcustFiling.getBusSid()).getData(); |
|
|
|
List<FinBillTrailerVo> finBillTrailerVos = finBillTrailerFeign.fetchByMainSid(busValcustFiling.getBusSid()).getData(); |
|
|
|
@ -733,7 +738,7 @@ public class BusValcustFilingService extends MybatisBaseService<BusValcustFiling |
|
|
|
BeanUtil.copyProperties(query, flowTaskVo); |
|
|
|
Map<String, Object> variables = new HashMap<>(); |
|
|
|
Map<String, Object> appMap = new HashMap<>(); |
|
|
|
appMap.put("sid",businessSid); |
|
|
|
appMap.put("sid", businessSid); |
|
|
|
variables.put("app", appMap); |
|
|
|
flowTaskVo.setValues(variables); |
|
|
|
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(flowTaskVo); |
|
|
|
@ -838,7 +843,15 @@ public class BusValcustFilingService extends MybatisBaseService<BusValcustFiling |
|
|
|
|
|
|
|
public ResultBean<BusValcustFiling> selectByContractNoAndVinNo(String contractNo, String vinNo) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
BusValcustFiling busValcustFiling = baseMapper.selectByContractNoAndVinNo(contractNo,vinNo); |
|
|
|
BusValcustFiling busValcustFiling = baseMapper.selectByContractNoAndVinNo(contractNo, vinNo); |
|
|
|
return rb.success().setData(busValcustFiling); |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean<String> getToDoNum(BusToDoNumQuery appToDoNumQuery) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
String userSid = appToDoNumQuery.getUserSid(); |
|
|
|
String orgPath = appToDoNumQuery.getOrgPath(); |
|
|
|
int count = baseMapper.getToDoNum(orgPath, userSid); |
|
|
|
return rb.success().setData(String.valueOf(count)); |
|
|
|
} |
|
|
|
} |
God
2 years ago