From ac35dea98e10d9ef7de58e6a8feebd29d2850ef7 Mon Sep 17 00:00:00 2001 From: xiaoCJ <406612557@qq.com> Date: Wed, 19 Mar 2025 17:12:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=87=BA=E5=8F=A3=E4=BF=A1?= =?UTF-8?q?=E7=94=A8=E8=AF=81=E4=B8=9A=E5=8A=A1=E7=9B=B8=E5=85=B3=E8=A1=A8?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=92=8C=E9=83=A8=E5=88=86=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...xportLetterOfCreditBusinessController.java | 451 ++++++++- ...ortCargoTransportationInsurancePolicy.java | 26 +- .../bank/entity/ExportCommercialInvoice.java | 32 +- .../ExportCommercialInvoiceExample.java | 70 ++ .../entity/ExportFinancingRegistration.java | 48 + .../ExportFinancingRegistrationExample.java | 140 +++ .../ExportFinancingReturnRegistration.java | 69 ++ ...ortFinancingReturnRegistrationExample.java | 60 ++ .../bank/entity/ExportPaymentAcceptance.java | 23 + .../ExportPaymentAcceptanceExample.java | 60 ++ .../entity/ExportRemittanceRegistration.java | 76 ++ .../com/sztzjy/bank/entity/ExportReview.java | 11 + .../bank/entity/ExportReviewExample.java | 70 ++ .../entity/dto/ExportBillOfLadingDTO.java | 38 + ...CargoTransportationInsurancePolicyDTO.java | 23 + .../dto/ExportCommercialInvoiceDTO.java | 41 + .../dto/ExportFinancingRegistrationDTO.java | 22 + .../ExportFinancingReturnRegistrationDto.java | 19 + .../dto/ExportPaymentAcceptanceDto.java | 26 + .../dto/ExportRemittanceRegistrationDTO.java | 80 ++ .../mapper/ExportCommercialInvoiceMapper.java | 6 - ...xportLetterOfCreditApplicationService.java | 19 +- ...tLetterOfCreditApplicationServiceImpl.java | 924 +++++++++++++++++- .../mappers/ExportCommercialInvoiceMapper.xml | 554 ----------- .../ExportFinancingRegistrationMapper.xml | 338 ------- ...xportFinancingReturnRegistrationMapper.xml | 306 ------ .../mappers/ExportPaymentAcceptanceMapper.xml | 306 ------ .../resources/mappers/ExportReviewMapper.xml | 41 +- 28 files changed, 2298 insertions(+), 1581 deletions(-) create mode 100644 src/main/java/com/sztzjy/bank/entity/dto/ExportBillOfLadingDTO.java create mode 100644 src/main/java/com/sztzjy/bank/entity/dto/ExportCargoTransportationInsurancePolicyDTO.java create mode 100644 src/main/java/com/sztzjy/bank/entity/dto/ExportCommercialInvoiceDTO.java create mode 100644 src/main/java/com/sztzjy/bank/entity/dto/ExportFinancingRegistrationDTO.java create mode 100644 src/main/java/com/sztzjy/bank/entity/dto/ExportFinancingReturnRegistrationDto.java create mode 100644 src/main/java/com/sztzjy/bank/entity/dto/ExportPaymentAcceptanceDto.java create mode 100644 src/main/java/com/sztzjy/bank/entity/dto/ExportRemittanceRegistrationDTO.java delete mode 100644 src/main/resources/mappers/ExportCommercialInvoiceMapper.xml delete mode 100644 src/main/resources/mappers/ExportFinancingRegistrationMapper.xml delete mode 100644 src/main/resources/mappers/ExportFinancingReturnRegistrationMapper.xml delete mode 100644 src/main/resources/mappers/ExportPaymentAcceptanceMapper.xml diff --git a/src/main/java/com/sztzjy/bank/controller/stu/ExportLetterOfCreditBusinessController.java b/src/main/java/com/sztzjy/bank/controller/stu/ExportLetterOfCreditBusinessController.java index c9c4f18..2bb2e44 100644 --- a/src/main/java/com/sztzjy/bank/controller/stu/ExportLetterOfCreditBusinessController.java +++ b/src/main/java/com/sztzjy/bank/controller/stu/ExportLetterOfCreditBusinessController.java @@ -2,15 +2,13 @@ package com.sztzjy.bank.controller.stu; import com.sztzjy.bank.annotation.AnonymousAccess; import com.sztzjy.bank.entity.*; -import com.sztzjy.bank.mapper.ExportBillOfExchangeMapper; -import com.sztzjy.bank.mapper.ExportLetterOfCreditApplicationMapper; -import com.sztzjy.bank.mapper.ExportLetterOfCreditPackagingMapper; -import com.sztzjy.bank.mapper.ExportPresentationOfDocumentsMapper; +import com.sztzjy.bank.mapper.*; import com.sztzjy.bank.service.ExportLetterOfCreditApplicationService; import com.sztzjy.bank.util.ResultEntity; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.util.CollectionUtils; @@ -19,6 +17,7 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.math.BigDecimal; import java.util.Date; import java.util.List; @@ -40,10 +39,26 @@ public class ExportLetterOfCreditBusinessController { private ExportPresentationOfDocumentsMapper presentationOfDocumentsMapper; @Autowired private ExportBillOfExchangeMapper exportBillOfExchangeMapper; + @Autowired + private ExportCommercialInvoiceMapper exportCommercialInvoiceMapper; + @Autowired + private ExportCargoTransportationInsurancePolicyMapper cargoTransportationInsurancePolicyMapper; + @Autowired + private ExportBillOfLadingMapper exportBillOfLadingMapper; + @Autowired + private ExportReviewMapper exportReviewMapper; + @Autowired + private ExportRemittanceRegistrationMapper exportRemittanceRegistrationMapper; + @Autowired + private ExportPaymentAcceptanceMapper exportPaymentAcceptanceMapper; + @Autowired + private ExportFinancingReturnRegistrationMapper financingReturnRegistrationMapper; + @Autowired + private ExportFinancingRegistrationMapper exportFinancingRegistrationMapper; @AnonymousAccess - @ApiOperation("来证登记 保存/提交") + @ApiOperation("来证登记-保存/提交") @PostMapping("addCertificateRegistration") public ResultEntity addCertificateRegistration(@RequestBody ExportLetterOfCreditApplication exportLetterOfCreditApplication) { @@ -81,7 +96,7 @@ public class ExportLetterOfCreditBusinessController { @AnonymousAccess - @ApiOperation("打包放款 保存/提交") + @ApiOperation("打包放款-保存/提交") @PostMapping("addLetterOfCreditPackaging") public ResultEntity addLetterOfCreditPackaging(@RequestBody ExportLetterOfCreditPackaging exportLetterOfCreditPackaging) { @@ -101,7 +116,7 @@ public class ExportLetterOfCreditBusinessController { } @AnonymousAccess - @ApiOperation("打包放款 回显") + @ApiOperation("打包放款-回显") @PostMapping("getLetterOfCreditPackaging") public ExportLetterOfCreditPackaging getLetterOfCreditPackaging(@ApiParam("用户ID") String userId, @ApiParam("案例序号") Integer number) { @@ -130,7 +145,7 @@ public class ExportLetterOfCreditBusinessController { } @AnonymousAccess - @ApiOperation("制单交单 保存/提交") + @ApiOperation("制单交单-保存/提交") @PostMapping("addPresentationOfDocuments") public ResultEntity addPresentationOfDocuments(@RequestBody ExportPresentationOfDocuments exportPresentationOfDocuments) { @@ -197,7 +212,7 @@ public class ExportLetterOfCreditBusinessController { @AnonymousAccess - @ApiOperation("填制单据 填写商业汇票 保存/提交") + @ApiOperation("填制单据-填写商业汇票-保存/提交") @PostMapping("addExportBillOfExchange") public ResultEntity addExportBillOfExchange(@RequestBody ExportBillOfExchange exportBillOfExchange) { @@ -255,4 +270,422 @@ public class ExportLetterOfCreditBusinessController { exchange.setContractNumber(contractNumber); return exchange; } + + + @AnonymousAccess + @ApiOperation("填制单据-填写商业发票-保存/提交") + @PostMapping("addExportCommercialInvoice") + public ResultEntity addExportCommercialInvoice(@RequestBody ExportCommercialInvoice exportCommercialInvoice) { + + Integer i = letterOfCreditApplicationService.addExportCommercialInvoice(exportCommercialInvoice); + + String type; + if (exportCommercialInvoice.getSubmitStatus() == 1) { + type = "提交"; + } else { + type = "保存"; + } + if (i > 0) { + return new ResultEntity<>(HttpStatus.OK, type + "成功"); + } else { + return new ResultEntity<>(HttpStatus.OK, type + "失败"); + } + } + + + @AnonymousAccess + @ApiOperation("填写商业发票-回显") + @PostMapping("getExportCommercialInvoice") + public ExportCommercialInvoice getExportCommercialInvoice(@ApiParam("用户ID") String userId, + @ApiParam("案例序号") Integer number) { + // 获取制单交单 + ExportPresentationOfDocumentsExample exportExample = new ExportPresentationOfDocumentsExample(); + exportExample.createCriteria().andUserIdEqualTo(userId).andNumberEqualTo(number); + + List presentationOfDocumentsList = presentationOfDocumentsMapper.selectByExample(exportExample); + + // 如果没有放款记录，直接返回 null + if (CollectionUtils.isEmpty(presentationOfDocumentsList)) { + return null; + } + + ExportCommercialInvoiceExample exportCommercialInvoiceExample = new ExportCommercialInvoiceExample(); + exportCommercialInvoiceExample.createCriteria().andNumberEqualTo(number).andUserIdEqualTo(userId); + List exportCommercialInvoices = exportCommercialInvoiceMapper.selectByExample(exportCommercialInvoiceExample); + + //合同编号 + ExportPresentationOfDocuments exportPresentationOfDocuments = presentationOfDocumentsList.get(0); + String contractNumber = exportPresentationOfDocuments.getContractNumber(); //合同编号 + + ExportCommercialInvoice exportCommercialInvoice; + if (!exportCommercialInvoices.isEmpty()) { + exportCommercialInvoice = exportCommercialInvoices.get(0); + } else { + exportCommercialInvoice = new ExportCommercialInvoice(); + } + exportCommercialInvoice.setContractNumber(contractNumber); + return exportCommercialInvoice; + } + + @AnonymousAccess + @ApiOperation("填制单据-填制货物运输保险保险单-保存/提交") + @PostMapping("addExportCargoTransportationInsurancePolicy") + public ResultEntity addExportCargoTransportationInsurancePolicy(@RequestBody ExportCargoTransportationInsurancePolicy exportCargoTransportationInsurancePolicy) { + + Integer i = letterOfCreditApplicationService.addExportCargoTransportationInsurancePolicy(exportCargoTransportationInsurancePolicy); + + String type; + if (exportCargoTransportationInsurancePolicy.getSubmitStatus() == 1) { + type = "提交"; + } else { + type = "保存"; + } + if (i > 0) { + return new ResultEntity<>(HttpStatus.OK, type + "成功"); + } else { + return new ResultEntity<>(HttpStatus.OK, type + "失败"); + } + } + + @AnonymousAccess + @ApiOperation("填写货物运输保险保险单-回显") + @PostMapping("getExportCargoTransportationInsurancePolicy") + public ExportCargoTransportationInsurancePolicy getExportCargoTransportationInsurancePolicy(@ApiParam("用户ID") String userId, + @ApiParam("案例序号") Integer number) { + ExportCommercialInvoice exportCommercialInvoice = getExportCommercialInvoice(userId, number); + if (exportCommercialInvoice == null) { + return null; + } + ExportCargoTransportationInsurancePolicy exportCargoTransportationInsurancePolicy; + ExportCargoTransportationInsurancePolicyExample example = new ExportCargoTransportationInsurancePolicyExample(); + example.createCriteria().andNumberEqualTo(number).andUserIdEqualTo(userId); + List cargoTransportationInsurancePolicyList = cargoTransportationInsurancePolicyMapper.selectByExample(example); + if (!cargoTransportationInsurancePolicyList.isEmpty()) { + exportCargoTransportationInsurancePolicy = cargoTransportationInsurancePolicyList.get(0); + } else { + exportCargoTransportationInsurancePolicy = new ExportCargoTransportationInsurancePolicy(); + } + + String invoiceNo = exportCommercialInvoice.getInvoiceNo(); //发票编号 + String contractNumber = exportCommercialInvoice.getContractNumber();//打包放款的合同编号 + exportCargoTransportationInsurancePolicy.setInvoiceNo(invoiceNo); + exportCargoTransportationInsurancePolicy.setContractNumber(contractNumber); + return exportCargoTransportationInsurancePolicy; + } + + + @AnonymousAccess + @ApiOperation("填制单据-填写海运提单-保存/提交") + @PostMapping("addExportBillOfLading") + public ResultEntity addExportBillOfLading(@RequestBody ExportBillOfLading exportBillOfLading) { + + Integer i = letterOfCreditApplicationService.addExportBillOfLading(exportBillOfLading); + + String type; + if (exportBillOfLading.getSubmitStatus() == 1) { + type = "提交"; + } else { + type = "保存"; + } + if (i > 0) { + return new ResultEntity<>(HttpStatus.OK, type + "成功"); + } else { + return new ResultEntity<>(HttpStatus.OK, type + "失败"); + } + } + + + @AnonymousAccess + @ApiOperation("填写填写海运提单-回显") + @PostMapping("getExportBillOfLading") + public ExportBillOfLading getExportBillOfLading(@ApiParam("用户ID") String userId, + @ApiParam("案例序号") Integer number) { + ExportBillOfLadingExample exportBillOfLadingExample = new ExportBillOfLadingExample(); + exportBillOfLadingExample.createCriteria().andNumberEqualTo(number).andUserIdEqualTo(userId); + List exportBillOfLadingList = exportBillOfLadingMapper.selectByExample(exportBillOfLadingExample); + if (!exportBillOfLadingList.isEmpty()) { + return exportBillOfLadingList.get(0); + } + return null; + } + + + @AnonymousAccess + @ApiOperation("出口审单-提交") + @PostMapping("submitExportReview") + public ResultEntity submitExportReview(@RequestBody ExportReview exportReview) { + if (StringUtils.isBlank(exportReview.getReviewStatus())) { + return new ResultEntity(HttpStatus.BAD_REQUEST, "请选择提交状态！"); + } + if (StringUtils.isBlank(exportReview.getReviewReason())) { + return new ResultEntity(HttpStatus.BAD_REQUEST, "请输入审核理由！"); + } + exportReview.setCreateTime(new Date()); + exportReview.setSubmitStatus(1); + exportReviewMapper.insert(exportReview); + return new ResultEntity(HttpStatus.OK, "提交成功！"); + } + + + @AnonymousAccess + @ApiOperation("出口审单-回显") + @PostMapping("getExportReview") + public ExportReview getExportReview(@ApiParam("用户ID") String userId, + @ApiParam("案例序号") Integer number) { + ExportReviewExample exportReviewExample = new ExportReviewExample(); + exportReviewExample.createCriteria().andNumberEqualTo(number).andUserIdEqualTo(userId); + List exportReviewList = exportReviewMapper.selectByExample(exportReviewExample); + if (!exportReviewList.isEmpty()) { + return exportReviewList.get(0); + } + return null; + } + + + @AnonymousAccess + @ApiOperation("出口押汇登记-保存/提交") + @PostMapping("addExportFinancingRegistration") + public ResultEntity addExportFinancingRegistration(@RequestBody ExportFinancingRegistration exportFinancingRegistration) { + + Integer i = letterOfCreditApplicationService.addExportFinancingRegistration(exportFinancingRegistration); + + String type; + if (exportFinancingRegistration.getSubmitStatus() == 1) { + type = "提交"; + } else { + type = "保存"; + } + if (i > 0) { + return new ResultEntity<>(HttpStatus.OK, type + "成功"); + } else { + return new ResultEntity<>(HttpStatus.OK, type + "失败"); + } + } + + @AnonymousAccess + @ApiOperation("出口押汇登记-回显") + @PostMapping("getExportBillOfLading") + public ExportFinancingRegistration getExportFinancingRegistration(@ApiParam("用户ID") String userId, + @ApiParam("案例序号") Integer number) { + // 获取打包放款对象 + ExportLetterOfCreditPackagingExample letterExample = new ExportLetterOfCreditPackagingExample(); + letterExample.createCriteria().andUserIdEqualTo(userId).andNumberEqualTo(number); + + List letterOfCreditPackagings = letterOfCreditPackagingMapper.selectByExample(letterExample); + + // 如果没有放款记录，直接返回 null + if (CollectionUtils.isEmpty(letterOfCreditPackagings)) { + return null; + } + + //出口押汇登记对象 + ExportFinancingRegistrationExample example = new ExportFinancingRegistrationExample(); + example.createCriteria().andUserIdEqualTo(userId).andNumberEqualTo(number); + List exportFinancingRegistrations = exportFinancingRegistrationMapper.selectByExample(example); + + ExportFinancingRegistration exportFinancingRegistration; + if (exportFinancingRegistrations.isEmpty()) { + exportFinancingRegistration = new ExportFinancingRegistration(); + } else { + exportFinancingRegistration = exportFinancingRegistrations.get(0); + } + + ExportLetterOfCreditPackaging exportLetterOfCreditPackaging = letterOfCreditPackagings.get(0); + String creditLetterNumber = exportLetterOfCreditPackaging.getCreditLetterNumber(); //信用证号 + String customerName = exportLetterOfCreditPackaging.getCustomerName(); //客户名称 + BigDecimal packagingAmount = exportLetterOfCreditPackaging.getPackagingAmount(); //打包金额 + String packagingCurrency = exportLetterOfCreditPackaging.getPackagingCurrency(); //打包币种 + + + exportFinancingRegistration.setCreditLetterNumber(creditLetterNumber); + exportFinancingRegistration.setCustomerName(customerName); + exportFinancingRegistration.setFinancingAmount(packagingAmount); + exportFinancingRegistration.setFinancingCurrency(packagingCurrency); + return exportFinancingRegistration; + } + + + @AnonymousAccess + @ApiOperation("寄单索汇-保存/提交") + @PostMapping("addExportRemittanceRegistration") + public ResultEntity addExportRemittanceRegistration(@RequestBody ExportRemittanceRegistration exportRemittanceRegistration) { + Integer i = letterOfCreditApplicationService.addExportRemittanceRegistration(exportRemittanceRegistration); + + String type; + if (exportRemittanceRegistration.getSubmitStatus() == 1) { + type = "提交"; + } else { + type = "保存"; + } + if (i > 0) { + return new ResultEntity<>(HttpStatus.OK, type + "成功"); + } else { + return new ResultEntity<>(HttpStatus.OK, type + "失败"); + } + } + + + @AnonymousAccess + @ApiOperation("寄单索汇-回显") + @PostMapping("getExportRemittanceRegistration") + public ExportRemittanceRegistration getExportRemittanceRegistration(@ApiParam("用户ID") String userId, + @ApiParam("案例序号") Integer number) { + ExportLetterOfCreditApplicationExample letterOfCreditApplicationExample = new ExportLetterOfCreditApplicationExample(); + letterOfCreditApplicationExample.createCriteria().andUserIdEqualTo(userId).andNumberEqualTo(number); + + List letterOfCreditApplications = letterOfCreditApplicationMapper.selectByExample(letterOfCreditApplicationExample); + //未完成来证登记步骤 直接返回null + if (letterOfCreditApplications.isEmpty()) { + return null; + } + ExportRemittanceRegistrationExample example = new ExportRemittanceRegistrationExample(); + example.createCriteria().andUserIdEqualTo(userId).andNumberEqualTo(number); + List exportRemittanceRegistrations = exportRemittanceRegistrationMapper.selectByExample(example); + + ExportRemittanceRegistration remittanceRegistration; + if (!exportRemittanceRegistrations.isEmpty()) { + remittanceRegistration = exportRemittanceRegistrations.get(0); + } else { + remittanceRegistration = new ExportRemittanceRegistration(); + } + + ExportLetterOfCreditApplication exportLetterOfCreditApplication = letterOfCreditApplications.get(0); + if (StringUtils.isNotBlank(exportLetterOfCreditApplication.getCreditLetterNumber())) { + String creditLetterNumber = exportLetterOfCreditApplication.getCreditLetterNumber();//信用证号 + remittanceRegistration.setCreditLetterNumber(creditLetterNumber); + } + if (StringUtils.isNotBlank(exportLetterOfCreditApplication.getBeneficiaryName())) { + String beneficiaryName = exportLetterOfCreditApplication.getBeneficiaryName(); //受益人名称 + remittanceRegistration.setBeneficiaryName(beneficiaryName); + } + if (StringUtils.isNotBlank(exportLetterOfCreditApplication.getBeneficiaryAddress())) { + String beneficiaryAddress = exportLetterOfCreditApplication.getBeneficiaryAddress(); //收益人地址 + remittanceRegistration.setBeneficiaryAddress(beneficiaryAddress); + } + if (exportLetterOfCreditApplication.getUsancePeriod() != null) { + Integer usancePeriod = exportLetterOfCreditApplication.getUsancePeriod(); //远期期限 + remittanceRegistration.setUsancePeriod(usancePeriod); + } + if (exportLetterOfCreditApplication.getActualTelegramFee() != null) { + BigDecimal actualTelegramFee = exportLetterOfCreditApplication.getActualTelegramFee();//实收电报费 + remittanceRegistration.setActualTelegramFee(actualTelegramFee); + } + if (exportLetterOfCreditApplication.getActualIssuingFee() != null) { + BigDecimal actualIssuingFee = exportLetterOfCreditApplication.getActualIssuingFee(); //todo 实收开证手续费是 议付费吗？ + remittanceRegistration.setActualIssuingFee(actualIssuingFee); + } + return remittanceRegistration; + } + + + @AnonymousAccess + @ApiOperation("付款承兑-保存/提交") + @PostMapping("addExportPaymentAcceptance") + public ResultEntity addExportPaymentAcceptance(@RequestBody ExportPaymentAcceptance exportPaymentAcceptance) { + Integer i = letterOfCreditApplicationService.addExportPaymentAcceptance(exportPaymentAcceptance); + + String type; + if (exportPaymentAcceptance.getSubmitStatus() == 1) { + type = "提交"; + } else { + type = "保存"; + } + if (i > 0) { + return new ResultEntity<>(HttpStatus.OK, type + "成功"); + } else { + return new ResultEntity<>(HttpStatus.OK, type + "失败"); + } + } + + + @AnonymousAccess + @ApiOperation("付款承兑-回显") + @PostMapping("getExportPaymentAcceptance") + public ExportPaymentAcceptance getExportPaymentAcceptance(@ApiParam("用户ID") String userId, + @ApiParam("案例序号") Integer number) { + ExportLetterOfCreditApplicationExample letterOfCreditApplicationExample = new ExportLetterOfCreditApplicationExample(); + letterOfCreditApplicationExample.createCriteria().andUserIdEqualTo(userId).andNumberEqualTo(number); + + List letterOfCreditApplications = letterOfCreditApplicationMapper.selectByExample(letterOfCreditApplicationExample); + //未完成来证登记步骤 直接返回null + if (letterOfCreditApplications.isEmpty()) { + return null; + } + + ExportLetterOfCreditApplication exportLetterOfCreditApplication = letterOfCreditApplications.get(0); + String creditLetterNumber = exportLetterOfCreditApplication.getCreditLetterNumber(); + + ExportPaymentAcceptanceExample example = new ExportPaymentAcceptanceExample(); + example.createCriteria().andUserIdEqualTo(userId).andNumberEqualTo(number); + List exportPaymentAcceptances = exportPaymentAcceptanceMapper.selectByExample(example); + + ExportPaymentAcceptance exportPaymentAcceptance; + if (exportPaymentAcceptances.isEmpty()) { + exportPaymentAcceptance = new ExportPaymentAcceptance(); + } else { + exportPaymentAcceptance = exportPaymentAcceptances.get(0); + } + exportPaymentAcceptance.setCreditLetterNumber(creditLetterNumber); + return exportPaymentAcceptance; + } + + + @AnonymousAccess + @ApiOperation("融资返还登记-保存/提交") + @PostMapping("addExportFinancingReturnRegistration") + public ResultEntity addExportFinancingReturnRegistration(@RequestBody ExportFinancingReturnRegistration exportFinancingReturnRegistration) { + Integer i = letterOfCreditApplicationService.addExportFinancingReturnRegistration(exportFinancingReturnRegistration); + + String type; + if (exportFinancingReturnRegistration.getSubmitStatus() == 1) { + type = "提交"; + } else { + type = "保存"; + } + if (i > 0) { + return new ResultEntity<>(HttpStatus.OK, type + "成功"); + } else { + return new ResultEntity<>(HttpStatus.OK, type + "失败"); + } + } + + + @AnonymousAccess + @ApiOperation("融资返还登记-回显") + @PostMapping("getExportPaymentAcceptance") + public ExportFinancingReturnRegistration getExportFinancingReturnRegistration(@ApiParam("用户ID") String userId, + @ApiParam("案例序号") Integer number) { + //出口押汇对象查询 + ExportFinancingRegistrationExample financingRegistrationExample = new ExportFinancingRegistrationExample(); + financingRegistrationExample.createCriteria().andUserIdEqualTo(userId).andNumberEqualTo(number); + List exportFinancingRegistrations = exportFinancingRegistrationMapper.selectByExample(financingRegistrationExample); + + if (exportFinancingRegistrations.isEmpty()) { + return null; + } + + ExportFinancingRegistration financingRegistration = exportFinancingRegistrations.get(0); + String customerName = financingRegistration.getCustomerName();//客户名称 + String financingCurrency = financingRegistration.getFinancingCurrency(); //融资币种 + Date interestStartDate = financingRegistration.getInterestStartDate(); //起息日 + String loanTerm = financingRegistration.getLoanTerm(); //贷款期限 + + + //融资返回登记对象 + ExportFinancingReturnRegistrationExample example = new ExportFinancingReturnRegistrationExample(); + example.createCriteria().andUserIdEqualTo(userId).andNumberEqualTo(number); + List exportFinancingReturnRegistrations = financingReturnRegistrationMapper.selectByExample(example); + + ExportFinancingReturnRegistration exportFinancingReturnRegistration; + if (!exportFinancingReturnRegistrations.isEmpty()) { + exportFinancingReturnRegistration = exportFinancingReturnRegistrations.get(0); + } else { + exportFinancingReturnRegistration = new ExportFinancingReturnRegistration(); + } + exportFinancingReturnRegistration.setCustomerName(customerName); + exportFinancingReturnRegistration.setFinancingCurrency(financingCurrency); + exportFinancingReturnRegistration.setInterestStartDate(interestStartDate); + exportFinancingReturnRegistration.setLoanTerm(loanTerm); + return exportFinancingReturnRegistration; + } } diff --git a/src/main/java/com/sztzjy/bank/entity/ExportCargoTransportationInsurancePolicy.java b/src/main/java/com/sztzjy/bank/entity/ExportCargoTransportationInsurancePolicy.java index d9b2bc8..0f283fd 100644 --- a/src/main/java/com/sztzjy/bank/entity/ExportCargoTransportationInsurancePolicy.java +++ b/src/main/java/com/sztzjy/bank/entity/ExportCargoTransportationInsurancePolicy.java @@ -1,9 +1,10 @@ package com.sztzjy.bank.entity; +import io.swagger.annotations.ApiModelProperty; + import java.math.BigDecimal; import java.util.Date; -import io.swagger.annotations.ApiModelProperty; /** * 出口信用证业务-货物运输保险单 * @@ -89,6 +90,29 @@ public class ExportCargoTransportationInsurancePolicy { @ApiModelProperty(notes = "保险货物项") private String descriptionOfGoods; + + @ApiModelProperty(notes = "回显用 合同编号") + private String contractNumber; + + @ApiModelProperty(notes = "回显用 发票编号") + private String invoiceNo; + + public String getContractNumber() { + return contractNumber; + } + + public void setContractNumber(String contractNumber) { + this.contractNumber = contractNumber; + } + + public String getInvoiceNo() { + return invoiceNo; + } + + public void setInvoiceNo(String invoiceNo) { + this.invoiceNo = invoiceNo; + } + public Integer getId() { return id; } diff --git a/src/main/java/com/sztzjy/bank/entity/ExportCommercialInvoice.java b/src/main/java/com/sztzjy/bank/entity/ExportCommercialInvoice.java index 9c03d38..8fd2a68 100644 --- a/src/main/java/com/sztzjy/bank/entity/ExportCommercialInvoice.java +++ b/src/main/java/com/sztzjy/bank/entity/ExportCommercialInvoice.java @@ -38,6 +38,9 @@ public class ExportCommercialInvoice { @ApiModelProperty(notes = "唛头号码") private String marksAndNo; + @ApiModelProperty(notes = "数量与货品名") + private String quantitiesAndDescriptions; + @ApiModelProperty(notes = "单价") private BigDecimal unitPrice; @@ -74,8 +77,17 @@ public class ExportCommercialInvoice { @ApiModelProperty(notes = "第几套案例（1、2、3）") private Integer number; - @ApiModelProperty(notes = "数量与货品名") - private String quantitiesAndDescriptions; + + @ApiModelProperty(notes = "回显用 合同号") + private String contractNumber; + + public String getContractNumber() { + return contractNumber; + } + + public void setContractNumber(String contractNumber) { + this.contractNumber = contractNumber; + } public Integer getId() { return id; @@ -149,6 +161,14 @@ public class ExportCommercialInvoice { this.marksAndNo = marksAndNo == null ? null : marksAndNo.trim(); } + public String getQuantitiesAndDescriptions() { + return quantitiesAndDescriptions; + } + + public void setQuantitiesAndDescriptions(String quantitiesAndDescriptions) { + this.quantitiesAndDescriptions = quantitiesAndDescriptions == null ? null : quantitiesAndDescriptions.trim(); + } + public BigDecimal getUnitPrice() { return unitPrice; } @@ -244,12 +264,4 @@ public class ExportCommercialInvoice { public void setNumber(Integer number) { this.number = number; } - - public String getQuantitiesAndDescriptions() { - return quantitiesAndDescriptions; - } - - public void setQuantitiesAndDescriptions(String quantitiesAndDescriptions) { - this.quantitiesAndDescriptions = quantitiesAndDescriptions == null ? null : quantitiesAndDescriptions.trim(); - } } \ No newline at end of file diff --git a/src/main/java/com/sztzjy/bank/entity/ExportCommercialInvoiceExample.java b/src/main/java/com/sztzjy/bank/entity/ExportCommercialInvoiceExample.java index 30cf412..9f59acb 100644 --- a/src/main/java/com/sztzjy/bank/entity/ExportCommercialInvoiceExample.java +++ b/src/main/java/com/sztzjy/bank/entity/ExportCommercialInvoiceExample.java @@ -743,6 +743,76 @@ public class ExportCommercialInvoiceExample { return (Criteria) this; } + public Criteria andQuantitiesAndDescriptionsIsNull() { + addCriterion("quantities_and_descriptions is null"); + return (Criteria) this; + } + + public Criteria andQuantitiesAndDescriptionsIsNotNull() { + addCriterion("quantities_and_descriptions is not null"); + return (Criteria) this; + } + + public Criteria andQuantitiesAndDescriptionsEqualTo(String value) { + addCriterion("quantities_and_descriptions =", value, "quantitiesAndDescriptions"); + return (Criteria) this; + } + + public Criteria andQuantitiesAndDescriptionsNotEqualTo(String value) { + addCriterion("quantities_and_descriptions <>", value, "quantitiesAndDescriptions"); + return (Criteria) this; + } + + public Criteria andQuantitiesAndDescriptionsGreaterThan(String value) { + addCriterion("quantities_and_descriptions >", value, "quantitiesAndDescriptions"); + return (Criteria) this; + } + + public Criteria andQuantitiesAndDescriptionsGreaterThanOrEqualTo(String value) { + addCriterion("quantities_and_descriptions >=", value, "quantitiesAndDescriptions"); + return (Criteria) this; + } + + public Criteria andQuantitiesAndDescriptionsLessThan(String value) { + addCriterion("quantities_and_descriptions <", value, "quantitiesAndDescriptions"); + return (Criteria) this; + } + + public Criteria andQuantitiesAndDescriptionsLessThanOrEqualTo(String value) { + addCriterion("quantities_and_descriptions <=", value, "quantitiesAndDescriptions"); + return (Criteria) this; + } + + public Criteria andQuantitiesAndDescriptionsLike(String value) { + addCriterion("quantities_and_descriptions like", value, "quantitiesAndDescriptions"); + return (Criteria) this; + } + + public Criteria andQuantitiesAndDescriptionsNotLike(String value) { + addCriterion("quantities_and_descriptions not like", value, "quantitiesAndDescriptions"); + return (Criteria) this; + } + + public Criteria andQuantitiesAndDescriptionsIn(List values) { + addCriterion("quantities_and_descriptions in", values, "quantitiesAndDescriptions"); + return (Criteria) this; + } + + public Criteria andQuantitiesAndDescriptionsNotIn(List values) { + addCriterion("quantities_and_descriptions not in", values, "quantitiesAndDescriptions"); + return (Criteria) this; + } + + public Criteria andQuantitiesAndDescriptionsBetween(String value1, String value2) { + addCriterion("quantities_and_descriptions between", value1, value2, "quantitiesAndDescriptions"); + return (Criteria) this; + } + + public Criteria andQuantitiesAndDescriptionsNotBetween(String value1, String value2) { + addCriterion("quantities_and_descriptions not between", value1, value2, "quantitiesAndDescriptions"); + return (Criteria) this; + } + public Criteria andUnitPriceIsNull() { addCriterion("unit_price is null"); return (Criteria) this; diff --git a/src/main/java/com/sztzjy/bank/entity/ExportFinancingRegistration.java b/src/main/java/com/sztzjy/bank/entity/ExportFinancingRegistration.java index b5bd808..39337bd 100644 --- a/src/main/java/com/sztzjy/bank/entity/ExportFinancingRegistration.java +++ b/src/main/java/com/sztzjy/bank/entity/ExportFinancingRegistration.java @@ -1,5 +1,6 @@ package com.sztzjy.bank.entity; +import java.math.BigDecimal; import java.util.Date; import io.swagger.annotations.ApiModelProperty; @@ -13,6 +14,12 @@ public class ExportFinancingRegistration { @ApiModelProperty(notes = "主键ID") private Integer id; + @ApiModelProperty(notes = "客户名称") + private String customerName; + + @ApiModelProperty(notes = "融资币种") + private String financingCurrency; + @ApiModelProperty(notes = "融资（贷款入账）账号") private String financingAccount; @@ -49,6 +56,31 @@ public class ExportFinancingRegistration { @ApiModelProperty(notes = "第几套案例（1、2、3）") private Integer number; + + + //回显用 + @ApiModelProperty(notes = "回显用-信用证号") + private String creditLetterNumber; + + @ApiModelProperty(notes = "回显-融资金额") + private BigDecimal financingAmount; + + public String getCreditLetterNumber() { + return creditLetterNumber; + } + + public void setCreditLetterNumber(String creditLetterNumber) { + this.creditLetterNumber = creditLetterNumber; + } + + public BigDecimal getFinancingAmount() { + return financingAmount; + } + + public void setFinancingAmount(BigDecimal financingAmount) { + this.financingAmount = financingAmount; + } + public Integer getId() { return id; } @@ -57,6 +89,22 @@ public class ExportFinancingRegistration { this.id = id; } + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName == null ? null : customerName.trim(); + } + + public String getFinancingCurrency() { + return financingCurrency; + } + + public void setFinancingCurrency(String financingCurrency) { + this.financingCurrency = financingCurrency == null ? null : financingCurrency.trim(); + } + public String getFinancingAccount() { return financingAccount; } diff --git a/src/main/java/com/sztzjy/bank/entity/ExportFinancingRegistrationExample.java b/src/main/java/com/sztzjy/bank/entity/ExportFinancingRegistrationExample.java index 3651a0c..3de534e 100644 --- a/src/main/java/com/sztzjy/bank/entity/ExportFinancingRegistrationExample.java +++ b/src/main/java/com/sztzjy/bank/entity/ExportFinancingRegistrationExample.java @@ -165,6 +165,146 @@ public class ExportFinancingRegistrationExample { return (Criteria) this; } + public Criteria andCustomerNameIsNull() { + addCriterion("customer_name is null"); + return (Criteria) this; + } + + public Criteria andCustomerNameIsNotNull() { + addCriterion("customer_name is not null"); + return (Criteria) this; + } + + public Criteria andCustomerNameEqualTo(String value) { + addCriterion("customer_name =", value, "customerName"); + return (Criteria) this; + } + + public Criteria andCustomerNameNotEqualTo(String value) { + addCriterion("customer_name <>", value, "customerName"); + return (Criteria) this; + } + + public Criteria andCustomerNameGreaterThan(String value) { + addCriterion("customer_name >", value, "customerName"); + return (Criteria) this; + } + + public Criteria andCustomerNameGreaterThanOrEqualTo(String value) { + addCriterion("customer_name >=", value, "customerName"); + return (Criteria) this; + } + + public Criteria andCustomerNameLessThan(String value) { + addCriterion("customer_name <", value, "customerName"); + return (Criteria) this; + } + + public Criteria andCustomerNameLessThanOrEqualTo(String value) { + addCriterion("customer_name <=", value, "customerName"); + return (Criteria) this; + } + + public Criteria andCustomerNameLike(String value) { + addCriterion("customer_name like", value, "customerName"); + return (Criteria) this; + } + + public Criteria andCustomerNameNotLike(String value) { + addCriterion("customer_name not like", value, "customerName"); + return (Criteria) this; + } + + public Criteria andCustomerNameIn(List values) { + addCriterion("customer_name in", values, "customerName"); + return (Criteria) this; + } + + public Criteria andCustomerNameNotIn(List values) { + addCriterion("customer_name not in", values, "customerName"); + return (Criteria) this; + } + + public Criteria andCustomerNameBetween(String value1, String value2) { + addCriterion("customer_name between", value1, value2, "customerName"); + return (Criteria) this; + } + + public Criteria andCustomerNameNotBetween(String value1, String value2) { + addCriterion("customer_name not between", value1, value2, "customerName"); + return (Criteria) this; + } + + public Criteria andFinancingCurrencyIsNull() { + addCriterion("financing_currency is null"); + return (Criteria) this; + } + + public Criteria andFinancingCurrencyIsNotNull() { + addCriterion("financing_currency is not null"); + return (Criteria) this; + } + + public Criteria andFinancingCurrencyEqualTo(String value) { + addCriterion("financing_currency =", value, "financingCurrency"); + return (Criteria) this; + } + + public Criteria andFinancingCurrencyNotEqualTo(String value) { + addCriterion("financing_currency <>", value, "financingCurrency"); + return (Criteria) this; + } + + public Criteria andFinancingCurrencyGreaterThan(String value) { + addCriterion("financing_currency >", value, "financingCurrency"); + return (Criteria) this; + } + + public Criteria andFinancingCurrencyGreaterThanOrEqualTo(String value) { + addCriterion("financing_currency >=", value, "financingCurrency"); + return (Criteria) this; + } + + public Criteria andFinancingCurrencyLessThan(String value) { + addCriterion("financing_currency <", value, "financingCurrency"); + return (Criteria) this; + } + + public Criteria andFinancingCurrencyLessThanOrEqualTo(String value) { + addCriterion("financing_currency <=", value, "financingCurrency"); + return (Criteria) this; + } + + public Criteria andFinancingCurrencyLike(String value) { + addCriterion("financing_currency like", value, "financingCurrency"); + return (Criteria) this; + } + + public Criteria andFinancingCurrencyNotLike(String value) { + addCriterion("financing_currency not like", value, "financingCurrency"); + return (Criteria) this; + } + + public Criteria andFinancingCurrencyIn(List values) { + addCriterion("financing_currency in", values, "financingCurrency"); + return (Criteria) this; + } + + public Criteria andFinancingCurrencyNotIn(List values) { + addCriterion("financing_currency not in", values, "financingCurrency"); + return (Criteria) this; + } + + public Criteria andFinancingCurrencyBetween(String value1, String value2) { + addCriterion("financing_currency between", value1, value2, "financingCurrency"); + return (Criteria) this; + } + + public Criteria andFinancingCurrencyNotBetween(String value1, String value2) { + addCriterion("financing_currency not between", value1, value2, "financingCurrency"); + return (Criteria) this; + } + public Criteria andFinancingAccountIsNull() { addCriterion("financing_account is null"); return (Criteria) this; diff --git a/src/main/java/com/sztzjy/bank/entity/ExportFinancingReturnRegistration.java b/src/main/java/com/sztzjy/bank/entity/ExportFinancingReturnRegistration.java index 6b08a7f..bc7282e 100644 --- a/src/main/java/com/sztzjy/bank/entity/ExportFinancingReturnRegistration.java +++ b/src/main/java/com/sztzjy/bank/entity/ExportFinancingReturnRegistration.java @@ -23,6 +23,9 @@ public class ExportFinancingReturnRegistration { @ApiModelProperty(notes = "本次融资返还账号") private String financingReturnAccount; + @ApiModelProperty(notes = "利息收入") + private BigDecimal interestIncome; + @ApiModelProperty(notes = "用户ID") private String userId; @@ -44,6 +47,64 @@ public class ExportFinancingReturnRegistration { @ApiModelProperty(notes = "第几套案例（1、2、3）") private Integer number; + + + //回显用 + @ApiModelProperty(notes = "回显用-客户名称") + private String customerName; + + @ApiModelProperty(notes = "融资币种") + private String financingCurrency; + + @ApiModelProperty(notes = "起息日") + private Date interestStartDate; + + @ApiModelProperty(notes = "贷款期限") + private String loanTerm; + + @ApiModelProperty(notes = "执行利率") + private String effectiveInterestRate; + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getFinancingCurrency() { + return financingCurrency; + } + + public void setFinancingCurrency(String financingCurrency) { + this.financingCurrency = financingCurrency; + } + + public Date getInterestStartDate() { + return interestStartDate; + } + + public void setInterestStartDate(Date interestStartDate) { + this.interestStartDate = interestStartDate; + } + + public String getLoanTerm() { + return loanTerm; + } + + public void setLoanTerm(String loanTerm) { + this.loanTerm = loanTerm; + } + + public String getEffectiveInterestRate() { + return effectiveInterestRate; + } + + public void setEffectiveInterestRate(String effectiveInterestRate) { + this.effectiveInterestRate = effectiveInterestRate; + } + public Integer getId() { return id; } @@ -76,6 +137,14 @@ public class ExportFinancingReturnRegistration { this.financingReturnAccount = financingReturnAccount == null ? null : financingReturnAccount.trim(); } + public BigDecimal getInterestIncome() { + return interestIncome; + } + + public void setInterestIncome(BigDecimal interestIncome) { + this.interestIncome = interestIncome; + } + public String getUserId() { return userId; } diff --git a/src/main/java/com/sztzjy/bank/entity/ExportFinancingReturnRegistrationExample.java b/src/main/java/com/sztzjy/bank/entity/ExportFinancingReturnRegistrationExample.java index e9478c2..d424ec1 100644 --- a/src/main/java/com/sztzjy/bank/entity/ExportFinancingReturnRegistrationExample.java +++ b/src/main/java/com/sztzjy/bank/entity/ExportFinancingReturnRegistrationExample.java @@ -366,6 +366,66 @@ public class ExportFinancingReturnRegistrationExample { return (Criteria) this; } + public Criteria andInterestIncomeIsNull() { + addCriterion("interest_income is null"); + return (Criteria) this; + } + + public Criteria andInterestIncomeIsNotNull() { + addCriterion("interest_income is not null"); + return (Criteria) this; + } + + public Criteria andInterestIncomeEqualTo(BigDecimal value) { + addCriterion("interest_income =", value, "interestIncome"); + return (Criteria) this; + } + + public Criteria andInterestIncomeNotEqualTo(BigDecimal value) { + addCriterion("interest_income <>", value, "interestIncome"); + return (Criteria) this; + } + + public Criteria andInterestIncomeGreaterThan(BigDecimal value) { + addCriterion("interest_income >", value, "interestIncome"); + return (Criteria) this; + } + + public Criteria andInterestIncomeGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("interest_income >=", value, "interestIncome"); + return (Criteria) this; + } + + public Criteria andInterestIncomeLessThan(BigDecimal value) { + addCriterion("interest_income <", value, "interestIncome"); + return (Criteria) this; + } + + public Criteria andInterestIncomeLessThanOrEqualTo(BigDecimal value) { + addCriterion("interest_income <=", value, "interestIncome"); + return (Criteria) this; + } + + public Criteria andInterestIncomeIn(List values) { + addCriterion("interest_income in", values, "interestIncome"); + return (Criteria) this; + } + + public Criteria andInterestIncomeNotIn(List values) { + addCriterion("interest_income not in", values, "interestIncome"); + return (Criteria) this; + } + + public Criteria andInterestIncomeBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("interest_income between", value1, value2, "interestIncome"); + return (Criteria) this; + } + + public Criteria andInterestIncomeNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("interest_income not between", value1, value2, "interestIncome"); + return (Criteria) this; + } + public Criteria andUserIdIsNull() { addCriterion("user_id is null"); return (Criteria) this; diff --git a/src/main/java/com/sztzjy/bank/entity/ExportPaymentAcceptance.java b/src/main/java/com/sztzjy/bank/entity/ExportPaymentAcceptance.java index 73796d8..6878f79 100644 --- a/src/main/java/com/sztzjy/bank/entity/ExportPaymentAcceptance.java +++ b/src/main/java/com/sztzjy/bank/entity/ExportPaymentAcceptance.java @@ -23,6 +23,9 @@ public class ExportPaymentAcceptance { @ApiModelProperty(notes = "币种") private String currency; + @ApiModelProperty(notes = "到期日") + private Date maturityData; + @ApiModelProperty(notes = "用户ID") private String userId; @@ -44,6 +47,18 @@ public class ExportPaymentAcceptance { @ApiModelProperty(notes = "第几套案例（1、2、3）") private Integer number; + //回显用 + @ApiModelProperty(notes = "回显用-信用证号") + private String creditLetterNumber; + + public String getCreditLetterNumber() { + return creditLetterNumber; + } + + public void setCreditLetterNumber(String creditLetterNumber) { + this.creditLetterNumber = creditLetterNumber; + } + public Integer getId() { return id; } @@ -76,6 +91,14 @@ public class ExportPaymentAcceptance { this.currency = currency == null ? null : currency.trim(); } + public Date getMaturityData() { + return maturityData; + } + + public void setMaturityData(Date maturityData) { + this.maturityData = maturityData; + } + public String getUserId() { return userId; } diff --git a/src/main/java/com/sztzjy/bank/entity/ExportPaymentAcceptanceExample.java b/src/main/java/com/sztzjy/bank/entity/ExportPaymentAcceptanceExample.java index cef1ce1..9963d38 100644 --- a/src/main/java/com/sztzjy/bank/entity/ExportPaymentAcceptanceExample.java +++ b/src/main/java/com/sztzjy/bank/entity/ExportPaymentAcceptanceExample.java @@ -366,6 +366,66 @@ public class ExportPaymentAcceptanceExample { return (Criteria) this; } + public Criteria andMaturityDataIsNull() { + addCriterion("maturity_data is null"); + return (Criteria) this; + } + + public Criteria andMaturityDataIsNotNull() { + addCriterion("maturity_data is not null"); + return (Criteria) this; + } + + public Criteria andMaturityDataEqualTo(Date value) { + addCriterion("maturity_data =", value, "maturityData"); + return (Criteria) this; + } + + public Criteria andMaturityDataNotEqualTo(Date value) { + addCriterion("maturity_data <>", value, "maturityData"); + return (Criteria) this; + } + + public Criteria andMaturityDataGreaterThan(Date value) { + addCriterion("maturity_data >", value, "maturityData"); + return (Criteria) this; + } + + public Criteria andMaturityDataGreaterThanOrEqualTo(Date value) { + addCriterion("maturity_data >=", value, "maturityData"); + return (Criteria) this; + } + + public Criteria andMaturityDataLessThan(Date value) { + addCriterion("maturity_data <", value, "maturityData"); + return (Criteria) this; + } + + public Criteria andMaturityDataLessThanOrEqualTo(Date value) { + addCriterion("maturity_data <=", value, "maturityData"); + return (Criteria) this; + } + + public Criteria andMaturityDataIn(List values) { + addCriterion("maturity_data in", values, "maturityData"); + return (Criteria) this; + } + + public Criteria andMaturityDataNotIn(List values) { + addCriterion("maturity_data not in", values, "maturityData"); + return (Criteria) this; + } + + public Criteria andMaturityDataBetween(Date value1, Date value2) { + addCriterion("maturity_data between", value1, value2, "maturityData"); + return (Criteria) this; + } + + public Criteria andMaturityDataNotBetween(Date value1, Date value2) { + addCriterion("maturity_data not between", value1, value2, "maturityData"); + return (Criteria) this; + } + public Criteria andUserIdIsNull() { addCriterion("user_id is null"); return (Criteria) this; diff --git a/src/main/java/com/sztzjy/bank/entity/ExportRemittanceRegistration.java b/src/main/java/com/sztzjy/bank/entity/ExportRemittanceRegistration.java index 64da901..6a8bb6f 100644 --- a/src/main/java/com/sztzjy/bank/entity/ExportRemittanceRegistration.java +++ b/src/main/java/com/sztzjy/bank/entity/ExportRemittanceRegistration.java @@ -104,6 +104,82 @@ public class ExportRemittanceRegistration { @ApiModelProperty(notes = "第几套案例（1、2、3）") private Integer number; + + //回显用 + @ApiModelProperty(notes = "回显用-信用证号") + private String creditLetterNumber; + + @ApiModelProperty(notes = "回显用-受益人名称") + private String beneficiaryName; + + @ApiModelProperty(notes = "回显用-收益人地址") + private String beneficiaryAddress; + + @ApiModelProperty(notes = "回显用-远期期限") + private Integer usancePeriod; + + @ApiModelProperty(notes = "回显用-实收电报费") + private BigDecimal actualTelegramFee; + + @ApiModelProperty(notes = "回显用-议付费吗") + private BigDecimal actualIssuingFee; + + public Integer getUsancePeriod() { + return usancePeriod; + } + + public void setUsancePeriod(Integer usancePeriod) { + this.usancePeriod = usancePeriod; + } + + public BigDecimal getActualTelegramFee() { + return actualTelegramFee; + } + + public void setActualTelegramFee(BigDecimal actualTelegramFee) { + this.actualTelegramFee = actualTelegramFee; + } + + public BigDecimal getActualIssuingFee() { + return actualIssuingFee; + } + + public void setActualIssuingFee(BigDecimal actualIssuingFee) { + this.actualIssuingFee = actualIssuingFee; + } + + public Boolean getEmbossedConfirmation() { + return isEmbossedConfirmation; + } + + public void setEmbossedConfirmation(Boolean embossedConfirmation) { + isEmbossedConfirmation = embossedConfirmation; + } + + public String getCreditLetterNumber() { + return creditLetterNumber; + } + + public void setCreditLetterNumber(String creditLetterNumber) { + this.creditLetterNumber = creditLetterNumber; + } + + public String getBeneficiaryName() { + return beneficiaryName; + } + + public void setBeneficiaryName(String beneficiaryName) { + this.beneficiaryName = beneficiaryName; + } + + public String getBeneficiaryAddress() { + return beneficiaryAddress; + } + + public void setBeneficiaryAddress(String beneficiaryAddress) { + this.beneficiaryAddress = beneficiaryAddress; + } + public Integer getId() { return id; } diff --git a/src/main/java/com/sztzjy/bank/entity/ExportReview.java b/src/main/java/com/sztzjy/bank/entity/ExportReview.java index cc986b8..6c83473 100644 --- a/src/main/java/com/sztzjy/bank/entity/ExportReview.java +++ b/src/main/java/com/sztzjy/bank/entity/ExportReview.java @@ -13,6 +13,9 @@ public class ExportReview { @ApiModelProperty(notes = "主键ID") private Integer id; + @ApiModelProperty(notes = "通过/不通过") + private String reviewStatus; + @ApiModelProperty(notes = "用户ID") private String userId; @@ -45,6 +48,14 @@ public class ExportReview { this.id = id; } + public String getReviewStatus() { + return reviewStatus; + } + + public void setReviewStatus(String reviewStatus) { + this.reviewStatus = reviewStatus == null ? null : reviewStatus.trim(); + } + public String getUserId() { return userId; } diff --git a/src/main/java/com/sztzjy/bank/entity/ExportReviewExample.java b/src/main/java/com/sztzjy/bank/entity/ExportReviewExample.java index ba21697..3f9c6a4 100644 --- a/src/main/java/com/sztzjy/bank/entity/ExportReviewExample.java +++ b/src/main/java/com/sztzjy/bank/entity/ExportReviewExample.java @@ -165,6 +165,76 @@ public class ExportReviewExample { return (Criteria) this; } + public Criteria andReviewStatusIsNull() { + addCriterion("review_status is null"); + return (Criteria) this; + } + + public Criteria andReviewStatusIsNotNull() { + addCriterion("review_status is not null"); + return (Criteria) this; + } + + public Criteria andReviewStatusEqualTo(String value) { + addCriterion("review_status =", value, "reviewStatus"); + return (Criteria) this; + } + + public Criteria andReviewStatusNotEqualTo(String value) { + addCriterion("review_status <>", value, "reviewStatus"); + return (Criteria) this; + } + + public Criteria andReviewStatusGreaterThan(String value) { + addCriterion("review_status >", value, "reviewStatus"); + return (Criteria) this; + } + + public Criteria andReviewStatusGreaterThanOrEqualTo(String value) { + addCriterion("review_status >=", value, "reviewStatus"); + return (Criteria) this; + } + + public Criteria andReviewStatusLessThan(String value) { + addCriterion("review_status <", value, "reviewStatus"); + return (Criteria) this; + } + + public Criteria andReviewStatusLessThanOrEqualTo(String value) { + addCriterion("review_status <=", value, "reviewStatus"); + return (Criteria) this; + } + + public Criteria andReviewStatusLike(String value) { + addCriterion("review_status like", value, "reviewStatus"); + return (Criteria) this; + } + + public Criteria andReviewStatusNotLike(String value) { + addCriterion("review_status not like", value, "reviewStatus"); + return (Criteria) this; + } + + public Criteria andReviewStatusIn(List values) { + addCriterion("review_status in", values, "reviewStatus"); + return (Criteria) this; + } + + public Criteria andReviewStatusNotIn(List values) { + addCriterion("review_status not in", values, "reviewStatus"); + return (Criteria) this; + } + + public Criteria andReviewStatusBetween(String value1, String value2) { + addCriterion("review_status between", value1, value2, "reviewStatus"); + return (Criteria) this; + } + + public Criteria andReviewStatusNotBetween(String value1, String value2) { + addCriterion("review_status not between", value1, value2, "reviewStatus"); + return (Criteria) this; + } + public Criteria andUserIdIsNull() { addCriterion("user_id is null"); return (Criteria) this; diff --git a/src/main/java/com/sztzjy/bank/entity/dto/ExportBillOfLadingDTO.java b/src/main/java/com/sztzjy/bank/entity/dto/ExportBillOfLadingDTO.java new file mode 100644 index 0000000..8f29af4 --- /dev/null +++ b/src/main/java/com/sztzjy/bank/entity/dto/ExportBillOfLadingDTO.java @@ -0,0 +1,38 @@ +package com.sztzjy.bank.entity.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * @Author xcj + * @Date 2025/3/17 + */ +@Data +public class ExportBillOfLadingDTO { + @ApiModelProperty(notes = "装运者") + private String shipper; + + @ApiModelProperty(notes = "海运提单号") + private String blNo; + + @ApiModelProperty(notes = "收货人") + private String consignee; + + @ApiModelProperty(notes = "装运港") + private String placeOfReceipt; + + @ApiModelProperty(notes = "卸货港") + private String portOfDischarge; + + @ApiModelProperty(notes = "发货港") + private String portOfLoading; + + @ApiModelProperty(notes = "日期") + private Date date; + + @ApiModelProperty(notes = "签发地点及日期") + private String placeAndDateOfIssue; + +} diff --git a/src/main/java/com/sztzjy/bank/entity/dto/ExportCargoTransportationInsurancePolicyDTO.java b/src/main/java/com/sztzjy/bank/entity/dto/ExportCargoTransportationInsurancePolicyDTO.java new file mode 100644 index 0000000..a8c8316 --- /dev/null +++ b/src/main/java/com/sztzjy/bank/entity/dto/ExportCargoTransportationInsurancePolicyDTO.java @@ -0,0 +1,23 @@ +package com.sztzjy.bank.entity.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * @Author xcj + * @Date 2025/3/17 + */ +@Data +public class ExportCargoTransportationInsurancePolicyDTO { + @ApiModelProperty(notes = "启运日期") + private Date slgOnOrAbt; + + @ApiModelProperty(notes = "日期") + private Date date; + + @ApiModelProperty(notes = "签名") + private String signature; +} diff --git a/src/main/java/com/sztzjy/bank/entity/dto/ExportCommercialInvoiceDTO.java b/src/main/java/com/sztzjy/bank/entity/dto/ExportCommercialInvoiceDTO.java new file mode 100644 index 0000000..89c1df9 --- /dev/null +++ b/src/main/java/com/sztzjy/bank/entity/dto/ExportCommercialInvoiceDTO.java @@ -0,0 +1,41 @@ +package com.sztzjy.bank.entity.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * @Author xcj + * @Date 2025/3/17 + */ +@Data +public class ExportCommercialInvoiceDTO { + @ApiModelProperty(notes = "名址") + private String address; + + @ApiModelProperty(notes = "日期") + private Date date; + + @ApiModelProperty(notes = "起运港") + private String fromPort; + + @ApiModelProperty(notes = "目的港") + private String toPort; + + @ApiModelProperty(notes = "数量与货品名") + private String quantitiesAndDescriptions; + + @ApiModelProperty(notes = "单价") + private BigDecimal unitPrice; + + @ApiModelProperty(notes = "总价") + private BigDecimal amount; + + @ApiModelProperty(notes = "总额") + private BigDecimal totalAmount; + + @ApiModelProperty(notes = "签名") + private String signature; +} diff --git a/src/main/java/com/sztzjy/bank/entity/dto/ExportFinancingRegistrationDTO.java b/src/main/java/com/sztzjy/bank/entity/dto/ExportFinancingRegistrationDTO.java new file mode 100644 index 0000000..8aeae85 --- /dev/null +++ b/src/main/java/com/sztzjy/bank/entity/dto/ExportFinancingRegistrationDTO.java @@ -0,0 +1,22 @@ +package com.sztzjy.bank.entity.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * @Author xcj + * @Date 2025/3/17 + */ +@Data +public class ExportFinancingRegistrationDTO { + @ApiModelProperty(notes = "融资（贷款入账）账号") + private String financingAccount; + + @ApiModelProperty(notes = "起息日") + private Date interestStartDate; + + @ApiModelProperty(notes = "贷款期限") + private String loanTerm; +} diff --git a/src/main/java/com/sztzjy/bank/entity/dto/ExportFinancingReturnRegistrationDto.java b/src/main/java/com/sztzjy/bank/entity/dto/ExportFinancingReturnRegistrationDto.java new file mode 100644 index 0000000..4e23de9 --- /dev/null +++ b/src/main/java/com/sztzjy/bank/entity/dto/ExportFinancingReturnRegistrationDto.java @@ -0,0 +1,19 @@ +package com.sztzjy.bank.entity.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @Author xcj + * @Date 2025/3/18 + */ +@Data +public class ExportFinancingReturnRegistrationDto { + @ApiModelProperty(notes = "返还融资本金") + private BigDecimal returnPrincipal; + + @ApiModelProperty(notes = "本次融资返还账号") + private String financingReturnAccount; +} diff --git a/src/main/java/com/sztzjy/bank/entity/dto/ExportPaymentAcceptanceDto.java b/src/main/java/com/sztzjy/bank/entity/dto/ExportPaymentAcceptanceDto.java new file mode 100644 index 0000000..a062d7b --- /dev/null +++ b/src/main/java/com/sztzjy/bank/entity/dto/ExportPaymentAcceptanceDto.java @@ -0,0 +1,26 @@ +package com.sztzjy.bank.entity.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * @Author xcj + * @Date 2025/3/18 + */ +@Data +public class ExportPaymentAcceptanceDto { + @ApiModelProperty(notes = "回电类型") + private String responseType; + + @ApiModelProperty(notes = "金额") + private BigDecimal amount; + + @ApiModelProperty(notes = "币种") + private String currency; + + @ApiModelProperty(notes = "到期日") + private Date maturityData; +} diff --git a/src/main/java/com/sztzjy/bank/entity/dto/ExportRemittanceRegistrationDTO.java b/src/main/java/com/sztzjy/bank/entity/dto/ExportRemittanceRegistrationDTO.java new file mode 100644 index 0000000..acd33a5 --- /dev/null +++ b/src/main/java/com/sztzjy/bank/entity/dto/ExportRemittanceRegistrationDTO.java @@ -0,0 +1,80 @@ +package com.sztzjy.bank.entity.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * @Author xcj + * @Date 2025/3/17 + */ +@Data +public class ExportRemittanceRegistrationDTO { + @ApiModelProperty(notes = "议付币种") + private String paymentCurrency; + + @ApiModelProperty(notes = "议付金额") + private BigDecimal paymentAmount; + + @ApiModelProperty(notes = "即期/远期") + private String spotForward; + + @ApiModelProperty(notes = "开证行代码") + private String issuingBankCode; + + @ApiModelProperty(notes = "收单行代码") + private String receivingBankCode; + + @ApiModelProperty(notes = "开证日") + private Date issuanceDate; + + @ApiModelProperty(notes = "收费方式") + private String chargingMethod; + + @ApiModelProperty(notes = "是否为压印核符") + private Boolean isEmbossedConfirmation; + + @ApiModelProperty(notes = "收费币种") + private String chargingCurrency; + + @ApiModelProperty(notes = "信用证币别") + private String letterOfCreditCurrency; + + @ApiModelProperty(notes = "信用证金额") + private BigDecimal letterOfCreditAmount; + + @ApiModelProperty(notes = "快递国别") + private String expressCountry; + + @ApiModelProperty(notes = "议付日期") + private Date paymentDate; + + @ApiModelProperty(notes = "电报费类型") + private String telegramFeeType; + + @ApiModelProperty(notes = "汇票，1为有填，0为无填") + private Boolean draft; + + @ApiModelProperty(notes = "发票，1为有填，0为无填") + private Boolean invoice; + + @ApiModelProperty(notes = "装箱单，1为有填，0为无填") + private Boolean packingList; + + @ApiModelProperty(notes = "保险单，1为有填，0为无填") + private Boolean insurancePolicy; + + @ApiModelProperty(notes = "提单，1为有填，0为无填") + private Boolean billOfLading; + + @ApiModelProperty(notes = "检验证，1为有填，0为无填") + private Boolean inspectionCertificate; + + @ApiModelProperty(notes = "普惠制产地证，1为有填，0为无填") + private Boolean preferentialOriginCertificate; + + @ApiModelProperty(notes = "一般产地证，1为有填，0为无填") + private Boolean generalCertificateOfOrigin; +} diff --git a/src/main/java/com/sztzjy/bank/mapper/ExportCommercialInvoiceMapper.java b/src/main/java/com/sztzjy/bank/mapper/ExportCommercialInvoiceMapper.java index b0eb6c5..b4924ac 100644 --- a/src/main/java/com/sztzjy/bank/mapper/ExportCommercialInvoiceMapper.java +++ b/src/main/java/com/sztzjy/bank/mapper/ExportCommercialInvoiceMapper.java @@ -16,21 +16,15 @@ public interface ExportCommercialInvoiceMapper { int insertSelective(ExportCommercialInvoice record); - List selectByExampleWithBLOBs(ExportCommercialInvoiceExample example); - List selectByExample(ExportCommercialInvoiceExample example); ExportCommercialInvoice selectByPrimaryKey(Integer id); int updateByExampleSelective(@Param("record") ExportCommercialInvoice record, @Param("example") ExportCommercialInvoiceExample example); - int updateByExampleWithBLOBs(@Param("record") ExportCommercialInvoice record, @Param("example") ExportCommercialInvoiceExample example); - int updateByExample(@Param("record") ExportCommercialInvoice record, @Param("example") ExportCommercialInvoiceExample example); int updateByPrimaryKeySelective(ExportCommercialInvoice record); - int updateByPrimaryKeyWithBLOBs(ExportCommercialInvoice record); - int updateByPrimaryKey(ExportCommercialInvoice record); } \ No newline at end of file diff --git a/src/main/java/com/sztzjy/bank/service/ExportLetterOfCreditApplicationService.java b/src/main/java/com/sztzjy/bank/service/ExportLetterOfCreditApplicationService.java index e63cb99..07832d7 100644 --- a/src/main/java/com/sztzjy/bank/service/ExportLetterOfCreditApplicationService.java +++ b/src/main/java/com/sztzjy/bank/service/ExportLetterOfCreditApplicationService.java @@ -1,9 +1,6 @@ package com.sztzjy.bank.service; -import com.sztzjy.bank.entity.ExportBillOfExchange; -import com.sztzjy.bank.entity.ExportLetterOfCreditApplication; -import com.sztzjy.bank.entity.ExportLetterOfCreditPackaging; -import com.sztzjy.bank.entity.ExportPresentationOfDocuments; +import com.sztzjy.bank.entity.*; /** * @Author xcj @@ -17,4 +14,18 @@ public interface ExportLetterOfCreditApplicationService { Integer addPresentationOfDocuments(ExportPresentationOfDocuments exportPresentationOfDocuments); Integer addExportBillOfExchange(ExportBillOfExchange exportBillOfExchange); + + Integer addExportCommercialInvoice(ExportCommercialInvoice exportCommercialInvoice); + + Integer addExportCargoTransportationInsurancePolicy(ExportCargoTransportationInsurancePolicy exportCargoTransportationInsurancePolicy); + + Integer addExportBillOfLading(ExportBillOfLading exportBillOfLading); + + Integer addExportFinancingRegistration(ExportFinancingRegistration exportFinancingRegistration); + + Integer addExportRemittanceRegistration(ExportRemittanceRegistration exportRemittanceRegistration); + + Integer addExportPaymentAcceptance(ExportPaymentAcceptance exportPaymentAcceptance); + + Integer addExportFinancingReturnRegistration(ExportFinancingReturnRegistration exportFinancingReturnRegistration); } diff --git a/src/main/java/com/sztzjy/bank/service/impl/ExportLetterOfCreditApplicationServiceImpl.java b/src/main/java/com/sztzjy/bank/service/impl/ExportLetterOfCreditApplicationServiceImpl.java index fa67e2f..8ed5c38 100644 --- a/src/main/java/com/sztzjy/bank/service/impl/ExportLetterOfCreditApplicationServiceImpl.java +++ b/src/main/java/com/sztzjy/bank/service/impl/ExportLetterOfCreditApplicationServiceImpl.java @@ -3,12 +3,10 @@ package com.sztzjy.bank.service.impl; import com.alibaba.fastjson.JSON; import com.sztzjy.bank.config.exception.handler.ServiceException; import com.sztzjy.bank.entity.*; -import com.sztzjy.bank.entity.dto.ExportBillOfExchangeDTO; -import com.sztzjy.bank.entity.dto.ExportLetterOfCreditApplicationDTO; -import com.sztzjy.bank.entity.dto.ExportLetterOfCreditPackagingDTO; -import com.sztzjy.bank.entity.dto.ExportPresentationOfDocumentsDTO; +import com.sztzjy.bank.entity.dto.*; import com.sztzjy.bank.mapper.*; import com.sztzjy.bank.service.ExportLetterOfCreditApplicationService; +import com.sztzjy.bank.service.IUpdateScoreInfo; import com.sztzjy.bank.util.ConvertUtil; import com.sztzjy.bank.util.RedisUtil; import com.sztzjy.bank.util.compute.ObjectComparatorUtil; @@ -20,7 +18,6 @@ import org.springframework.util.CollectionUtils; import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; -import java.util.Random; /** * @Author xcj @@ -46,6 +43,23 @@ public class ExportLetterOfCreditApplicationServiceImpl implements ExportLetterO ExportPresentationOfDocumentsMapper presentationOfDocumentsMapper; @Autowired ExportBillOfExchangeMapper exportBillOfExchangeMapper; + @Autowired + ExportCommercialInvoiceMapper exportCommercialInvoiceMapper; + @Autowired + IUpdateScoreInfo iUpdateScoreInfo; + @Autowired + ExportCargoTransportationInsurancePolicyMapper cargoTransportationInsurancePolicyMapper; + @Autowired + ExportBillOfLadingMapper exportBillOfLadingMapper; + @Autowired + ExportFinancingRegistrationMapper exportFinancingRegistrationMapper; + @Autowired + ExportRemittanceRegistrationMapper exportRemittanceRegistrationMapper; + @Autowired + ExportPaymentAcceptanceMapper exportPaymentAcceptanceMapper; + @Autowired + ExportFinancingReturnRegistrationMapper financingReturnRegistrationMapper; + /* 来证登记 * @author xcj @@ -72,6 +86,7 @@ public class ExportLetterOfCreditApplicationServiceImpl implements ExportLetterO //计算错误次数 exportLetterOfCreditApplication = submitCertificateRegistration(exportLetterOfCreditApplication); + iUpdateScoreInfo.UpdateScoreInfo(exportLetterOfCreditApplication.getUserId(), "国际结算业务", "出口信用证业务", exportLetterOfCreditApplication.getErrorNumber(), 1); } //否则保存不计算，直接添加 @@ -94,6 +109,7 @@ public class ExportLetterOfCreditApplicationServiceImpl implements ExportLetterO //计算错误次数 exportLetterOfCreditApplication = submitCertificateRegistration(exportLetterOfCreditApplication); + iUpdateScoreInfo.UpdateScoreInfo(exportLetterOfCreditApplication.getUserId(), "国际结算业务", "出口信用证业务", exportLetterOfCreditApplication.getErrorNumber(), 1); } } @@ -167,10 +183,11 @@ public class ExportLetterOfCreditApplicationServiceImpl implements ExportLetterO //计算错误次数 exportLetterOfCreditPackaging = submitLetterOfCreditPackaging(exportLetterOfCreditPackaging); + iUpdateScoreInfo.UpdateScoreInfo(exportLetterOfCreditPackaging.getUserId(), "国际结算业务", "出口信用证业务", exportLetterOfCreditPackaging.getErrorNumber(), 2); //生成唯一的合同号 四位大写英文加当前年月日 - String num = generateContractNumber(); + String num = generatePackagingNumber(exportLetterOfCreditPackaging.getUserId()); List letterOfCreditPackagings; do { @@ -206,9 +223,11 @@ public class ExportLetterOfCreditApplicationServiceImpl implements ExportLetterO //计算错误次数 exportLetterOfCreditPackaging = submitLetterOfCreditPackaging(exportLetterOfCreditPackaging); + iUpdateScoreInfo.UpdateScoreInfo(exportLetterOfCreditPackaging.getUserId(), "国际结算业务", "出口信用证业务", exportLetterOfCreditPackaging.getErrorNumber(), 2); //生成唯一的合同号 四位大写英文加当前年月日 - String num = generateContractNumber(); + String num = generatePackagingNumber(exportLetterOfCreditPackaging.getUserId()); + List letterOfCreditPackagings; do { @@ -271,8 +290,6 @@ public class ExportLetterOfCreditApplicationServiceImpl implements ExportLetterO } - - /* 制单交单 提交/保存 * @author xcj * @Date 2025/3/13 @@ -297,6 +314,7 @@ public class ExportLetterOfCreditApplicationServiceImpl implements ExportLetterO //计算错误次数 exportPresentationOfDocuments = submitPresentationOfDocuments(exportPresentationOfDocuments); + iUpdateScoreInfo.UpdateScoreInfo(exportPresentationOfDocuments.getUserId(), "国际结算业务", "出口信用证业务", exportPresentationOfDocuments.getErrorNumber(), 3); } @@ -320,6 +338,7 @@ public class ExportLetterOfCreditApplicationServiceImpl implements ExportLetterO //计算错误次数 exportPresentationOfDocuments = submitPresentationOfDocuments(exportPresentationOfDocuments); + iUpdateScoreInfo.UpdateScoreInfo(exportPresentationOfDocuments.getUserId(), "国际结算业务", "出口信用证业务", exportPresentationOfDocuments.getErrorNumber(), 3); } } @@ -369,8 +388,6 @@ public class ExportLetterOfCreditApplicationServiceImpl implements ExportLetterO } - - /* 填写商业汇票 * @author xcj * @Date 2025/3/13 @@ -395,6 +412,7 @@ public class ExportLetterOfCreditApplicationServiceImpl implements ExportLetterO //计算错误次数 exportBillOfExchange = submitExportBillOfExchange(exportBillOfExchange); + iUpdateScoreInfo.UpdateScoreInfo(exportBillOfExchange.getUserId(), "国际结算业务", "出口信用证业务", exportBillOfExchange.getErrorNumber(), 4); } @@ -418,6 +436,7 @@ public class ExportLetterOfCreditApplicationServiceImpl implements ExportLetterO //计算错误次数 exportBillOfExchange = submitExportBillOfExchange(exportBillOfExchange); + iUpdateScoreInfo.UpdateScoreInfo(exportBillOfExchange.getUserId(), "国际结算业务", "出口信用证业务", exportBillOfExchange.getErrorNumber(), 4); } } @@ -467,6 +486,738 @@ public class ExportLetterOfCreditApplicationServiceImpl implements ExportLetterO } + /* 填写商业发票 + * @author xcj + * @Date 2025/3/17 + */ + @Override + public Integer addExportCommercialInvoice(ExportCommercialInvoice exportCommercialInvoice) { + ExportCommercialInvoiceExample exportCommercialInvoiceExample = new ExportCommercialInvoiceExample(); + exportCommercialInvoiceExample.createCriteria().andUserIdEqualTo(exportCommercialInvoice.getUserId()) + .andNumberEqualTo(exportCommercialInvoice.getNumber()); + + List exportCommercialInvoices = exportCommercialInvoiceMapper.selectByExample(exportCommercialInvoiceExample); + if (CollectionUtils.isEmpty(exportCommercialInvoices)) { //添加数据 + exportCommercialInvoice.setCreateTime(new Date()); + + //检验是提交还是保存 + if (exportCommercialInvoice.getSubmitStatus() == 1) { //提交则计算错误次数 + + //判断用户是否完成上一个流程,并更新操作步骤序号 + if (!ProcessJudgment(5, exportCommercialInvoice.getUserId(), "出口信用证业务")) { + throw new ServiceException(HttpStatus.ACCEPTED, "请先完成上一流程"); + } + + //计算错误次数 + exportCommercialInvoice = submitExportCommercialInvoice(exportCommercialInvoice); + + iUpdateScoreInfo.UpdateScoreInfo(exportCommercialInvoice.getUserId(), "国际结算业务", "出口信用证业务", exportCommercialInvoice.getErrorNumber(), 5); + + String num = generateInvoiceNumber(exportCommercialInvoice.getUserId()); + exportCommercialInvoice.setInvoiceNo(num); + } + + //否则保存不计算，直接添加 + return exportCommercialInvoiceMapper.insert(exportCommercialInvoice); + } else { //已有操作记录 + ExportCommercialInvoice commercialInvoice = exportCommercialInvoices.get(0); + //取出id，以防被覆盖 + Integer id = commercialInvoice.getId(); + + //判断是否已经提交，已提交保存记录不计分，未提交保存记录并计分 + if (commercialInvoice.getSubmitStatus() != 1) { + + //检验本次是提交还是保存 + if (exportCommercialInvoice.getSubmitStatus() == 1) { //提交则计算错误次数 + + //判断用户是否完成上一个流程,并更新操作步骤序号 + if (!ProcessJudgment(5, exportCommercialInvoice.getUserId(), "出口信用证业务")) { + throw new ServiceException(HttpStatus.ACCEPTED, "请先完成上一流程"); + } + + //计算错误次数 + exportCommercialInvoice = submitExportCommercialInvoice(exportCommercialInvoice); + iUpdateScoreInfo.UpdateScoreInfo(exportCommercialInvoice.getUserId(), "国际结算业务", "出口信用证业务", exportCommercialInvoice.getErrorNumber(), 5); + + String num = generateInvoiceNumber(exportCommercialInvoice.getUserId()); + exportCommercialInvoice.setInvoiceNo(num); + } + + } + exportCommercialInvoice.setId(id); + exportCommercialInvoice.setUpdateTime(new Date()); + + return exportCommercialInvoiceMapper.updateByPrimaryKeySelective(exportCommercialInvoice); + } + } + + + /* 填写商业发票计算 + * @author xcj + * @Date 2025/3/17 + */ + private ExportCommercialInvoice submitExportCommercialInvoice(ExportCommercialInvoice exportCommercialInvoice) { + String answer = redisUtil.get("bank" + "-出口信用证业务" + "-填写商业发票"); + if (answer == null) { + CaseInfoExample caseInfoExample = new CaseInfoExample(); + caseInfoExample.createCriteria().andLargeModuleEqualTo("出口信用证业务").andModuleEqualTo("填写商业发票") + .andNumberEqualTo(exportCommercialInvoice.getNumber()); + List caseInfoList = caseInfoMapper.selectByExampleWithBLOBs(caseInfoExample); + if (!CollectionUtils.isEmpty(caseInfoList)) { + CaseInfo caseInfo = caseInfoList.get(0); + CaseAnswerInfoExample caseAnswerInfoExample = new CaseAnswerInfoExample(); + caseAnswerInfoExample.createCriteria().andCaseIdEqualTo(caseInfo.getCaseId()); + List answerInfoList = caseAnswerInfoMapper.selectByExampleWithBLOBs(caseAnswerInfoExample); + if (!CollectionUtils.isEmpty(answerInfoList)) { + String info = answerInfoList.get(0).getAnswer(); + redisUtil.set("bank" + "-出口信用证业务" + "-填写商业发票", info, 3600); + answer = redisUtil.get("bank" + "-出口信用证业务" + "-填写商业发票"); + } + } + } + + // 解析 JSON 字符串 + ExportCommercialInvoiceDTO answerDTO = JSON.parseObject(answer, ExportCommercialInvoiceDTO.class); + + ExportCommercialInvoiceDTO commercialInvoiceDTO = convertUtil.entityToDTO(exportCommercialInvoice, ExportCommercialInvoiceDTO.class); + + try { + int update = ObjectComparatorUtil.countDifferences(answerDTO, commercialInvoiceDTO); + + //错误次数 + exportCommercialInvoice.setErrorNumber(update); + + return exportCommercialInvoice; + } catch (IllegalAccessException e) { + throw new RuntimeException(e); + } + } + + + /* 货物运输保险单 + * @author xcj + * @Date 2025/3/17 + */ + @Override + public Integer addExportCargoTransportationInsurancePolicy(ExportCargoTransportationInsurancePolicy exportCargoTransportationInsurancePolicy) { + ExportCargoTransportationInsurancePolicyExample cargoTransportationInsurancePolicyExample = new ExportCargoTransportationInsurancePolicyExample(); + cargoTransportationInsurancePolicyExample.createCriteria().andUserIdEqualTo(exportCargoTransportationInsurancePolicy.getUserId()) + .andNumberEqualTo(exportCargoTransportationInsurancePolicy.getNumber()); + + List exportCommercialInvoices = cargoTransportationInsurancePolicyMapper.selectByExample(cargoTransportationInsurancePolicyExample); + if (CollectionUtils.isEmpty(exportCommercialInvoices)) { //添加数据 + exportCargoTransportationInsurancePolicy.setCreateTime(new Date()); + + //检验是提交还是保存 + if (exportCargoTransportationInsurancePolicy.getSubmitStatus() == 1) { //提交则计算错误次数 + + //判断用户是否完成上一个流程,并更新操作步骤序号 + if (!ProcessJudgment(6, exportCargoTransportationInsurancePolicy.getUserId(), "出口信用证业务")) { + throw new ServiceException(HttpStatus.ACCEPTED, "请先完成上一流程"); + } + + //计算错误次数 + exportCargoTransportationInsurancePolicy = submitExportCargoTransportationInsurancePolicy(exportCargoTransportationInsurancePolicy); + + iUpdateScoreInfo.UpdateScoreInfo(exportCargoTransportationInsurancePolicy.getUserId(), "国际结算业务", "出口信用证业务", exportCargoTransportationInsurancePolicy.getErrorNumber(), 6); + String num = generateInsurancePolicyNumber(exportCargoTransportationInsurancePolicy.getUserId()); + exportCargoTransportationInsurancePolicy.setPolicyNo(num); + } + + //否则保存不计算，直接添加 + return cargoTransportationInsurancePolicyMapper.insert(exportCargoTransportationInsurancePolicy); + } else { //已有操作记录 + ExportCargoTransportationInsurancePolicy cargoTransportationInsurancePolicy = exportCommercialInvoices.get(0); + //取出id，以防被覆盖 + Integer id = cargoTransportationInsurancePolicy.getId(); + + //判断是否已经提交，已提交保存记录不计分，未提交保存记录并计分 + if (cargoTransportationInsurancePolicy.getSubmitStatus() != 1) { + + //检验本次是提交还是保存 + if (exportCargoTransportationInsurancePolicy.getSubmitStatus() == 1) { //提交则计算错误次数 + + //判断用户是否完成上一个流程,并更新操作步骤序号 + if (!ProcessJudgment(6, exportCargoTransportationInsurancePolicy.getUserId(), "出口信用证业务")) { + throw new ServiceException(HttpStatus.ACCEPTED, "请先完成上一流程"); + } + + //计算错误次数 + exportCargoTransportationInsurancePolicy = submitExportCargoTransportationInsurancePolicy(exportCargoTransportationInsurancePolicy); + iUpdateScoreInfo.UpdateScoreInfo(exportCargoTransportationInsurancePolicy.getUserId(), "国际结算业务", "出口信用证业务", exportCargoTransportationInsurancePolicy.getErrorNumber(), 6); + + String num = generateInsurancePolicyNumber(exportCargoTransportationInsurancePolicy.getUserId()); + exportCargoTransportationInsurancePolicy.setPolicyNo(num); + } + + } + exportCargoTransportationInsurancePolicy.setId(id); + exportCargoTransportationInsurancePolicy.setUpdateTime(new Date()); + + return cargoTransportationInsurancePolicyMapper.updateByPrimaryKeySelective(exportCargoTransportationInsurancePolicy); + } + } + + + /* 货物运输保险单计算 + * @author xcj + * @Date 2025/3/17 + */ + private ExportCargoTransportationInsurancePolicy submitExportCargoTransportationInsurancePolicy(ExportCargoTransportationInsurancePolicy exportCargoTransportationInsurancePolicy) { + String answer = redisUtil.get("bank" + "-出口信用证业务" + "-填写保险单"); + if (answer == null) { + CaseInfoExample caseInfoExample = new CaseInfoExample(); + caseInfoExample.createCriteria().andLargeModuleEqualTo("出口信用证业务").andModuleEqualTo("填写保险单") + .andNumberEqualTo(exportCargoTransportationInsurancePolicy.getNumber()); + List caseInfoList = caseInfoMapper.selectByExampleWithBLOBs(caseInfoExample); + if (!CollectionUtils.isEmpty(caseInfoList)) { + CaseInfo caseInfo = caseInfoList.get(0); + CaseAnswerInfoExample caseAnswerInfoExample = new CaseAnswerInfoExample(); + caseAnswerInfoExample.createCriteria().andCaseIdEqualTo(caseInfo.getCaseId()); + List answerInfoList = caseAnswerInfoMapper.selectByExampleWithBLOBs(caseAnswerInfoExample); + if (!CollectionUtils.isEmpty(answerInfoList)) { + String info = answerInfoList.get(0).getAnswer(); + redisUtil.set("bank" + "-出口信用证业务" + "-填写保险单", info, 3600); + answer = redisUtil.get("bank" + "-出口信用证业务" + "-填写保险单"); + } + } + } + + // 解析 JSON 字符串 + ExportCargoTransportationInsurancePolicyDTO answerDTO = JSON.parseObject(answer, ExportCargoTransportationInsurancePolicyDTO.class); + + ExportCargoTransportationInsurancePolicyDTO commercialInvoiceDTO = convertUtil.entityToDTO(exportCargoTransportationInsurancePolicy, ExportCargoTransportationInsurancePolicyDTO.class); + + try { + int update = ObjectComparatorUtil.countDifferences(answerDTO, commercialInvoiceDTO); + + //错误次数 + exportCargoTransportationInsurancePolicy.setErrorNumber(update); + + return exportCargoTransportationInsurancePolicy; + } catch (IllegalAccessException e) { + throw new RuntimeException(e); + } + } + + + /* 填写海运提单 + * @author xcj + * @Date 2025/3/17 + */ + @Override + public Integer addExportBillOfLading(ExportBillOfLading exportBillOfLading) { + ExportBillOfLadingExample exportBillOfLadingExample = new ExportBillOfLadingExample(); + exportBillOfLadingExample.createCriteria().andUserIdEqualTo(exportBillOfLading.getUserId()) + .andNumberEqualTo(exportBillOfLading.getNumber()); + + List exportBillOfLadingList = exportBillOfLadingMapper.selectByExample(exportBillOfLadingExample); + if (CollectionUtils.isEmpty(exportBillOfLadingList)) { //添加数据 + exportBillOfLading.setCreateTime(new Date()); + + //检验是提交还是保存 + if (exportBillOfLading.getSubmitStatus() == 1) { //提交则计算错误次数 + + //判断用户是否完成上一个流程,并更新操作步骤序号 + if (!ProcessJudgment(7, exportBillOfLading.getUserId(), "出口信用证业务")) { + throw new ServiceException(HttpStatus.ACCEPTED, "请先完成上一流程"); + } + + //计算错误次数 + exportBillOfLading = submitExportBillOfLading(exportBillOfLading); + + iUpdateScoreInfo.UpdateScoreInfo(exportBillOfLading.getUserId(), "国际结算业务", "出口信用证业务", exportBillOfLading.getErrorNumber(), 7); + } + + //否则保存不计算，直接添加 + return exportBillOfLadingMapper.insert(exportBillOfLading); + } else { //已有操作记录 + ExportBillOfLading billOfLading = exportBillOfLadingList.get(0); + //取出id，以防被覆盖 + Integer id = billOfLading.getId(); + + //判断是否已经提交，已提交保存记录不计分，未提交保存记录并计分 + if (billOfLading.getSubmitStatus() != 1) { + + //检验本次是提交还是保存 + if (exportBillOfLading.getSubmitStatus() == 1) { //提交则计算错误次数 + + //判断用户是否完成上一个流程,并更新操作步骤序号 + if (!ProcessJudgment(7, exportBillOfLading.getUserId(), "出口信用证业务")) { + throw new ServiceException(HttpStatus.ACCEPTED, "请先完成上一流程"); + } + + //计算错误次数 + exportBillOfLading = submitExportBillOfLading(exportBillOfLading); + iUpdateScoreInfo.UpdateScoreInfo(exportBillOfLading.getUserId(), "国际结算业务", "出口信用证业务", exportBillOfLading.getErrorNumber(), 7); + } + + } + exportBillOfLading.setId(id); + exportBillOfLading.setUpdateTime(new Date()); + + return exportBillOfLadingMapper.updateByPrimaryKeySelective(exportBillOfLading); + } + } + + + + /* 填写海运提单计算 + * @author xcj + * @Date 2025/3/17 + */ + private ExportBillOfLading submitExportBillOfLading(ExportBillOfLading exportBillOfLading) { + String answer = redisUtil.get("bank" + "-出口信用证业务" + "-填制海运提单"); + if (answer == null) { + CaseInfoExample caseInfoExample = new CaseInfoExample(); + caseInfoExample.createCriteria().andLargeModuleEqualTo("出口信用证业务").andModuleEqualTo("填制海运提单") + .andNumberEqualTo(exportBillOfLading.getNumber()); + List caseInfoList = caseInfoMapper.selectByExampleWithBLOBs(caseInfoExample); + if (!CollectionUtils.isEmpty(caseInfoList)) { + CaseInfo caseInfo = caseInfoList.get(0); + CaseAnswerInfoExample caseAnswerInfoExample = new CaseAnswerInfoExample(); + caseAnswerInfoExample.createCriteria().andCaseIdEqualTo(caseInfo.getCaseId()); + List answerInfoList = caseAnswerInfoMapper.selectByExampleWithBLOBs(caseAnswerInfoExample); + if (!CollectionUtils.isEmpty(answerInfoList)) { + String info = answerInfoList.get(0).getAnswer(); + redisUtil.set("bank" + "-出口信用证业务" + "-填制海运提单", info, 3600); + answer = redisUtil.get("bank" + "-出口信用证业务" + "-填制海运提单"); + } + } + } + + // 解析 JSON 字符串 + ExportBillOfLadingDTO answerDTO = JSON.parseObject(answer, ExportBillOfLadingDTO.class); + + ExportBillOfLadingDTO commercialInvoiceDTO = convertUtil.entityToDTO(exportBillOfLading, ExportBillOfLadingDTO.class); + + try { + int update = ObjectComparatorUtil.countDifferences(answerDTO, commercialInvoiceDTO); + + //错误次数 + exportBillOfLading.setErrorNumber(update); + + return exportBillOfLading; + } catch (IllegalAccessException e) { + throw new RuntimeException(e); + } + } + + + /* 出口押汇登记 + * @author xcj + * @Date 2025/3/17 + */ + @Override + public Integer addExportFinancingRegistration(ExportFinancingRegistration exportFinancingRegistration) { + ExportFinancingRegistrationExample exportFinancingRegistrationExample = new ExportFinancingRegistrationExample(); + exportFinancingRegistrationExample.createCriteria().andUserIdEqualTo(exportFinancingRegistration.getUserId()) + .andNumberEqualTo(exportFinancingRegistration.getNumber()); + + List exportFinancingRegistrationList = exportFinancingRegistrationMapper.selectByExample(exportFinancingRegistrationExample); + if (CollectionUtils.isEmpty(exportFinancingRegistrationList)) { //添加数据 + exportFinancingRegistration.setCreateTime(new Date()); + + //检验是提交还是保存 + if (exportFinancingRegistration.getSubmitStatus() == 1) { //提交则计算错误次数 + + //判断用户是否完成上一个流程,并更新操作步骤序号 + if (!ProcessJudgment(9, exportFinancingRegistration.getUserId(), "出口信用证业务")) { + throw new ServiceException(HttpStatus.ACCEPTED, "请先完成上一流程"); + } + + //计算错误次数 + exportFinancingRegistration = submitExportFinancingRegistration(exportFinancingRegistration); + + iUpdateScoreInfo.UpdateScoreInfo(exportFinancingRegistration.getUserId(), "国际结算业务", "出口信用证业务", exportFinancingRegistration.getErrorNumber(), 9); + } + + //否则保存不计算，直接添加 + return exportFinancingRegistrationMapper.insert(exportFinancingRegistration); + } else { //已有操作记录 + ExportFinancingRegistration financingRegistration = exportFinancingRegistrationList.get(0); + //取出id，以防被覆盖 + Integer id = financingRegistration.getId(); + + //判断是否已经提交，已提交保存记录不计分，未提交保存记录并计分 + if (financingRegistration.getSubmitStatus() != 1) { + + //检验本次是提交还是保存 + if (exportFinancingRegistration.getSubmitStatus() == 1) { //提交则计算错误次数 + + //判断用户是否完成上一个流程,并更新操作步骤序号 + if (!ProcessJudgment(9, exportFinancingRegistration.getUserId(), "出口信用证业务")) { + throw new ServiceException(HttpStatus.ACCEPTED, "请先完成上一流程"); + } + + //计算错误次数 + exportFinancingRegistration = submitExportFinancingRegistration(exportFinancingRegistration); + iUpdateScoreInfo.UpdateScoreInfo(exportFinancingRegistration.getUserId(), "国际结算业务", "出口信用证业务", exportFinancingRegistration.getErrorNumber(), 9); + } + + } + exportFinancingRegistration.setId(id); + exportFinancingRegistration.setUpdateTime(new Date()); + + return exportFinancingRegistrationMapper.updateByPrimaryKeySelective(exportFinancingRegistration); + } + } + + /* 出口押汇登记计算 + * @author xcj + * @Date 2025/3/17 + */ + private ExportFinancingRegistration submitExportFinancingRegistration(ExportFinancingRegistration exportFinancingRegistration) { + String answer = redisUtil.get("bank" + "-出口信用证业务" + "-出口押汇登记"); + if (answer == null) { + CaseInfoExample caseInfoExample = new CaseInfoExample(); + caseInfoExample.createCriteria().andLargeModuleEqualTo("出口信用证业务").andModuleEqualTo("出口押汇登记") + .andNumberEqualTo(exportFinancingRegistration.getNumber()); + List caseInfoList = caseInfoMapper.selectByExampleWithBLOBs(caseInfoExample); + if (!CollectionUtils.isEmpty(caseInfoList)) { + CaseInfo caseInfo = caseInfoList.get(0); + CaseAnswerInfoExample caseAnswerInfoExample = new CaseAnswerInfoExample(); + caseAnswerInfoExample.createCriteria().andCaseIdEqualTo(caseInfo.getCaseId()); + List answerInfoList = caseAnswerInfoMapper.selectByExampleWithBLOBs(caseAnswerInfoExample); + if (!CollectionUtils.isEmpty(answerInfoList)) { + String info = answerInfoList.get(0).getAnswer(); + redisUtil.set("bank" + "-出口信用证业务" + "-出口押汇登记", info, 3600); + answer = redisUtil.get("bank" + "-出口信用证业务" + "-出口押汇登记"); + } + } + } + + // 解析 JSON 字符串 + ExportFinancingRegistrationDTO answerDTO = JSON.parseObject(answer, ExportFinancingRegistrationDTO.class); + + ExportFinancingRegistrationDTO commercialInvoiceDTO = convertUtil.entityToDTO(exportFinancingRegistration, ExportFinancingRegistrationDTO.class); + + try { + int update = ObjectComparatorUtil.countDifferences(answerDTO, commercialInvoiceDTO); + + //错误次数 + exportFinancingRegistration.setErrorNumber(update); + + return exportFinancingRegistration; + } catch (IllegalAccessException e) { + throw new RuntimeException(e); + } + } + + + + + /* 寄单索汇 + * @author xcj + * @Date 2025/3/17 + */ + @Override + public Integer addExportRemittanceRegistration(ExportRemittanceRegistration exportRemittanceRegistration) { + ExportRemittanceRegistrationExample exportRemittanceRegistrationExample = new ExportRemittanceRegistrationExample(); + exportRemittanceRegistrationExample.createCriteria().andUserIdEqualTo(exportRemittanceRegistration.getUserId()) + .andNumberEqualTo(exportRemittanceRegistration.getNumber()); + + List exportRemittanceRegistrationList = exportRemittanceRegistrationMapper.selectByExample(exportRemittanceRegistrationExample); + if (CollectionUtils.isEmpty(exportRemittanceRegistrationList)) { //添加数据 + exportRemittanceRegistration.setCreateTime(new Date()); + + //检验是提交还是保存 + if (exportRemittanceRegistration.getSubmitStatus() == 1) { //提交则计算错误次数 + + //判断用户是否完成上一个流程,并更新操作步骤序号 + if (!ProcessJudgment(10, exportRemittanceRegistration.getUserId(), "出口信用证业务")) { + throw new ServiceException(HttpStatus.ACCEPTED, "请先完成上一流程"); + } + + //计算错误次数 + exportRemittanceRegistration = submitExportRemittanceRegistration(exportRemittanceRegistration); + + iUpdateScoreInfo.UpdateScoreInfo(exportRemittanceRegistration.getUserId(), "国际结算业务", "出口信用证业务", exportRemittanceRegistration.getErrorNumber(), 10); + } + + //否则保存不计算，直接添加 + return exportRemittanceRegistrationMapper.insert(exportRemittanceRegistration); + } else { //已有操作记录 + ExportRemittanceRegistration remittanceRegistration = exportRemittanceRegistrationList.get(0); + //取出id，以防被覆盖 + Integer id = remittanceRegistration.getId(); + + //判断是否已经提交，已提交保存记录不计分，未提交保存记录并计分 + if (remittanceRegistration.getSubmitStatus() != 1) { + + //检验本次是提交还是保存 + if (exportRemittanceRegistration.getSubmitStatus() == 1) { //提交则计算错误次数 + + //判断用户是否完成上一个流程,并更新操作步骤序号 + if (!ProcessJudgment(10, exportRemittanceRegistration.getUserId(), "出口信用证业务")) { + throw new ServiceException(HttpStatus.ACCEPTED, "请先完成上一流程"); + } + + //计算错误次数 + exportRemittanceRegistration = submitExportRemittanceRegistration(exportRemittanceRegistration); + iUpdateScoreInfo.UpdateScoreInfo(exportRemittanceRegistration.getUserId(), "国际结算业务", "出口信用证业务", exportRemittanceRegistration.getErrorNumber(), 10); + } + + } + exportRemittanceRegistration.setId(id); + exportRemittanceRegistration.setUpdateTime(new Date()); + + return exportRemittanceRegistrationMapper.updateByPrimaryKeySelective(exportRemittanceRegistration); + } + } + + + /* 寄单索汇计算 + * @author xcj + * @Date 2025/3/17 + */ + private ExportRemittanceRegistration submitExportRemittanceRegistration(ExportRemittanceRegistration exportRemittanceRegistration) { + String answer = redisUtil.get("bank" + "-出口信用证业务" + "-寄单索汇"); + if (answer == null) { + CaseInfoExample caseInfoExample = new CaseInfoExample(); + caseInfoExample.createCriteria().andLargeModuleEqualTo("出口信用证业务").andModuleEqualTo("寄单索汇") + .andNumberEqualTo(exportRemittanceRegistration.getNumber()); + List caseInfoList = caseInfoMapper.selectByExampleWithBLOBs(caseInfoExample); + if (!CollectionUtils.isEmpty(caseInfoList)) { + CaseInfo caseInfo = caseInfoList.get(0); + CaseAnswerInfoExample caseAnswerInfoExample = new CaseAnswerInfoExample(); + caseAnswerInfoExample.createCriteria().andCaseIdEqualTo(caseInfo.getCaseId()); + List answerInfoList = caseAnswerInfoMapper.selectByExampleWithBLOBs(caseAnswerInfoExample); + if (!CollectionUtils.isEmpty(answerInfoList)) { + String info = answerInfoList.get(0).getAnswer(); + redisUtil.set("bank" + "-出口信用证业务" + "-寄单索汇", info, 3600); + answer = redisUtil.get("bank" + "-出口信用证业务" + "-寄单索汇"); + } + } + } + + // 解析 JSON 字符串 + ExportRemittanceRegistrationDTO answerDTO = JSON.parseObject(answer, ExportRemittanceRegistrationDTO.class); + + ExportRemittanceRegistrationDTO commercialInvoiceDTO = convertUtil.entityToDTO(exportRemittanceRegistration, ExportRemittanceRegistrationDTO.class); + + try { + int update = ObjectComparatorUtil.countDifferences(answerDTO, commercialInvoiceDTO); + + //错误次数 + exportRemittanceRegistration.setErrorNumber(update); + + return exportRemittanceRegistration; + } catch (IllegalAccessException e) { + throw new RuntimeException(e); + } + } + + + + /* 付款/承兑 保存提交 + * @author xcj + * @Date 2025/3/18 + */ + @Override + public Integer addExportPaymentAcceptance(ExportPaymentAcceptance exportPaymentAcceptance) { + ExportPaymentAcceptanceExample exportPaymentAcceptanceExample = new ExportPaymentAcceptanceExample(); + exportPaymentAcceptanceExample.createCriteria().andUserIdEqualTo(exportPaymentAcceptance.getUserId()) + .andNumberEqualTo(exportPaymentAcceptance.getNumber()); + + List exportRemittanceRegistrationList = exportPaymentAcceptanceMapper.selectByExample(exportPaymentAcceptanceExample); + if (CollectionUtils.isEmpty(exportRemittanceRegistrationList)) { //添加数据 + exportPaymentAcceptance.setCreateTime(new Date()); + + //检验是提交还是保存 + if (exportPaymentAcceptance.getSubmitStatus() == 1) { //提交则计算错误次数 + + //判断用户是否完成上一个流程,并更新操作步骤序号 + if (!ProcessJudgment(11, exportPaymentAcceptance.getUserId(), "出口信用证业务")) { + throw new ServiceException(HttpStatus.ACCEPTED, "请先完成上一流程"); + } + + //计算错误次数 + exportPaymentAcceptance = submitExportPaymentAcceptance(exportPaymentAcceptance); + + iUpdateScoreInfo.UpdateScoreInfo(exportPaymentAcceptance.getUserId(), "国际结算业务", "出口信用证业务", exportPaymentAcceptance.getErrorNumber(), 11); + } + + //否则保存不计算，直接添加 + return exportPaymentAcceptanceMapper.insert(exportPaymentAcceptance); + } else { //已有操作记录 + ExportPaymentAcceptance paymentAcceptance = exportRemittanceRegistrationList.get(0); + //取出id，以防被覆盖 + Integer id = paymentAcceptance.getId(); + + //判断是否已经提交，已提交保存记录不计分，未提交保存记录并计分 + if (paymentAcceptance.getSubmitStatus() != 1) { + + //检验本次是提交还是保存 + if (exportPaymentAcceptance.getSubmitStatus() == 1) { //提交则计算错误次数 + + //判断用户是否完成上一个流程,并更新操作步骤序号 + if (!ProcessJudgment(11, exportPaymentAcceptance.getUserId(), "出口信用证业务")) { + throw new ServiceException(HttpStatus.ACCEPTED, "请先完成上一流程"); + } + + //计算错误次数 + exportPaymentAcceptance = submitExportPaymentAcceptance(exportPaymentAcceptance); + iUpdateScoreInfo.UpdateScoreInfo(exportPaymentAcceptance.getUserId(), "国际结算业务", "出口信用证业务", exportPaymentAcceptance.getErrorNumber(), 11); + } + + } + exportPaymentAcceptance.setId(id); + exportPaymentAcceptance.setUpdateTime(new Date()); + + return exportPaymentAcceptanceMapper.updateByPrimaryKeySelective(exportPaymentAcceptance); + } + } + + + + /* 付款/承兑 计算 + * @author xcj + * @Date 2025/3/18 + */ + private ExportPaymentAcceptance submitExportPaymentAcceptance(ExportPaymentAcceptance exportPaymentAcceptance) { + String answer = redisUtil.get("bank" + "-出口信用证业务" + "-付款/承兑"); + if (answer == null) { + CaseInfoExample caseInfoExample = new CaseInfoExample(); + caseInfoExample.createCriteria().andLargeModuleEqualTo("出口信用证业务").andModuleEqualTo("付款/承兑") + .andNumberEqualTo(exportPaymentAcceptance.getNumber()); + List caseInfoList = caseInfoMapper.selectByExampleWithBLOBs(caseInfoExample); + if (!CollectionUtils.isEmpty(caseInfoList)) { + CaseInfo caseInfo = caseInfoList.get(0); + CaseAnswerInfoExample caseAnswerInfoExample = new CaseAnswerInfoExample(); + caseAnswerInfoExample.createCriteria().andCaseIdEqualTo(caseInfo.getCaseId()); + List answerInfoList = caseAnswerInfoMapper.selectByExampleWithBLOBs(caseAnswerInfoExample); + if (!CollectionUtils.isEmpty(answerInfoList)) { + String info = answerInfoList.get(0).getAnswer(); + redisUtil.set("bank" + "-出口信用证业务" + "-付款/承兑", info, 3600); + answer = redisUtil.get("bank" + "-出口信用证业务" + "-付款/承兑"); + } + } + } + + // 解析 JSON 字符串 + ExportPaymentAcceptanceDto answerDTO = JSON.parseObject(answer, ExportPaymentAcceptanceDto.class); + + ExportPaymentAcceptanceDto commercialInvoiceDTO = convertUtil.entityToDTO(exportPaymentAcceptance, ExportPaymentAcceptanceDto.class); + + try { + int update = ObjectComparatorUtil.countDifferences(answerDTO, commercialInvoiceDTO); + + //错误次数 + exportPaymentAcceptance.setErrorNumber(update); + + return exportPaymentAcceptance; + } catch (IllegalAccessException e) { + throw new RuntimeException(e); + } + } + + + + + + /* 融资返还登记 + * @author xcj + * @Date 2025/3/18 + */ + @Override + public Integer addExportFinancingReturnRegistration(ExportFinancingReturnRegistration exportFinancingReturnRegistration) { + ExportFinancingReturnRegistrationExample exportFinancingReturnRegistrationExample = new ExportFinancingReturnRegistrationExample(); + exportFinancingReturnRegistrationExample.createCriteria().andUserIdEqualTo(exportFinancingReturnRegistration.getUserId()) + .andNumberEqualTo(exportFinancingReturnRegistration.getNumber()); + + List exportRemittanceRegistrationList = financingReturnRegistrationMapper.selectByExample(exportFinancingReturnRegistrationExample); + if (CollectionUtils.isEmpty(exportRemittanceRegistrationList)) { //添加数据 + exportFinancingReturnRegistration.setCreateTime(new Date()); + + //检验是提交还是保存 + if (exportFinancingReturnRegistration.getSubmitStatus() == 1) { //提交则计算错误次数 + + //判断用户是否完成上一个流程,并更新操作步骤序号 + if (!ProcessJudgment(12, exportFinancingReturnRegistration.getUserId(), "出口信用证业务")) { + throw new ServiceException(HttpStatus.ACCEPTED, "请先完成上一流程"); + } + + //计算错误次数 + exportFinancingReturnRegistration = submitExportFinancingReturnRegistration(exportFinancingReturnRegistration); + + iUpdateScoreInfo.UpdateScoreInfo(exportFinancingReturnRegistration.getUserId(), "国际结算业务", "出口信用证业务", exportFinancingReturnRegistration.getErrorNumber(), 12); + } + + //否则保存不计算，直接添加 + return financingReturnRegistrationMapper.insert(exportFinancingReturnRegistration); + } else { //已有操作记录 + ExportFinancingReturnRegistration returnRegistration = exportRemittanceRegistrationList.get(0); + //取出id，以防被覆盖 + Integer id = returnRegistration.getId(); + + //判断是否已经提交，已提交保存记录不计分，未提交保存记录并计分 + if (returnRegistration.getSubmitStatus() != 1) { + + //检验本次是提交还是保存 + if (exportFinancingReturnRegistration.getSubmitStatus() == 1) { //提交则计算错误次数 + + //判断用户是否完成上一个流程,并更新操作步骤序号 + if (!ProcessJudgment(12, exportFinancingReturnRegistration.getUserId(), "出口信用证业务")) { + throw new ServiceException(HttpStatus.ACCEPTED, "请先完成上一流程"); + } + + //计算错误次数 + exportFinancingReturnRegistration = submitExportFinancingReturnRegistration(exportFinancingReturnRegistration); + iUpdateScoreInfo.UpdateScoreInfo(exportFinancingReturnRegistration.getUserId(), "国际结算业务", "出口信用证业务", exportFinancingReturnRegistration.getErrorNumber(), 12); + } + + } + exportFinancingReturnRegistration.setId(id); + exportFinancingReturnRegistration.setUpdateTime(new Date()); + + return financingReturnRegistrationMapper.updateByPrimaryKeySelective(exportFinancingReturnRegistration); + } + } + + + + + /* 融资返还登记 + * @author xcj + * @Date 2025/3/18 + */ + private ExportFinancingReturnRegistration submitExportFinancingReturnRegistration(ExportFinancingReturnRegistration exportFinancingReturnRegistration) { + String answer = redisUtil.get("bank" + "-出口信用证业务" + "融资返还登记"); + if (answer == null) { + CaseInfoExample caseInfoExample = new CaseInfoExample(); + caseInfoExample.createCriteria().andLargeModuleEqualTo("出口信用证业务").andModuleEqualTo("融资返还登记") + .andNumberEqualTo(exportFinancingReturnRegistration.getNumber()); + List caseInfoList = caseInfoMapper.selectByExampleWithBLOBs(caseInfoExample); + if (!CollectionUtils.isEmpty(caseInfoList)) { + CaseInfo caseInfo = caseInfoList.get(0); + CaseAnswerInfoExample caseAnswerInfoExample = new CaseAnswerInfoExample(); + caseAnswerInfoExample.createCriteria().andCaseIdEqualTo(caseInfo.getCaseId()); + List answerInfoList = caseAnswerInfoMapper.selectByExampleWithBLOBs(caseAnswerInfoExample); + if (!CollectionUtils.isEmpty(answerInfoList)) { + String info = answerInfoList.get(0).getAnswer(); + redisUtil.set("bank" + "-出口信用证业务" + "融资返还登记", info, 3600); + answer = redisUtil.get("bank" + "-出口信用证业务" + "融资返还登记"); + } + } + } + + // 解析 JSON 字符串 + ExportFinancingReturnRegistrationDto answerDTO = JSON.parseObject(answer, ExportFinancingReturnRegistrationDto.class); + + ExportFinancingReturnRegistrationDto commercialInvoiceDTO = convertUtil.entityToDTO(exportFinancingReturnRegistration, ExportFinancingReturnRegistrationDto.class); + + try { + int update = ObjectComparatorUtil.countDifferences(answerDTO, commercialInvoiceDTO); + + //错误次数 + exportFinancingReturnRegistration.setErrorNumber(update); + + return exportFinancingReturnRegistration; + } catch (IllegalAccessException e) { + throw new RuntimeException(e); + } + } @@ -500,37 +1251,140 @@ public class ExportLetterOfCreditApplicationServiceImpl implements ExportLetterO return number <= operationProcess.getCompletedStepsNumber() + 1; } - //生成（digits）位数随机数 - public Integer getRandom(int digits) { - if (digits <= 0) { - throw new IllegalArgumentException("Number of digits must be positive."); +// //生成（digits）位数随机数 +// public Integer getRandom(int digits) { +// if (digits <= 0) { +// throw new IllegalArgumentException("Number of digits must be positive."); +// } +// +// Random random = new Random(); +// // 计算最小值和最大值 +// int min = (int) Math.pow(10, digits - 1); // 10^(digits - 1) +// int max = (int) Math.pow(10, digits) - 1; // 10^digits - 1 +// +// // 返回生成的随机数 +// return min + random.nextInt(max - min + 1); +// } + + +// // 生成唯一的合同号 +// public static String generateContractNumber() { +// // 生成四位大写字母 +// StringBuilder letterPart = new StringBuilder(); +// Random random = new Random(); +// for (int i = 0; i < 4; i++) { +// char letter = (char) ('A' + random.nextInt(26)); // 生成A-Z之间的随机字母 +// letterPart.append(letter); +// } +// +// // 获取当前年月日 +// SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd"); +// String datePart = dateFormat.format(new Date()); +// +// // 合并生成合同号 +// return letterPart.toString() + datePart; +// } + + public String generateInvoiceNumber(String userId) throws ServiceException { + // 1. 获取当前日期 + SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd"); + String date = sdf.format(new Date()); + + // 2. 查询该日期下最大顺序编号 + String prefix = "SYFP"; + ExportCommercialInvoiceExample example = new ExportCommercialInvoiceExample(); + example.createCriteria().andUserIdEqualTo(userId) + .andInvoiceNoLike(prefix + date + "%"); // 只匹配以SYFP+日期开头的编号 + List invoices = exportCommercialInvoiceMapper.selectByExample(example); + + // 3. 计算顺序编号 + int maxOrderNo = 0; + for (ExportCommercialInvoice invoice : invoices) { + String number = invoice.getInvoiceNo(); + String orderNoPart = number.replace(prefix + date, "").replace("NO", ""); + if (!orderNoPart.isEmpty()) { + int orderNo = Integer.parseInt(orderNoPart); + if (orderNo > maxOrderNo) { + maxOrderNo = orderNo; + } + } } - Random random = new Random(); - // 计算最小值和最大值 - int min = (int) Math.pow(10, digits - 1); // 10^(digits - 1) - int max = (int) Math.pow(10, digits) - 1; // 10^digits - 1 - - // 返回生成的随机数 - return min + random.nextInt(max - min + 1); + // 4. 生成下一个顺序编号 + String newOrderNo = String.format("NO%d", maxOrderNo + 1); + return prefix + date + newOrderNo; // 格式: SYFP20250228NO1 } - // 生成唯一的合同号 - public static String generateContractNumber() { - // 生成四位大写字母 - StringBuilder letterPart = new StringBuilder(); - Random random = new Random(); - for (int i = 0; i < 4; i++) { - char letter = (char) ('A' + random.nextInt(26)); // 生成A-Z之间的随机字母 - letterPart.append(letter); + + /* 打包放款生成合同编号 + * @author xcj + * @Date 2025/3/17 + */ + + private String generatePackagingNumber(String userId) { + // 1. 获取当前日期 + SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd"); + String date = sdf.format(new Date()); + + // 2. 查询该日期下最大顺序编号 + String prefix = "CKXY"; + ExportLetterOfCreditPackagingExample example = new ExportLetterOfCreditPackagingExample(); + example.createCriteria().andUserIdEqualTo(userId) + .andContractNumberLike(prefix + date + "%"); // 只匹配以SYFP+日期开头的编号 + List letterOfCreditPackagings = letterOfCreditPackagingMapper.selectByExample(example); + + // 3. 计算顺序编号 + int maxOrderNo = 0; + for (ExportLetterOfCreditPackaging packaging : letterOfCreditPackagings) { + String number = packaging.getContractNumber(); + String orderNoPart = number.replace(prefix + date, "").replace("NO", ""); + if (!orderNoPart.isEmpty()) { + int orderNo = Integer.parseInt(orderNoPart); + if (orderNo > maxOrderNo) { + maxOrderNo = orderNo; + } + } } - // 获取当前年月日 - SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd"); - String datePart = dateFormat.format(new Date()); + // 4. 生成下一个顺序编号 + String newOrderNo = String.format("NO%d", maxOrderNo + 1); + return prefix + date + newOrderNo; + } + - // 合并生成合同号 - return letterPart.toString() + datePart; + /* 生成货物运输保险保单号次 + * @author xcj + * @Date 2025/3/17 + */ + private String generateInsurancePolicyNumber(String userId) { + // 1. 获取当前日期 + SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd"); + String date = sdf.format(new Date()); + + // 2. 查询该日期下最大顺序编号 + String prefix = "HWYSBXD"; + ExportCargoTransportationInsurancePolicyExample example = new ExportCargoTransportationInsurancePolicyExample(); + example.createCriteria().andUserIdEqualTo(userId) + .andPolicyNoLike(prefix + date + "%"); + List cargoTransportationInsurancePolicyList = cargoTransportationInsurancePolicyMapper.selectByExample(example); + + // 3. 计算顺序编号 + int maxOrderNo = 0; + for (ExportCargoTransportationInsurancePolicy cargoTransportationInsurancePolicy : cargoTransportationInsurancePolicyList) { + String number = cargoTransportationInsurancePolicy.getPolicyNo(); + String orderNoPart = number.replace(prefix + date, "").replace("NO", ""); + if (!orderNoPart.isEmpty()) { + int orderNo = Integer.parseInt(orderNoPart); + if (orderNo > maxOrderNo) { + maxOrderNo = orderNo; + } + } + } + + // 4. 生成下一个顺序编号 + String newOrderNo = String.format("NO%d", maxOrderNo + 1); + return prefix + date + newOrderNo; } + } diff --git a/src/main/resources/mappers/ExportCommercialInvoiceMapper.xml b/src/main/resources/mappers/ExportCommercialInvoiceMapper.xml deleted file mode 100644 index 1ec8abc..0000000 --- a/src/main/resources/mappers/ExportCommercialInvoiceMapper.xml +++ /dev/null @@ -1,554 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - id, address, invoice_no, lc_no, date, sc_no, from_port, to_port, marks_and_no, unit_price, - amount, total_amount, issued_by, signature, user_id, create_time, update_time, save_status, - submit_status, error_number, number - - - quantities_and_descriptions - - - - - - delete from export_commercial_invoice - where id = #{id,jdbcType=INTEGER} - - - delete from export_commercial_invoice - - - - - - insert into export_commercial_invoice (id, address, invoice_no, - lc_no, date, sc_no, from_port, - to_port, marks_and_no, unit_price, - amount, total_amount, issued_by, - signature, user_id, create_time, - update_time, save_status, submit_status, - error_number, number, quantities_and_descriptions - ) - values (#{id,jdbcType=INTEGER}, #{address,jdbcType=VARCHAR}, #{invoiceNo,jdbcType=VARCHAR}, - #{lcNo,jdbcType=VARCHAR}, #{date,jdbcType=DATE}, #{scNo,jdbcType=VARCHAR}, #{fromPort,jdbcType=VARCHAR}, - #{toPort,jdbcType=VARCHAR}, #{marksAndNo,jdbcType=VARCHAR}, #{unitPrice,jdbcType=DECIMAL}, - #{amount,jdbcType=DECIMAL}, #{totalAmount,jdbcType=DECIMAL}, #{issuedBy,jdbcType=VARCHAR}, - #{signature,jdbcType=VARCHAR}, #{userId,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, - #{updateTime,jdbcType=TIMESTAMP}, #{saveStatus,jdbcType=INTEGER}, #{submitStatus,jdbcType=INTEGER}, - #{errorNumber,jdbcType=INTEGER}, #{number,jdbcType=INTEGER}, #{quantitiesAndDescriptions,jdbcType=LONGVARCHAR} - ) - - - insert into export_commercial_invoice - - - id, - - - address, - - - invoice_no, - - - lc_no, - - - date, - - - sc_no, - - - from_port, - - - to_port, - - - marks_and_no, - - - unit_price, - - - amount, - - - total_amount, - - - issued_by, - - - signature, - - - user_id, - - - create_time, - - - update_time, - - - save_status, - - - submit_status, - - - error_number, - - - number, - - - quantities_and_descriptions, - - - - - #{id,jdbcType=INTEGER}, - - - #{address,jdbcType=VARCHAR}, - - - #{invoiceNo,jdbcType=VARCHAR}, - - - #{lcNo,jdbcType=VARCHAR}, - - - #{date,jdbcType=DATE}, - - - #{scNo,jdbcType=VARCHAR}, - - - #{fromPort,jdbcType=VARCHAR}, - - - #{toPort,jdbcType=VARCHAR}, - - - #{marksAndNo,jdbcType=VARCHAR}, - - - #{unitPrice,jdbcType=DECIMAL}, - - - #{amount,jdbcType=DECIMAL}, - - - #{totalAmount,jdbcType=DECIMAL}, - - - #{issuedBy,jdbcType=VARCHAR}, - - - #{signature,jdbcType=VARCHAR}, - - - #{userId,jdbcType=VARCHAR}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - #{updateTime,jdbcType=TIMESTAMP}, - - - #{saveStatus,jdbcType=INTEGER}, - - - #{submitStatus,jdbcType=INTEGER}, - - - #{errorNumber,jdbcType=INTEGER}, - - - #{number,jdbcType=INTEGER}, - - - #{quantitiesAndDescriptions,jdbcType=LONGVARCHAR}, - - - - - - update export_commercial_invoice - - - id = #{record.id,jdbcType=INTEGER}, - - - address = #{record.address,jdbcType=VARCHAR}, - - - invoice_no = #{record.invoiceNo,jdbcType=VARCHAR}, - - - lc_no = #{record.lcNo,jdbcType=VARCHAR}, - - - date = #{record.date,jdbcType=DATE}, - - - sc_no = #{record.scNo,jdbcType=VARCHAR}, - - - from_port = #{record.fromPort,jdbcType=VARCHAR}, - - - to_port = #{record.toPort,jdbcType=VARCHAR}, - - - marks_and_no = #{record.marksAndNo,jdbcType=VARCHAR}, - - - unit_price = #{record.unitPrice,jdbcType=DECIMAL}, - - - amount = #{record.amount,jdbcType=DECIMAL}, - - - total_amount = #{record.totalAmount,jdbcType=DECIMAL}, - - - issued_by = #{record.issuedBy,jdbcType=VARCHAR}, - - - signature = #{record.signature,jdbcType=VARCHAR}, - - - user_id = #{record.userId,jdbcType=VARCHAR}, - - - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - - - update_time = #{record.updateTime,jdbcType=TIMESTAMP}, - - - save_status = #{record.saveStatus,jdbcType=INTEGER}, - - - submit_status = #{record.submitStatus,jdbcType=INTEGER}, - - - error_number = #{record.errorNumber,jdbcType=INTEGER}, - - - number = #{record.number,jdbcType=INTEGER}, - - - quantities_and_descriptions = #{record.quantitiesAndDescriptions,jdbcType=LONGVARCHAR}, - - - - - - - - update export_commercial_invoice - set id = #{record.id,jdbcType=INTEGER}, - address = #{record.address,jdbcType=VARCHAR}, - invoice_no = #{record.invoiceNo,jdbcType=VARCHAR}, - lc_no = #{record.lcNo,jdbcType=VARCHAR}, - date = #{record.date,jdbcType=DATE}, - sc_no = #{record.scNo,jdbcType=VARCHAR}, - from_port = #{record.fromPort,jdbcType=VARCHAR}, - to_port = #{record.toPort,jdbcType=VARCHAR}, - marks_and_no = #{record.marksAndNo,jdbcType=VARCHAR}, - unit_price = #{record.unitPrice,jdbcType=DECIMAL}, - amount = #{record.amount,jdbcType=DECIMAL}, - total_amount = #{record.totalAmount,jdbcType=DECIMAL}, - issued_by = #{record.issuedBy,jdbcType=VARCHAR}, - signature = #{record.signature,jdbcType=VARCHAR}, - user_id = #{record.userId,jdbcType=VARCHAR}, - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - update_time = #{record.updateTime,jdbcType=TIMESTAMP}, - save_status = #{record.saveStatus,jdbcType=INTEGER}, - submit_status = #{record.submitStatus,jdbcType=INTEGER}, - error_number = #{record.errorNumber,jdbcType=INTEGER}, - number = #{record.number,jdbcType=INTEGER}, - quantities_and_descriptions = #{record.quantitiesAndDescriptions,jdbcType=LONGVARCHAR} - - - - - - update export_commercial_invoice - set id = #{record.id,jdbcType=INTEGER}, - address = #{record.address,jdbcType=VARCHAR}, - invoice_no = #{record.invoiceNo,jdbcType=VARCHAR}, - lc_no = #{record.lcNo,jdbcType=VARCHAR}, - date = #{record.date,jdbcType=DATE}, - sc_no = #{record.scNo,jdbcType=VARCHAR}, - from_port = #{record.fromPort,jdbcType=VARCHAR}, - to_port = #{record.toPort,jdbcType=VARCHAR}, - marks_and_no = #{record.marksAndNo,jdbcType=VARCHAR}, - unit_price = #{record.unitPrice,jdbcType=DECIMAL}, - amount = #{record.amount,jdbcType=DECIMAL}, - total_amount = #{record.totalAmount,jdbcType=DECIMAL}, - issued_by = #{record.issuedBy,jdbcType=VARCHAR}, - signature = #{record.signature,jdbcType=VARCHAR}, - user_id = #{record.userId,jdbcType=VARCHAR}, - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - update_time = #{record.updateTime,jdbcType=TIMESTAMP}, - save_status = #{record.saveStatus,jdbcType=INTEGER}, - submit_status = #{record.submitStatus,jdbcType=INTEGER}, - error_number = #{record.errorNumber,jdbcType=INTEGER}, - number = #{record.number,jdbcType=INTEGER} - - - - - - update export_commercial_invoice - - - address = #{address,jdbcType=VARCHAR}, - - - invoice_no = #{invoiceNo,jdbcType=VARCHAR}, - - - lc_no = #{lcNo,jdbcType=VARCHAR}, - - - date = #{date,jdbcType=DATE}, - - - sc_no = #{scNo,jdbcType=VARCHAR}, - - - from_port = #{fromPort,jdbcType=VARCHAR}, - - - to_port = #{toPort,jdbcType=VARCHAR}, - - - marks_and_no = #{marksAndNo,jdbcType=VARCHAR}, - - - unit_price = #{unitPrice,jdbcType=DECIMAL}, - - - amount = #{amount,jdbcType=DECIMAL}, - - - total_amount = #{totalAmount,jdbcType=DECIMAL}, - - - issued_by = #{issuedBy,jdbcType=VARCHAR}, - - - signature = #{signature,jdbcType=VARCHAR}, - - - user_id = #{userId,jdbcType=VARCHAR}, - - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - update_time = #{updateTime,jdbcType=TIMESTAMP}, - - - save_status = #{saveStatus,jdbcType=INTEGER}, - - - submit_status = #{submitStatus,jdbcType=INTEGER}, - - - error_number = #{errorNumber,jdbcType=INTEGER}, - - - number = #{number,jdbcType=INTEGER}, - - - quantities_and_descriptions = #{quantitiesAndDescriptions,jdbcType=LONGVARCHAR}, - - - where id = #{id,jdbcType=INTEGER} - - - update export_commercial_invoice - set address = #{address,jdbcType=VARCHAR}, - invoice_no = #{invoiceNo,jdbcType=VARCHAR}, - lc_no = #{lcNo,jdbcType=VARCHAR}, - date = #{date,jdbcType=DATE}, - sc_no = #{scNo,jdbcType=VARCHAR}, - from_port = #{fromPort,jdbcType=VARCHAR}, - to_port = #{toPort,jdbcType=VARCHAR}, - marks_and_no = #{marksAndNo,jdbcType=VARCHAR}, - unit_price = #{unitPrice,jdbcType=DECIMAL}, - amount = #{amount,jdbcType=DECIMAL}, - total_amount = #{totalAmount,jdbcType=DECIMAL}, - issued_by = #{issuedBy,jdbcType=VARCHAR}, - signature = #{signature,jdbcType=VARCHAR}, - user_id = #{userId,jdbcType=VARCHAR}, - create_time = #{createTime,jdbcType=TIMESTAMP}, - update_time = #{updateTime,jdbcType=TIMESTAMP}, - save_status = #{saveStatus,jdbcType=INTEGER}, - submit_status = #{submitStatus,jdbcType=INTEGER}, - error_number = #{errorNumber,jdbcType=INTEGER}, - number = #{number,jdbcType=INTEGER}, - quantities_and_descriptions = #{quantitiesAndDescriptions,jdbcType=LONGVARCHAR} - where id = #{id,jdbcType=INTEGER} - - - update export_commercial_invoice - set address = #{address,jdbcType=VARCHAR}, - invoice_no = #{invoiceNo,jdbcType=VARCHAR}, - lc_no = #{lcNo,jdbcType=VARCHAR}, - date = #{date,jdbcType=DATE}, - sc_no = #{scNo,jdbcType=VARCHAR}, - from_port = #{fromPort,jdbcType=VARCHAR}, - to_port = #{toPort,jdbcType=VARCHAR}, - marks_and_no = #{marksAndNo,jdbcType=VARCHAR}, - unit_price = #{unitPrice,jdbcType=DECIMAL}, - amount = #{amount,jdbcType=DECIMAL}, - total_amount = #{totalAmount,jdbcType=DECIMAL}, - issued_by = #{issuedBy,jdbcType=VARCHAR}, - signature = #{signature,jdbcType=VARCHAR}, - user_id = #{userId,jdbcType=VARCHAR}, - create_time = #{createTime,jdbcType=TIMESTAMP}, - update_time = #{updateTime,jdbcType=TIMESTAMP}, - save_status = #{saveStatus,jdbcType=INTEGER}, - submit_status = #{submitStatus,jdbcType=INTEGER}, - error_number = #{errorNumber,jdbcType=INTEGER}, - number = #{number,jdbcType=INTEGER} - where id = #{id,jdbcType=INTEGER} - - \ No newline at end of file diff --git a/src/main/resources/mappers/ExportFinancingRegistrationMapper.xml b/src/main/resources/mappers/ExportFinancingRegistrationMapper.xml deleted file mode 100644 index a991da3..0000000 --- a/src/main/resources/mappers/ExportFinancingRegistrationMapper.xml +++ /dev/null @@ -1,338 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - id, financing_account, receipt_number, interest_start_date, loan_term, effective_interest_rate, - user_id, create_time, update_time, save_status, submit_status, error_number, number - - - - - delete from export_financing_registration - where id = #{id,jdbcType=INTEGER} - - - delete from export_financing_registration - - - - - - insert into export_financing_registration (id, financing_account, receipt_number, - interest_start_date, loan_term, effective_interest_rate, - user_id, create_time, update_time, - save_status, submit_status, error_number, - number) - values (#{id,jdbcType=INTEGER}, #{financingAccount,jdbcType=VARCHAR}, #{receiptNumber,jdbcType=VARCHAR}, - #{interestStartDate,jdbcType=TIMESTAMP}, #{loanTerm,jdbcType=VARCHAR}, #{effectiveInterestRate,jdbcType=VARCHAR}, - #{userId,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, - #{saveStatus,jdbcType=INTEGER}, #{submitStatus,jdbcType=INTEGER}, #{errorNumber,jdbcType=INTEGER}, - #{number,jdbcType=INTEGER}) - - - insert into export_financing_registration - - - id, - - - financing_account, - - - receipt_number, - - - interest_start_date, - - - loan_term, - - - effective_interest_rate, - - - user_id, - - - create_time, - - - update_time, - - - save_status, - - - submit_status, - - - error_number, - - - number, - - - - - #{id,jdbcType=INTEGER}, - - - #{financingAccount,jdbcType=VARCHAR}, - - - #{receiptNumber,jdbcType=VARCHAR}, - - - #{interestStartDate,jdbcType=TIMESTAMP}, - - - #{loanTerm,jdbcType=VARCHAR}, - - - #{effectiveInterestRate,jdbcType=VARCHAR}, - - - #{userId,jdbcType=VARCHAR}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - #{updateTime,jdbcType=TIMESTAMP}, - - - #{saveStatus,jdbcType=INTEGER}, - - - #{submitStatus,jdbcType=INTEGER}, - - - #{errorNumber,jdbcType=INTEGER}, - - - #{number,jdbcType=INTEGER}, - - - - - - update export_financing_registration - - - id = #{record.id,jdbcType=INTEGER}, - - - financing_account = #{record.financingAccount,jdbcType=VARCHAR}, - - - receipt_number = #{record.receiptNumber,jdbcType=VARCHAR}, - - - interest_start_date = #{record.interestStartDate,jdbcType=TIMESTAMP}, - - - loan_term = #{record.loanTerm,jdbcType=VARCHAR}, - - - effective_interest_rate = #{record.effectiveInterestRate,jdbcType=VARCHAR}, - - - user_id = #{record.userId,jdbcType=VARCHAR}, - - - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - - - update_time = #{record.updateTime,jdbcType=TIMESTAMP}, - - - save_status = #{record.saveStatus,jdbcType=INTEGER}, - - - submit_status = #{record.submitStatus,jdbcType=INTEGER}, - - - error_number = #{record.errorNumber,jdbcType=INTEGER}, - - - number = #{record.number,jdbcType=INTEGER}, - - - - - - - - update export_financing_registration - set id = #{record.id,jdbcType=INTEGER}, - financing_account = #{record.financingAccount,jdbcType=VARCHAR}, - receipt_number = #{record.receiptNumber,jdbcType=VARCHAR}, - interest_start_date = #{record.interestStartDate,jdbcType=TIMESTAMP}, - loan_term = #{record.loanTerm,jdbcType=VARCHAR}, - effective_interest_rate = #{record.effectiveInterestRate,jdbcType=VARCHAR}, - user_id = #{record.userId,jdbcType=VARCHAR}, - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - update_time = #{record.updateTime,jdbcType=TIMESTAMP}, - save_status = #{record.saveStatus,jdbcType=INTEGER}, - submit_status = #{record.submitStatus,jdbcType=INTEGER}, - error_number = #{record.errorNumber,jdbcType=INTEGER}, - number = #{record.number,jdbcType=INTEGER} - - - - - - update export_financing_registration - - - financing_account = #{financingAccount,jdbcType=VARCHAR}, - - - receipt_number = #{receiptNumber,jdbcType=VARCHAR}, - - - interest_start_date = #{interestStartDate,jdbcType=TIMESTAMP}, - - - loan_term = #{loanTerm,jdbcType=VARCHAR}, - - - effective_interest_rate = #{effectiveInterestRate,jdbcType=VARCHAR}, - - - user_id = #{userId,jdbcType=VARCHAR}, - - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - update_time = #{updateTime,jdbcType=TIMESTAMP}, - - - save_status = #{saveStatus,jdbcType=INTEGER}, - - - submit_status = #{submitStatus,jdbcType=INTEGER}, - - - error_number = #{errorNumber,jdbcType=INTEGER}, - - - number = #{number,jdbcType=INTEGER}, - - - where id = #{id,jdbcType=INTEGER} - - - update export_financing_registration - set financing_account = #{financingAccount,jdbcType=VARCHAR}, - receipt_number = #{receiptNumber,jdbcType=VARCHAR}, - interest_start_date = #{interestStartDate,jdbcType=TIMESTAMP}, - loan_term = #{loanTerm,jdbcType=VARCHAR}, - effective_interest_rate = #{effectiveInterestRate,jdbcType=VARCHAR}, - user_id = #{userId,jdbcType=VARCHAR}, - create_time = #{createTime,jdbcType=TIMESTAMP}, - update_time = #{updateTime,jdbcType=TIMESTAMP}, - save_status = #{saveStatus,jdbcType=INTEGER}, - submit_status = #{submitStatus,jdbcType=INTEGER}, - error_number = #{errorNumber,jdbcType=INTEGER}, - number = #{number,jdbcType=INTEGER} - where id = #{id,jdbcType=INTEGER} - - \ No newline at end of file diff --git a/src/main/resources/mappers/ExportFinancingReturnRegistrationMapper.xml b/src/main/resources/mappers/ExportFinancingReturnRegistrationMapper.xml deleted file mode 100644 index 80be300..0000000 --- a/src/main/resources/mappers/ExportFinancingReturnRegistrationMapper.xml +++ /dev/null @@ -1,306 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - id, return_principal, receipt_number, financing_return_account, user_id, create_time, - update_time, save_status, submit_status, error_number, number - - - - - delete from export_financing_return_registration - where id = #{id,jdbcType=INTEGER} - - - delete from export_financing_return_registration - - - - - - insert into export_financing_return_registration (id, return_principal, receipt_number, - financing_return_account, user_id, create_time, - update_time, save_status, submit_status, - error_number, number) - values (#{id,jdbcType=INTEGER}, #{returnPrincipal,jdbcType=DECIMAL}, #{receiptNumber,jdbcType=VARCHAR}, - #{financingReturnAccount,jdbcType=VARCHAR}, #{userId,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, - #{updateTime,jdbcType=TIMESTAMP}, #{saveStatus,jdbcType=INTEGER}, #{submitStatus,jdbcType=INTEGER}, - #{errorNumber,jdbcType=INTEGER}, #{number,jdbcType=INTEGER}) - - - insert into export_financing_return_registration - - - id, - - - return_principal, - - - receipt_number, - - - financing_return_account, - - - user_id, - - - create_time, - - - update_time, - - - save_status, - - - submit_status, - - - error_number, - - - number, - - - - - #{id,jdbcType=INTEGER}, - - - #{returnPrincipal,jdbcType=DECIMAL}, - - - #{receiptNumber,jdbcType=VARCHAR}, - - - #{financingReturnAccount,jdbcType=VARCHAR}, - - - #{userId,jdbcType=VARCHAR}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - #{updateTime,jdbcType=TIMESTAMP}, - - - #{saveStatus,jdbcType=INTEGER}, - - - #{submitStatus,jdbcType=INTEGER}, - - - #{errorNumber,jdbcType=INTEGER}, - - - #{number,jdbcType=INTEGER}, - - - - - - update export_financing_return_registration - - - id = #{record.id,jdbcType=INTEGER}, - - - return_principal = #{record.returnPrincipal,jdbcType=DECIMAL}, - - - receipt_number = #{record.receiptNumber,jdbcType=VARCHAR}, - - - financing_return_account = #{record.financingReturnAccount,jdbcType=VARCHAR}, - - - user_id = #{record.userId,jdbcType=VARCHAR}, - - - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - - - update_time = #{record.updateTime,jdbcType=TIMESTAMP}, - - - save_status = #{record.saveStatus,jdbcType=INTEGER}, - - - submit_status = #{record.submitStatus,jdbcType=INTEGER}, - - - error_number = #{record.errorNumber,jdbcType=INTEGER}, - - - number = #{record.number,jdbcType=INTEGER}, - - - - - - - - update export_financing_return_registration - set id = #{record.id,jdbcType=INTEGER}, - return_principal = #{record.returnPrincipal,jdbcType=DECIMAL}, - receipt_number = #{record.receiptNumber,jdbcType=VARCHAR}, - financing_return_account = #{record.financingReturnAccount,jdbcType=VARCHAR}, - user_id = #{record.userId,jdbcType=VARCHAR}, - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - update_time = #{record.updateTime,jdbcType=TIMESTAMP}, - save_status = #{record.saveStatus,jdbcType=INTEGER}, - submit_status = #{record.submitStatus,jdbcType=INTEGER}, - error_number = #{record.errorNumber,jdbcType=INTEGER}, - number = #{record.number,jdbcType=INTEGER} - - - - - - update export_financing_return_registration - - - return_principal = #{returnPrincipal,jdbcType=DECIMAL}, - - - receipt_number = #{receiptNumber,jdbcType=VARCHAR}, - - - financing_return_account = #{financingReturnAccount,jdbcType=VARCHAR}, - - - user_id = #{userId,jdbcType=VARCHAR}, - - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - update_time = #{updateTime,jdbcType=TIMESTAMP}, - - - save_status = #{saveStatus,jdbcType=INTEGER}, - - - submit_status = #{submitStatus,jdbcType=INTEGER}, - - - error_number = #{errorNumber,jdbcType=INTEGER}, - - - number = #{number,jdbcType=INTEGER}, - - - where id = #{id,jdbcType=INTEGER} - - - update export_financing_return_registration - set return_principal = #{returnPrincipal,jdbcType=DECIMAL}, - receipt_number = #{receiptNumber,jdbcType=VARCHAR}, - financing_return_account = #{financingReturnAccount,jdbcType=VARCHAR}, - user_id = #{userId,jdbcType=VARCHAR}, - create_time = #{createTime,jdbcType=TIMESTAMP}, - update_time = #{updateTime,jdbcType=TIMESTAMP}, - save_status = #{saveStatus,jdbcType=INTEGER}, - submit_status = #{submitStatus,jdbcType=INTEGER}, - error_number = #{errorNumber,jdbcType=INTEGER}, - number = #{number,jdbcType=INTEGER} - where id = #{id,jdbcType=INTEGER} - - \ No newline at end of file diff --git a/src/main/resources/mappers/ExportPaymentAcceptanceMapper.xml b/src/main/resources/mappers/ExportPaymentAcceptanceMapper.xml deleted file mode 100644 index 003e637..0000000 --- a/src/main/resources/mappers/ExportPaymentAcceptanceMapper.xml +++ /dev/null @@ -1,306 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - id, response_type, amount, currency, user_id, create_time, update_time, save_status, - submit_status, error_number, number - - - - - delete from export_payment_acceptance - where id = #{id,jdbcType=INTEGER} - - - delete from export_payment_acceptance - - - - - - insert into export_payment_acceptance (id, response_type, amount, - currency, user_id, create_time, - update_time, save_status, submit_status, - error_number, number) - values (#{id,jdbcType=INTEGER}, #{responseType,jdbcType=VARCHAR}, #{amount,jdbcType=DECIMAL}, - #{currency,jdbcType=VARCHAR}, #{userId,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, - #{updateTime,jdbcType=TIMESTAMP}, #{saveStatus,jdbcType=INTEGER}, #{submitStatus,jdbcType=INTEGER}, - #{errorNumber,jdbcType=INTEGER}, #{number,jdbcType=INTEGER}) - - - insert into export_payment_acceptance - - - id, - - - response_type, - - - amount, - - - currency, - - - user_id, - - - create_time, - - - update_time, - - - save_status, - - - submit_status, - - - error_number, - - - number, - - - - - #{id,jdbcType=INTEGER}, - - - #{responseType,jdbcType=VARCHAR}, - - - #{amount,jdbcType=DECIMAL}, - - - #{currency,jdbcType=VARCHAR}, - - - #{userId,jdbcType=VARCHAR}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - #{updateTime,jdbcType=TIMESTAMP}, - - - #{saveStatus,jdbcType=INTEGER}, - - - #{submitStatus,jdbcType=INTEGER}, - - - #{errorNumber,jdbcType=INTEGER}, - - - #{number,jdbcType=INTEGER}, - - - - - - update export_payment_acceptance - - - id = #{record.id,jdbcType=INTEGER}, - - - response_type = #{record.responseType,jdbcType=VARCHAR}, - - - amount = #{record.amount,jdbcType=DECIMAL}, - - - currency = #{record.currency,jdbcType=VARCHAR}, - - - user_id = #{record.userId,jdbcType=VARCHAR}, - - - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - - - update_time = #{record.updateTime,jdbcType=TIMESTAMP}, - - - save_status = #{record.saveStatus,jdbcType=INTEGER}, - - - submit_status = #{record.submitStatus,jdbcType=INTEGER}, - - - error_number = #{record.errorNumber,jdbcType=INTEGER}, - - - number = #{record.number,jdbcType=INTEGER}, - - - - - - - - update export_payment_acceptance - set id = #{record.id,jdbcType=INTEGER}, - response_type = #{record.responseType,jdbcType=VARCHAR}, - amount = #{record.amount,jdbcType=DECIMAL}, - currency = #{record.currency,jdbcType=VARCHAR}, - user_id = #{record.userId,jdbcType=VARCHAR}, - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - update_time = #{record.updateTime,jdbcType=TIMESTAMP}, - save_status = #{record.saveStatus,jdbcType=INTEGER}, - submit_status = #{record.submitStatus,jdbcType=INTEGER}, - error_number = #{record.errorNumber,jdbcType=INTEGER}, - number = #{record.number,jdbcType=INTEGER} - - - - - - update export_payment_acceptance - - - response_type = #{responseType,jdbcType=VARCHAR}, - - - amount = #{amount,jdbcType=DECIMAL}, - - - currency = #{currency,jdbcType=VARCHAR}, - - - user_id = #{userId,jdbcType=VARCHAR}, - - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - update_time = #{updateTime,jdbcType=TIMESTAMP}, - - - save_status = #{saveStatus,jdbcType=INTEGER}, - - - submit_status = #{submitStatus,jdbcType=INTEGER}, - - - error_number = #{errorNumber,jdbcType=INTEGER}, - - - number = #{number,jdbcType=INTEGER}, - - - where id = #{id,jdbcType=INTEGER} - - - update export_payment_acceptance - set response_type = #{responseType,jdbcType=VARCHAR}, - amount = #{amount,jdbcType=DECIMAL}, - currency = #{currency,jdbcType=VARCHAR}, - user_id = #{userId,jdbcType=VARCHAR}, - create_time = #{createTime,jdbcType=TIMESTAMP}, - update_time = #{updateTime,jdbcType=TIMESTAMP}, - save_status = #{saveStatus,jdbcType=INTEGER}, - submit_status = #{submitStatus,jdbcType=INTEGER}, - error_number = #{errorNumber,jdbcType=INTEGER}, - number = #{number,jdbcType=INTEGER} - where id = #{id,jdbcType=INTEGER} - - \ No newline at end of file diff --git a/src/main/resources/mappers/ExportReviewMapper.xml b/src/main/resources/mappers/ExportReviewMapper.xml index fbb92a4..c734e7d 100644 --- a/src/main/resources/mappers/ExportReviewMapper.xml +++ b/src/main/resources/mappers/ExportReviewMapper.xml @@ -3,6 +3,7 @@ + @@ -73,8 +74,8 @@ - id, user_id, create_time, update_time, save_status, submit_status, error_number, - number + id, review_status, user_id, create_time, update_time, save_status, submit_status, + error_number, number review_reason @@ -128,14 +129,14 @@ - insert into export_review (id, user_id, create_time, - update_time, save_status, submit_status, - error_number, number, review_reason - ) - values (#{id,jdbcType=INTEGER}, #{userId,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, - #{updateTime,jdbcType=TIMESTAMP}, #{saveStatus,jdbcType=INTEGER}, #{submitStatus,jdbcType=INTEGER}, - #{errorNumber,jdbcType=INTEGER}, #{number,jdbcType=INTEGER}, #{reviewReason,jdbcType=LONGVARCHAR} - ) + insert into export_review (id, review_status, user_id, + create_time, update_time, save_status, + submit_status, error_number, number, + review_reason) + values (#{id,jdbcType=INTEGER}, #{reviewStatus,jdbcType=VARCHAR}, #{userId,jdbcType=VARCHAR}, + #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{saveStatus,jdbcType=INTEGER}, + #{submitStatus,jdbcType=INTEGER}, #{errorNumber,jdbcType=INTEGER}, #{number,jdbcType=INTEGER}, + #{reviewReason,jdbcType=LONGVARCHAR}) insert into export_review @@ -143,6 +144,9 @@ id, + + review_status, + user_id, @@ -172,6 +176,9 @@ #{id,jdbcType=INTEGER}, + + #{reviewStatus,jdbcType=VARCHAR}, + #{userId,jdbcType=VARCHAR}, @@ -210,6 +217,9 @@ id = #{record.id,jdbcType=INTEGER}, + + review_status = #{record.reviewStatus,jdbcType=VARCHAR}, + user_id = #{record.userId,jdbcType=VARCHAR}, @@ -242,6 +252,7 @@ update export_review set id = #{record.id,jdbcType=INTEGER}, + review_status = #{record.reviewStatus,jdbcType=VARCHAR}, user_id = #{record.userId,jdbcType=VARCHAR}, create_time = #{record.createTime,jdbcType=TIMESTAMP}, update_time = #{record.updateTime,jdbcType=TIMESTAMP}, @@ -257,6 +268,7 @@ update export_review set id = #{record.id,jdbcType=INTEGER}, + review_status = #{record.reviewStatus,jdbcType=VARCHAR}, user_id = #{record.userId,jdbcType=VARCHAR}, create_time = #{record.createTime,jdbcType=TIMESTAMP}, update_time = #{record.updateTime,jdbcType=TIMESTAMP}, @@ -271,6 +283,9 @@ update export_review + + review_status = #{reviewStatus,jdbcType=VARCHAR}, + user_id = #{userId,jdbcType=VARCHAR}, @@ -300,7 +315,8 @@ update export_review - set user_id = #{userId,jdbcType=VARCHAR}, + set review_status = #{reviewStatus,jdbcType=VARCHAR}, + user_id = #{userId,jdbcType=VARCHAR}, create_time = #{createTime,jdbcType=TIMESTAMP}, update_time = #{updateTime,jdbcType=TIMESTAMP}, save_status = #{saveStatus,jdbcType=INTEGER}, @@ -312,7 +328,8 @@ update export_review - set user_id = #{userId,jdbcType=VARCHAR}, + set review_status = #{reviewStatus,jdbcType=VARCHAR}, + user_id = #{userId,jdbcType=VARCHAR}, create_time = #{createTime,jdbcType=TIMESTAMP}, update_time = #{updateTime,jdbcType=TIMESTAMP}, save_status = #{saveStatus,jdbcType=INTEGER},