去掉保存,改用通用接口
This commit is contained in:
-13
@@ -53,19 +53,6 @@ public class ProcessMarketStandardReleaseController extends JeroController<Proce
|
|||||||
return Result.OK();
|
return Result.OK();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 保存到草稿
|
|
||||||
* @param processInfoVO
|
|
||||||
*/
|
|
||||||
@AutoLog(value = "市场法规清单发布流程-保存")
|
|
||||||
@ApiOperation(value="市场法规清单发布流程-保存", notes="市场法规清单发布流程-保存")
|
|
||||||
@PostMapping("/save")
|
|
||||||
public Result<?> save(@Validated @RequestBody ProcessInfoVO<ProcessMarketStandardRelease> processInfoVO) {
|
|
||||||
sccService.saveToDraft(processInfoVO);
|
|
||||||
return Result.OK();
|
|
||||||
}
|
|
||||||
|
|
||||||
@AutoLog(value = "市场法规清单发布流程-同意")
|
@AutoLog(value = "市场法规清单发布流程-同意")
|
||||||
@ApiOperation(value = "市场法规清单发布流程-同意", notes = "市场法规清单发布流程-同意")
|
@ApiOperation(value = "市场法规清单发布流程-同意", notes = "市场法规清单发布流程-同意")
|
||||||
@PostMapping("/agree")
|
@PostMapping("/agree")
|
||||||
|
|||||||
-2
@@ -15,8 +15,6 @@ public interface IProcessMarketStandardReleaseService extends IService<ProcessMa
|
|||||||
|
|
||||||
void startProcess(ProcessInfoVO<ProcessMarketStandardRelease> processInfoVO);
|
void startProcess(ProcessInfoVO<ProcessMarketStandardRelease> processInfoVO);
|
||||||
|
|
||||||
void saveToDraft(ProcessInfoVO<ProcessMarketStandardRelease> processInfoVO);
|
|
||||||
|
|
||||||
void approveTask(ProcessInfoVO<ProcessMarketStandardRelease> processInfoVO, boolean b);
|
void approveTask(ProcessInfoVO<ProcessMarketStandardRelease> processInfoVO, boolean b);
|
||||||
|
|
||||||
ProcessInfoVO<ProcessMarketStandardRelease> getHandleData(String taskId);
|
ProcessInfoVO<ProcessMarketStandardRelease> getHandleData(String taskId);
|
||||||
|
|||||||
-17
@@ -34,7 +34,6 @@ import org.activiti.engine.RuntimeService;
|
|||||||
import org.activiti.engine.TaskService;
|
import org.activiti.engine.TaskService;
|
||||||
import org.activiti.engine.delegate.DelegateExecution;
|
import org.activiti.engine.delegate.DelegateExecution;
|
||||||
import org.activiti.engine.runtime.ProcessInstance;
|
import org.activiti.engine.runtime.ProcessInstance;
|
||||||
import org.activiti.engine.task.DelegationState;
|
|
||||||
import org.activiti.engine.task.Task;
|
import org.activiti.engine.task.Task;
|
||||||
import org.apache.commons.collections4.CollectionUtils;
|
import org.apache.commons.collections4.CollectionUtils;
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
@@ -145,22 +144,6 @@ public class ProcessMarketStandardReleaseServiceImpl extends ServiceImpl<Process
|
|||||||
return map;
|
return map;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
@Transactional(rollbackFor = JeroBootException.class)
|
|
||||||
public void saveToDraft(ProcessInfoVO<ProcessMarketStandardRelease> processInfoVO) {
|
|
||||||
BasicTaskInfoDTO basicTaskInfoDTO = processInfoVO.getBasicTaskInfoDTO();
|
|
||||||
if(Objects.isNull(basicTaskInfoDTO) || StringUtils.isBlank(basicTaskInfoDTO.getTaskId())){
|
|
||||||
// 验证是否已发起流程
|
|
||||||
checkProcessStatus(processInfoVO.getBusinessInfoDTO().getManifestId());
|
|
||||||
}
|
|
||||||
// 流程信息
|
|
||||||
BasicProcessInfoDTO basicProcessInfoDTO = processInfoVO.getBasicProcessInfoDTO();
|
|
||||||
// 流程类型
|
|
||||||
basicProcessInfoDTO.setProcessType(ProcessTypeEnum.MARKET_STANDARD_PUBLISH.getValue());
|
|
||||||
|
|
||||||
processHandleService.saveToDraft(processInfoVO, UserUtils.getUserId());
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 第一个节点业务数据处理
|
* 第一个节点业务数据处理
|
||||||
* @param processInfoVO
|
* @param processInfoVO
|
||||||
|
|||||||
-13
@@ -51,19 +51,6 @@ public class ProcessNewStandardImportController extends JeroController<ProcessNe
|
|||||||
return Result.OK();
|
return Result.OK();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 保存到草稿
|
|
||||||
* @param processInfoVO
|
|
||||||
*/
|
|
||||||
@AutoLog(value = "新法规导入流程-保存")
|
|
||||||
@ApiOperation(value="新法规导入流程-保存", notes="新法规导入流程-保存")
|
|
||||||
@PostMapping("/save")
|
|
||||||
public Result<?> save(@Validated @RequestBody ProcessInfoVO<ProcessNewStandardImport> processInfoVO) {
|
|
||||||
sccService.saveToDraft(processInfoVO);
|
|
||||||
return Result.OK();
|
|
||||||
}
|
|
||||||
|
|
||||||
@AutoLog(value = "新法规导入流程-同意")
|
@AutoLog(value = "新法规导入流程-同意")
|
||||||
@ApiOperation(value = "新法规导入流程-同意", notes = "新法规导入流程-同意")
|
@ApiOperation(value = "新法规导入流程-同意", notes = "新法规导入流程-同意")
|
||||||
@PostMapping("/agree")
|
@PostMapping("/agree")
|
||||||
|
|||||||
-2
@@ -16,8 +16,6 @@ public interface IProcessNewStandardImportService extends IService<ProcessNewSta
|
|||||||
|
|
||||||
void startProcess(ProcessInfoVO<ProcessNewStandardImport> processInfoVO);
|
void startProcess(ProcessInfoVO<ProcessNewStandardImport> processInfoVO);
|
||||||
|
|
||||||
void saveToDraft(ProcessInfoVO<ProcessNewStandardImport> processInfoVO);
|
|
||||||
|
|
||||||
void approveTask(ProcessInfoVO<ProcessNewStandardImport> processInfoVO, boolean b);
|
void approveTask(ProcessInfoVO<ProcessNewStandardImport> processInfoVO, boolean b);
|
||||||
|
|
||||||
ProcessInfoVO<ProcessNewStandardImport> getHandleData(String taskId);
|
ProcessInfoVO<ProcessNewStandardImport> getHandleData(String taskId);
|
||||||
|
|||||||
-16
@@ -18,7 +18,6 @@ import com.jero.modules.activiti.process.fb.dto.BasicProcessInfoDTO;
|
|||||||
import com.jero.modules.activiti.process.fb.dto.BasicTaskInfoDTO;
|
import com.jero.modules.activiti.process.fb.dto.BasicTaskInfoDTO;
|
||||||
import com.jero.modules.activiti.process.fb.service.IProcessHandleService;
|
import com.jero.modules.activiti.process.fb.service.IProcessHandleService;
|
||||||
import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO;
|
import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO;
|
||||||
import com.jero.modules.activiti.process.ni.common.ProcessNewStandardImportConstants;
|
|
||||||
import com.jero.modules.activiti.process.ni.entity.ProcessNewStandardImport;
|
import com.jero.modules.activiti.process.ni.entity.ProcessNewStandardImport;
|
||||||
import com.jero.modules.activiti.process.ni.mapper.ProcessNewStandardImportMapper;
|
import com.jero.modules.activiti.process.ni.mapper.ProcessNewStandardImportMapper;
|
||||||
import com.jero.modules.activiti.process.ni.service.IProcessNewStandardImportService;
|
import com.jero.modules.activiti.process.ni.service.IProcessNewStandardImportService;
|
||||||
@@ -28,7 +27,6 @@ import com.jero.modules.activiti.service.ProcessNodeLinkService;
|
|||||||
import com.jero.modules.sys.utils.UserUtils;
|
import com.jero.modules.sys.utils.UserUtils;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.activiti.engine.ProcessEngine;
|
import org.activiti.engine.ProcessEngine;
|
||||||
import org.activiti.engine.ProcessEngines;
|
|
||||||
import org.activiti.engine.RuntimeService;
|
import org.activiti.engine.RuntimeService;
|
||||||
import org.activiti.engine.TaskService;
|
import org.activiti.engine.TaskService;
|
||||||
import org.activiti.engine.delegate.DelegateExecution;
|
import org.activiti.engine.delegate.DelegateExecution;
|
||||||
@@ -146,20 +144,6 @@ public class ProcessNewStandardImportServiceImpl extends ServiceImpl<ProcessNewS
|
|||||||
return map;
|
return map;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
@Transactional(rollbackFor = JeroBootException.class)
|
|
||||||
public void saveToDraft(ProcessInfoVO<ProcessNewStandardImport> processInfoVO) {
|
|
||||||
ProcessNewStandardImport processNewStandardImport = processInfoVO.getBusinessInfoDTO();
|
|
||||||
if(!Objects.isNull(processNewStandardImport)){
|
|
||||||
saveOrUpdate(processNewStandardImport);
|
|
||||||
}
|
|
||||||
// 流程信息
|
|
||||||
BasicProcessInfoDTO basicProcessInfoDTO = processInfoVO.getBasicProcessInfoDTO();
|
|
||||||
// 流程类型
|
|
||||||
basicProcessInfoDTO.setProcessType(ProcessTypeEnum.NEW_STANDARD_IMPORT.getValue());
|
|
||||||
processHandleService.saveToDraft(processInfoVO, UserUtils.getUserId());
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 第一个节点业务数据处理
|
* 第一个节点业务数据处理
|
||||||
* @param processInfoVO
|
* @param processInfoVO
|
||||||
|
|||||||
Reference in New Issue
Block a user