将数据分享给财务

liusheng

2023-06-30 c68e3da8e41b171755a99a5c877b5df1d391ddd9

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java

@@ -152,6 +152,12 @@
        }
        //startPage();
        List<SpFinancialExpensesReimbursementOut> list = serviceReimbursementService.getListBypower(loginUser.getUsername(), 1, APPLICANT, APPLICATIONBEGTIME, APPLICATIONENDTIME, loginUser.getDeptId().toString(), CHECKFLAG, APPLYTYPE);
        Collections.sort(list, new Comparator<SpFinancialExpensesReimbursementOut>() {
            @Override
            public int compare(SpFinancialExpensesReimbursementOut o1, SpFinancialExpensesReimbursementOut o2) {
                return o2.getCreateTime().compareTo(o1.getCreateTime());
            }
        });
        return getCustomDataTable(list, pageNum, pageSize);
    }

@@ -189,18 +195,6 @@
    }

    /**
     * 往service_reimbursement_share,往service_reimbursementdetail_share,往service_reimbursementpyee_share新增备份数据
     *
     * @param id
     * @return
     */
    @GetMapping("/addShareData/{id}")
    public AjaxResult addSharedData(@PathVariable("id") Long id) {

        return AjaxResult.success(serviceReimbursementService.addSharedData(id));
    }

    /**
     * 新增报销申请
     */
    @ApiOperation("新增报销申请")
@@ -219,229 +213,229 @@
        return AjaxResult.success(id);
    }

    public int addReiSharedDatd(ServiceReimbursement serviceReimbursement, int nType) {
        //remShare = ;
        ServiceReimbursementShared remShare = new ServiceReimbursementShared();
        if (nType == 1) {
            // remShare = new ServiceReimbursementShared();
            remShare.setReimid(serviceReimbursement.getId());
        } else //modify
        {
            List<ServiceReimbursementShared> remlist = serviceReimbursementServiceShare.getRemShareInfoByRemId(serviceReimbursement.getId());
            if (!CollectionUtils.isEmpty(remlist)) remShare = remlist.get(0);
        }

        remShare.setUserno(serviceReimbursement.getUserno());
        remShare.setUsername(serviceReimbursement.getUsername());
        remShare.setTravelers(serviceReimbursement.getTravelers());
        remShare.setIdcardtype(serviceReimbursement.getIdcardtype());
        remShare.setIdcardno(serviceReimbursement.getIdcardno());
        remShare.setPhone(serviceReimbursement.getPhone());
        remShare.setDepositbank(serviceReimbursement.getDepositbank());
        remShare.setBankcardno(serviceReimbursement.getBankcardno());
        remShare.setBranchbankname(serviceReimbursement.getBranchbankname());
        remShare.setAnnexbankcard(serviceReimbursement.getAnnexbankcard());
        remShare.setAnnexfiles(serviceReimbursement.getAnnexfiles());
        //remShare.setAnnexfiles(serviceReimbursement.getAnnexfiles());
        // remShare.setAmountrequested(BigDecimal.valueOf(serviceReimbursement.getAmountrequested()));

        Double nTemp = serviceReimbursement.getAmountrequested();
        if (nTemp == null) nTemp = 0d;
        remShare.setAmountrequested(BigDecimal.valueOf(nTemp));

        nTemp = serviceReimbursement.getPrepaidamount();
        if (nTemp == null) nTemp = 0.0;
        remShare.setPrepaidamount(BigDecimal.valueOf(nTemp));

        remShare.setInvoicecount(serviceReimbursement.getInvoicecount());
        remShare.setAttachcount(serviceReimbursement.getAttachcount());
        remShare.setManagerno(serviceReimbursement.getManagerno());
        remShare.setManagername(serviceReimbursement.getManagername());
        remShare.setDeptmentno(serviceReimbursement.getDeptmentno());
        remShare.setDeptmentname(serviceReimbursement.getDeptmentname());
        remShare.setOpochecker(serviceReimbursement.getOpochecker());
        remShare.setFinvicepresident(serviceReimbursement.getFinvicepresident());
        remShare.setBusvicepresident(serviceReimbursement.getBusvicepresident());
        remShare.setOfficedirector(serviceReimbursement.getOfficedirector());
        remShare.setFinancedirector(serviceReimbursement.getFinancedirector());
        remShare.setFinancechecher(serviceReimbursement.getFinancechecher());
        remShare.setInfoid(serviceReimbursement.getInfoid());
        remShare.setDonorno(serviceReimbursement.getDonorno());

        remShare.setDonorname(serviceReimbursement.getDonorname());
        remShare.setReason(serviceReimbursement.getReason());
        remShare.setRecordstatus(serviceReimbursement.getRecordstatus());
        remShare.setUploadflag(serviceReimbursement.getUploadflag());
        remShare.setUploadtime(serviceReimbursement.getUploadtime());

        nTemp = serviceReimbursement.getTotalamount();
        if (nTemp == null) nTemp = 0.0;
        remShare.setTotalamount(BigDecimal.valueOf(nTemp));

        remShare.setBigstrmoney(serviceReimbursement.getBigstrmoney());
        remShare.setFlowlevel(serviceReimbursement.getFlowlevel());
        remShare.setCosttype(serviceReimbursement.getCosttype());
        remShare.setCosttypename(serviceReimbursement.getCosttypename());
        remShare.setFileurl(serviceReimbursement.getAnnexfiles());
        remShare.setDonorbank(serviceReimbursement.getDonorbank());
        remShare.setDonorbankcard(serviceReimbursement.getDonorbankcard());
        remShare.setDonorremark(serviceReimbursement.getDonorremark());

        nTemp = serviceReimbursement.getDonoramount();
        if (nTemp == null) nTemp = 0.0;
        remShare.setDonoramount(nTemp);
        remShare.setDonorrelatives(serviceReimbursement.getDonorrelatives());
        //remShare.setOaid(serviceReimbursement.getOaid());
        //remShare.setDonorno(serviceReimbursement.getDonorno());

        boolean bRet = false;
        if (nType == 1) {
            bRet = serviceReimbursementServiceShare.save(remShare);
        } else {
            //remShare.setId(serviceReimbursement.);
            bRet = serviceReimbursementServiceShare.updateById(remShare);
        }

        //if(!bRet) return -1;
        String strMutfileUrl = remShare.getFileurl();
        //有附件时才调用第三方进行上传
        if (strMutfileUrl == null) return 0;
        if (strMutfileUrl.isEmpty()) return 0;

        try {
            uploadOAFileAndUpdateDb(remShare);
        } catch (Exception e) {
            logger.error("调用第三方接口出错!");
            e.printStackTrace();
        }

        //此处保存成功后要上传OA，保存返回值

        return 0;
    }
//    public int addReiSharedDatd(ServiceReimbursement serviceReimbursement, int nType) {
//        //remShare = ;
//        ServiceReimbursementShared remShare = new ServiceReimbursementShared();
//        if (nType == 1) {
//            // remShare = new ServiceReimbursementShared();
//            remShare.setReimid(serviceReimbursement.getId());
//        } else //modify
//        {
//            List<ServiceReimbursementShared> remlist = serviceReimbursementServiceShare.getRemShareInfoByRemId(serviceReimbursement.getId());
//            if (!CollectionUtils.isEmpty(remlist)) remShare = remlist.get(0);
//        }
//
//        remShare.setUserno(serviceReimbursement.getUserno());
//        remShare.setUsername(serviceReimbursement.getUsername());
//        remShare.setTravelers(serviceReimbursement.getTravelers());
//        remShare.setIdcardtype(serviceReimbursement.getIdcardtype());
//        remShare.setIdcardno(serviceReimbursement.getIdcardno());
//        remShare.setPhone(serviceReimbursement.getPhone());
//        remShare.setDepositbank(serviceReimbursement.getDepositbank());
//        remShare.setBankcardno(serviceReimbursement.getBankcardno());
//        remShare.setBranchbankname(serviceReimbursement.getBranchbankname());
//        remShare.setAnnexbankcard(serviceReimbursement.getAnnexbankcard());
//        remShare.setAnnexfiles(serviceReimbursement.getAnnexfiles());
//        //remShare.setAnnexfiles(serviceReimbursement.getAnnexfiles());
//        // remShare.setAmountrequested(BigDecimal.valueOf(serviceReimbursement.getAmountrequested()));
//
//        Double nTemp = serviceReimbursement.getAmountrequested();
//        if (nTemp == null) nTemp = 0d;
//        remShare.setAmountrequested(BigDecimal.valueOf(nTemp));
//
//        nTemp = serviceReimbursement.getPrepaidamount();
//        if (nTemp == null) nTemp = 0.0;
//        remShare.setPrepaidamount(BigDecimal.valueOf(nTemp));
//
//        remShare.setInvoicecount(serviceReimbursement.getInvoicecount());
//        remShare.setAttachcount(serviceReimbursement.getAttachcount());
//        remShare.setManagerno(serviceReimbursement.getManagerno());
//        remShare.setManagername(serviceReimbursement.getManagername());
//        remShare.setDeptmentno(serviceReimbursement.getDeptmentno());
//        remShare.setDeptmentname(serviceReimbursement.getDeptmentname());
//        remShare.setOpochecker(serviceReimbursement.getOpochecker());
//        remShare.setFinvicepresident(serviceReimbursement.getFinvicepresident());
//        remShare.setBusvicepresident(serviceReimbursement.getBusvicepresident());
//        remShare.setOfficedirector(serviceReimbursement.getOfficedirector());
//        remShare.setFinancedirector(serviceReimbursement.getFinancedirector());
//        remShare.setFinancechecher(serviceReimbursement.getFinancechecher());
//        remShare.setInfoid(serviceReimbursement.getInfoid());
//        remShare.setDonorno(serviceReimbursement.getDonorno());
//
//        remShare.setDonorname(serviceReimbursement.getDonorname());
//        remShare.setReason(serviceReimbursement.getReason());
//        remShare.setRecordstatus(serviceReimbursement.getRecordstatus());
//        remShare.setUploadflag(serviceReimbursement.getUploadflag());
//        remShare.setUploadtime(serviceReimbursement.getUploadtime());
//
//        nTemp = serviceReimbursement.getTotalamount();
//        if (nTemp == null) nTemp = 0.0;
//        remShare.setTotalamount(BigDecimal.valueOf(nTemp));
//
//        remShare.setBigstrmoney(serviceReimbursement.getBigstrmoney());
//        remShare.setFlowlevel(serviceReimbursement.getFlowlevel());
//        remShare.setCosttype(serviceReimbursement.getCosttype());
//        remShare.setCosttypename(serviceReimbursement.getCosttypename());
//        remShare.setFileurl(serviceReimbursement.getAnnexfiles());
//        remShare.setDonorbank(serviceReimbursement.getDonorbank());
//        remShare.setDonorbankcard(serviceReimbursement.getDonorbankcard());
//        remShare.setDonorremark(serviceReimbursement.getDonorremark());
//
//        nTemp = serviceReimbursement.getDonoramount();
//        if (nTemp == null) nTemp = 0.0;
//        remShare.setDonoramount(nTemp);
//        remShare.setDonorrelatives(serviceReimbursement.getDonorrelatives());
//        //remShare.setOaid(serviceReimbursement.getOaid());
//        //remShare.setDonorno(serviceReimbursement.getDonorno());
//
//        boolean bRet = false;
//        if (nType == 1) {
//            bRet = serviceReimbursementServiceShare.save(remShare);
//        } else {
//            //remShare.setId(serviceReimbursement.);
//            bRet = serviceReimbursementServiceShare.updateById(remShare);
//        }
//
//        //if(!bRet) return -1;
//        String strMutfileUrl = remShare.getFileurl();
//        //有附件时才调用第三方进行上传
//        if (strMutfileUrl == null) return 0;
//        if (strMutfileUrl.isEmpty()) return 0;
//
//        try {
//            uploadOAFileAndUpdateDb(remShare);
//        } catch (Exception e) {
//            logger.error("调用第三方接口出错!");
//            e.printStackTrace();
//        }
//
//        //此处保存成功后要上传OA，保存返回值
//
//        return 0;
//    }


    int uploadOAFileAndUpdateDb(ServiceReimbursementShared 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.getFileurl();//可能存在多个地址，以,分开

        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();
            }


            /*CloseableHttpClient httpClient = HttpClients.createDefault();
            //创建post方法连接实例，在post方法中传入待连接地址
            HttpPost httpPost = new HttpPost(strFUrl);
            CloseableHttpResponse response = null;

            String struploadResult = "";
            try {
                //设置请求参数（类似html页面中name属性）
                MultipartEntityBuilder entity = MultipartEntityBuilder.create();
                //entity.setMode(HttpMultipartMode.BROWSER_COMPATIBLE);
                entity.setCharset(Charset.forName("UTF-8"));

                byte[] fileBytes = Files.readAllBytes(Paths.get(strFile));
                if (fileBytes != null) {
                    //内容类型，用于定义网络文件的类型和网页的编码，决定文件接收方将以什么形式、什么编码读取这个文件
                    ContentType OCTEC_STREAM = ContentType.create("application/octet-stream", Charset.forName("UTF-8"));
                    //添加文件
                    entity.addBinaryBody("file", fileBytes, OCTEC_STREAM, strTemp);
                }

                httpPost.setEntity(entity.build());
                //发起请求，并返回请求响应
                response = httpClient.execute(httpPost);
                struploadResult = EntityUtils.toString(response.getEntity(), "utf-8");
            }
            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 = serviceReimbursementServiceShare.updateById(remShare);
        if (!bRet) return -1;

        return 0;
    }
//    int uploadOAFileAndUpdateDb(ServiceReimbursementShared 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.getFileurl();//可能存在多个地址，以,分开
//
//        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();
//            }
//
//
//            /*CloseableHttpClient httpClient = HttpClients.createDefault();
//            //创建post方法连接实例，在post方法中传入待连接地址
//            HttpPost httpPost = new HttpPost(strFUrl);
//            CloseableHttpResponse response = null;
//
//            String struploadResult = "";
//            try {
//                //设置请求参数（类似html页面中name属性）
//                MultipartEntityBuilder entity = MultipartEntityBuilder.create();
//                //entity.setMode(HttpMultipartMode.BROWSER_COMPATIBLE);
//                entity.setCharset(Charset.forName("UTF-8"));
//
//                byte[] fileBytes = Files.readAllBytes(Paths.get(strFile));
//                if (fileBytes != null) {
//                    //内容类型，用于定义网络文件的类型和网页的编码，决定文件接收方将以什么形式、什么编码读取这个文件
//                    ContentType OCTEC_STREAM = ContentType.create("application/octet-stream", Charset.forName("UTF-8"));
//                    //添加文件
//                    entity.addBinaryBody("file", fileBytes, OCTEC_STREAM, strTemp);
//                }
//
//                httpPost.setEntity(entity.build());
//                //发起请求，并返回请求响应
//                response = httpClient.execute(httpPost);
//                struploadResult = EntityUtils.toString(response.getEntity(), "utf-8");
//            }
//            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 = serviceReimbursementServiceShare.updateById(remShare);
////        if (!bRet) return -1;
//
//        return 0;
//    }

    /**
     * 差旅费上报
@@ -496,7 +490,7 @@
    public AjaxResult checkFund(@RequestBody CheckFundVO checkFundVO) {
        ServiceReimbursement serviceReimbursement = serviceReimbursementService.getById(checkFundVO.getFundid());
        if (serviceReimbursement != null) {
            Integer TotalLevel = 0;
            Integer totalLevel = 0;
            LoginUser loginUser = getLoginUser();
            ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
            serviceFundflowrule.setFundtype(1);
@@ -513,7 +507,9 @@
            }

            if (serviceFundflowrules != null && serviceFundflowrules.stream().count() > 0) {
                TotalLevel = serviceFundflowrules.get(0).getTotallevel();
                totalLevel = serviceFundflowrules.get(0).getTotallevel();


            }
            Integer CheckFlag = 0;
            Integer RecordStatus = serviceReimbursement.getRecordstatus();
@@ -521,10 +517,11 @@
            Integer OriginalFlowLevel = FlowLevel;
            if (checkFundVO.getFlowconclusion() == 1) {
                CheckFlag = 1;
                if (TotalLevel == 0) {
                if (totalLevel == 0) {
                    //99 取消
                    RecordStatus = 99;
                } else {
                    if (TotalLevel == FlowLevel + 1) {
                    if (totalLevel == FlowLevel + 1) {
                        RecordStatus = 99;
                    } else {
                        RecordStatus = (FlowLevel + 1) * 2;
@@ -590,7 +587,10 @@
                //通过
                serviceSystemmessage.setMessagetitle("" + (OriginalFlowLevel + 1) + "级审核通过");
                serviceSystemmessage.setMessagecontent("您" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(serviceReimbursement.getCreateTime()) + "提交的关于捐献案例【" + serviceReimbursement.getDonorname() + "】的差旅费申请已通过" + (OriginalFlowLevel + 1) + "级审核");

                if (totalLevel == OriginalFlowLevel + 1) {
                    //所有数据新增到备份表
                    serviceReimbursementService.addSharedData(checkFundVO.getFundid());
                }
            } else {
                //驳回
                serviceSystemmessage.setMessagetitle("" + (OriginalFlowLevel + 1) + "级审核驳回");
@@ -615,9 +615,9 @@
    @RepeatSubmit
    public AjaxResult edit(@RequestBody ServiceReimbursement serviceReimbursement) {
        boolean b = serviceReimbursementService.updateById(serviceReimbursement);
        if (b) {
            addReiSharedDatd(serviceReimbursement, 2);
        }
//        if (b) {
//            addReiSharedDatd(serviceReimbursement, 2);
//        }
        return toAjax(b);
    }

@@ -730,9 +730,7 @@
            BigDecimal keyOneMoney = new BigDecimal(0.00);
            BigDecimal keyTwoMoney = new BigDecimal(0.00);
            for (ServiceReimbursementEo serviceReimbursementEo1 : values) {
                otherMoney = otherMoney.add(serviceReimbursementEo1.getTrafficexpense()).add(serviceReimbursementEo1.getHotelexpense())
                        .add(serviceReimbursementEo1.getFoodexpenses()).add(serviceReimbursementEo1.getFoodallowance())
                        .add(serviceReimbursementEo1.getOtherexpense()).add(serviceReimbursementEo1.getOtherfeeamount());
                otherMoney = otherMoney.add(serviceReimbursementEo1.getTrafficexpense()).add(serviceReimbursementEo1.getHotelexpense()).add(serviceReimbursementEo1.getFoodexpenses()).add(serviceReimbursementEo1.getFoodallowance()).add(serviceReimbursementEo1.getOtherexpense()).add(serviceReimbursementEo1.getOtherfeeamount());
            }
            map.put(key, otherMoney);
            list.add(map);
@@ -1014,9 +1012,7 @@
        }

        result = result.replaceAll("零仟", "零").replaceAll("零佰", "零")        //把单位'亿','万','元'放到最后替换。
                .replaceAll("零拾", "零").replaceAll("零零", "零")
                .replaceAll("零零", "零").replaceAll("零亿", "亿")
                .replaceAll("零万", "万").replaceAll("零元", "元");
                .replaceAll("零拾", "零").replaceAll("零零", "零").replaceAll("零零", "零").replaceAll("零亿", "亿").replaceAll("零万", "万").replaceAll("零元", "元");
        //        result = result.replaceAll("零仟", "零");
        //        result = result.replaceAll("零佰", "零");
        //        result = result.replaceAll("零拾", "零");