代码提交

liusheng

2024-03-11 7a1a246539b16c7e81006fb79dd2885d94aa8c01

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

@@ -1,29 +1,28 @@
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;
import com.ruoyi.project.domain.vo.CheckFundVO;
import com.ruoyi.project.domain.vo.DingTalkReqVo;
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.system.service.ISysUserService;
import com.ruoyi.web.controller.enums.PersonType;
import freemarker.template.Configuration;
import freemarker.template.Template;
@@ -41,6 +40,7 @@
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.regex.Pattern;
import java.util.stream.Collectors;

@@ -59,6 +59,9 @@
    @Autowired
    private IServiceReimbursementService serviceReimbursementService;

//    @Autowired
//    private MergeFilesToPDFUtils mergeFilesToPDFUtils;

    @Autowired
    private IServiceReimbursementSharedService serviceReimbursementSharedService;

@@ -75,10 +78,10 @@
    private IServiceFundflowService serviceFundflowService;

    @Autowired
    private ISysDeptService sysDeptService;
    private DingTalkService dingTalkService;

    @Autowired
    private IBaseOnlyvalueService baseOnlyvalueService;
    private ISysUserService sysUserService;

    @Autowired
    private ISysPostService postService;
@@ -229,12 +232,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 +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());

@@ -386,7 +402,7 @@

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

@@ -422,8 +438,19 @@
                        FlowLevel = 0;
                    }
                }


                SysUser sysUser = sysUserService.selectUserByUserName(serviceReimbursement.getUserno());
                ArrayList<ConcurrentHashMap<String, Object>> contentList = new ArrayList<>();
                ConcurrentHashMap map = new ConcurrentHashMap();
                map.put("审批人：", loginUser.getUser().getUserName());
                map.put("审批时间：", new Date());
                map.put("意见：", "不通过");
                if (StringUtils.isNotBlank(checkFundVO.getFlowcontent())) map.put("意见：", checkFundVO.getFlowcontent());
                contentList.add(map);
                DingTalkReqVo dingTalkReqVo = new DingTalkReqVo();
                dingTalkReqVo.setTitle("财务系统驳回信息");
                dingTalkReqVo.setNumber(sysUser.getPhonenumber());
                dingTalkReqVo.setContents(contentList);
                dingTalkService.sendNotification(dingTalkReqVo);
            }

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

            serviceReimbursementService.updateById(serviceReimbursement);