后台
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
liusheng
2023-07-17 2c456094bdf1cc7e1bab5e0dbee00bb1f2743488 
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java


@@ -331,97 +331,97 @@


//    }






    int uploadOAFileAndUpdateDb(ServiceFundShared remShare) {


        //上传OA文件


        //String strUrl = "http://129.88.242.39:8899/seeyon/rest/token?userName=opo&password=127814f8-84e8-4304-84a5-a71573567efd&loginName=demo3";


        String strUrl = "http://129.88.242.39:8899/seeyon/rest/token";


        //String strUrl = "http://slb.hospitalstar.com:8899/seeyon/rest/token";


        //上传文件成功后，去更新相关的数据库






        Map<String, Object> map = new HashMap<String, Object>();


        map.put("userName", "opo");


        map.put("password", "4126407a-9821-4874-be41-6568abd6dbe5");


        map.put("loginName", "demo3");




        JSONObject jsonObj = new JSONObject(map);




        System.out.println("uploadOAFileAndUpdateDb + jsonObject" + jsonObj.toString() + "\r\n" + jsonObj.toJSONString());


        String strRes = HttpClientKit.postOpr(strUrl, jsonObj.toString());//


        //String strRes = HttpClientKit.postMsg(strUrl,jsonObj);//得到返回的token?




        JSONObject json1 = JSONObject.parseObject(strRes);


        strRes = json1.get("id").toString();




        ///if(strRes.isEmpty() || "" == strRes) return -1;// 为空代表失败




        //下面需求调用文件的接口，调用成功返回后，得到filename和fileid 用这二个值去更新数据




        String filePath = RuoYiConfig.getUploadPath();


        String strMutfileUrl = remShare.getAnnexbankcard();//可能存在多个地址，以,分开




        String strFUrl = "http://129.88.242.39:8899/seeyon/rest/attachment?token=" + strRes;


        //String strFUrl = "http://slb.hospitalstar.com:8899/seeyon/rest/attachment?token="+strRes;


        //strFUrl = String.format(strFUrl, strRes);




        /*File test = null;


        File file = new File("E:\\YYJQ\\OPO\\WEB\\Upload\\upload\\2023\\02\\17");


        if (file.exists() && file.isDirectory()) {


            // 获取所有盲盒文件夹


            File[] ones = file.listFiles();


            for (File one : ones) {


                test = one;


            }


        }*/




        String filename = "";


        String fileid = "";




        String[] urlArray = strMutfileUrl.split(",");


        for (int i = 0; i < urlArray.length; i++) {


            String strOneFileName = urlArray[i];


            String strTemp = strOneFileName.substring(15);


            String strFile = filePath + strTemp;


            //FileUploadUtils.getAbsoluteFile(filePath,strOneFileName);


            String struploadResult = "";


            File filetest = new File(strFile);


            try {


                struploadResult = HttpClientKit.sendPostWithFile(filetest, strFUrl);


            } catch (Exception e) {


                e.printStackTrace();


            }






            //String strFRes = HttpClientKit.postMsg(strFUrl,jsonFObj);


            if (struploadResult == null) return 0;


            if (struploadResult.isEmpty()) return 0;




            JSONObject jsonR = JSONObject.parseObject(struploadResult);




            JSONArray jsonArr = jsonR.getJSONArray("atts");


            for (int j = 0; j < jsonArr.size(); j++) {


                JSONObject jsonRet = jsonArr.getJSONObject(j);


                String name1 = jsonRet.get("filename").toString();


                String id1 = jsonRet.get("fileUrl").toString();


                filename += name1;


                fileid += id1;


                if (i != urlArray.length - 1) {


                    filename += ",";


                    fileid += ",";


                }


            }




        }




        long nId = remShare.getId();


        remShare.setId(nId);


        remShare.setFilename(filename);


        remShare.setFileid(fileid);


        boolean bRet = fundServiceShare.updateById(remShare);


        if (!bRet) return -1;




        return 0;


    }


//    int uploadOAFileAndUpdateDb(ServiceFundShared remShare) {


//        //上传OA文件


//        //String strUrl = "http://129.88.242.39:8899/seeyon/rest/token?userName=opo&password=127814f8-84e8-4304-84a5-a71573567efd&loginName=demo3";


//        String strUrl = "http://129.88.242.39:8899/seeyon/rest/token";


//        //String strUrl = "http://slb.hospitalstar.com:8899/seeyon/rest/token";


//        //上传文件成功后，去更新相关的数据库


//


//


//        Map<String, Object> map = new HashMap<String, Object>();


//        map.put("userName", "opo");


//        map.put("password", "4126407a-9821-4874-be41-6568abd6dbe5");


//        map.put("loginName", "demo3");


//


//        JSONObject jsonObj = new JSONObject(map);


//


//        System.out.println("uploadOAFileAndUpdateDb + jsonObject" + jsonObj.toString() + "\r\n" + jsonObj.toJSONString());


//        String strRes = HttpClientKit.postOpr(strUrl, jsonObj.toString());//


//        //String strRes = HttpClientKit.postMsg(strUrl,jsonObj);//得到返回的token?


//


//        JSONObject json1 = JSONObject.parseObject(strRes);


//        strRes = json1.get("id").toString();


//


//        ///if(strRes.isEmpty() || "" == strRes) return -1;// 为空代表失败


//


//        //下面需求调用文件的接口，调用成功返回后，得到filename和fileid 用这二个值去更新数据


//


//        String filePath = RuoYiConfig.getUploadPath();


//        String strMutfileUrl = remShare.getAnnexbankcard();//可能存在多个地址，以,分开


//


//        String strFUrl = "http://129.88.242.39:8899/seeyon/rest/attachment?token=" + strRes;


//        //String strFUrl = "http://slb.hospitalstar.com:8899/seeyon/rest/attachment?token="+strRes;


//        //strFUrl = String.format(strFUrl, strRes);


//


//        /*File test = null;


//        File file = new File("E:\\YYJQ\\OPO\\WEB\\Upload\\upload\\2023\\02\\17");


//        if (file.exists() && file.isDirectory()) {


//            // 获取所有盲盒文件夹


//            File[] ones = file.listFiles();


//            for (File one : ones) {


//                test = one;


//            }


//        }*/


//


//        String filename = "";


//        String fileid = "";


//


//        String[] urlArray = strMutfileUrl.split(",");


//        for (int i = 0; i < urlArray.length; i++) {


//            String strOneFileName = urlArray[i];


//            String strTemp = strOneFileName.substring(15);


//            String strFile = filePath + strTemp;


//            //FileUploadUtils.getAbsoluteFile(filePath,strOneFileName);


//            String struploadResult = "";


//            File filetest = new File(strFile);


//            try {


//                struploadResult = HttpClientKit.sendPostWithFile(filetest, strFUrl);


//            } catch (Exception e) {


//                e.printStackTrace();


//            }


//


//


//            //String strFRes = HttpClientKit.postMsg(strFUrl,jsonFObj);


//            if (struploadResult == null) return 0;


//            if (struploadResult.isEmpty()) return 0;


//


//            JSONObject jsonR = JSONObject.parseObject(struploadResult);


//


//            JSONArray jsonArr = jsonR.getJSONArray("atts");


//            for (int j = 0; j < jsonArr.size(); j++) {


//                JSONObject jsonRet = jsonArr.getJSONObject(j);


//                String name1 = jsonRet.get("filename").toString();


//                String id1 = jsonRet.get("fileUrl").toString();


//                filename += name1;


//                fileid += id1;


//                if (i != urlArray.length - 1) {


//                    filename += ",";


//                    fileid += ",";


//                }


//            }


//


//        }


//


//        long nId = remShare.getId();


//        remShare.setId(nId);


//        remShare.setFilename(filename);


//        remShare.setFileid(fileid);


//        boolean bRet = fundServiceShare.updateById(remShare);


//        if (!bRet) return -1;


//


//        return 0;


//    }




    /**


     * 新增费用汇总


@@ -450,7 +450,7 @@


    @Log(title = "审核费用", businessType = BusinessType.OTHER)


    @PostMapping("/checkfund")


    public AjaxResult checkFund(@RequestBody CheckFundVO checkFundVO) {


        logger.info("serviceFundController---checkFund的入参值checkFundVO :{}",checkFundVO);


        logger.info("serviceFundController---checkFund的入参值checkFundVO :{}", checkFundVO);


        ServiceFund serviceFund = serviceFundService.getById(checkFundVO.getFundid());


        if (serviceFund != null) {


            Integer TotalLevel = 0;


@@ -459,7 +459,7 @@


            serviceFundflowrule.setFundtype(2);


            serviceFundflowrule.setApplytype(serviceFund.getApplytype());


            serviceFundflowrule.setCheckuserno(loginUser.getUsername());


            logger.info("serviceFundController---checkFund---queryList的入参值serviceFundflowrule:{}",serviceFundflowrule);


            logger.info("serviceFundController---checkFund---queryList的入参值serviceFundflowrule:{}", serviceFundflowrule);




            List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);




@@ -493,10 +493,15 @@


                FlowLevel = FlowLevel + 1;


            } else {


                CheckFlag = 2;


                RecordStatus = (FlowLevel + 1) * 2 - 1;


                FlowLevel = (FlowLevel - 1);


                if (FlowLevel < 0) {


                if (CheckFlag == 2) {


                    //应医院要求如果出现退回，直接退到发起者


                    FlowLevel = 0;


                } else {


                    RecordStatus = (FlowLevel + 1) * 2 - 1;


                    FlowLevel = (FlowLevel - 1);


                    if (FlowLevel < 0) {


                        FlowLevel = 0;


                    }


                }


            }




@@ -550,7 +555,7 @@


                    columnMap.put("fundID", checkFundVO.getFundid());


                    //获取详情数据


                    List<ServiceFunddetail> serviceFunddetails = serviceFunddetailMapper.selectByMap(columnMap);


                    logger.info("serviceFundController---checkFund的返回值serviceFunddetails :{}",serviceFunddetails);


                    logger.info("serviceFundController---checkFund的返回值serviceFunddetails :{}", serviceFunddetails);


                    List<ServiceFunddetailShared> serviceFunddetailShareds = DtoConversionUtils.sourceToTarget(serviceFunddetails, ServiceFunddetailShared.class);


                    for (int i = 0; i < serviceFunddetails.size(); i++) {


                        serviceFunddetailShareds.get(i).setFundid(serviceFundShared.getId());


@@ -589,11 +594,29 @@


    @PutMapping


    @RepeatSubmit


    public AjaxResult edit(@RequestBody ServiceFund serviceFund) {


        boolean bret = serviceFundService.updateById(serviceFund);


        List<ServiceFund> infoByInfoIdList = serviceFundService.getInfoByInfoId(serviceFund.getId());


        for (ServiceFund sf : infoByInfoIdList) {


            //如果等于100，说明已经走到医院财务那边了；财务那边取数据是从分享表取，所以，这里直接往分享表里添加数据就行了


            if (sf.getBackflowlevel() == 100 || sf.getBackflowlevel() == 199) {


                ServiceFundShared serviceFundShared = DtoConversionUtils.sourceToTarget(serviceFund, ServiceFundShared.class);


                serviceFundShared.setId(null);


                serviceFundShared.setDel_flag(0);


                fundSharedService.save(serviceFundShared);




                //将fund表的审核状态改成100


                sf.setBackflowlevel(100);


                serviceFundService.updateById(sf);


                return success();


            } else {


                boolean bret = serviceFundService.updateById(serviceFund);


//        if (bret) {


//            addReiSharedDatd(serviceFund, 2);


//        }


        return toAjax(bret);


                return toAjax(bret);


            }


        }




        return toAjax(false);


    }




    /**