Merge branch 'master' into docker_package

renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java

@@ -28,12 +28,15 @@ import io.renren.modules.security.user.SecurityUser;
 import io.renren.modules.security.user.UserDetail;
 import io.renren.modules.sys.dto.SysDeptDTO;
 import io.renren.modules.sys.service.SysDeptService;
+import io.renren.modules.sys.service.SysUserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.activiti.engine.HistoryService;
+import org.activiti.engine.TaskService;
 import org.activiti.engine.history.HistoricProcessInstance;
+import org.activiti.engine.task.Task;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -60,6 +63,9 @@ import java.util.stream.Collectors;
 @Api(tags = "能力申请表单")
 public class TAbilityApplicationController {
     private static final Logger logger = LoggerFactory.getLogger(TAbilityApplicationController.class);
+
+    @Value("${project.place}")
+    private Integer projectPlace;
     @Autowired
     private TAbilityApplicationService tAbilityApplicationService;
     @Autowired
@@ -76,8 +82,10 @@ public class TAbilityApplicationController {
     private SysDeptService sysDeptService;
     @Autowired
     protected HistoryService historyService;
-    @Value("${project.place}")
+    @Autowired
-    private Integer projectPlace;
+    private TaskService taskService;
+    @Autowired
+    private SysUserService sysUserService;
 
 
     /**
@@ -264,6 +272,23 @@ public class TAbilityApplicationController {
                 }
             }
 
+            if (tAbilityApplicationDTOList.get(0).getApproveStatus().equals("审核中")) { // 若处于审核中时 增加当前节点信息
+                Task task = taskService.createTaskQuery().processInstanceId(tAbilityApplicationDTOList.get(0).getInstanceId()).active().includeProcessVariables().singleResult();
+                if (task != null && StringUtils.isNotEmpty(task.getId()) && StringUtils.isNumeric(task.getAssignee())) {
+                    HistoryDetailDTO detailDTO = new HistoryDetailDTO();
+                    detailDTO.setId(task.getId());
+                    detailDTO.setAssignee(sysUserService.get(Long.valueOf(task.getAssignee())).getRealName());
+                    detailDTO.setActivityName(task.getName());
+                    detailDTO.setActivityType("");
+                    detailDTO.setStartTime(task.getCreateTime());
+                    detailDTO.setEndTime(null);
+                    detailDTO.setDurationInSeconds(null);
+                    detailDTO.setExecutionId(task.getExecutionId());
+                    detailDTO.setProcessDefinitionId(task.getProcessDefinitionId());
+                    taskHandleDetailInfo.add(detailDTO);
+                }
+            }
+
             boolean finalBackToFirst = backToFirst;
             return new HashMap<String, Object>() {
                 {

renren-admin/src/main/java/io/renren/modules/processForm/listener/v3/ApplyDeptListener.java

@@ -85,7 +85,7 @@ public class ApplyDeptListener implements TaskListener, ExecutionListener, Activ
     }
 
     @Override
-    @ActivitiNoticeOperation(value = "申请人发起人部门负责人审批", process = "能力申请流程v3")
+    @ActivitiNoticeOperation(value = "申请人发起人部门负责人审批", process = "能力申请流程")
     public void notify(DelegateTask delegateTask) {
         logger.error("事件类型：" + delegateTask.getEventName());
         final String eventName = delegateTask.getEventName();

renren-admin/src/main/java/io/renren/modules/processForm/listener/v3/ApplyDistrictListener.java

@@ -64,7 +64,7 @@ public class ApplyDistrictListener implements TaskListener, ExecutionListener, A
     private String defaultAssigneeRoleId; // 当未查到审批人时将使用该用户审批
 
     @Override
-    @ActivitiNoticeOperation(value = "申请发起人区市管理员审批", process = "能力申请流程V3")
+    @ActivitiNoticeOperation(value = "申请发起人区市管理员审批", process = "能力申请流程")
     public void notify(DelegateTask delegateTask) {
         logger.error("事件类型：" + delegateTask.getEventName());
         final String eventName = delegateTask.getEventName();

renren-admin/src/main/java/io/renren/modules/processForm/listener/v3/CityListener.java

@@ -64,7 +64,7 @@ public class CityListener implements TaskListener, ExecutionListener, ActivitiEv
     private String defaultAssigneeRoleId; // 当未查到审批人时将使用该用户审批
 
     @Override
-    @ActivitiNoticeOperation(value = "市级区市管理员审批", process = "能力申请流程V3")
+    @ActivitiNoticeOperation(value = "市级区市管理员审批", process = "能力申请流程")
     public void notify(DelegateTask delegateTask) {
         logger.error("事件类型：" + delegateTask.getEventName());
         final String eventName = delegateTask.getEventName();

renren-admin/src/main/java/io/renren/modules/processForm/listener/v3/CorrectionListenerV3.java

@@ -77,7 +77,7 @@ public class CorrectionListenerV3 implements TaskListener, ExecutionListener, Ac
     private TAbilityApplicationService tAbilityApplicationService;
 
     @Override
-    @ActivitiNoticeOperation(value = "流程结束", process = "能力申请流程v3", type = 2)
+    @ActivitiNoticeOperation(value = "流程结束", process = "能力申请流程", type = 2)
     public void notify(DelegateExecution delegateExecution) throws Exception {
         logger.error("----------------------进入部门审批结束节点---------------------------");
         delegateExecution.getProcessBusinessKey();

renren-admin/src/main/java/io/renren/modules/processForm/listener/v3/OwnerDistrictListener.java

@@ -61,7 +61,7 @@ public class OwnerDistrictListener implements TaskListener, ExecutionListener, A
     private String defaultAssigneeRoleId; // 当未查到审批人时将使用该用户审批
 
     @Override
-    @ActivitiNoticeOperation(value = "资源所属区市管理员审批", process = "能力申请流程V3")
+    @ActivitiNoticeOperation(value = "资源所属区市管理员审批", process = "能力申请流程")
     public void notify(DelegateTask delegateTask) {
         logger.error("事件类型：" + delegateTask.getEventName());
         final String eventName = delegateTask.getEventName();