变更

liusheng

2024-07-22 9e99e7e192c62c2274f8f5362b354cbf55c3d80f

变更

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

@@ -643,7 +643,11 @@
        dataMap.put("JXZXM", serviceFund.getDonorname() == null ? "" : serviceFund.getDonorname());
        dataMap.put("JSR", serviceFund.getUsername() == null ? "" : serviceFund.getUsername());
//        dataMap.put("FYXM1", "支付专家费用，其中税前金额" + serviceFund.getPretaxcost() + "元，税后金额" + serviceFund.getTaxedcost() + "元。");
        dataMap.put("FYXM1", "人体器官捐献专家劳务费:" + serviceFund.getPretaxcost() + "元 (其中税后费用由中心承担税费)。");
        if (serviceFund.getApplytype().equals("1")) {
            dataMap.put("FYXM1", "人体器官捐献专家劳务费:" + serviceFund.getPretaxcost() + "元 (其中税后费用由中心承担税费)。");
        } else if (serviceFund.getApplytype().equals("4")) {
            dataMap.put("FYXM1", "办公费用:" + serviceFund.getPretaxcost());
        }
        dataMap.put("FYXM2", "");
        dataMap.put("FYXM3", "");
        dataMap.put("JEXS", serviceFund.getPretaxcost());
@@ -991,14 +995,14 @@
            out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(outFile), "utf-8"));

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

            t.process(dataMap, out);
        } catch (TemplateException e) {
            log.error("TemplateException报错信自是：{}",e.getMessage());
            log.error("TemplateException报错信自是：{}", e.getMessage());
            e.getMessage();
        }
        Map<String, Object> map = new HashMap<>();

 ruoyi-admin/src/main/resources/template/ר¼ÒÀÍÎñ·Ñ·¢·ÅÉêÇëµ¥.ftl

@@ -1662,10 +1662,10 @@
                            <w:rPr>
                                <w:rFonts w:hint="eastAsia"/>
                            </w:rPr>
                            <w:t>中心负责人：</w:t>
                            <w:t>中心财务：    ä¸­å¿ƒè´Ÿè´£äººï¼š</w:t>
                        </w:r>
                        <w:r w:rsidRPr="00D61E43">
                            <w:t xml:space="preserve">      è´¢åŠ¡å‰¯é™¢é•¿ï¼š       ä¸šåŠ¡å‰¯é™¢é•¿ï¼š       åŠžå…¬å®¤ä¸»ä»»ï¼š      åŠžå…¬å®¤å®¡æ ¸ï¼š       è´¢åŠ¡éƒ¨ä¸»ä»»ï¼š        è´¢åŠ¡å®¡æ ¸ï¼š</w:t>
                            <w:t xml:space="preserve">     è´¢åŠ¡å‰¯é™¢é•¿ï¼š      ä¸šåŠ¡å‰¯é™¢é•¿ï¼š      åŠžå…¬å®¤ä¸»ä»»ï¼š     åŠžå…¬å®¤å®¡æ ¸ï¼š      è´¢åŠ¡éƒ¨ä¸»ä»»ï¼š       è´¢åŠ¡å®¡æ ¸ï¼š</w:t>
                        </w:r>
                    </w:p>
                    <w:p w:rsidR="00196045" w:rsidRDefault="00196045">
@@ -3552,4 +3552,4 @@
            </Properties>
        </pkg:xmlData>
    </pkg:part>
</pkg:package>
</pkg:package>

 ruoyi-admin/src/main/resources/template/Â×Àíר¼ÒÀÍÎñ·Ñ·¢·ÅÉêÇëµ¥.ftl

@@ -1717,10 +1717,10 @@
                            <w:rPr>
                                <w:rFonts w:hint="eastAsia"/>
                            </w:rPr>
                            <w:t>中心负责人：</w:t>
                            <w:t>中心财务：    ä¸­å¿ƒè´Ÿè´£äººï¼š</w:t>
                        </w:r>
                        <w:r w:rsidRPr="00D61E43">
                            <w:t xml:space="preserve">       è´¢åŠ¡å‰¯é™¢é•¿ï¼š       ä¸šåŠ¡å‰¯é™¢é•¿ï¼š       åŠžå…¬å®¤ä¸»ä»»ï¼š       åŠžå…¬å®¤å®¡æ ¸ï¼š        è´¢åŠ¡éƒ¨ä¸»ä»»ï¼š        è´¢åŠ¡å®¡æ ¸ï¼š</w:t>
                            <w:t xml:space="preserve">      è´¢åŠ¡å‰¯é™¢é•¿ï¼š      ä¸šåŠ¡å‰¯é™¢é•¿ï¼š      åŠžå…¬å®¤ä¸»ä»»ï¼š      åŠžå…¬å®¤å®¡æ ¸ï¼š       è´¢åŠ¡éƒ¨ä¸»ä»»ï¼š       è´¢åŠ¡å®¡æ ¸ï¼š</w:t>
                        </w:r>
                    </w:p>
                    <w:p w:rsidR="00196045" w:rsidRDefault="00196045">
@@ -3675,4 +3675,4 @@
            <b:Sources xmlns:b="http://schemas.openxmlformats.org/officeDocument/2006/bibliography" xmlns="http://schemas.openxmlformats.org/officeDocument/2006/bibliography" SelectedStyle="\APASixthEditionOfficeOnline.xsl" StyleName="APA" Version="6"/>
        </pkg:xmlData>
    </pkg:part>
</pkg:package>
</pkg:package>

 ruoyi-admin/src/main/resources/template/°ì¹«·ÑÓÃÉêÇëµ¥.ftl

@@ -1070,7 +1070,7 @@
                                <w:sz w:val="18"/>
                                <w:szCs w:val="24"/>
                            </w:rPr>
                            <w:t>院长：${YZ}  è´¢åŠ¡å‰¯é™¢é•¿ï¼š${CWFYZ}  ä¸šåŠ¡å‰¯é™¢é•¿ï¼š${YWFYZ}   åŠžå…¬å®¤ä¸»ä»»ï¼š${BGSZR}   åŠžå…¬å®¤å®¡æ ¸ï¼š   è´¢åŠ¡éƒ¨ä¸»ä»»ï¼š${CWBZR}   è´¢åŠ¡å®¡æ ¸ï¼š${CWSH}</w:t>
                            <w:t>中心财务：    é™¢é•¿ï¼š${YZ}  è´¢åŠ¡å‰¯é™¢é•¿ï¼š${CWFYZ}  ä¸šåŠ¡å‰¯é™¢é•¿ï¼š${YWFYZ}   åŠžå…¬å®¤ä¸»ä»»ï¼š${BGSZR}   åŠžå…¬å®¤å®¡æ ¸ï¼š   è´¢åŠ¡éƒ¨ä¸»ä»»ï¼š${CWBZR}   è´¢åŠ¡å®¡æ ¸ï¼š${CWSH}</w:t>
                        </w:r>
                    </w:p>
                    <w:p w14:paraId="21317D7A" w14:textId="77777777" w:rsidR="00196045" w:rsidRDefault="00196045">
@@ -3703,4 +3703,4 @@
            </Properties>
        </pkg:xmlData>
    </pkg:part>
</pkg:package>
</pkg:package>

 ruoyi-admin/src/main/resources/template/ҽѧ³É±¾·ÑÓÃÉêÇëµ¥.ftl

@@ -1406,10 +1406,10 @@
                            <w:rPr>
                                <w:rFonts w:hint="eastAsia"/>
                            </w:rPr>
                            <w:t>中心负责人：</w:t>
                            <w:t>中心财务：    ä¸­å¿ƒè´Ÿè´£äººï¼š</w:t>
                        </w:r>
                        <w:r w:rsidRPr="00D61E43">
                            <w:t xml:space="preserve">      è´¢åŠ¡å‰¯é™¢é•¿ï¼š${CWFYZ}      ä¸šåŠ¡å‰¯é™¢é•¿ï¼š${YWFYZ}       åŠžå…¬å®¤ä¸»ä»»ï¼š${BGSZR}       åŠžå…¬å®¤å®¡æ ¸ï¼š      è´¢åŠ¡éƒ¨ä¸»ä»»ï¼š${CWBZR}       è´¢åŠ¡å®¡æ ¸ï¼š${CWSH}</w:t>
                            <w:t xml:space="preserve">     è´¢åŠ¡å‰¯é™¢é•¿ï¼š${CWFYZ}      ä¸šåŠ¡å‰¯é™¢é•¿ï¼š${YWFYZ}       åŠžå…¬å®¤ä¸»ä»»ï¼š${BGSZR}      åŠžå…¬å®¤å®¡æ ¸ï¼š     è´¢åŠ¡éƒ¨ä¸»ä»»ï¼š${CWBZR}      è´¢åŠ¡å®¡æ ¸ï¼š${CWSH}</w:t>
                        </w:r>
                    </w:p>
                    <w:p w:rsidR="00196045" w:rsidRDefault="00196045">
@@ -3905,4 +3905,4 @@
            </Properties>
        </pkg:xmlData>
    </pkg:part>
</pkg:package>
</pkg:package>

 ruoyi-admin/src/main/resources/template/²îÂ÷ѱ¨ÏúÉêÇëµ¥.ftl

@@ -1752,10 +1752,10 @@
                            <w:rPr>
                                <w:rFonts w:hint="eastAsia"/>
                            </w:rPr>
                            <w:t>中心负责人：${ZXFZR}</w:t>
                            <w:t>中心财务：    ä¸­å¿ƒè´¢åŠ¡ï¼š    ä¸­å¿ƒè´Ÿè´£äººï¼š${ZXFZR}</w:t>
                        </w:r>
                        <w:r w:rsidRPr="00D61E43">
                            <w:t xml:space="preserve">     è´¢åŠ¡å‰¯é™¢é•¿ï¼š${CWFYZ}    ä¸šåŠ¡å‰¯é™¢é•¿ï¼š${YWFYZ}    åŠžå…¬å®¤ä¸»ä»»ï¼š${BGSZR}     åŠžå…¬å®¤å®¡æ ¸ï¼š   è´¢åŠ¡éƒ¨ä¸»ä»»ï¼š${CWBZR}    è´¢åŠ¡å®¡æ ¸ï¼š${CWSH}</w:t>
                            <w:t xml:space="preserve">    è´¢åŠ¡å‰¯é™¢é•¿ï¼š${CWFYZ}   ä¸šåŠ¡å‰¯é™¢é•¿ï¼š${YWFYZ}   åŠžå…¬å®¤ä¸»ä»»ï¼š${BGSZR}   åŠžå…¬å®¤å®¡æ ¸ï¼š  è´¢åŠ¡éƒ¨ä¸»ä»»ï¼š${CWBZR}   è´¢åŠ¡å®¡æ ¸ï¼š${CWSH}</w:t>
                        </w:r>
                    </w:p>
                    <w:p w:rsidR="00196045" w:rsidRDefault="00196045">
@@ -5965,4 +5965,4 @@
            </Properties>
        </pkg:xmlData>
    </pkg:part>
</pkg:package>
</pkg:package>

 ruoyi-admin/src/main/resources/template/²îÂ÷ѱ¨ÏúÉêÇëµ¥22.ftl

¶Ô±ÈÐÂÎļþ
ÎļþÌ«´ó

 ruoyi-admin/src/main/resources/template/¼¨Ð§·ÑÓÃÉêÇëµ¥.ftl

@@ -996,7 +996,7 @@
                                <w:sz w:val="18"/>
                                <w:szCs w:val="24"/>
                            </w:rPr>
                            <w:t>院长：${YZ}    è´¢åŠ¡å‰¯é™¢é•¿ï¼š${CWFYZ}    ä¸šåŠ¡å‰¯é™¢é•¿ï¼š${YWFYZ}    åŠžå…¬å®¤ä¸»ä»»ï¼š${BGSZR}    è´¢åŠ¡éƒ¨ä¸»ä»»ï¼š${CWBZR}    è´¢åŠ¡å®¡æ ¸ï¼š${CWSH}</w:t>
                            <w:t>中心财务：     é™¢é•¿ï¼š${YZ}     è´¢åŠ¡å‰¯é™¢é•¿ï¼š${CWFYZ}     ä¸šåŠ¡å‰¯é™¢é•¿ï¼š${YWFYZ}    åŠžå…¬å®¤ä¸»ä»»ï¼š${BGSZR}    è´¢åŠ¡éƒ¨ä¸»ä»»ï¼š${CWBZR}    è´¢åŠ¡å®¡æ ¸ï¼š${CWSH}</w:t>
                        </w:r>
                    </w:p>

@@ -1012,4 +1012,4 @@
        </pkg:xmlData>
    </pkg:part>

</pkg:package>
</pkg:package>

 ruoyi-admin/src/main/resources/template/¼¨Ð§·ÑÓÃÉêÇëµ¥2.ftl

@@ -1070,7 +1070,7 @@
                                <w:sz w:val="18"/>
                                <w:szCs w:val="24"/>
                            </w:rPr>
                            <w:t>院长：${YZ}    è´¢åŠ¡å‰¯é™¢é•¿ï¼š${CWFYZ}    ä¸šåŠ¡å‰¯é™¢é•¿ï¼š${YWFYZ}    åŠžå…¬å®¤ä¸»ä»»ï¼š${BGSZR}    è´¢åŠ¡éƒ¨ä¸»ä»»ï¼š${CWBZR}    è´¢åŠ¡å®¡æ ¸ï¼š${CWSH}</w:t>
                            <w:t>中心财务：     é™¢é•¿ï¼š${YZ}    è´¢åŠ¡å‰¯é™¢é•¿ï¼š${CWFYZ}    ä¸šåŠ¡å‰¯é™¢é•¿ï¼š${YWFYZ}    åŠžå…¬å®¤ä¸»ä»»ï¼š${BGSZR}    è´¢åŠ¡éƒ¨ä¸»ä»»ï¼š${CWBZR}    è´¢åŠ¡å®¡æ ¸ï¼š${CWSH}</w:t>
                        </w:r>
                    </w:p>
                    <w:p w14:paraId="21317D7A" w14:textId="77777777" w:rsidR="00196045" w:rsidRDefault="00196045">
@@ -3703,4 +3703,4 @@
            </Properties>
        </pkg:xmlData>
    </pkg:part>
</pkg:package>
</pkg:package>

 ruoyi-admin/src/main/resources/template/·ÑÓñ¨Ïúµ¥.ftl

@@ -1618,10 +1618,10 @@
                            <w:rPr>
                                <w:rFonts w:hint="eastAsia"/>
                            </w:rPr>
                            <w:t>中心负责人：</w:t>
                            <w:t>中心财务：    ä¸­å¿ƒè´Ÿè´£äººï¼š</w:t>
                        </w:r>
                        <w:r w:rsidRPr="00D61E43">
                            <w:t xml:space="preserve">      è´¢åŠ¡å‰¯é™¢é•¿ï¼š      ä¸šåŠ¡å‰¯é™¢é•¿ï¼š       åŠžå…¬å®¤ä¸»ä»»ï¼š       åŠžå…¬å®¤å®¡æ ¸ï¼š      è´¢åŠ¡éƒ¨ä¸»ä»»ï¼š       è´¢åŠ¡å®¡æ ¸ï¼š</w:t>
                            <w:t xml:space="preserve">     è´¢åŠ¡å‰¯é™¢é•¿ï¼š     ä¸šåŠ¡å‰¯é™¢é•¿ï¼š      åŠžå…¬å®¤ä¸»ä»»ï¼š      åŠžå…¬å®¤å®¡æ ¸ï¼š      è´¢åŠ¡éƒ¨ä¸»ä»»ï¼š      è´¢åŠ¡å®¡æ ¸ï¼š</w:t>
                        </w:r>
                    </w:p>
                    <w:sectPr w:rsidR="00E0316F" w:rsidRPr="00D61E43" w:rsidSect="00D61E43">
@@ -2486,4 +2486,4 @@
            </w:styles>
        </pkg:xmlData>
    </pkg:part>
</pkg:package>
</pkg:package>

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

@@ -309,15 +309,14 @@
                log.info("filePath的修改:{}", filePath);
                String url = rbDetailFile.getUrl();
                //file用的是绝对位置
                String substring = url.substring(url.indexOf("/profile/upload") + "/profile/upload".length());
                String fileName = url.substring(url.indexOf("/profile/upload") + "/profile/upload".length());
                String strFile = rbDetailFile.getUrl().replace(filePath, "/profile/upload");
                System.out.println("reimbursement服务的filePath + substring是乱码吗: " + filePath + substring);
                File filetest = new File(filePath + substring);
                File fileUpload = new File(filePath + fileName);
                log.info("请求第三方的入参strFile : {}, strFUrl : {}", strFile, filePath);
                String struploadResult = HttpClientKit.sendPostWithFile(filetest, strFUrl);
                String struploadResult = HttpClientKit.sendPostWithFile(fileUpload, strFUrl);
                log.info("第三方传回的数据: {}", struploadResult);
                if (StringUtils.isEmpty(struploadResult)) {
                    log.info("HttpClientKit.sendPostWithFile è¯·æ±‚为空了 filetest:{},  strFUrl:{} ", filetest, strFUrl);
                    log.info("HttpClientKit.sendPostWithFile è¯·æ±‚为空了 struploadResult:{},  strFUrl:{} ", struploadResult, strFUrl);
                    return 0;
                }