代码提交

liusheng

2023-09-07 5f265641217e0a2b5b8160233487e63ff8cfaf39

 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() {
@@ -144,6 +148,11 @@

        //startPage();
        List<SpFinancialExpensesFundOut> list = serviceFundService.getListBypower(loginUser.getUsername(), 2, APPLICANT, APPLICATIONBEGTIME, APPLICATIONENDTIME, loginUser.getDeptId().toString(), CHECKFLAG, APPLYTYPE);
        //通过捐献者过滤
        if (StringUtils.isNotEmpty(spFinancialExpensesIn.getDonorname())) {
            list = list.stream().filter(obj -> obj.getDonorname().contains(spFinancialExpensesIn.getDonorname())).collect(Collectors.toList());
        }

        Collections.sort(list, new Comparator<SpFinancialExpensesFundOut>() {
            @Override
            public int compare(SpFinancialExpensesFundOut o1, SpFinancialExpensesFundOut o2) {
@@ -558,10 +567,10 @@


    /**
     * 修改费用申请
     * 费用上报
     */
    @ApiOperation("修改费用申请")
    @Log(title = "费用申请主", businessType = BusinessType.UPDATE)
    @ApiOperation("费用上报")
    @Log(title = "费用上报", businessType = BusinessType.UPDATE)
    @PostMapping("/fundEdit")
    @RepeatSubmit
    public AjaxResult fundEdit(@RequestBody ServiceFund serviceFund) {
@@ -573,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);
@@ -583,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);

@@ -1055,11 +1087,14 @@
            String fyxm = "";
            fyxm += f.getItemname() == null ? "" : f.getItemname();
            fyxm += f.getAmount() + "元";
//            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")) {
                fyxm += "(";
                fyxm += f.getUnitname() == null ? "" : f.getUnitname() + ";";
                fyxm += f.getDepositbank() == null ? "" : f.getDepositbank() + ": ";
                fyxm += f.getBankcardno() == null ? "" : f.getBankcardno();
                fyxm += ")";
            }
            map.put("FYXM", fyxm);
            newList.add(map);
        }
@@ -1072,7 +1107,8 @@
//        dataMap.put("JEXS", serviceFund.getAmountrequested());
//        dataMap.put("JEDS", convert(serviceFund.getAmountrequested()) + "整");
        //备注里放的是经办人的银行卡信息
        dataMap.put("BXBZ", infoByUserNo == null ? "" : infoByUserNo.getBranchbankname() + "  " + infoByUserNo.getBankcardno());

        dataMap.put("BXBZ", serviceFund.getApplytype().equals("3") ? "" : infoByUserNo == null ? "" : infoByUserNo.getBranchbankname() + "  " + infoByUserNo.getBankcardno());
        dataMap.put("YZ", serviceFund.getPresident() == null ? "" : serviceFund.getPresident());
        dataMap.put("CWFYZ", serviceFund.getFinvicepresident() == null ? "" : serviceFund.getFinvicepresident());
        dataMap.put("YWFYZ", serviceFund.getBusvicepresident() == null ? "" : serviceFund.getBusvicepresident());
@@ -1926,6 +1962,5 @@
        return AjaxResult.success(serviceFundService.countItem(infoid, itemid));

    }


}