代码提交

liusheng

2024-02-28 ee99290acc01bf294b44f39194f93762d7a3de2d

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

@@ -1,16 +1,19 @@
package com.ruoyi.web.controller.project;

import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.NotRepeatCommit;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.constant.HttpStatus;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.MergeFilesToPDFUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.bean.DtoConversionUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -20,6 +23,7 @@
import com.ruoyi.project.domain.vo.SpFinancialExpensesIn;
import com.ruoyi.project.domain.vo.SpFinancialExpensesReimbursementOut;
import com.ruoyi.project.service.*;
import com.ruoyi.system.service.ISysDeptService;
import com.ruoyi.system.service.ISysPostService;
import com.ruoyi.web.controller.enums.PersonType;
import freemarker.template.Configuration;
@@ -56,6 +60,9 @@
    @Autowired
    private IServiceReimbursementService serviceReimbursementService;

//    @Autowired
//    private MergeFilesToPDFUtils mergeFilesToPDFUtils;

    @Autowired
    private IServiceReimbursementSharedService serviceReimbursementSharedService;

@@ -72,7 +79,7 @@
    private IServiceFundflowService serviceFundflowService;

    @Autowired
    private IServiceFundService serviceFundService;
    private ISysDeptService sysDeptService;

    @Autowired
    private IBaseOnlyvalueService baseOnlyvalueService;
@@ -135,8 +142,10 @@
        String APPLICATIONENDTIME = spFinancialExpensesIn.getAPPLICATIONENDTIME();
        Integer CHECKFLAG = spFinancialExpensesIn.getCHECKFLAG();
        Integer APPLYTYPE = spFinancialExpensesIn.getAPPLYTYPE();
        Integer checkstatus = spFinancialExpensesIn.getCheckstatus();
        Integer pageNum = spFinancialExpensesIn.getPageNum();
        Integer pageSize = spFinancialExpensesIn.getPageSize();
        String donorname = spFinancialExpensesIn.getDonorname();

        if (pageNum == null) {
            pageNum = 1;
@@ -158,7 +167,7 @@
            APPLICATIONENDTIME = "";
        }
        //startPage();
        List<SpFinancialExpensesReimbursementOut> list = serviceReimbursementService.getListBypower(loginUser.getUsername(), 1, APPLICANT, APPLICATIONBEGTIME, APPLICATIONENDTIME, loginUser.getDeptId().toString(), CHECKFLAG, APPLYTYPE);
        List<SpFinancialExpensesReimbursementOut> list = serviceReimbursementService.getListBypower(loginUser.getUsername(), 1, APPLICANT, APPLICATIONBEGTIME, APPLICATIONENDTIME, loginUser.getDeptId().toString(), CHECKFLAG, APPLYTYPE, checkstatus, donorname);
        //根据经办人筛选
        if (StringUtils.isNotBlank(spFinancialExpensesIn.getUsername())) {
            list = list.stream().filter(reimbursementOut -> reimbursementOut.getUsername().contains(spFinancialExpensesIn.getUsername())).collect(Collectors.toList()); // 按name字段过滤
@@ -217,241 +226,29 @@
    @ApiOperation("新增报销申请")
    //@PreAuthorize("@ss.hasPermi('project:reimbursement:add')")
    @Log(title = "报销申请", businessType = BusinessType.INSERT)
    @PostMapping
    @PostMapping("/add")
    @RepeatSubmit
    @Options(useGeneratedKeys = true, keyProperty = "id")
    public AjaxResult add(@RequestBody ServiceReimbursement serviceReimbursement) {

        boolean b = serviceReimbursementService.save(serviceReimbursement);
//        if (b) {
//            addReiSharedDatd(serviceReimbursement, 1);
//        }
        Long id = serviceReimbursement.getId();
        return AjaxResult.success(id);
        if (!Objects.isNull(serviceReimbursement)) {
            serviceReimbursement.setCreateTime(new Date());
            serviceReimbursement.setCheckstatus(serviceReimbursement.getCheckstatus() == null ? 1 : serviceReimbursement.getCheckstatus());
            boolean b = serviceReimbursementService.save(serviceReimbursement);
            Long id = serviceReimbursement.getId();
            return AjaxResult.success(id);
        }
        return error();
    }

//    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;
//    /**
//     * 差旅费上报
//     */
//    @ApiOperation("差旅费上报")
//    @Log(title = "差旅费上报", businessType = BusinessType.OTHER)
//    @PostMapping("/test")
//    public AjaxResult test(@RequestBody CheckFundVO checkFundVO) {
//        mergeFilesToPDFUtils.generatePdf(checkFundVO.getFileNames(), checkFundVO.getOutputFile());
//        return AjaxResult.success(200);
//    }


@@ -463,26 +260,44 @@
    @PostMapping("/travelexpensereport")
    public AjaxResult travelexpensereport(@RequestBody CheckFundVO checkFundVO) {
        ServiceReimbursement serviceReimbursement = serviceReimbursementService.getById(checkFundVO.getFundid());
        serviceReimbursement.setApplyTime(new Date());
        Long flowLavel = null;

        LoginUser loginUser = getLoginUser();
        SysUser user = loginUser.getUser();

        //查询必审人
        ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
        serviceFundflowrule.setApplytype("0");
        serviceFundflowrule.setMustAudite(1);
        serviceFundflowrule.setDel_flag(0);
        List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
        log.info("reimbursement必审人的等级为：{}", serviceFundflowrules.get(0).getFlowlevel());

        //如果等于100，说明已经走到医院财务那边了；财务那边取数据是从分享表取，所以，这里直接往分享表里添加数据就行了;
        if (!Objects.isNull(serviceReimbursement) && serviceReimbursement.getBackflowlevel() != null) {
//            if (serviceReimbursement.getBackflowlevel() == 100 || serviceReimbursement.getBackflowlevel() == 199) {
            if (serviceReimbursement.getBackflowlevel() == 199) {
            if (serviceReimbursement.getBackflowlevel() == 100 || serviceReimbursement.getBackflowlevel() == 199) {
                //将退回阶段设置成100
                serviceReimbursement.setBackflowlevel(100L);
                serviceReimbursement.setFlowlevel(100L);
                serviceReimbursement.setRecordstatus(0);
                //退回再提交，需要再到出纳那里
                serviceReimbursement.setFlowlevel(Long.valueOf(serviceFundflowrules.get(0).getFlowlevel() - 1));
                serviceReimbursement.setRecordstatus(2);
                serviceReimbursementService.updateById(serviceReimbursement);

                //将修改的上报数据 新增一条
                serviceReimbursementService.addSharedData(checkFundVO.getFundid());
//                serviceReimbursementService.addSharedData(checkFundVO.getFundid());

                return success();
            } else if (serviceReimbursement.getBackflowlevel() >= Long.valueOf(serviceFundflowrules.get(0).getFlowlevel())) {
                //必审人领导退回的，也需要走必审人那里
                serviceReimbursement.setFlowlevel(Long.valueOf(serviceFundflowrules.get(0).getFlowlevel() - 1));
                serviceReimbursement.setRecordstatus(2);
                serviceReimbursementService.updateById(serviceReimbursement);
                return success();
            }
        }
        if (serviceReimbursement != null) {
            Integer TotalLevel = 0;
            LoginUser loginUser = getLoginUser();
            SysUser user = loginUser.getUser();
            List<Integer> postids = postService.selectPostListByUserId(loginUser.getUserId());

            if (!postids.contains(2)) {
@@ -490,8 +305,8 @@
                if (serviceReimbursement.getBackflowlevel() != null) {
                    serviceReimbursement.setFlowlevel(serviceReimbursement.getBackflowlevel());
                } else {
                    serviceReimbursement.setBackflowlevel(1L);
                    serviceReimbursement.setFlowlevel(1L);
                    serviceReimbursement.setBackflowlevel(Long.valueOf(serviceFundflowrules.get(0).getFlowlevel() - 1));
                    serviceReimbursement.setFlowlevel(Long.valueOf(serviceFundflowrules.get(0).getFlowlevel() - 1));
                }
            } else {
                serviceReimbursement.setRecordstatus(0);
@@ -513,7 +328,8 @@
                serviceFundflow.setApplytype("0");
                serviceFundflow.setFlowconclusion(1);
                serviceFundflow.setFlowcontent("非专职人员直接进入二级审核");
                serviceFundflow.setFlowlevel(1);

                serviceFundflow.setFlowlevel(serviceFundflowrules.get(0).getFlowlevel() - 1);
                serviceFundflowService.save(serviceFundflow);
            }

@@ -571,12 +387,40 @@
                    //99 取消
                    RecordStatus = 99;
                } else {

                    if (totalLevel == FlowLevel + 1) {
                        RecordStatus = 99;
                    } else {
                        RecordStatus = (FlowLevel + 1) * 2;
                    }
                }

                if (serviceReimbursement.getFlowlevel() == 1 && serviceReimbursement.getBackflowlevel() == 100) {
                    log.info("出差补贴被 财务退回再提交，出纳再次审批，之后提交到财务:{}", serviceReimbursement.getId());
                    //说明是财务退回再提交的.需要出纳再看一遍，没问题之后，往分享表里新增
//                    serviceReimbursementService.addSharedData(serviceReimbursement.getId());

                    serviceReimbursement.setFlowlevel(serviceFundflowrules.get(0).getTotallevel().longValue());
                    serviceReimbursement.setRecordstatus(99);
                    serviceReimbursement.setUploadStates(0);
                    boolean b = serviceReimbursementService.updateById(serviceReimbursement);
                    log.info("是否修改成功:{}", b);

                    //保存审批流程表
                    ServiceFundflow serviceFundflow = new ServiceFundflow();
                    SysUser user = loginUser.getUser();
                    serviceFundflow.setFundid(serviceReimbursement.getId());
                    serviceFundflow.setCheckuserno(user.getUserName());
                    serviceFundflow.setCheckusername(user.getNickName());
                    serviceFundflow.setFundtype(1);
                    serviceFundflow.setApplytype("0");
                    serviceFundflow.setFlowconclusion(CheckFlag);
                    serviceFundflow.setFlowcontent("通过");
                    serviceFundflow.setFlowlevel(OriginalFlowLevel + 1);
                    Boolean aBoolean = serviceFundflowService.save(serviceFundflow);
                    return AjaxResult.success();
                }

                FlowLevel = FlowLevel + 1;
                serviceReimbursement.setBackflowlevel(Long.valueOf(FlowLevel));
            } else {
@@ -594,6 +438,8 @@
                        FlowLevel = 0;
                    }
                }


            }

            serviceReimbursement.setRecordstatus(RecordStatus);
@@ -635,8 +481,7 @@
            //001审批通过之后，就需要把“办公室主任”的名字填上
            if (checkFundVO.getFlowconclusion() == 1 && user.getUserName().equals("001")) {
                serviceReimbursement.setOfficedirector(user.getNickName());
                String bh = baseOnlyvalueService.getOnlyCode("fund");
                serviceReimbursement.setBh(bh);
                serviceReimbursement.setUploadStates(0);
            }

            serviceReimbursementService.updateById(serviceReimbursement);
@@ -657,10 +502,12 @@
                serviceSystemmessage.setMessagetitle("" + (OriginalFlowLevel + 1) + "级审核通过");
                serviceSystemmessage.setMessagecontent("您" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(serviceReimbursement.getCreateTime()) + "提交的关于捐献案例【" + serviceReimbursement.getDonorname() + "】的差旅费申请已通过" + (OriginalFlowLevel + 1) + "级审核");
                log.info("totalLevel的值 : {},  OriginalFlowLevel的值:{}", totalLevel, OriginalFlowLevel);
                if (totalLevel == OriginalFlowLevel + 1) {
                    //所有数据新增到备份表
                    serviceReimbursementService.addSharedData(checkFundVO.getFundid());
                }

                //这一块放定时任务里做
//                if (totalLevel == OriginalFlowLevel + 1) {
//                    //所有数据新增到备份表
//                    serviceReimbursementService.addSharedData(checkFundVO.getFundid());
//                }
            } else {
                //驳回
                serviceSystemmessage.setMessagetitle("" + (OriginalFlowLevel + 1) + "级审核驳回");
@@ -772,6 +619,7 @@
        }
        Map<String, Object> map = new HashMap<>();
        map.put("downloadUrl", "/profile/download/wordtemplate/" + name + ".doc");
        map.put("downloadName", name + ".doc");
        return map;
    }