diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractMapper.xml
index c4d90b3299..7abaa69fbc 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractMapper.xml
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractMapper.xml
@@ -25,7 +25,7 @@
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java
index b213ca6b46..2827e4a05a 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java
@@ -36,11 +36,8 @@ import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo;
import com.yxt.anrui.buscenter.api.busdeliveredapply.PushOtherDocument;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrower;
-import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerDetailsVo;
-import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerFeign;
import com.yxt.anrui.buscenter.api.bussalesorderloancontract.*;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
-import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService;
import com.yxt.anrui.buscenter.biz.bussalesorderborrower.BusSalesOrderBorrowerService;
import com.yxt.anrui.buscenter.biz.bussalesordervehicle.BusSalesOrderVehicleService;
@@ -51,7 +48,6 @@ import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
import com.yxt.anrui.fin.api.kingdee.bdcustomer.BdCustomer;
import com.yxt.anrui.fin.api.kingdee.capitalcreditresult.CapitalCreditResult;
import com.yxt.anrui.fin.api.kingdee.capitalcreditresult.CwSystemYT;
-import com.yxt.anrui.fin.api.kingdee.otherarreceivable.OtherReceivable;
import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign;
import com.yxt.anrui.portal.api.dictcommon.DictCommonVo;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
@@ -62,29 +58,22 @@ import com.yxt.anrui.riskcenter.api.loanfinbank.LoanFinBankFeign;
import com.yxt.anrui.riskcenter.api.loanfinbank.LoanFinBankVo;
import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicyFeign;
import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicyVo;
-import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameter;
-import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterQuery;
-import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterVo;
-import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.LoanRepaymentHistory;
import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.LoanRepaymentSchedule;
import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.LoanRepaymentScheduleFeign;
-import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign;
import com.yxt.anrui.riskcenter.api.loansolutions.PushVo;
import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo;
import com.yxt.anrui.riskcenter.api.loansolutionsdetail.LoanSolutionsDetailFeign;
-import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
-
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
@@ -378,13 +367,13 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService pagging = baseMapper.listPageForRepay(page, qw);
List records = pagging.getRecords();
records.removeAll(Collections.singleton(null));
if (!records.isEmpty()) {
for (BusLoancontractForRepayVo record : records) {
-// record.setHandleBtn(false);
if (StringUtils.isNotBlank(record.getSalesOrderSid())) {
List busSalesOrderVehicles = busSalesOrderVehicleService.selByLoanContractSid(record.getSalesOrderSid());
busSalesOrderVehicles.removeAll(Collections.singleton(null));
@@ -506,18 +495,7 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService histories = repaymentScheduleFeign.selHistoryBySid(repaymentSchedule.getData().getSid()).getData();
-// if (histories.isEmpty() || histories == null) {
-// record.setHandleBtn(true);
-// }
}
-// else {
-// record.setBuilded("否");
-// if (StringUtils.isNotBlank(record.getBankContractNo())) {
-// record.setHandleBtn(true);
-// }
-// }
}
}
}
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java
index ec335877d6..2771b5a5bc 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java
@@ -171,7 +171,7 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper selectListByOrderSidAndXdConSid(@Param("saleOrderSid") String saleOrderSid,@Param("loanContractSid") String loanContractSid);
- @Select("select * from bus_sales_order_vehicle where loanContractSid = #{loanContractSid}")
+
List selByLoanContractSid(String loanContractSid);
@Select("select * from bus_sales_order_vehicle where borrowerSid = #{borrowerSid}")
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml
index f5aaa8921d..5c28d82b42 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml
@@ -377,11 +377,13 @@
+
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fintemptimepush/FinTempTimePushFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fintemptimepush/FinTempTimePushFeign.java
index af12b98bd3..1d47da14fb 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fintemptimepush/FinTempTimePushFeign.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fintemptimepush/FinTempTimePushFeign.java
@@ -4,8 +4,10 @@ import com.yxt.common.core.result.ResultBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
@Api(tags = "金蝶数据推送-临时表")
@FeignClient(
@@ -20,6 +22,11 @@ public interface FinTempTimePushFeign {
@ApiOperation("测试推送凭证")
@PostMapping("/test")
- public void test();
+ public ResultBean test();
+
+ @ApiOperation("根据业务sid删除")
+ @DeleteMapping("/delByBusSid")
+ public ResultBean delByBusSid(@RequestParam("busSid") String busSid);
+
}
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/FinTempTimePushMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/FinTempTimePushMapper.java
index fcb241afec..37353be775 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/FinTempTimePushMapper.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/FinTempTimePushMapper.java
@@ -40,4 +40,6 @@ public interface FinTempTimePushMapper extends BaseMapper {
void delBySid(@Param("sid") String sid);
+
+ int delByBusSid(@Param("busSid") String busSid);
}
\ No newline at end of file
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/FinTempTimePushMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/FinTempTimePushMapper.xml
index 2ec038b322..9ecac21ff2 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/FinTempTimePushMapper.xml
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/FinTempTimePushMapper.xml
@@ -5,6 +5,10 @@
DELETE FROM fin_temp_time_push
WHERE sid =#{sid}
+
+ DELETE FROM fin_temp_time_push
+ WHERE busSid =#{busSid}
+
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/FinTempTimePushRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/FinTempTimePushRest.java
index 6ba724668b..bd67c524e1 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/FinTempTimePushRest.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/FinTempTimePushRest.java
@@ -50,7 +50,12 @@ public class FinTempTimePushRest implements FinTempTimePushFeign {
}
@Override
- public void test() {
- timingPushService.monthlyAccrualVoucher();
+ public ResultBean test() {
+ return timingPushService.monthlyAccrualVoucher();
+ }
+
+ @Override
+ public ResultBean delByBusSid(String busSid) {
+ return finTempTimePushService.delByBusSid(busSid);
}
}
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/FinTempTimePushService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/FinTempTimePushService.java
index 56a1084deb..80900d0179 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/FinTempTimePushService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/FinTempTimePushService.java
@@ -53,4 +53,10 @@ public class FinTempTimePushService extends MybatisBaseService list = finTempTimePushService.selListByBusType("月还计提");
list.removeAll(Collections.singleton(null));
- if (!list.isEmpty()) {
- for (FinTempTimePush f : list) {
- loanMonthlyAccrualApplyFeign.rePushVoucher(f.getBusSid());
- finTempTimePushService.delBySid(f.getSid());
- }
- }
+ if (!list.isEmpty()) {
+ for (FinTempTimePush f : list) {
+ List vouchers = loanMonthlyAccrualApplyFeign.rePushVoucher2(f.getBusSid()).getData();
+ if (!vouchers.isEmpty()) {
+ for (RskGeneralVoucher voucher : vouchers) {
+ Voucher newVoucher = new Voucher();
+ List resultDetails = new ArrayList<>();
+ if (StringUtils.isNotBlank(voucher.getUseOrgCode())) {
+ newVoucher.setAccountBook(voucher.getUseOrgCode());
+ newVoucher.setVoucherNo(voucher.getUseOrgCode());
+ }
+ String formatDate = voucher.getBussDate();
+ String[] split = formatDate.split("-");
+ String month = split[1];
+ int m = Integer.parseInt(month);
+ List voucherDetails = voucher.getVoucherDetails();
+ if (!voucherDetails.isEmpty()) {
+ for (RskGeneralVoucher.GeneralVoucherDetail voucherDetail : voucherDetails) {
+ Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto(); //借方
+ Voucher.VoucherResultDetailDto dto2 = new Voucher.VoucherResultDetailDto(); //贷方
+ dto1.setSummary(m + "月计提月还");
+ dto2.setSummary(m + "月计提月还");
+ dto1.setSubjectNo("1201.02.01");
+ dto2.setSubjectNo("1201.01.00");
+ dto1.setDimensionDept(voucherDetail.getDeptCode());
+ dto1.setDimensionCustom(voucherDetail.getCustomerCode());
+ dto2.setDimensionDept(voucherDetail.getDeptCode());
+ dto2.setDimensionCustom(voucherDetail.getCustomerCode());
+ dto1.setDebit(String.valueOf(voucherDetail.getAmount()));
+ dto2.setCredit(String.valueOf(voucherDetail.getAmount()));
+ resultDetails.add(dto1);
+ resultDetails.add(dto2);
+ }
+ newVoucher.setResultDetails(resultDetails);
+ }
+ log.info("FinKingDeeFeignRest-saveVoucher:{}", JSONObject.toJSONString(newVoucher));
+ voucherService.saveVoucher(newVoucher);
+ }
+ }
+// loanMonthlyAccrualApplyFeign.rePushVoucher(f.getBusSid());
+ finTempTimePushService.delBySid(f.getSid());
+ }
+ }
+ return rb.success();
}
}
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/voucher/VoucherService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/voucher/VoucherService.java
index 7592f1b5fb..7c3087d765 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/voucher/VoucherService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/voucher/VoucherService.java
@@ -2,7 +2,6 @@ package com.yxt.anrui.fin.biz.kingdee.voucher;
import com.yxt.anrui.fin.api.kingdee.KingDeeBillId;
import com.yxt.anrui.fin.api.kingdee.KingDeeBillUrl;
-import com.yxt.anrui.fin.api.kingdee.otherarreceivable.OtherReceivable;
import com.yxt.anrui.fin.api.kingdee.voucher.Voucher;
import com.yxt.anrui.fin.biz.kingdee.FinKingDeeService;
import com.yxt.common.base.utils.StringUtils;
@@ -48,12 +47,6 @@ public class VoucherService extends FinKingDeeService {
}
String kingDeeData = VoucherCastToKingDeeBillFields.getKingDeeData(map_fEntityModel_, vehicleListMap.getData());
try {
-// ResultBean resultBean1 = accessKingDeeInterface(KingDeeBillId.GL_VOUCHER.getID(), kingDeeData, KingDeeBillUrl.DRAFT_URL.getURL());
-// if (!resultBean1.getSuccess()) {
-// log.info("凭证暂存失败!");
-// return rb.setMsg("凭证暂存失败!");
-// }
-// log.info("凭证暂存成功!");
ResultBean resultBean1 = accessKingDeeInterface(KingDeeBillId.GL_VOUCHER.getID(), kingDeeData, KingDeeBillUrl.SAVE_URL.getURL());
if (!resultBean1.getSuccess()) {
log.info("凭证保存失败!");
@@ -61,14 +54,6 @@ public class VoucherService extends FinKingDeeService {
}
log.info("凭证保存成功!");
-
-// String submitKD = getSubmitKD(resultBean1.getData(), KingDeeBillId.AR_OTHERRECEIVABLE.getID());
-// ResultBean resultBean2 = accessKingDeeInterface(KingDeeBillId.AR_OTHERRECEIVABLE.getID(), submitKD, KingDeeBillUrl.SUBMIT_URL.getURL());
-// if (!resultBean2.getSuccess()) {
-// log.info("凭证提交失败!");
-// return rb.setMsg("凭证提交失败!");
-// }
-// log.info("凭证提交成功!");
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyFallback.java
index 1e0c2a4438..0257dbb3d2 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyFallback.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyFallback.java
@@ -2,6 +2,7 @@ package com.yxt.anrui.riskcenter.api.loanmonthlyaccrualapply;
import com.yxt.anrui.riskcenter.api.loanmonthlyaccrualapply.flow.*;
+import com.yxt.anrui.riskcenter.api.loanvoucher.RskGeneralVoucher;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@@ -54,6 +55,11 @@ public class LoanMonthlyAccrualApplyFallback implements LoanMonthlyAccrualApplyF
return null;
}
+ @Override
+ public ResultBean> rePushVoucher2(String sid) {
+ return null;
+ }
+
@Override
public ResultBean submitRecordApplication(SubmitAccrualDto dto) {
return null;
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyFeign.java
index 02bdce85e5..6e9d90832e 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyFeign.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyFeign.java
@@ -1,6 +1,7 @@
package com.yxt.anrui.riskcenter.api.loanmonthlyaccrualapply;
import com.yxt.anrui.riskcenter.api.loanmonthlyaccrualapply.flow.*;
+import com.yxt.anrui.riskcenter.api.loanvoucher.RskGeneralVoucher;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@@ -66,6 +67,11 @@ public interface LoanMonthlyAccrualApplyFeign {
@PostMapping("/rePushVoucher")
public ResultBean rePushVoucher(@RequestParam("sid") String sid);
+
+ @ApiOperation("重推凭证")
+ @PostMapping("/rePushVoucher2")
+ public ResultBean> rePushVoucher2(@RequestParam("sid") String sid);
+
//---------------------------流程---------------------------------------
@ApiOperation("提交")
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanvoucher/RskGeneralVoucher.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanvoucher/RskGeneralVoucher.java
new file mode 100644
index 0000000000..12df8ca8aa
--- /dev/null
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanvoucher/RskGeneralVoucher.java
@@ -0,0 +1,62 @@
+package com.yxt.anrui.riskcenter.api.loanvoucher;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2023/12/19 11:16
+ */
+@Data
+@ApiModel(value = "一般凭证 数据传输对象", description = "一般凭证 数据传输对象")
+public class RskGeneralVoucher {
+
+ @ApiModelProperty("分公司编码")
+ @NotBlank(message = "分公司编码不能为空")
+ public String useOrgCode;
+ @ApiModelProperty("业务日期")
+ public String bussDate;
+ @ApiModelProperty("凭证明细")
+ public List voucherDetails;
+
+ @Data
+ public static class GeneralVoucherDetail {
+ public String timeFlag; //应用于资金占用费计提凭证摘要标识 0代表上月 1代表本月
+ public String type;
+ @ApiModelProperty("场景编码")
+ public String sceneCode;
+ @ApiModelProperty("资方简称")
+ @NotBlank(message = "资方简称不能为空")
+ public String bankName;
+ @ApiModelProperty("数据日期")
+ public Date dataTime;
+ @ApiModelProperty("部门编码")
+ @NotBlank(message = "部门编码不能为空")
+ public String deptCode;
+ @ApiModelProperty("部门名称")
+ public String deptName;
+ @ApiModelProperty("客户编码")
+ @NotBlank(message = "客户编码不能为空")
+ public String customerCode;
+ @ApiModelProperty("客户名称")
+ public String customerName;
+ @ApiModelProperty("金额")
+ @NotBlank(message = "金额不能为空")
+ public BigDecimal amount;
+ @ApiModelProperty("核算维度厂商（供应商）")
+ public String manufacturer;
+ @ApiModelProperty("核算维度物料")
+ public String material;
+ @ApiModelProperty("备注")
+ public String remarks;
+ @ApiModelProperty("采购系统sid")
+ public String purchaseSystemSid;
+ }
+}
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyMapper.java
index cb10968a1a..6b2829b0b4 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyMapper.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyMapper.java
@@ -4,8 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.yxt.anrui.riskcenter.api.loanbuckleapply.LoanBuckleApply;
-import com.yxt.anrui.riskcenter.api.loanbuckleapply.LoanBuckleApplyVo;
import com.yxt.anrui.riskcenter.api.loanmonthlyaccrualapply.LoanMonthlyAccrualApply;
import com.yxt.anrui.riskcenter.api.loanmonthlyaccrualapply.LoanMonthlyAccrualApplyVo;
import com.yxt.anrui.riskcenter.api.loanmonthlyaccrualapply.LoanMonthlyPlanRecord;
@@ -29,4 +27,5 @@ public interface LoanMonthlyAccrualApplyMapper extends BaseMapper map);
+ void delFinTempTimePushByBusSid(@Param("businessSid") String businessSid);
}
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyMapper.xml
index f68be23a01..89f48c3be7 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyMapper.xml
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyMapper.xml
@@ -16,6 +16,9 @@
WHERE sid = #{sid}
+
+ DELETE FROM anrui_fin.fin_temp_time_push WHERE busSid = #{businessSid}
+