|
|
@ -34,12 +34,13 @@ import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo; |
|
|
|
import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum; |
|
|
|
import com.yxt.anrui.base.api.commoncontract.CommonContractFeign; |
|
|
|
import com.yxt.anrui.base.api.commoncontract.CommonContractVo; |
|
|
|
import com.yxt.anrui.buscenter.api.busorder.BusOrderFeign; |
|
|
|
import com.yxt.anrui.buscenter.api.busorder.BusOrderVo; |
|
|
|
import com.yxt.anrui.buscenter.api.busordermodel.BusOrderModelFeign; |
|
|
|
import com.yxt.anrui.fin.api.finbillapplication.*; |
|
|
|
import com.yxt.anrui.fin.api.finbillapplicationpublic.FinBillApplicationPublic; |
|
|
|
import com.yxt.anrui.fin.api.finbillapplicationpublic.FinBillApplicationPublicDto; |
|
|
|
import com.yxt.anrui.fin.api.finbillfile.FinBillFile; |
|
|
|
import com.yxt.anrui.fin.api.finbillfile.FinBillFileDto; |
|
|
|
import com.yxt.anrui.fin.api.finbillfile.FinBillFileVo; |
|
|
|
import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicle; |
|
|
|
import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDto; |
|
|
@ -62,7 +63,6 @@ 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.sysstafforg.SysStaffOrgVo; |
|
|
|
import com.yxt.anrui.portal.api.sysuser.SysUserFeign; |
|
|
|
import com.yxt.common.base.config.component.FileUploadComponent; |
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
import com.yxt.common.base.service.MybatisBaseService; |
|
|
@ -119,6 +119,8 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica |
|
|
|
private BusOrderModelFeign busOrderModelFeign; |
|
|
|
@Autowired |
|
|
|
private SysOrganizationFeign sysOrganizationFeign; |
|
|
|
@Autowired |
|
|
|
private BusOrderFeign busOrderFeign; |
|
|
|
|
|
|
|
private QueryWrapper<FinBillApplication> createQueryWrapper(FinBillApplicationQuery query) { |
|
|
|
// todo: 这里根据具体业务调整查询条件
|
|
|
@ -351,6 +353,17 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica |
|
|
|
FinBillApplicationPublic finBillApplicationPublic = finBillApplicationPublicService.fetchBySid(billAppPublicSid); |
|
|
|
BeanUtil.copyProperties(dto, finBillApplicationPublic); |
|
|
|
finBillApplicationPublic.setSid(billAppPublicSid); |
|
|
|
String oneBillMoney = dto.getOneBillMoney(); |
|
|
|
String sid1 = dto.getContractSid(); |
|
|
|
ResultBean<CommonContractVo> commonContractVoResultBean = commonContractFeign.fetchBySid(sid1); |
|
|
|
CommonContractVo data = commonContractVoResultBean.getData(); |
|
|
|
String busSid = data.getBusSid(); |
|
|
|
ResultBean<BusOrderVo> busOrderVoResultBean = busOrderFeign.fetchSid(busSid); |
|
|
|
BusOrderVo data1 = busOrderVoResultBean.getData(); |
|
|
|
String orderSid = data1.getOrderSid(); |
|
|
|
if (StringUtils.isNotBlank(oneBillMoney)){ |
|
|
|
busOrderFeign.updateOneBillMoneyByOrderSid(orderSid,oneBillMoney); |
|
|
|
} |
|
|
|
updateBySid(dto, dtoSid); |
|
|
|
BeanUtil.copyProperties(finBillApplicationPublic, finBillApplicationPublicDto); |
|
|
|
finBillApplicationPublicService.updateBySid(finBillApplicationPublicDto, billAppPublicSid); |
|
|
@ -385,10 +398,17 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica |
|
|
|
FinBillApplication entity = fetchBySid(sid); |
|
|
|
FinBillApplicationDetailsVo vo = new FinBillApplicationDetailsVo(); |
|
|
|
BeanUtil.copyProperties(entity, vo); |
|
|
|
String oneBillMoney = vo.getOneBillMoney(); |
|
|
|
if (StringUtils.isBlank(oneBillMoney)) { |
|
|
|
String sid1 = entity.getContractSid(); |
|
|
|
ResultBean<CommonContractVo> commonContractVoResultBean = commonContractFeign.fetchBySid(sid1); |
|
|
|
CommonContractVo data = commonContractVoResultBean.getData(); |
|
|
|
String busSid = data.getBusSid(); |
|
|
|
ResultBean<BusOrderVo> busOrderVoResultBean = busOrderFeign.fetchSid(busSid); |
|
|
|
BusOrderVo data1 = busOrderVoResultBean.getData(); |
|
|
|
String oneBillMoney = data1.getOneBillMoney(); |
|
|
|
if (StringUtils.isBlank(oneBillMoney)){ |
|
|
|
vo.setOneBillState("0"); |
|
|
|
} else { |
|
|
|
}else { |
|
|
|
vo.setOneBillMoney(oneBillMoney); |
|
|
|
vo.setOneBillState("1"); |
|
|
|
} |
|
|
|
List<FinBillVehicleVo> finBillVehicleVos = finBillVehicleService.fetchVehBySid(sid); |
|
|
|