代码提交

liusheng

2023-08-31 d51450c60f95c7e6fb7034451e9c1f7497b2b116

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

@@ -450,20 +450,17 @@
        ServiceReimbursement serviceReimbursement = serviceReimbursementService.getById(checkFundVO.getFundid());
        //如果等于100，说明已经走到医院财务那边了；财务那边取数据是从分享表取，所以，这里直接往分享表里添加数据就行了;
        if (!Objects.isNull(serviceReimbursement) && serviceReimbursement.getBackflowlevel() != null) {
            if (serviceReimbursement.getBackflowlevel() == 100 || serviceReimbursement.getBackflowlevel() == 199) {

                //将修改的上报数据 新增一条
                ServiceReimbursementShared serviceReimbursementShared = DtoConversionUtils.sourceToTarget(serviceReimbursement, ServiceReimbursementShared.class);
                serviceReimbursementShared.setId(null);
                serviceReimbursementShared.setDelFlag(0L);
                serviceReimbursementShared.setReimid(serviceReimbursement.getId());
                serviceReimbursementSharedService.save(serviceReimbursementShared);

//            if (serviceReimbursement.getBackflowlevel() == 100 || serviceReimbursement.getBackflowlevel() == 199) {
            if (serviceReimbursement.getBackflowlevel() == 199) {
                //将退回阶段设置成100
                serviceReimbursement.setBackflowlevel(100L);
                serviceReimbursement.setFlowlevel(100L);
                serviceReimbursement.setRecordstatus(0);
                serviceReimbursementService.updateById(serviceReimbursement);

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

                return success();
            }
        }
@@ -474,16 +471,25 @@
            List<Integer> postids = postService.selectPostListByUserId(loginUser.getUserId());

            if (!postids.contains(2)) {
                serviceReimbursement.setFlowlevel(1L);
                serviceReimbursement.setBackflowlevel(1L);
                serviceReimbursement.setRecordstatus(2);
                if (serviceReimbursement.getBackflowlevel() != null) {
                    serviceReimbursement.setFlowlevel(serviceReimbursement.getBackflowlevel());
                } else {
                    serviceReimbursement.setBackflowlevel(1L);
                    serviceReimbursement.setFlowlevel(1L);
                }
            } else {
                serviceReimbursement.setFlowlevel(0L);
                serviceReimbursement.setRecordstatus(0);
                serviceReimbursement.setBackflowlevel(0L);
                if (serviceReimbursement.getBackflowlevel() != null) {
                    serviceReimbursement.setFlowlevel(serviceReimbursement.getBackflowlevel());
                } else {
                    serviceReimbursement.setFlowlevel(0L);
                    serviceReimbursement.setBackflowlevel(0L);
                }

            }

            if (!postids.contains(2)) {
            if (!postids.contains(2) && (serviceReimbursement.getBackflowlevel() == null || serviceReimbursement.getBackflowlevel() == 0)) {
                ServiceFundflow serviceFundflow = new ServiceFundflow();
                serviceFundflow.setFundid(serviceReimbursement.getId());
                serviceFundflow.setCheckuserno(user.getUserName());
@@ -557,12 +563,14 @@
                    }
                }
                FlowLevel = FlowLevel + 1;
                serviceReimbursement.setBackflowlevel(Long.valueOf(FlowLevel));
            } else {
                CheckFlag = 2;

                if (CheckFlag == 2) {
                    //应医院要求如果出现退回，直接退到发起者
                    FlowLevel = 0;
                    RecordStatus = -1;
                } else {
                    //下面是原来的写法，一级一级的往下退，医院现在不要这样搞了，下面这段代码先保留，等医院回心转意，再给放开
                    RecordStatus = (FlowLevel + 1) * 2 - 1;
@@ -583,13 +591,17 @@
            serviceFundflow.setFundtype(1);
            serviceFundflow.setApplytype("0");
            serviceFundflow.setFlowconclusion(CheckFlag);
            serviceFundflow.setFlowcontent(checkFundVO.getFlowcontent());
            if (StringUtils.isNotBlank(checkFundVO.getFlowcontent())) {
                serviceFundflow.setFlowcontent(checkFundVO.getFlowcontent());
            } else {
                serviceFundflow.setFlowcontent(checkFundVO.getFlowconclusion() == 1 ? "通过" : "不通过");
            }
            serviceFundflow.setFlowlevel(OriginalFlowLevel + 1);
            serviceFundflowService.save(serviceFundflow);

            List<Integer> postids = postService.selectPostListByUserId(loginUser.getUserId());
            log.info("postService.selectPostListByUserId : {}", postids.size());
            if (!postids.contains(2)) {
            if (!postids.contains(2) && !postids.contains(6) && (serviceReimbursement.getBackflowlevel() == null || serviceReimbursement.getBackflowlevel() == 0)) {
                if (CheckFlag == 2 && OriginalFlowLevel == 1) {
                    ServiceFundflow serviceFundflowAuto = new ServiceFundflow();
                    serviceFundflowAuto.setFundid(serviceReimbursement.getId());
@@ -623,7 +635,7 @@
                //通过
                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);
                log.info("totalLevel的值 : {},  OriginalFlowLevel的值:{}", totalLevel, OriginalFlowLevel);
                if (totalLevel == OriginalFlowLevel + 1) {
                    //所有数据新增到备份表
                    serviceReimbursementService.addSharedData(checkFundVO.getFundid());
@@ -678,8 +690,8 @@
     */
    @ApiOperation("删除报销申请")
    //@PreAuthorize("@ss.hasPermi('project:reimbursement:remove')")
    @Log(title = "报销申请", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    @Log(title = "报销申请")
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids) {
        return toAjax(serviceReimbursementService.removeByIds(Arrays.asList(ids)));
    }
@@ -866,6 +878,7 @@
        String date = formatter.format(dt);
        String time = date.substring(0, 10);

        dataMap.put("XZBH", rdInfoByItem.get(0).getBh() == null ? "" : rdInfoByItem.get(0).getBh());
        dataMap.put("TBYYMMDD", time);
        dataMap.put("BXDFJ", rdInfoByItem.get(0).getAttachcount() == null ? "   " : "" + rdInfoByItem.get(0).getAttachcount());
        dataMap.put("JXZXM", rdInfoByItem.get(0).getDonorname() == null ? "" : rdInfoByItem.get(0).getDonorname());