From 75c3c13b083e2d3ffa0aefdf5e1c117697a032e7 Mon Sep 17 00:00:00 2001 From: mg <maokecheng@163.com> Date: 星期五, 14 十月 2022 09:01:18 +0800 Subject: [PATCH] 处理流程问题。 --- ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java | 27 +++++++++++++++++++++++---- 1 files changed, 23 insertions(+), 4 deletions(-) diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java index da12065..e8f1740 100644 --- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java +++ b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java @@ -96,6 +96,10 @@ WorkflowConfigMapper workflowConfigMapper; @Resource ImageResourcesMapper imageResourcesMapper; + @Resource + DispatchInfoMapper dispatchInfoMapper; + @Resource + PartyInfoMapper partyInfoMapper; @Override @@ -235,20 +239,27 @@ public BaseCaseDetail baseCaseDetail(String code) { BaseCaseDetail bcd = new BaseCaseDetail(); //1.鏌ヨ妗堜欢鍩烘湰淇℃伅 - QueryWrapper<BaseCase> wrapper = new QueryWrapper<>(); - wrapper.lambda().eq(BaseCase::getCode, code); - BaseCase baseCase = baseCaseMapper.selectOne(wrapper); + Map map = new HashMap(); + map.put("code", code); + BaseCase baseCase = baseCaseMapper.selectCondMap(map); if (baseCase == null) { return null; } //鏌ヨ妗堜欢杩濊淇℃伅 if (baseCase.getCategory() == 1) { - Violations violations = violationsMapper.selectById(baseCase.getId()); + Map mapV = new HashMap(); + mapV.put("id", baseCase.getId()); + Violations violations = violationsMapper.selectCondMap(mapV); baseCase.setViolations(violations); } else { IllegalBuilding illegalBuilding = illegalBuildingMapper.selectById(baseCase.getId()); baseCase.setIllegalBuilding(illegalBuilding); } + //鑾峰彇璋冨害淇℃伅 + Map mapD = new HashMap(); + mapD.put("baseCaseId",baseCase.getId()); + DispatchInfo dispatchInfo = dispatchInfoMapper.selectCondMap(mapD); + baseCase.setDispatchInfo(dispatchInfo); bcd.setBaseCase(baseCase); //妗堜欢鐩稿叧淇℃伅 //2.鏌ヨ鍔炵悊缁忚繃淇℃伅 @@ -316,6 +327,14 @@ QueryWrapper<Investigation> wrapperI = new QueryWrapper<>(); wrapperI.lambda().eq(Investigation::getBaseCaseId, baseCase.getId()); Investigation investigation = investigationMapper.selectOne(wrapperI); + if (investigation != null && investigation.getPartyId() != null) { + //鑾峰彇褰撲簨浜轰俊鎭� + Map mapP = new HashMap(); + mapP.put("id", investigation.getPartyId()); + PartyInfo partyInfo = partyInfoMapper.selectCondMap(mapP); + //濉厖褰撲簨浜� + investigation.setPartyInfo(partyInfo); + } currentSitVo.setInvestigation(investigation); //璁剧疆鍛婄煡杩濇硶 QueryWrapper<Writ> wrapperW = new QueryWrapper<>(); -- Gitblit v1.8.0