|
|
@ -126,30 +126,30 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica |
|
|
|
QueryWrapper<FinBillApplication> qw = new QueryWrapper<>(); |
|
|
|
qw.eq("fba.useOrgSid", query.getUseOrgSid()); |
|
|
|
qw.eq("fba.createBySid", query.getStaffSid()); |
|
|
|
if (StringUtils.isNotBlank(query.getContractNo())) { |
|
|
|
qw.eq("fba.contractNo", query.getContractNo()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getCustomerName())) { |
|
|
|
qw.eq("fba.customerName", query.getCustomerName()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getBillTypeKey())) { |
|
|
|
qw.eq("fbv.billTypeKey", query.getBillTypeKey()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getBillName())) { |
|
|
|
qw.eq("fbv.billName", query.getBillName()); |
|
|
|
} |
|
|
|
String applyStartDate = query.getApplyStartDate(); |
|
|
|
String applyEndDate = query.getApplyEndDate(); |
|
|
|
qw.apply(StringUtils.isNotEmpty(applyStartDate), "date_format (applyDate,'%Y-%m-%d') >= date_format('" + applyStartDate + "','%Y-%m-%d')"). |
|
|
|
apply(StringUtils.isNotEmpty(applyEndDate), "date_format (applyDate,'%Y-%m-%d') <= date_format('" + applyEndDate + "','%Y-%m-%d')" |
|
|
|
); |
|
|
|
if (StringUtils.isNotBlank(query.getCreateByName())) { |
|
|
|
qw.eq("fba.createByName", query.getCreateByName()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getBillState())) { |
|
|
|
qw.eq("fba.billState", query.getBillState()); |
|
|
|
} |
|
|
|
return qw; |
|
|
|
if (StringUtils.isNotBlank(query.getContractNo())) { |
|
|
|
qw.eq("fba.contractNo", query.getContractNo()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getCustomerName())) { |
|
|
|
qw.eq("fba.customerName", query.getCustomerName()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getBillTypeKey())) { |
|
|
|
qw.eq("fbv.billTypeKey", query.getBillTypeKey()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getBillName())) { |
|
|
|
qw.eq("fbv.billName", query.getBillName()); |
|
|
|
} |
|
|
|
String applyStartDate = query.getApplyStartDate(); |
|
|
|
String applyEndDate = query.getApplyEndDate(); |
|
|
|
qw.apply(StringUtils.isNotEmpty(applyStartDate), "date_format (applyDate,'%Y-%m-%d') >= date_format('" + applyStartDate + "','%Y-%m-%d')"). |
|
|
|
apply(StringUtils.isNotEmpty(applyEndDate), "date_format (applyDate,'%Y-%m-%d') <= date_format('" + applyEndDate + "','%Y-%m-%d')" |
|
|
|
); |
|
|
|
if (StringUtils.isNotBlank(query.getCreateByName())) { |
|
|
|
qw.eq("fba.createByName", query.getCreateByName()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getBillState())) { |
|
|
|
qw.eq("fba.billState", query.getBillState()); |
|
|
|
} |
|
|
|
return qw; |
|
|
|
} |
|
|
|
|
|
|
|
public PagerVo<FinBillApplicationVo> listPageVo(PagerQuery<FinBillApplicationQuery> pq) { |
|
|
@ -184,63 +184,89 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
String dtoSid = dto.getSid(); |
|
|
|
List<FinBillVehicleDto> finBillVehicles = dto.getFinBillVehicles(); |
|
|
|
List<FinBillApplicationAppendxDto> finBillApplicationAppendxs = dto.getFinBillApplicationAppendxs(); |
|
|
|
List<FinBillFileDto> finBillFiles = dto.getFinBillFiles(); |
|
|
|
String path = ""; |
|
|
|
List<FinBillApplicationAppendxDto> khkpsqsApplicationAppendxs = dto.getKhkpsqsApplicationAppendxs(); |
|
|
|
List<FinBillApplicationAppendxDto> kpxxqrsApplicationAppendxs = dto.getKpxxqrsApplicationAppendxs(); |
|
|
|
List<FinBillApplicationAppendxDto> cldjhtApplicationAppendxs = dto.getCldjhtApplicationAppendxs(); |
|
|
|
CommonAppendixDto commonAppendixDto = new CommonAppendixDto(); |
|
|
|
if (StringUtils.isBlank(dtoSid)) {//新增
|
|
|
|
FinBillApplication finBillApplication = new FinBillApplication(); |
|
|
|
String sid = finBillApplication.getSid(); |
|
|
|
BeanUtil.copyProperties(dto,finBillApplication); |
|
|
|
BeanUtil.copyProperties(dto, finBillApplication); |
|
|
|
finBillApplication.setSid(sid); |
|
|
|
FinBillApplicationPublic finBillApplicationPublic = new FinBillApplicationPublic(); |
|
|
|
String sid2 = finBillApplicationPublic.getSid(); |
|
|
|
BeanUtil.copyProperties(finBillApplication,finBillApplicationPublic); |
|
|
|
BeanUtil.copyProperties(finBillApplication, finBillApplicationPublic); |
|
|
|
finBillApplicationPublic.setSid(sid2); |
|
|
|
finBillApplicationPublicService.save(finBillApplicationPublic); |
|
|
|
finBillApplication.setBillAppPublicSid(sid2); |
|
|
|
finBillApplication.setNodeState("待提交"); |
|
|
|
String contractSid = finBillApplication.getContractSid(); |
|
|
|
String oneBillMoney = dto.getOneBillMoney(); |
|
|
|
ResultBean<CommonContractVo> commonContractVoResultBean = commonContractFeign.fetchBySid(contractSid); |
|
|
|
CommonContractVo data1 = commonContractVoResultBean.getData(); |
|
|
|
String busSid = data1.getBusSid(); |
|
|
|
String price = busOrderModelFeign.getPriceByOrderSid(busSid); |
|
|
|
if (price.equals(oneBillMoney)){ |
|
|
|
finBillApplication.setIsHighAndLowOpen(false); |
|
|
|
}else { |
|
|
|
finBillApplication.setIsHighAndLowOpen(true); |
|
|
|
} |
|
|
|
save(finBillApplication); |
|
|
|
for (FinBillVehicleDto finBillVehicleDto : finBillVehicles) { |
|
|
|
FinBillVehicle finBillVehicle = new FinBillVehicle(); |
|
|
|
String sid1 = finBillVehicle.getSid(); |
|
|
|
BeanUtil.copyProperties(finBillVehicleDto,finBillVehicle); |
|
|
|
BeanUtil.copyProperties(finBillVehicleDto, finBillVehicle); |
|
|
|
finBillVehicle.setSid(sid1); |
|
|
|
finBillVehicle.setBillAppSid(sid); |
|
|
|
finBillVehicleService.save(finBillVehicle); |
|
|
|
} |
|
|
|
for (FinBillApplicationAppendxDto finBillApplicationAppendx : finBillApplicationAppendxs) { |
|
|
|
BeanUtil.copyProperties(finBillApplicationAppendx,commonAppendixDto); |
|
|
|
for (FinBillApplicationAppendxDto finBillApplicationAppendx : khkpsqsApplicationAppendxs) { |
|
|
|
BeanUtil.copyProperties(finBillApplicationAppendx, commonAppendixDto); |
|
|
|
String filePath = finBillApplicationAppendx.getFilePath(); |
|
|
|
String urlPrefix = fileUploadComponent.getUrlPrefix(); |
|
|
|
path = urlPrefix + filePath; |
|
|
|
if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { |
|
|
|
filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); |
|
|
|
} |
|
|
|
commonAppendixDto.setLinkSid(sid); |
|
|
|
commonAppendixDto.setFilePath(filePath); |
|
|
|
commonAppendixDto.setCreateBySid(dto.getStaffSid()); |
|
|
|
commonAppendixDto.setAttachType(CommonAttachTypeEnum.BILL_APPLICAYION.getAttachType()); |
|
|
|
commonAppendixFeign.save(commonAppendixDto); |
|
|
|
FinBillFile finBillFile = new FinBillFile(); |
|
|
|
finBillFile.setBillAppSid(sid); |
|
|
|
finBillFile.setFileType(finBillApplicationAppendx.getAppendixName()); |
|
|
|
finBillFile.setFileUrl(filePath); |
|
|
|
ResultBean<CommonAppendixVo> commonAppendixVoResultBean = commonAppendixFeign.fetchByFilePath(filePath); |
|
|
|
CommonAppendixVo data = commonAppendixVoResultBean.getData(); |
|
|
|
String sid1 = data.getSid(); |
|
|
|
finBillFile.setFileSid(sid1); |
|
|
|
finBillFileService.save(finBillFile); |
|
|
|
} |
|
|
|
for (FinBillApplicationAppendxDto finBillApplicationAppendx : kpxxqrsApplicationAppendxs) { |
|
|
|
BeanUtil.copyProperties(finBillApplicationAppendx, commonAppendixDto); |
|
|
|
String filePath = finBillApplicationAppendx.getFilePath(); |
|
|
|
if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { |
|
|
|
filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); |
|
|
|
} |
|
|
|
commonAppendixDto.setLinkSid(sid); |
|
|
|
commonAppendixDto.setFilePath(path); |
|
|
|
commonAppendixDto.setFilePath(filePath); |
|
|
|
commonAppendixDto.setCreateBySid(dto.getStaffSid()); |
|
|
|
commonAppendixDto.setAttachType(CommonAttachTypeEnum.BILL_APPLICAYION.getAttachType()); |
|
|
|
commonAppendixFeign.save(commonAppendixDto); |
|
|
|
FinBillFile finBillFile = new FinBillFile(); |
|
|
|
finBillFile.setBillAppSid(sid); |
|
|
|
finBillFile.setFileType(finBillApplicationAppendx.getAppendixName()); |
|
|
|
finBillFile.setFileUrl(filePath); |
|
|
|
ResultBean<CommonAppendixVo> commonAppendixVoResultBean = commonAppendixFeign.fetchByFilePath(filePath); |
|
|
|
CommonAppendixVo data = commonAppendixVoResultBean.getData(); |
|
|
|
String sid1 = data.getSid(); |
|
|
|
finBillFile.setFileSid(sid1); |
|
|
|
finBillFileService.save(finBillFile); |
|
|
|
} |
|
|
|
for (FinBillFileDto finBillFileDto : finBillFiles) { |
|
|
|
for (FinBillApplicationAppendxDto finBillApplicationAppendx : cldjhtApplicationAppendxs) { |
|
|
|
BeanUtil.copyProperties(finBillApplicationAppendx, commonAppendixDto); |
|
|
|
String filePath = finBillApplicationAppendx.getFilePath(); |
|
|
|
if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { |
|
|
|
filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); |
|
|
|
} |
|
|
|
commonAppendixDto.setLinkSid(sid); |
|
|
|
commonAppendixDto.setFilePath(filePath); |
|
|
|
commonAppendixDto.setCreateBySid(dto.getStaffSid()); |
|
|
|
commonAppendixDto.setAttachType(CommonAttachTypeEnum.BILL_APPLICAYION.getAttachType()); |
|
|
|
commonAppendixFeign.save(commonAppendixDto); |
|
|
|
FinBillFile finBillFile = new FinBillFile(); |
|
|
|
String fileUrl = finBillFileDto.getFileUrl(); |
|
|
|
String urlPrefix = fileUploadComponent.getUrlPrefix(); |
|
|
|
path = urlPrefix + fileUrl; |
|
|
|
finBillFile.setBillAppSid(sid); |
|
|
|
finBillFile.setCreateByName(finBillFileDto.getCreateByName()); |
|
|
|
finBillFile.setFileType(finBillFileDto.getFileType()); |
|
|
|
finBillFile.setFileUrl(path); |
|
|
|
ResultBean<CommonAppendixVo> commonAppendixVoResultBean = commonAppendixFeign.fetchByFilePath(path); |
|
|
|
finBillFile.setFileType(finBillApplicationAppendx.getAppendixName()); |
|
|
|
finBillFile.setFileUrl(filePath); |
|
|
|
ResultBean<CommonAppendixVo> commonAppendixVoResultBean = commonAppendixFeign.fetchByFilePath(filePath); |
|
|
|
CommonAppendixVo data = commonAppendixVoResultBean.getData(); |
|
|
|
String sid1 = data.getSid(); |
|
|
|
finBillFile.setFileSid(sid1); |
|
|
@ -249,32 +275,72 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica |
|
|
|
return rb.success().setMsg("保存成功").setData(sid); |
|
|
|
} |
|
|
|
FinBillApplication finBillApplication = fetchBySid(dtoSid); |
|
|
|
if (finBillApplication == null){ |
|
|
|
if (finBillApplication == null) { |
|
|
|
rb.setMsg("该数据不存在"); |
|
|
|
} |
|
|
|
commonAppendixFeign.deleteFiles(dtoSid); |
|
|
|
for (FinBillApplicationAppendxDto finBillApplicationAppendx : finBillApplicationAppendxs) { |
|
|
|
BeanUtil.copyProperties(finBillApplicationAppendx,commonAppendixDto); |
|
|
|
finBillFileService.deleteByFinAppSid(dtoSid); |
|
|
|
for (FinBillApplicationAppendxDto finBillApplicationAppendx : khkpsqsApplicationAppendxs) { |
|
|
|
BeanUtil.copyProperties(finBillApplicationAppendx, commonAppendixDto); |
|
|
|
String filePath = finBillApplicationAppendx.getFilePath(); |
|
|
|
if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { |
|
|
|
filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); |
|
|
|
} |
|
|
|
commonAppendixDto.setLinkSid(dtoSid); |
|
|
|
commonAppendixDto.setFilePath(filePath); |
|
|
|
commonAppendixDto.setCreateBySid(dto.getStaffSid()); |
|
|
|
commonAppendixDto.setAttachType(CommonAttachTypeEnum.BILL_APPLICAYION.getAttachType()); |
|
|
|
commonAppendixFeign.save(commonAppendixDto); |
|
|
|
FinBillFile finBillFile = new FinBillFile(); |
|
|
|
finBillFile.setBillAppSid(dtoSid); |
|
|
|
finBillFile.setFileType(finBillApplicationAppendx.getAppendixName()); |
|
|
|
finBillFile.setFileUrl(filePath); |
|
|
|
finBillFile.setCreateByName(commonAppendixDto.getName()); |
|
|
|
ResultBean<CommonAppendixVo> commonAppendixVoResultBean = commonAppendixFeign.fetchByFilePath(filePath); |
|
|
|
CommonAppendixVo data = commonAppendixVoResultBean.getData(); |
|
|
|
String sid1 = data.getSid(); |
|
|
|
finBillFile.setFileSid(sid1); |
|
|
|
finBillFileService.save(finBillFile); |
|
|
|
} |
|
|
|
for (FinBillApplicationAppendxDto finBillApplicationAppendx : kpxxqrsApplicationAppendxs) { |
|
|
|
BeanUtil.copyProperties(finBillApplicationAppendx, commonAppendixDto); |
|
|
|
String filePath = finBillApplicationAppendx.getFilePath(); |
|
|
|
String urlPrefix = fileUploadComponent.getUrlPrefix(); |
|
|
|
path = urlPrefix + filePath; |
|
|
|
if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { |
|
|
|
filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); |
|
|
|
} |
|
|
|
commonAppendixDto.setLinkSid(dtoSid); |
|
|
|
commonAppendixDto.setFilePath(path); |
|
|
|
commonAppendixDto.setFilePath(filePath); |
|
|
|
commonAppendixDto.setCreateBySid(dto.getStaffSid()); |
|
|
|
commonAppendixDto.setAttachType(CommonAttachTypeEnum.BILL_APPLICAYION.getAttachType()); |
|
|
|
commonAppendixFeign.save(commonAppendixDto); |
|
|
|
FinBillFile finBillFile = new FinBillFile(); |
|
|
|
finBillFile.setBillAppSid(dtoSid); |
|
|
|
finBillFile.setFileType(finBillApplicationAppendx.getAppendixName()); |
|
|
|
finBillFile.setFileUrl(filePath); |
|
|
|
finBillFile.setCreateByName(commonAppendixDto.getName()); |
|
|
|
ResultBean<CommonAppendixVo> commonAppendixVoResultBean = commonAppendixFeign.fetchByFilePath(filePath); |
|
|
|
CommonAppendixVo data = commonAppendixVoResultBean.getData(); |
|
|
|
String sid1 = data.getSid(); |
|
|
|
finBillFile.setFileSid(sid1); |
|
|
|
finBillFileService.save(finBillFile); |
|
|
|
} |
|
|
|
finBillFileService.deleteByFinAppSid(dtoSid); |
|
|
|
for (FinBillFileDto finBillFileDto : finBillFiles) { |
|
|
|
for (FinBillApplicationAppendxDto finBillApplicationAppendx : cldjhtApplicationAppendxs) { |
|
|
|
BeanUtil.copyProperties(finBillApplicationAppendx, commonAppendixDto); |
|
|
|
String filePath = finBillApplicationAppendx.getFilePath(); |
|
|
|
if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { |
|
|
|
filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); |
|
|
|
} |
|
|
|
commonAppendixDto.setLinkSid(dtoSid); |
|
|
|
commonAppendixDto.setFilePath(filePath); |
|
|
|
commonAppendixDto.setCreateBySid(dto.getStaffSid()); |
|
|
|
commonAppendixDto.setAttachType(CommonAttachTypeEnum.BILL_APPLICAYION.getAttachType()); |
|
|
|
commonAppendixFeign.save(commonAppendixDto); |
|
|
|
FinBillFile finBillFile = new FinBillFile(); |
|
|
|
String fileUrl = finBillFileDto.getFileUrl(); |
|
|
|
String urlPrefix = fileUploadComponent.getUrlPrefix(); |
|
|
|
path = urlPrefix + fileUrl; |
|
|
|
finBillFile.setBillAppSid(dtoSid); |
|
|
|
finBillFile.setCreateByName(finBillFileDto.getCreateByName()); |
|
|
|
finBillFile.setFileType(finBillFileDto.getFileType()); |
|
|
|
finBillFile.setFileUrl(path); |
|
|
|
ResultBean<CommonAppendixVo> commonAppendixVoResultBean = commonAppendixFeign.fetchByFilePath(path); |
|
|
|
finBillFile.setFileType(finBillApplicationAppendx.getAppendixName()); |
|
|
|
finBillFile.setFileUrl(filePath); |
|
|
|
finBillFile.setCreateByName(commonAppendixDto.getName()); |
|
|
|
ResultBean<CommonAppendixVo> commonAppendixVoResultBean = commonAppendixFeign.fetchByFilePath(filePath); |
|
|
|
CommonAppendixVo data = commonAppendixVoResultBean.getData(); |
|
|
|
String sid1 = data.getSid(); |
|
|
|
finBillFile.setFileSid(sid1); |
|
|
@ -283,11 +349,19 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica |
|
|
|
FinBillApplicationPublicDto finBillApplicationPublicDto = new FinBillApplicationPublicDto(); |
|
|
|
String billAppPublicSid = dto.getBillAppPublicSid(); |
|
|
|
FinBillApplicationPublic finBillApplicationPublic = finBillApplicationPublicService.fetchBySid(billAppPublicSid); |
|
|
|
BeanUtil.copyProperties(dto,finBillApplicationPublic); |
|
|
|
BeanUtil.copyProperties(dto, finBillApplicationPublic); |
|
|
|
finBillApplicationPublic.setSid(billAppPublicSid); |
|
|
|
updateBySid(dto,dtoSid); |
|
|
|
BeanUtil.copyProperties(finBillApplicationPublic,finBillApplicationPublicDto); |
|
|
|
finBillApplicationPublicService.updateBySid(finBillApplicationPublicDto,billAppPublicSid); |
|
|
|
updateBySid(dto, dtoSid); |
|
|
|
BeanUtil.copyProperties(finBillApplicationPublic, finBillApplicationPublicDto); |
|
|
|
finBillApplicationPublicService.updateBySid(finBillApplicationPublicDto, billAppPublicSid); |
|
|
|
finBillVehicleService.delByBillAppSid(dtoSid); |
|
|
|
for (FinBillVehicleDto finBillVehicleDto : finBillVehicles) { |
|
|
|
FinBillVehicle finBillVehicle = new FinBillVehicle(); |
|
|
|
BeanUtil.copyProperties(finBillVehicleDto, finBillVehicle); |
|
|
|
finBillVehicle.setSid(finBillVehicleDto.getSid()); |
|
|
|
finBillVehicle.setBillAppSid(dtoSid); |
|
|
|
finBillVehicleService.save(finBillVehicle); |
|
|
|
} |
|
|
|
return rb.success().setMsg("修改成功").setData(dtoSid); |
|
|
|
} |
|
|
|
|
|
|
@ -311,10 +385,16 @@ 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)) { |
|
|
|
vo.setOneBillState("0"); |
|
|
|
} else { |
|
|
|
vo.setOneBillState("1"); |
|
|
|
} |
|
|
|
List<FinBillVehicleVo> finBillVehicleVos = finBillVehicleService.fetchVehBySid(sid); |
|
|
|
vo.setFinBillVehicles(finBillVehicleVos); |
|
|
|
List<FinBillFileVo> finBillFileVos = finBillFileService.fetchBillFileBySid(sid); |
|
|
|
vo.setFinBillFiles(finBillFileVos); |
|
|
|
List<FinBillFileVo> finBillFileVos = finBillFileService.groupByList(sid); |
|
|
|
vo.setFinBillFileVos(finBillFileVos); |
|
|
|
return vo; |
|
|
|
} |
|
|
|
|
|
|
@ -345,6 +425,17 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica |
|
|
|
Map<String, Object> variables = new HashMap<>(); |
|
|
|
variables.put("businessSid", businessSid); |
|
|
|
variables.put("orgSid", orgSid); //部门sid
|
|
|
|
String contractSid = dto.getContractSid(); |
|
|
|
String oneBillMoney = dto.getOneBillMoney(); |
|
|
|
ResultBean<CommonContractVo> commonContractVoResultBean = commonContractFeign.fetchBySid(contractSid); |
|
|
|
CommonContractVo data1 = commonContractVoResultBean.getData(); |
|
|
|
String busSid = data1.getBusSid(); |
|
|
|
String price = busOrderModelFeign.getPriceByOrderSid(busSid); |
|
|
|
if (price.equals(oneBillMoney)) { |
|
|
|
variables.put("isHighAndLowOpen",false); |
|
|
|
} else { |
|
|
|
variables.put("isHighAndLowOpen",true); |
|
|
|
} |
|
|
|
if (StringUtils.isBlank(dto.getTaskId())) { // 新提交
|
|
|
|
String proDefId = ProcDefEnum.SEALAPPLY.getProDefId(); |
|
|
|
ResultBean resultBean1 = flowableFeign.businessStart(ProcDefEnum.FINBILLAPPLICATION.getProDefId(), dto.getUserSid(), variables); |
|
|
@ -413,11 +504,12 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica |
|
|
|
|
|
|
|
/** |
|
|
|
* 办理 |
|
|
|
* |
|
|
|
* @param variables |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
public ResultBean complete(Map<String, Object> variables) { |
|
|
|
BusinessVariables bv= BusinessVariables.builder().build(); |
|
|
|
BusinessVariables bv = BusinessVariables.builder().build(); |
|
|
|
bv.setDetailUrl(""); |
|
|
|
bv.setHandleUrl(""); |
|
|
|
bv.setFormVariables(variables); |
|
|
@ -448,6 +540,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica |
|
|
|
|
|
|
|
/** |
|
|
|
* 更新流程相关的状态 |
|
|
|
* |
|
|
|
* @param map |
|
|
|
* @return |
|
|
|
*/ |
|
|
@ -457,14 +550,15 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica |
|
|
|
|
|
|
|
/** |
|
|
|
* 撤回 |
|
|
|
* |
|
|
|
* @param userSid |
|
|
|
* @param businessSid |
|
|
|
* @param flowTaskVo |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
public ResultBean revokeProcess(String userSid, String businessSid, FlowTaskVo flowTaskVo) { |
|
|
|
com.yxt.anrui.flowable.api.flowtask.FlowTaskVo fl=new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo(); |
|
|
|
BeanUtil.copyProperties(flowTaskVo,fl); |
|
|
|
com.yxt.anrui.flowable.api.flowtask.FlowTaskVo fl = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo(); |
|
|
|
BeanUtil.copyProperties(flowTaskVo, fl); |
|
|
|
fl.setUserSid(userSid); |
|
|
|
ResultBean<List<LatestTaskVo>> resultBean = flowTaskFeign.revokeProcess(fl); |
|
|
|
if (!resultBean.getSuccess()) { |
|
|
@ -480,8 +574,8 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica |
|
|
|
paramMap.put("taskDefKey", taskDefKey); |
|
|
|
paramMap.put("flowState", SysFormLinkFlowStateEnum.UNCOMMITTED.getCode()); |
|
|
|
} else { |
|
|
|
paramMap.put("nodeState",nodeState ); |
|
|
|
paramMap.put("taskDefKey",taskDefKey ); |
|
|
|
paramMap.put("nodeState", nodeState); |
|
|
|
paramMap.put("taskDefKey", taskDefKey); |
|
|
|
} |
|
|
|
updateFlowFiled(paramMap); |
|
|
|
return resultBean; |
|
|
@ -489,13 +583,14 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica |
|
|
|
|
|
|
|
/** |
|
|
|
* 驳回 |
|
|
|
* |
|
|
|
* @param businessSid |
|
|
|
* @param flowTaskVo |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
public ResultBean taskReject(String businessSid, FlowTaskVo flowTaskVo) { |
|
|
|
com.yxt.anrui.flowable.api.flowtask.FlowTaskVo fl=new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo(); |
|
|
|
BeanUtil.copyProperties(flowTaskVo,fl); |
|
|
|
com.yxt.anrui.flowable.api.flowtask.FlowTaskVo fl = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo(); |
|
|
|
BeanUtil.copyProperties(flowTaskVo, fl); |
|
|
|
ResultBean<List<LatestTaskVo>> resultBean = flowTaskFeign.taskReject(fl); |
|
|
|
if (!resultBean.getSuccess()) { |
|
|
|
return resultBean; |
|
|
@ -516,13 +611,14 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica |
|
|
|
|
|
|
|
/** |
|
|
|
* 终止流程 |
|
|
|
* |
|
|
|
* @param businessSid |
|
|
|
* @param flowTaskVo |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
public ResultBean breakProcess(String businessSid, FlowTaskVo flowTaskVo) { |
|
|
|
com.yxt.anrui.flowable.api.flowtask.FlowTaskVo fl=new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo(); |
|
|
|
BeanUtil.copyProperties(flowTaskVo,fl); |
|
|
|
com.yxt.anrui.flowable.api.flowtask.FlowTaskVo fl = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo(); |
|
|
|
BeanUtil.copyProperties(flowTaskVo, fl); |
|
|
|
ResultBean resultBean = flowTaskFeign.breakProcess(fl); |
|
|
|
if (!resultBean.getSuccess()) { |
|
|
|
return resultBean; |
|
|
@ -538,26 +634,27 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica |
|
|
|
|
|
|
|
/** |
|
|
|
* 流程历史流转记录 |
|
|
|
* |
|
|
|
* @param procInsId |
|
|
|
* @param deployId |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
public ResultBean flowRecord(String procInsId, String deployId) { |
|
|
|
return flowTaskFeign.businessFlowRecord(procInsId,deployId); |
|
|
|
return flowTaskFeign.businessFlowRecord(procInsId, deployId); |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean submitFinBillApplicationPageList(SubmitFinBillApplicationPageListDto dto) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
FinBillApplicationDetailsVo finBillApplicationDetailsVo = fetchDetailsVoBySid(dto.getSid()); |
|
|
|
String oneBillMoney = finBillApplicationDetailsVo.getOneBillMoney(); |
|
|
|
if (StringUtils.isBlank(oneBillMoney)){ |
|
|
|
if (StringUtils.isBlank(oneBillMoney)) { |
|
|
|
rb.setMsg("该申请单信息不完善,请补充完整后提交"); |
|
|
|
} |
|
|
|
List<FinBillVehicleVo> finBillVehicles = finBillApplicationDetailsVo.getFinBillVehicles(); |
|
|
|
for (FinBillVehicleVo finBillVehicle : finBillVehicles) { |
|
|
|
String billTypeValue = finBillVehicle.getBillTypeValue(); |
|
|
|
String billName = finBillVehicle.getBillName(); |
|
|
|
if (StringUtils.isBlank(billTypeValue) || StringUtils.isBlank(billName)){ |
|
|
|
if (StringUtils.isBlank(billTypeValue) || StringUtils.isBlank(billName)) { |
|
|
|
rb.setMsg("该申请单信息不完善,请补充完整后提交"); |
|
|
|
} |
|
|
|
} |
|
|
|