优化代码

java110-bean/src/main/java/com/java110/dto/oaWorkflowData/OaWorkflowDataDto.java

@@ -0,0 +1,111 @@
+package com.java110.dto.oaWorkflowData;
+
+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 OaWorkflowDataDto extends PageDto implements Serializable {
+
+    private String dataId;
+private String businessKey;
+private String context;
+private String staffName;
+private String startTime;
+private String preDataId;
+private String endTime;
+private String storeId;
+private String event;
+private String staffId;
+
+
+    private Date createTime;
+
+    private String statusCd = "0";
+
+
+    public String getDataId() {
+        return dataId;
+    }
+public void setDataId(String dataId) {
+        this.dataId = dataId;
+    }
+public String getBusinessKey() {
+        return businessKey;
+    }
+public void setBusinessKey(String businessKey) {
+        this.businessKey = businessKey;
+    }
+public String getContext() {
+        return context;
+    }
+public void setContext(String context) {
+        this.context = context;
+    }
+public String getStaffName() {
+        return staffName;
+    }
+public void setStaffName(String staffName) {
+        this.staffName = staffName;
+    }
+public String getStartTime() {
+        return startTime;
+    }
+public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+public String getPreDataId() {
+        return preDataId;
+    }
+public void setPreDataId(String preDataId) {
+        this.preDataId = preDataId;
+    }
+public String getEndTime() {
+        return endTime;
+    }
+public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+public String getStoreId() {
+        return storeId;
+    }
+public void setStoreId(String storeId) {
+        this.storeId = storeId;
+    }
+public String getEvent() {
+        return event;
+    }
+public void setEvent(String event) {
+        this.event = event;
+    }
+public String getStaffId() {
+        return staffId;
+    }
+public void setStaffId(String staffId) {
+        this.staffId = staffId;
+    }
+
+
+    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/oaWorkflowData/OaWorkflowDataPo.java

@@ -0,0 +1,88 @@
+package com.java110.po.oaWorkflowData;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class OaWorkflowDataPo implements Serializable {
+
+    private String dataId;
+private String businessKey;
+private String context;
+private String staffName;
+private String startTime;
+private String preDataId;
+private String statusCd = "0";
+private String endTime;
+private String storeId;
+private String event;
+private String staffId;
+public String getDataId() {
+        return dataId;
+    }
+public void setDataId(String dataId) {
+        this.dataId = dataId;
+    }
+public String getBusinessKey() {
+        return businessKey;
+    }
+public void setBusinessKey(String businessKey) {
+        this.businessKey = businessKey;
+    }
+public String getContext() {
+        return context;
+    }
+public void setContext(String context) {
+        this.context = context;
+    }
+public String getStaffName() {
+        return staffName;
+    }
+public void setStaffName(String staffName) {
+        this.staffName = staffName;
+    }
+public String getStartTime() {
+        return startTime;
+    }
+public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+public String getPreDataId() {
+        return preDataId;
+    }
+public void setPreDataId(String preDataId) {
+        this.preDataId = preDataId;
+    }
+public String getStatusCd() {
+        return statusCd;
+    }
+public void setStatusCd(String statusCd) {
+        this.statusCd = statusCd;
+    }
+public String getEndTime() {
+        return endTime;
+    }
+public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+public String getStoreId() {
+        return storeId;
+    }
+public void setStoreId(String storeId) {
+        this.storeId = storeId;
+    }
+public String getEvent() {
+        return event;
+    }
+public void setEvent(String event) {
+        this.event = event;
+    }
+public String getStaffId() {
+        return staffId;
+    }
+public void setStaffId(String staffId) {
+        this.staffId = staffId;
+    }
+
+
+
+}

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

@@ -218,6 +218,7 @@ public class GenerateCodeFactory {
     public static final String CODE_PREFIX_monthId = "79";
     public static final String CODE_PREFIX_xmlId = "79";
     public static final String CODE_PREFIX_formId = "80";
+    public static final String CODE_PREFIX_dataId = "81";
 
 
 

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

@@ -0,0 +1,151 @@
+<?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="oaWorkflowDataServiceDaoImpl">
+
+
+
+
+
+    <!-- 保存OA表单审批数据信息 add by wuxw 2018-07-03 -->
+    <insert id="saveOaWorkflowDataInfo" parameterType="Map">
+        insert into oa_workflow_data(
+data_id,business_key,context,staff_name,start_time,pre_data_id,end_time,store_id,event,staff_id
+) values (
+#{dataId},#{businessKey},#{context},#{staffName},#{startTime},#{preDataId},#{endTime},#{storeId},#{event},#{staffId}
+)
+    </insert>
+
+
+
+    <!-- 查询OA表单审批数据信息 add by wuxw 2018-07-03 -->
+    <select id="getOaWorkflowDataInfo" parameterType="Map" resultType="Map">
+        select  t.data_id,t.data_id dataId,t.business_key,t.business_key businessKey,t.context,t.staff_name,t.staff_name staffName,t.start_time,t.start_time startTime,t.pre_data_id,t.pre_data_id preDataId,t.status_cd,t.status_cd statusCd,t.end_time,t.end_time endTime,t.store_id,t.store_id storeId,t.event,t.staff_id,t.staff_id staffId 
+from oa_workflow_data t 
+where 1 =1 
+<if test="dataId !=null and dataId != ''">
+   and t.data_id= #{dataId}
+</if> 
+<if test="businessKey !=null and businessKey != ''">
+   and t.business_key= #{businessKey}
+</if> 
+<if test="context !=null and context != ''">
+   and t.context= #{context}
+</if> 
+<if test="staffName !=null and staffName != ''">
+   and t.staff_name= #{staffName}
+</if> 
+<if test="startTime !=null and startTime != ''">
+   and t.start_time= #{startTime}
+</if> 
+<if test="preDataId !=null and preDataId != ''">
+   and t.pre_data_id= #{preDataId}
+</if> 
+<if test="statusCd !=null and statusCd != ''">
+   and t.status_cd= #{statusCd}
+</if> 
+<if test="endTime !=null and endTime != ''">
+   and t.end_time= #{endTime}
+</if> 
+<if test="storeId !=null and storeId != ''">
+   and t.store_id= #{storeId}
+</if> 
+<if test="event !=null and event != ''">
+   and t.event= #{event}
+</if> 
+<if test="staffId !=null and staffId != ''">
+   and t.staff_id= #{staffId}
+</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="updateOaWorkflowDataInfo" parameterType="Map">
+        update  oa_workflow_data t set t.status_cd = #{statusCd}
+<if test="newBId != null and newBId != ''">
+,t.b_id = #{newBId}
+</if> 
+<if test="businessKey !=null and businessKey != ''">
+, t.business_key= #{businessKey}
+</if> 
+<if test="context !=null and context != ''">
+, t.context= #{context}
+</if> 
+<if test="staffName !=null and staffName != ''">
+, t.staff_name= #{staffName}
+</if> 
+<if test="startTime !=null and startTime != ''">
+, t.start_time= #{startTime}
+</if> 
+<if test="preDataId !=null and preDataId != ''">
+, t.pre_data_id= #{preDataId}
+</if> 
+<if test="endTime !=null and endTime != ''">
+, t.end_time= #{endTime}
+</if> 
+<if test="storeId !=null and storeId != ''">
+, t.store_id= #{storeId}
+</if> 
+<if test="event !=null and event != ''">
+, t.event= #{event}
+</if> 
+<if test="staffId !=null and staffId != ''">
+, t.staff_id= #{staffId}
+</if> 
+ where 1=1 <if test="dataId !=null and dataId != ''">
+and t.data_id= #{dataId}
+</if> 
+
+    </update>
+
+    <!-- 查询OA表单审批数据数量 add by wuxw 2018-07-03 -->
+     <select id="queryOaWorkflowDatasCount" parameterType="Map" resultType="Map">
+        select  count(1) count 
+from oa_workflow_data t 
+where 1 =1 
+<if test="dataId !=null and dataId != ''">
+   and t.data_id= #{dataId}
+</if> 
+<if test="businessKey !=null and businessKey != ''">
+   and t.business_key= #{businessKey}
+</if> 
+<if test="context !=null and context != ''">
+   and t.context= #{context}
+</if> 
+<if test="staffName !=null and staffName != ''">
+   and t.staff_name= #{staffName}
+</if> 
+<if test="startTime !=null and startTime != ''">
+   and t.start_time= #{startTime}
+</if> 
+<if test="preDataId !=null and preDataId != ''">
+   and t.pre_data_id= #{preDataId}
+</if> 
+<if test="statusCd !=null and statusCd != ''">
+   and t.status_cd= #{statusCd}
+</if> 
+<if test="endTime !=null and endTime != ''">
+   and t.end_time= #{endTime}
+</if> 
+<if test="storeId !=null and storeId != ''">
+   and t.store_id= #{storeId}
+</if> 
+<if test="event !=null and event != ''">
+   and t.event= #{event}
+</if> 
+<if test="staffId !=null and staffId != ''">
+   and t.staff_id= #{staffId}
+</if> 
+
+
+     </select>
+
+</mapper>

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

@@ -1,29 +1,33 @@
 {
   "autoMove": true,
-  "id": "xmlId",
-  "name": "oaWorkflowForm",
-  "desc": "OA表单",
+  "id": "dataId",
+  "name": "oaWorkflowData",
+  "desc": "OA表单审批数据",
   "shareParam": "storeId",
   "shareColumn": "store_id",
   "shareName": "oa",
-  "tableName": "oa_workflow_form",
+  "tableName": "oa_workflow_data",
   "param": {
-    "formId": "form_id",
-    "flowId": "flow_id",
+    "dataId": "data_id",
+    "businessKey": "business_key",
     "storeId": "store_id",
-    "formJson": "form_json",
-    "tableName": "table_name",
-    "version": "version",
+    "context": "context",
+    "staffId": "staff_id",
+    "staffName": "staff_name",
+    "startTime": "start_time",
+    "endTime": "end_time",
+    "event": "event",
+    "preDataId": "pre_data_id",
     "statusCd": "status_cd"
   },
   "required": [
     {
-      "code": "flowId",
-      "msg": "流程不能为空"
+      "code": "businessKey",
+      "msg": "业务不能为空"
     },
     {
-      "code": "formJson",
-      "msg": "流程图不能为空"
+      "code": "context",
+      "msg": "审批内容不能为空"
     }
   ]
 }

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

@@ -0,0 +1,53 @@
+package com.java110.intf.oa;
+
+import com.java110.config.feign.FeignConfiguration;
+import com.java110.dto.oaWorkflowData.OaWorkflowDataDto;
+import com.java110.po.oaWorkflowData.OaWorkflowDataPo;
+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 IOaWorkflowDataInnerServiceSMO
+ * @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("/oaWorkflowDataApi")
+public interface IOaWorkflowDataInnerServiceSMO {
+
+
+    @RequestMapping(value = "/saveOaWorkflowData", method = RequestMethod.POST)
+    public int saveOaWorkflowData(@RequestBody OaWorkflowDataPo oaWorkflowDataPo);
+
+    @RequestMapping(value = "/updateOaWorkflowData", method = RequestMethod.POST)
+    public int updateOaWorkflowData(@RequestBody  OaWorkflowDataPo oaWorkflowDataPo);
+
+    @RequestMapping(value = "/deleteOaWorkflowData", method = RequestMethod.POST)
+    public int deleteOaWorkflowData(@RequestBody  OaWorkflowDataPo oaWorkflowDataPo);
+
+    /**
+     * <p>查询小区楼信息</p>
+     *
+     *
+     * @param oaWorkflowDataDto 数据对象分享
+     * @return OaWorkflowDataDto 对象数据
+     */
+    @RequestMapping(value = "/queryOaWorkflowDatas", method = RequestMethod.POST)
+    List<OaWorkflowDataDto> queryOaWorkflowDatas(@RequestBody OaWorkflowDataDto oaWorkflowDataDto);
+
+    /**
+     * 查询<p>小区楼</p>总记录数
+     *
+     * @param oaWorkflowDataDto 数据对象分享
+     * @return 小区下的小区楼记录数
+     */
+    @RequestMapping(value = "/queryOaWorkflowDatasCount", method = RequestMethod.POST)
+    int queryOaWorkflowDatasCount(@RequestBody OaWorkflowDataDto oaWorkflowDataDto);
+}

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

@@ -2,12 +2,17 @@ package com.java110.oa.api;
 
 import com.alibaba.fastjson.JSONObject;
 import com.java110.dto.oaWorkflow.OaWorkflowDto;
+import com.java110.dto.oaWorkflowData.OaWorkflowDataDto;
 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.oaWorkflowData.IDeleteOaWorkflowDataBMO;
+import com.java110.oa.bmo.oaWorkflowData.IGetOaWorkflowDataBMO;
+import com.java110.oa.bmo.oaWorkflowData.ISaveOaWorkflowDataBMO;
+import com.java110.oa.bmo.oaWorkflowData.IUpdateOaWorkflowDataBMO;
 import com.java110.oa.bmo.oaWorkflowForm.IDeleteOaWorkflowFormBMO;
 import com.java110.oa.bmo.oaWorkflowForm.IGetOaWorkflowFormBMO;
 import com.java110.oa.bmo.oaWorkflowForm.ISaveOaWorkflowFormBMO;
@@ -17,13 +22,19 @@ 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.oaWorkflowData.OaWorkflowDataPo;
 import com.java110.po.oaWorkflowForm.OaWorkflowFormPo;
 import com.java110.po.oaWorkflowXml.OaWorkflowXmlPo;
 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.*;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -64,6 +75,17 @@ public class OaWorkflowApi {
     @Autowired
     private IGetOaWorkflowFormBMO getOaWorkflowFormBMOImpl;
 
+
+    @Autowired
+    private ISaveOaWorkflowDataBMO saveOaWorkflowDataBMOImpl;
+    @Autowired
+    private IUpdateOaWorkflowDataBMO updateOaWorkflowDataBMOImpl;
+    @Autowired
+    private IDeleteOaWorkflowDataBMO deleteOaWorkflowDataBMOImpl;
+
+    @Autowired
+    private IGetOaWorkflowDataBMO getOaWorkflowDataBMOImpl;
+
     /**
      * 微信保存消息模板
      *
@@ -462,11 +484,91 @@ public class OaWorkflowApi {
      */
     @RequestMapping(value = "/getNextTask", method = RequestMethod.GET)
     public ResponseEntity<String> getNextTask(@RequestHeader(value = "store-id") String storeId,
-                                                  @RequestHeader(value = "user-id") String userId,
-                                                  @RequestParam(value = "taskId") String taskId) {
+                                              @RequestHeader(value = "user-id") String userId,
+                                              @RequestParam(value = "taskId") String taskId) {
         JSONObject reqJson = new JSONObject();
         reqJson.put("storeId", storeId);
         reqJson.put("taskId", taskId);
         return getOaWorkflowFormBMOImpl.getNextTask(reqJson);
     }
+
+
+    /**
+     * 微信保存消息模板
+     *
+     * @param reqJson
+     * @return
+     * @serviceCode /oaWorkflow/saveOaWorkflowData
+     * @path /app/oaWorkflow/saveOaWorkflowData
+     */
+    @RequestMapping(value = "/saveOaWorkflowData", method = RequestMethod.POST)
+    public ResponseEntity<String> saveOaWorkflowData(@RequestBody JSONObject reqJson) {
+
+        Assert.hasKeyAndValue(reqJson, "businessKey", "请求报文中未包含businessKey");
+        Assert.hasKeyAndValue(reqJson, "context", "请求报文中未包含context");
+
+
+        OaWorkflowDataPo oaWorkflowDataPo = BeanConvertUtil.covertBean(reqJson, OaWorkflowDataPo.class);
+        return saveOaWorkflowDataBMOImpl.save(oaWorkflowDataPo);
+    }
+
+    /**
+     * 微信修改消息模板
+     *
+     * @param reqJson
+     * @return
+     * @serviceCode /oaWorkflow/updateOaWorkflowData
+     * @path /app/oaWorkflow/updateOaWorkflowData
+     */
+    @RequestMapping(value = "/updateOaWorkflowData", method = RequestMethod.POST)
+    public ResponseEntity<String> updateOaWorkflowData(@RequestBody JSONObject reqJson) {
+
+        Assert.hasKeyAndValue(reqJson, "businessKey", "请求报文中未包含businessKey");
+        Assert.hasKeyAndValue(reqJson, "context", "请求报文中未包含context");
+        Assert.hasKeyAndValue(reqJson, "dataId", "dataId不能为空");
+
+
+        OaWorkflowDataPo oaWorkflowDataPo = BeanConvertUtil.covertBean(reqJson, OaWorkflowDataPo.class);
+        return updateOaWorkflowDataBMOImpl.update(oaWorkflowDataPo);
+    }
+
+    /**
+     * 微信删除消息模板
+     *
+     * @param reqJson
+     * @return
+     * @serviceCode /oaWorkflow/deleteOaWorkflowData
+     * @path /app/oaWorkflow/deleteOaWorkflowData
+     */
+    @RequestMapping(value = "/deleteOaWorkflowData", method = RequestMethod.POST)
+    public ResponseEntity<String> deleteOaWorkflowData(@RequestBody JSONObject reqJson) {
+        Assert.hasKeyAndValue(reqJson, "communityId", "小区ID不能为空");
+
+        Assert.hasKeyAndValue(reqJson, "dataId", "dataId不能为空");
+
+
+        OaWorkflowDataPo oaWorkflowDataPo = BeanConvertUtil.covertBean(reqJson, OaWorkflowDataPo.class);
+        return deleteOaWorkflowDataBMOImpl.delete(oaWorkflowDataPo);
+    }
+
+    /**
+     * 微信删除消息模板
+     *
+     * @param storeId 小区ID
+     * @return
+     * @serviceCode /oaWorkflow/queryOaWorkflowData
+     * @path /app/oaWorkflow/queryOaWorkflowData
+     */
+    @RequestMapping(value = "/queryOaWorkflowData", method = RequestMethod.GET)
+    public ResponseEntity<String> queryOaWorkflowData(@RequestHeader(value = "store-id") String storeId,
+                                                      @RequestParam(value = "page") int page,
+                                                      @RequestParam(value = "businessKey") String businessKey,
+                                                      @RequestParam(value = "row") int row) {
+        OaWorkflowDataDto oaWorkflowDataDto = new OaWorkflowDataDto();
+        oaWorkflowDataDto.setPage(page);
+        oaWorkflowDataDto.setRow(row);
+        oaWorkflowDataDto.setStoreId(storeId);
+        oaWorkflowDataDto.setBusinessKey(businessKey);
+        return getOaWorkflowDataBMOImpl.get(oaWorkflowDataDto);
+    }
 }

service-oa/src/main/java/com/java110/oa/bmo/oaWorkflowData/IDeleteOaWorkflowDataBMO.java

@@ -0,0 +1,17 @@
+package com.java110.oa.bmo.oaWorkflowData;
+import com.java110.po.oaWorkflowData.OaWorkflowDataPo;
+import org.springframework.http.ResponseEntity;
+
+public interface IDeleteOaWorkflowDataBMO {
+
+
+    /**
+     * 修改OA表单审批数据
+     * add by wuxw
+     * @param oaWorkflowDataPo
+     * @return
+     */
+    ResponseEntity<String> delete(OaWorkflowDataPo oaWorkflowDataPo);
+
+
+}

service-oa/src/main/java/com/java110/oa/bmo/oaWorkflowData/IGetOaWorkflowDataBMO.java

@@ -0,0 +1,16 @@
+package com.java110.oa.bmo.oaWorkflowData;
+import com.java110.dto.oaWorkflowData.OaWorkflowDataDto;
+import org.springframework.http.ResponseEntity;
+public interface IGetOaWorkflowDataBMO {
+
+
+    /**
+     * 查询OA表单审批数据
+     * add by wuxw
+     * @param  oaWorkflowDataDto
+     * @return
+     */
+    ResponseEntity<String> get(OaWorkflowDataDto oaWorkflowDataDto);
+
+
+}

service-oa/src/main/java/com/java110/oa/bmo/oaWorkflowData/ISaveOaWorkflowDataBMO.java

@@ -0,0 +1,17 @@
+package com.java110.oa.bmo.oaWorkflowData;
+
+import com.java110.po.oaWorkflowData.OaWorkflowDataPo;
+import org.springframework.http.ResponseEntity;
+public interface ISaveOaWorkflowDataBMO {
+
+
+    /**
+     * 添加OA表单审批数据
+     * add by wuxw
+     * @param oaWorkflowDataPo
+     * @return
+     */
+    ResponseEntity<String> save(OaWorkflowDataPo oaWorkflowDataPo);
+
+
+}

service-oa/src/main/java/com/java110/oa/bmo/oaWorkflowData/IUpdateOaWorkflowDataBMO.java

@@ -0,0 +1,17 @@
+package com.java110.oa.bmo.oaWorkflowData;
+import com.java110.po.oaWorkflowData.OaWorkflowDataPo;
+import org.springframework.http.ResponseEntity;
+
+public interface IUpdateOaWorkflowDataBMO {
+
+
+    /**
+     * 修改OA表单审批数据
+     * add by wuxw
+     * @param oaWorkflowDataPo
+     * @return
+     */
+    ResponseEntity<String> update(OaWorkflowDataPo oaWorkflowDataPo);
+
+
+}

service-oa/src/main/java/com/java110/oa/bmo/oaWorkflowData/impl/DeleteOaWorkflowDataBMOImpl.java

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

service-oa/src/main/java/com/java110/oa/bmo/oaWorkflowData/impl/GetOaWorkflowDataBMOImpl.java

@@ -0,0 +1,44 @@
+package com.java110.oa.bmo.oaWorkflowData.impl;
+
+import com.java110.dto.oaWorkflowData.OaWorkflowDataDto;
+import com.java110.intf.oa.IOaWorkflowDataInnerServiceSMO;
+import com.java110.oa.bmo.oaWorkflowData.IGetOaWorkflowDataBMO;
+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("getOaWorkflowDataBMOImpl")
+public class GetOaWorkflowDataBMOImpl implements IGetOaWorkflowDataBMO {
+
+    @Autowired
+    private IOaWorkflowDataInnerServiceSMO oaWorkflowDataInnerServiceSMOImpl;
+
+    /**
+     * @param oaWorkflowDataDto
+     * @return 订单服务能够接受的报文
+     */
+    public ResponseEntity<String> get(OaWorkflowDataDto oaWorkflowDataDto) {
+
+
+        int count = oaWorkflowDataInnerServiceSMOImpl.queryOaWorkflowDatasCount(oaWorkflowDataDto);
+
+        List<OaWorkflowDataDto> oaWorkflowDataDtos = null;
+        if (count > 0) {
+            oaWorkflowDataDtos = oaWorkflowDataInnerServiceSMOImpl.queryOaWorkflowDatas(oaWorkflowDataDto);
+        } else {
+            oaWorkflowDataDtos = new ArrayList<>();
+        }
+
+        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) oaWorkflowDataDto.getRow()), count, oaWorkflowDataDtos);
+
+        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+
+        return responseEntity;
+    }
+
+}

service-oa/src/main/java/com/java110/oa/bmo/oaWorkflowData/impl/SaveOaWorkflowDataBMOImpl.java

@@ -0,0 +1,38 @@
+package com.java110.oa.bmo.oaWorkflowData.impl;
+
+import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.intf.oa.IOaWorkflowDataInnerServiceSMO;
+import com.java110.oa.bmo.oaWorkflowData.ISaveOaWorkflowDataBMO;
+import com.java110.po.oaWorkflowData.OaWorkflowDataPo;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+
+@Service("saveOaWorkflowDataBMOImpl")
+public class SaveOaWorkflowDataBMOImpl implements ISaveOaWorkflowDataBMO {
+
+    @Autowired
+    private IOaWorkflowDataInnerServiceSMO oaWorkflowDataInnerServiceSMOImpl;
+
+    /**
+     * 添加小区信息
+     *
+     * @param oaWorkflowDataPo
+     * @return 订单服务能够接受的报文
+     */
+    @Java110Transactional
+    public ResponseEntity<String> save(OaWorkflowDataPo oaWorkflowDataPo) {
+
+        oaWorkflowDataPo.setDataId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_dataId));
+        int flag = oaWorkflowDataInnerServiceSMOImpl.saveOaWorkflowData(oaWorkflowDataPo);
+
+        if (flag > 0) {
+            return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
+        }
+
+        return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
+    }
+
+}

service-oa/src/main/java/com/java110/oa/bmo/oaWorkflowData/impl/UpdateOaWorkflowDataBMOImpl.java

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

service-oa/src/main/java/com/java110/oa/dao/IOaWorkflowDataServiceDao.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 IOaWorkflowDataServiceDao {
+
+
+    /**
+     * 保存 OA表单审批数据信息
+     * @param info
+     * @throws DAOException DAO异常
+     */
+    void saveOaWorkflowDataInfo(Map info) throws DAOException;
+
+
+
+
+    /**
+     * 查询OA表单审批数据信息（instance过程）
+     * 根据bId 查询OA表单审批数据信息
+     * @param info bId 信息
+     * @return OA表单审批数据信息
+     * @throws DAOException DAO异常
+     */
+    List<Map> getOaWorkflowDataInfo(Map info) throws DAOException;
+
+
+
+    /**
+     * 修改OA表单审批数据信息
+     * @param info 修改信息
+     * @throws DAOException DAO异常
+     */
+    void updateOaWorkflowDataInfo(Map info) throws DAOException;
+
+
+    /**
+     * 查询OA表单审批数据总数
+     *
+     * @param info OA表单审批数据信息
+     * @return OA表单审批数据数量
+     */
+    int queryOaWorkflowDatasCount(Map info);
+
+}

service-oa/src/main/java/com/java110/oa/dao/impl/OaWorkflowDataServiceDaoImpl.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.IOaWorkflowDataServiceDao;
+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("oaWorkflowDataServiceDaoImpl")
+//@Transactional
+public class OaWorkflowDataServiceDaoImpl extends BaseServiceDao implements IOaWorkflowDataServiceDao {
+
+    private static Logger logger = LoggerFactory.getLogger(OaWorkflowDataServiceDaoImpl.class);
+
+
+
+
+
+    /**
+     * 保存OA表单审批数据信息 到 instance
+     * @param info   bId 信息
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public void saveOaWorkflowDataInfo(Map info) throws DAOException {
+        logger.debug("保存OA表单审批数据信息Instance 入参 info : {}",info);
+
+        int saveFlag = sqlSessionTemplate.insert("oaWorkflowDataServiceDaoImpl.saveOaWorkflowDataInfo",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> getOaWorkflowDataInfo(Map info) throws DAOException {
+        logger.debug("查询OA表单审批数据信息 入参 info : {}",info);
+
+        List<Map> businessOaWorkflowDataInfos = sqlSessionTemplate.selectList("oaWorkflowDataServiceDaoImpl.getOaWorkflowDataInfo",info);
+
+        return businessOaWorkflowDataInfos;
+    }
+
+
+    /**
+     * 修改OA表单审批数据信息
+     * @param info 修改信息
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public void updateOaWorkflowDataInfo(Map info) throws DAOException {
+        logger.debug("修改OA表单审批数据信息Instance 入参 info : {}",info);
+
+        int saveFlag = sqlSessionTemplate.update("oaWorkflowDataServiceDaoImpl.updateOaWorkflowDataInfo",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 queryOaWorkflowDatasCount(Map info) {
+        logger.debug("查询OA表单审批数据数据 入参 info : {}",info);
+
+        List<Map> businessOaWorkflowDataInfos = sqlSessionTemplate.selectList("oaWorkflowDataServiceDaoImpl.queryOaWorkflowDatasCount", info);
+        if (businessOaWorkflowDataInfos.size() < 1) {
+            return 0;
+        }
+
+        return Integer.parseInt(businessOaWorkflowDataInfos.get(0).get("count").toString());
+    }
+
+
+}

service-oa/src/main/java/com/java110/oa/smo/impl/OaWorkflowDataInnerServiceSMOImpl.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.oaWorkflowData.OaWorkflowDataDto;
+import com.java110.intf.oa.IOaWorkflowDataInnerServiceSMO;
+import com.java110.oa.dao.IOaWorkflowDataServiceDao;
+import com.java110.po.oaWorkflowData.OaWorkflowDataPo;
+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 OaWorkflowDataInnerServiceSMOImpl extends BaseServiceSMO implements IOaWorkflowDataInnerServiceSMO {
+
+    @Autowired
+    private IOaWorkflowDataServiceDao oaWorkflowDataServiceDaoImpl;
+
+
+    @Override
+    public int saveOaWorkflowData(@RequestBody OaWorkflowDataPo oaWorkflowDataPo) {
+        int saveFlag = 1;
+        oaWorkflowDataServiceDaoImpl.saveOaWorkflowDataInfo(BeanConvertUtil.beanCovertMap(oaWorkflowDataPo));
+        return saveFlag;
+    }
+
+    @Override
+    public int updateOaWorkflowData(@RequestBody OaWorkflowDataPo oaWorkflowDataPo) {
+        int saveFlag = 1;
+        oaWorkflowDataServiceDaoImpl.updateOaWorkflowDataInfo(BeanConvertUtil.beanCovertMap(oaWorkflowDataPo));
+        return saveFlag;
+    }
+
+    @Override
+    public int deleteOaWorkflowData(@RequestBody OaWorkflowDataPo oaWorkflowDataPo) {
+        int saveFlag = 1;
+        oaWorkflowDataPo.setStatusCd("1");
+        oaWorkflowDataServiceDaoImpl.updateOaWorkflowDataInfo(BeanConvertUtil.beanCovertMap(oaWorkflowDataPo));
+        return saveFlag;
+    }
+
+    @Override
+    public List<OaWorkflowDataDto> queryOaWorkflowDatas(@RequestBody OaWorkflowDataDto oaWorkflowDataDto) {
+
+        //校验是否传了 分页信息
+
+        int page = oaWorkflowDataDto.getPage();
+
+        if (page != PageDto.DEFAULT_PAGE) {
+            oaWorkflowDataDto.setPage((page - 1) * oaWorkflowDataDto.getRow());
+        }
+
+        List<OaWorkflowDataDto> oaWorkflowDatas = BeanConvertUtil.covertBeanList(oaWorkflowDataServiceDaoImpl.getOaWorkflowDataInfo(BeanConvertUtil.beanCovertMap(oaWorkflowDataDto)), OaWorkflowDataDto.class);
+
+        return oaWorkflowDatas;
+    }
+
+
+    @Override
+    public int queryOaWorkflowDatasCount(@RequestBody OaWorkflowDataDto oaWorkflowDataDto) {
+        return oaWorkflowDataServiceDaoImpl.queryOaWorkflowDatasCount(BeanConvertUtil.beanCovertMap(oaWorkflowDataDto));
+    }
+
+    public IOaWorkflowDataServiceDao getOaWorkflowDataServiceDaoImpl() {
+        return oaWorkflowDataServiceDaoImpl;
+    }
+
+    public void setOaWorkflowDataServiceDaoImpl(IOaWorkflowDataServiceDao oaWorkflowDataServiceDaoImpl) {
+        this.oaWorkflowDataServiceDaoImpl = oaWorkflowDataServiceDaoImpl;
+    }
+}