Browse Source

问题修改

zhanglei
God 3 years ago
parent
commit
b7a5ad601b
  1. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyRest.java
  2. 54
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java

4
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyRest.java

@ -115,7 +115,7 @@ public class BaseAccadjApplyRest implements BaseAccadjApplyFeign {
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv);
bv.setModelId(ProcDefEnum.BASEACCADJAPPLY.getProDefId());
return baseAccadjApplyService.InitiatorToAnswer(bv);
return baseAccadjApplyService.InitiatorToAnswer(bv,query.getBaseInternalPurchaseVehicles());
}
@Override
@ -123,7 +123,7 @@ public class BaseAccadjApplyRest implements BaseAccadjApplyFeign {
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv);
bv.setModelId(ProcDefEnum.BASEACCADJAPPLY.getProDefId());
return baseAccadjApplyService.companyToFinancialCenter(bv);
return baseAccadjApplyService.companyToFinancialCenter(bv,query.getBaseInternalPurchaseVehicles());
}
@Override

54
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java

@ -675,10 +675,35 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
return salOutStock;
}
public ResultBean InitiatorToAnswer(BusinessVariables bv) {
public ResultBean InitiatorToAnswer(BusinessVariables bv,List<BaseInternalPurchaseVehicle> baseInternalPurchaseVehicles) {
ResultBean rb = ResultBean.fireFail();
BaseAccadjApply baseAccadjApply = fetchBySid(bv.getBusinessSid());
List<String> purchaseSidss = baseAccadjApplyeVehService.fetchByMainSid(baseAccadjApply.getSid());
Boolean i = false;
if (baseInternalPurchaseVehicles != null) {
if (baseInternalPurchaseVehicles.size() > 0) {
for (BaseInternalPurchaseVehicle baseInternalPurchaseVehicle : baseInternalPurchaseVehicles) {
String witPinMoney = baseInternalPurchaseVehicle.getWitPinMoney();
String sid = baseInternalPurchaseVehicle.getSid();
BaseInternalPurchaseVehicle baseInternalPurchaseVehicle1 = baseInternalPurchaseVehicleService.fetchBySid(sid);
String witPinMoney1 = baseInternalPurchaseVehicle1.getInitialWitPinMoney();
if (!witPinMoney.equals(witPinMoney1)) {
i = true;
baseInternalPurchaseVehicleService.updateWitPinMoneyBySid(witPinMoney, sid);
}
}
}
} else {
for (String s : purchaseSidss) {
BaseInternalPurchaseVehicle baseInternalPurchaseVehicle = baseInternalPurchaseVehicleService.fetchBySid(s);
String witPinMoney = baseInternalPurchaseVehicle.getWitPinMoney();
String initialWitPinMoney = baseInternalPurchaseVehicle.getInitialWitPinMoney();
if (!witPinMoney.equals(initialWitPinMoney)) {
i = true;
break;
}
}
}
Map<String, Object> map = new HashMap<>();
Map<String, Object> formVariables = bv.getFormVariables();
if (formVariables == null) {
@ -756,10 +781,35 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
}
}
public ResultBean companyToFinancialCenter(BusinessVariables bv) {
public ResultBean companyToFinancialCenter(BusinessVariables bv,List<BaseInternalPurchaseVehicle> baseInternalPurchaseVehicles) {
ResultBean rb = ResultBean.fireFail();
BaseAccadjApply baseAccadjApply = fetchBySid(bv.getBusinessSid());
List<String> purchaseSidss = baseAccadjApplyeVehService.fetchByMainSid(baseAccadjApply.getSid());
Boolean i = false;
if (baseInternalPurchaseVehicles != null) {
if (baseInternalPurchaseVehicles.size() > 0) {
for (BaseInternalPurchaseVehicle baseInternalPurchaseVehicle : baseInternalPurchaseVehicles) {
String witPinMoney = baseInternalPurchaseVehicle.getWitPinMoney();
String sid = baseInternalPurchaseVehicle.getSid();
BaseInternalPurchaseVehicle baseInternalPurchaseVehicle1 = baseInternalPurchaseVehicleService.fetchBySid(sid);
String witPinMoney1 = baseInternalPurchaseVehicle1.getInitialWitPinMoney();
if (!witPinMoney.equals(witPinMoney1)) {
i = true;
baseInternalPurchaseVehicleService.updateWitPinMoneyBySid(witPinMoney, sid);
}
}
}
} else {
for (String s : purchaseSidss) {
BaseInternalPurchaseVehicle baseInternalPurchaseVehicle = baseInternalPurchaseVehicleService.fetchBySid(s);
String witPinMoney = baseInternalPurchaseVehicle.getWitPinMoney();
String initialWitPinMoney = baseInternalPurchaseVehicle.getInitialWitPinMoney();
if (!witPinMoney.equals(initialWitPinMoney)) {
i = true;
break;
}
}
}
Map<String, Object> map = new HashMap<>();
Map<String, Object> formVariables = bv.getFormVariables();
if (formVariables == null) {

Loading…
Cancel
Save