diff --git a/src/main/java/cn/palmte/work/service/ActListenerService.java b/src/main/java/cn/palmte/work/service/ActListenerService.java index 633c151..a99882e 100644 --- a/src/main/java/cn/palmte/work/service/ActListenerService.java +++ b/src/main/java/cn/palmte/work/service/ActListenerService.java @@ -105,11 +105,13 @@ public class ActListenerService { ActTaskDef actTaskDef = actTaskDefService.findFirstByProcDefIdAndTaskKey(procDefId, taskDefKey); //找到当前有效的用户 List enableUsers = currentEnableUsers(candidateUsers); - boolean isFirstUserTask = actTaskDef != null && actTaskDef.getTaskIndex() != ActTaskIndexEnum.FIRST_USER_TASK.getIndex(); + boolean notFirstUserTask = actTaskDef != null && actTaskDef.getTaskIndex() != ActTaskIndexEnum.FIRST_USER_TASK.getIndex(); + logger.info("**** rwcjjt 更新审批人 procInsId:{}, projectId:{}, enableUsers:{}, notFirstUserTask:{} **** ", + processInstance.getProcessInstanceId(), businessKey, enableUsers, notFirstUserTask); if (actUtil.isFourcalProcess(procDefId)) { int adminId = 0;//默认审批人设置为空 - if (!isFirstUserTask && !enableUsers.isEmpty()) { + if (notFirstUserTask && !enableUsers.isEmpty()) { adminId = enableUsers.get(0);//四算项目只支持一个审批人 } logger.info("**** rwcjjt 任务创建监听 更新审批人1 procInsId:{}, projectId:{}, adminId:{} **** ", @@ -119,7 +121,7 @@ public class ActListenerService { if (!enableUsers.isEmpty()) { projectProcessService.updateAudit(Integer.parseInt(businessKey), null, enableUsers); } - logger.info("**** rwcjjt 任务创建监听 更新审批2 procInsId:{}, projectId:{}, enableUsers:{} **** ", + logger.info("**** rwcjjt 任务创建监听 更新审批人2 procInsId:{}, projectId:{}, enableUsers:{} **** ", processInstance.getProcessInstanceId(), businessKey, enableUsers); } } diff --git a/src/main/java/cn/palmte/work/service/ActProcInsService.java b/src/main/java/cn/palmte/work/service/ActProcInsService.java index 29b0983..974e89a 100644 --- a/src/main/java/cn/palmte/work/service/ActProcInsService.java +++ b/src/main/java/cn/palmte/work/service/ActProcInsService.java @@ -9,6 +9,7 @@ import cn.palmte.work.model.ProjectTaskRecord; import cn.palmte.work.pojo.ActProcIns; import cn.palmte.work.utils.ActUtil; import cn.palmte.work.utils.InterfaceUtil; +import cn.palmte.work.utils.StrKit; import org.activiti.bpmn.model.BpmnModel; import org.activiti.bpmn.model.FlowNode; import org.activiti.bpmn.model.SequenceFlow; @@ -172,6 +173,20 @@ public class ActProcInsService { "LEFT JOIN act_ru_task t on t.PROC_INST_ID_=h.proc_inst_id_ " + "LEFT JOIN project pjct on pjct.id=h.BUSINESS_KEY_ " + "LEFT JOIN project_process pp on pp.id=h.BUSINESS_KEY_ "); + + String procDefKey = searchInfo.get("procDefKey"); + queryHelper.addCondition(StrKit.notBlank(procDefKey), "p.key_=?", procDefKey); + + String projectName = searchInfo.get("projectName"); + String projectNameLike = "%" + projectName + "%"; + queryHelper.addCondition(StrKit.notBlank(projectName), " (pjct.name like ? or pp.project_title like ?) ", projectNameLike, projectNameLike); + + String projectId = searchInfo.get("projectId"); + queryHelper.addCondition(StrKit.notBlank(projectId), "h.BUSINESS_KEY_ =? ", projectId); + + String procInsId = searchInfo.get("procInsId"); + queryHelper.addCondition(StrKit.notBlank(procInsId), "h.proc_inst_id_ =? ", procInsId); + queryHelper.addGroupProperty("h.PROC_INST_ID_"); queryHelper.addOrderProperty("h.start_time_", false); Page paginate = pagination.paginate(queryHelper.getSql(), ActProcIns.class, pageNumber, pageSize); diff --git a/src/main/resources/templates/admin/act_proc_ins_list.ftl b/src/main/resources/templates/admin/act_proc_ins_list.ftl index ba51f35..201544b 100644 --- a/src/main/resources/templates/admin/act_proc_ins_list.ftl +++ b/src/main/resources/templates/admin/act_proc_ins_list.ftl @@ -10,6 +10,79 @@ + +
+
+
+ + + + + + + + + + + + + + + + + + + +
流程名称 +
+ +
+
项目名称 +
+ +
+
项目ID +
+ +
+
流程实例ID +
+ +
+
+
+ +
+
+
+
+
+
@@ -19,6 +92,7 @@ 流程名称 流程标识 流程版本 + 流程实例id 项目名称 申请人 申请时间 @@ -35,6 +109,7 @@ ${list.procName!} ${list.procKey!} ${list.version!} + ${list.procInsId!} ${list.projectName!}${list.projectTitle!} ${list.user!} ${list.startTime?datetime} @@ -203,4 +278,31 @@ }); } + + function initSearch() { + var keywordsObj = {}; + if ($("#procDefKey").val()) + keywordsObj.procDefKey = $("#procDefKey").val(); + if ($("#projectName").val()) + keywordsObj.projectName = $("#projectName").val(); + if ($("#projectId").val()) + keywordsObj.projectId = $("#projectId").val(); + if ($("#procInsId").val()) + keywordsObj.procInsId = $("#procInsId").val(); + + var keywords = ""; + if (!$.isEmptyObject(keywordsObj)) { + keywords = JSON.stringify(keywordsObj); + } + $("#keywords").val(keywords); + }; + + var sub_function = function (type) { + initSearch(); + if(type == 'query'){ + $("#listForm").attr("action", "${base}/actProcIns/list"); + } + $("#listForm").submit(); + }; + \ No newline at end of file