From 74d11ef5c97095aceacba5c3d55ae7f883ad886b Mon Sep 17 00:00:00 2001 From: xiaoCJ <406612557@qq.com> Date: Mon, 23 Sep 2024 18:26:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E5=A2=9E=EF=BC=8C?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=BB=BA=E8=AE=AE=E4=B9=A6=EF=BC=8C=E7=94=9F?= =?UTF-8?q?=E6=88=90=E8=A7=84=E5=88=92=E6=8A=A5=E5=91=8A=EF=BC=8C=E9=A2=84?= =?UTF-8?q?=E8=A7=88=E7=AD=89=E6=8E=A5=E5=8F=A3=20=E7=BC=96=E5=86=99mysql?= =?UTF-8?q?=E5=BB=BA=E8=A1=A8=E8=AF=AD=E5=8F=A5=EF=BC=8C=E7=94=9F=E6=88=90?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E7=9A=84=E6=95=B0=E6=8D=AE=E5=BA=93=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=92=8C=E4=BB=A3=E7=A0=81=20=E6=8E=92=E6=9F=A5?= =?UTF-8?q?=E5=A4=A7=E8=B5=9B=E7=B3=BB=E7=BB=9F=E8=B4=A6=E5=8F=B7=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SynthesisPlanController.java | 7 ++++++- .../entity/SynthesisPlanClient.java | 2 +- .../service/impl/CaseServiceImpl.java | 15 ++++++++++++--- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/sztzjy/money_management/controller/SynthesisPlanController.java b/src/main/java/com/sztzjy/money_management/controller/SynthesisPlanController.java index 54e0e7a..dc28fde 100644 --- a/src/main/java/com/sztzjy/money_management/controller/SynthesisPlanController.java +++ b/src/main/java/com/sztzjy/money_management/controller/SynthesisPlanController.java @@ -365,7 +365,7 @@ public class SynthesisPlanController { return new ResultEntity<>(synthesisPlanClient); } - /* + /* 编辑建议书 * @author xcj * @Date 2024/8/15 */ @@ -373,6 +373,10 @@ public class SynthesisPlanController { @ApiOperation("编辑潜在客户信息/完善客户信息") @PostMapping("/updatePotentialCustomer") public ResultEntity updatePotentialCustomer(@RequestBody SynthesisPlanClient synthesisPlanClient) { + if(StringUtils.isBlank(synthesisPlanClient.getProposalNumber())){ + String number = "FPR"+IdUtil.simpleUUID(); + synthesisPlanClient.setProposalNumber(number); + } int i = synthesisPlanClientMapper.updateByPrimaryKeySelective(synthesisPlanClient); if (i > 0) { return new ResultEntity<>(HttpStatus.OK, "编辑成功！"); @@ -380,6 +384,7 @@ public class SynthesisPlanController { return new ResultEntity<>(HttpStatus.BAD_REQUEST, "系统！"); } + /* * @author xcj * @Date 2024/8/15 diff --git a/src/main/java/com/sztzjy/money_management/entity/SynthesisPlanClient.java b/src/main/java/com/sztzjy/money_management/entity/SynthesisPlanClient.java index affdedb..96036f6 100644 --- a/src/main/java/com/sztzjy/money_management/entity/SynthesisPlanClient.java +++ b/src/main/java/com/sztzjy/money_management/entity/SynthesisPlanClient.java @@ -77,7 +77,7 @@ public class SynthesisPlanClient { @ApiModelProperty("理财类型") private String manageMoneyMattersType; - @ApiModelProperty("提交状态") + @ApiModelProperty("提交状态 未提交/已审核/未审核") private String submitStatus; @ApiModelProperty("实训时长") 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 cb1896b..6b62218 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 @@ -210,8 +210,8 @@ public class CaseServiceImpl implements CaseService { return new ResultEntity<>(HttpStatus.INTERNAL_SERVER_ERROR, "系统错误，请联系管理员！"); } - String submitStatus = synthesisPlanClientList.get(0).getSubmitStatus(); - if (!submitStatus.equals("未提交")) { + SynthesisPlanClient synthesisPlanClient = synthesisPlanClientList.get(0); + if (synthesisPlanClient.getSubmitStatus() != null && !synthesisPlanClient.getSubmitStatus().equals("未提交")) { return new ResultEntity<>(HttpStatus.BAD_REQUEST, "提交后无法编辑！"); } return null; @@ -1698,13 +1698,22 @@ public class CaseServiceImpl implements CaseService { ComCaseExample example = new ComCaseExample(); example.createCriteria().andCaseidEqualTo(caseID); List comCases = comCaseMapper.selectByExample(example); + + SynthesisPlanClientExample example1 =new SynthesisPlanClientExample(); + example1.createCriteria().andUseridEqualTo(userId).andCaseidEqualTo(caseID); + List synthesisPlanClientList = synthesisPlanClientMapper.selectByExample(example1); + if (synthesisPlanClientList!=null && !synthesisPlanClientList.isEmpty()){ + SynthesisPlanClient synthesisPlanClient = synthesisPlanClientList.get(0); + synthesisPlanClient.setSubmitStatus("未提交"); + synthesisPlanClientMapper.updateByPrimaryKey(synthesisPlanClient); + } if (comCases == null || comCases.isEmpty()) { log.info("未查询到综合案例信息表"); return new ResultEntity<>(HttpStatus.INTERNAL_SERVER_ERROR, "服务器异常，请联系管理员！"); } ComCase comCase = comCases.get(0); - List typeList = Arrays.asList(comCase.getManageMoneyMattersType().split(", ")); + String[] typeList = comCase.getManageMoneyMattersType().split(","); for (String allType : typeList) { if (allType.equals("风险测评-风险指标")) { CaseRiskIndex caseRiskIndices = getCaseRiskIndices(caseID, userId, isAnswer);