|
|
@ -1348,14 +1348,14 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
String contractNo = dto.getContractNo(); |
|
|
|
List<FinBillApplicationDetailsVo> finBillApplicationDetailsVos = baseMapper.selectByContractNo(contractNo); |
|
|
|
if (finBillApplicationDetailsVos != null) { |
|
|
|
/*if (finBillApplicationDetailsVos != null) { |
|
|
|
for (FinBillApplicationDetailsVo finBillApplicationDetailsVo : finBillApplicationDetailsVos) { |
|
|
|
String nodeState = finBillApplicationDetailsVo.getNodeState(); |
|
|
|
if (!"待提交".equals(nodeState) && !"已办结".equals(nodeState) && !"终止".equals(nodeState) && !"发起申请".equals(nodeState)) { |
|
|
|
return rb.setMsg("该合同已有开票/欠款开票申请正在审批中,不可提交"); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
}*/ |
|
|
|
//判断车辆是否发起过开票申请
|
|
|
|
List<FinBillVehicleDto> finBillVehicles = dto.getFinBillVehicles(); |
|
|
|
for (FinBillVehicleDto finBillVehicle : finBillVehicles) { |
|
|
@ -2438,14 +2438,14 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica |
|
|
|
} |
|
|
|
String contractNo = dto.getContractNo(); |
|
|
|
List<FinBillApplicationDetailsVo> finBillApplicationDetailsVos = baseMapper.selectByContractNo(contractNo); |
|
|
|
if (finBillApplicationDetailsVos != null) { |
|
|
|
/* if (finBillApplicationDetailsVos != null) { |
|
|
|
for (FinBillApplicationDetailsVo finBillApplicationDetailsVo : finBillApplicationDetailsVos) { |
|
|
|
String nodeState = finBillApplicationDetailsVo.getNodeState(); |
|
|
|
if (!"待提交".equals(nodeState) && !"已办结".equals(nodeState) && !"终止".equals(nodeState) && !"发起申请".equals(nodeState)) { |
|
|
|
return rb.setMsg("该合同已有开票/欠款开票申请正在审批中,不可提交"); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
}*/ |
|
|
|
//用户的组织全路径
|
|
|
|
String orgSidPath = ""; |
|
|
|
if (StringUtils.isNotBlank(dto.getOrgSidPath())) { |
|
|
|