diff --git a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/controller/SkyeyeClassFlowableController.java b/skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/controller/SkyeyeClassFlowableController.java index 529b7f8f..559ddaca 100644 --- a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/controller/SkyeyeClassFlowableController.java +++ b/skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/controller/SkyeyeClassFlowableController.java @@ -46,7 +46,7 @@ public class SkyeyeClassFlowableController { } /** - * 获取工作流业务对象服务 + * 获取工作流业务对象服务---common层使用 * * @param inputObject 入参以及用户信息等获取对象 * @param outputObject 出参以及提示信息的返回值对象 @@ -61,12 +61,12 @@ public class SkyeyeClassFlowableController { } /** - * 获取所有工作流业务对象服务列表 + * 获取所有工作流业务对象服务列表---前台使用 * * @param inputObject 入参以及用户信息等获取对象 * @param outputObject 出参以及提示信息的返回值对象 */ - @ApiOperation(id = "queryClassFlowableDataList", value = "获取所有工作流业务对象服务列表", method = "GET", allUse = "2") + @ApiOperation(id = "queryClassFlowableDataList", value = "获取所有工作流业务对象服务列表", method = "POST", allUse = "2") @ApiImplicitParams(classBean = CommonPageInfo.class) @RequestMapping("/post/SkyeyeClassFlowableController/queryClassFlowableDataList") public void queryClassFlowableDataList(InputObject inputObject, OutputObject outputObject) { diff --git a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/dao/SkyeyeClassFlowableDao.java b/skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/dao/SkyeyeClassFlowableDao.java index 23008b65..f71b4cc5 100644 --- a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/dao/SkyeyeClassFlowableDao.java +++ b/skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/dao/SkyeyeClassFlowableDao.java @@ -4,7 +4,7 @@ package com.skyeye.eve.dao; -import com.github.pagehelper.Page; +import com.skyeye.common.entity.CommonPageInfo; import com.skyeye.eve.entity.classflowable.SkyeyeClassFlowableLinkMation; import java.util.List; @@ -19,6 +19,6 @@ import java.util.List; */ public interface SkyeyeClassFlowableDao extends SkyeyeBaseMapper { - List queryClassFlowableDataList(Page pages); + List queryClassFlowableDataList(CommonPageInfo commonPageInfo); } diff --git a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/service/impl/SkyeyeClassFlowableServiceImpl.java b/skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/service/impl/SkyeyeClassFlowableServiceImpl.java index 76631c80..562e45df 100644 --- a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/service/impl/SkyeyeClassFlowableServiceImpl.java +++ b/skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/service/impl/SkyeyeClassFlowableServiceImpl.java @@ -113,7 +113,7 @@ public class SkyeyeClassFlowableServiceImpl extends ServiceImpl beans = skyeyeClassFlowableDao.queryClassFlowableDataList(pages); + List beans = skyeyeClassFlowableDao.queryClassFlowableDataList(commonPageInfo); outputObject.setBeans(beans); outputObject.settotal(pages.getTotal()); } diff --git a/skyeye-promote/skyeye-common/src/main/resources/mapper/common/SkyeyeClassFlowableMapper.xml b/skyeye-promote/skyeye-common/src/main/resources/mapper/common/SkyeyeClassFlowableMapper.xml index 6dc67019..5ee66c34 100644 --- a/skyeye-promote/skyeye-common/src/main/resources/mapper/common/SkyeyeClassFlowableMapper.xml +++ b/skyeye-promote/skyeye-common/src/main/resources/mapper/common/SkyeyeClassFlowableMapper.xml @@ -15,7 +15,7 @@ ${sqlExtract} - AND a.serviceName like '%${keyword}%' + AND a.service_name like '%${keyword}%' ORDER BY a.create_time DESC