代码提交

liusheng

2023-09-07 b113be4dfacb8ce58789b12e8beca6cd9ba8fb3c

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

@@ -12,6 +12,7 @@
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.tax.TaxtUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.bean.DtoConversionUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -98,6 +99,8 @@
    public TableDataInfo list(ServiceFund serviceFund) {
        startPage();
        //List<ServiceFund> list = serviceFundService.queryList(serviceFund);
        SysUser user = SecurityUtils.getLoginUser().getUser();
        serviceFund.setUsername(user.getNickName());
        List<ServiceFund> list = serviceFundService.selectServiceFundList(serviceFund);
        return getDataTable(list);
    }
@@ -632,7 +635,7 @@
    @ApiOperation("删除费用申请主")
    //@PreAuthorize("@ss.hasPermi('project:fund:remove')")
    @Log(title = "费用申请主", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids) {
        return toAjax(serviceFundService.removeByIds(Arrays.asList(ids)));
    }
@@ -1087,11 +1090,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);
        }
@@ -1104,7 +1110,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());