ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(标准征求意见流程): 转交问题修复

Browse Source
This commit is contained in:
yjz
2024-01-12 15:32:41 +08:00
parent c8c0858f57
commit b9c0003c9c
4 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/common/entity/TransferVO.java
+2
View File
@@ -12,4 +12,6 @@ public class TransferVO {
String taskId; String taskId;
String userId; String userId;
String projectId;
} }
laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbStandardConsultationController.java
+1 -1
View File
@@ -92,7 +92,7 @@ public class ProcessFbStandardConsultationController extends JeroController<Proc
@ApiOperation(value="标准征求意见流程-转办", notes="标准征求意见流程-转办") @ApiOperation(value="标准征求意见流程-转办", notes="标准征求意见流程-转办")
@PostMapping(value = "/transfer") @PostMapping(value = "/transfer")
public Result<T> transfer(@RequestBody TransferVO transferVO) { public Result<T> transfer(@RequestBody TransferVO transferVO) {
processFbStandardConsultationService.transfer(transferVO.getTaskId(), transferVO.getUserId()); processFbStandardConsultationService.transfer(transferVO.getTaskId(), transferVO.getUserId(), transferVO.getProjectId());
return Result.OK(); return Result.OK();
} }
} }
laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessFbStandardConsultationService.java
+1 -1
View File
@@ -49,7 +49,7 @@ public interface IProcessFbStandardConsultationService extends IService<ProcessF
* @Date: 2023/11/16 15:11 * @Date: 2023/11/16 15:11
* @Description: 转办 * @Description: 转办
**/ **/
void transfer(String taskId, String toUserId); void transfer(String taskId, String toUserId, String projectId);
/** /**
* @Author: liao * @Author: liao
laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java
+23 -1
View File
@@ -308,8 +308,30 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
* @Description: 转办 * @Description: 转办
**/ **/
@Override @Override
public void transfer(String taskId, String toUserId) { public void transfer(String taskId, String toUserId, String projectId) {
processHandleService.transfer(taskId, toUserId); processHandleService.transfer(taskId, toUserId);
// 模块负责人汇总填写意见
Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
String taskDefinitionKey = task.getTaskDefinitionKey();
// 设计工程师填写征求意见
if (ConsultationTaskKey.DESIGN_ENGINEER_1.equals(taskDefinitionKey)
|| ConsultationTaskKey.DESIGN_ENGINEER_2.equals(taskDefinitionKey)){
processFbConsultationUserLinkService.update(
new LambdaUpdateWrapper<ProcessFbConsultationUserLink>()
.eq(ProcessFbConsultationUserLink::getBusinessId, projectId)
.eq(ProcessFbConsultationUserLink::getDesignEngineerId, CurrentUserUtil.getId())
.set(ProcessFbConsultationUserLink::getDesignEngineerId, toUserId));
}
// 模块负责人汇总填写意见
if (ConsultationTaskKey.DEPART_LEADER_START_1.equals(taskDefinitionKey)
|| ConsultationTaskKey.MODULE_OWNER_END_2.equals(taskDefinitionKey)
|| ConsultationTaskKey.MODULE_OWNER_END_3.equals(taskDefinitionKey)){
processFbConsultationUserLinkService.update(
new LambdaUpdateWrapper<ProcessFbConsultationUserLink>()
.eq(ProcessFbConsultationUserLink::getBusinessId, projectId)
.eq(ProcessFbConsultationUserLink::getModuleOwnerId, CurrentUserUtil.getId())
.set(ProcessFbConsultationUserLink::getModuleOwnerId, toUserId));
}
} }
/** /**