java110 лет назад: 5
Родитель
Сommit
d919912379
17 измененных файлов с 948 добавлено и 25 удалено
  1. 97 0
      java110-bean/src/main/java/com/java110/dto/oaWorkflow/OaWorkflowDto.java
  2. 74 0
      java110-bean/src/main/java/com/java110/po/oaWorkflow/OaWorkflowPo.java
  3. 133 0
      java110-db/src/main/resources/mapper/oa/OaWorkflowServiceDaoImplMapper.xml
  4. 19 25
      java110-generator/src/main/resources/newBack/template_1.json
  5. 53 0
      java110-interface/src/main/java/com/java110/intf/oa/IOaWorkflowInnerServiceSMO.java
  6. 107 0
      service-oa/src/main/java/com/java110/oa/api/OaWorkflowApi.java
  7. 19 0
      service-oa/src/main/java/com/java110/oa/bmo/oaWorkflow/IDeleteOaWorkflowBMO.java
  8. 19 0
      service-oa/src/main/java/com/java110/oa/bmo/oaWorkflow/IGetOaWorkflowBMO.java
  9. 17 0
      service-oa/src/main/java/com/java110/oa/bmo/oaWorkflow/ISaveOaWorkflowBMO.java
  10. 17 0
      service-oa/src/main/java/com/java110/oa/bmo/oaWorkflow/IUpdateOaWorkflowBMO.java
  11. 34 0
      service-oa/src/main/java/com/java110/oa/bmo/oaWorkflow/impl/DeleteOaWorkflowBMOImpl.java
  12. 44 0
      service-oa/src/main/java/com/java110/oa/bmo/oaWorkflow/impl/GetOaWorkflowBMOImpl.java
  13. 38 0
      service-oa/src/main/java/com/java110/oa/bmo/oaWorkflow/impl/SaveOaWorkflowBMOImpl.java
  14. 34 0
      service-oa/src/main/java/com/java110/oa/bmo/oaWorkflow/impl/UpdateOaWorkflowBMOImpl.java
  15. 61 0
      service-oa/src/main/java/com/java110/oa/dao/IOaWorkflowServiceDao.java
  16. 98 0
      service-oa/src/main/java/com/java110/oa/dao/impl/OaWorkflowServiceDaoImpl.java
  17. 84 0
      service-oa/src/main/java/com/java110/oa/smo/impl/OaWorkflowInnerServiceSMOImpl.java

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

@@ -0,0 +1,97 @@
+package com.java110.dto.oaWorkflow;
+
+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 OaWorkflowDto extends PageDto implements Serializable {
+
+    private String describle;
+private String modelId;
+private String flowKey;
+private String storeId;
+private String flowId;
+private String flowName;
+private String flowType;
+private String processDefinitionKey;
+
+
+    private Date createTime;
+
+    private String statusCd = "0";
+
+
+    public String getDescrible() {
+        return describle;
+    }
+public void setDescrible(String describle) {
+        this.describle = describle;
+    }
+public String getModelId() {
+        return modelId;
+    }
+public void setModelId(String modelId) {
+        this.modelId = modelId;
+    }
+public String getFlowKey() {
+        return flowKey;
+    }
+public void setFlowKey(String flowKey) {
+        this.flowKey = flowKey;
+    }
+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 getFlowName() {
+        return flowName;
+    }
+public void setFlowName(String flowName) {
+        this.flowName = flowName;
+    }
+public String getFlowType() {
+        return flowType;
+    }
+public void setFlowType(String flowType) {
+        this.flowType = flowType;
+    }
+public String getProcessDefinitionKey() {
+        return processDefinitionKey;
+    }
+public void setProcessDefinitionKey(String processDefinitionKey) {
+        this.processDefinitionKey = processDefinitionKey;
+    }
+
+
+    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;
+    }
+}

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

@@ -0,0 +1,74 @@
+package com.java110.po.oaWorkflow;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class OaWorkflowPo implements Serializable {
+
+    private String describle;
+private String modelId;
+private String statusCd = "0";
+private String flowKey;
+private String storeId;
+private String flowId;
+private String flowName;
+private String flowType;
+private String processDefinitionKey;
+public String getDescrible() {
+        return describle;
+    }
+public void setDescrible(String describle) {
+        this.describle = describle;
+    }
+public String getModelId() {
+        return modelId;
+    }
+public void setModelId(String modelId) {
+        this.modelId = modelId;
+    }
+public String getStatusCd() {
+        return statusCd;
+    }
+public void setStatusCd(String statusCd) {
+        this.statusCd = statusCd;
+    }
+public String getFlowKey() {
+        return flowKey;
+    }
+public void setFlowKey(String flowKey) {
+        this.flowKey = flowKey;
+    }
+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 getFlowName() {
+        return flowName;
+    }
+public void setFlowName(String flowName) {
+        this.flowName = flowName;
+    }
+public String getFlowType() {
+        return flowType;
+    }
+public void setFlowType(String flowType) {
+        this.flowType = flowType;
+    }
+public String getProcessDefinitionKey() {
+        return processDefinitionKey;
+    }
+public void setProcessDefinitionKey(String processDefinitionKey) {
+        this.processDefinitionKey = processDefinitionKey;
+    }
+
+
+
+}

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

@@ -0,0 +1,133 @@
+<?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="oaWorkflowServiceDaoImpl">
+
+
+
+
+
+    <!-- 保存OA工作流信息 add by wuxw 2018-07-03 -->
+    <insert id="saveOaWorkflowInfo" parameterType="Map">
+        insert into oa_workflow(
+describle,model_id,flow_key,store_id,flow_id,flow_name,flow_type,process_definition_key
+) values (
+#{describle},#{modelId},#{flowKey},#{storeId},#{flowId},#{flowName},#{flowType},#{processDefinitionKey}
+)
+    </insert>
+
+
+
+    <!-- 查询OA工作流信息 add by wuxw 2018-07-03 -->
+    <select id="getOaWorkflowInfo" parameterType="Map" resultType="Map">
+        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 
+from oa_workflow t 
+where 1 =1 
+<if test="describle !=null and describle != ''">
+   and t.describle= #{describle}
+</if> 
+<if test="modelId !=null and modelId != ''">
+   and t.model_id= #{modelId}
+</if> 
+<if test="statusCd !=null and statusCd != ''">
+   and t.status_cd= #{statusCd}
+</if> 
+<if test="flowKey !=null and flowKey != ''">
+   and t.flow_key= #{flowKey}
+</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="flowName !=null and flowName != ''">
+   and t.flow_name= #{flowName}
+</if> 
+<if test="flowType !=null and flowType != ''">
+   and t.flow_type= #{flowType}
+</if> 
+<if test="processDefinitionKey !=null and processDefinitionKey != ''">
+   and t.process_definition_key= #{processDefinitionKey}
+</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="updateOaWorkflowInfo" parameterType="Map">
+        update  oa_workflow t set t.status_cd = #{statusCd}
+<if test="newBId != null and newBId != ''">
+,t.b_id = #{newBId}
+</if> 
+<if test="describle !=null and describle != ''">
+, t.describle= #{describle}
+</if> 
+<if test="modelId !=null and modelId != ''">
+, t.model_id= #{modelId}
+</if> 
+<if test="flowKey !=null and flowKey != ''">
+, t.flow_key= #{flowKey}
+</if> 
+<if test="storeId !=null and storeId != ''">
+, t.store_id= #{storeId}
+</if> 
+<if test="flowName !=null and flowName != ''">
+, t.flow_name= #{flowName}
+</if> 
+<if test="flowType !=null and flowType != ''">
+, t.flow_type= #{flowType}
+</if> 
+<if test="processDefinitionKey !=null and processDefinitionKey != ''">
+, t.process_definition_key= #{processDefinitionKey}
+</if> 
+ where 1=1 <if test="flowId !=null and flowId != ''">
+and t.flow_id= #{flowId}
+</if> 
+
+    </update>
+
+    <!-- 查询OA工作流数量 add by wuxw 2018-07-03 -->
+     <select id="queryOaWorkflowsCount" parameterType="Map" resultType="Map">
+        select  count(1) count 
+from oa_workflow t 
+where 1 =1 
+<if test="describle !=null and describle != ''">
+   and t.describle= #{describle}
+</if> 
+<if test="modelId !=null and modelId != ''">
+   and t.model_id= #{modelId}
+</if> 
+<if test="statusCd !=null and statusCd != ''">
+   and t.status_cd= #{statusCd}
+</if> 
+<if test="flowKey !=null and flowKey != ''">
+   and t.flow_key= #{flowKey}
+</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="flowName !=null and flowName != ''">
+   and t.flow_name= #{flowName}
+</if> 
+<if test="flowType !=null and flowType != ''">
+   and t.flow_type= #{flowType}
+</if> 
+<if test="processDefinitionKey !=null and processDefinitionKey != ''">
+   and t.process_definition_key= #{processDefinitionKey}
+</if> 
+
+
+     </select>
+
+</mapper>

+ 19 - 25
java110-generator/src/main/resources/newBack/template_1.json

@@ -1,37 +1,31 @@
 {
   "autoMove": true,
-  "id": "monthId",
-  "name": "payFeeDetailMonth",
-  "desc": "月缴费表",
-  "shareParam": "communityId",
-  "shareColumn": "community_id",
-  "shareName": "fee",
-  "tableName": "pay_fee_detail_month",
+  "id": "flowId",
+  "name": "oaWorkflow",
+  "desc": "OA工作流",
+  "shareParam": "storeId",
+  "shareColumn": "store_id",
+  "shareName": "oa",
+  "tableName": "oa_workflow",
   "param": {
-    "monthId": "month_id",
-    "feeId": "fee_id",
-    "detailId": "detail_id",
-    "communityId": "community_id",
-    "detailYear": "detail_year",
-    "detailMonth": "detail_month",
-    "receivableAmount": "receivable_amount",
-    "receivedAmount": "received_amount",
-    "discountAmount": "discount_amount",
-    "remark": "remark",
+    "flowId": "flow_id",
+    "flowName": "flow_name",
+    "describle": "describle",
+    "storeId": "store_id",
+    "flowType": "flow_type",
+    "modelId": "model_id",
+    "flowKey": "flow_key",
+    "processDefinitionKey": "process_definition_key",
     "statusCd": "status_cd"
   },
   "required": [
     {
-      "code": "detailId",
-      "msg": "缴费ID不能为空"
+      "code": "flowName",
+      "msg": "流程名称不能为空"
     },
     {
-      "code": "detailYear",
-      "msg": "年份不能为空"
-    },
-    {
-      "code": "detailMonth",
-      "msg": "月份不能为空"
+      "code": "flowType",
+      "msg": "流程类型不能为空"
     }
   ]
 }

+ 53 - 0
java110-interface/src/main/java/com/java110/intf/oa/IOaWorkflowInnerServiceSMO.java

@@ -0,0 +1,53 @@
+package com.java110.intf.oa;
+
+import com.java110.config.feign.FeignConfiguration;
+import com.java110.dto.oaWorkflow.OaWorkflowDto;
+import com.java110.po.oaWorkflow.OaWorkflowPo;
+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 IOaWorkflowInnerServiceSMO
+ * @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("/oaWorkflowApi")
+public interface IOaWorkflowInnerServiceSMO {
+
+
+    @RequestMapping(value = "/saveOaWorkflow", method = RequestMethod.POST)
+    public int saveOaWorkflow(@RequestBody OaWorkflowPo oaWorkflowPo);
+
+    @RequestMapping(value = "/updateOaWorkflow", method = RequestMethod.POST)
+    public int updateOaWorkflow(@RequestBody  OaWorkflowPo oaWorkflowPo);
+
+    @RequestMapping(value = "/deleteOaWorkflow", method = RequestMethod.POST)
+    public int deleteOaWorkflow(@RequestBody  OaWorkflowPo oaWorkflowPo);
+
+    /**
+     * <p>查询小区楼信息</p>
+     *
+     *
+     * @param oaWorkflowDto 数据对象分享
+     * @return OaWorkflowDto 对象数据
+     */
+    @RequestMapping(value = "/queryOaWorkflows", method = RequestMethod.POST)
+    List<OaWorkflowDto> queryOaWorkflows(@RequestBody OaWorkflowDto oaWorkflowDto);
+
+    /**
+     * 查询<p>小区楼</p>总记录数
+     *
+     * @param oaWorkflowDto 数据对象分享
+     * @return 小区下的小区楼记录数
+     */
+    @RequestMapping(value = "/queryOaWorkflowsCount", method = RequestMethod.POST)
+    int queryOaWorkflowsCount(@RequestBody OaWorkflowDto oaWorkflowDto);
+}

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

@@ -0,0 +1,107 @@
+package com.java110.oa.api;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.dto.oaWorkflow.OaWorkflowDto;
+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.po.oaWorkflow.OaWorkflowPo;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping(value = "/oaWorkflow")
+public class OaWorkflowApi {
+
+    @Autowired
+    private ISaveOaWorkflowBMO saveOaWorkflowBMOImpl;
+    @Autowired
+    private IUpdateOaWorkflowBMO updateOaWorkflowBMOImpl;
+    @Autowired
+    private IDeleteOaWorkflowBMO deleteOaWorkflowBMOImpl;
+
+    @Autowired
+    private IGetOaWorkflowBMO getOaWorkflowBMOImpl;
+
+    /**
+     * 微信保存消息模板
+     *
+     * @param reqJson
+     * @return
+     * @serviceCode /oaWorkflow/saveOaWorkflow
+     * @path /app/oaWorkflow/saveOaWorkflow
+     */
+    @RequestMapping(value = "/saveOaWorkflow", method = RequestMethod.POST)
+    public ResponseEntity<String> saveOaWorkflow(@RequestHeader(value = "store-id") String storeId,
+                                                 @RequestBody JSONObject reqJson) {
+
+        Assert.hasKeyAndValue(reqJson, "flowName", "请求报文中未包含flowName");
+        Assert.hasKeyAndValue(reqJson, "flowType", "请求报文中未包含flowType");
+
+
+        OaWorkflowPo oaWorkflowPo = BeanConvertUtil.covertBean(reqJson, OaWorkflowPo.class);
+        return saveOaWorkflowBMOImpl.save(oaWorkflowPo);
+    }
+
+    /**
+     * 微信修改消息模板
+     *
+     * @param reqJson
+     * @return
+     * @serviceCode /oaWorkflow/updateOaWorkflow
+     * @path /app/oaWorkflow/updateOaWorkflow
+     */
+    @RequestMapping(value = "/updateOaWorkflow", method = RequestMethod.POST)
+    public ResponseEntity<String> updateOaWorkflow(@RequestBody JSONObject reqJson) {
+
+        Assert.hasKeyAndValue(reqJson, "flowName", "请求报文中未包含flowName");
+        Assert.hasKeyAndValue(reqJson, "flowType", "请求报文中未包含flowType");
+        Assert.hasKeyAndValue(reqJson, "flowId", "flowId不能为空");
+
+
+        OaWorkflowPo oaWorkflowPo = BeanConvertUtil.covertBean(reqJson, OaWorkflowPo.class);
+        return updateOaWorkflowBMOImpl.update(oaWorkflowPo);
+    }
+
+    /**
+     * 微信删除消息模板
+     *
+     * @param reqJson
+     * @return
+     * @serviceCode /oaWorkflow/deleteOaWorkflow
+     * @path /app/oaWorkflow/deleteOaWorkflow
+     */
+    @RequestMapping(value = "/deleteOaWorkflow", method = RequestMethod.POST)
+    public ResponseEntity<String> deleteOaWorkflow(@RequestBody JSONObject reqJson) {
+        Assert.hasKeyAndValue(reqJson, "communityId", "小区ID不能为空");
+
+        Assert.hasKeyAndValue(reqJson, "flowId", "flowId不能为空");
+
+
+        OaWorkflowPo oaWorkflowPo = BeanConvertUtil.covertBean(reqJson, OaWorkflowPo.class);
+        return deleteOaWorkflowBMOImpl.delete(oaWorkflowPo);
+    }
+
+    /**
+     * 微信删除消息模板
+     *
+     * @param storeId 小区ID
+     * @return
+     * @serviceCode /oaWorkflow/queryOaWorkflow
+     * @path /app/oaWorkflow/queryOaWorkflow
+     */
+    @RequestMapping(value = "/queryOaWorkflow", method = RequestMethod.GET)
+    public ResponseEntity<String> queryOaWorkflow(@RequestHeader(value = "store-id") String storeId,
+                                                  @RequestParam(value = "page") int page,
+                                                  @RequestParam(value = "row") int row) {
+        OaWorkflowDto oaWorkflowDto = new OaWorkflowDto();
+        oaWorkflowDto.setPage(page);
+        oaWorkflowDto.setRow(row);
+        oaWorkflowDto.setStoreId(storeId);
+        return getOaWorkflowBMOImpl.get(oaWorkflowDto);
+    }
+}

+ 19 - 0
service-oa/src/main/java/com/java110/oa/bmo/oaWorkflow/IDeleteOaWorkflowBMO.java

@@ -0,0 +1,19 @@
+package com.java110.oa.bmo.oaWorkflow;
+
+import com.java110.po.oaWorkflow.OaWorkflowPo;
+import org.springframework.http.ResponseEntity;
+
+public interface IDeleteOaWorkflowBMO {
+
+
+    /**
+     * 修改OA工作流
+     * add by wuxw
+     *
+     * @param oaWorkflowPo
+     * @return
+     */
+    ResponseEntity<String> delete(OaWorkflowPo oaWorkflowPo);
+
+
+}

+ 19 - 0
service-oa/src/main/java/com/java110/oa/bmo/oaWorkflow/IGetOaWorkflowBMO.java

@@ -0,0 +1,19 @@
+package com.java110.oa.bmo.oaWorkflow;
+
+import com.java110.dto.oaWorkflow.OaWorkflowDto;
+import org.springframework.http.ResponseEntity;
+
+public interface IGetOaWorkflowBMO {
+
+
+    /**
+     * 查询OA工作流
+     * add by wuxw
+     *
+     * @param oaWorkflowDto
+     * @return
+     */
+    ResponseEntity<String> get(OaWorkflowDto oaWorkflowDto);
+
+
+}

+ 17 - 0
service-oa/src/main/java/com/java110/oa/bmo/oaWorkflow/ISaveOaWorkflowBMO.java

@@ -0,0 +1,17 @@
+package com.java110.oa.bmo.oaWorkflow;
+
+import com.java110.po.oaWorkflow.OaWorkflowPo;
+import org.springframework.http.ResponseEntity;
+public interface ISaveOaWorkflowBMO {
+
+
+    /**
+     * 添加OA工作流
+     * add by wuxw
+     * @param oaWorkflowPo
+     * @return
+     */
+    ResponseEntity<String> save(OaWorkflowPo oaWorkflowPo);
+
+
+}

+ 17 - 0
service-oa/src/main/java/com/java110/oa/bmo/oaWorkflow/IUpdateOaWorkflowBMO.java

@@ -0,0 +1,17 @@
+package com.java110.oa.bmo.oaWorkflow;
+import com.java110.po.oaWorkflow.OaWorkflowPo;
+import org.springframework.http.ResponseEntity;
+
+public interface IUpdateOaWorkflowBMO {
+
+
+    /**
+     * 修改OA工作流
+     * add by wuxw
+     * @param oaWorkflowPo
+     * @return
+     */
+    ResponseEntity<String> update(OaWorkflowPo oaWorkflowPo);
+
+
+}

+ 34 - 0
service-oa/src/main/java/com/java110/oa/bmo/oaWorkflow/impl/DeleteOaWorkflowBMOImpl.java

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

+ 44 - 0
service-oa/src/main/java/com/java110/oa/bmo/oaWorkflow/impl/GetOaWorkflowBMOImpl.java

@@ -0,0 +1,44 @@
+package com.java110.oa.bmo.oaWorkflow.impl;
+
+import com.java110.dto.oaWorkflow.OaWorkflowDto;
+import com.java110.intf.oa.IOaWorkflowInnerServiceSMO;
+import com.java110.oa.bmo.oaWorkflow.IGetOaWorkflowBMO;
+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("getOaWorkflowBMOImpl")
+public class GetOaWorkflowBMOImpl implements IGetOaWorkflowBMO {
+
+    @Autowired
+    private IOaWorkflowInnerServiceSMO oaWorkflowInnerServiceSMOImpl;
+
+    /**
+     * @param oaWorkflowDto
+     * @return 订单服务能够接受的报文
+     */
+    public ResponseEntity<String> get(OaWorkflowDto oaWorkflowDto) {
+
+
+        int count = oaWorkflowInnerServiceSMOImpl.queryOaWorkflowsCount(oaWorkflowDto);
+
+        List<OaWorkflowDto> oaWorkflowDtos = null;
+        if (count > 0) {
+            oaWorkflowDtos = oaWorkflowInnerServiceSMOImpl.queryOaWorkflows(oaWorkflowDto);
+        } else {
+            oaWorkflowDtos = new ArrayList<>();
+        }
+
+        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) oaWorkflowDto.getRow()), count, oaWorkflowDtos);
+
+        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+
+        return responseEntity;
+    }
+
+}

+ 38 - 0
service-oa/src/main/java/com/java110/oa/bmo/oaWorkflow/impl/SaveOaWorkflowBMOImpl.java

@@ -0,0 +1,38 @@
+package com.java110.oa.bmo.oaWorkflow.impl;
+
+import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.intf.oa.IOaWorkflowInnerServiceSMO;
+import com.java110.oa.bmo.oaWorkflow.ISaveOaWorkflowBMO;
+import com.java110.po.oaWorkflow.OaWorkflowPo;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+
+@Service("saveOaWorkflowBMOImpl")
+public class SaveOaWorkflowBMOImpl implements ISaveOaWorkflowBMO {
+
+    @Autowired
+    private IOaWorkflowInnerServiceSMO oaWorkflowInnerServiceSMOImpl;
+
+    /**
+     * 添加小区信息
+     *
+     * @param oaWorkflowPo
+     * @return 订单服务能够接受的报文
+     */
+    @Java110Transactional
+    public ResponseEntity<String> save(OaWorkflowPo oaWorkflowPo) {
+
+        oaWorkflowPo.setFlowId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_flowId));
+        int flag = oaWorkflowInnerServiceSMOImpl.saveOaWorkflow(oaWorkflowPo);
+
+        if (flag > 0) {
+            return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
+        }
+
+        return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
+    }
+
+}

+ 34 - 0
service-oa/src/main/java/com/java110/oa/bmo/oaWorkflow/impl/UpdateOaWorkflowBMOImpl.java

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

+ 61 - 0
service-oa/src/main/java/com/java110/oa/dao/IOaWorkflowServiceDao.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 IOaWorkflowServiceDao {
+
+
+    /**
+     * 保存 OA工作流信息
+     * @param info
+     * @throws DAOException DAO异常
+     */
+    void saveOaWorkflowInfo(Map info) throws DAOException;
+
+
+
+
+    /**
+     * 查询OA工作流信息(instance过程)
+     * 根据bId 查询OA工作流信息
+     * @param info bId 信息
+     * @return OA工作流信息
+     * @throws DAOException DAO异常
+     */
+    List<Map> getOaWorkflowInfo(Map info) throws DAOException;
+
+
+
+    /**
+     * 修改OA工作流信息
+     * @param info 修改信息
+     * @throws DAOException DAO异常
+     */
+    void updateOaWorkflowInfo(Map info) throws DAOException;
+
+
+    /**
+     * 查询OA工作流总数
+     *
+     * @param info OA工作流信息
+     * @return OA工作流数量
+     */
+    int queryOaWorkflowsCount(Map info);
+
+}

+ 98 - 0
service-oa/src/main/java/com/java110/oa/dao/impl/OaWorkflowServiceDaoImpl.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.IOaWorkflowServiceDao;
+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("oaWorkflowServiceDaoImpl")
+//@Transactional
+public class OaWorkflowServiceDaoImpl extends BaseServiceDao implements IOaWorkflowServiceDao {
+
+    private static Logger logger = LoggerFactory.getLogger(OaWorkflowServiceDaoImpl.class);
+
+
+
+
+
+    /**
+     * 保存OA工作流信息 到 instance
+     * @param info   bId 信息
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public void saveOaWorkflowInfo(Map info) throws DAOException {
+        logger.debug("保存OA工作流信息Instance 入参 info : {}",info);
+
+        int saveFlag = sqlSessionTemplate.insert("oaWorkflowServiceDaoImpl.saveOaWorkflowInfo",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> getOaWorkflowInfo(Map info) throws DAOException {
+        logger.debug("查询OA工作流信息 入参 info : {}",info);
+
+        List<Map> businessOaWorkflowInfos = sqlSessionTemplate.selectList("oaWorkflowServiceDaoImpl.getOaWorkflowInfo",info);
+
+        return businessOaWorkflowInfos;
+    }
+
+
+    /**
+     * 修改OA工作流信息
+     * @param info 修改信息
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public void updateOaWorkflowInfo(Map info) throws DAOException {
+        logger.debug("修改OA工作流信息Instance 入参 info : {}",info);
+
+        int saveFlag = sqlSessionTemplate.update("oaWorkflowServiceDaoImpl.updateOaWorkflowInfo",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 queryOaWorkflowsCount(Map info) {
+        logger.debug("查询OA工作流数据 入参 info : {}",info);
+
+        List<Map> businessOaWorkflowInfos = sqlSessionTemplate.selectList("oaWorkflowServiceDaoImpl.queryOaWorkflowsCount", info);
+        if (businessOaWorkflowInfos.size() < 1) {
+            return 0;
+        }
+
+        return Integer.parseInt(businessOaWorkflowInfos.get(0).get("count").toString());
+    }
+
+
+}

+ 84 - 0
service-oa/src/main/java/com/java110/oa/smo/impl/OaWorkflowInnerServiceSMOImpl.java

@@ -0,0 +1,84 @@
+package com.java110.oa.smo.impl;
+
+
+import com.java110.intf.oa.IOaWorkflowInnerServiceSMO;
+import com.java110.oa.dao.IOaWorkflowServiceDao;
+import com.java110.dto.oaWorkflow.OaWorkflowDto;
+import com.java110.po.oaWorkflow.OaWorkflowPo;
+import com.java110.utils.util.BeanConvertUtil;
+import com.java110.core.base.smo.BaseServiceSMO;
+import com.java110.dto.user.UserDto;
+import com.java110.dto.PageDto;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+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 OaWorkflowInnerServiceSMOImpl extends BaseServiceSMO implements IOaWorkflowInnerServiceSMO {
+
+    @Autowired
+    private IOaWorkflowServiceDao oaWorkflowServiceDaoImpl;
+
+
+    @Override
+    public int saveOaWorkflow(@RequestBody OaWorkflowPo oaWorkflowPo) {
+        int saveFlag = 1;
+        oaWorkflowServiceDaoImpl.saveOaWorkflowInfo(BeanConvertUtil.beanCovertMap(oaWorkflowPo));
+        return saveFlag;
+    }
+
+     @Override
+    public int updateOaWorkflow(@RequestBody  OaWorkflowPo oaWorkflowPo) {
+        int saveFlag = 1;
+         oaWorkflowServiceDaoImpl.updateOaWorkflowInfo(BeanConvertUtil.beanCovertMap(oaWorkflowPo));
+        return saveFlag;
+    }
+
+     @Override
+    public int deleteOaWorkflow(@RequestBody  OaWorkflowPo oaWorkflowPo) {
+        int saveFlag = 1;
+        oaWorkflowPo.setStatusCd("1");
+        oaWorkflowServiceDaoImpl.updateOaWorkflowInfo(BeanConvertUtil.beanCovertMap(oaWorkflowPo));
+        return saveFlag;
+    }
+
+    @Override
+    public List<OaWorkflowDto> queryOaWorkflows(@RequestBody  OaWorkflowDto oaWorkflowDto) {
+
+        //校验是否传了 分页信息
+
+        int page = oaWorkflowDto.getPage();
+
+        if (page != PageDto.DEFAULT_PAGE) {
+            oaWorkflowDto.setPage((page - 1) * oaWorkflowDto.getRow());
+        }
+
+        List<OaWorkflowDto> oaWorkflows = BeanConvertUtil.covertBeanList(oaWorkflowServiceDaoImpl.getOaWorkflowInfo(BeanConvertUtil.beanCovertMap(oaWorkflowDto)), OaWorkflowDto.class);
+
+        return oaWorkflows;
+    }
+
+
+    @Override
+    public int queryOaWorkflowsCount(@RequestBody OaWorkflowDto oaWorkflowDto) {
+        return oaWorkflowServiceDaoImpl.queryOaWorkflowsCount(BeanConvertUtil.beanCovertMap(oaWorkflowDto));    }
+
+    public IOaWorkflowServiceDao getOaWorkflowServiceDaoImpl() {
+        return oaWorkflowServiceDaoImpl;
+    }
+
+    public void setOaWorkflowServiceDaoImpl(IOaWorkflowServiceDao oaWorkflowServiceDaoImpl) {
+        this.oaWorkflowServiceDaoImpl = oaWorkflowServiceDaoImpl;
+    }
+}