diff --git a/src/main/java/com/demo/Application.java b/src/main/java/com/demo/Application.java index e40aa7d..a4eadb1 100644 --- a/src/main/java/com/demo/Application.java +++ b/src/main/java/com/demo/Application.java @@ -30,9 +30,9 @@ public class Application { // service.removeYiDong(); //移除异动 // // //费用申请 - for (int i = 1; i < 13; i++) { - service.syncCost(y,i); - } +// for (int i = 1; i < 13; i++) { +// service.syncCost(y,i); +// } //// //// //特殊的命中修改成本中心 // SyncMatchActCenter matchActCenter = new SyncMatchActCenter(); @@ -41,21 +41,21 @@ public class Application { // //更新申请vtb_flag=1,重新录入核销,并非每次执行 // new SyncActVtb().tmain(); // - new TbsMatchServiceImpl().matchBudget(); +// new TbsMatchServiceImpl().matchBudget(); // // //费用核销 SyncVerificationMain verificationMain = new SyncVerificationMain(); verificationMain.formain(); //// //// //更新核销中的预算费用占用 - new SyncDiscountBudget().sync(); +// new SyncDiscountBudget().sync(); // 更新申请和活动的状态 // 同步isCancel=1的费用释放 // new SyncNotCheckMain().doMain();(弃用,功能并于verificationMain.formain()) - new TbsMatchServiceImpl().updateStatus(); +// new TbsMatchServiceImpl().updateStatus(); } diff --git a/src/main/java/com/demo/cost/SyncVerificationMain.java b/src/main/java/com/demo/cost/SyncVerificationMain.java index 6ecb128..db76ecb 100644 --- a/src/main/java/com/demo/cost/SyncVerificationMain.java +++ b/src/main/java/com/demo/cost/SyncVerificationMain.java @@ -483,6 +483,12 @@ public class SyncVerificationMain { VtbVerification verification = new VtbVerification(); verification.setVerificationCode(checkCostItem.getListNumber()); + if(verification.getVerificationCode().contains("_")){ + String mainCode = verification.getVerificationCode().substring(0,verification.getVerificationCode().indexOf("_")); + verification.setVerificationMainCode(mainCode); + }else{ + verification.setVerificationMainCode(verification.getVerificationCode()); + } verification.setFinishedTime(checkCostItem.getExedate()); verification.setCostApplyId(tbsActivity.getCostApplyId()); verification.setActivityId(tbsActivity.getId()); @@ -544,7 +550,7 @@ public class SyncVerificationMain { VtbVerificationSubject verificationSubject = new VtbVerificationSubject(); verificationSubject.setVerificationId(varifId); - verificationSubject.setVerificationSubCode(checkCostItem.getMainNumber()); + verificationSubject.setVerificationSubCode(checkCostItem.getListNumber()); verificationSubject.setCostApplyId(tbsActivity.getCostApplyId()); verificationSubject.setActivityId(tbsActivity.getId()); verificationSubject.setSubjectId(activitySubject.getSubjectId()); @@ -567,44 +573,44 @@ public class SyncVerificationMain { Long varifSubjectId = vtbSubId; // jslDbContext.table(vtb_verification_subject).setEntity(verificationSubject).insert(); - PayPayment payPayment = new PayPayment(); - payPayment.setPayCode(checkCostItem.getMainNumber()); - payPayment.setPayType("pay"); - payPayment.setSupplierId(tbsActivity.getSupplierId()); - payPayment.setSupplierCode(tbsActivity.getSupplierCode()); - payPayment.setSupplierName(tbsActivity.getSupplierName()); - payPayment.setPayAmount(checkCostAmt); - payPayment.setUserId("0"); - payPayment.setUserCode("0"); - payPayment.setUserName("系统导入"); - payPayment.setCreateTime(checkCostItem.getExedate()); - payPayment.setErpCode(""); - payPayment.setBillNumber(""); - payPayment.setPayTime(checkCostItem.getExedate()); - payPayment.setTenantId("001"); - payMaxId++; - Long payId = payMaxId; -// jslDbContext.table(pay_payment).setEntity(payPayment).insert(); - payPaymentList.add(payPayment); - - PayPaymentItem payPaymentItem = new PayPaymentItem(); - payPaymentItem.setPayType("pay"); - payPaymentItem.setPaymentId(payId); - payPaymentItem.setItemPayAmount(checkCostAmt); - payPaymentItem.setPolicyItemCode(checkCostItem.getListNumber()); - payPaymentItem.setPayType("pay"); - payPaymentItem.setSupplierId(tbsActivity.getSupplierId()); - payPaymentItem.setSubjectId(activitySubject.getSubjectId()); - payPaymentItem.setSubjectCode(activitySubject.getSubjectCode()); - payPaymentItem.setSubjectName(activitySubject.getSubjectName()); - payPaymentItem.setCostApplyId(tbsActivity.getCostApplyId()); - payPaymentItem.setActivityId(tbsActivity.getId()); - payPaymentItem.setTenantId("001"); - payPaymentItem.setActivityCode(tbsActivity.getActivityCode()); - payPaymentItem.setVerificationId(varifId); - payPaymentItem.setVerificationSubjectId(varifSubjectId); -// jslDbContext.table(pay_payment_item).setEntity(payPaymentItem).insert(); - payPaymentItemList.add(payPaymentItem); +// PayPayment payPayment = new PayPayment(); +// payPayment.setPayCode(checkCostItem.getMainNumber()); +// payPayment.setPayType("pay"); +// payPayment.setSupplierId(tbsActivity.getSupplierId()); +// payPayment.setSupplierCode(tbsActivity.getSupplierCode()); +// payPayment.setSupplierName(tbsActivity.getSupplierName()); +// payPayment.setPayAmount(checkCostAmt); +// payPayment.setUserId("0"); +// payPayment.setUserCode("0"); +// payPayment.setUserName("系统导入"); +// payPayment.setCreateTime(checkCostItem.getExedate()); +// payPayment.setErpCode(""); +// payPayment.setBillNumber(""); +// payPayment.setPayTime(checkCostItem.getExedate()); +// payPayment.setTenantId("001"); +// payMaxId++; +// Long payId = payMaxId; +//// jslDbContext.table(pay_payment).setEntity(payPayment).insert(); +// payPaymentList.add(payPayment); +// +// PayPaymentItem payPaymentItem = new PayPaymentItem(); +// payPaymentItem.setPayType("pay"); +// payPaymentItem.setPaymentId(payId); +// payPaymentItem.setItemPayAmount(checkCostAmt); +// payPaymentItem.setPolicyItemCode(checkCostItem.getListNumber()); +// payPaymentItem.setPayType("pay"); +// payPaymentItem.setSupplierId(tbsActivity.getSupplierId()); +// payPaymentItem.setSubjectId(activitySubject.getSubjectId()); +// payPaymentItem.setSubjectCode(activitySubject.getSubjectCode()); +// payPaymentItem.setSubjectName(activitySubject.getSubjectName()); +// payPaymentItem.setCostApplyId(tbsActivity.getCostApplyId()); +// payPaymentItem.setActivityId(tbsActivity.getId()); +// payPaymentItem.setTenantId("001"); +// payPaymentItem.setActivityCode(tbsActivity.getActivityCode()); +// payPaymentItem.setVerificationId(varifId); +// payPaymentItem.setVerificationSubjectId(varifSubjectId); +//// jslDbContext.table(pay_payment_item).setEntity(payPaymentItem).insert(); +// payPaymentItemList.add(payPaymentItem); } @@ -614,6 +620,7 @@ public class SyncVerificationMain { jslDbContext.table(vtb_verification).insertList(list, (d, m) -> { m.set("id", d.getId()); m.set("verification_code", d.getVerificationCode()); + m.set("verification_main_code", d.getVerificationMainCode()); m.set("cost_apply_id", d.getCostApplyId()); m.set("activity_id", d.getActivityId()); m.set("policy_item_id", d.getPolicyItemId()); diff --git a/src/main/java/com/demo/jsl/entity/verifi/VtbVerification.java b/src/main/java/com/demo/jsl/entity/verifi/VtbVerification.java index b0c3106..480261e 100644 --- a/src/main/java/com/demo/jsl/entity/verifi/VtbVerification.java +++ b/src/main/java/com/demo/jsl/entity/verifi/VtbVerification.java @@ -27,6 +27,9 @@ public class VtbVerification implements Serializable { */ private String verificationCode; + private String verificationMainCode; + + /** * 活动id */