From 1f4697e9dc775df7eb52ba2de556131172d0ad2a Mon Sep 17 00:00:00 2001 From: xiaoCJ <406612557@qq.com> Date: Sat, 12 Oct 2024 17:47:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=BC=E5=90=88=E8=A7=84?= =?UTF-8?q?=E5=88=92=E4=B8=8B=E6=96=B9=E5=B1=95=E7=A4=BA=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=20=E4=BF=AE=E6=94=B9=E6=8A=95=E8=B5=84?= =?UTF-8?q?=E8=A7=84=E5=88=92=E6=A1=88=E4=BE=8B=E8=A1=A8=EF=BC=8C=E4=BA=A7?= =?UTF-8?q?=E5=93=81=E9=80=89=E6=8B=A9=E8=A1=A8=EF=BC=8C=E5=AE=9E=E7=89=A9?= =?UTF-8?q?=E9=BB=84=E9=87=91=E7=AD=89=E4=BA=94=E5=BC=A0=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E8=A1=A8=E7=9A=84=E5=AD=A6=E7=94=9F=E6=8F=90=E4=BA=A4=E5=AE=9E?= =?UTF-8?q?=E8=AE=AD=EF=BC=8C=E6=96=B0=E5=A2=9E=EF=BC=8C=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E7=9A=84=E9=80=BB=E8=BE=91=20=E4=BF=AE=E6=94=B9=E7=BB=BC?= =?UTF-8?q?=E5=90=88=E8=A7=84=E5=88=92=E6=A1=88=E4=BE=8B=E8=A1=A8=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CaseController.java | 5 +- .../common/StatisticsController.java | 6 ++ .../service/impl/CaseServiceImpl.java | 77 +++++++++++-------- 3 files changed, 51 insertions(+), 37 deletions(-) diff --git a/src/main/java/com/sztzjy/money_management/controller/CaseController.java b/src/main/java/com/sztzjy/money_management/controller/CaseController.java index f2ff161..aae77ed 100644 --- a/src/main/java/com/sztzjy/money_management/controller/CaseController.java +++ b/src/main/java/com/sztzjy/money_management/controller/CaseController.java @@ -100,15 +100,14 @@ public class CaseController { @PostMapping("/ZHGHType") @ApiOperation("综合规划下方展示类型") @AnonymousAccess - private ResultEntity> editDropDown(@RequestParam String caseID) { + private ResultEntity editDropDown(@RequestParam String caseID) { ComCaseExample example = new ComCaseExample(); example.createCriteria().andCaseidEqualTo(caseID); List comCases = comCaseMapper.selectByExample(example); if (comCases.isEmpty()) { return null; } - List typeList = comCases.stream().map(ComCase::getManageMoneyMattersType).collect(Collectors.toList()); - return new ResultEntity<>(typeList); + return new ResultEntity<>(comCases.get(0).getManageMoneyMattersType()); } @AnonymousAccess diff --git a/src/main/java/com/sztzjy/money_management/controller/common/StatisticsController.java b/src/main/java/com/sztzjy/money_management/controller/common/StatisticsController.java index 2795ac3..30fa257 100644 --- a/src/main/java/com/sztzjy/money_management/controller/common/StatisticsController.java +++ b/src/main/java/com/sztzjy/money_management/controller/common/StatisticsController.java @@ -65,9 +65,15 @@ public class StatisticsController { stuStatisticsDto.setScore(scoreRank.getTotalScore()); //获取客户案例时长 Integer khanTime=stuTrainingMapper.selectTotalTrainingTimeByUserId(userId); + if (khanTime==null){ + khanTime = 0; + } stuStatisticsDto.setKhalTime(khanTime); //获取综合规划时间 Integer zhghTime=synthesisPlanClientMapper.getTotalUseTime(userId); + if (zhghTime==null){ + zhghTime = 0; + } stuStatisticsDto.setZhghTime(zhghTime); //获取考试中心时间 StuTheoryRecord stuTheoryRecord = stuTheoryRecordMapper.selectByPrimaryKey(userId); diff --git a/src/main/java/com/sztzjy/money_management/service/impl/CaseServiceImpl.java b/src/main/java/com/sztzjy/money_management/service/impl/CaseServiceImpl.java index 6512933..19a0f97 100644 --- a/src/main/java/com/sztzjy/money_management/service/impl/CaseServiceImpl.java +++ b/src/main/java/com/sztzjy/money_management/service/impl/CaseServiceImpl.java @@ -525,7 +525,6 @@ public class CaseServiceImpl implements CaseService { newCase.setCaseid(IdUtil.randomUUID()); newCase.setAddTime(new Date()); caseInfoMapper.insert(newCase); - //综合规划需要额外新增一张表 if (newCase.getModel().equals("综合规划")) { ComCase comCase = new ComCase(); @@ -540,6 +539,16 @@ public class CaseServiceImpl implements CaseService { //修改案例信息表 caseInfoMapper.updateByPrimaryKeySelective(newCase); + //修改实训类型 + if (newCase.getModel().equals("综合规划")) { + ComCaseExample example1 = new ComCaseExample(); + example1.createCriteria().andCaseidEqualTo(newCase.getCaseid()); + List comCases = comCaseMapper.selectByExample(example1); + ComCase comCase = comCases.get(0); + comCase.setManageMoneyMattersType(newCase.getManageMoneyMattersType()); + comCaseMapper.updateByPrimaryKeySelective(comCase); + } + //同时修改综合综合规划客户表 SynthesisPlanClient synthesisPlanClient = new SynthesisPlanClient(); synthesisPlanClient.setName(newCase.getCustomerName()); @@ -1309,7 +1318,39 @@ public class CaseServiceImpl implements CaseService { CaseInvestmentPlan investmentPlan = caseInvestmentPlanDto.getInvestmentPlan(); - //投资规划-产品选择表和其余五张表是一对多关系 + //提交功能 主表必定不为空，把老数据查出来删掉 + CaseInvestmentPlanExample example = new CaseInvestmentPlanExample(); + example.createCriteria().andCaseIdEqualTo(investmentPlan.getCaseId()).andUserIdEqualTo(investmentPlan.getUserId()).andIsAnswerEqualTo("学生答案"); + List caseInvestmentPlans = investmentPlanMapper.selectByExampleWithBLOBs(example); + + //删除老数据 + if (caseInvestmentPlans != null && !caseInvestmentPlans.isEmpty()) { + CaseInvestmentPlan caseInvestmentPlan = caseInvestmentPlans.get(0); + + CaseInvestmentPlanSelectExample planSelectExample = new CaseInvestmentPlanSelectExample(); + planSelectExample.createCriteria().andCaseInvestmentPlanIdEqualTo(caseInvestmentPlan.getCaseInvestmentPlanId()); + List investmentPlanSelectsDataList = caseInvestmentPlanSelectMapper.selectByExampleWithBLOBs(planSelectExample); + if (investmentPlanSelectsDataList != null && !investmentPlanSelectsDataList.isEmpty()) { + CaseInvestmentPlanSelect investmentPlanSelectsData = investmentPlanSelectsDataList.get(0); + String productSelectId = investmentPlanSelectsData.getProductSelectId(); + caseInvestmentPlanSelectMapper.deleteByPrimaryKey(productSelectId); + caseInvestmentPlanSelectMapper.deleteByPrimaryKey(productSelectId); + investmentPlanFundProductInfoMapper.deleteByPrimaryKey(productSelectId); + investmentPlanBankProductInfoMapper.deleteByPrimaryKey(productSelectId); + investmentPlanInsuranceProductInfoMapper.deleteByPrimaryKey(productSelectId); + investmentPlanP2PProductInfoMapper.deleteByPrimaryKey(productSelectId); + investmentPlanRealGoldProductInfoMapper.deleteByPrimaryKey(productSelectId); + } + investmentPlanMapper.deleteByPrimaryKey(caseInvestmentPlan.getCaseInvestmentPlanId()); + } + + //新增主表 + String newCaseInvestmentPlanId = IdUtil.randomUUID(); + investmentPlan.setCaseInvestmentPlanId(newCaseInvestmentPlanId); + investmentPlanMapper.insert(investmentPlan); + + + //投资规划-产品选择表和其余五张表是一对多关系 //下面都为新增操作 if (caseInvestmentPlanDto.getCaseInvestmentPlanSelectDtos() != null && !caseInvestmentPlanDto.getCaseInvestmentPlanSelectDtos().isEmpty()) { List investmentPlanSelects = caseInvestmentPlanDto.getCaseInvestmentPlanSelectDtos(); @@ -1319,38 +1360,6 @@ public class CaseServiceImpl implements CaseService { CaseInvestmentPlanSelect caseInvestmentPlanSelect = investmentPlanSelect.getCaseInvestmentPlanSelect(); //产品选择表 String selectId = IdUtil.randomUUID(); - //提交功能 主表必定不为空，把老数据查出来删掉 - CaseInvestmentPlanExample example = new CaseInvestmentPlanExample(); - example.createCriteria().andCaseIdEqualTo(investmentPlan.getCaseId()).andUserIdEqualTo(investmentPlan.getUserId()).andIsAnswerEqualTo("学生答案"); - List caseInvestmentPlans = investmentPlanMapper.selectByExampleWithBLOBs(example); - - //删除老数据 - if (caseInvestmentPlans != null) { - CaseInvestmentPlan caseInvestmentPlan = caseInvestmentPlans.get(0); - - CaseInvestmentPlanSelectExample planSelectExample = new CaseInvestmentPlanSelectExample(); - planSelectExample.createCriteria().andCaseInvestmentPlanIdEqualTo(caseInvestmentPlan.getCaseInvestmentPlanId()); - List investmentPlanSelectsDataList = caseInvestmentPlanSelectMapper.selectByExampleWithBLOBs(planSelectExample); - if (investmentPlanSelectsDataList != null) { - CaseInvestmentPlanSelect investmentPlanSelectsData = investmentPlanSelectsDataList.get(0); - String productSelectId = investmentPlanSelectsData.getProductSelectId(); - caseInvestmentPlanSelectMapper.deleteByPrimaryKey(productSelectId); - caseInvestmentPlanSelectMapper.deleteByPrimaryKey(productSelectId); - investmentPlanFundProductInfoMapper.deleteByPrimaryKey(productSelectId); - investmentPlanBankProductInfoMapper.deleteByPrimaryKey(productSelectId); - investmentPlanInsuranceProductInfoMapper.deleteByPrimaryKey(productSelectId); - investmentPlanP2PProductInfoMapper.deleteByPrimaryKey(productSelectId); - investmentPlanRealGoldProductInfoMapper.deleteByPrimaryKey(productSelectId); - } - investmentPlanMapper.deleteByPrimaryKey(caseInvestmentPlan.getCaseInvestmentPlanId()); - } - - //新增主表 - String newCaseInvestmentPlanId = IdUtil.randomUUID(); - investmentPlan.setCaseInvestmentPlanId(newCaseInvestmentPlanId); - investmentPlanMapper.insert(investmentPlan); - - //下面都为新增操作 if (caseInvestmentPlanSelect != null) { caseInvestmentPlanSelect.setProductSelectId(selectId); caseInvestmentPlanSelect.setCaseInvestmentPlanId(newCaseInvestmentPlanId);