代码提交

liusheng

2024-02-28 ee99290acc01bf294b44f39194f93762d7a3de2d

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

@@ -13,6 +13,7 @@
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;
@@ -58,6 +59,9 @@
public class ServiceReimbursementController extends BaseController {
    @Autowired
    private IServiceReimbursementService serviceReimbursementService;

//    @Autowired
//    private MergeFilesToPDFUtils mergeFilesToPDFUtils;

    @Autowired
    private IServiceReimbursementSharedService serviceReimbursementSharedService;
@@ -236,6 +240,17 @@
        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 +270,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());

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

            serviceReimbursementService.updateById(serviceReimbursement);