代码提交

liusheng

2023-09-04 9c39825700c4ce97e95efdf1524c743fb404751d

代码提交

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

@@ -19,6 +19,7 @@
import com.ruoyi.project.domain.vo.*;
import com.ruoyi.project.mapper.ServiceFunddetailMapper;
import com.ruoyi.project.service.*;
import com.ruoyi.system.service.ISysPostService;
import freemarker.template.Configuration;
import freemarker.template.Template;
import freemarker.template.TemplateException;
@@ -78,6 +79,9 @@

    @Autowired
    private IServiceExternalpersonService externalpersonService;

    @Autowired
    private ISysPostService postService;


    public ServiceFundController() {
@@ -563,10 +567,10 @@


    /**
     * 修改费用申请
     * 费用上报
     */
    @ApiOperation("修改费用申请")
    @Log(title = "费用申请主", businessType = BusinessType.UPDATE)
    @ApiOperation("费用上报")
    @Log(title = "费用上报", businessType = BusinessType.UPDATE)
    @PostMapping("/fundEdit")
    @RepeatSubmit
    public AjaxResult fundEdit(@RequestBody ServiceFund serviceFund) {
@@ -578,7 +582,7 @@
        }
        for (ServiceFund sf : infoByInfoIdList) {
            //如果等于100，说明已经走到医院财务那边了；财务那边取数据是从分享表取，所以，这里直接往分享表里添加数据就行了
            if (sf.getBackflowlevel() == 199) {
            if (sf.getBackflowlevel() != null && sf.getBackflowlevel() == 199) {
                //将fund表的审核状态改成100
                sf.setBackflowlevel(100);
                serviceFundService.updateById(sf);
@@ -588,7 +592,30 @@

                return success();
            } else {
                serviceFund.setFlowlevel(sf.getBackflowlevel());

                Integer TotalLevel = 0;
                LoginUser loginUser = getLoginUser();
                SysUser user = loginUser.getUser();
                List<Integer> postids = postService.selectPostListByUserId(loginUser.getUserId());
                if (!postids.contains(2)) {
                    serviceFund.setRecordstatus(2);
                    if (serviceFund.getBackflowlevel() != null) {
                        serviceFund.setFlowlevel(serviceFund.getBackflowlevel());
                    } else {
                        serviceFund.setBackflowlevel(1);
                        serviceFund.setFlowlevel(1);
                    }
                } else {
                    serviceFund.setRecordstatus(0);
                    if (serviceFund.getBackflowlevel() != null) {
                        serviceFund.setFlowlevel(serviceFund.getBackflowlevel());
                    } else {
                        serviceFund.setFlowlevel(0);
                        serviceFund.setBackflowlevel(0);
                    }

                }
                //   serviceFund.setFlowlevel(sf.getBackflowlevel());
                boolean bret = serviceFundService.updateById(serviceFund);
                log.info("serviceFundService.updateById返参:{}", bret);

@@ -1931,24 +1958,5 @@
        return AjaxResult.success(serviceFundService.countItem(infoid, itemid));

    }


    /**
     * 根据税前求税后
     */
    @ApiOperation("根据税前求税后")
    @GetMapping(value = "/taxAfterByTaxBefore")
    public AjaxResult taxAfterByTaxBefore(@PathVariable BigDecimal taxBefore) {
        log.info("税前的值为：{}", taxBefore);
        BigDecimal taxAfter = new BigDecimal(0.0);
        if (taxBefore != null) {
            String taxation = TaxtUtils.getTaxation(taxBefore);
            taxAfter = taxBefore.subtract(new BigDecimal(taxation));
            log.info("税前的值为：{}", taxBefore);
        }
        return AjaxResult.success(taxAfter);

    }


}

 ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFund.java

@@ -214,7 +214,7 @@
     * 处于哪个阶段 0：申请；1：一级审核；2：二级审核；3：三级审核等  100：医院财务  199:医院驳回
     */
    @ApiModelProperty("退回审核级别")
    private int backflowlevel;
    private Integer backflowlevel;

    /** 税前金额 */
    @ApiModelProperty("税前金额")