From 3441ace2fd71ed09d31b33f8d4b1b9c276239ab7 Mon Sep 17 00:00:00 2001 From: mg <maokecheng@163.com> Date: 星期四, 29 九月 2022 15:19:29 +0800 Subject: [PATCH] 添加案件详情。 --- ycl-platform/src/main/java/com/ycl/bo/casePool/FilesPictureVo.java | 2 ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java | 8 ++ ycl-platform/src/main/java/com/ycl/entity/caseHandler/WorkflowConfigStep.java | 59 +++++++++++++++++++ ycl-platform/src/main/java/com/ycl/mapper/caseHandler/WorkflowConfigStepMapper.java | 15 +++++ ycl-platform/src/main/java/com/ycl/bo/casePool/CurrentSitVo.java | 2 ycl-platform/src/main/java/com/ycl/bo/casePool/HandlePassVo.java | 15 ++++ ycl-platform/src/main/java/com/ycl/bo/casePool/ProblemProVo.java | 14 ++++ ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java | 61 +++++++++++++++++++- ycl-platform/src/main/java/com/ycl/service/caseHandler/IBaseCaseService.java | 4 + 9 files changed, 172 insertions(+), 8 deletions(-) diff --git a/ycl-platform/src/main/java/com/ycl/bo/casePool/CurrentSitVo.java b/ycl-platform/src/main/java/com/ycl/bo/casePool/CurrentSitVo.java index 23265c6..7609027 100644 --- a/ycl-platform/src/main/java/com/ycl/bo/casePool/CurrentSitVo.java +++ b/ycl-platform/src/main/java/com/ycl/bo/casePool/CurrentSitVo.java @@ -8,7 +8,7 @@ /** * <p> - * 绫昏鏄� + * 鐜板満鎯呭喌 绫� * </p> * * @author mg diff --git a/ycl-platform/src/main/java/com/ycl/bo/casePool/FilesPictureVo.java b/ycl-platform/src/main/java/com/ycl/bo/casePool/FilesPictureVo.java index fbfa680..b087bd6 100644 --- a/ycl-platform/src/main/java/com/ycl/bo/casePool/FilesPictureVo.java +++ b/ycl-platform/src/main/java/com/ycl/bo/casePool/FilesPictureVo.java @@ -2,7 +2,7 @@ /** * <p> - * 绫昏鏄� + * 妗堝嵎鍥剧墖 绫� * </p> * * @author mg diff --git a/ycl-platform/src/main/java/com/ycl/bo/casePool/HandlePassVo.java b/ycl-platform/src/main/java/com/ycl/bo/casePool/HandlePassVo.java index 90b9253..0e6c662 100644 --- a/ycl-platform/src/main/java/com/ycl/bo/casePool/HandlePassVo.java +++ b/ycl-platform/src/main/java/com/ycl/bo/casePool/HandlePassVo.java @@ -1,12 +1,25 @@ package com.ycl.bo.casePool; +import com.ycl.entity.caseHandler.WorkflowConfigStep; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + /** * <p> - * 绫昏鏄� + * 鍔炵悊缁忚繃绫� * </p> * * @author mg * @since 2022-09-29 */ +@Data public class HandlePassVo { + + /** + * 娴佺▼鐜妭鍒楄〃 + */ + @ApiModelProperty(value = "娴佺▼鐜妭鍒楄〃",dataType = "ArrivalSituation") + private List<WorkflowConfigStep> workflowConfigSteps; } diff --git a/ycl-platform/src/main/java/com/ycl/bo/casePool/ProblemProVo.java b/ycl-platform/src/main/java/com/ycl/bo/casePool/ProblemProVo.java index 8aa5227..d6e4b0e 100644 --- a/ycl-platform/src/main/java/com/ycl/bo/casePool/ProblemProVo.java +++ b/ycl-platform/src/main/java/com/ycl/bo/casePool/ProblemProVo.java @@ -1,12 +1,24 @@ package com.ycl.bo.casePool; +import com.ycl.entity.caseHandler.WorkflowConfigStep; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + /** * <p> - * 绫昏鏄� + * 闂澶勭悊 绫� * </p> * * @author mg * @since 2022-09-29 */ +@Data public class ProblemProVo { + /** + * 娴佺▼鐜妭鍒楄〃 + */ + @ApiModelProperty(value = "娴佺▼鐜妭鍒楄〃",dataType = "ArrivalSituation") + private List<WorkflowConfigStep> workflowConfigSteps; } diff --git a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java index 0f17330..337cb17 100644 --- a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java +++ b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java @@ -183,4 +183,12 @@ return CommonResult.success(baseCaseService.baseCaseDetail(code)); } + @ApiOperation("浜哄伐璺緞妗堜欢鍥剧墖灞曠ず") + @GetMapping("/hand_work_case_images") + @ApiImplicitParams({ + @ApiImplicitParam(name = "type", value = "01 杩濊,02 杩濆缓", dataType = "Integer") + }) + public CommonResult queryCaseImages(@RequestParam Integer id,@RequestParam Integer type){ + return CommonResult.success(baseCaseService.listCaseImages(id,type)); + } } diff --git a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/WorkflowConfigStep.java b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/WorkflowConfigStep.java new file mode 100644 index 0000000..62bae4b --- /dev/null +++ b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/WorkflowConfigStep.java @@ -0,0 +1,59 @@ +package com.ycl.entity.caseHandler; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; + +/** + * <p> + * 澶勭疆娴佺▼鐜妭閰嶇疆 绫� + * </p> + * + * @author mg + * @since 2022-09-29 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("ums_workflow_config_step") +public class WorkflowConfigStep implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId(value = "id", type = IdType.AUTO) + @ApiModelProperty(value = "id",dataType = "Integer") + private Integer id; + + /** + * 澶勭疆娴佺▼閰嶇疆id + */ + @TableField(value = "workflow_config_id ") + @ApiModelProperty(value = "澶勭疆娴佺▼閰嶇疆id",dataType = "Integer") + private Integer workflowConfigId ; + + /** + * 鐜妭鍚嶇О + */ + @TableField("name") + @ApiModelProperty(value = "鐜妭鍚嶇О",dataType = "String") + private String name; + /** + * 瀵瑰簲瑙掕壊id + */ + @TableField(value = "role_id ") + @ApiModelProperty(value = "瀵瑰簲瑙掕壊id",dataType = "Integer") + private Integer roleId ; + /** + * 搴忓彿 + */ + @TableField(value = "seq ") + @ApiModelProperty(value = "搴忓彿",dataType = "Integer") + private Integer seq ; +} diff --git a/ycl-platform/src/main/java/com/ycl/mapper/caseHandler/WorkflowConfigStepMapper.java b/ycl-platform/src/main/java/com/ycl/mapper/caseHandler/WorkflowConfigStepMapper.java new file mode 100644 index 0000000..487a0fd --- /dev/null +++ b/ycl-platform/src/main/java/com/ycl/mapper/caseHandler/WorkflowConfigStepMapper.java @@ -0,0 +1,15 @@ +package com.ycl.mapper.caseHandler; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ycl.entity.caseHandler.WorkflowConfigStep; + +/** + * <p> + * 澶勭疆娴佺▼鐜妭閰嶇疆琛� Mapper 鎺ュ彛 + * </p> + * + * @author mg + * @since 2022-09-29 + */ +public interface WorkflowConfigStepMapper extends BaseMapper<WorkflowConfigStep> { +} diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/IBaseCaseService.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/IBaseCaseService.java index a6f36b9..a63356e 100644 --- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/IBaseCaseService.java +++ b/ycl-platform/src/main/java/com/ycl/service/caseHandler/IBaseCaseService.java @@ -7,6 +7,8 @@ import com.ycl.entity.caseHandler.BaseCase; import com.ycl.entity.caseHandler.BaseCaseDetail; +import java.util.ArrayList; + /** * <p> * 妗堜欢鍩烘湰淇℃伅 鏈嶅姟绫� @@ -44,4 +46,6 @@ String processEvent(Integer caseId); BaseCaseDetail baseCaseDetail(String code); + + ArrayList<String> listCaseImages(Integer id, Integer type); } 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 ff3c5dc..b1913e7 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 @@ -1,11 +1,10 @@ package com.ycl.service.caseHandler.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ycl.bo.casePool.CasePoolIllegalBuildingDO; -import com.ycl.bo.casePool.CasePoolViolationDO; -import com.ycl.bo.casePool.CurrentSitVo; +import com.ycl.bo.casePool.*; import com.ycl.dto.casePool.IllegalBuildingParam; import com.ycl.dto.casePool.ViolationParam; import com.ycl.entity.caseHandler.*; @@ -28,6 +27,7 @@ import java.time.Instant; import java.time.LocalDateTime; import java.time.ZoneOffset; +import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; @@ -79,6 +79,11 @@ InvestigationMapper investigationMapper; @Resource WritMapper writMapper; + + @Resource + WorkflowConfigStepMapper workflowConfigStepMapper; + @Resource + WorkflowConfigMapper workflowConfigMapper; @Override @@ -206,12 +211,40 @@ BaseCase baseCase = baseCaseMapper.selectOne(wrapper); bcd.setBaseCase(baseCase); //2.鏌ヨ鍔炵悊缁忚繃淇℃伅 + //2.1鏌ヨ澶勭疆娴佺▼閰嶇疆 + HandlePassVo handlePassVo = new HandlePassVo(); + QueryWrapper<WorkflowConfig> wrapperWc = new QueryWrapper<>(); + wrapperWc.lambda().eq(WorkflowConfig::getCode, "ddlc").or().eq(WorkflowConfig::getCode, "wtcllc"); + List<WorkflowConfig> wcs = workflowConfigMapper.selectList(wrapperWc); + Integer ddlcId=0,wtcllcId=0; + for (WorkflowConfig wc : wcs) { + if ("ddlc".equals(wc.getCode())) { + ddlcId = wc.getId(); + } + if ("wtcllc".equals(wc.getCode())) { + wtcllcId = wc.getId(); + } + } + //2.2鏌ヨ澶勭疆娴佺▼鐜妭閰嶇疆 + QueryWrapper<WorkflowConfigStep> wrapperWcs = new QueryWrapper<>(); + wrapperWcs.lambda().eq(WorkflowConfigStep::getWorkflowConfigId, ddlcId); + List<WorkflowConfigStep> listWcs = workflowConfigStepMapper.selectList(wrapperWcs); + //2.3璁剧疆璋冨害娴佺▼ + handlePassVo.setWorkflowConfigSteps(listWcs); + bcd.setHandlePassVo(handlePassVo); //3.鏌ヨ妗堝嵎鍥剧墖淇℃伅 //4.鏌ヨ闂澶勭悊淇℃伅 + ProblemProVo problemProVo = new ProblemProVo(); + //4.2鏌ヨ澶勭疆娴佺▼鐜妭閰嶇疆 + QueryWrapper<WorkflowConfigStep> wrapperWcsPp = new QueryWrapper<>(); + wrapperWcsPp.lambda().eq(WorkflowConfigStep::getWorkflowConfigId, wtcllcId); + List<WorkflowConfigStep> listWcsPp = workflowConfigStepMapper.selectList(wrapperWcsPp); + //4.3璁剧疆璋冨害娴佺▼ + problemProVo.setWorkflowConfigSteps(listWcsPp); + bcd.setProblemProVo(problemProVo); //5.鏌ヨ鐜板満鎯呭喌淇℃伅 CurrentSitVo currentSitVo = new CurrentSitVo(); QueryWrapper<ArrivalSituation> wrapperAs = new QueryWrapper<>(); - wrapperAs.lambda().eq(ArrivalSituation::getBaseCaseId, baseCase.getId()); //璁剧疆鍒拌揪鐜板満鎯呭喌 ArrivalSituation as = arrivalSituationMapper.selectOne(wrapperAs); currentSitVo.setArrivalSituation(as); @@ -228,4 +261,24 @@ bcd.setCurrentSitVo(currentSitVo); return bcd; } + + @Override + public ArrayList<String> listCaseImages(Integer id, Integer type) { + Integer illegalBuildingType = 02; + ArrayList<String> caseImages = new ArrayList<>(); + caseImages.add(investigationMapper + .selectOne(new LambdaQueryWrapper<Investigation>() + .eq(Investigation::getBaseCaseId, id)).getPic()); + caseImages.add(arrivalSituationMapper + .selectOne(new LambdaQueryWrapper<ArrivalSituation>() + .eq(ArrivalSituation::getBaseCaseId, id)).getSituationPic()); + if (type == illegalBuildingType) { + Writ writ = writMapper.selectOne(new LambdaQueryWrapper<Writ>().eq(Writ::getBaseCaseId, id)); + caseImages.add(writ.getWritPic()); + caseImages.add(writ.getOriginalPic()); + caseImages.add(writ.getOtherPic()); + caseImages.add(writ.getRectifiedPic()); + } + return caseImages; + } } \ No newline at end of file -- Gitblit v1.8.0