diff --git a/module-activiti/src/main/java/ink/wgink/module/activiti/controller/api/oa/OaController.java b/module-activiti/src/main/java/ink/wgink/module/activiti/controller/api/oa/OaController.java index f24489d9..26ca8da1 100644 --- a/module-activiti/src/main/java/ink/wgink/module/activiti/controller/api/oa/OaController.java +++ b/module-activiti/src/main/java/ink/wgink/module/activiti/controller/api/oa/OaController.java @@ -146,4 +146,17 @@ public class OaController extends DefaultBaseController { return new SuccessResultData<>(count); } + + @ApiOperation(value = "我的发起分页列表", notes = "我的发起分页列表接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "page", value = "当前页码", paramType = "query", dataType = "int", defaultValue = "1"), + @ApiImplicitParam(name = "rows", value = "显示数量", paramType = "query", dataType = "int", defaultValue = "20"), + }) + @GetMapping("listpage-start-of-mine") + public SuccessResultList> listPageStartOfMine(ListPage page) { + Map requestParams = requestParams(); + page.setParams(requestParams); + return oaCcService.listPageStartOfMine(page); + } + } diff --git a/module-activiti/src/main/java/ink/wgink/module/activiti/controller/route/oa/OaRouteController.java b/module-activiti/src/main/java/ink/wgink/module/activiti/controller/route/oa/OaRouteController.java index db796ea8..f0f261cd 100644 --- a/module-activiti/src/main/java/ink/wgink/module/activiti/controller/route/oa/OaRouteController.java +++ b/module-activiti/src/main/java/ink/wgink/module/activiti/controller/route/oa/OaRouteController.java @@ -76,4 +76,11 @@ public class OaRouteController extends DefaultBaseController { oaFormReportRouteService.updateRead(formCode, formVersion, ccId, httpSession, httpServletRequest, httpServletResponse); } + + + @GetMapping("list-start-of-mine") + public ModelAndView listStartOfMine() { + ModelAndView mv = new ModelAndView("oa/list-start-of-mine"); + return mv; + } } diff --git a/module-activiti/src/main/java/ink/wgink/module/activiti/enums/oa/assignee/AssigneeTypeEnum.java b/module-activiti/src/main/java/ink/wgink/module/activiti/enums/oa/assignee/AssigneeTypeEnum.java index 7c930f23..1047280e 100644 --- a/module-activiti/src/main/java/ink/wgink/module/activiti/enums/oa/assignee/AssigneeTypeEnum.java +++ b/module-activiti/src/main/java/ink/wgink/module/activiti/enums/oa/assignee/AssigneeTypeEnum.java @@ -9,7 +9,8 @@ package ink.wgink.module.activiti.enums.oa.assignee; */ public enum AssigneeTypeEnum { APPOINT("appoint", "手动指定"), - AUTO("auto", "自动获取"); + AUTO("auto", "自动获取"), + FORM("form", "表单"); private String value; private String text; diff --git a/module-activiti/src/main/java/ink/wgink/module/activiti/handler/IOaUserTaskAssignmentHandler.java b/module-activiti/src/main/java/ink/wgink/module/activiti/handler/task/IOaUserTaskAssignmentHandler.java similarity index 88% rename from module-activiti/src/main/java/ink/wgink/module/activiti/handler/IOaUserTaskAssignmentHandler.java rename to module-activiti/src/main/java/ink/wgink/module/activiti/handler/task/IOaUserTaskAssignmentHandler.java index b042968b..886ccba6 100644 --- a/module-activiti/src/main/java/ink/wgink/module/activiti/handler/IOaUserTaskAssignmentHandler.java +++ b/module-activiti/src/main/java/ink/wgink/module/activiti/handler/task/IOaUserTaskAssignmentHandler.java @@ -1,4 +1,4 @@ -package ink.wgink.module.activiti.handler; +package ink.wgink.module.activiti.handler.task; import org.activiti.engine.delegate.DelegateTask; diff --git a/module-activiti/src/main/java/ink/wgink/module/activiti/handler/IOaUserTaskCompleteHandler.java b/module-activiti/src/main/java/ink/wgink/module/activiti/handler/task/IOaUserTaskCompleteHandler.java similarity index 88% rename from module-activiti/src/main/java/ink/wgink/module/activiti/handler/IOaUserTaskCompleteHandler.java rename to module-activiti/src/main/java/ink/wgink/module/activiti/handler/task/IOaUserTaskCompleteHandler.java index b7e751a2..8d1bc196 100644 --- a/module-activiti/src/main/java/ink/wgink/module/activiti/handler/IOaUserTaskCompleteHandler.java +++ b/module-activiti/src/main/java/ink/wgink/module/activiti/handler/task/IOaUserTaskCompleteHandler.java @@ -1,4 +1,4 @@ -package ink.wgink.module.activiti.handler; +package ink.wgink.module.activiti.handler.task; import org.activiti.engine.delegate.DelegateTask; diff --git a/module-activiti/src/main/java/ink/wgink/module/activiti/handler/IOaUserTaskCreateHandler.java b/module-activiti/src/main/java/ink/wgink/module/activiti/handler/task/IOaUserTaskCreateHandler.java similarity index 88% rename from module-activiti/src/main/java/ink/wgink/module/activiti/handler/IOaUserTaskCreateHandler.java rename to module-activiti/src/main/java/ink/wgink/module/activiti/handler/task/IOaUserTaskCreateHandler.java index c272281c..1c787e0b 100644 --- a/module-activiti/src/main/java/ink/wgink/module/activiti/handler/IOaUserTaskCreateHandler.java +++ b/module-activiti/src/main/java/ink/wgink/module/activiti/handler/task/IOaUserTaskCreateHandler.java @@ -1,4 +1,4 @@ -package ink.wgink.module.activiti.handler; +package ink.wgink.module.activiti.handler.task; import org.activiti.engine.delegate.DelegateTask; diff --git a/module-activiti/src/main/java/ink/wgink/module/activiti/handler/IOaUserTaskDeleteHandler.java b/module-activiti/src/main/java/ink/wgink/module/activiti/handler/task/IOaUserTaskDeleteHandler.java similarity index 88% rename from module-activiti/src/main/java/ink/wgink/module/activiti/handler/IOaUserTaskDeleteHandler.java rename to module-activiti/src/main/java/ink/wgink/module/activiti/handler/task/IOaUserTaskDeleteHandler.java index f7c30d1d..197f00b7 100644 --- a/module-activiti/src/main/java/ink/wgink/module/activiti/handler/IOaUserTaskDeleteHandler.java +++ b/module-activiti/src/main/java/ink/wgink/module/activiti/handler/task/IOaUserTaskDeleteHandler.java @@ -1,4 +1,4 @@ -package ink.wgink.module.activiti.handler; +package ink.wgink.module.activiti.handler.task; import org.activiti.engine.delegate.DelegateTask; diff --git a/module-activiti/src/main/java/ink/wgink/module/activiti/listener/task/OaUserTaskAssignmentListener.java b/module-activiti/src/main/java/ink/wgink/module/activiti/listener/task/OaUserTaskAssignmentListener.java index 6948a721..3cc36616 100644 --- a/module-activiti/src/main/java/ink/wgink/module/activiti/listener/task/OaUserTaskAssignmentListener.java +++ b/module-activiti/src/main/java/ink/wgink/module/activiti/listener/task/OaUserTaskAssignmentListener.java @@ -1,6 +1,6 @@ package ink.wgink.module.activiti.listener.task; -import ink.wgink.module.activiti.handler.IOaUserTaskAssignmentHandler; +import ink.wgink.module.activiti.handler.task.IOaUserTaskAssignmentHandler; import org.activiti.engine.delegate.DelegateExecution; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.JavaDelegate; diff --git a/module-activiti/src/main/java/ink/wgink/module/activiti/listener/task/OaUserTaskCompleteListener.java b/module-activiti/src/main/java/ink/wgink/module/activiti/listener/task/OaUserTaskCompleteListener.java index 6f9ee34c..54163c6b 100644 --- a/module-activiti/src/main/java/ink/wgink/module/activiti/listener/task/OaUserTaskCompleteListener.java +++ b/module-activiti/src/main/java/ink/wgink/module/activiti/listener/task/OaUserTaskCompleteListener.java @@ -1,6 +1,6 @@ package ink.wgink.module.activiti.listener.task; -import ink.wgink.module.activiti.handler.IOaUserTaskCompleteHandler; +import ink.wgink.module.activiti.handler.task.IOaUserTaskCompleteHandler; import org.activiti.engine.delegate.DelegateExecution; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.JavaDelegate; diff --git a/module-activiti/src/main/java/ink/wgink/module/activiti/listener/task/OaUserTaskCreateListener.java b/module-activiti/src/main/java/ink/wgink/module/activiti/listener/task/OaUserTaskCreateListener.java index c86a0c41..7813ea35 100644 --- a/module-activiti/src/main/java/ink/wgink/module/activiti/listener/task/OaUserTaskCreateListener.java +++ b/module-activiti/src/main/java/ink/wgink/module/activiti/listener/task/OaUserTaskCreateListener.java @@ -1,6 +1,6 @@ package ink.wgink.module.activiti.listener.task; -import ink.wgink.module.activiti.handler.IOaUserTaskCreateHandler; +import ink.wgink.module.activiti.handler.task.IOaUserTaskCreateHandler; import org.activiti.engine.delegate.DelegateExecution; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.JavaDelegate; diff --git a/module-activiti/src/main/java/ink/wgink/module/activiti/listener/task/OaUserTaskDeleteListener.java b/module-activiti/src/main/java/ink/wgink/module/activiti/listener/task/OaUserTaskDeleteListener.java index 758d8906..a3f3589a 100644 --- a/module-activiti/src/main/java/ink/wgink/module/activiti/listener/task/OaUserTaskDeleteListener.java +++ b/module-activiti/src/main/java/ink/wgink/module/activiti/listener/task/OaUserTaskDeleteListener.java @@ -1,6 +1,6 @@ package ink.wgink.module.activiti.listener.task; -import ink.wgink.module.activiti.handler.IOaUserTaskDeleteHandler; +import ink.wgink.module.activiti.handler.task.IOaUserTaskDeleteHandler; import org.activiti.engine.delegate.DelegateExecution; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.JavaDelegate; diff --git a/module-activiti/src/main/java/ink/wgink/module/activiti/pojo/dtos/oa/OaStartedInstanceDTO.java b/module-activiti/src/main/java/ink/wgink/module/activiti/pojo/dtos/oa/OaStartedInstanceDTO.java new file mode 100644 index 00000000..11abac31 --- /dev/null +++ b/module-activiti/src/main/java/ink/wgink/module/activiti/pojo/dtos/oa/OaStartedInstanceDTO.java @@ -0,0 +1,129 @@ +package ink.wgink.module.activiti.pojo.dtos.oa; + +/** + * @ClassName: OaStartedInstanceDTO + * @Description: OA已经启动实例 + * @Author: wanggeng + * @Date: 2022/7/18 16:25 + * @Version: 1.0 + */ +public class OaStartedInstanceDTO { + + private String deploymentId; + private String processDefinitionId; + private String processDefinitionKey; + private String processDefinitionName; + private Integer processDefinitionVersion; + private String processInstanceId; + private String startActivityId; + private String startTime; + private String endTime; + private String startUserId; + private String formCode; + private Integer formVersion; + private String reportUid; + + public String getDeploymentId() { + return deploymentId == null ? "" : deploymentId.trim(); + } + + public void setDeploymentId(String deploymentId) { + this.deploymentId = deploymentId; + } + + public String getProcessDefinitionId() { + return processDefinitionId == null ? "" : processDefinitionId.trim(); + } + + public void setProcessDefinitionId(String processDefinitionId) { + this.processDefinitionId = processDefinitionId; + } + + public String getProcessDefinitionKey() { + return processDefinitionKey == null ? "" : processDefinitionKey.trim(); + } + + public void setProcessDefinitionKey(String processDefinitionKey) { + this.processDefinitionKey = processDefinitionKey; + } + + public String getProcessDefinitionName() { + return processDefinitionName == null ? "" : processDefinitionName.trim(); + } + + public void setProcessDefinitionName(String processDefinitionName) { + this.processDefinitionName = processDefinitionName; + } + + public Integer getProcessDefinitionVersion() { + return processDefinitionVersion == null ? 0 : processDefinitionVersion; + } + + public void setProcessDefinitionVersion(Integer processDefinitionVersion) { + this.processDefinitionVersion = processDefinitionVersion; + } + + public String getProcessInstanceId() { + return processInstanceId == null ? "" : processInstanceId.trim(); + } + + public void setProcessInstanceId(String processInstanceId) { + this.processInstanceId = processInstanceId; + } + + public String getStartActivityId() { + return startActivityId == null ? "" : startActivityId.trim(); + } + + public void setStartActivityId(String startActivityId) { + this.startActivityId = startActivityId; + } + + public String getStartTime() { + return startTime == null ? "" : startTime.trim(); + } + + public void setStartTime(String startTime) { + this.startTime = startTime; + } + + public String getEndTime() { + return endTime == null ? "" : endTime.trim(); + } + + public void setEndTime(String endTime) { + this.endTime = endTime; + } + + public String getStartUserId() { + return startUserId == null ? "" : startUserId.trim(); + } + + public void setStartUserId(String startUserId) { + this.startUserId = startUserId; + } + + public String getFormCode() { + return formCode == null ? "" : formCode.trim(); + } + + public void setFormCode(String formCode) { + this.formCode = formCode; + } + + public Integer getFormVersion() { + return formVersion == null ? 0 : formVersion; + } + + public void setFormVersion(Integer formVersion) { + this.formVersion = formVersion; + } + + public String getReportUid() { + return reportUid == null ? "" : reportUid.trim(); + } + + public void setReportUid(String reportUid) { + this.reportUid = reportUid; + } +} diff --git a/module-activiti/src/main/java/ink/wgink/module/activiti/service/oa/IOaCcService.java b/module-activiti/src/main/java/ink/wgink/module/activiti/service/oa/IOaCcService.java index 112d3b3a..5e140e23 100644 --- a/module-activiti/src/main/java/ink/wgink/module/activiti/service/oa/IOaCcService.java +++ b/module-activiti/src/main/java/ink/wgink/module/activiti/service/oa/IOaCcService.java @@ -1,6 +1,7 @@ package ink.wgink.module.activiti.service.oa; import ink.wgink.module.activiti.pojo.dtos.oa.OaCcDTO; +import ink.wgink.module.activiti.pojo.dtos.oa.OaStartedInstanceDTO; import ink.wgink.module.activiti.pojo.pos.oa.OaCcPO; import ink.wgink.module.activiti.pojo.vos.oa.OaCcVO; import ink.wgink.pojo.ListPage; @@ -174,5 +175,28 @@ public interface IOaCcService { */ Integer countReadByUserId(String userId, int isRead); + /** + * 用户的发起列表 + * + * @return + */ + List listStartByUserId(String userId); + + /** + * 用户的发起分页列表 + * + * @param userId\ + * @param page + * @return + */ + SuccessResultList> listPageStartByUserId(String userId, ListPage page); + + /** + * 我的发起分页列表 + * + * @param page + * @return + */ + SuccessResultList> listPageStartOfMine(ListPage page); } diff --git a/module-activiti/src/main/java/ink/wgink/module/activiti/service/oa/impl/NodeAssigneeServiceImpl.java b/module-activiti/src/main/java/ink/wgink/module/activiti/service/oa/impl/NodeAssigneeServiceImpl.java index fa1c761d..343fcf22 100644 --- a/module-activiti/src/main/java/ink/wgink/module/activiti/service/oa/impl/NodeAssigneeServiceImpl.java +++ b/module-activiti/src/main/java/ink/wgink/module/activiti/service/oa/impl/NodeAssigneeServiceImpl.java @@ -26,6 +26,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; @@ -211,6 +212,11 @@ public class NodeAssigneeServiceImpl extends DefaultBaseService implements INode LOG.debug("assigneeType -> auto"); return auto(processInstanceId, currentAssignee, oaNodeAssigneePO); } + // 代理人来源于表单，直接返回空 + if (StringUtils.equals(oaNodeAssigneePO.getAssigneeType(), AssigneeTypeEnum.FORM.getValue())) { + LOG.debug("assigneeType -> form"); + return new ArrayList<>(); + } throw new OaNodeException("节点 assigneeType 配置错误"); } @@ -238,6 +244,11 @@ public class NodeAssigneeServiceImpl extends DefaultBaseService implements INode LOG.debug("assigneeType -> auto"); return auto(processInstanceId, currentAssignee, oaNodeAssigneePO); } + // 代理人来源于表单，直接返回空 + if (StringUtils.equals(oaNodeAssigneePO.getAssigneeType(), AssigneeTypeEnum.FORM.getValue())) { + LOG.debug("assigneeType -> form"); + return new ArrayList<>(); + } throw new OaNodeException("节点 assigneeType 配置错误"); } @@ -352,7 +363,7 @@ public class NodeAssigneeServiceImpl extends DefaultBaseService implements INode List roleUserIds = roleUserBaseService.listUserIdByRoleIdsAndUserIds(Arrays.asList(roleIds.split(",")), departmentUserIds); return listRoleCandidateUser(roleUserIds, positionIds); } - if(!StringUtils.isBlank(positionIds)) { + if (!StringUtils.isBlank(positionIds)) { LOG.debug("查询职位用户"); List positionUserIds = positionUserBaseService.listUserIdByPositionIdsAndUserIds(Arrays.asList(positionIds.split(",")), departmentUserIds); return listPositionCandidateUser(positionUserIds); diff --git a/module-activiti/src/main/java/ink/wgink/module/activiti/service/oa/impl/OaCcServiceImpl.java b/module-activiti/src/main/java/ink/wgink/module/activiti/service/oa/impl/OaCcServiceImpl.java index f26bbb99..38109c46 100644 --- a/module-activiti/src/main/java/ink/wgink/module/activiti/service/oa/impl/OaCcServiceImpl.java +++ b/module-activiti/src/main/java/ink/wgink/module/activiti/service/oa/impl/OaCcServiceImpl.java @@ -3,12 +3,15 @@ package ink.wgink.module.activiti.service.oa.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import ink.wgink.common.base.DefaultBaseService; +import ink.wgink.interfaces.consts.ISystemConstant; import ink.wgink.interfaces.user.IUserBaseService; import ink.wgink.module.activiti.dao.oa.IOaCcDao; import ink.wgink.module.activiti.pojo.dtos.oa.OaCcDTO; +import ink.wgink.module.activiti.pojo.dtos.oa.OaStartedInstanceDTO; import ink.wgink.module.activiti.pojo.pos.oa.OaCcPO; import ink.wgink.module.activiti.pojo.vos.oa.OaCcVO; import ink.wgink.module.activiti.service.oa.IOaCcService; +import ink.wgink.module.activiti.service.oa.IOaFormReportService; import ink.wgink.module.form.service.design.IFormDesignService; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.dtos.user.UserDTO; @@ -18,11 +21,16 @@ import ink.wgink.util.UUIDUtil; import ink.wgink.util.map.HashMapUtil; import org.activiti.engine.HistoryService; import org.activiti.engine.history.HistoricProcessInstance; +import org.activiti.engine.history.HistoricProcessInstanceQuery; import org.apache.commons.lang3.StringUtils; +import org.joda.time.DateTime; +import org.joda.time.format.DateTimeFormat; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.text.SimpleDateFormat; import java.util.*; +import java.util.stream.Collectors; /** * @ClassName: FormCcServiceImpl @@ -204,6 +212,64 @@ public class OaCcServiceImpl extends DefaultBaseService implements IOaCcService return oaCcDao.count(params); } + @Override + public List listStartByUserId(String userId) { + return listOaStartedInstance(historyService.createHistoricProcessInstanceQuery() + .includeProcessVariables() + .startedBy(userId) + .orderByProcessInstanceStartTime() + .desc() + .list()); + } + + @Override + public SuccessResultList> listPageStartByUserId(String userId, ListPage page) { + HistoricProcessInstanceQuery historicProcessInstanceQuery = historyService.createHistoricProcessInstanceQuery() + .startedBy(userId); + long count = historicProcessInstanceQuery.count(); + List historicProcessInstances = historicProcessInstanceQuery + .includeProcessVariables() + .orderByProcessInstanceStartTime() + .desc() + .listPage((page.getPage() - 1) * page.getRows(), page.getRows()); + return new SuccessResultList<>(listOaStartedInstance(historicProcessInstances), page.getPage(), count); + } + + @Override + public SuccessResultList> listPageStartOfMine(ListPage page) { + return listPageStartByUserId(securityComponent.getCurrentUser().getUserId(), page); + } + + private List listOaStartedInstance(List historicProcessInstances) { + SimpleDateFormat sdfTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + sdfTime.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai")); + return historicProcessInstances.stream().map(historicProcessInstance -> { + OaStartedInstanceDTO oaStartedInstanceDTO = new OaStartedInstanceDTO(); + oaStartedInstanceDTO.setDeploymentId(historicProcessInstance.getDeploymentId()); + oaStartedInstanceDTO.setProcessDefinitionId(historicProcessInstance.getProcessDefinitionId()); + oaStartedInstanceDTO.setProcessDefinitionKey(historicProcessInstance.getProcessDefinitionKey()); + oaStartedInstanceDTO.setProcessDefinitionName(historicProcessInstance.getProcessDefinitionName()); + oaStartedInstanceDTO.setProcessDefinitionVersion(historicProcessInstance.getProcessDefinitionVersion()); + oaStartedInstanceDTO.setProcessInstanceId(historicProcessInstance.getId()); + oaStartedInstanceDTO.setStartActivityId(historicProcessInstance.getStartActivityId()); + DateTime startDateTime = new DateTime(historicProcessInstance.getStartTime().getTime()); + startDateTime = startDateTime.minusHours(8); + DateTime endDateTime = null; + if (historicProcessInstance.getEndTime() != null) { + endDateTime = new DateTime(historicProcessInstance.getEndTime().getTime()); + endDateTime = endDateTime.minusHours(8); + } + oaStartedInstanceDTO.setStartTime(startDateTime.toString(DateTimeFormat.forPattern(ISystemConstant.DATE_FORMATTER_YYYY_MM_DD_HH_MM_SS))); + oaStartedInstanceDTO.setEndTime(endDateTime == null ? null : endDateTime.toString(DateTimeFormat.forPattern(ISystemConstant.DATE_FORMATTER_YYYY_MM_DD_HH_MM_SS))); + oaStartedInstanceDTO.setStartUserId(historicProcessInstance.getStartUserId()); + Map processVariables = historicProcessInstance.getProcessVariables(); + oaStartedInstanceDTO.setFormCode((String) processVariables.get(IOaFormReportService.KEY_FORM_CODE)); + oaStartedInstanceDTO.setFormVersion((Integer) processVariables.get(IOaFormReportService.KEY_FORM_VERSION)); + oaStartedInstanceDTO.setReportUid((String) processVariables.get(IOaFormReportService.KEY_REPORT_UID)); + return oaStartedInstanceDTO; + }).collect(Collectors.toList()); + } + /** * 设置主标题 * diff --git a/module-activiti/src/main/resources/static/editor-app/configuration/properties-oa-node-manage-controller.js b/module-activiti/src/main/resources/static/editor-app/configuration/properties-oa-node-manage-controller.js index 0097da0f..d196f502 100644 --- a/module-activiti/src/main/resources/static/editor-app/configuration/properties-oa-node-manage-controller.js +++ b/module-activiti/src/main/resources/static/editor-app/configuration/properties-oa-node-manage-controller.js @@ -524,6 +524,9 @@ var OaNodeManagePopupCtrl = ['$scope', '$timeout', '$http', function ($scope, $t updateAssignee(); return; } + if (assignee.assigneeType === 'form') { + updateAssignee() + } return; } @@ -614,7 +617,6 @@ var OaNodeManagePopupCtrl = ['$scope', '$timeout', '$http', function ($scope, $t } } - $scope.property.value = {}; $scope.property.value = $scope.oaNodeManage; $scope.updatePropertyInModel($scope.property); diff --git a/module-activiti/src/main/resources/static/editor-app/configuration/properties/oa-node-manage-popup.html b/module-activiti/src/main/resources/static/editor-app/configuration/properties/oa-node-manage-popup.html index f1a79a62..46498ef3 100644 --- a/module-activiti/src/main/resources/static/editor-app/configuration/properties/oa-node-manage-popup.html +++ b/module-activiti/src/main/resources/static/editor-app/configuration/properties/oa-node-manage-popup.html @@ -113,6 +113,9 @@ + diff --git a/module-activiti/src/main/resources/templates/oa/list-start-of-mine.html b/module-activiti/src/main/resources/templates/oa/list-start-of-mine.html new file mode 100644 index 00000000..ef3a53a6 --- /dev/null +++ b/module-activiti/src/main/resources/templates/oa/list-start-of-mine.html @@ -0,0 +1,147 @@ + + + + + + + + + + + + + + +
+
+
+
+
+
+
+
+
+
+
+ + + + + \ No newline at end of file