ycl-platform/src/main/java/com/ycl/bo/casePool/CurrentSitVo.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ycl-platform/src/main/java/com/ycl/bo/casePool/FilesPictureVo.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ycl-platform/src/main/java/com/ycl/bo/casePool/HandlePassVo.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ycl-platform/src/main/java/com/ycl/bo/casePool/ProblemProVo.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ycl-platform/src/main/java/com/ycl/entity/caseHandler/WorkflowConfigStep.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ycl-platform/src/main/java/com/ycl/mapper/caseHandler/WorkflowConfigStepMapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ycl-platform/src/main/java/com/ycl/service/caseHandler/IBaseCaseService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
ycl-platform/src/main/java/com/ycl/bo/casePool/CurrentSitVo.java
@@ -8,7 +8,7 @@ /** * <p> * 类说明 * 现场情况 类 * </p> * * @author mg ycl-platform/src/main/java/com/ycl/bo/casePool/FilesPictureVo.java
@@ -2,7 +2,7 @@ /** * <p> * 类说明 * 案卷图片 类 * </p> * * @author mg 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; } 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; } 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)); } } ycl-platform/src/main/java/com/ycl/entity/caseHandler/WorkflowConfigStep.java
New file @@ -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 ; } ycl-platform/src/main/java/com/ycl/mapper/caseHandler/WorkflowConfigStepMapper.java
New file @@ -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> { } 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); } 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; } }