Merge branch 'test' into fix/Download_image_interface_added

# Conflicts:
#	jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/PrevailCloudApi.java
#	jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/impl/PrevailCloudApiImpl.java

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/PrevailCloudApi.java

@@ -22,6 +22,12 @@ public interface PrevailCloudApi {
 
     void sendFlowTaskResult(String tenantId,String data) throws Exception;
 
+    /**
+     * 根据租户id 拉取对应业务主体信息
+     * @param tenantNo
+     */
+    void pullAccountInfo(long tenantNo) throws Exception;
+
     /**
      * 图片下载监测
      */

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/impl/PrevailCloudApiImpl.java

@@ -141,6 +141,37 @@ public class PrevailCloudApiImpl implements PrevailCloudApi {
         System.out.println(responseJsonStr);
     }
 
+    @Override
+    public void pullAccountInfo(long tenantNo) throws Exception {
+        Map<String, Object> queryParam = new HashMap<>();
+        queryParam.put("tenantNo",tenantNo);
+        String json = JSONObject.toJSONString(queryParam);
+        RequestData requestData = ApiHelper.buildRequest(tenantNo+"", apiConfig.getAccessKey(), apiConfig.getAccessCode(),json);
+        String url = apiConfig.getInterfaceDomain()+tenantSourceUrl;
+        String requestBodyJson = JSONObject.toJSONString(requestData);
+        //入参
+        HttpParamers httpParamers = new HttpParamers(HttpMethod.POST);
+        httpParamers.setJsonParamer(requestBodyJson);
+        //发起请求
+        String responseJsonStr = HttpClient.doPost(url,httpParamers,null,apiConfig.getConnectTimeout(),apiConfig.getReadTimeout());
+        System.out.println(responseJsonStr);
+        ResultData<String> resultData =JSONUtil.toBean(responseJsonStr,ResultData.class);
+        if(resultData.getStatus()==100){;
+            //解析基础数据
+            String data = ApiHelper.decryptResponse(apiConfig.getAccessCode(), resultData);
+            ApiPage<String> apiPage = JSONUtil.toBean(data,ApiPage.class);
+            System.out.println(apiPage);
+            //解析数据结果为List
+//            List<PictureSourceResult> listResult = JSONUtil.toList(JSONObject.toJSONString(apiPage.getRecords()),PictureSourceResult.class);
+//            ApiPage<PictureSourceResult> resultApiPage = new ApiPage<>();
+//            resultApiPage.setPageNo(apiPage.getPageNo());
+//            resultApiPage.setPageSize(apiPage.getPageSize());
+//            resultApiPage.setTotal(apiPage.getTotal());
+//            resultApiPage.setRecords(listResult);
+//            return resultApiPage;
+        }
+    }
+
     /**
      * 启动任务 图片下载监测
      *

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/ApiTestController.java

@@ -82,6 +82,19 @@ public class ApiTestController {
     }
 
 
+    @GetMapping("pullAccountInfo")
+    public String pullAccountInfo(HttpServletRequest request){
+
+        try {
+           prevailCloudApi.pullAccountInfo(1714548920583360512L);
+           return "ok";
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return "处理失败";
+    }
+
+
     @GetMapping("psTest01")
     public String psTset01(HttpServletRequest request){
         String beginStr = request.getParameter("beginStr");

jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml

@@ -513,7 +513,7 @@
                     ${iztaskrrom.likeend}
                 </if>
                 <if test="izproject != null">
-                    ${izproject.rulesOp} tcp.FROMPROJECTID ${izproject.dataOp} ${izproject.likestar}
+                    ${izproject.rulesOp} tcp.FROMPROJECTNAME ${izproject.dataOp} ${izproject.likestar}
                     <!--				#{fromuserid.value}-->
                     <if test="izproject.value instanceof java.util.List">
                         <foreach item="item" collection="izproject.value" open="" separator="," close="">