代码提交

liusheng

2025-01-02 b6dd47b05107fc36d8ff4f7f29a4446521f95503

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

@@ -104,7 +104,7 @@
     * 查询报销申请列表
     */
    @ApiOperation("查询报销申请列表")
    //@PreAuthorize("@ss.hasPermi('project:reimbursement:list')")
    //// @PreAuthorize("@ss.hasPermi('project:reimbursement:list')")
    @Log(title = "查询报销申请列表", businessType = BusinessType.OTHER)
    @GetMapping("/list")
    public TableDataInfo list(ServiceReimbursement serviceReimbursement) {
@@ -180,7 +180,7 @@
        Collections.sort(list, new Comparator<SpFinancialExpensesReimbursementOut>() {
            @Override
            public int compare(SpFinancialExpensesReimbursementOut o1, SpFinancialExpensesReimbursementOut o2) {
                return o1.getCreateTime().compareTo(o2.getCreateTime());
                return o1.getApplyTime().compareTo(o2.getApplyTime());
            }
        });
        return getCustomDataTable(list, pageNum, pageSize);
@@ -190,7 +190,7 @@
     * 导出报销申请列表
     */
    @ApiOperation("导出报销申请列表")
    //@PreAuthorize("@ss.hasPermi('project:reimbursement:export')")
    //// @PreAuthorize("@ss.hasPermi('project:reimbursement:export')")
    @Log(title = "报销申请", businessType = BusinessType.EXPORT)
    @GetMapping("/export")
    public AjaxResult export(ServiceReimbursement serviceReimbursement) {
@@ -203,7 +203,7 @@
     * 获取报销申请详细信息
     */
    @ApiOperation("获取报销申请详细信息")
    //@PreAuthorize("@ss.hasPermi('project:reimbursement:query')")
    //// @PreAuthorize("@ss.hasPermi('project:reimbursement:query')")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id) {
        return AjaxResult.success(serviceReimbursementService.getById(id));
@@ -223,7 +223,7 @@
     * 新增报销申请
     */
    @ApiOperation("新增报销申请")
    //@PreAuthorize("@ss.hasPermi('project:reimbursement:add')")
    //// @PreAuthorize("@ss.hasPermi('project:reimbursement:add')")
    @Log(title = "报销申请", businessType = BusinessType.INSERT)
    @PostMapping("/add")
    @RepeatSubmit
@@ -489,8 +489,8 @@
                }

            }
            //001审批通过之后，就需要把“办公室主任”的名字填上
            if (checkFundVO.getFlowconclusion() == 1 && user.getUserName().equals("001")) {
            //053审批通过之后，就需要把“办公室主任”的名字填上
            if (checkFundVO.getFlowconclusion() == 1 && user.getUserName().equals("053")) {
                serviceReimbursement.setOfficedirector(user.getNickName());
                serviceReimbursement.setUploadStates(1);
            }
@@ -506,12 +506,14 @@
            serviceSystemmessage.setReceiveusername(serviceReimbursement.getUsername());
            serviceSystemmessage.setIsread(0);
            serviceSystemmessage.setMessagetype(1);
            serviceSystemmessage.setUpdateTime(new Date());
            serviceSystemmessage.setUpdateBy(user.getNickName());
            serviceSystemmessage.setRelevantno(serviceReimbursement.getId());
            log.info("CheckFlag的值 : {}", CheckFlag);
            if (CheckFlag == 1) {
                //通过
                serviceSystemmessage.setMessagetitle("" + (OriginalFlowLevel + 1) + "级审核通过");
                serviceSystemmessage.setMessagecontent("您" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(serviceReimbursement.getCreateTime()) + "提交的关于捐献案例【" + serviceReimbursement.getDonorname() + "】的差旅费申请已通过" + (OriginalFlowLevel + 1) + "级审核");
                serviceSystemmessage.setMessagecontent("您" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(serviceReimbursement.getCreateTime()) + "提交的差旅报销单申请已通过");
                log.info("totalLevel的值 : {},  OriginalFlowLevel的值:{}", totalLevel, OriginalFlowLevel);

                //这一块放定时任务里做
@@ -522,7 +524,7 @@
            } else {
                //驳回
                serviceSystemmessage.setMessagetitle("" + (OriginalFlowLevel + 1) + "级审核驳回");
                serviceSystemmessage.setMessagecontent("您" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(serviceReimbursement.getCreateTime()) + "提交的关于捐献案例【" + serviceReimbursement.getDonorname() + "】的差旅费申请已被" + (OriginalFlowLevel + 1) + "级审核驳回，原因为" + checkFundVO.getFlowcontent() + "");
                serviceSystemmessage.setMessagecontent("您" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(serviceReimbursement.getCreateTime()) + "提交的差旅报销单申请被驳回，原因:" + checkFundVO.getFlowcontent() + "");
            }
            ServiceSystemmessage.save(serviceSystemmessage);

@@ -537,7 +539,7 @@
     * 修改报销申请
     */
    @ApiOperation("修改报销申请")
    //@PreAuthorize("@ss.hasPermi('project:reimbursement:edit')")
    //// @PreAuthorize("@ss.hasPermi('project:reimbursement:edit')")
    @Log(title = "报销申请", businessType = BusinessType.UPDATE)
    @PostMapping("/reimbursementEdit")
    @RepeatSubmit
@@ -553,7 +555,7 @@
     * 修改报销申请
     */
    @ApiOperation("修改报销申请")
    //@PreAuthorize("@ss.hasPermi('project:reimbursement:edit')")
    //// @PreAuthorize("@ss.hasPermi('project:reimbursement:edit')")
    @Log(title = "审核费用", businessType = BusinessType.OTHER)
    @PostMapping("/editMoney")
    public AjaxResult editMoney(@RequestBody List<ReimbursementService> serviceReimbursement) {
@@ -568,7 +570,7 @@
     * 删除报销申请
     */
    @ApiOperation("删除报销申请")
    //@PreAuthorize("@ss.hasPermi('project:reimbursement:remove')")
    //// @PreAuthorize("@ss.hasPermi('project:reimbursement:remove')")
    @Log(title = "报销申请")
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids) {