fix(任务转交): 返回字段
This commit is contained in:
+3
@@ -26,6 +26,9 @@ public class LawsProcessDB {
|
|||||||
@Dict(dicCode = "prc_type")
|
@Dict(dicCode = "prc_type")
|
||||||
@ApiModelProperty(value="流程类型")
|
@ApiModelProperty(value="流程类型")
|
||||||
private Integer prcType;
|
private Integer prcType;
|
||||||
|
/**项目id*/
|
||||||
|
@ApiModelProperty(value="项目id")
|
||||||
|
private String projectId;
|
||||||
/**流程名称*/
|
/**流程名称*/
|
||||||
@ApiModelProperty(value="流程名称")
|
@ApiModelProperty(value="流程名称")
|
||||||
private String prcName;
|
private String prcName;
|
||||||
|
|||||||
+1
@@ -89,6 +89,7 @@
|
|||||||
task_id,
|
task_id,
|
||||||
prc_num,
|
prc_num,
|
||||||
prc_type,
|
prc_type,
|
||||||
|
pa.project_id AS project_id,
|
||||||
pa.prc_name,
|
pa.prc_name,
|
||||||
task_name,
|
task_name,
|
||||||
user_id AS user,
|
user_id AS user,
|
||||||
|
|||||||
+11
-1
@@ -8,6 +8,8 @@ import com.jero.common.constant.enums.YesOrNoEnum;
|
|||||||
import com.jero.common.system.vo.LoginUser;
|
import com.jero.common.system.vo.LoginUser;
|
||||||
import com.jero.modules.activiti.enums.FinishFlagEnum;
|
import com.jero.modules.activiti.enums.FinishFlagEnum;
|
||||||
import com.jero.modules.activiti.enums.ProcessStatusEnum;
|
import com.jero.modules.activiti.enums.ProcessStatusEnum;
|
||||||
|
import com.jero.modules.activiti.enums.ProcessTypeEnum;
|
||||||
|
import com.jero.modules.activiti.process.fb.service.IProcessFbStandardConsultationService;
|
||||||
import com.jero.modules.activiti.process.fb.service.IProcessHandleService;
|
import com.jero.modules.activiti.process.fb.service.IProcessHandleService;
|
||||||
import com.jero.modules.compare.entity.SarFileCompareInfo;
|
import com.jero.modules.compare.entity.SarFileCompareInfo;
|
||||||
import com.jero.modules.compare.service.ISarFileCompareInfoService;
|
import com.jero.modules.compare.service.ISarFileCompareInfoService;
|
||||||
@@ -52,6 +54,7 @@ public class LawsTaskTransferServiceImpl implements ILawsTaskTransferService {
|
|||||||
private final ILawsCustomCompareInfoService lawsCustomCompareInfoService;
|
private final ILawsCustomCompareInfoService lawsCustomCompareInfoService;
|
||||||
private final ISysUserService sysUserService;
|
private final ISysUserService sysUserService;
|
||||||
private final IProcessHandleService processHandleService;
|
private final IProcessHandleService processHandleService;
|
||||||
|
private final IProcessFbStandardConsultationService processFbStandardConsultationService;
|
||||||
|
|
||||||
public LawsTaskTransferServiceImpl(LawsTaskTransferMapper lawsTaskTransferMapper,
|
public LawsTaskTransferServiceImpl(LawsTaskTransferMapper lawsTaskTransferMapper,
|
||||||
EnterpriseStandardPlanService enterpriseStandardPlanService,
|
EnterpriseStandardPlanService enterpriseStandardPlanService,
|
||||||
@@ -59,7 +62,8 @@ public class LawsTaskTransferServiceImpl implements ILawsTaskTransferService {
|
|||||||
ISarFileCompareInfoService sarFileCompareInfoService,
|
ISarFileCompareInfoService sarFileCompareInfoService,
|
||||||
ILawsCustomCompareInfoService lawsCustomCompareInfoService,
|
ILawsCustomCompareInfoService lawsCustomCompareInfoService,
|
||||||
ISysUserService sysUserService,
|
ISysUserService sysUserService,
|
||||||
IProcessHandleService processHandleService) {
|
IProcessHandleService processHandleService,
|
||||||
|
IProcessFbStandardConsultationService processFbStandardConsultationService) {
|
||||||
this.lawsTaskTransferMapper = lawsTaskTransferMapper;
|
this.lawsTaskTransferMapper = lawsTaskTransferMapper;
|
||||||
this.enterpriseStandardPlanService = enterpriseStandardPlanService;
|
this.enterpriseStandardPlanService = enterpriseStandardPlanService;
|
||||||
this.sarFileSplitInfoService = sarFileSplitInfoService;
|
this.sarFileSplitInfoService = sarFileSplitInfoService;
|
||||||
@@ -67,6 +71,7 @@ public class LawsTaskTransferServiceImpl implements ILawsTaskTransferService {
|
|||||||
this.lawsCustomCompareInfoService = lawsCustomCompareInfoService;
|
this.lawsCustomCompareInfoService = lawsCustomCompareInfoService;
|
||||||
this.sysUserService = sysUserService;
|
this.sysUserService = sysUserService;
|
||||||
this.processHandleService = processHandleService;
|
this.processHandleService = processHandleService;
|
||||||
|
this.processFbStandardConsultationService = processFbStandardConsultationService;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -116,6 +121,11 @@ public class LawsTaskTransferServiceImpl implements ILawsTaskTransferService {
|
|||||||
for (LawsProcessDB lawsProcessDb : lawsProcessDBList) {
|
for (LawsProcessDB lawsProcessDb : lawsProcessDBList) {
|
||||||
String taskId = lawsProcessDb.getTaskId();
|
String taskId = lawsProcessDb.getTaskId();
|
||||||
String toUserId = lawsProcessDb.getTransferUser();
|
String toUserId = lawsProcessDb.getTransferUser();
|
||||||
|
// 征求意见流程特殊处理
|
||||||
|
if (ProcessTypeEnum.FB_STANDARD_CONSULTATION.getValue().equals(lawsProcessDb.getPrcType())) {
|
||||||
|
processFbStandardConsultationService.transfer(taskId, toUserId, lawsProcessDb.getProjectId());
|
||||||
|
continue;
|
||||||
|
}
|
||||||
processHandleService.transfer(taskId, toUserId);
|
processHandleService.transfer(taskId, toUserId);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user