diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskCompleteApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskCompleteApi.java index 3d870994ee6a9b6454ce3bbfb7d126c5103cb9c8..36a03a864d6c607a08ea9f7f50cd77939b326d24 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskCompleteApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskCompleteApi.java @@ -19,7 +19,6 @@ import com.alibaba.fastjson.JSONObject; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.process.auth.PROCESS_BASE; -import neatlogic.framework.process.crossover.IProcessTaskCompleteApiCrossoverService; import neatlogic.framework.restful.annotation.Description; import neatlogic.framework.restful.annotation.Input; import neatlogic.framework.restful.annotation.OperationType; @@ -34,7 +33,7 @@ import javax.annotation.Resource; @Service @OperationType(type = OperationTypeEnum.UPDATE) @AuthAction(action = PROCESS_BASE.class) -public class ProcessTaskCompleteApi extends PrivateApiComponentBase implements IProcessTaskCompleteApiCrossoverService { +public class ProcessTaskCompleteApi extends PrivateApiComponentBase { @Resource private ProcessTaskService processTaskService; diff --git a/src/main/java/neatlogic/module/process/api/processtask/task/ProcessTaskStepTaskCompleteApi.java b/src/main/java/neatlogic/module/process/api/processtask/task/ProcessTaskStepTaskCompleteApi.java index 8b0ba3962929e3cbaf5dd69eb258df3770cc0dc1..b56c45af6f7b4bcd67b6370605c55eb358cbad3f 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/task/ProcessTaskStepTaskCompleteApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/task/ProcessTaskStepTaskCompleteApi.java @@ -15,15 +15,14 @@ along with this program. If not, see .*/ package neatlogic.module.process.api.processtask.task; +import com.alibaba.fastjson.JSONObject; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.process.auth.PROCESS_BASE; -import neatlogic.framework.process.crossover.IProcessTaskStepTaskCompleteApiCrossoverService; import neatlogic.framework.restful.annotation.*; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; import neatlogic.module.process.service.ProcessTaskStepTaskService; -import com.alibaba.fastjson.JSONObject; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -37,7 +36,7 @@ import javax.annotation.Resource; @Transactional @OperationType(type = OperationTypeEnum.OPERATE) @AuthAction(action = PROCESS_BASE.class) -public class ProcessTaskStepTaskCompleteApi extends PrivateApiComponentBase implements IProcessTaskStepTaskCompleteApiCrossoverService { +public class ProcessTaskStepTaskCompleteApi extends PrivateApiComponentBase { @Resource ProcessTaskStepTaskService processTaskStepTaskService; diff --git a/src/main/java/neatlogic/module/process/dao/mapper/catalog/CatalogMapper.java b/src/main/java/neatlogic/module/process/dao/mapper/catalog/CatalogMapper.java index e9d61b2fdcfb780babfbe09974dd7c2c5c985993..874df2365ed6647499fb97102da7ff21a63ddb55 100644 --- a/src/main/java/neatlogic/module/process/dao/mapper/catalog/CatalogMapper.java +++ b/src/main/java/neatlogic/module/process/dao/mapper/catalog/CatalogMapper.java @@ -111,7 +111,7 @@ public interface CatalogMapper extends ICatalogCrossoverMapper { String getParentUuidByUuid(String uuid); -// List getCatalogByName(String name); + List getCatalogByName(String name); List getCatalogListByUuidList(List uuidList); diff --git a/src/main/java/neatlogic/module/process/dao/mapper/catalog/CatalogMapper.xml b/src/main/java/neatlogic/module/process/dao/mapper/catalog/CatalogMapper.xml index e2f3838aa6430d2caa0e09801e62e9f97497248d..876e8886168ff67812bebcc295e535c6303a1ea8 100644 --- a/src/main/java/neatlogic/module/process/dao/mapper/catalog/CatalogMapper.xml +++ b/src/main/java/neatlogic/module/process/dao/mapper/catalog/CatalogMapper.xml @@ -323,7 +323,7 @@ - +