加入当前表单

java110-bean/src/main/java/com/java110/dto/oaWorkflow/OaWorkflowDto.java

@@ -27,7 +27,7 @@ public class OaWorkflowDto extends PageDto implements Serializable {
     private String flowType;
     private String processDefinitionKey;
     private String state;
-
+    private String curFormId;
 
     private Date createTime;
 
@@ -122,4 +122,12 @@ public class OaWorkflowDto extends PageDto implements Serializable {
     public void setState(String state) {
         this.state = state;
     }
+
+    public String getCurFormId() {
+        return curFormId;
+    }
+
+    public void setCurFormId(String curFormId) {
+        this.curFormId = curFormId;
+    }
 }

java110-bean/src/main/java/com/java110/po/oaWorkflow/OaWorkflowPo.java

@@ -14,6 +14,7 @@ public class OaWorkflowPo implements Serializable {
     private String flowType;
     private String state;
     private String processDefinitionKey;
+    private String curFormId;
 
     public String getDescrible() {
         return describle;
@@ -94,4 +95,13 @@ public class OaWorkflowPo implements Serializable {
     public void setState(String state) {
         this.state = state;
     }
+
+
+    public String getCurFormId() {
+        return curFormId;
+    }
+
+    public void setCurFormId(String curFormId) {
+        this.curFormId = curFormId;
+    }
 }

java110-db/src/main/resources/mapper/oa/OaWorkflowServiceDaoImplMapper.xml

@@ -20,7 +20,7 @@
         select t.describle,t.model_id,t.model_id modelId,t.status_cd,t.status_cd statusCd,t.flow_key,t.flow_key
         flowKey,t.store_id,t.store_id storeId,t.flow_id,t.flow_id flowId,t.flow_name,t.flow_name
         flowName,t.flow_type,t.flow_type flowType,t.process_definition_key,t.process_definition_key processDefinitionKey,
-        t.create_time createTime,t.state
+        t.create_time createTime,t.state,t.cur_form_id curFormId
         from oa_workflow t
         where 1 =1
         <if test="describle !=null and describle != ''">
@@ -50,6 +50,9 @@
         <if test="flowType !=null and flowType != ''">
             and t.flow_type= #{flowType}
         </if>
+        <if test="curFormId !=null and curFormId != ''">
+            and t.cur_form_id= #{curFormId}
+        </if>
         <if test="processDefinitionKey !=null and processDefinitionKey != ''">
             and t.process_definition_key= #{processDefinitionKey}
         </if>
@@ -86,6 +89,9 @@
         <if test="flowType !=null and flowType != ''">
             , t.flow_type= #{flowType}
         </if>
+        <if test="curFormId !=null and curFormId != ''">
+            , t.cur_form_id= #{curFormId}
+        </if>
         <if test="processDefinitionKey !=null and processDefinitionKey != ''">
             , t.process_definition_key= #{processDefinitionKey}
         </if>
@@ -131,6 +137,9 @@
         <if test="flowType !=null and flowType != ''">
             and t.flow_type= #{flowType}
         </if>
+        <if test="curFormId !=null and curFormId != ''">
+            and t.cur_form_id= #{curFormId}
+        </if>
         <if test="processDefinitionKey !=null and processDefinitionKey != ''">
             and t.process_definition_key= #{processDefinitionKey}
         </if>

service-oa/src/main/java/com/java110/oa/bmo/oaWorkflowForm/impl/SaveOaWorkflowFormBMOImpl.java

@@ -58,6 +58,7 @@ public class SaveOaWorkflowFormBMOImpl implements ISaveOaWorkflowFormBMO {
         OaWorkflowPo oaWorkflowPo = new OaWorkflowPo();
         oaWorkflowPo.setFlowId(oaWorkflowFormPo.getFlowId());
         oaWorkflowPo.setState(OaWorkflowDto.STATE_WAIT);
+        oaWorkflowPo.setCurFormId(oaWorkflowFormPo.getFormId());
         flag = oaWorkflowInnerServiceSMOImpl.updateOaWorkflow(oaWorkflowPo);
         if (flag < 1) {
             return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");