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

update 法规征求意见流程

Browse Source
This commit is contained in:
liao
2023-11-29 11:21:46 +08:00
parent 32b924e9f4
commit 4d47ae0034
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/fb/listener/TaskListenerService.java
+2 -2
View File
@@ -44,8 +44,6 @@ public class TaskListenerService {
DelegateExecution execution = delegateTask.getExecution(); DelegateExecution execution = delegateTask.getExecution();
String executionId = execution.getId(); String executionId = execution.getId();
String parentExecutionId = execution.getParentId(); String parentExecutionId = execution.getParentId();
HistoricTaskInstance historicTask = historyService.createHistoricTaskInstanceQuery().executionId(parentExecutionId).singleResult();
String historicTaskAssignee = historicTask.getAssignee();
LambdaQueryWrapper<ProcessFbConsultationUserLink> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<ProcessFbConsultationUserLink> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(ProcessFbConsultationUserLink::getBusinessId, processAll.getProjectId()); queryWrapper.eq(ProcessFbConsultationUserLink::getBusinessId, processAll.getProjectId());
@@ -83,6 +81,8 @@ public class TaskListenerService {
delegateTask.setFormKey(userId); // 绑定主管级领导的id delegateTask.setFormKey(userId); // 绑定主管级领导的id
break; break;
case ConsultationTaskKey.MODULE_OWNER_END_3: // 法规工程师审批驳回后的子流程中的模块负责人汇总 case ConsultationTaskKey.MODULE_OWNER_END_3: // 法规工程师审批驳回后的子流程中的模块负责人汇总
HistoricTaskInstance historicTask = historyService.createHistoricTaskInstanceQuery().executionId(parentExecutionId).singleResult();
String historicTaskAssignee = historicTask.getAssignee();
if (StringUtils.isBlank(historicTaskAssignee)) { if (StringUtils.isBlank(historicTaskAssignee)) {
throw new JeroBootException("系统错误，请联系开发管理员"); throw new JeroBootException("系统错误，请联系开发管理员");
} }
laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardPurchaseServiceImpl.java
+1 -6
View File
@@ -45,8 +45,6 @@ public class ProcessFbStandardPurchaseServiceImpl extends ServiceImpl<ProcessFbS
@Resource @Resource
private IProcessHandleService processHandleService; private IProcessHandleService processHandleService;
@Value("${jero.path.upload}")
private String upLoadPath;
/** /**
* @Author: liao * @Author: liao
@@ -178,12 +176,9 @@ public class ProcessFbStandardPurchaseServiceImpl extends ServiceImpl<ProcessFbS
queryWrapper.orderByAsc(ProcessFbStandardPurchase::getSort); queryWrapper.orderByAsc(ProcessFbStandardPurchase::getSort);
List<ProcessFbStandardPurchase> exportList = list(queryWrapper); // 准备数据 List<ProcessFbStandardPurchase> exportList = list(queryWrapper); // 准备数据
String title = "法规采购流程";
ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
mv.addObject(JeroController.FILE_NAME, title); //此处设置的filename无效 ,前端会重更新设置一下
mv.addObject(JeroController.CLASS, ProcessFbStandardPurchase.class); mv.addObject(JeroController.CLASS, ProcessFbStandardPurchase.class);
ExportParams exportParams=new ExportParams(title + "报表", "导出人:" + CurrentUserUtil.getRealName(), title); ExportParams exportParams=new ExportParams();
exportParams.setImageBasePath(upLoadPath);
mv.addObject(JeroController.PARAMS,exportParams); mv.addObject(JeroController.PARAMS,exportParams);
mv.addObject(NormalExcelConstants.DATA_LIST, exportList); mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
return mv; return mv;