代码提交，添加apply_time

liusheng

2023-12-16 3db944578af704f433fc6f4bc37180c8fed48ce9

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

@@ -1,8 +1,10 @@
package com.ruoyi.web.controller.project;

import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
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;
@@ -13,6 +15,7 @@
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.tax.TaxtUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
@@ -479,6 +482,7 @@
     * 审核费用
     */
    @ApiOperation("审核费用")
    @RepeatSubmit
//    @Log(title = "审核费用", businessType = BusinessType.OTHER)
    @PostMapping("/checkfund")
    public AjaxResult checkFund(@RequestBody CheckFundVO checkFundVO) {
@@ -492,7 +496,6 @@
            serviceFundflowrule.setApplytype(serviceFund.getApplytype());
            serviceFundflowrule.setCheckuserno(loginUser.getUsername());
            log.info("serviceFundController---checkFund---queryList的入参值serviceFundflowrule:{}", serviceFundflowrule);

            List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);

            if (serviceFundflowrules == null || serviceFundflowrules.stream().count() == 0) {
@@ -645,6 +648,7 @@
            return toAjax(false);
        }
        for (ServiceFund sf : infoByInfoIdList) {
            sf.setApplyTime(new Date());
            //如果等于100，说明已经走到医院财务那边了；财务那边取数据是从分享表取，所以，这里直接往分享表里添加数据就行了
            if (sf.getBackflowlevel() != null && sf.getBackflowlevel() == 199) {
                //将fund表的审核状态改成100
@@ -2097,6 +2101,7 @@
    /**
     * 费用类型计数
     */
//    @NotRepeatCommit(key = "param:arg[1]", value = 30000)
    @ApiOperation("费用类型计数")
    @GetMapping(value = "/countItem/{infoid}/{itemid}")
    public AjaxResult countItem(@PathVariable Long infoid, @PathVariable Long itemid) {
@@ -2121,17 +2126,31 @@
    /**
     * 合计个税
     */
    @NotRepeatCommit(key = "param:arg[1]", value = 30000)
    @ApiOperation("合计个税")
    @Log(title = "合计个税", businessType = BusinessType.INSERT)
    @PostMapping("/totaltax")
    @RepeatSubmit
    public AjaxResult totaltax(@RequestBody TotalTaxVO totalTaxVO) {
        Boolean totaltax = serviceFundService.totaltax(totalTaxVO);
        if (totaltax) {
            return AjaxResult.success("合计个税成功,请去E:\\OPO\\WEB\\Upload\\download 中查找文件");
        Map<String, List<ServiceFunddetailExcel>> totaltax = serviceFundService.totaltax(totalTaxVO);
        if (ObjectUtils.isEmpty(totaltax)) {
            throw new BaseException("合计个税失败");
        }

        return AjaxResult.success("合计失败，请稍后重试");
        Set<String> strings = totaltax.keySet();
        String key2 = null;
        for (String key : strings) {
            key2 = key;
        }
        ExcelUtil<ServiceFunddetailExcel> util = new ExcelUtil<ServiceFunddetailExcel>(ServiceFunddetailExcel.class);
        AjaxResult ajaxResult = util.exportExcel(totaltax.get(key2), key2);
        String msg = (String) ajaxResult.get("msg");

        Map dataMap = new HashMap();
        dataMap.put("downloadUrl", "/profile/download/" + msg);

        return AjaxResult.success(dataMap);


    }

}