代码提交

liusheng

2023-08-22 31b00e51adcb4005c8e0bced960c5f7f3033f0f4

代码提交

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

@@ -76,6 +76,9 @@
    @Autowired
    private IServiceFundSharedService fundServiceShare;

    @Autowired
    private IServiceExternalpersonService externalpersonService;


    public ServiceFundController() {
        configuration = new Configuration();
@@ -1007,6 +1010,10 @@
        if (serviceFund == null) {
            throw new ServiceException("下载失败，用户信息出错", HttpStatus.NO_CONTENT);
        }
        ServiceExternalperson infoByUserNo = null;
        if (StringUtils.isNotBlank(serviceFund.getUserno())) {
            infoByUserNo = externalpersonService.getInfoByUserNo(serviceFund.getUserno());
        }

        List<ServiceFunddetail> fd = serviceFunddetailService.getAllDetailsByFDIDHZ(id);
        if (fd == null) {
@@ -1035,11 +1042,11 @@
            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 += ")";
//            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);
        }
@@ -1051,7 +1058,8 @@
        dataMap.put("JEDS", convert(serviceFund.getPretaxcost()) + "整");
//        dataMap.put("JEXS", serviceFund.getAmountrequested());
//        dataMap.put("JEDS", convert(serviceFund.getAmountrequested()) + "整");
        dataMap.put("BXBZ", serviceFund.getRemark() == null ? "" : serviceFund.getRemark());
        //备注里放的是经办人的银行卡信息
        dataMap.put("BXBZ", 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());
@@ -1087,6 +1095,9 @@

        dataMap.put("list", newsList);
        dataMap.put("BYHJ", hj);
        dataMap.put("BGSZR2", serviceFund.getOfficedirector() == null ? "" : serviceFund.getOfficedirector());
        dataMap.put("CWBZR2", serviceFund.getFinancedirector() == null ? "" : serviceFund.getFinancedirector());
        dataMap.put("CWSH2", serviceFund.getFinancechecher() == null ? "" : serviceFund.getFinancechecher());

    }


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

@@ -2412,7 +2412,7 @@
                                            <w:color w:val="000000"/>
                                            <w:szCs w:val="21"/>
                                        </w:rPr>
                                        <w:t>办公室主任：</w:t>
                                        <w:t>办公室主任：${BGSZR2}</w:t>
                                    </w:r>
                                    <w:r>
                                        <w:rPr>
@@ -2443,7 +2443,7 @@
                                            <w:color w:val="000000"/>
                                            <w:szCs w:val="21"/>
                                        </w:rPr>
                                        <w:t xml:space="preserve">    è´¢åŠ¡éƒ¨ä¸»ä»»ï¼š</w:t>
                                        <w:t xml:space="preserve">    è´¢åŠ¡éƒ¨ä¸»ä»»ï¼š${CWBZR2}</w:t>
                                    </w:r>
                                    <w:r>
                                        <w:rPr>
@@ -2474,7 +2474,7 @@
                                            <w:color w:val="000000"/>
                                            <w:szCs w:val="21"/>
                                        </w:rPr>
                                        <w:t xml:space="preserve">   è´¢åŠ¡å®¡æ ¸ï¼š   </w:t>
                                        <w:t xml:space="preserve">   è´¢åŠ¡å®¡æ ¸ï¼š${CWSH2}   </w:t>
                                    </w:r>
                                </w:p>
                            </w:tc>