Ver código fonte

工作流开发完成

wuxw 6 anos atrás
pai
commit
e26e4ef3fc

+ 2 - 2
CommonService/src/main/java/com/java110/common/smo/impl/ResourceEntryStoreInnerServiceSMOImpl.java

@@ -83,7 +83,7 @@ public class ResourceEntryStoreInnerServiceSMOImpl extends BaseServiceSMO implem
     public boolean agreeCompleteTask(@RequestBody ResourceOrderDto resourceOrderDto) {
         TaskService taskService = processEngine.getTaskService();
         Map<String, Object> variables = new HashMap<String, Object>();
-        variables.put("auditFlag", true);
+        variables.put("auditCode", resourceOrderDto.getAuditCode());
         taskService.complete(resourceOrderDto.getTaskId(), variables);
         return true;
     }
@@ -91,7 +91,7 @@ public class ResourceEntryStoreInnerServiceSMOImpl extends BaseServiceSMO implem
     public boolean refuteCompleteTask(@RequestBody ResourceOrderDto resourceOrderDto) {
         TaskService taskService = processEngine.getTaskService();
         Map<String, Object> variables = new HashMap<String, Object>();
-        variables.put("auditFlag", true);
+        variables.put("auditCode", resourceOrderDto.getAuditCode());
         taskService.complete(resourceOrderDto.getTaskId(), variables);
         return true;
     }

+ 4 - 4
CommonService/src/main/resources/processes/resourceEnter.bpmn

@@ -12,24 +12,24 @@
     <sequenceFlow id="_6" sourceRef="_2" targetRef="_3"/>
     <sequenceFlow id="_7" sourceRef="_3" targetRef="_4">
       <conditionExpression xsi:type="tFormalExpression">
-        <![CDATA[${auditFlag==true}]]>
+        <![CDATA[${auditCode==10000}]]>
       </conditionExpression>
     </sequenceFlow>
     <userTask activiti:exclusive="true" id="_9" name="buyer"/>
     <sequenceFlow id="_10" sourceRef="_4" targetRef="_9">
       <conditionExpression xsi:type="tFormalExpression">
-        <![CDATA[${auditFlag==true}]]>
+        <![CDATA[${auditCode==10000}]]>
       </conditionExpression>
     </sequenceFlow>
     <sequenceFlow id="_11" sourceRef="_9" targetRef="_5"/>
     <sequenceFlow id="_8" sourceRef="_3" targetRef="_5">
       <conditionExpression xsi:type="tFormalExpression">
-        <![CDATA[${auditFlag == false}]]>
+        <![CDATA[${auditCode==20000}]]>
       </conditionExpression>
     </sequenceFlow>
     <sequenceFlow id="_12" sourceRef="_4" targetRef="_5">
       <conditionExpression xsi:type="tFormalExpression">
-        <![CDATA[${auditFlag==false}]]>
+        <![CDATA[${auditCode==20000}]]>
       </conditionExpression>
     </sequenceFlow>
     <textAnnotation id="_13" textFormat="text/plain">

Diferenças do arquivo suprimidas por serem muito extensas
+ 1171 - 1702
docs/hc小区管理系统数据库模型v1.0.pdb


Diferenças do arquivo suprimidas por serem muito extensas
+ 1170 - 1701
docs/hc小区管理系统数据库模型v1.0.pdm


+ 7 - 0
java110-utils/src/main/java/com/java110/utils/constant/BusinessTypeConstant.java

@@ -556,5 +556,12 @@ public class BusinessTypeConstant {
      */
     public static final String BUSINESS_TYPE_DELETE_AUDIT_MESSAGE ="170200050001";
 
+    /**
+     * 启动工作流流程
+     */
+    public static final String BUSINESS_TYPE_START_PROCESS ="180200030001";
+   /* public static final String BUSINESS_TYPE_DELETE_AUDIT_MESSAGE ="170200050001";
+    public static final String BUSINESS_TYPE_DELETE_AUDIT_MESSAGE ="170200050001";
+*/
 
 }