|
|
@@ -6,10 +6,8 @@ import com.huaxu.model.AjaxMessage;
|
|
|
import com.huaxu.model.LoginUser;
|
|
|
import com.huaxu.model.Pagination;
|
|
|
import com.huaxu.model.ResultStatus;
|
|
|
-import com.huaxu.process.dto.TaskPorcessResult;
|
|
|
import com.huaxu.process.entity.ProcessDefinition;
|
|
|
import com.huaxu.process.service.WorkFlowService;
|
|
|
-import com.huaxu.process.utils.Action;
|
|
|
import com.huaxu.task.dto.PlanManageDto;
|
|
|
import com.huaxu.task.entity.PlanManage;
|
|
|
import com.huaxu.task.service.PlanManageService;
|
|
|
@@ -117,8 +115,11 @@ public class PlanManageController {
|
|
|
iPage = planManageService.selectPage(iPage, planManageDto);
|
|
|
Pagination<PlanManageDto> pages = new Pagination<>(iPage);
|
|
|
for(PlanManage plan : pages.getList()){
|
|
|
- //plan.setCompanyOrgName(orgInfoUtil.getOrgName(plan.getCompanyOrgId()));
|
|
|
- //plan.setDeptOrgName(orgInfoUtil.getOrgName(plan.getDeptOrgId()));
|
|
|
+ //查询并更新用户名称
|
|
|
+ plan.setCreateByName("");
|
|
|
+ plan.setUpdateByName("");
|
|
|
+ plan.setUserName("");
|
|
|
+ plan.setPlanUserName("");
|
|
|
}
|
|
|
return new AjaxMessage<>(ResultStatus.OK, pages);
|
|
|
}
|
|
|
@@ -138,11 +139,11 @@ public class PlanManageController {
|
|
|
@ApiParam(value = "计划ID", required = true) @RequestParam(required = false) Integer id){
|
|
|
LoginUser loginUser = UserUtil.getCurrentUser();
|
|
|
PlanManage planManage = planManageService.selectByPrimaryKey(id);
|
|
|
- //测试数据 test1 1 1
|
|
|
// ProcessDefinition processDefinition = workFlowService.findProcessDefinition(
|
|
|
// loginUser.getTenantId(),
|
|
|
// loginUser.getCompanyId(),
|
|
|
// planManage.getTaskType());
|
|
|
+ //流程查询, 测试参数:(test1 1 1)
|
|
|
ProcessDefinition processDefinition = workFlowService.findProcessDefinition(
|
|
|
"test1",
|
|
|
1,
|
wangbo