代码提交

liusheng

2024-05-22 9b44e841586ce281e4e3e9d7296d74b29939418b

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

@@ -102,7 +102,7 @@
     * 查询费用申请主列表
     */
    @ApiOperation("查询费用申请主列表")
    //@PreAuthorize("@ss.hasPermi('project:fund:list')")
    //// @PreAuthorize("@ss.hasPermi('project:fund:list')")
    @GetMapping("/list")
    public TableDataInfo list(ServiceFund serviceFund) {
        startPage();
@@ -196,7 +196,7 @@
    }

    @ApiOperation("查询费用申请主列表")
    //@PreAuthorize("@ss.hasPermi('project:fund:list')")
    //// @PreAuthorize("@ss.hasPermi('project:fund:list')")
    @GetMapping(value = "/getInfo/{infoid}")
    public AjaxResult getInfoByInfoId(@PathVariable("infoid") Long infoid) {
        return AjaxResult.success(serviceFundService.getInfoByInfoId(infoid));
@@ -218,7 +218,7 @@
     * 导出费用申请主列表
     */
    @ApiOperation("导出费用申请主列表")
    //@PreAuthorize("@ss.hasPermi('project:fund:export')")
    //// @PreAuthorize("@ss.hasPermi('project:fund:export')")
    @Log(title = "费用申请主", businessType = BusinessType.EXPORT)
    @GetMapping("/export")
    public AjaxResult export(ServiceFund serviceFund) {
@@ -232,7 +232,7 @@
     * 获取费用申请主详细信息
     */
    @ApiOperation("获取费用申请主详细信息")
    //@PreAuthorize("@ss.hasPermi('project:fund:query')")
    //// @PreAuthorize("@ss.hasPermi('project:fund:query')")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id) {
        return AjaxResult.success(serviceFundService.getById(id));
@@ -242,7 +242,7 @@
     * 新增费用申请主
     */
    @ApiOperation("新增费用申请主")
    //@PreAuthorize("@ss.hasPermi('project:fund:add')")
    //// @PreAuthorize("@ss.hasPermi('project:fund:add')")
    @Log(title = "费用申请主", businessType = BusinessType.INSERT)
    @PostMapping("/add")
    @RepeatSubmit
@@ -571,7 +571,7 @@
     * 删除费用申请主
     */
    @ApiOperation("删除费用申请主")
    //@PreAuthorize("@ss.hasPermi('project:fund:remove')")
    //// @PreAuthorize("@ss.hasPermi('project:fund:remove')")
    @Log(title = "费用申请主", businessType = BusinessType.DELETE)
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids) {
@@ -956,6 +956,7 @@
        Map dataMap = new HashMap();
        String dataYX = getDataYX(dataMap, id);
        String filePath = getClass().getResource("/template/").getPath();
        log.info("filePath的值为:{}", filePath);
        System.out.println(filePath);
        //设置模本装置方法和路径,FreeMarker支持多种模板装载方法。可以重servlet，classpath，数据库教程装载，
        configuration.setDirectoryForTemplateLoading(new File(filePath));
@@ -986,18 +987,19 @@
        //输出文档路径及名称
        File outFile = new File(RuoYiConfig.getProfile() + "/download/wordtemplate/" + name + ".doc");
        Writer out = null;

        try {
            out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(outFile), "utf-8"));

        } catch (FileNotFoundException e1) {
            e1.printStackTrace();
            log.error("FileNotFoundException报错信息是：{}",e1.getMessage());
//            e1.printStackTrace();
        }
        try {

            t.process(dataMap, out);
        } catch (TemplateException e) {
            e.printStackTrace();
            log.error("TemplateException报错信自是：{}",e.getMessage());
            e.getMessage();
        }
        Map<String, Object> map = new HashMap<>();
        map.put("downloadUrl", "/profile/download/wordtemplate/" + name + ".doc");
@@ -1012,7 +1014,7 @@
            throw new ServiceException("下载失败，用户信息出错", HttpStatus.NO_CONTENT);
        }
        ServiceExternalperson infoByUserNo = null;
        if (StringUtils.isNotBlank(serviceFund.getUserno())) {
        if (StringUtils.isNotBlank(serviceFund.getUserno()) && serviceFund.getApplytype().equals("5")) {
            infoByUserNo = externalpersonService.getInfoByUserNo(serviceFund.getUserno());
        }

@@ -1139,7 +1141,7 @@
        dataMap.put("CWSH", serviceFund.getFinancechecher() == null ? "" : serviceFund.getFinancechecher());

        dataMap.put("YYMMDD", time);
        dataMap.put("XM", serviceFund.getDonorname() == null ? "" : serviceFund.getDonorname());
        dataMap.put("XM", serviceFund.getDonorname() == null ? "" : serviceFund.getDonorname().trim());
        dataMap.put("GZRY", serviceFund.getUsername() == null ? "" : serviceFund.getUsername());
        dataMap.put("ZZ", serviceFund.getManagername() == null ? "" : serviceFund.getManagername());