Accueil Explorer Aide
S'inscrire Connexion
SG
/
pigx-wx-ui38
4
0
Fork 0
Fichiers Tickets 0 Pull Requests 0 Wiki
Parcourir la source

:recycle: 工作流重构，增加排他网关

冷冷 il y a 6 ans
Parent
e05e782fce
commit
6d0c722a28
7 fichiers modifiés avec 701 ajouts et 567 suppressions
Vue séparée Afficher les stats Diff
  1. 688 0
      doc/db/pigxx_ac.sql
  2. 0 563
      doc/db/pigxx_oa.sql
  3. 1 1
      pigx-config/src/main/resources/config/pigx-activiti-dev.yml
  4. 2 2
      pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/listener/LeaveProcessTaskListener.java
  5. 1 0
      pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/ActTaskServiceImpl.java
  6. 0 1
      pigx-visual/pigx-activiti/src/main/resources/static/editor-app/css/style-common.css
  7. 9 0
      pigx-visual/pigx-activiti/src/main/resources/static/modeler.html

Fichier diff supprimé car celui-ci est trop grand
+ 688 - 0
doc/db/pigxx_ac.sql


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 563
doc/db/pigxx_oa.sql


+ 1 - 1
pigx-config/src/main/resources/config/pigx-activiti-dev.yml
Voir le fichier 

@@ -23,4 +23,4 @@ spring:
 
     driver-class-name: com.mysql.cj.jdbc.Driver
 
     username: root
 
     password:  root
 
-    url: jdbc:mysql://pigx-mysql:3306/pigxx_ac?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
 
+    url: jdbc:mysql://pigx-mysql:3306/pigxx_ac?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true

+ 2 - 2
pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/listener/LeaveProcessTaskListener.java
Voir le fichier 

@@ -50,11 +50,11 @@ public class LeaveProcessTaskListener implements TaskListener {
 
 		R<List<SysUser>> result = userService.ancestorUsers(SecurityUtils.getUsername());
 
 
 		if (CollUtil.isEmpty(result.getData())) {
 
-			log.debug("用户 {} 不存在上级,任务单由当前用户审批", SecurityUtils.getUsername());
 
+			log.warn("用户 {} 不存在上级,任务单由当前用户审批", SecurityUtils.getUsername());
 
 			delegateTask.addCandidateUser(SecurityUtils.getUsername());
 
 		} else {
 
 			List<String> userList = result.getData().stream().map(SysUser::getUsername).collect(Collectors.toList());
 
-			log.debug("当前任务 {}，由 {}处理", delegateTask.getId(), userList);
 
+			log.warn("当前任务 {}，由 {}处理", delegateTask.getId(), userList);
 
 			delegateTask.addCandidateUsers(userList);
 
 		}

+ 1 - 0
pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/ActTaskServiceImpl.java
Voir le fichier 

@@ -151,6 +151,7 @@ public class ActTaskServiceImpl implements ActTaskService {
 
 
 		Map<String, Object> variables = new HashMap<>(1);
 
 		variables.put("flag", leaveBillDto.getTaskFlag());
 
+		variables.put("days", leaveBillDto.getDays());
 
 
 		taskService.complete(taskId, variables);
 
 		ProcessInstance pi = runtimeService.createProcessInstanceQuery()

+ 0 - 1
pigx-visual/pigx-activiti/src/main/resources/static/editor-app/css/style-common.css
Voir le fichier 

@@ -448,7 +448,6 @@ a.dropdown-toggle {
 
 /* Navigation */
 
 
 .navbar {
 
-    background-color: #333333;
 
     border: none;
 
     min-height: 40px;
 
 }

+ 9 - 0
pigx-visual/pigx-activiti/src/main/resources/static/modeler.html
Voir le fichier 

@@ -27,6 +27,15 @@
 
 
 </head>
 
 <body>
 
+
 
+	<div class="navbar navbar-fixed-top" role="navigation" id="main-header">
 
+	    <div class="navbar-header">
 
+            <a href="" ng-click="backToLanding()" class="navbar-brand"
 
+               title="{{'GENERAL.MAIN-TITLE' | translate}}"><span
 
+                    class="sr-only">{{'GENERAL.MAIN-TITLE' | translate}}</span></a>
 
+        </div>
 
+	</div>
 
+
 
 	<!--[if lt IE 9]>
 
 	<div class="unsupported-browser">
 
 	    <p class="alert error">You are using an unsupported browser. Please upgrade your browser in order to use the