整理

jiangping

2024-01-09 857a1e6ddac0a5cfdd82c78218b2483534ab397f

 server/dmvisit_service/src/main/java/com/doumee/core/erp/ErpTool.java

@@ -46,7 +46,7 @@
                ERPApiResponse<PageData<ErpOrgListResponse>> response = JSONObject.parseObject(result, typeReference.getType());
                if(response!=null && response.getData()!=null&& response.getData().getRecords()!=null){
                    list.addAll(response.getData().getRecords());
                        if(100*pageSize < response.getData().getTotal() ){
                        if(page*pageSize < response.getData().getTotal() ){
                            hasLast =true;//还有下一页
                        }
                        page++;
@@ -81,7 +81,7 @@
                ERPApiResponse<PageData <ErpUserListResponse>> response = JSONObject.parseObject(result, typeReference.getType());
                if(response!=null && response.getData()!=null && response.getData().getRecords()!=null){
                    list.addAll(response.getData().getRecords());
                    if(100*pageSize < response.getData().getTotal() ){
                    if(pageSize*page < response.getData().getTotal() ){
                        hasLast =true;//还有下一页
                    }
                    page++;
@@ -99,14 +99,25 @@
     * @return
     */
    public static ApproveInfoResponse submitApprove(String url, ApproveAddRequest param){
        System.out.println(JSONObject.toJSONString(param));
        String result = HttpsUtil.postJson(url, JSONObject.toJSONString(param));
        if(StringUtils.isNotBlank(result)){
//            TypeReference typeReference =
//                    new TypeReference<ERPApiResponse<ApproveInfoResponse>>(){};
//            ERPApiResponse<ApproveInfoResponse> response = JSONObject.parseObject(result, typeReference.getType());
//            if(response!=null && response.isSuccess()){
//                return response.getData();
//            }
            TypeReference typeReference =
                    new TypeReference<ERPApiResponse<ApproveInfoResponse>>(){};
            ERPApiResponse<ApproveInfoResponse> response = JSONObject.parseObject(result, typeReference.getType());
                    new TypeReference<ERPApiResponse<String>>(){};
            ERPApiResponse<String> response = JSONObject.parseObject(result, typeReference.getType());
            if(response!=null && response.isSuccess()){
                return response.getData();
                ApproveInfoResponse approveInfoResponse = new ApproveInfoResponse();
                approveInfoResponse.setId(response.getData());
                return approveInfoResponse;
            }


        }
        return  null;
    }