代码提交

liusheng

2023-08-11 49594433e797d03da3453240bb89186dcf136619

代码提交

 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/DingTalkServiceImpl.java

@@ -84,11 +84,13 @@
            body = response2.getBody();
            // 解析为JSONObject
            JSONObject jsonObject = JSONObject.parseObject(body);
            // 提取出JSONArray
            JSONArray jsonArray = new JSONArray(jsonObject.getJSONObject("result").getJSONArray("userid_list"));
            // 将JSONArray转为List列表
            String str = JSONObject.toJSONString(jsonArray);
            userIdlist = JSONObject.parseObject(str, List.class);
            if (jsonObject != null) {
                // 提取出JSONArray
                JSONArray jsonArray = new JSONArray(jsonObject.getJSONObject("result").getJSONArray("userid_list"));
                // 将JSONArray转为List列表
                String str = JSONObject.toJSONString(jsonArray);
                userIdlist = JSONObject.parseObject(str, List.class);
            }
        }



 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java

@@ -151,7 +151,7 @@
            serviceFunddetailShareds.get(i).setFundid(serviceFundShared.getId());
            serviceFunddetailShareds.get(i).setId(null);
            //数据发送给财务
            uploadOAFileAndUpdateDb(serviceFunddetailShareds.get(i));
          //  uploadOAFileAndUpdateDb(serviceFunddetailShareds.get(i));
        }
        boolean result = detailSharedService.saveBatch(serviceFunddetailShareds);
        return result;

 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java

@@ -148,7 +148,7 @@
        Map<String, Object> columnMap = new HashMap<>();
        columnMap.put("rbid", id);
        //获取详情数据
        List<ServiceReimbursementdetail> details = serviceReimbursementdetailMapper.selectByMap(columnMap);
         List<ServiceReimbursementdetail> details = serviceReimbursementdetailMapper.selectByMap(columnMap);
        log.info("serviceReimbursementdetailMapper.selectByMap方法的返参参 :{}", CollectionUtils.isEmpty(details) ? null : details.size());
        //获取支付数据
        List<ServiceReimbursementpayee> serviceReimbursementpayees = reimbursementpayeeMapper.selectByMap(columnMap);

 ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java

@@ -60,7 +60,7 @@
        //查出所有被医院退回的Fund数据
        List<ServiceFundShared> serviceFundShareds = serviceFundSharedService.queryFundShareList();
        for (ServiceFundShared serviceFundShared : serviceFundShareds) {
            if (serviceFundShared.getOabdzt().equals("已撤销")) {
            if (StringUtils.isNotBlank(serviceFundShared.getOabdzt()) && serviceFundShared.getOabdzt().equals("已撤销")) {
                //如果有财务驳回信息说明是退回的
                String[] split = serviceFundShared.getCxrjyj().split("&");
                String phone = serviceFundShared.getPhone();
@@ -71,8 +71,9 @@
                serviceFund.setId(serviceFundShared.getSerfunid());
                List<ServiceFund> serviceFunds = serviceFundService.queryList(serviceFund);
                ServiceFund serviceFund1 = serviceFunds.get(0);
                serviceFund1.setFlowlevel(0);
                serviceFund1.setFlowlevel(100);
                serviceFund1.setDel_flag(0);
                serviceFund1.setRecordstatus(-1);
                serviceFund1.setBackflowlevel(199);
                serviceFundService.updateById(serviceFund1);
                sendMeg(split, phone, serviceFundShared.getApplytype(), 2, serviceFundShared.getSerfunid());
@@ -90,13 +91,13 @@
                        serviceFund.setBusvicepresident(serviceFundShared.getBusvicepresident());
                    }
                    if (StringUtils.isNotBlank(serviceFundShared.getOfficedirector())) {
                        serviceFund.setBusvicepresident(serviceFundShared.getOfficedirector());
                        serviceFund.setOfficedirector(serviceFundShared.getOfficedirector());
                    }
                    if (StringUtils.isNotBlank(serviceFundShared.getFinancedirector())) {
                        serviceFund.setBusvicepresident(serviceFundShared.getFinancedirector());
                        serviceFund.setFinancedirector(serviceFundShared.getFinancedirector());
                    }
                    if (StringUtils.isNotBlank(serviceFundShared.getFinancechecher())) {
                        serviceFund.setBusvicepresident(serviceFundShared.getFinancechecher());
                        serviceFund.setFinancechecher(serviceFundShared.getFinancechecher());
                    }
                    serviceFund.setRiqi(serviceFundShared.getRiqi());
                    boolean b = serviceFundService.updateById(serviceFund);
@@ -275,7 +276,7 @@
        //查出所有被医院退回的Reimbursement数据
        List<ServiceReimbursementShared> serviceReimbursementShareds = serviceReimbursementSharedService.queryReShareList();
        for (ServiceReimbursementShared serviceReimbursementShared : serviceReimbursementShareds) {
            if (serviceReimbursementShared.getOabdzt().equals("已撤销")) {
            if (StringUtils.isNotBlank(serviceReimbursementShared.getOabdzt()) && serviceReimbursementShared.getOabdzt().equals("已撤销")) {
                String phone = serviceReimbursementShared.getPhone();
                String[] split = serviceReimbursementShared.getCxrjyj().split("&");

@@ -287,7 +288,7 @@
                serviceReimbursement.setId(serviceReimbursementShared.getReimid());
                List<ServiceReimbursement> serviceReimbursementList = serviceReimbursementService.queryList(serviceReimbursement);
                ServiceReimbursement serviceReimbursement1 = serviceReimbursementList.get(0);
                serviceReimbursement1.setFlowlevel(0L);
                serviceReimbursement1.setFlowlevel(100L);
                serviceReimbursement1.setDelFlag(0);
                serviceReimbursement1.setBackflowlevel(199L);
                serviceReimbursement1.setRecordstatus(-1);
@@ -302,7 +303,7 @@
                    serviceReimbursement.setId(serviceReimbursementShared.getReimid());
                    serviceReimbursement.setZffs(serviceReimbursementShared.getZffs());
                    serviceReimbursement.setRiqi(serviceReimbursementShared.getRiqi());
              

                    if (StringUtils.isNotBlank(serviceReimbursementShared.getFinvicepresident())) {
                        serviceReimbursement.setFinvicepresident(serviceReimbursementShared.getFinvicepresident());
                    }
@@ -310,13 +311,13 @@
                        serviceReimbursement.setBusvicepresident(serviceReimbursementShared.getBusvicepresident());
                    }
                    if (StringUtils.isNotBlank(serviceReimbursementShared.getOfficedirector())) {
                        serviceReimbursement.setBusvicepresident(serviceReimbursementShared.getOfficedirector());
                        serviceReimbursement.setOfficedirector(serviceReimbursementShared.getOfficedirector());
                    }
                    if (StringUtils.isNotBlank(serviceReimbursementShared.getFinancedirector())) {
                        serviceReimbursement.setBusvicepresident(serviceReimbursementShared.getFinancedirector());
                        serviceReimbursement.setFinancedirector(serviceReimbursementShared.getFinancedirector());
                    }
                    if (StringUtils.isNotBlank(serviceReimbursementShared.getFinancechecher())) {
                        serviceReimbursement.setBusvicepresident(serviceReimbursementShared.getFinancechecher());
                        serviceReimbursement.setFinancechecher(serviceReimbursementShared.getFinancechecher());
                    }
                    boolean b = serviceReimbursementService.updateById(serviceReimbursement);
                    log.info("更新serviceReimbursement里的zffs表是否成功: {}", b);