1.2.12-SNAPSHOT

99f1faef · 雍欢 · df363ab1 · 99f1faef · 99f1faef · 99f1faef
Commit 99f1faef authored Mar 15, 2021 by 雍欢
24 changed files
--- a/huigou-bpm/pom.xml
+++ b/huigou-bpm/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>com.huigou</groupId>
        <artifactId>root</artifactId>
-        <version>1.2.11-SNAPSHOT</version>
+        <version>1.2.12-SNAPSHOT</version>
    </parent>
    <groupId>com.huigou</groupId>
    <artifactId>huigou-bpm</artifactId>

--- a/huigou-common/pom.xml
+++ b/huigou-common/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.huigou</groupId>
 		<artifactId>root</artifactId>
-		<version>1.2.11-SNAPSHOT</version>
+		<version>1.2.12-SNAPSHOT</version>
 	</parent>
 	<artifactId>huigou-common</artifactId>
 	<name>huigou-common</name>

--- a/huigou-core-api/pom.xml
+++ b/huigou-core-api/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>com.huigou</groupId>
        <artifactId>root</artifactId>
-        <version>1.2.11-SNAPSHOT</version>
+        <version>1.2.12-SNAPSHOT</version>
    </parent>
    <artifactId>huigou-core-api</artifactId>
    <name>huigou-core-api</name>

--- a/huigou-core-api/src/main/java/com/huigou/uasp/bpm/managment/application/ProcDefinitionApplication.java
+++ b/huigou-core-api/src/main/java/com/huigou/uasp/bpm/managment/application/ProcDefinitionApplication.java
@@ -150,4 +150,5 @@ public interface ProcDefinitionApplication {
     */
    List<ProcDefinition> queryProcUnitsForSequence(String processDefinitionKey);

+    ProcDefinition loadProcDefinitionByFormNo(String formNo);
 }
--- a/huigou-core-api/src/main/java/com/huigou/uasp/bpm/managment/repository/ProcDefinitionRespository.java
+++ b/huigou-core-api/src/main/java/com/huigou/uasp/bpm/managment/repository/ProcDefinitionRespository.java
@@ -30,4 +30,7 @@ public interface ProcDefinitionRespository extends JpaRepository<ProcDefinition,

    @Query("select count(p) from ProcDefinition p where p.nodeKindId='proc' and p.formNo=?1")
    long countByFormNo(String formNo);
+
+    @Query("select p from ProcDefinition p where p.nodeKindId='proc' and p.formNo=?1")
+    ProcDefinition findByFormNo(String formNo);
 }
--- a/huigou-core-impl/pom.xml
+++ b/huigou-core-impl/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.huigou</groupId>
 		<artifactId>root</artifactId>
-		<version>1.2.11-SNAPSHOT</version>
+		<version>1.2.12-SNAPSHOT</version>
 	</parent>
 	<artifactId>huigou-core-impl</artifactId>
 	<name>huigou-core-impl</name>

--- a/huigou-core-proxy/pom.xml
+++ b/huigou-core-proxy/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.huigou</groupId>
 		<artifactId>root</artifactId>
-		<version>1.2.11-SNAPSHOT</version>
+		<version>1.2.12-SNAPSHOT</version>
 	</parent>
 	<artifactId>huigou-core-proxy</artifactId>
 	<name>huigou-core-proxy</name>

--- a/huigou-data/pom.xml
+++ b/huigou-data/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>com.huigou</groupId>
        <artifactId>root</artifactId>
-        <version>1.2.11-SNAPSHOT</version>
+        <version>1.2.12-SNAPSHOT</version>
    </parent>
    <artifactId>huigou-data</artifactId>
    <name>huigou-data</name>

--- a/huigou-demo/pom.xml
+++ b/huigou-demo/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>root</artifactId>
        <groupId>com.huigou</groupId>
-        <version>1.2.11-SNAPSHOT</version>
+        <version>1.2.12-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>


--- a/huigou-demo/src/main/java/com/huigou/demo/application/impl/LeaveApplicationImpl.java
+++ b/huigou-demo/src/main/java/com/huigou/demo/application/impl/LeaveApplicationImpl.java
 package com.huigou.demo.application.impl;


+import com.huigou.uasp.bmp.common.BizBillStatus;
+import com.huigou.uasp.bpm.FlowBroker;
+import com.huigou.util.ClassHelper;
 import com.huigou.demo.application.LeaveApplication;
 import com.huigou.demo.domain.model.Leave;
 import com.huigou.demo.domain.query.LeaveQuery;
 import com.huigou.demo.mapper.LeaveMapper;
 import com.huigou.demo.repository.LeaveRepository;
-import com.huigou.uasp.bmp.common.BizBillStatus;
-import com.huigou.uasp.bmp.doc.attachment.application.AttachmentApplication;
-import com.huigou.uasp.bmp.doc.attachment.application.SecrecyLevelComparator;
-import com.huigou.uasp.bpm.FlowBroker;
-import com.huigou.util.ClassHelper;
+import org.activiti.engine.RuntimeService;
+import org.activiti.engine.TaskService;
 import org.activiti.engine.delegate.DelegateExecution;
 import org.activiti.engine.delegate.DelegateTask;
+import org.activiti.engine.runtime.ProcessInstance;
+import org.activiti.engine.task.Task;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

@@ -26,7 +28,18 @@ public class LeaveApplicationImpl extends FlowBroker implements LeaveApplication

    private LeaveRepository leaveRepository;
    private LeaveMapper leaveMapper;
-    private AttachmentApplication attachmentApplication;
+
+    @Autowired
+    private RuntimeService runtimeService;
+    @Autowired
+    private TaskService taskService;
+
+    public void test() {
+        Task task = taskService.createTaskQuery().taskId("taskId").singleResult();
+        ProcessInstance pi = runtimeService.createProcessInstanceQuery()
+                .processInstanceId( task.getProcessInstanceId())
+                .singleResult();
+    }

    @Autowired
    public void setLeaveRepository(LeaveRepository leaveRepository) {
@@ -38,10 +51,6 @@ public class LeaveApplicationImpl extends FlowBroker implements LeaveApplication
        this.leaveMapper = leaveMapper;
    }

-    @Autowired
-    public void setAttachmentApplication(AttachmentApplication attachmentApplication) {
-        this.attachmentApplication = attachmentApplication;
-    }

    @Override
    public Leave loadLeaveById(String id) {
@@ -61,14 +70,15 @@ public class LeaveApplicationImpl extends FlowBroker implements LeaveApplication
        if (leave.isNew()) {
            leave.setStatusId(BizBillStatus.APPLYING.getId());
        } else {
-            // 修改数据的时候，需要校验表单中的密级密级是否与表单、人员密级匹配
            leave = (Leave) commonDomainService.loadAndFillinProperties(leave);
-            attachmentApplication.checkAttachmentSecretLevel("demoLeave", leave.getId(), leave.getSecretLevel());
        }
+        leave = leaveRepository.save(leave);
+
        return leave.getId();
    }


+
    @Override
    protected Map<String, Object> getProcessBizParams(String bizId) {
        // 返回业务数据给流程实例，

--- a/huigou-explorer/pom.xml
+++ b/huigou-explorer/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>root</artifactId>
        <groupId>com.huigou</groupId>
-        <version>1.2.11-SNAPSHOT</version>
+        <version>1.2.12-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

@@ -67,4 +67,4 @@
        </repository>
    </distributionManagement>

-</project>
\ No newline at end of file
+</project>
--- a/huigou-explorer/src/main/java/com/huigou/explorer/controller/ModelController.java
+++ b/huigou-explorer/src/main/java/com/huigou/explorer/controller/ModelController.java
@@ -89,9 +89,25 @@ public class ModelController extends CommonController implements ApplicationCont
    @RequiresPermissions("ProcDefinition:query")
    @LogInfo(logType = LogType.SYS, subType = "", operaionType = OperationType.VIEW, description = "跳转到流程模型页面")
    public String forwardModeler() {
-        String id = getSDO().getId();
-        Assert.hasText(id, "流程id不能为空");
-        ProcDefinition pd = procDefinitionApplication.loadProcDefinition(id);
+        SDO sdo = getSDO();
+        String id = sdo.getId();
+        ProcDefinition pd;
+        if (StringUtils.isNotBlank(id)) {
+            pd = procDefinitionApplication.loadProcDefinition(id);
+        } else {
+            String formNo = sdo.getString("formNo");
+            pd = procDefinitionApplication.loadProcDefinitionByFormNo(formNo);
+            if (pd == null) {
+                pd = new ProcDefinition();
+                pd.setCode(formNo);
+                pd.setFormNo(formNo);
+                pd.setProcId(formNo);
+                pd.setProcName(formNo);
+                pd.setParentId(ProcDefinition.ROOT_ID);
+                pd.setNodeKindId("proc");
+                procDefinitionApplication.insertProcDefinition(pd);
+            }
+        }
        return forward("modeler", pd);
    }


--- a/huigou-form/pom.xml
+++ b/huigou-form/pom.xml
@@ -9,7 +9,7 @@
    <version>1.0.0-SNAPSHOT</version>

    <properties>
-        <huigou.version>1.2.11-SNAPSHOT</huigou.version>
+        <huigou.version>1.2.12-SNAPSHOT</huigou.version>
    </properties>

    <dependencies>

--- a/huigou-loader/pom.xml
+++ b/huigou-loader/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.huigou</groupId>
 		<artifactId>root</artifactId>
-		<version>1.2.11-SNAPSHOT</version>
+		<version>1.2.12-SNAPSHOT</version>
 	</parent>
 	<artifactId>huigou-loader</artifactId>
 	<packaging>jar</packaging>

--- a/huigou-rule/pom.xml
+++ b/huigou-rule/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>root</artifactId>
        <groupId>com.huigou</groupId>
-        <version>1.2.11-SNAPSHOT</version>
+        <version>1.2.12-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>


--- a/huigou-system-common/pom.xml
+++ b/huigou-system-common/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.huigou</groupId>
 		<artifactId>root</artifactId>
-		<version>1.2.11-SNAPSHOT</version>
+		<version>1.2.12-SNAPSHOT</version>
 	</parent>

 	<artifactId>huigou-system-common</artifactId>

--- a/huigou-uasp/pom.xml
+++ b/huigou-uasp/pom.xml
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.huigou</groupId>
        <artifactId>root</artifactId>
-        <version>1.2.11-SNAPSHOT</version>
+        <version>1.2.12-SNAPSHOT</version>
    </parent>
    <artifactId>huigou-uasp</artifactId>
    <name>huigou-uasp</name>
@@ -346,7 +346,7 @@
        <dependency>
            <groupId>com.topsunit</groupId>
            <artifactId>query-spring</artifactId>
-            <version>1.2.11-SNAPSHOT</version>
+            <version>1.2.12-SNAPSHOT</version>
        </dependency>
        <dependency>
            <groupId>net.sf.cssbox</groupId>

--- a/huigou-uasp/src/main/java/com/huigou/uasp/bpm/managment/application/impl/ProcDefinitionApplicationImpl.java
+++ b/huigou-uasp/src/main/java/com/huigou/uasp/bpm/managment/application/impl/ProcDefinitionApplicationImpl.java
@@ -325,4 +325,9 @@ public class ProcDefinitionApplicationImpl extends BaseApplication implements Pr
        Assert.hasText(processDefinitionKey, "参数processDefinitionKey不能为空。");
        return this.procDefinitionRespository.findProcUnitsForSequnce(processDefinitionKey);
    }
+
+    @Override
+    public ProcDefinition loadProcDefinitionByFormNo(String formNo) {
+        return procDefinitionRespository.findByFormNo(formNo);
+    }
 }
--- a/huigou-webservice/pom.xml
+++ b/huigou-webservice/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>root</artifactId>
        <groupId>com.huigou</groupId>
-        <version>1.2.11-SNAPSHOT</version>
+        <version>1.2.12-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>


--- a/huigou-xt/pom.xml
+++ b/huigou-xt/pom.xml
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.huigou</groupId>
        <artifactId>root</artifactId>
-        <version>1.2.11-SNAPSHOT</version>
+        <version>1.2.12-SNAPSHOT</version>
    </parent>
    <artifactId>huigou-xt</artifactId>
    <name>huigou-xt</name>

--- a/huigou-xt/src/main/webapp/formdesign/form-making/css/chunk-vendors.css
+++ b/huigou-xt/src/main/webapp/formdesign/form-making/css/chunk-vendors.css
--- a/huigou-xt/src/main/webapp/formdesign/form-making/js/chunk-vendors.js
+++ b/huigou-xt/src/main/webapp/formdesign/form-making/js/chunk-vendors.js
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@

    <groupId>com.huigou</groupId>
    <artifactId>root</artifactId>
-    <version>1.2.11-SNAPSHOT</version>
+    <version>1.2.12-SNAPSHOT</version>
    <packaging>pom</packaging>

    <modules>
@@ -164,7 +164,7 @@
        <!-- test -->
        <junit.version>4.13</junit.version>
        <spring-data-mongodb.version>1.9.3.RELEASE</spring-data-mongodb.version>
-        <huigou.uasp.version>1.2.11-SNAPSHOT</huigou.uasp.version>
+        <huigou.uasp.version>1.2.12-SNAPSHOT</huigou.uasp.version>
         <classgraph.version>4.8.43</classgraph.version>
         <fastjson.version>1.2.59</fastjson.version>
        <jstyleparser.version>3.5</jstyleparser.version>

--- a/query-spring/pom.xml
+++ b/query-spring/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>com.huigou</groupId>
        <artifactId>root</artifactId>
-        <version>1.2.11-SNAPSHOT</version>
+        <version>1.2.12-SNAPSHOT</version>
    </parent>

    <groupId>com.topsunit</groupId>
@@ -79,4 +79,4 @@
        </repository>
    </distributionManagement>

-</project>
\ No newline at end of file
+</project>