liusheng
2023-07-17 194d1f8c2ca14fbb04fe0f655d793d4bddf89320
设置 fundType    applyType
已修改2个文件
12 ■■■■■ 文件已修改
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java
@@ -608,6 +608,7 @@
                serviceFundService.updateById(sf);
                return success();
            } else {
                serviceFund.setFlowlevel(sf.getBackflowlevel());
                boolean bret = serviceFundService.updateById(serviceFund);
//        if (bret) {
//            addReiSharedDatd(serviceFund, 2);
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
@@ -68,7 +68,7 @@
            serviceFund1.setDel_flag(0);
            serviceFund1.setBackflowlevel(199);
            serviceFundService.updateById(serviceFund1);
            sendMeg(split,phone);
            sendMeg(split, phone,serviceFundShared.getApplytype(),2,serviceFundShared.getSerfunid());
        }
@@ -90,13 +90,13 @@
            serviceReimbursement1.setDelFlag(0);
            serviceReimbursement1.setBackflowlevel(199L);
            serviceReimbursementService.updateById(serviceReimbursement1);
            sendMeg(split,phone);
            sendMeg(split, phone, "0", 1, serviceReimbursementShared.getReimid());
        }
    }
    public void sendMeg(String[] split,String phone) {
    public void sendMeg(String[] split, String phone, String applyType, Integer fundType, Long fundId) {
        //记录操作记录
        ServiceFundflow serviceFundflow = new ServiceFundflow();
        serviceFundflow.setCreateBy("admin");
@@ -106,8 +106,11 @@
        serviceFundflow.setCheckusername(split[0]);
        serviceFundflow.setFlowcontent(split[2]);
        serviceFundflow.setFlowconclusion(2);
        serviceFundflow.setFundtype(2);
        serviceFundflow.setFundtype(fundType);
        serviceFundflow.setFlowlevel(100);
        serviceFundflow.setApplytype(applyType);
        serviceFundflow.setFundtype(fundType);
        serviceFundflow.setFundid(fundId);
        fundflowService.save(serviceFundflow);
        ArrayList<ConcurrentHashMap<String, String>> contentList = new ArrayList<>();