Skip to content

T
test
Commit 99f1faef authored by 雍欢's avatar 雍欢
Browse files
Options

1.2.12-SNAPSHOT

parent df363ab1
Show whitespace changes
Inline Side-by-side
Showing with 108 additions and 73 deletions
huigou-bpm/pom.xml
View file @ 99f1faef
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<parent> <parent>
<groupId>com.huigou</groupId> <groupId>com.huigou</groupId>
<artifactId>root</artifactId> <artifactId>root</artifactId>
<version>1.2.11-SNAPSHOT</version> <version>1.2.12-SNAPSHOT</version>
</parent> </parent>
<groupId>com.huigou</groupId> <groupId>com.huigou</groupId>
<artifactId>huigou-bpm</artifactId> <artifactId>huigou-bpm</artifactId>
......
huigou-common/pom.xml
View file @ 99f1faef
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<parent> <parent>
<groupId>com.huigou</groupId> <groupId>com.huigou</groupId>
<artifactId>root</artifactId> <artifactId>root</artifactId>
<version>1.2.11-SNAPSHOT</version> <version>1.2.12-SNAPSHOT</version>
</parent> </parent>
<artifactId>huigou-common</artifactId> <artifactId>huigou-common</artifactId>
<name>huigou-common</name> <name>huigou-common</name>
......
huigou-core-api/pom.xml
View file @ 99f1faef
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<parent> <parent>
<groupId>com.huigou</groupId> <groupId>com.huigou</groupId>
<artifactId>root</artifactId> <artifactId>root</artifactId>
<version>1.2.11-SNAPSHOT</version> <version>1.2.12-SNAPSHOT</version>
</parent> </parent>
<artifactId>huigou-core-api</artifactId> <artifactId>huigou-core-api</artifactId>
<name>huigou-core-api</name> <name>huigou-core-api</name>
......
huigou-core-api/src/main/java/com/huigou/uasp/bpm/managment/application/ProcDefinitionApplication.java
View file @ 99f1faef
...@@ -150,4 +150,5 @@ public interface ProcDefinitionApplication { ...@@ -150,4 +150,5 @@ public interface ProcDefinitionApplication {
*/ */
List<ProcDefinition> queryProcUnitsForSequence(String processDefinitionKey); List<ProcDefinition> queryProcUnitsForSequence(String processDefinitionKey);
ProcDefinition loadProcDefinitionByFormNo(String formNo);
} }
huigou-core-api/src/main/java/com/huigou/uasp/bpm/managment/repository/ProcDefinitionRespository.java
View file @ 99f1faef
...@@ -30,4 +30,7 @@ public interface ProcDefinitionRespository extends JpaRepository<ProcDefinition, ...@@ -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") @Query("select count(p) from ProcDefinition p where p.nodeKindId='proc' and p.formNo=?1")
long countByFormNo(String formNo); long countByFormNo(String formNo);
@Query("select p from ProcDefinition p where p.nodeKindId='proc' and p.formNo=?1")
ProcDefinition findByFormNo(String formNo);
} }
huigou-core-impl/pom.xml
View file @ 99f1faef
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<parent> <parent>
<groupId>com.huigou</groupId> <groupId>com.huigou</groupId>
<artifactId>root</artifactId> <artifactId>root</artifactId>
<version>1.2.11-SNAPSHOT</version> <version>1.2.12-SNAPSHOT</version>
</parent> </parent>
<artifactId>huigou-core-impl</artifactId> <artifactId>huigou-core-impl</artifactId>
<name>huigou-core-impl</name> <name>huigou-core-impl</name>
......
huigou-core-proxy/pom.xml
View file @ 99f1faef
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<parent> <parent>
<groupId>com.huigou</groupId> <groupId>com.huigou</groupId>
<artifactId>root</artifactId> <artifactId>root</artifactId>
<version>1.2.11-SNAPSHOT</version> <version>1.2.12-SNAPSHOT</version>
</parent> </parent>
<artifactId>huigou-core-proxy</artifactId> <artifactId>huigou-core-proxy</artifactId>
<name>huigou-core-proxy</name> <name>huigou-core-proxy</name>
......
huigou-data/pom.xml
View file @ 99f1faef
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<parent> <parent>
<groupId>com.huigou</groupId> <groupId>com.huigou</groupId>
<artifactId>root</artifactId> <artifactId>root</artifactId>
<version>1.2.11-SNAPSHOT</version> <version>1.2.12-SNAPSHOT</version>
</parent> </parent>
<artifactId>huigou-data</artifactId> <artifactId>huigou-data</artifactId>
<name>huigou-data</name> <name>huigou-data</name>
......
huigou-demo/pom.xml
View file @ 99f1faef
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>root</artifactId> <artifactId>root</artifactId>
<groupId>com.huigou</groupId> <groupId>com.huigou</groupId>
<version>1.2.11-SNAPSHOT</version> <version>1.2.12-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
huigou-demo/src/main/java/com/huigou/demo/application/impl/LeaveApplicationImpl.java
View file @ 99f1faef
package com.huigou.demo.application.impl; 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.application.LeaveApplication;
import com.huigou.demo.domain.model.Leave; import com.huigou.demo.domain.model.Leave;
import com.huigou.demo.domain.query.LeaveQuery; import com.huigou.demo.domain.query.LeaveQuery;
import com.huigou.demo.mapper.LeaveMapper; import com.huigou.demo.mapper.LeaveMapper;
import com.huigou.demo.repository.LeaveRepository; import com.huigou.demo.repository.LeaveRepository;
import com.huigou.uasp.bmp.common.BizBillStatus; import org.activiti.engine.RuntimeService;
import com.huigou.uasp.bmp.doc.attachment.application.AttachmentApplication; import org.activiti.engine.TaskService;
import com.huigou.uasp.bmp.doc.attachment.application.SecrecyLevelComparator;
import com.huigou.uasp.bpm.FlowBroker;
import com.huigou.util.ClassHelper;
import org.activiti.engine.delegate.DelegateExecution; import org.activiti.engine.delegate.DelegateExecution;
import org.activiti.engine.delegate.DelegateTask; 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.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -26,7 +28,18 @@ public class LeaveApplicationImpl extends FlowBroker implements LeaveApplication ...@@ -26,7 +28,18 @@ public class LeaveApplicationImpl extends FlowBroker implements LeaveApplication
private LeaveRepository leaveRepository; private LeaveRepository leaveRepository;
private LeaveMapper leaveMapper; 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 @Autowired
public void setLeaveRepository(LeaveRepository leaveRepository) { public void setLeaveRepository(LeaveRepository leaveRepository) {
...@@ -38,10 +51,6 @@ public class LeaveApplicationImpl extends FlowBroker implements LeaveApplication ...@@ -38,10 +51,6 @@ public class LeaveApplicationImpl extends FlowBroker implements LeaveApplication
this.leaveMapper = leaveMapper; this.leaveMapper = leaveMapper;
} }
@Autowired
public void setAttachmentApplication(AttachmentApplication attachmentApplication) {
this.attachmentApplication = attachmentApplication;
}
@Override @Override
public Leave loadLeaveById(String id) { public Leave loadLeaveById(String id) {
...@@ -61,14 +70,15 @@ public class LeaveApplicationImpl extends FlowBroker implements LeaveApplication ...@@ -61,14 +70,15 @@ public class LeaveApplicationImpl extends FlowBroker implements LeaveApplication
if (leave.isNew()) { if (leave.isNew()) {
leave.setStatusId(BizBillStatus.APPLYING.getId()); leave.setStatusId(BizBillStatus.APPLYING.getId());
} else { } else {
// 修改数据的时候，需要校验表单中的密级密级是否与表单、人员密级匹配
leave = (Leave) commonDomainService.loadAndFillinProperties(leave); leave = (Leave) commonDomainService.loadAndFillinProperties(leave);
attachmentApplication.checkAttachmentSecretLevel("demoLeave", leave.getId(), leave.getSecretLevel());
} }
leave = leaveRepository.save(leave);
return leave.getId(); return leave.getId();
} }
@Override @Override
protected Map<String, Object> getProcessBizParams(String bizId) { protected Map<String, Object> getProcessBizParams(String bizId) {
// 返回业务数据给流程实例， // 返回业务数据给流程实例，
......
huigou-explorer/pom.xml
View file @ 99f1faef
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>root</artifactId> <artifactId>root</artifactId>
<groupId>com.huigou</groupId> <groupId>com.huigou</groupId>
<version>1.2.11-SNAPSHOT</version> <version>1.2.12-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
huigou-explorer/src/main/java/com/huigou/explorer/controller/ModelController.java
View file @ 99f1faef
...@@ -89,9 +89,25 @@ public class ModelController extends CommonController implements ApplicationCont ...@@ -89,9 +89,25 @@ public class ModelController extends CommonController implements ApplicationCont
@RequiresPermissions("ProcDefinition:query") @RequiresPermissions("ProcDefinition:query")
@LogInfo(logType = LogType.SYS, subType = "", operaionType = OperationType.VIEW, description = "跳转到流程模型页面") @LogInfo(logType = LogType.SYS, subType = "", operaionType = OperationType.VIEW, description = "跳转到流程模型页面")
public String forwardModeler() { public String forwardModeler() {
String id = getSDO().getId(); SDO sdo = getSDO();
Assert.hasText(id, "流程id不能为空"); String id = sdo.getId();
ProcDefinition pd = procDefinitionApplication.loadProcDefinition(id); 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); return forward("modeler", pd);
} }
......
huigou-form/pom.xml
View file @ 99f1faef
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<version>1.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<properties> <properties>
<huigou.version>1.2.11-SNAPSHOT</huigou.version> <huigou.version>1.2.12-SNAPSHOT</huigou.version>
</properties> </properties>
<dependencies> <dependencies>
......
huigou-loader/pom.xml
View file @ 99f1faef
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.huigou</groupId> <groupId>com.huigou</groupId>
<artifactId>root</artifactId> <artifactId>root</artifactId>
<version>1.2.11-SNAPSHOT</version> <version>1.2.12-SNAPSHOT</version>
</parent> </parent>
<artifactId>huigou-loader</artifactId> <artifactId>huigou-loader</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
......
huigou-rule/pom.xml
View file @ 99f1faef
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>root</artifactId> <artifactId>root</artifactId>
<groupId>com.huigou</groupId> <groupId>com.huigou</groupId>
<version>1.2.11-SNAPSHOT</version> <version>1.2.12-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
huigou-system-common/pom.xml
View file @ 99f1faef
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.huigou</groupId> <groupId>com.huigou</groupId>
<artifactId>root</artifactId> <artifactId>root</artifactId>
<version>1.2.11-SNAPSHOT</version> <version>1.2.12-SNAPSHOT</version>
</parent> </parent>
<artifactId>huigou-system-common</artifactId> <artifactId>huigou-system-common</artifactId>
......
huigou-uasp/pom.xml
View file @ 99f1faef
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.huigou</groupId> <groupId>com.huigou</groupId>
<artifactId>root</artifactId> <artifactId>root</artifactId>
<version>1.2.11-SNAPSHOT</version> <version>1.2.12-SNAPSHOT</version>
</parent> </parent>
<artifactId>huigou-uasp</artifactId> <artifactId>huigou-uasp</artifactId>
<name>huigou-uasp</name> <name>huigou-uasp</name>
...@@ -346,7 +346,7 @@ ...@@ -346,7 +346,7 @@
<dependency> <dependency>
<groupId>com.topsunit</groupId> <groupId>com.topsunit</groupId>
<artifactId>query-spring</artifactId> <artifactId>query-spring</artifactId>
<version>1.2.11-SNAPSHOT</version> <version>1.2.12-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.sf.cssbox</groupId> <groupId>net.sf.cssbox</groupId>
......
huigou-uasp/src/main/java/com/huigou/uasp/bpm/managment/application/impl/ProcDefinitionApplicationImpl.java
View file @ 99f1faef
...@@ -325,4 +325,9 @@ public class ProcDefinitionApplicationImpl extends BaseApplication implements Pr ...@@ -325,4 +325,9 @@ public class ProcDefinitionApplicationImpl extends BaseApplication implements Pr
Assert.hasText(processDefinitionKey, "参数processDefinitionKey不能为空。"); Assert.hasText(processDefinitionKey, "参数processDefinitionKey不能为空。");
return this.procDefinitionRespository.findProcUnitsForSequnce(processDefinitionKey); return this.procDefinitionRespository.findProcUnitsForSequnce(processDefinitionKey);
} }
@Override
public ProcDefinition loadProcDefinitionByFormNo(String formNo) {
return procDefinitionRespository.findByFormNo(formNo);
}
} }
huigou-webservice/pom.xml
View file @ 99f1faef
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>root</artifactId> <artifactId>root</artifactId>
<groupId>com.huigou</groupId> <groupId>com.huigou</groupId>
<version>1.2.11-SNAPSHOT</version> <version>1.2.12-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
huigou-xt/pom.xml
View file @ 99f1faef
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.huigou</groupId> <groupId>com.huigou</groupId>
<artifactId>root</artifactId> <artifactId>root</artifactId>
<version>1.2.11-SNAPSHOT</version> <version>1.2.12-SNAPSHOT</version>
</parent> </parent>
<artifactId>huigou-xt</artifactId> <artifactId>huigou-xt</artifactId>
<name>huigou-xt</name> <name>huigou-xt</name>
......
huigou-xt/src/main/webapp/formdesign/form-making/css/chunk-vendors.css
View file @ 99f1faef
This source diff could not be displayed because it is too large. You can view the blob instead.
huigou-xt/src/main/webapp/formdesign/form-making/js/chunk-vendors.js
View file @ 99f1faef
This source diff could not be displayed because it is too large. You can view the blob instead.
pom.xml
View file @ 99f1faef
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<groupId>com.huigou</groupId> <groupId>com.huigou</groupId>
<artifactId>root</artifactId> <artifactId>root</artifactId>
<version>1.2.11-SNAPSHOT</version> <version>1.2.12-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<modules> <modules>
...@@ -164,7 +164,7 @@ ...@@ -164,7 +164,7 @@
<!-- test --> <!-- test -->
<junit.version>4.13</junit.version> <junit.version>4.13</junit.version>
<spring-data-mongodb.version>1.9.3.RELEASE</spring-data-mongodb.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> <classgraph.version>4.8.43</classgraph.version>
<fastjson.version>1.2.59</fastjson.version> <fastjson.version>1.2.59</fastjson.version>
<jstyleparser.version>3.5</jstyleparser.version> <jstyleparser.version>3.5</jstyleparser.version>
......
query-spring/pom.xml
View file @ 99f1faef
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<parent> <parent>
<groupId>com.huigou</groupId> <groupId>com.huigou</groupId>
<artifactId>root</artifactId> <artifactId>root</artifactId>
<version>1.2.11-SNAPSHOT</version> <version>1.2.12-SNAPSHOT</version>
</parent> </parent>
<groupId>com.topsunit</groupId> <groupId>com.topsunit</groupId>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment