代码提交

liusheng

2024-02-01 a8b458570fea9039e464150da723b9415b95a64c

代码提交

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

@@ -1189,8 +1189,12 @@
        dataMap.put("YWZ", serviceFund.getDeptmentname() == null ? "" : serviceFund.getDeptmentname());
        dataMap.put("ZHUZANG", serviceFund.getManagername() == null ? "" : serviceFund.getManagername());

        dataMap.put("FYMC", LocalDate.now().getYear() + "年" + LocalDate.now().getMonthValue() + "月人体器官获取服务管理中心工作人员绩效");

        if (StringUtils.isEmpty(serviceFund.getRemark())) {
            dataMap.put("FYMC", LocalDate.now().getYear() + "年" + LocalDate.now().getMonthValue() + "月人体器官获取服务管理中心工作人员绩效");
        } else {
            dataMap.put("FYMC", serviceFund.getRemark().substring(0, serviceFund.getRemark().length() - 2) + "人体器官获取服务管理中心工作人员绩效");
        }
        String bz = "";
        int i = 0;
        if (!serviceFund.getApplytype().equals("5")) {
@@ -1231,7 +1235,11 @@
            Map<String, Object> map = new HashMap<String, Object>();
            map.put("seqno", 1);
            String fyxm = "";
            if (StringUtils.isEmpty(serviceFund.getRemark())) {
            fyxm += LocalDate.now().getYear() + "年" + LocalDate.now().getMonthValue() + "月人体器官获取服务管理中心工作人员绩效,共计";
            } else {
                fyxm += serviceFund.getRemark().substring(0, serviceFund.getRemark().length() - 2) + "人体器官获取服务管理中心工作人员绩效,共计";
            }
            fyxm += serviceFund.getPretaxcost() + "元";
            if (serviceFund.getPretaxcost() == null && serviceFund.getPretaxcost() == 0.0) {
                fyxm = "";

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

@@ -368,12 +368,13 @@
                }

                if (serviceReimbursement.getFlowlevel() == 1 && serviceReimbursement.getBackflowlevel() == 100) {
                    log.info("出差补贴被 财务退回再提交，出纳再次审批，之后提交到财务");
                    log.info("出差补贴被 财务退回再提交，出纳再次审批，之后提交到财务:{}", serviceReimbursement.getId());
                    //说明是财务退回再提交的.需要出纳再看一遍，没问题之后，往分享表里新增
                    serviceReimbursementService.addSharedData(serviceReimbursement.getId());
                    serviceReimbursement.setFlowlevel(100L);
                    serviceReimbursement.setRecordstatus(99);
                    serviceReimbursementService.updateById(serviceReimbursement);
                    boolean b = serviceReimbursementService.updateById(serviceReimbursement);
                    log.info("是否修改成功:{}", b);

                    //保存审批流程表
                    ServiceFundflow serviceFundflow = new ServiceFundflow();

 ruoyi-common/src/main/java/com/ruoyi/common/tax/TaxtUtils.java

@@ -85,12 +85,12 @@
            taxMoney = money.divide(new BigDecimal(0.84), 2, BigDecimal.ROUND_CEILING);
        }

        if (money.doubleValue() > 21000 && money.doubleValue() <= 40000) {
        if (money.doubleValue() > 21000 && money.doubleValue() <= 49500) {
            money = money.subtract(new BigDecimal(2000));
            taxMoney = money.divide(new BigDecimal(0.76), 2, BigDecimal.ROUND_CEILING);
        }

        if (money.doubleValue() > 40000) {
        if (money.doubleValue() > 49500) {
            money = money.subtract(new BigDecimal(7000));
            taxMoney = money.divide(new BigDecimal(0.68), 2, BigDecimal.ROUND_CEILING);
        }
@@ -106,11 +106,11 @@


    public static void main(String[] args) {
        String taxation = getTaxation(BigDecimal.valueOf(80589.723));
        String taxationBefore = getTaxationBefore(BigDecimal.valueOf(900.531));
        String taxation = getTaxation(BigDecimal.valueOf(43000));
        String taxationBefore = getTaxationBefore(BigDecimal.valueOf(205892.36));


        System.out.println(taxation + "        " + taxationBefore);
        System.out.println("taxation:" + taxation + "============taxationBefore: " + taxationBefore);
    }

}

 ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/SpFinancialExpensesReimbursementOut.java

@@ -10,9 +10,10 @@
import java.util.Date;

@Data
public class SpFinancialExpensesReimbursementOut extends ServiceReimbursement
{
    /** 审核按钮标志 */
public class SpFinancialExpensesReimbursementOut extends ServiceReimbursement {
    /**
     * 审核按钮标志
     */
    @ApiModelProperty("审核按钮标志 0：不显示审核；1：显示审核")
    @Excel(name = "审核按钮标志")
    private Integer CheckFlag;

 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java

@@ -158,6 +158,7 @@
        reimbursementShared1.setReimid(id);
        reimbursementShared1.setDelFlag(0L);
        List<ServiceReimbursementShared> serviceReimbursementShareds = sharedService.queryList(reimbursementShared1);
        log.info("serviceReimbursementShareds的查询结果 :{}", serviceReimbursementShareds.size());
        if (!CollectionUtils.isEmpty(serviceReimbursementShareds)) {
            return true;
        }

 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementSharedServiceImpl.java

@@ -40,6 +40,9 @@
        if (serviceReimbursementShared.getReimid() != null) {
            wrappers.eq(ServiceReimbursementShared::getReimid, serviceReimbursementShared.getReimid());
        }
        if (serviceReimbursementShared.getDelFlag() != null) {
            wrappers.eq(ServiceReimbursementShared::getDelFlag, serviceReimbursementShared.getDelFlag());
        }
        if (StringUtils.isNotBlank(serviceReimbursementShared.getUsername())) {
            wrappers.like(ServiceReimbursementShared::getUsername, serviceReimbursementShared.getUsername());
        }