加入OA表单功能

java110-bean/src/main/java/com/java110/dto/oaWorkflowForm/OaWorkflowFormDto.java

@@ -0,0 +1,95 @@
+package com.java110.dto.oaWorkflowForm;
+
+import com.java110.dto.PageDto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @ClassName FloorDto
+ * @Description OA表单数据层封装
+ * @Author wuxw
+ * @Date 2019/4/24 8:52
+ * @Version 1.0
+ * add by wuxw 2019/4/24
+ **/
+public class OaWorkflowFormDto extends PageDto implements Serializable {
+
+    private String formId;
+    private String formJson;
+    private String storeId;
+    private String flowId;
+    private String version;
+    private String tableName;
+
+
+    private Date createTime;
+
+    private String statusCd = "0";
+
+
+    public String getFormId() {
+        return formId;
+    }
+
+    public void setFormId(String formId) {
+        this.formId = formId;
+    }
+
+    public String getFormJson() {
+        return formJson;
+    }
+
+    public void setFormJson(String formJson) {
+        this.formJson = formJson;
+    }
+
+    public String getStoreId() {
+        return storeId;
+    }
+
+    public void setStoreId(String storeId) {
+        this.storeId = storeId;
+    }
+
+    public String getFlowId() {
+        return flowId;
+    }
+
+    public void setFlowId(String flowId) {
+        this.flowId = flowId;
+    }
+
+    public String getVersion() {
+        return version;
+    }
+
+    public void setVersion(String version) {
+        this.version = version;
+    }
+
+    public String getTableName() {
+        return tableName;
+    }
+
+    public void setTableName(String tableName) {
+        this.tableName = tableName;
+    }
+
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getStatusCd() {
+        return statusCd;
+    }
+
+    public void setStatusCd(String statusCd) {
+        this.statusCd = statusCd;
+    }
+}

java110-bean/src/main/java/com/java110/po/oaWorkflowForm/OaWorkflowFormPo.java

@@ -0,0 +1,72 @@
+package com.java110.po.oaWorkflowForm;
+
+import java.io.Serializable;
+
+public class OaWorkflowFormPo implements Serializable {
+
+    private String formId;
+    private String statusCd = "0";
+    private String formJson;
+    private String storeId;
+    private String flowId;
+    private String version;
+    private String tableName;
+
+    public String getFormId() {
+        return formId;
+    }
+
+    public void setFormId(String formId) {
+        this.formId = formId;
+    }
+
+    public String getStatusCd() {
+        return statusCd;
+    }
+
+    public void setStatusCd(String statusCd) {
+        this.statusCd = statusCd;
+    }
+
+    public String getFormJson() {
+        return formJson;
+    }
+
+    public void setFormJson(String formJson) {
+        this.formJson = formJson;
+    }
+
+    public String getStoreId() {
+        return storeId;
+    }
+
+    public void setStoreId(String storeId) {
+        this.storeId = storeId;
+    }
+
+    public String getFlowId() {
+        return flowId;
+    }
+
+    public void setFlowId(String flowId) {
+        this.flowId = flowId;
+    }
+
+    public String getVersion() {
+        return version;
+    }
+
+    public void setVersion(String version) {
+        this.version = version;
+    }
+
+    public String getTableName() {
+        return tableName;
+    }
+
+    public void setTableName(String tableName) {
+        this.tableName = tableName;
+    }
+
+
+}

java110-core/src/main/java/com/java110/core/factory/GenerateCodeFactory.java

@@ -217,6 +217,7 @@ public class GenerateCodeFactory {
     public static final String CODE_PREFIX_backId = "78";
     public static final String CODE_PREFIX_monthId = "79";
     public static final String CODE_PREFIX_xmlId = "79";
+    public static final String CODE_PREFIX_formId = "80";
 
 
 

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

@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="oaWorkflowFormServiceDaoImpl">
+
+
+    <!-- 保存OA表单信息 add by wuxw 2018-07-03 -->
+    <insert id="saveOaWorkflowFormInfo" parameterType="Map">
+        insert into oa_workflow_form(
+        form_id,form_json,store_id,flow_id,version,table_name
+        ) values (
+        #{formId},#{formJson},#{storeId},#{flowId},#{version},#{tableName}
+        )
+    </insert>
+
+
+    <!-- 查询OA表单信息 add by wuxw 2018-07-03 -->
+    <select id="getOaWorkflowFormInfo" parameterType="Map" resultType="Map">
+        select t.form_id,t.form_id formId,t.status_cd,t.status_cd statusCd,t.form_json,t.form_json
+        formJson,t.store_id,t.store_id storeId,t.flow_id,t.flow_id flowId,t.version,t.table_name,t.table_name tableName
+        from oa_workflow_form t
+        where 1 =1
+        <if test="formId !=null and formId != ''">
+            and t.form_id= #{formId}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="formJson !=null and formJson != ''">
+            and t.form_json= #{formJson}
+        </if>
+        <if test="storeId !=null and storeId != ''">
+            and t.store_id= #{storeId}
+        </if>
+        <if test="flowId !=null and flowId != ''">
+            and t.flow_id= #{flowId}
+        </if>
+        <if test="version !=null and version != ''">
+            and t.version= #{version}
+        </if>
+        <if test="tableName !=null and tableName != ''">
+            and t.table_name= #{tableName}
+        </if>
+        order by t.create_time desc
+        <if test="page != -1 and page != null ">
+            limit #{page}, #{row}
+        </if>
+
+    </select>
+
+
+    <!-- 修改OA表单信息 add by wuxw 2018-07-03 -->
+    <update id="updateOaWorkflowFormInfo" parameterType="Map">
+        update oa_workflow_form t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+        <if test="formId !=null and formId != ''">
+            , t.form_id= #{formId}
+        </if>
+        <if test="formJson !=null and formJson != ''">
+            , t.form_json= #{formJson}
+        </if>
+        <if test="storeId !=null and storeId != ''">
+            , t.store_id= #{storeId}
+        </if>
+        <if test="flowId !=null and flowId != ''">
+            , t.flow_id= #{flowId}
+        </if>
+        <if test="version !=null and version != ''">
+            , t.version= #{version}
+        </if>
+        <if test="tableName !=null and tableName != ''">
+            , t.table_name= #{tableName}
+        </if>
+        where 1=1
+    </update>
+
+    <!-- 查询OA表单数量 add by wuxw 2018-07-03 -->
+    <select id="queryOaWorkflowFormsCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from oa_workflow_form t
+        where 1 =1
+        <if test="formId !=null and formId != ''">
+            and t.form_id= #{formId}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="formJson !=null and formJson != ''">
+            and t.form_json= #{formJson}
+        </if>
+        <if test="storeId !=null and storeId != ''">
+            and t.store_id= #{storeId}
+        </if>
+        <if test="flowId !=null and flowId != ''">
+            and t.flow_id= #{flowId}
+        </if>
+        <if test="version !=null and version != ''">
+            and t.version= #{version}
+        </if>
+        <if test="tableName !=null and tableName != ''">
+            and t.table_name= #{tableName}
+        </if>
+
+
+    </select>
+
+</mapper>

java110-generator/src/main/resources/newBack/template_1.json

@@ -1,18 +1,19 @@
 {
   "autoMove": true,
   "id": "xmlId",
-  "name": "oaWorkflowXml",
-  "desc": "OA流程图",
+  "name": "oaWorkflowForm",
+  "desc": "OA表单",
   "shareParam": "storeId",
   "shareColumn": "store_id",
   "shareName": "oa",
-  "tableName": "oa_workflow_xml",
+  "tableName": "oa_workflow_form",
   "param": {
-    "xmlId": "xml_id",
+    "formId": "form_id",
     "flowId": "flow_id",
     "storeId": "store_id",
-    "bpmnXml": "bpmn_xml",
-    "svgXml": "svg_xml",
+    "formJson": "form_json",
+    "tableName": "table_name",
+    "version": "version",
     "statusCd": "status_cd"
   },
   "required": [
@@ -21,7 +22,7 @@
       "msg": "流程不能为空"
     },
     {
-      "code": "bpmnXml",
+      "code": "formJson",
       "msg": "流程图不能为空"
     }
   ]

java110-interface/src/main/java/com/java110/intf/oa/IOaWorkflowFormInnerServiceSMO.java

@@ -0,0 +1,53 @@
+package com.java110.intf.oa;
+
+import com.java110.config.feign.FeignConfiguration;
+import com.java110.dto.oaWorkflowForm.OaWorkflowFormDto;
+import com.java110.po.oaWorkflowForm.OaWorkflowFormPo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import java.util.List;
+
+/**
+ * @ClassName IOaWorkflowFormInnerServiceSMO
+ * @Description OA表单接口类
+ * @Author wuxw
+ * @Date 2019/4/24 9:04
+ * @Version 1.0
+ * add by wuxw 2019/4/24
+ **/
+@FeignClient(name = "oa-service", configuration = {FeignConfiguration.class})
+@RequestMapping("/oaWorkflowFormApi")
+public interface IOaWorkflowFormInnerServiceSMO {
+
+
+    @RequestMapping(value = "/saveOaWorkflowForm", method = RequestMethod.POST)
+    public int saveOaWorkflowForm(@RequestBody OaWorkflowFormPo oaWorkflowFormPo);
+
+    @RequestMapping(value = "/updateOaWorkflowForm", method = RequestMethod.POST)
+    public int updateOaWorkflowForm(@RequestBody  OaWorkflowFormPo oaWorkflowFormPo);
+
+    @RequestMapping(value = "/deleteOaWorkflowForm", method = RequestMethod.POST)
+    public int deleteOaWorkflowForm(@RequestBody  OaWorkflowFormPo oaWorkflowFormPo);
+
+    /**
+     * <p>查询小区楼信息</p>
+     *
+     *
+     * @param oaWorkflowFormDto 数据对象分享
+     * @return OaWorkflowFormDto 对象数据
+     */
+    @RequestMapping(value = "/queryOaWorkflowForms", method = RequestMethod.POST)
+    List<OaWorkflowFormDto> queryOaWorkflowForms(@RequestBody OaWorkflowFormDto oaWorkflowFormDto);
+
+    /**
+     * 查询<p>小区楼</p>总记录数
+     *
+     * @param oaWorkflowFormDto 数据对象分享
+     * @return 小区下的小区楼记录数
+     */
+    @RequestMapping(value = "/queryOaWorkflowFormsCount", method = RequestMethod.POST)
+    int queryOaWorkflowFormsCount(@RequestBody OaWorkflowFormDto oaWorkflowFormDto);
+}

service-oa/src/main/java/com/java110/oa/api/OaWorkflowApi.java

@@ -2,16 +2,22 @@ package com.java110.oa.api;
 
 import com.alibaba.fastjson.JSONObject;
 import com.java110.dto.oaWorkflow.OaWorkflowDto;
+import com.java110.dto.oaWorkflowForm.OaWorkflowFormDto;
 import com.java110.dto.oaWorkflowXml.OaWorkflowXmlDto;
 import com.java110.oa.bmo.oaWorkflow.IDeleteOaWorkflowBMO;
 import com.java110.oa.bmo.oaWorkflow.IGetOaWorkflowBMO;
 import com.java110.oa.bmo.oaWorkflow.ISaveOaWorkflowBMO;
 import com.java110.oa.bmo.oaWorkflow.IUpdateOaWorkflowBMO;
+import com.java110.oa.bmo.oaWorkflowForm.IDeleteOaWorkflowFormBMO;
+import com.java110.oa.bmo.oaWorkflowForm.IGetOaWorkflowFormBMO;
+import com.java110.oa.bmo.oaWorkflowForm.ISaveOaWorkflowFormBMO;
+import com.java110.oa.bmo.oaWorkflowForm.IUpdateOaWorkflowFormBMO;
 import com.java110.oa.bmo.oaWorkflowXml.IDeleteOaWorkflowXmlBMO;
 import com.java110.oa.bmo.oaWorkflowXml.IGetOaWorkflowXmlBMO;
 import com.java110.oa.bmo.oaWorkflowXml.ISaveOaWorkflowXmlBMO;
 import com.java110.oa.bmo.oaWorkflowXml.IUpdateOaWorkflowXmlBMO;
 import com.java110.po.oaWorkflow.OaWorkflowPo;
+import com.java110.po.oaWorkflowForm.OaWorkflowFormPo;
 import com.java110.po.oaWorkflowXml.OaWorkflowXmlPo;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
@@ -43,6 +49,16 @@ public class OaWorkflowApi {
     @Autowired
     private IGetOaWorkflowXmlBMO getOaWorkflowXmlBMOImpl;
 
+    @Autowired
+    private ISaveOaWorkflowFormBMO saveOaWorkflowFormBMOImpl;
+    @Autowired
+    private IUpdateOaWorkflowFormBMO updateOaWorkflowFormBMOImpl;
+    @Autowired
+    private IDeleteOaWorkflowFormBMO deleteOaWorkflowFormBMOImpl;
+
+    @Autowired
+    private IGetOaWorkflowFormBMO getOaWorkflowFormBMOImpl;
+
     /**
      * 微信保存消息模板
      *
@@ -112,7 +128,7 @@ public class OaWorkflowApi {
      */
     @RequestMapping(value = "/queryOaWorkflow", method = RequestMethod.GET)
     public ResponseEntity<String> queryOaWorkflow(@RequestHeader(value = "store-id") String storeId,
-                                                  @RequestParam(value="flowId",required = false) String flowId,
+                                                  @RequestParam(value = "flowId", required = false) String flowId,
                                                   @RequestParam(value = "page") int page,
                                                   @RequestParam(value = "row") int row) {
         OaWorkflowDto oaWorkflowDto = new OaWorkflowDto();
@@ -124,8 +140,6 @@ public class OaWorkflowApi {
     }
 
 
-
-
     /**
      * 微信保存消息模板
      *
@@ -199,7 +213,7 @@ public class OaWorkflowApi {
      */
     @RequestMapping(value = "/queryOaWorkflowXml", method = RequestMethod.GET)
     public ResponseEntity<String> queryOaWorkflowXml(@RequestHeader(value = "store-id") String storeId,
-                                                     @RequestParam(value="flowId") String flowId,
+                                                     @RequestParam(value = "flowId") String flowId,
                                                      @RequestParam(value = "page") int page,
                                                      @RequestParam(value = "row") int row) {
         OaWorkflowXmlDto oaWorkflowXmlDto = new OaWorkflowXmlDto();
@@ -209,4 +223,87 @@ public class OaWorkflowApi {
         oaWorkflowXmlDto.setFlowId(flowId);
         return getOaWorkflowXmlBMOImpl.get(oaWorkflowXmlDto);
     }
+
+    /**
+     * 微信保存消息模板
+     *
+     * @param reqJson
+     * @return
+     * @serviceCode /oaWorkflow/saveOaWorkflowForm
+     * @path /app/oaWorkflow/saveOaWorkflowForm
+     */
+    @RequestMapping(value = "/saveOaWorkflowForm", method = RequestMethod.POST)
+    public ResponseEntity<String> saveOaWorkflowForm(@RequestHeader(value = "store-id") String storeId,
+                                                     @RequestBody JSONObject reqJson) {
+
+        Assert.hasKeyAndValue(reqJson, "flowId", "请求报文中未包含flowId");
+        Assert.hasKeyAndValue(reqJson, "formJson", "请求报文中未包含formJson");
+
+
+        OaWorkflowFormPo oaWorkflowFormPo = BeanConvertUtil.covertBean(reqJson, OaWorkflowFormPo.class);
+        oaWorkflowFormPo.setStoreId(storeId);
+        return saveOaWorkflowFormBMOImpl.save(oaWorkflowFormPo);
+    }
+
+    /**
+     * 微信修改消息模板
+     *
+     * @param reqJson
+     * @return
+     * @serviceCode /oaWorkflow/updateOaWorkflowForm
+     * @path /app/oaWorkflow/updateOaWorkflowForm
+     */
+    @RequestMapping(value = "/updateOaWorkflowForm", method = RequestMethod.POST)
+    public ResponseEntity<String> updateOaWorkflowForm(@RequestHeader(value = "store-id") String storeId,
+                                                       @RequestBody JSONObject reqJson) {
+
+        Assert.hasKeyAndValue(reqJson, "flowId", "请求报文中未包含flowId");
+        Assert.hasKeyAndValue(reqJson, "formJson", "请求报文中未包含formJson");
+        Assert.hasKeyAndValue(reqJson, "formId", "formId不能为空");
+
+        OaWorkflowFormPo oaWorkflowFormPo = BeanConvertUtil.covertBean(reqJson, OaWorkflowFormPo.class);
+        oaWorkflowFormPo.setStoreId(storeId);
+        return updateOaWorkflowFormBMOImpl.update(oaWorkflowFormPo);
+    }
+
+    /**
+     * 微信删除消息模板
+     *
+     * @param reqJson
+     * @return
+     * @serviceCode /oaWorkflow/deleteOaWorkflowForm
+     * @path /app/oaWorkflow/deleteOaWorkflowForm
+     */
+    @RequestMapping(value = "/deleteOaWorkflowForm", method = RequestMethod.POST)
+    public ResponseEntity<String> deleteOaWorkflowForm(@RequestHeader(value = "store-id") String storeId,
+                                                       @RequestBody JSONObject reqJson) {
+
+        Assert.hasKeyAndValue(reqJson, "xmlId", "xmlId不能为空");
+
+
+        OaWorkflowFormPo oaWorkflowFormPo = BeanConvertUtil.covertBean(reqJson, OaWorkflowFormPo.class);
+        oaWorkflowFormPo.setStoreId(storeId);
+        return deleteOaWorkflowFormBMOImpl.delete(oaWorkflowFormPo);
+    }
+
+    /**
+     * 微信删除消息模板
+     *
+     * @param storeId 小区ID
+     * @return
+     * @serviceCode /oaWorkflow/queryOaWorkflowForm
+     * @path /app/oaWorkflow/queryOaWorkflowForm
+     */
+    @RequestMapping(value = "/queryOaWorkflowForm", method = RequestMethod.GET)
+    public ResponseEntity<String> queryOaWorkflowForm(@RequestHeader(value = "store-id") String storeId,
+                                                      @RequestParam(value = "flowId", required = false) String flowId,
+                                                      @RequestParam(value = "page") int page,
+                                                      @RequestParam(value = "row") int row) {
+        OaWorkflowFormDto oaWorkflowFormDto = new OaWorkflowFormDto();
+        oaWorkflowFormDto.setPage(page);
+        oaWorkflowFormDto.setRow(row);
+        oaWorkflowFormDto.setStoreId(storeId);
+        oaWorkflowFormDto.setFlowId(flowId);
+        return getOaWorkflowFormBMOImpl.get(oaWorkflowFormDto);
+    }
 }

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

@@ -0,0 +1,17 @@
+package com.java110.oa.bmo.oaWorkflowForm;
+import com.java110.po.oaWorkflowForm.OaWorkflowFormPo;
+import org.springframework.http.ResponseEntity;
+
+public interface IDeleteOaWorkflowFormBMO {
+
+
+    /**
+     * 修改OA表单
+     * add by wuxw
+     * @param oaWorkflowFormPo
+     * @return
+     */
+    ResponseEntity<String> delete(OaWorkflowFormPo oaWorkflowFormPo);
+
+
+}

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

@@ -0,0 +1,16 @@
+package com.java110.oa.bmo.oaWorkflowForm;
+import com.java110.dto.oaWorkflowForm.OaWorkflowFormDto;
+import org.springframework.http.ResponseEntity;
+public interface IGetOaWorkflowFormBMO {
+
+
+    /**
+     * 查询OA表单
+     * add by wuxw
+     * @param  oaWorkflowFormDto
+     * @return
+     */
+    ResponseEntity<String> get(OaWorkflowFormDto oaWorkflowFormDto);
+
+
+}

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

@@ -0,0 +1,17 @@
+package com.java110.oa.bmo.oaWorkflowForm;
+
+import com.java110.po.oaWorkflowForm.OaWorkflowFormPo;
+import org.springframework.http.ResponseEntity;
+public interface ISaveOaWorkflowFormBMO {
+
+
+    /**
+     * 添加OA表单
+     * add by wuxw
+     * @param oaWorkflowFormPo
+     * @return
+     */
+    ResponseEntity<String> save(OaWorkflowFormPo oaWorkflowFormPo);
+
+
+}

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

@@ -0,0 +1,17 @@
+package com.java110.oa.bmo.oaWorkflowForm;
+import com.java110.po.oaWorkflowForm.OaWorkflowFormPo;
+import org.springframework.http.ResponseEntity;
+
+public interface IUpdateOaWorkflowFormBMO {
+
+
+    /**
+     * 修改OA表单
+     * add by wuxw
+     * @param oaWorkflowFormPo
+     * @return
+     */
+    ResponseEntity<String> update(OaWorkflowFormPo oaWorkflowFormPo);
+
+
+}

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

@@ -0,0 +1,34 @@
+package com.java110.oa.bmo.oaWorkflowForm.impl;
+
+import com.java110.core.annotation.Java110Transactional;
+import com.java110.intf.oa.IOaWorkflowFormInnerServiceSMO;
+import com.java110.oa.bmo.oaWorkflowForm.IDeleteOaWorkflowFormBMO;
+import com.java110.po.oaWorkflowForm.OaWorkflowFormPo;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+
+@Service("deleteOaWorkflowFormBMOImpl")
+public class DeleteOaWorkflowFormBMOImpl implements IDeleteOaWorkflowFormBMO {
+
+    @Autowired
+    private IOaWorkflowFormInnerServiceSMO oaWorkflowFormInnerServiceSMOImpl;
+
+    /**
+     * @param oaWorkflowFormPo 数据
+     * @return 订单服务能够接受的报文
+     */
+    @Java110Transactional
+    public ResponseEntity<String> delete(OaWorkflowFormPo oaWorkflowFormPo) {
+
+        int flag = oaWorkflowFormInnerServiceSMOImpl.deleteOaWorkflowForm(oaWorkflowFormPo);
+
+        if (flag > 0) {
+            return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
+        }
+
+        return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
+    }
+
+}

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

@@ -0,0 +1,44 @@
+package com.java110.oa.bmo.oaWorkflowForm.impl;
+
+import com.java110.dto.oaWorkflowForm.OaWorkflowFormDto;
+import com.java110.intf.oa.IOaWorkflowFormInnerServiceSMO;
+import com.java110.oa.bmo.oaWorkflowForm.IGetOaWorkflowFormBMO;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service("getOaWorkflowFormBMOImpl")
+public class GetOaWorkflowFormBMOImpl implements IGetOaWorkflowFormBMO {
+
+    @Autowired
+    private IOaWorkflowFormInnerServiceSMO oaWorkflowFormInnerServiceSMOImpl;
+
+    /**
+     * @param oaWorkflowFormDto
+     * @return 订单服务能够接受的报文
+     */
+    public ResponseEntity<String> get(OaWorkflowFormDto oaWorkflowFormDto) {
+
+
+        int count = oaWorkflowFormInnerServiceSMOImpl.queryOaWorkflowFormsCount(oaWorkflowFormDto);
+
+        List<OaWorkflowFormDto> oaWorkflowFormDtos = null;
+        if (count > 0) {
+            oaWorkflowFormDtos = oaWorkflowFormInnerServiceSMOImpl.queryOaWorkflowForms(oaWorkflowFormDto);
+        } else {
+            oaWorkflowFormDtos = new ArrayList<>();
+        }
+
+        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) oaWorkflowFormDto.getRow()), count, oaWorkflowFormDtos);
+
+        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+
+        return responseEntity;
+    }
+
+}

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

@@ -0,0 +1,60 @@
+package com.java110.oa.bmo.oaWorkflowForm.impl;
+
+import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.dto.oaWorkflow.OaWorkflowDto;
+import com.java110.intf.oa.IOaWorkflowFormInnerServiceSMO;
+import com.java110.intf.oa.IOaWorkflowInnerServiceSMO;
+import com.java110.oa.bmo.oaWorkflowForm.ISaveOaWorkflowFormBMO;
+import com.java110.po.oaWorkflowForm.OaWorkflowFormPo;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.DateUtil;
+import com.java110.utils.util.PinYinUtil;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service("saveOaWorkflowFormBMOImpl")
+public class SaveOaWorkflowFormBMOImpl implements ISaveOaWorkflowFormBMO {
+
+    @Autowired
+    private IOaWorkflowFormInnerServiceSMO oaWorkflowFormInnerServiceSMOImpl;
+
+    @Autowired
+    private IOaWorkflowInnerServiceSMO oaWorkflowInnerServiceSMOImpl;
+
+    /**
+     * 添加小区信息
+     *
+     * @param oaWorkflowFormPo
+     * @return 订单服务能够接受的报文
+     */
+    @Java110Transactional
+    public ResponseEntity<String> save(OaWorkflowFormPo oaWorkflowFormPo) {
+        //查询 流程存在不存在
+        OaWorkflowDto oaWorkflowDto = new OaWorkflowDto();
+        oaWorkflowDto.setFlowId(oaWorkflowFormPo.getFlowId());
+        oaWorkflowDto.setStoreId(oaWorkflowFormPo.getFormId());
+        List<OaWorkflowDto> oaWorkflowDtos = oaWorkflowInnerServiceSMOImpl.queryOaWorkflows(oaWorkflowDto);
+
+        Assert.listOnlyOne(oaWorkflowDtos, "流程不存在");
+
+        oaWorkflowFormPo.setFormId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_formId));
+        //设置版本
+        oaWorkflowFormPo.setVersion(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_DEFAULT));
+
+        oaWorkflowFormPo.setTableName(PinYinUtil.getFirstSpell(oaWorkflowDtos.get(0).getFlowName()+oaWorkflowFormPo.getVersion()));
+
+        int flag = oaWorkflowFormInnerServiceSMOImpl.saveOaWorkflowForm(oaWorkflowFormPo);
+
+        if (flag > 0) {
+            return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
+        }
+
+        return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
+    }
+
+}

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

@@ -0,0 +1,34 @@
+package com.java110.oa.bmo.oaWorkflowForm.impl;
+
+import com.java110.core.annotation.Java110Transactional;
+import com.java110.intf.oa.IOaWorkflowFormInnerServiceSMO;
+import com.java110.oa.bmo.oaWorkflowForm.IUpdateOaWorkflowFormBMO;
+import com.java110.po.oaWorkflowForm.OaWorkflowFormPo;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+
+@Service("updateOaWorkflowFormBMOImpl")
+public class UpdateOaWorkflowFormBMOImpl implements IUpdateOaWorkflowFormBMO {
+
+    @Autowired
+    private IOaWorkflowFormInnerServiceSMO oaWorkflowFormInnerServiceSMOImpl;
+
+    /**
+     * @param oaWorkflowFormPo
+     * @return 订单服务能够接受的报文
+     */
+    @Java110Transactional
+    public ResponseEntity<String> update(OaWorkflowFormPo oaWorkflowFormPo) {
+
+        int flag = oaWorkflowFormInnerServiceSMOImpl.updateOaWorkflowForm(oaWorkflowFormPo);
+
+        if (flag > 0) {
+            return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
+        }
+
+        return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
+    }
+
+}

service-oa/src/main/java/com/java110/oa/dao/IOaWorkflowFormServiceDao.java

@@ -0,0 +1,61 @@
+package com.java110.oa.dao;
+
+
+import com.java110.utils.exception.DAOException;
+import com.java110.entity.merchant.BoMerchant;
+import com.java110.entity.merchant.BoMerchantAttr;
+import com.java110.entity.merchant.Merchant;
+import com.java110.entity.merchant.MerchantAttr;
+
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * OA表单组件内部之间使用，没有给外围系统提供服务能力
+ * OA表单服务接口类，要求全部以字符串传输，方便微服务化
+ * 新建客户，修改客户，删除客户，查询客户等功能
+ *
+ * Created by wuxw on 2016/12/27.
+ */
+public interface IOaWorkflowFormServiceDao {
+
+
+    /**
+     * 保存 OA表单信息
+     * @param info
+     * @throws DAOException DAO异常
+     */
+    void saveOaWorkflowFormInfo(Map info) throws DAOException;
+
+
+
+
+    /**
+     * 查询OA表单信息（instance过程）
+     * 根据bId 查询OA表单信息
+     * @param info bId 信息
+     * @return OA表单信息
+     * @throws DAOException DAO异常
+     */
+    List<Map> getOaWorkflowFormInfo(Map info) throws DAOException;
+
+
+
+    /**
+     * 修改OA表单信息
+     * @param info 修改信息
+     * @throws DAOException DAO异常
+     */
+    void updateOaWorkflowFormInfo(Map info) throws DAOException;
+
+
+    /**
+     * 查询OA表单总数
+     *
+     * @param info OA表单信息
+     * @return OA表单数量
+     */
+    int queryOaWorkflowFormsCount(Map info);
+
+}

service-oa/src/main/java/com/java110/oa/dao/impl/OaWorkflowFormServiceDaoImpl.java

@@ -0,0 +1,98 @@
+package com.java110.oa.dao.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.utils.constant.ResponseConstant;
+import com.java110.utils.exception.DAOException;
+import com.java110.utils.util.DateUtil;
+import com.java110.core.base.dao.BaseServiceDao;
+import com.java110.oa.dao.IOaWorkflowFormServiceDao;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * OA表单服务 与数据库交互
+ * Created by wuxw on 2017/4/5.
+ */
+@Service("oaWorkflowFormServiceDaoImpl")
+//@Transactional
+public class OaWorkflowFormServiceDaoImpl extends BaseServiceDao implements IOaWorkflowFormServiceDao {
+
+    private static Logger logger = LoggerFactory.getLogger(OaWorkflowFormServiceDaoImpl.class);
+
+
+
+
+
+    /**
+     * 保存OA表单信息 到 instance
+     * @param info   bId 信息
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public void saveOaWorkflowFormInfo(Map info) throws DAOException {
+        logger.debug("保存OA表单信息Instance 入参 info : {}",info);
+
+        int saveFlag = sqlSessionTemplate.insert("oaWorkflowFormServiceDaoImpl.saveOaWorkflowFormInfo",info);
+
+        if(saveFlag < 1){
+            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR,"保存OA表单信息Instance数据失败："+ JSONObject.toJSONString(info));
+        }
+    }
+
+
+    /**
+     * 查询OA表单信息（instance）
+     * @param info bId 信息
+     * @return List<Map>
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public List<Map> getOaWorkflowFormInfo(Map info) throws DAOException {
+        logger.debug("查询OA表单信息 入参 info : {}",info);
+
+        List<Map> businessOaWorkflowFormInfos = sqlSessionTemplate.selectList("oaWorkflowFormServiceDaoImpl.getOaWorkflowFormInfo",info);
+
+        return businessOaWorkflowFormInfos;
+    }
+
+
+    /**
+     * 修改OA表单信息
+     * @param info 修改信息
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public void updateOaWorkflowFormInfo(Map info) throws DAOException {
+        logger.debug("修改OA表单信息Instance 入参 info : {}",info);
+
+        int saveFlag = sqlSessionTemplate.update("oaWorkflowFormServiceDaoImpl.updateOaWorkflowFormInfo",info);
+
+        if(saveFlag < 1){
+            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR,"修改OA表单信息Instance数据失败："+ JSONObject.toJSONString(info));
+        }
+    }
+
+     /**
+     * 查询OA表单数量
+     * @param info OA表单信息
+     * @return OA表单数量
+     */
+    @Override
+    public int queryOaWorkflowFormsCount(Map info) {
+        logger.debug("查询OA表单数据 入参 info : {}",info);
+
+        List<Map> businessOaWorkflowFormInfos = sqlSessionTemplate.selectList("oaWorkflowFormServiceDaoImpl.queryOaWorkflowFormsCount", info);
+        if (businessOaWorkflowFormInfos.size() < 1) {
+            return 0;
+        }
+
+        return Integer.parseInt(businessOaWorkflowFormInfos.get(0).get("count").toString());
+    }
+
+
+}

service-oa/src/main/java/com/java110/oa/smo/impl/OaWorkflowFormInnerServiceSMOImpl.java

@@ -0,0 +1,83 @@
+package com.java110.oa.smo.impl;
+
+
+import com.java110.core.base.smo.BaseServiceSMO;
+import com.java110.dto.PageDto;
+import com.java110.dto.oaWorkflowForm.OaWorkflowFormDto;
+import com.java110.intf.oa.IOaWorkflowFormInnerServiceSMO;
+import com.java110.oa.dao.IOaWorkflowFormServiceDao;
+import com.java110.po.oaWorkflowForm.OaWorkflowFormPo;
+import com.java110.utils.util.BeanConvertUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @ClassName FloorInnerServiceSMOImpl
+ * @Description OA表单内部服务实现类
+ * @Author wuxw
+ * @Date 2019/4/24 9:20
+ * @Version 1.0
+ * add by wuxw 2019/4/24
+ **/
+@RestController
+public class OaWorkflowFormInnerServiceSMOImpl extends BaseServiceSMO implements IOaWorkflowFormInnerServiceSMO {
+
+    @Autowired
+    private IOaWorkflowFormServiceDao oaWorkflowFormServiceDaoImpl;
+
+
+    @Override
+    public int saveOaWorkflowForm(@RequestBody OaWorkflowFormPo oaWorkflowFormPo) {
+        int saveFlag = 1;
+        oaWorkflowFormServiceDaoImpl.saveOaWorkflowFormInfo(BeanConvertUtil.beanCovertMap(oaWorkflowFormPo));
+        return saveFlag;
+    }
+
+    @Override
+    public int updateOaWorkflowForm(@RequestBody OaWorkflowFormPo oaWorkflowFormPo) {
+        int saveFlag = 1;
+        oaWorkflowFormServiceDaoImpl.updateOaWorkflowFormInfo(BeanConvertUtil.beanCovertMap(oaWorkflowFormPo));
+        return saveFlag;
+    }
+
+    @Override
+    public int deleteOaWorkflowForm(@RequestBody OaWorkflowFormPo oaWorkflowFormPo) {
+        int saveFlag = 1;
+        oaWorkflowFormPo.setStatusCd("1");
+        oaWorkflowFormServiceDaoImpl.updateOaWorkflowFormInfo(BeanConvertUtil.beanCovertMap(oaWorkflowFormPo));
+        return saveFlag;
+    }
+
+    @Override
+    public List<OaWorkflowFormDto> queryOaWorkflowForms(@RequestBody OaWorkflowFormDto oaWorkflowFormDto) {
+
+        //校验是否传了 分页信息
+
+        int page = oaWorkflowFormDto.getPage();
+
+        if (page != PageDto.DEFAULT_PAGE) {
+            oaWorkflowFormDto.setPage((page - 1) * oaWorkflowFormDto.getRow());
+        }
+
+        List<OaWorkflowFormDto> oaWorkflowForms = BeanConvertUtil.covertBeanList(oaWorkflowFormServiceDaoImpl.getOaWorkflowFormInfo(BeanConvertUtil.beanCovertMap(oaWorkflowFormDto)), OaWorkflowFormDto.class);
+
+        return oaWorkflowForms;
+    }
+
+
+    @Override
+    public int queryOaWorkflowFormsCount(@RequestBody OaWorkflowFormDto oaWorkflowFormDto) {
+        return oaWorkflowFormServiceDaoImpl.queryOaWorkflowFormsCount(BeanConvertUtil.beanCovertMap(oaWorkflowFormDto));
+    }
+
+    public IOaWorkflowFormServiceDao getOaWorkflowFormServiceDaoImpl() {
+        return oaWorkflowFormServiceDaoImpl;
+    }
+
+    public void setOaWorkflowFormServiceDaoImpl(IOaWorkflowFormServiceDao oaWorkflowFormServiceDaoImpl) {
+        this.oaWorkflowFormServiceDaoImpl = oaWorkflowFormServiceDaoImpl;
+    }
+}