代码提交

liusheng

2024-03-05 0c5e744bd9b52147c7fc273ec8fe7bd7afea0ebb

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

@@ -1,20 +1,17 @@
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.SecurityUtils;
import com.ruoyi.common.utils.bean.DtoConversionUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.project.domain.*;
import com.ruoyi.project.domain.dto.ServiceReimbursementDto;
@@ -58,6 +55,9 @@
public class ServiceReimbursementController extends BaseController {
    @Autowired
    private IServiceReimbursementService serviceReimbursementService;

//    @Autowired
//    private MergeFilesToPDFUtils mergeFilesToPDFUtils;

    @Autowired
    private IServiceReimbursementSharedService serviceReimbursementSharedService;
@@ -229,12 +229,24 @@
        if (!Objects.isNull(serviceReimbursement)) {
            serviceReimbursement.setCreateTime(new Date());
            serviceReimbursement.setCheckstatus(serviceReimbursement.getCheckstatus() == null ? 1 : serviceReimbursement.getCheckstatus());
            serviceReimbursement.setUploadStates(0);
            boolean b = serviceReimbursementService.save(serviceReimbursement);
            Long id = serviceReimbursement.getId();
            return AjaxResult.success(id);
        }
        return error();
    }

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


    /**
@@ -255,6 +267,7 @@
        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());

@@ -273,7 +286,7 @@

                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);
@@ -384,9 +397,9 @@
                    //说明是财务退回再提交的.需要出纳再看一遍，没问题之后，往分享表里新增
//                    serviceReimbursementService.addSharedData(serviceReimbursement.getId());

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

@@ -465,6 +478,7 @@
            //001审批通过之后，就需要把“办公室主任”的名字填上
            if (checkFundVO.getFlowconclusion() == 1 && user.getUserName().equals("001")) {
                serviceReimbursement.setOfficedirector(user.getNickName());
                serviceReimbursement.setUploadStates(1);
            }

            serviceReimbursementService.updateById(serviceReimbursement);