优化代码

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

@@ -56,9 +56,7 @@
         <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>
@@ -75,6 +73,8 @@
             , t.table_name= #{tableName}
         </if>
         where 1=1
+            and t.form_id= #{formId}
+
     </update>
 
     <!-- 查询OA表单数量 add by wuxw 2018-07-03 -->
@@ -118,4 +118,50 @@
 
 
 
+    <!-- 查询OA表单数量 add by wuxw 2018-07-03 -->
+    <select id="queryOaWorkflowFormDataCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from #{tableName} t
+        where 1 =1
+            and t.store_id = #{storeId}
+            and t.status_cd= '0'
+        <if test="startTime !=null and startTime != ''">
+            and t.create_time &gt; #{startTime}
+        </if>
+        <if test="endTime !=null and endTime != ''">
+            and t.create_time &lt; #{endTime}
+        </if>
+        <if test="id !=null and id != ''">
+            and t.id = #{id}
+        </if>
+        <if test="createUserName !=null and createUserName != ''">
+            and t.create_user_name = #{createUserName}
+        </if>
+    </select>
+
+    <!-- 查询OA表单数量 add by wuxw 2018-07-03 -->
+    <select id="queryOaWorkflowFormDatas" parameterType="Map" resultType="Map">
+        select t.*
+        from #{tableName} t
+        where 1 =1
+        and t.store_id = #{storeId}
+        and t.status_cd= '0'
+        <if test="startTime !=null and startTime != ''">
+            and t.create_time &gt; #{startTime}
+        </if>
+        <if test="endTime !=null and endTime != ''">
+            and t.create_time &lt; #{endTime}
+        </if>
+        <if test="id !=null and id != ''">
+            and t.id = #{id}
+        </if>
+        <if test="createUserName !=null and createUserName != ''">
+            and t.create_user_name = #{createUserName}
+        </if>
+        order by t.create_time desc
+        <if test="page != -1 and page != null ">
+            limit #{page}, #{row}
+        </if>
+    </select>
+
 </mapper>

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

@@ -9,6 +9,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @ClassName IOaWorkflowFormInnerServiceSMO
@@ -62,4 +63,15 @@ public interface IOaWorkflowFormInnerServiceSMO {
 
     @RequestMapping(value = "/createTable", method = RequestMethod.POST)
     int createTable(@RequestBody String sql);
+
+    /**
+     * 查询数据总记录数
+     * @param oaWorkflowFormDto
+     * @return
+     */
+    @RequestMapping(value = "/queryOaWorkflowFormDataCount", method = RequestMethod.POST)
+    int queryOaWorkflowFormDataCount(@RequestBody Map oaWorkflowFormDto);
+
+    @RequestMapping(value = "/queryOaWorkflowFormDatas", method = RequestMethod.POST)
+    List<Map> queryOaWorkflowFormDatas(@RequestBody Map paramIn);
 }

service-common/src/main/java/com/java110/common/bmo/workflow/impl/QueryWorkFlowFirstStaffBMOImpl.java

@@ -290,6 +290,7 @@ public class QueryWorkFlowFirstStaffBMOImpl implements IQueryWorkFlowFirstStaffB
             sql.append(component.getString("label"));
             sql.append("',");
         }
+        sql.append("store_id varchar(30) not null COMMENT '商户ID',");
         sql.append("create_user_id varchar(30) not null COMMENT '创建人ID',");
         sql.append("create_user_name varchar(64) not null COMMENT '创建人',");
         sql.append("create_time timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',");

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

@@ -308,4 +308,25 @@ public class OaWorkflowApi {
         oaWorkflowFormDto.setFlowId(flowId);
         return getOaWorkflowFormBMOImpl.get(oaWorkflowFormDto);
     }
+
+    /**
+     * 微信删除消息模板
+     *
+     * @param storeId 小区ID
+     * @return
+     * @serviceCode /oaWorkflow/queryOaWorkflowFormData
+     * @path /app/oaWorkflow/queryOaWorkflowFormData
+     */
+    @RequestMapping(value = "/queryOaWorkflowFormData", method = RequestMethod.GET)
+    public ResponseEntity<String> queryOaWorkflowFormData(@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.queryOaWorkflowFormData(oaWorkflowFormDto);
+    }
 }

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

@@ -13,4 +13,5 @@ public interface IGetOaWorkflowFormBMO {
     ResponseEntity<String> get(OaWorkflowFormDto oaWorkflowFormDto);
 
 
+    ResponseEntity<String> queryOaWorkflowFormData(OaWorkflowFormDto oaWorkflowFormDto);
 }

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

@@ -1,8 +1,10 @@
 package com.java110.oa.bmo.oaWorkflowForm.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.java110.dto.oaWorkflowForm.OaWorkflowFormDto;
 import com.java110.intf.oa.IOaWorkflowFormInnerServiceSMO;
 import com.java110.oa.bmo.oaWorkflowForm.IGetOaWorkflowFormBMO;
+import com.java110.utils.util.Assert;
 import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -10,7 +12,9 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Service("getOaWorkflowFormBMOImpl")
 public class GetOaWorkflowFormBMOImpl implements IGetOaWorkflowFormBMO {
@@ -41,4 +45,44 @@ public class GetOaWorkflowFormBMOImpl implements IGetOaWorkflowFormBMO {
         return responseEntity;
     }
 
+    /**
+     * {"schemaVersion":1,"exporter":{"name":"form-js","version":"0.1.0"},
+     * "components":[{"text":"# Text","type":"text"},{"key":"textfield2","label":"文本框","type":"textfield"},{"key":"number2","label":"Number","type":"number"},
+     * {"key":"checkbox2","label":"Checkbox","type":"checkbox"},
+     * {"key":"radio2","label":"Radio","type":"radio","values":[{"label":"Value","value":"value"}]},
+     * {"key":"select2","label":"Select","type":"select","values":[{"label":"Value","value":"value"}]},
+     * {"text":"# Text","type":"text"},{"key":"textarea1","label":"多行文本框","type":"textarea"},
+     * {"key":"textdate1","label":"日期","type":"textdate"},
+     * {"key":"textdatetime1","label":"时间","type":"textdatetime"},
+     * {"action":"submit","key":"button1","label":"Button","type":"button"}],"type":"default"}
+     * @param oaWorkflowFormDto
+     * @return
+     */
+    @Override
+    public ResponseEntity<String> queryOaWorkflowFormData(OaWorkflowFormDto oaWorkflowFormDto) {
+        List<OaWorkflowFormDto> oaWorkflowFormDtos = oaWorkflowFormInnerServiceSMOImpl.queryOaWorkflowForms(oaWorkflowFormDto);
+
+        Assert.listOnlyOne(oaWorkflowFormDtos, "未包含流程表单，请先设置表单");
+
+        String formJson = oaWorkflowFormDtos.get(0).getFormJson();
+
+        JSONObject formObj = JSONObject.parseObject(formJson);
+        Map paramIn = new HashMap();
+
+        int count = oaWorkflowFormInnerServiceSMOImpl.queryOaWorkflowFormDataCount(paramIn);
+
+        List<Map> datas = null;
+        if (count > 0) {
+            datas = oaWorkflowFormInnerServiceSMOImpl.queryOaWorkflowFormDatas(paramIn);
+        } else {
+            datas = new ArrayList<>();
+        }
+
+        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) oaWorkflowFormDto.getRow()), count, datas);
+
+        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+
+        return responseEntity;
+    }
+
 }

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

@@ -66,4 +66,8 @@ public interface IOaWorkflowFormServiceDao {
     List<Map> hasTable(Map info);
 
     int createTable(Map info);
+
+    int queryOaWorkflowFormDataCount(Map paramIn);
+
+    List<Map> queryOaWorkflowFormDatas(Map paramIn);
 }

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

@@ -115,5 +115,26 @@ public class OaWorkflowFormServiceDaoImpl extends BaseServiceDao implements IOaW
         return  flag;
     }
 
+    @Override
+    public int queryOaWorkflowFormDataCount(Map paramIn) {
+        logger.debug("查询queryOaWorkflowFormDataCount数据 入参 info : {}",paramIn);
+
+        List<Map> businessOaWorkflowFormInfos = sqlSessionTemplate.selectList("oaWorkflowFormServiceDaoImpl.queryOaWorkflowFormDataCount", paramIn);
+        if (businessOaWorkflowFormInfos.size() < 1) {
+            return 0;
+        }
+
+        return Integer.parseInt(businessOaWorkflowFormInfos.get(0).get("count").toString());
+    }
+
+    @Override
+    public List<Map> queryOaWorkflowFormDatas(Map paramIn) {
+        logger.debug("查询queryOaWorkflowFormDatas信息 入参 info : {}",paramIn);
+
+        List<Map> businessOaWorkflowFormInfos = sqlSessionTemplate.selectList("oaWorkflowFormServiceDaoImpl.queryOaWorkflowFormDatas",paramIn);
+
+        return businessOaWorkflowFormInfos;
+    }
+
 
 }

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

@@ -96,6 +96,26 @@ public class OaWorkflowFormInnerServiceSMOImpl extends BaseServiceSMO implements
         return flag;
     }
 
+    @Override
+    public int queryOaWorkflowFormDataCount(@RequestBody Map paramIn) {
+        return oaWorkflowFormServiceDaoImpl.queryOaWorkflowFormDataCount(paramIn);
+    }
+
+    @Override
+    public List<Map> queryOaWorkflowFormDatas(@RequestBody Map paramIn) {
+
+        //校验是否传了 分页信息
+
+        int page = (int)paramIn.get("page");
+
+        if (page != PageDto.DEFAULT_PAGE) {
+            paramIn.put("page",(page - 1) * (int)paramIn.get("row"));
+        }
+        List<Map> info = oaWorkflowFormServiceDaoImpl.queryOaWorkflowFormDatas(paramIn);
+
+        return info;
+    }
+
     public IOaWorkflowFormServiceDao getOaWorkflowFormServiceDaoImpl() {
         return oaWorkflowFormServiceDaoImpl;
     }