diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepListApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepListApi.java index 0ba6f2ae4d5f656d87457e97886ff9d95cc6d6ab..c1d235960d4543c71399a585389f850553a9d963 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepListApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepListApi.java @@ -134,6 +134,7 @@ public class ProcessTaskStepListApi extends PrivateApiComponentBase { typeList.add(ProcessTaskOperationType.PROCESSTASK_TRANSFER.getValue()); typeList.add(ProcessTaskOperationType.STEP_REAPPROVAL.getValue()); typeList.add(ProcessTaskOperationType.PROCESSTASK_START.getValue()); + typeList.add(ProcessTaskOperationType.STEP_TRANSFER.getValue()); startProcessTaskStepVo.setCommentList( processTaskService.getProcessTaskStepReplyListByProcessTaskStepId(startProcessTaskStepVo.getId(), typeList)); //任务列表 @@ -162,6 +163,7 @@ public class ProcessTaskStepListApi extends PrivateApiComponentBase { typeList.add(ProcessTaskOperationType.PROCESSTASK_TRANSFER.getValue()); typeList.add(ProcessTaskOperationType.STEP_REAPPROVAL.getValue()); typeList.add(ProcessTaskOperationType.PROCESSTASK_START.getValue()); + typeList.add(ProcessTaskOperationType.STEP_TRANSFER.getValue()); processTaskStepVo.setCommentList( processTaskService.getProcessTaskStepReplyListByProcessTaskStepId(processTaskStepVo.getId(), typeList)); diff --git a/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskMapper.java b/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskMapper.java index e30aff40bf24ea421e26e17e9fa75f1b0ef9809a..fe0864eaa76c93414ff29a4ea39ca78314b956b6 100644 --- a/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskMapper.java +++ b/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskMapper.java @@ -18,6 +18,7 @@ package neatlogic.module.process.dao.mapper.processtask; import neatlogic.framework.dto.AuthenticationInfoVo; +import neatlogic.framework.dto.WorkAssignmentUnitVo; import neatlogic.framework.file.dto.FileVo; import neatlogic.framework.form.dto.AttributeDataVo; import neatlogic.framework.process.crossover.IProcessTaskCrossoverMapper; @@ -197,6 +198,8 @@ public interface ProcessTaskMapper extends IProcessTaskCrossoverMapper { List getFileIdListByContentId(Long contentId); + List getTargetListByContentId(Long contentId); + ProcessTaskStepContentVo getProcessTaskStepContentById(Long id); List getProcessTaskStepUserList(ProcessTaskStepUserVo processTaskStepUserVo); @@ -401,6 +404,8 @@ public interface ProcessTaskMapper extends IProcessTaskCrossoverMapper { int insertProcessTaskStepContent(ProcessTaskStepContentVo processTaskStepContentVo); + int insertProcessTaskStepContentTarget(@Param("contentId") Long contentId, @Param("type") String type, @Param("uuid") String uuid); + int insertProcessTaskOperationContent(ProcessTaskOperationContentVo processTaskOperationContentVo); int insertProcessTaskStepAudit(ProcessTaskStepAuditVo processTaskStepAuditVo); @@ -492,6 +497,8 @@ public interface ProcessTaskMapper extends IProcessTaskCrossoverMapper { int updateProcessTaskStepUserStatus(ProcessTaskStepUserVo processTaskStepUserVo); + int updateProcessTaskStepMajorUserUserTypeAndStatus(ProcessTaskStepUserVo processTaskStepUserVo); + int updateProcessTaskIsShow(ProcessTaskVo processTaskVo); int updateProcessTaskNeedScoreByIdList(@Param("idList") List idList, @Param("needScore") Integer needScore); diff --git a/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskMapper.xml b/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskMapper.xml index 1ca1b3becba57c8b4ff7cbb782ee3dc6eb574b23..a3720d206fd5bdc938eceb4e9cae1341727fe9f2 100644 --- a/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskMapper.xml +++ b/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskMapper.xml @@ -1325,6 +1325,14 @@ WHERE `content_id` = #{value} + +