Commit 9ef8564f authored by 张森's avatar 张森

下拉API修改

parent 3144c27b
...@@ -9,6 +9,7 @@ import com.yeejoin.amos.fas.business.service.intfc.IDictService; ...@@ -9,6 +9,7 @@ import com.yeejoin.amos.fas.business.service.intfc.IDictService;
import com.yeejoin.amos.fas.business.service.intfc.IEmergencyTaskService; import com.yeejoin.amos.fas.business.service.intfc.IEmergencyTaskService;
import com.yeejoin.amos.fas.business.service.intfc.IPlanStepService; import com.yeejoin.amos.fas.business.service.intfc.IPlanStepService;
import com.yeejoin.amos.fas.business.vo.EmergencyRelationVo; import com.yeejoin.amos.fas.business.vo.EmergencyRelationVo;
import com.yeejoin.amos.fas.business.vo.PlanStepJsonVO;
import com.yeejoin.amos.fas.config.Permission; import com.yeejoin.amos.fas.config.Permission;
import com.yeejoin.amos.fas.core.common.request.CommonPageable; import com.yeejoin.amos.fas.core.common.request.CommonPageable;
import com.yeejoin.amos.fas.core.util.CommonResponse; import com.yeejoin.amos.fas.core.util.CommonResponse;
...@@ -169,9 +170,8 @@ public class EmergencyTaskController extends BaseController{ ...@@ -169,9 +170,8 @@ public class EmergencyTaskController extends BaseController{
@ApiOperation(httpMethod = "GET",value = "查询流程节点", notes = "查询流程节点") @ApiOperation(httpMethod = "GET",value = "查询流程节点", notes = "查询流程节点")
@GetMapping(value = "/findStep") @GetMapping(value = "/findStep")
public CommonResponse findStep(@RequestParam String planType){ public ResponseModel<List<PlanStepJsonVO>> findStep(@RequestParam String planType){
planStepService.getPlanStepByParam(planType); return CommonResponseUtil2.success(planStepService.getPlanStepByParam(planType));
return CommonResponseUtil.success(planStepService.getPlanStepByParam(planType));
} }
@Permission @Permission
......
...@@ -3,6 +3,7 @@ package com.yeejoin.amos.fas.business.dao.mapper; ...@@ -3,6 +3,7 @@ package com.yeejoin.amos.fas.business.dao.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.fas.dao.entity.EmergencyTaskRole; import com.yeejoin.amos.fas.dao.entity.EmergencyTaskRole;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
...@@ -29,5 +30,5 @@ public interface EmergencyTaskRoleMapper extends BaseMapper<EmergencyTaskRole> { ...@@ -29,5 +30,5 @@ public interface EmergencyTaskRoleMapper extends BaseMapper<EmergencyTaskRole> {
List<EmergencyTaskRole> selectList(); List<EmergencyTaskRole> selectList();
String getPlanStepInfoByType(String planType); String getPlanStepInfoByType(@Param("planType") String planType);
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment