From f0815cf1d5edfa55abbdbe06eadfafc991e340e7 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 17 七月 2023 19:07:14 +0800
Subject: [PATCH] 代码修改

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java |  454 +++++++++++++++++++++++++++++--------------------------
 1 files changed, 239 insertions(+), 215 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java
index 199f62c..b5eee76 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java
@@ -213,215 +213,215 @@
     }
 
 
-    public int addReiSharedDatd(ServiceFund serviceFund, int nType) {
-        //remShare = ;
-        ServiceFundShared remShare = null;
-        if (nType == 1) {
-            remShare = new ServiceFundShared();
-            remShare.setSerfunid(serviceFund.getId());
-        } else //modify
-        {
-            List<ServiceFundShared> remlist = fundServiceShare.getFundShareInfoById(serviceFund.getId());
-            if (remlist != null) remShare = remlist.get(0);
-        }
-
-        remShare.setDonorno(serviceFund.getDonorno());
-        remShare.setDonorname(serviceFund.getDonorname());
-        remShare.setUserno(serviceFund.getUserno());
-        remShare.setUsername(serviceFund.getUsername());
-        remShare.setUnitname(serviceFund.getUnitname());
-        remShare.setUnitno(serviceFund.getUnitno());
-        remShare.setUnituserno(serviceFund.getUnituserno());
-        remShare.setPhone(serviceFund.getPhone());
-        remShare.setAnnexbankcard(serviceFund.getAnnexbankcard());
-        remShare.setAnnexregistform(serviceFund.getAnnexregistform());
-        Double nTemp = serviceFund.getPretaxcost();
-        if (nTemp == null) nTemp = 0d;
-        remShare.setPretaxcost(BigDecimal.valueOf(nTemp));
-        //remShare.setAnnexfiles(serviceReimbursement.getAnnexfiles());
-        // remShare.setAmountrequested(BigDecimal.valueOf(serviceReimbursement.getAmountrequested()));
-
-        nTemp = serviceFund.getTaxedcost();
-        if (nTemp == null) nTemp = 0d;
-        remShare.setTaxedcost(BigDecimal.valueOf(nTemp));
-
-        nTemp = serviceFund.getTotalcost();
-        if (nTemp == null) nTemp = 0d;
-        remShare.setTotalcost(BigDecimal.valueOf(nTemp));
-
-        nTemp = serviceFund.getExpertcost();
-        if (nTemp == null) nTemp = 0.0;
-        remShare.setExpertcost(BigDecimal.valueOf(nTemp));
-
-        nTemp = serviceFund.getEthicscost();
-        if (nTemp == null) nTemp = 0.0;
-        remShare.setEthicscost(BigDecimal.valueOf(nTemp));
-
-        nTemp = serviceFund.getMedicalcost();
-        if (nTemp == null) nTemp = 0.0;
-        remShare.setMedicalcost(BigDecimal.valueOf(nTemp));
-
-        nTemp = serviceFund.getFamilycost();
-        if (nTemp == null) nTemp = 0.0;
-        remShare.setFamilycost(BigDecimal.valueOf(nTemp));
-
-        nTemp = serviceFund.getAftercarecost();
-        if (nTemp == null) nTemp = 0.0;
-        remShare.setAftercarecost(BigDecimal.valueOf(nTemp));
-
-        nTemp = serviceFund.getAmountrequested();
-        if (nTemp == null) nTemp = 0.0;
-        remShare.setAmountrequested(BigDecimal.valueOf(nTemp));
+//    public int addReiSharedDatd(ServiceFund serviceFund, int nType) {
+//        //remShare = ;
+//        ServiceFundShared remShare = null;
+//        if (nType == 1) {
+//            remShare = new ServiceFundShared();
+//            remShare.setSerfunid(serviceFund.getId());
+//        } else //modify
+//        {
+//            List<ServiceFundShared> remlist = fundServiceShare.getFundShareInfoById(serviceFund.getId());
+//            if (remlist != null) remShare = remlist.get(0);
+//        }
+//
+//        remShare.setDonorno(serviceFund.getDonorno());
+//        remShare.setDonorname(serviceFund.getDonorname());
+//        remShare.setUserno(serviceFund.getUserno());
+//        remShare.setUsername(serviceFund.getUsername());
+//        remShare.setUnitname(serviceFund.getUnitname());
+//        remShare.setUnitno(serviceFund.getUnitno());
+//        remShare.setUnituserno(serviceFund.getUnituserno());
+//        remShare.setPhone(serviceFund.getPhone());
+//        remShare.setAnnexbankcard(serviceFund.getAnnexbankcard());
+//        remShare.setAnnexregistform(serviceFund.getAnnexregistform());
+//        Double nTemp = serviceFund.getPretaxcost();
+//        if (nTemp == null) nTemp = 0d;
+//        remShare.setPretaxcost(BigDecimal.valueOf(nTemp));
+//        //remShare.setAnnexfiles(serviceReimbursement.getAnnexfiles());
+//        // remShare.setAmountrequested(BigDecimal.valueOf(serviceReimbursement.getAmountrequested()));
+//
+//        nTemp = serviceFund.getTaxedcost();
+//        if (nTemp == null) nTemp = 0d;
+//        remShare.setTaxedcost(BigDecimal.valueOf(nTemp));
+//
+//        nTemp = serviceFund.getTotalcost();
+//        if (nTemp == null) nTemp = 0d;
+//        remShare.setTotalcost(BigDecimal.valueOf(nTemp));
+//
+//        nTemp = serviceFund.getExpertcost();
+//        if (nTemp == null) nTemp = 0.0;
+//        remShare.setExpertcost(BigDecimal.valueOf(nTemp));
+//
+//        nTemp = serviceFund.getEthicscost();
+//        if (nTemp == null) nTemp = 0.0;
+//        remShare.setEthicscost(BigDecimal.valueOf(nTemp));
+//
+//        nTemp = serviceFund.getMedicalcost();
+//        if (nTemp == null) nTemp = 0.0;
+//        remShare.setMedicalcost(BigDecimal.valueOf(nTemp));
+//
+//        nTemp = serviceFund.getFamilycost();
+//        if (nTemp == null) nTemp = 0.0;
+//        remShare.setFamilycost(BigDecimal.valueOf(nTemp));
+//
+//        nTemp = serviceFund.getAftercarecost();
+//        if (nTemp == null) nTemp = 0.0;
+//        remShare.setAftercarecost(BigDecimal.valueOf(nTemp));
+//
+//        nTemp = serviceFund.getAmountrequested();
+//        if (nTemp == null) nTemp = 0.0;
+//        remShare.setAmountrequested(BigDecimal.valueOf(nTemp));
+//
+//
+//        remShare.setApplytype(serviceFund.getApplytype());
+//
+//        nTemp = serviceFund.getPrepaidamount();
+//        if (nTemp == null) nTemp = 0.0;
+//        remShare.setPrepaidamount(BigDecimal.valueOf(nTemp));
+//
+//        remShare.setInvoicecount(serviceFund.getInvoicecount());
+//        remShare.setAttachcount(serviceFund.getAttachcount());
+//        remShare.setManagerno(serviceFund.getManagerno());
+//        remShare.setManagername(serviceFund.getManagername());
+//        remShare.setDeptmentno(serviceFund.getDeptmentno());
+//        remShare.setDeptmentname(serviceFund.getDeptmentname());
+//        remShare.setOpochecker(serviceFund.getOpochecker());
+//        remShare.setFinvicepresident(serviceFund.getFinvicepresident());
+//        remShare.setBusvicepresident(serviceFund.getBusvicepresident());
+//        remShare.setOfficedirector(serviceFund.getOfficedirector());
+//        remShare.setFinancedirector(serviceFund.getFinancedirector());
+//        remShare.setFinancechecher(serviceFund.getFinancechecher());
+//        //remShare.setIsdistribute(serviceFund.getIsdistribute());
+//        remShare.setRecordstatus(serviceFund.getRecordstatus());
+//        remShare.setUploadflag(serviceFund.getUploadflag());
+//        remShare.setUploadtime(serviceFund.getUploadtime());
+//        long nLevel = serviceFund.getFlowlevel();
+//        remShare.setFlowlevel(nLevel);
+//
+//        remShare.setInfoid(serviceFund.getInfoid());
+//
+//        //remShare.setOaid(serviceReimbursement.getOaid());
+//        //remShare.setDonorno(serviceReimbursement.getDonorno());
+//
+//        boolean bRet = false;
+//        if (nType == 1) {
+//            bRet = fundServiceShare.save(remShare);
+//        } else {
+//            //remShare.setId(serviceReimbursement.);
+//            bRet = fundServiceShare.updateById(remShare);
+//        }
+//
+//        //if(!bRet) return -1;
+//        String strMutfileUrl = remShare.getAnnexbankcard();
+//        //鏈夐檮浠舵椂鎵嶈皟鐢ㄧ涓夋柟杩涜涓婁紶
+//        if (strMutfileUrl == null) return 0;
+//        if (strMutfileUrl.isEmpty()) return 0;
+//
+//        try {
+//            uploadOAFileAndUpdateDb(remShare);
+//        } catch (Exception e) {
+//            logger.error("璋冪敤绗笁鏂规帴鍙e嚭閿�!");
+//            e.printStackTrace();
+//        }
+//
+//        //姝ゅ淇濆瓨鎴愬姛鍚庤涓婁紶OA锛屼繚瀛樿繑鍥炲��
+//
+//        return 0;
+//    }
 
 
-        remShare.setApplytype(serviceFund.getApplytype());
-
-        nTemp = serviceFund.getPrepaidamount();
-        if (nTemp == null) nTemp = 0.0;
-        remShare.setPrepaidamount(BigDecimal.valueOf(nTemp));
-
-        remShare.setInvoicecount(serviceFund.getInvoicecount());
-        remShare.setAttachcount(serviceFund.getAttachcount());
-        remShare.setManagerno(serviceFund.getManagerno());
-        remShare.setManagername(serviceFund.getManagername());
-        remShare.setDeptmentno(serviceFund.getDeptmentno());
-        remShare.setDeptmentname(serviceFund.getDeptmentname());
-        remShare.setOpochecker(serviceFund.getOpochecker());
-        remShare.setFinvicepresident(serviceFund.getFinvicepresident());
-        remShare.setBusvicepresident(serviceFund.getBusvicepresident());
-        remShare.setOfficedirector(serviceFund.getOfficedirector());
-        remShare.setFinancedirector(serviceFund.getFinancedirector());
-        remShare.setFinancechecher(serviceFund.getFinancechecher());
-        //remShare.setIsdistribute(serviceFund.getIsdistribute());
-        remShare.setRecordstatus(serviceFund.getRecordstatus());
-        remShare.setUploadflag(serviceFund.getUploadflag());
-        remShare.setUploadtime(serviceFund.getUploadtime());
-        long nLevel = serviceFund.getFlowlevel();
-        remShare.setFlowlevel(nLevel);
-
-        remShare.setInfoid(serviceFund.getInfoid());
-
-        //remShare.setOaid(serviceReimbursement.getOaid());
-        //remShare.setDonorno(serviceReimbursement.getDonorno());
-
-        boolean bRet = false;
-        if (nType == 1) {
-            bRet = fundServiceShare.save(remShare);
-        } else {
-            //remShare.setId(serviceReimbursement.);
-            bRet = fundServiceShare.updateById(remShare);
-        }
-
-        //if(!bRet) return -1;
-        String strMutfileUrl = remShare.getAnnexbankcard();
-        //鏈夐檮浠舵椂鎵嶈皟鐢ㄧ涓夋柟杩涜涓婁紶
-        if (strMutfileUrl == null) return 0;
-        if (strMutfileUrl.isEmpty()) return 0;
-
-        try {
-            uploadOAFileAndUpdateDb(remShare);
-        } catch (Exception e) {
-            logger.error("璋冪敤绗笁鏂规帴鍙e嚭閿�!");
-            e.printStackTrace();
-        }
-
-        //姝ゅ淇濆瓨鎴愬姛鍚庤涓婁紶OA锛屼繚瀛樿繑鍥炲��
-
-        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);//寰楀埌杩斿洖鐨則oken?
-
-        JSONObject json1 = JSONObject.parseObject(strRes);
-        strRes = json1.get("id").toString();
-
-        ///if(strRes.isEmpty() || "" == strRes) return -1;// 涓虹┖浠h〃澶辫触
-
-        //涓嬮潰闇�姹傝皟鐢ㄦ枃浠剁殑鎺ュ彛锛岃皟鐢ㄦ垚鍔熻繑鍥炲悗锛屽緱鍒癴ilename鍜宖ileid 鐢ㄨ繖浜屼釜鍊煎幓鏇存柊鏁版嵁
-
-        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);//寰楀埌杩斿洖鐨則oken?
+//
+//        JSONObject json1 = JSONObject.parseObject(strRes);
+//        strRes = json1.get("id").toString();
+//
+//        ///if(strRes.isEmpty() || "" == strRes) return -1;// 涓虹┖浠h〃澶辫触
+//
+//        //涓嬮潰闇�姹傝皟鐢ㄦ枃浠剁殑鎺ュ彛锛岃皟鐢ㄦ垚鍔熻繑鍥炲悗锛屽緱鍒癴ilename鍜宖ileid 鐢ㄨ繖浜屼釜鍊煎幓鏇存柊鏁版嵁
+//
+//        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鐨勫叆鍙傚�糲heckFundVO :{}",checkFundVO);
+        logger.info("serviceFundController---checkFund鐨勫叆鍙傚�糲heckFundVO :{}", 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鐨勫叆鍙傚�約erviceFundflowrule:{}",serviceFundflowrule);
+            logger.info("serviceFundController---checkFund---queryList鐨勫叆鍙傚�約erviceFundflowrule:{}", 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鐨勮繑鍥炲�約erviceFunddetails :{}",serviceFunddetails);
+                    logger.info("serviceFundController---checkFund鐨勮繑鍥炲�約erviceFunddetails :{}", 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,30 @@
     @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);
+
+                //灏唂und琛ㄧ殑瀹℃牳鐘舵�佹敼鎴�100
+                sf.setBackflowlevel(100);
+                serviceFundService.updateById(sf);
+                return success();
+            } else {
+                serviceFund.setFlowlevel(sf.getBackflowlevel());
+                boolean bret = serviceFundService.updateById(serviceFund);
 //        if (bret) {
 //            addReiSharedDatd(serviceFund, 2);
 //        }
-        return toAjax(bret);
+                return toAjax(bret);
+            }
+        }
+
+        return toAjax(false);
     }
 
     /**

--
Gitblit v1.9.3