Browse Source

问题优化

master
God 2 years ago
parent
commit
6def4ac206
  1. 8
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

8
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

@ -864,7 +864,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
for (FinBillApplicationDetailsVo finBillApplicationDetailsVo : finBillApplicationDetailsVos) {
String nodeState = finBillApplicationDetailsVo.getNodeState();
if (!"待提交".equals(nodeState) && !"已办结".equals(nodeState) && !"终止".equals(nodeState) && !"发起申请".equals(nodeState)) {
return rb.setMsg("该合同已有开票/欠款开票/欠款领票申请正在审批中,不可提交");
return rb.setMsg("该合同已有开票/欠款开票申请正在审批中,不可提交");
}
}
}
@ -1708,7 +1708,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
for (FinBillApplicationDetailsVo finBillApplicationDetailsVo : finBillApplicationDetailsVos) {
String nodeState = finBillApplicationDetailsVo.getNodeState();
if (!"待提交".equals(nodeState) && !"已办结".equals(nodeState) && !"终止".equals(nodeState) && !"发起申请".equals(nodeState)) {
return rb.setMsg("该合同已有开票/欠款开票/欠款领票申请正在审批中,不可提交");
return rb.setMsg("该合同已有开票/欠款开票申请正在审批中,不可提交");
}
}
}
@ -2396,7 +2396,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
public ResultBean submitFinBillApplicationQKLP(SubmitFinBillApplicationDto dto) {
ResultBean rb = ResultBean.fireFail();
String contractNo = dto.getContractNo();
List<FinBillApplicationDetailsVo> finBillApplicationDetailsVos = baseMapper.selectByContractNo(contractNo);
/*List<FinBillApplicationDetailsVo> finBillApplicationDetailsVos = baseMapper.selectByContractNo(contractNo);
if (finBillApplicationDetailsVos != null) {
for (FinBillApplicationDetailsVo finBillApplicationDetailsVo : finBillApplicationDetailsVos) {
String nodeState = finBillApplicationDetailsVo.getNodeState();
@ -2404,7 +2404,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
return rb.setMsg("该合同已有开票/欠款开票/欠款领票申请正在审批中,不可提交");
}
}
}
}*/
//用户的组织全路径
String orgSidPath = "";
if (StringUtils.isNotBlank(dto.getOrgSidPath())) {

Loading…
Cancel
Save