From da38044a719ffcb7baff44d1b09b91c26460960d Mon Sep 17 00:00:00 2001 From: xiaoCJ <406612557@qq.com> Date: Mon, 24 Jun 2024 17:21:35 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=9E=E5=8A=A1?= =?UTF-8?q?=E8=AE=A4=E7=9F=A5=E5=BE=97=E5=88=86=E5=92=8C=E6=99=BA=E8=83=BD?= =?UTF-8?q?=E8=AF=84=E5=88=86=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/serviceImpl/TopicServiceImpl.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/sztzjy/fund_investment/service/serviceImpl/TopicServiceImpl.java b/src/main/java/com/sztzjy/fund_investment/service/serviceImpl/TopicServiceImpl.java index 35abd80..0f301e3 100644 --- a/src/main/java/com/sztzjy/fund_investment/service/serviceImpl/TopicServiceImpl.java +++ b/src/main/java/com/sztzjy/fund_investment/service/serviceImpl/TopicServiceImpl.java @@ -329,7 +329,16 @@ public class TopicServiceImpl implements TopicService { @Override public List getTopicRecord(String flowId, String module) { TopicRecordExample example = new TopicRecordExample(); - example.createCriteria().andModuleEqualTo(module).andFlowIdEqualTo(flowId); + TopicRecordExample.Criteria criteria = example.createCriteria(); + criteria.andFlowIdEqualTo(flowId); + if (module.equals("IPO")){ + Listlist =new ArrayList<>(); + list.add(Constant.IPOBK); + list.add(Constant.IPOTJ); + criteria.andModuleIn(list); + }else { + criteria.andModuleEqualTo(module); + } example.setOrderByClause("id"); List list = topicRecordMapper.selectByExample(example); return list; From ea306e52f9463059e2547bd083134e991ff9f911 Mon Sep 17 00:00:00 2001 From: xiaoCJ <406612557@qq.com> Date: Mon, 24 Jun 2024 17:28:48 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=9E=E5=8A=A1?= =?UTF-8?q?=E8=AE=A4=E7=9F=A5=E5=BE=97=E5=88=86=E5=92=8C=E6=99=BA=E8=83=BD?= =?UTF-8?q?=E8=AF=84=E5=88=86=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fund_investment/controller/TopicController.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/sztzjy/fund_investment/controller/TopicController.java b/src/main/java/com/sztzjy/fund_investment/controller/TopicController.java index 3d7c3c4..11236c8 100644 --- a/src/main/java/com/sztzjy/fund_investment/controller/TopicController.java +++ b/src/main/java/com/sztzjy/fund_investment/controller/TopicController.java @@ -2,11 +2,9 @@ package com.sztzjy.fund_investment.controller; import cn.hutool.core.util.IdUtil; import com.sztzjy.fund_investment.annotation.AnonymousAccess; -import com.sztzjy.fund_investment.config.Constant; import com.sztzjy.fund_investment.entity.*; import com.sztzjy.fund_investment.mapper.FlowMapper; import com.sztzjy.fund_investment.mapper.PerformanceScoreMapper; -import com.sztzjy.fund_investment.mapper.TopicsMapper; import com.sztzjy.fund_investment.mapper.UserMapper; import com.sztzjy.fund_investment.service.PerformanceScoreService; import com.sztzjy.fund_investment.service.TopicService; @@ -132,7 +130,11 @@ public class TopicController { PerformanceScoreExample performanceScoreExample = new PerformanceScoreExample(); performanceScoreExample.createCriteria().andFlowIdEqualTo(flowId); List performanceScores = performanceScoreMapper.selectByExample(performanceScoreExample); - return new ResultEntity<>(performanceScores.get(0)); + if (performanceScores.isEmpty()) { + return null; + } else { + return new ResultEntity<>(performanceScores.get(0)); + } } From 64ffe49eddb602898a0b90e1238351fe96573d6f Mon Sep 17 00:00:00 2001 From: whb <17803890193@163.com> Date: Wed, 26 Jun 2024 15:38:42 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=95=E8=B5=84?= =?UTF-8?q?=E6=84=8F=E5=90=91=E4=B9=A6=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ContractInvestmentController.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/sztzjy/fund_investment/controller/ContractInvestmentController.java b/src/main/java/com/sztzjy/fund_investment/controller/ContractInvestmentController.java index b8793d1..a5d2ee6 100644 --- a/src/main/java/com/sztzjy/fund_investment/controller/ContractInvestmentController.java +++ b/src/main/java/com/sztzjy/fund_investment/controller/ContractInvestmentController.java @@ -107,9 +107,9 @@ public class ContractInvestmentController { public ResultEntity totalInvestAmount(@ApiParam("流程ID") @RequestParam String flowId, @ApiParam("总投资额度") @RequestParam Double totalInvest) { //金额不低于100万 - if (1000000 > totalInvest) { - return new ResultEntity(HttpStatus.BAD_REQUEST, "金额不能低于100万"); - } +// if (1000000 > totalInvest) { +// return new ResultEntity(HttpStatus.BAD_REQUEST, "金额不能低于100万"); +// } //查询估值 FoundProjectExample foundProjectExample = new FoundProjectExample(); @@ -136,9 +136,9 @@ public class ContractInvestmentController { // 金额不低于100万，持股比例自动显示，为总投资额/估值，持股比例不低于5% double proportion = (totalInvest / v)*100; - if (0.05 > proportion) { - return new ResultEntity(HttpStatus.BAD_REQUEST, "持股比例不低于5%"); - } +// if (0.05 > proportion) { +// return new ResultEntity(HttpStatus.BAD_REQUEST, "持股比例不低于5%"); +// } ProfitManagementExample profitManagementExample = new ProfitManagementExample(); profitManagementExample.createCriteria().andFlowIdEqualTo(flowId);