代码提交

liusheng

2023-11-10 6f344e6360751574f7e03b21c00cfa3f4b2bc099

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

@@ -42,6 +42,7 @@
import java.io.*;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.util.*;
import java.util.stream.Collectors;

@@ -143,6 +144,9 @@
        Integer checkstatus = spFinancialExpensesIn.getCheckstatus();

        String donorname = spFinancialExpensesIn.getDonorname();
        if (StringUtils.isEmpty(donorname)) {
            donorname = null;
        }
        if (pageNum == null) {
            pageNum = 1;
        }
@@ -519,6 +523,28 @@
                    }
                }
                FlowLevel = FlowLevel + 1;

                if (serviceFund.getFlowlevel() == 1 && serviceFund.getBackflowlevel() == 100) {
                    log.info("财务退回再提交，出纳再次审批，之后提交到财务");
                    //说明是财务退回再提交的.需要出纳再看一遍，没问题之后，往分享表里新增
                    serviceFundService.addFundSharedInfo(serviceFund.getId());
                    serviceFund.setFlowlevel(100L);
                    serviceFund.setRecordstatus(99);
                    serviceFundService.updateById(serviceFund);

                    //保存审批流程表
                    ServiceFundflow serviceFundflow = new ServiceFundflow();
                    SysUser user = loginUser.getUser();
                    serviceFundflow.setFundid(serviceFund.getId());
                    serviceFundflow.setCheckuserno(user.getUserName());
                    serviceFundflow.setCheckusername(user.getNickName());
                    serviceFundflow.setFundtype(2);
                    serviceFundflow.setApplytype(serviceFund.getApplytype());
                    serviceFundflow.setFlowconclusion(CheckFlag);
                    serviceFundflow.setFlowcontent("通过");
                    Boolean aBoolean = serviceFundflowService.saveData(serviceFundflow);
                    return AjaxResult.success();
                }
                //记录一下，下一级的审批，以便于下一级退回后，发起者提交时，能再提到当前审批层级
                serviceFund.setBackflowlevel(FlowLevel);
            } else {
@@ -623,12 +649,27 @@
            if (sf.getBackflowlevel() != null && sf.getBackflowlevel() == 199) {
                //将fund表的审核状态改成100
                sf.setBackflowlevel(100);

                //退回再提交，需要再到出纳那里
                sf.setFlowlevel(1L);
                sf.setRecordstatus(0);
                serviceFundService.updateById(sf);

                //往分享表里新增
                serviceFundService.addFundSharedInfo(serviceFund.getId());
//                //往分享表里新增
//                serviceFundService.addFundSharedInfo(serviceFund.getId());

                return success();
            } else if (sf.getBackflowlevel() != null && sf.getBackflowlevel() == 100) {
                //财务退回的数据再提交，到出纳那里没有过，再退回，导致backflowlevel是100,
                //退回再提交，需要再到出纳那里
                sf.setFlowlevel(1L);
                sf.setRecordstatus(2);
                serviceFundService.updateById(sf);
            } else if (sf.getBackflowlevel() != null && sf.getBackflowlevel() == 2) {
                //聂科退回的，也需要先到出纳那里
                sf.setFlowlevel(1L);
                sf.setRecordstatus(2);
                serviceFundService.updateById(sf);
            } else {

                Integer TotalLevel = 0;
@@ -663,6 +704,7 @@

        return toAjax(false);
    }


    /**
     * 删除费用申请主
@@ -1137,51 +1179,67 @@
        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() + "月人体器官获取服务管理中心工作人员绩效");

        String bz = "";
        int i = 0;
        for (ServiceFunddetail f : fd) {
            seqno++;
        if (!serviceFund.getApplytype().equals("5")) {
            for (ServiceFunddetail f : fd) {
                seqno++;
                Map<String, Object> map = new HashMap<String, Object>();
                map.put("seqno", seqno);

                //如果是医疗成本，则把银行卡加上每条明细的后面
                if (serviceFund.getApplytype().equals("3")) {
                    i = i + 1;
                    bz += f.getBeneficiaryname() == null ? "(" + i + ")" : "(" + i + ")" + f.getBeneficiaryname() + "，";
                    bz += "金额 : " + f.getAmount() + "元" + "，";
                    bz += f.getDepositbank() == null ? "" : f.getDepositbank() + ": ";
                    bz += f.getBankcardno() == null ? "" : f.getBankcardno();
                    bz += "<w:br/>";
                }
                if (serviceFund.getApplytype().equals("4")) {
                    i = i + 1;
                    bz += f.getBeneficiaryname() == null ? "(" + i + ")" : "(" + i + ")" + f.getBeneficiaryname() + "，";
                    bz += "金额 : " + f.getAmount() + "元" + "，";
                    bz += f.getDepositbank() == null ? "" : f.getDepositbank() + ": ";
                    bz += f.getBankcardno() == null ? "" : f.getBankcardno();
                    bz += "<w:br/>";
                }


                String fyxm = "";
                fyxm += f.getItemname() == null ? "" : f.getItemname();
                fyxm += f.getAmount() + "元";
                if (f.getItemname() == null && f.getAmount() == 0.0) {
                    fyxm = "";
                }
                map.put("FYXM", fyxm);
                newList.add(map);
            }
        } else {
            Map<String, Object> map = new HashMap<String, Object>();
            map.put("seqno", seqno);
//            String fyxm = "";
//            fyxm += f.getItemname() == null ? "" : f.getItemname();
//            fyxm += f.getAmount() + "元";
//            //如果是医疗成本，则把银行卡加上每条明细的后面
//            if (serviceFund.getApplytype().equals("3")) {
//                fyxm += "(";
//                fyxm += f.getUnitname() == null ? "" : f.getUnitname() + ";";
//                fyxm += f.getDepositbank() == null ? "" : f.getDepositbank() + ": ";
//                fyxm += f.getBankcardno() == null ? "" : f.getBankcardno();
//                fyxm += ")";
//            }

            //如果是医疗成本，则把银行卡加上每条明细的后面
            if (serviceFund.getApplytype().equals("3")) {
                i = i + 1;
                bz += f.getBeneficiaryname() == null ? "(" + i + ")" : "(" + i + ")" + f.getBeneficiaryname() + "，";
                bz += "金额 : " + f.getAmount() + "元" + "，";
                bz += f.getDepositbank() == null ? "" : f.getDepositbank() + ": ";
                bz += f.getBankcardno() == null ? "" : f.getBankcardno();
                bz += "<w:br/>";
            }
            if (serviceFund.getApplytype().equals("4")) {
                i = i + 1;
                bz += f.getBeneficiaryname() == null ? "(" + i + ")" : "(" + i + ")" + f.getBeneficiaryname() + "，";
                bz += "金额 : " + f.getAmount() + "元" + "，";
                bz += f.getDepositbank() == null ? "" : f.getDepositbank() + ": ";
                bz += f.getBankcardno() == null ? "" : f.getBankcardno();
                bz += "<w:br/>";
            }

            map.put("seqno", 1);
            String fyxm = "";
            fyxm += f.getItemname() == null ? "" : f.getItemname();
            fyxm += f.getAmount() + "元";
            if (f.getItemname() == null && f.getAmount() == 0.0) {
            fyxm += LocalDate.now().getYear() + "年" + LocalDate.now().getMonthValue() + "月人体器官获取服务管理中心工作人员绩效,共计";
            fyxm += serviceFund.getPretaxcost() + "元";
            if (serviceFund.getPretaxcost() == null && serviceFund.getPretaxcost() == 0.0) {
                fyxm = "";
            }
            map.put("FYXM", fyxm);
            newList.add(map);
            Map<String, Object> objectObjectHashMap = new HashMap<>();
            objectObjectHashMap.put("seqno", 2);
            objectObjectHashMap.put("FYXM", "");
            newList.add(objectObjectHashMap);

            Map<String, Object> objectObjectHashMap2 = new HashMap<>();
            objectObjectHashMap2.put("seqno", 3);
            objectObjectHashMap2.put("FYXM", "");
            newList.add(objectObjectHashMap2);
        }


        //合并单元格
        checkList(newList);
        dataMap.put("items", newList);
@@ -2060,4 +2118,20 @@
        return AjaxResult.success(serviceFundService.performance(serviceFundVO));
    }

    /**
     * 合计个税
     */
    @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 中查找文件");
        }

        return AjaxResult.success("合计失败，请稍后重试");
    }

}