From a868a717c0c4a138e50baa1a5f384e5612abcbce Mon Sep 17 00:00:00 2001 From: "@t2652009480" <2652009480@qq.com> Date: Fri, 22 Mar 2024 09:03:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E5=AD=97=E7=AD=BE=E7=AB=A0=E7=A1=AE?= =?UTF-8?q?=E6=9D=83=EF=BC=88=E4=BF=9D=E7=90=86=E5=85=AC=E5=8F=B8=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StuDebtTransferStartController.java | 37 +- .../entity/StuTransactionDocumentsInfo.java | 102 ++- .../StuTransactionDocumentsInfoExample.java | 609 +++++++++++++++++- .../StuDebtInvestigationInfoMapper.java | 4 +- .../mappers/stuJoinNodeMapper.java | 4 +- .../service/StuDebtTransferStartService.java | 7 + .../impl/StuDebtTransferStartServiceImpl.java | 36 ++ .../StuTransactionDocumentsInfoMapper.xml | 181 +++++- 8 files changed, 921 insertions(+), 59 deletions(-) diff --git a/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/controller/StuDebtTransferStartController.java b/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/controller/StuDebtTransferStartController.java index 0588ca3..074faab 100644 --- a/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/controller/StuDebtTransferStartController.java +++ b/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/controller/StuDebtTransferStartController.java @@ -1,6 +1,9 @@ package com.sztzjy.block_finance.controller; +import com.alibaba.fastjson.JSONObject; +import com.nimbusds.jose.shaded.gson.JsonObject; import com.sztzjy.block_finance.annotation.AnonymousAccess; +import com.sztzjy.block_finance.entity.StuDebtInvestigationInfo; import com.sztzjy.block_finance.entity.dto.StuDebtTransferDTO; import com.sztzjy.block_finance.service.StuDebtTransferStartService; import com.sztzjy.block_finance.util.ResultEntity; @@ -8,9 +11,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import org.springframework.http.HttpStatus; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.util.List; @@ -28,7 +29,7 @@ public class StuDebtTransferStartController { @PostMapping("/debtTransferFileDisplay") @AnonymousAccess - @ApiOperation("债权转让文件展示") + @ApiOperation("发起债权转让贴现--债权转让文件展示") public ResultEntity> debtTransferFileDisplay(@ApiParam("用户ID") String userId){ List stuDebtTransferDTOList=stuDebtTransferStartService.debtTransferFileDisplay(userId); return new ResultEntity<>(HttpStatus.OK,"成功",stuDebtTransferDTOList); @@ -36,7 +37,7 @@ public class StuDebtTransferStartController { @PostMapping("/operate") @AnonymousAccess - @ApiOperation("操作:下载、上传、读取") + @ApiOperation("发起债权转让贴现--操作:下载、上传、读取") public ResultEntity operate(@ApiParam("文件ID") Integer id, @ApiParam("操作类型") String operateType){ int result=stuDebtTransferStartService.operate(id,operateType); @@ -45,9 +46,33 @@ public class StuDebtTransferStartController { @PostMapping("/applicationForDebtTransfer") @AnonymousAccess - @ApiOperation("发起债权转让申请") + @ApiOperation("发起债权转让贴现--发起债权转让申请") public ResultEntity applicationForDebtTransfer(@ApiParam("用户ID") String userId){ stuDebtTransferStartService.applicationForDebtTransfer(userId); return new ResultEntity<>(HttpStatus.OK,"成功"); } + + @PostMapping("/debtInvestigationFileDisplay") + @AnonymousAccess + @ApiOperation("债项调查--债权转让文件展示") + public ResultEntity> debtInvestigationFileDisplay(@ApiParam("用户ID") String userId){ + List stuDebtInvestigationInfos=stuDebtTransferStartService.debtInvestigationFileDisplay(userId); + return new ResultEntity<>(HttpStatus.OK,"成功",stuDebtInvestigationInfos); + } + + @PostMapping("/debtInvestigationPassed") + @AnonymousAccess + @ApiOperation("债项调查--债项调查通过") + public ResultEntity debtInvestigationPassed(@RequestBody List stuDebtInvestigationInfo){ + stuDebtTransferStartService.debtInvestigationPassed(stuDebtInvestigationInfo); + return new ResultEntity(HttpStatus.OK,"通过"); + } + + @PostMapping("/supplierFileDisplay") + @AnonymousAccess + @ApiOperation("数字签章确权(供应商/核心企业/保理公司)--文件展示") + public ResultEntity> supplierFileDisplay(@ApiParam("用户ID") String userId){ + List stuDebtTransferDTOList=stuDebtTransferStartService.supplierFileDisplay(userId); + return new ResultEntity<>(HttpStatus.OK,"成功",stuDebtTransferDTOList); + } } diff --git a/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/entity/StuTransactionDocumentsInfo.java b/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/entity/StuTransactionDocumentsInfo.java index a666c76..bbc1a7a 100644 --- a/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/entity/StuTransactionDocumentsInfo.java +++ b/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/entity/StuTransactionDocumentsInfo.java @@ -1,5 +1,7 @@ package com.sztzjy.block_finance.entity; +import java.util.Date; + public class StuTransactionDocumentsInfo { private Integer id; @@ -15,19 +17,29 @@ public class StuTransactionDocumentsInfo { private String userId; - private Integer receiveStatus; + private Integer discountDisplay; + + private Integer supplierDisplay; + + private Integer coreEnterpriseDisplay; + + private Integer coreEnterpriseReceiveStatus; + + private Integer factoringCompanyDisplay; + + private Integer factoringCompaniesReceiveStatus; private Integer readStatus; private Integer downloadStatus; - public StuTransactionDocumentsInfo(){ + private Date createTime; - } + private Date updateTime; - public StuTransactionDocumentsInfo(String userId,String fileName){ + private String crypDigest; - } + private String informationCiphertext; public Integer getId() { return id; @@ -85,12 +97,52 @@ public class StuTransactionDocumentsInfo { this.userId = userId == null ? null : userId.trim(); } - public Integer getReceiveStatus() { - return receiveStatus; + public Integer getDiscountDisplay() { + return discountDisplay; + } + + public void setDiscountDisplay(Integer discountDisplay) { + this.discountDisplay = discountDisplay; + } + + public Integer getSupplierDisplay() { + return supplierDisplay; + } + + public void setSupplierDisplay(Integer supplierDisplay) { + this.supplierDisplay = supplierDisplay; + } + + public Integer getCoreEnterpriseDisplay() { + return coreEnterpriseDisplay; + } + + public void setCoreEnterpriseDisplay(Integer coreEnterpriseDisplay) { + this.coreEnterpriseDisplay = coreEnterpriseDisplay; + } + + public Integer getCoreEnterpriseReceiveStatus() { + return coreEnterpriseReceiveStatus; + } + + public void setCoreEnterpriseReceiveStatus(Integer coreEnterpriseReceiveStatus) { + this.coreEnterpriseReceiveStatus = coreEnterpriseReceiveStatus; } - public void setReceiveStatus(Integer receiveStatus) { - this.receiveStatus = receiveStatus; + public Integer getFactoringCompanyDisplay() { + return factoringCompanyDisplay; + } + + public void setFactoringCompanyDisplay(Integer factoringCompanyDisplay) { + this.factoringCompanyDisplay = factoringCompanyDisplay; + } + + public Integer getFactoringCompaniesReceiveStatus() { + return factoringCompaniesReceiveStatus; + } + + public void setFactoringCompaniesReceiveStatus(Integer factoringCompaniesReceiveStatus) { + this.factoringCompaniesReceiveStatus = factoringCompaniesReceiveStatus; } public Integer getReadStatus() { @@ -108,4 +160,36 @@ public class StuTransactionDocumentsInfo { public void setDownloadStatus(Integer downloadStatus) { this.downloadStatus = downloadStatus; } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + public String getCrypDigest() { + return crypDigest; + } + + public void setCrypDigest(String crypDigest) { + this.crypDigest = crypDigest == null ? null : crypDigest.trim(); + } + + public String getInformationCiphertext() { + return informationCiphertext; + } + + public void setInformationCiphertext(String informationCiphertext) { + this.informationCiphertext = informationCiphertext == null ? null : informationCiphertext.trim(); + } } \ No newline at end of file diff --git a/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/entity/StuTransactionDocumentsInfoExample.java b/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/entity/StuTransactionDocumentsInfoExample.java index 9d676e8..3ad6320 100644 --- a/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/entity/StuTransactionDocumentsInfoExample.java +++ b/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/entity/StuTransactionDocumentsInfoExample.java @@ -1,6 +1,7 @@ package com.sztzjy.block_finance.entity; import java.util.ArrayList; +import java.util.Date; import java.util.List; public class StuTransactionDocumentsInfoExample { @@ -554,63 +555,363 @@ public class StuTransactionDocumentsInfoExample { return (Criteria) this; } - public Criteria andReceiveStatusIsNull() { - addCriterion("receive_status is null"); + public Criteria andDiscountDisplayIsNull() { + addCriterion("discount_display is null"); return (Criteria) this; } - public Criteria andReceiveStatusIsNotNull() { - addCriterion("receive_status is not null"); + public Criteria andDiscountDisplayIsNotNull() { + addCriterion("discount_display is not null"); return (Criteria) this; } - public Criteria andReceiveStatusEqualTo(Integer value) { - addCriterion("receive_status =", value, "receiveStatus"); + public Criteria andDiscountDisplayEqualTo(Integer value) { + addCriterion("discount_display =", value, "discountDisplay"); return (Criteria) this; } - public Criteria andReceiveStatusNotEqualTo(Integer value) { - addCriterion("receive_status <>", value, "receiveStatus"); + public Criteria andDiscountDisplayNotEqualTo(Integer value) { + addCriterion("discount_display <>", value, "discountDisplay"); return (Criteria) this; } - public Criteria andReceiveStatusGreaterThan(Integer value) { - addCriterion("receive_status >", value, "receiveStatus"); + public Criteria andDiscountDisplayGreaterThan(Integer value) { + addCriterion("discount_display >", value, "discountDisplay"); return (Criteria) this; } - public Criteria andReceiveStatusGreaterThanOrEqualTo(Integer value) { - addCriterion("receive_status >=", value, "receiveStatus"); + public Criteria andDiscountDisplayGreaterThanOrEqualTo(Integer value) { + addCriterion("discount_display >=", value, "discountDisplay"); return (Criteria) this; } - public Criteria andReceiveStatusLessThan(Integer value) { - addCriterion("receive_status <", value, "receiveStatus"); + public Criteria andDiscountDisplayLessThan(Integer value) { + addCriterion("discount_display <", value, "discountDisplay"); return (Criteria) this; } - public Criteria andReceiveStatusLessThanOrEqualTo(Integer value) { - addCriterion("receive_status <=", value, "receiveStatus"); + public Criteria andDiscountDisplayLessThanOrEqualTo(Integer value) { + addCriterion("discount_display <=", value, "discountDisplay"); return (Criteria) this; } - public Criteria andReceiveStatusIn(List values) { - addCriterion("receive_status in", values, "receiveStatus"); + public Criteria andDiscountDisplayIn(List values) { + addCriterion("discount_display in", values, "discountDisplay"); return (Criteria) this; } - public Criteria andReceiveStatusNotIn(List values) { - addCriterion("receive_status not in", values, "receiveStatus"); + public Criteria andDiscountDisplayNotIn(List values) { + addCriterion("discount_display not in", values, "discountDisplay"); return (Criteria) this; } - public Criteria andReceiveStatusBetween(Integer value1, Integer value2) { - addCriterion("receive_status between", value1, value2, "receiveStatus"); + public Criteria andDiscountDisplayBetween(Integer value1, Integer value2) { + addCriterion("discount_display between", value1, value2, "discountDisplay"); return (Criteria) this; } - public Criteria andReceiveStatusNotBetween(Integer value1, Integer value2) { - addCriterion("receive_status not between", value1, value2, "receiveStatus"); + public Criteria andDiscountDisplayNotBetween(Integer value1, Integer value2) { + addCriterion("discount_display not between", value1, value2, "discountDisplay"); + return (Criteria) this; + } + + public Criteria andSupplierDisplayIsNull() { + addCriterion("supplier_display is null"); + return (Criteria) this; + } + + public Criteria andSupplierDisplayIsNotNull() { + addCriterion("supplier_display is not null"); + return (Criteria) this; + } + + public Criteria andSupplierDisplayEqualTo(Integer value) { + addCriterion("supplier_display =", value, "supplierDisplay"); + return (Criteria) this; + } + + public Criteria andSupplierDisplayNotEqualTo(Integer value) { + addCriterion("supplier_display <>", value, "supplierDisplay"); + return (Criteria) this; + } + + public Criteria andSupplierDisplayGreaterThan(Integer value) { + addCriterion("supplier_display >", value, "supplierDisplay"); + return (Criteria) this; + } + + public Criteria andSupplierDisplayGreaterThanOrEqualTo(Integer value) { + addCriterion("supplier_display >=", value, "supplierDisplay"); + return (Criteria) this; + } + + public Criteria andSupplierDisplayLessThan(Integer value) { + addCriterion("supplier_display <", value, "supplierDisplay"); + return (Criteria) this; + } + + public Criteria andSupplierDisplayLessThanOrEqualTo(Integer value) { + addCriterion("supplier_display <=", value, "supplierDisplay"); + return (Criteria) this; + } + + public Criteria andSupplierDisplayIn(List values) { + addCriterion("supplier_display in", values, "supplierDisplay"); + return (Criteria) this; + } + + public Criteria andSupplierDisplayNotIn(List values) { + addCriterion("supplier_display not in", values, "supplierDisplay"); + return (Criteria) this; + } + + public Criteria andSupplierDisplayBetween(Integer value1, Integer value2) { + addCriterion("supplier_display between", value1, value2, "supplierDisplay"); + return (Criteria) this; + } + + public Criteria andSupplierDisplayNotBetween(Integer value1, Integer value2) { + addCriterion("supplier_display not between", value1, value2, "supplierDisplay"); + return (Criteria) this; + } + + public Criteria andCoreEnterpriseDisplayIsNull() { + addCriterion("core_enterprise_display is null"); + return (Criteria) this; + } + + public Criteria andCoreEnterpriseDisplayIsNotNull() { + addCriterion("core_enterprise_display is not null"); + return (Criteria) this; + } + + public Criteria andCoreEnterpriseDisplayEqualTo(Integer value) { + addCriterion("core_enterprise_display =", value, "coreEnterpriseDisplay"); + return (Criteria) this; + } + + public Criteria andCoreEnterpriseDisplayNotEqualTo(Integer value) { + addCriterion("core_enterprise_display <>", value, "coreEnterpriseDisplay"); + return (Criteria) this; + } + + public Criteria andCoreEnterpriseDisplayGreaterThan(Integer value) { + addCriterion("core_enterprise_display >", value, "coreEnterpriseDisplay"); + return (Criteria) this; + } + + public Criteria andCoreEnterpriseDisplayGreaterThanOrEqualTo(Integer value) { + addCriterion("core_enterprise_display >=", value, "coreEnterpriseDisplay"); + return (Criteria) this; + } + + public Criteria andCoreEnterpriseDisplayLessThan(Integer value) { + addCriterion("core_enterprise_display <", value, "coreEnterpriseDisplay"); + return (Criteria) this; + } + + public Criteria andCoreEnterpriseDisplayLessThanOrEqualTo(Integer value) { + addCriterion("core_enterprise_display <=", value, "coreEnterpriseDisplay"); + return (Criteria) this; + } + + public Criteria andCoreEnterpriseDisplayIn(List values) { + addCriterion("core_enterprise_display in", values, "coreEnterpriseDisplay"); + return (Criteria) this; + } + + public Criteria andCoreEnterpriseDisplayNotIn(List values) { + addCriterion("core_enterprise_display not in", values, "coreEnterpriseDisplay"); + return (Criteria) this; + } + + public Criteria andCoreEnterpriseDisplayBetween(Integer value1, Integer value2) { + addCriterion("core_enterprise_display between", value1, value2, "coreEnterpriseDisplay"); + return (Criteria) this; + } + + public Criteria andCoreEnterpriseDisplayNotBetween(Integer value1, Integer value2) { + addCriterion("core_enterprise_display not between", value1, value2, "coreEnterpriseDisplay"); + return (Criteria) this; + } + + public Criteria andCoreEnterpriseReceiveStatusIsNull() { + addCriterion("core_enterprise_receive_status is null"); + return (Criteria) this; + } + + public Criteria andCoreEnterpriseReceiveStatusIsNotNull() { + addCriterion("core_enterprise_receive_status is not null"); + return (Criteria) this; + } + + public Criteria andCoreEnterpriseReceiveStatusEqualTo(Integer value) { + addCriterion("core_enterprise_receive_status =", value, "coreEnterpriseReceiveStatus"); + return (Criteria) this; + } + + public Criteria andCoreEnterpriseReceiveStatusNotEqualTo(Integer value) { + addCriterion("core_enterprise_receive_status <>", value, "coreEnterpriseReceiveStatus"); + return (Criteria) this; + } + + public Criteria andCoreEnterpriseReceiveStatusGreaterThan(Integer value) { + addCriterion("core_enterprise_receive_status >", value, "coreEnterpriseReceiveStatus"); + return (Criteria) this; + } + + public Criteria andCoreEnterpriseReceiveStatusGreaterThanOrEqualTo(Integer value) { + addCriterion("core_enterprise_receive_status >=", value, "coreEnterpriseReceiveStatus"); + return (Criteria) this; + } + + public Criteria andCoreEnterpriseReceiveStatusLessThan(Integer value) { + addCriterion("core_enterprise_receive_status <", value, "coreEnterpriseReceiveStatus"); + return (Criteria) this; + } + + public Criteria andCoreEnterpriseReceiveStatusLessThanOrEqualTo(Integer value) { + addCriterion("core_enterprise_receive_status <=", value, "coreEnterpriseReceiveStatus"); + return (Criteria) this; + } + + public Criteria andCoreEnterpriseReceiveStatusIn(List values) { + addCriterion("core_enterprise_receive_status in", values, "coreEnterpriseReceiveStatus"); + return (Criteria) this; + } + + public Criteria andCoreEnterpriseReceiveStatusNotIn(List values) { + addCriterion("core_enterprise_receive_status not in", values, "coreEnterpriseReceiveStatus"); + return (Criteria) this; + } + + public Criteria andCoreEnterpriseReceiveStatusBetween(Integer value1, Integer value2) { + addCriterion("core_enterprise_receive_status between", value1, value2, "coreEnterpriseReceiveStatus"); + return (Criteria) this; + } + + public Criteria andCoreEnterpriseReceiveStatusNotBetween(Integer value1, Integer value2) { + addCriterion("core_enterprise_receive_status not between", value1, value2, "coreEnterpriseReceiveStatus"); + return (Criteria) this; + } + + public Criteria andFactoringCompanyDisplayIsNull() { + addCriterion("factoring_company_display is null"); + return (Criteria) this; + } + + public Criteria andFactoringCompanyDisplayIsNotNull() { + addCriterion("factoring_company_display is not null"); + return (Criteria) this; + } + + public Criteria andFactoringCompanyDisplayEqualTo(Integer value) { + addCriterion("factoring_company_display =", value, "factoringCompanyDisplay"); + return (Criteria) this; + } + + public Criteria andFactoringCompanyDisplayNotEqualTo(Integer value) { + addCriterion("factoring_company_display <>", value, "factoringCompanyDisplay"); + return (Criteria) this; + } + + public Criteria andFactoringCompanyDisplayGreaterThan(Integer value) { + addCriterion("factoring_company_display >", value, "factoringCompanyDisplay"); + return (Criteria) this; + } + + public Criteria andFactoringCompanyDisplayGreaterThanOrEqualTo(Integer value) { + addCriterion("factoring_company_display >=", value, "factoringCompanyDisplay"); + return (Criteria) this; + } + + public Criteria andFactoringCompanyDisplayLessThan(Integer value) { + addCriterion("factoring_company_display <", value, "factoringCompanyDisplay"); + return (Criteria) this; + } + + public Criteria andFactoringCompanyDisplayLessThanOrEqualTo(Integer value) { + addCriterion("factoring_company_display <=", value, "factoringCompanyDisplay"); + return (Criteria) this; + } + + public Criteria andFactoringCompanyDisplayIn(List values) { + addCriterion("factoring_company_display in", values, "factoringCompanyDisplay"); + return (Criteria) this; + } + + public Criteria andFactoringCompanyDisplayNotIn(List values) { + addCriterion("factoring_company_display not in", values, "factoringCompanyDisplay"); + return (Criteria) this; + } + + public Criteria andFactoringCompanyDisplayBetween(Integer value1, Integer value2) { + addCriterion("factoring_company_display between", value1, value2, "factoringCompanyDisplay"); + return (Criteria) this; + } + + public Criteria andFactoringCompanyDisplayNotBetween(Integer value1, Integer value2) { + addCriterion("factoring_company_display not between", value1, value2, "factoringCompanyDisplay"); + return (Criteria) this; + } + + public Criteria andFactoringCompaniesReceiveStatusIsNull() { + addCriterion("\"factoring companies_receive_status\" is null"); + return (Criteria) this; + } + + public Criteria andFactoringCompaniesReceiveStatusIsNotNull() { + addCriterion("\"factoring companies_receive_status\" is not null"); + return (Criteria) this; + } + + public Criteria andFactoringCompaniesReceiveStatusEqualTo(Integer value) { + addCriterion("\"factoring companies_receive_status\" =", value, "factoringCompaniesReceiveStatus"); + return (Criteria) this; + } + + public Criteria andFactoringCompaniesReceiveStatusNotEqualTo(Integer value) { + addCriterion("\"factoring companies_receive_status\" <>", value, "factoringCompaniesReceiveStatus"); + return (Criteria) this; + } + + public Criteria andFactoringCompaniesReceiveStatusGreaterThan(Integer value) { + addCriterion("\"factoring companies_receive_status\" >", value, "factoringCompaniesReceiveStatus"); + return (Criteria) this; + } + + public Criteria andFactoringCompaniesReceiveStatusGreaterThanOrEqualTo(Integer value) { + addCriterion("\"factoring companies_receive_status\" >=", value, "factoringCompaniesReceiveStatus"); + return (Criteria) this; + } + + public Criteria andFactoringCompaniesReceiveStatusLessThan(Integer value) { + addCriterion("\"factoring companies_receive_status\" <", value, "factoringCompaniesReceiveStatus"); + return (Criteria) this; + } + + public Criteria andFactoringCompaniesReceiveStatusLessThanOrEqualTo(Integer value) { + addCriterion("\"factoring companies_receive_status\" <=", value, "factoringCompaniesReceiveStatus"); + return (Criteria) this; + } + + public Criteria andFactoringCompaniesReceiveStatusIn(List values) { + addCriterion("\"factoring companies_receive_status\" in", values, "factoringCompaniesReceiveStatus"); + return (Criteria) this; + } + + public Criteria andFactoringCompaniesReceiveStatusNotIn(List values) { + addCriterion("\"factoring companies_receive_status\" not in", values, "factoringCompaniesReceiveStatus"); + return (Criteria) this; + } + + public Criteria andFactoringCompaniesReceiveStatusBetween(Integer value1, Integer value2) { + addCriterion("\"factoring companies_receive_status\" between", value1, value2, "factoringCompaniesReceiveStatus"); + return (Criteria) this; + } + + public Criteria andFactoringCompaniesReceiveStatusNotBetween(Integer value1, Integer value2) { + addCriterion("\"factoring companies_receive_status\" not between", value1, value2, "factoringCompaniesReceiveStatus"); return (Criteria) this; } @@ -733,6 +1034,266 @@ public class StuTransactionDocumentsInfoExample { addCriterion("\"download status\" not between", value1, value2, "downloadStatus"); return (Criteria) this; } + + public Criteria andCreateTimeIsNull() { + addCriterion("create_time is null"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNotNull() { + addCriterion("create_time is not null"); + return (Criteria) this; + } + + public Criteria andCreateTimeEqualTo(Date value) { + addCriterion("create_time =", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotEqualTo(Date value) { + addCriterion("create_time <>", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThan(Date value) { + addCriterion("create_time >", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("create_time >=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThan(Date value) { + addCriterion("create_time <", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThanOrEqualTo(Date value) { + addCriterion("create_time <=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeIn(List values) { + addCriterion("create_time in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotIn(List values) { + addCriterion("create_time not in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeBetween(Date value1, Date value2) { + addCriterion("create_time between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotBetween(Date value1, Date value2) { + addCriterion("create_time not between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIsNull() { + addCriterion("update_time is null"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIsNotNull() { + addCriterion("update_time is not null"); + return (Criteria) this; + } + + public Criteria andUpdateTimeEqualTo(Date value) { + addCriterion("update_time =", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotEqualTo(Date value) { + addCriterion("update_time <>", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThan(Date value) { + addCriterion("update_time >", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("update_time >=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThan(Date value) { + addCriterion("update_time <", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThanOrEqualTo(Date value) { + addCriterion("update_time <=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIn(List values) { + addCriterion("update_time in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotIn(List values) { + addCriterion("update_time not in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeBetween(Date value1, Date value2) { + addCriterion("update_time between", value1, value2, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotBetween(Date value1, Date value2) { + addCriterion("update_time not between", value1, value2, "updateTime"); + return (Criteria) this; + } + + public Criteria andCrypDigestIsNull() { + addCriterion("cryp_digest is null"); + return (Criteria) this; + } + + public Criteria andCrypDigestIsNotNull() { + addCriterion("cryp_digest is not null"); + return (Criteria) this; + } + + public Criteria andCrypDigestEqualTo(String value) { + addCriterion("cryp_digest =", value, "crypDigest"); + return (Criteria) this; + } + + public Criteria andCrypDigestNotEqualTo(String value) { + addCriterion("cryp_digest <>", value, "crypDigest"); + return (Criteria) this; + } + + public Criteria andCrypDigestGreaterThan(String value) { + addCriterion("cryp_digest >", value, "crypDigest"); + return (Criteria) this; + } + + public Criteria andCrypDigestGreaterThanOrEqualTo(String value) { + addCriterion("cryp_digest >=", value, "crypDigest"); + return (Criteria) this; + } + + public Criteria andCrypDigestLessThan(String value) { + addCriterion("cryp_digest <", value, "crypDigest"); + return (Criteria) this; + } + + public Criteria andCrypDigestLessThanOrEqualTo(String value) { + addCriterion("cryp_digest <=", value, "crypDigest"); + return (Criteria) this; + } + + public Criteria andCrypDigestLike(String value) { + addCriterion("cryp_digest like", value, "crypDigest"); + return (Criteria) this; + } + + public Criteria andCrypDigestNotLike(String value) { + addCriterion("cryp_digest not like", value, "crypDigest"); + return (Criteria) this; + } + + public Criteria andCrypDigestIn(List values) { + addCriterion("cryp_digest in", values, "crypDigest"); + return (Criteria) this; + } + + public Criteria andCrypDigestNotIn(List values) { + addCriterion("cryp_digest not in", values, "crypDigest"); + return (Criteria) this; + } + + public Criteria andCrypDigestBetween(String value1, String value2) { + addCriterion("cryp_digest between", value1, value2, "crypDigest"); + return (Criteria) this; + } + + public Criteria andCrypDigestNotBetween(String value1, String value2) { + addCriterion("cryp_digest not between", value1, value2, "crypDigest"); + return (Criteria) this; + } + + public Criteria andInformationCiphertextIsNull() { + addCriterion("information_ciphertext is null"); + return (Criteria) this; + } + + public Criteria andInformationCiphertextIsNotNull() { + addCriterion("information_ciphertext is not null"); + return (Criteria) this; + } + + public Criteria andInformationCiphertextEqualTo(String value) { + addCriterion("information_ciphertext =", value, "informationCiphertext"); + return (Criteria) this; + } + + public Criteria andInformationCiphertextNotEqualTo(String value) { + addCriterion("information_ciphertext <>", value, "informationCiphertext"); + return (Criteria) this; + } + + public Criteria andInformationCiphertextGreaterThan(String value) { + addCriterion("information_ciphertext >", value, "informationCiphertext"); + return (Criteria) this; + } + + public Criteria andInformationCiphertextGreaterThanOrEqualTo(String value) { + addCriterion("information_ciphertext >=", value, "informationCiphertext"); + return (Criteria) this; + } + + public Criteria andInformationCiphertextLessThan(String value) { + addCriterion("information_ciphertext <", value, "informationCiphertext"); + return (Criteria) this; + } + + public Criteria andInformationCiphertextLessThanOrEqualTo(String value) { + addCriterion("information_ciphertext <=", value, "informationCiphertext"); + return (Criteria) this; + } + + public Criteria andInformationCiphertextLike(String value) { + addCriterion("information_ciphertext like", value, "informationCiphertext"); + return (Criteria) this; + } + + public Criteria andInformationCiphertextNotLike(String value) { + addCriterion("information_ciphertext not like", value, "informationCiphertext"); + return (Criteria) this; + } + + public Criteria andInformationCiphertextIn(List values) { + addCriterion("information_ciphertext in", values, "informationCiphertext"); + return (Criteria) this; + } + + public Criteria andInformationCiphertextNotIn(List values) { + addCriterion("information_ciphertext not in", values, "informationCiphertext"); + return (Criteria) this; + } + + public Criteria andInformationCiphertextBetween(String value1, String value2) { + addCriterion("information_ciphertext between", value1, value2, "informationCiphertext"); + return (Criteria) this; + } + + public Criteria andInformationCiphertextNotBetween(String value1, String value2) { + addCriterion("information_ciphertext not between", value1, value2, "informationCiphertext"); + return (Criteria) this; + } } public static class Criteria extends GeneratedCriteria { diff --git a/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/mappers/StuDebtInvestigationInfoMapper.java b/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/mappers/StuDebtInvestigationInfoMapper.java index 2511829..29ed142 100644 --- a/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/mappers/StuDebtInvestigationInfoMapper.java +++ b/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/mappers/StuDebtInvestigationInfoMapper.java @@ -3,8 +3,10 @@ package com.sztzjy.block_finance.mappers; import com.sztzjy.block_finance.entity.StuDebtInvestigationInfo; import com.sztzjy.block_finance.entity.StuDebtInvestigationInfoExample; import java.util.List; -import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +@Mapper public interface StuDebtInvestigationInfoMapper { long countByExample(StuDebtInvestigationInfoExample example); diff --git a/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/mappers/stuJoinNodeMapper.java b/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/mappers/stuJoinNodeMapper.java index 91fed9f..27ba884 100644 --- a/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/mappers/stuJoinNodeMapper.java +++ b/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/mappers/stuJoinNodeMapper.java @@ -3,8 +3,10 @@ package com.sztzjy.block_finance.mappers; import com.sztzjy.block_finance.entity.stuJoinNode; import com.sztzjy.block_finance.entity.stuJoinNodeExample; import java.util.List; -import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +@Mapper public interface stuJoinNodeMapper { long countByExample(stuJoinNodeExample example); diff --git a/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/service/StuDebtTransferStartService.java b/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/service/StuDebtTransferStartService.java index b867b1b..c448250 100644 --- a/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/service/StuDebtTransferStartService.java +++ b/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/service/StuDebtTransferStartService.java @@ -1,5 +1,6 @@ package com.sztzjy.block_finance.service; +import com.sztzjy.block_finance.entity.StuDebtInvestigationInfo; import com.sztzjy.block_finance.entity.dto.StuDebtTransferDTO; import java.util.List; @@ -14,4 +15,10 @@ public interface StuDebtTransferStartService { int operate(Integer id, String operateType); void applicationForDebtTransfer(String userId); + + List debtInvestigationFileDisplay(String userId); + + void debtInvestigationPassed(List stuDebtInvestigationInfo); + + List supplierFileDisplay(String userId); } diff --git a/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/service/impl/StuDebtTransferStartServiceImpl.java b/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/service/impl/StuDebtTransferStartServiceImpl.java index 07ee361..92e8e8b 100644 --- a/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/service/impl/StuDebtTransferStartServiceImpl.java +++ b/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/service/impl/StuDebtTransferStartServiceImpl.java @@ -1,9 +1,12 @@ package com.sztzjy.block_finance.service.impl; import com.sztzjy.block_finance.config.exception.handler.ServiceException; +import com.sztzjy.block_finance.entity.StuDebtInvestigationInfo; +import com.sztzjy.block_finance.entity.StuDebtInvestigationInfoExample; import com.sztzjy.block_finance.entity.StuTransactionDocumentsInfo; import com.sztzjy.block_finance.entity.StuTransactionDocumentsInfoExample; import com.sztzjy.block_finance.entity.dto.StuDebtTransferDTO; +import com.sztzjy.block_finance.mappers.StuDebtInvestigationInfoMapper; import com.sztzjy.block_finance.mappers.StuTransactionDocumentsInfoMapper; import com.sztzjy.block_finance.service.StuDebtTransferStartService; import com.sztzjy.block_finance.util.ConvertUtil; @@ -24,6 +27,8 @@ public class StuDebtTransferStartServiceImpl implements StuDebtTransferStartServ ConvertUtil convertUtil; @Resource StuTransactionDocumentsInfoMapper stuTransactionDocumentsInfoMapper; + @Resource + StuDebtInvestigationInfoMapper stuDebtInvestigationInfoMapper; @Override public List debtTransferFileDisplay(String userId) { @@ -81,8 +86,39 @@ public class StuDebtTransferStartServiceImpl implements StuDebtTransferStartServ for (int i = 0; i < stuTransactionDocumentsInfos.size(); i++) { if(stuTransactionDocumentsInfos.get(i).getReadStatus()!=1){ throw new ServiceException(HttpStatus.ACCEPTED,"文件未全部读取"); + } + } + } + + @Override + public List debtInvestigationFileDisplay(String userId) { + List stuDebtInvestigationInfos = stuDebtInvestigationInfoMapper.selectByExample(null); + return stuDebtInvestigationInfos; + } + @Override + public void debtInvestigationPassed(List stuDebtInvestigationInfo) { + //查询内置数据 + List stuDebtInvestigationInfos = stuDebtInvestigationInfoMapper.selectByExample(null); + //进行比较 + for (int i = 0; i < stuDebtInvestigationInfo.size(); i++) { + for (int j = 0; j < stuDebtInvestigationInfos.size(); j++) { + if(stuDebtInvestigationInfo.get(i).getId()==stuDebtInvestigationInfos.get(j).getId()){ //是否是同一文件 + if(!stuDebtInvestigationInfo.get(i).getOnAnalysis().equals(stuDebtInvestigationInfos.get(j).getOnAnalysis())){ + throw new ServiceException(HttpStatus.ACCEPTED,"分析结果选择错误"); + } + break; + } } } } + + @Override + public List supplierFileDisplay(String userId) { + StuTransactionDocumentsInfoExample example=new StuTransactionDocumentsInfoExample(); + example.createCriteria().andUserIdEqualTo(userId).andSupplierDisplayEqualTo(1); + List stuTransactionDocumentsInfoList = stuTransactionDocumentsInfoMapper.selectByExample(example); + List stuDebtTransferDTOList = convertUtil.entityToDTOList(stuTransactionDocumentsInfoList, StuDebtTransferDTO.class); + return stuDebtTransferDTOList; + } } diff --git a/BlockFinanceCentral/src/main/resources/mappers/StuTransactionDocumentsInfoMapper.xml b/BlockFinanceCentral/src/main/resources/mappers/StuTransactionDocumentsInfoMapper.xml index 41bc43a..d6d06af 100644 --- a/BlockFinanceCentral/src/main/resources/mappers/StuTransactionDocumentsInfoMapper.xml +++ b/BlockFinanceCentral/src/main/resources/mappers/StuTransactionDocumentsInfoMapper.xml @@ -9,9 +9,18 @@ - + + + + + + + + + + @@ -73,7 +82,9 @@ id, file_name, url, upload_status, information_status, signature_verification_status, - user_id, receive_status, read_status, "download status" + user_id, discount_display, supplier_display, core_enterprise_display, core_enterprise_receive_status, + factoring_company_display, "factoring companies_receive_status", read_status, "download status", + create_time, update_time, cryp_digest, information_ciphertext @@ -212,8 +285,23 @@ user_id = #{record.userId,jdbcType=VARCHAR}, - - receive_status = #{record.receiveStatus,jdbcType=INTEGER}, + + discount_display = #{record.discountDisplay,jdbcType=INTEGER}, + + + supplier_display = #{record.supplierDisplay,jdbcType=INTEGER}, + + + core_enterprise_display = #{record.coreEnterpriseDisplay,jdbcType=INTEGER}, + + + core_enterprise_receive_status = #{record.coreEnterpriseReceiveStatus,jdbcType=INTEGER}, + + + factoring_company_display = #{record.factoringCompanyDisplay,jdbcType=INTEGER}, + + + "factoring companies_receive_status" = #{record.factoringCompaniesReceiveStatus,jdbcType=INTEGER}, read_status = #{record.readStatus,jdbcType=INTEGER}, @@ -221,6 +309,18 @@ "download status" = #{record.downloadStatus,jdbcType=INTEGER}, + + create_time = #{record.createTime,jdbcType=TIMESTAMP}, + + + update_time = #{record.updateTime,jdbcType=TIMESTAMP}, + + + cryp_digest = #{record.crypDigest,jdbcType=VARCHAR}, + + + information_ciphertext = #{record.informationCiphertext,jdbcType=VARCHAR}, + @@ -235,9 +335,18 @@ information_status = #{record.informationStatus,jdbcType=INTEGER}, signature_verification_status = #{record.signatureVerificationStatus,jdbcType=INTEGER}, user_id = #{record.userId,jdbcType=VARCHAR}, - receive_status = #{record.receiveStatus,jdbcType=INTEGER}, + discount_display = #{record.discountDisplay,jdbcType=INTEGER}, + supplier_display = #{record.supplierDisplay,jdbcType=INTEGER}, + core_enterprise_display = #{record.coreEnterpriseDisplay,jdbcType=INTEGER}, + core_enterprise_receive_status = #{record.coreEnterpriseReceiveStatus,jdbcType=INTEGER}, + factoring_company_display = #{record.factoringCompanyDisplay,jdbcType=INTEGER}, + "factoring companies_receive_status" = #{record.factoringCompaniesReceiveStatus,jdbcType=INTEGER}, read_status = #{record.readStatus,jdbcType=INTEGER}, - "download status" = #{record.downloadStatus,jdbcType=INTEGER} + "download status" = #{record.downloadStatus,jdbcType=INTEGER}, + create_time = #{record.createTime,jdbcType=TIMESTAMP}, + update_time = #{record.updateTime,jdbcType=TIMESTAMP}, + cryp_digest = #{record.crypDigest,jdbcType=VARCHAR}, + information_ciphertext = #{record.informationCiphertext,jdbcType=VARCHAR} @@ -263,8 +372,23 @@ user_id = #{userId,jdbcType=VARCHAR}, - - receive_status = #{receiveStatus,jdbcType=INTEGER}, + + discount_display = #{discountDisplay,jdbcType=INTEGER}, + + + supplier_display = #{supplierDisplay,jdbcType=INTEGER}, + + + core_enterprise_display = #{coreEnterpriseDisplay,jdbcType=INTEGER}, + + + core_enterprise_receive_status = #{coreEnterpriseReceiveStatus,jdbcType=INTEGER}, + + + factoring_company_display = #{factoringCompanyDisplay,jdbcType=INTEGER}, + + + "factoring companies_receive_status" = #{factoringCompaniesReceiveStatus,jdbcType=INTEGER}, read_status = #{readStatus,jdbcType=INTEGER}, @@ -272,6 +396,18 @@ "download status" = #{downloadStatus,jdbcType=INTEGER}, + + create_time = #{createTime,jdbcType=TIMESTAMP}, + + + update_time = #{updateTime,jdbcType=TIMESTAMP}, + + + cryp_digest = #{crypDigest,jdbcType=VARCHAR}, + + + information_ciphertext = #{informationCiphertext,jdbcType=VARCHAR}, + where id = #{id,jdbcType=INTEGER} @@ -283,9 +419,18 @@ information_status = #{informationStatus,jdbcType=INTEGER}, signature_verification_status = #{signatureVerificationStatus,jdbcType=INTEGER}, user_id = #{userId,jdbcType=VARCHAR}, - receive_status = #{receiveStatus,jdbcType=INTEGER}, + discount_display = #{discountDisplay,jdbcType=INTEGER}, + supplier_display = #{supplierDisplay,jdbcType=INTEGER}, + core_enterprise_display = #{coreEnterpriseDisplay,jdbcType=INTEGER}, + core_enterprise_receive_status = #{coreEnterpriseReceiveStatus,jdbcType=INTEGER}, + factoring_company_display = #{factoringCompanyDisplay,jdbcType=INTEGER}, + "factoring companies_receive_status" = #{factoringCompaniesReceiveStatus,jdbcType=INTEGER}, read_status = #{readStatus,jdbcType=INTEGER}, - "download status" = #{downloadStatus,jdbcType=INTEGER} + "download status" = #{downloadStatus,jdbcType=INTEGER}, + create_time = #{createTime,jdbcType=TIMESTAMP}, + update_time = #{updateTime,jdbcType=TIMESTAMP}, + cryp_digest = #{crypDigest,jdbcType=VARCHAR}, + information_ciphertext = #{informationCiphertext,jdbcType=VARCHAR} where id = #{id,jdbcType=INTEGER} \ No newline at end of file