代码提交

liusheng

2024-04-09 4207b9bd1dd2f81eea512a82085c4083be5e6d44

代码提交

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

@@ -183,8 +183,8 @@
    }

    @ApiOperation("获取捐献编号")
    @GetMapping("/donatenumber")
    public AjaxResult getDonateNumber(ServiceDonatebaseinfo serviceDonatebaseinfo) {
    @PostMapping("/donatenumber")
    public AjaxResult getDonateNumber(@RequestBody ServiceDonatebaseinfo serviceDonatebaseinfo) {
        log.info("获取捐献编号：{}", serviceDonatebaseinfo);
        return AjaxResult.success(serviceDonatebaseinfoService.getDonateNumber(serviceDonatebaseinfo));
    }

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

@@ -130,15 +130,16 @@
    @RepeatSubmit
    public AjaxResult add(@RequestBody ServiceDonationwitness serviceDonationwitness) {
        boolean save = serviceDonationwitnessService.save(serviceDonationwitness);
        if (save) {
            //生成“捐献者编号”
            ServiceDonatebaseinfo serviceDonatebaseinfo = serviceDonatebaseinfoService.getById(serviceDonationwitness.getInfoid());
            log.info("serviceDonatebaseinfo的信息为{}", serviceDonatebaseinfo);
            String donorno = serviceDonatebaseinfoService.getDonateNumber(serviceDonatebaseinfo);
            log.info("生成的捐献者编号为:{}", donorno);
            serviceDonatebaseinfo.setDonorno(donorno);
            serviceDonatebaseinfoService.updateById(serviceDonatebaseinfo);
        }
        log.info("新增捐献见证是否成功：{},id为：{},infoId为：{}", save, serviceDonationwitness.getId(), serviceDonationwitness.getInfoid());
//        if (save) {
//            //生成“捐献者编号”
//            ServiceDonatebaseinfo serviceDonatebaseinfo = serviceDonatebaseinfoService.getById(serviceDonationwitness.getInfoid());
//            log.info("serviceDonatebaseinfo的信息为{}", serviceDonatebaseinfo);
//            String donorno = serviceDonatebaseinfoService.getDonateNumber(serviceDonatebaseinfo);
//            log.info("生成的捐献者编号为:{}", donorno);
//            serviceDonatebaseinfo.setDonorno(donorno);
//            serviceDonatebaseinfoService.updateById(serviceDonatebaseinfo);
//        }
        return AjaxResult.success(serviceDonationwitness);
    }

@@ -151,6 +152,8 @@
    @PostMapping("/edit")
    @RepeatSubmit
    public AjaxResult edit(@RequestBody ServiceDonationwitness serviceDonationwitness) {
        log.info("新增捐献见证id为：{},infoId为：{}", serviceDonationwitness.getId(), serviceDonationwitness.getInfoid());

        int last = -1;
        if (StringUtils.isNotEmpty(serviceDonationwitness.getDonorno())) {
            last = serviceDonationwitness.getDonorno().lastIndexOf("*");

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

@@ -75,7 +75,7 @@
    //@PreAuthorize("@ss.hasPermi('project:ethicalreviewopinions:add')")
    @Log(title = "伦理审查专家意见", businessType = BusinessType.INSERT)
    @PostMapping("/add")
    @NotRepeatCommit(key = "param:arg[1]", value = 30000)
//    @NotRepeatCommit(key = "param:arg[1]", value = 30000)
    public AjaxResult add(@RequestBody ServiceEthicalreviewopinions serviceEthicalreviewopinions) {
        boolean save = serviceEthicalreviewopinionsService.save(serviceEthicalreviewopinions);
        return AjaxResult.success(serviceEthicalreviewopinions);
@@ -87,7 +87,7 @@
    //@PreAuthorize("@ss.hasPermi('project:ethicalreviewopinions:edit')")
    @Log(title = "伦理审查专家意见", businessType = BusinessType.UPDATE)
    @PostMapping("/edit")
    @RepeatSubmit
//    @RepeatSubmit
    public AjaxResult edit(@RequestBody ServiceEthicalreviewopinions serviceEthicalreviewopinions) {
        return toAjax(serviceEthicalreviewopinionsService.updateById(serviceEthicalreviewopinions));
    }

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

@@ -178,7 +178,7 @@
        Collections.sort(list, new Comparator<SpFinancialExpensesFundOut>() {
            @Override
            public int compare(SpFinancialExpensesFundOut o1, SpFinancialExpensesFundOut o2) {
                return o1.getCreateTime().compareTo(o2.getCreateTime());
                return o1.getApplyTime().compareTo(o2.getApplyTime());
            }
        });
        return getCustomDataTable(list, pageNum, pageSize);
@@ -585,7 +585,7 @@
    @GetMapping(value = "/downloadLW/{id}")
    public Map downloadInfoLW(@PathVariable("id") Long id) throws IOException {
        Map dataMap = new HashMap();
        getDataLW(dataMap, id);
        String dataLW = getDataLW(dataMap, id);
        String filePath = getClass().getResource("/template/").getPath();
        System.out.println(filePath);
        //设置模本装置方法和路径,FreeMarker支持多种模板装载方法。可以重servlet，classpath，数据库教程装载，
@@ -599,7 +599,11 @@
            e.printStackTrace();
        }
        String newTime = String.valueOf(Calendar.getInstance().getTimeInMillis());

        String name = "专家劳务费发放申请单_" + dataMap.get("XM") + "_" + newTime;
        if (dataLW.equals("4")) {
            name = "办公费用申请单_" + dataMap.get("XM") + "_" + newTime;
        }

        //输出文档路径及名称
        File outFile = new File(RuoYiConfig.getProfile() + "/download/wordtemplate/" + name + ".doc");
@@ -622,7 +626,7 @@
        return map;
    }

    private void getDataLW(Map dataMap, Long id) {
    private String getDataLW(Map dataMap, Long id) {
        ServiceFund serviceFund = serviceFundService.getById(id);
        if (serviceFund == null) {
            throw new ServiceException("下载失败，用户信息出错", HttpStatus.NO_CONTENT);
@@ -754,6 +758,7 @@
        dataMap.put("KSLJ", kslj);
        dataMap.put("SHLJ", shlj);

        return serviceFund.getApplytype();
    }



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

@@ -12,7 +12,10 @@
    </pkg:part>
    <pkg:part pkg:name="/word/document.xml" pkg:contentType="application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml">
        <pkg:xmlData>
            <w:document xmlns:wpc="http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas" xmlns:cx="http://schemas.microsoft.com/office/drawing/2014/chartex" xmlns:cx1="http://schemas.microsoft.com/office/drawing/2015/9/8/chartex" xmlns:cx2="http://schemas.microsoft.com/office/drawing/2015/10/21/chartex" xmlns:cx3="http://schemas.microsoft.com/office/drawing/2016/5/9/chartex" xmlns:cx4="http://schemas.microsoft.com/office/drawing/2016/5/10/chartex" xmlns:cx5="http://schemas.microsoft.com/office/drawing/2016/5/11/chartex" xmlns:cx6="http://schemas.microsoft.com/office/drawing/2016/5/12/chartex" xmlns:cx7="http://schemas.microsoft.com/office/drawing/2016/5/13/chartex" xmlns:cx8="http://schemas.microsoft.com/office/drawing/2016/5/14/chartex" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:aink="http://schemas.microsoft.com/office/drawing/2016/ink" xmlns:am3d="http://schemas.microsoft.com/office/drawing/2017/model3d" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:oel="http://schemas.microsoft.com/office/2019/extlst" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:wp14="http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing" xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:w14="http://schemas.microsoft.com/office/word/2010/wordml" xmlns:w15="http://schemas.microsoft.com/office/word/2012/wordml" xmlns:w16cex="http://schemas.microsoft.com/office/word/2018/wordml/cex" xmlns:w16cid="http://schemas.microsoft.com/office/word/2016/wordml/cid" xmlns:w16="http://schemas.microsoft.com/office/word/2018/wordml" xmlns:w16sdtdh="http://schemas.microsoft.com/office/word/2020/wordml/sdtdatahash" xmlns:w16se="http://schemas.microsoft.com/office/word/2015/wordml/symex" xmlns:wpg="http://schemas.microsoft.com/office/word/2010/wordprocessingGroup" xmlns:wpi="http://schemas.microsoft.com/office/word/2010/wordprocessingInk" xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml" xmlns:wps="http://schemas.microsoft.com/office/word/2010/wordprocessingShape" mc:Ignorable="w14 w15 w16se w16cid w16 w16cex w16sdtdh wp14">
            <w:document xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:o="urn:schemas-microsoft-com:office:office"
                        xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math" xmlns:v="urn:schemas-microsoft-com:vml"
                        xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:w14="http://schemas.microsoft.com/office/word/2010/wordml" xmlns:w15="http://schemas.microsoft.com/office/word/2012/wordml"
                        mc:Ignorable="w14 w15 w16se w16cid w16 w16cex w16sdtdh wp14">
                <w:body>
                    <w:p w14:paraId="2B03D239" w14:textId="77777777" w:rsidR="00D61E43" w:rsidRPr="00D61E43" w:rsidRDefault="00D61E43" w:rsidP="00196045">
                        <w:pPr>
@@ -1693,7 +1696,7 @@
                    </w:p>
                    <w:p w14:paraId="6610F453" w14:textId="77777777" w:rsidR="00196045" w:rsidRDefault="00D61E43" w:rsidP="00196045">
                        <w:pPr>
                            <w:ind w:left="840" w:firstLineChars="200" w:firstLine="420"/>
                            <w:ind w:left="0" w:firstLineChars="200" w:firstLine="420"/>
                        </w:pPr>
                        <w:r w:rsidRPr="00D61E43">
                            <w:rPr>
@@ -1702,7 +1705,7 @@
                            <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 w14:paraId="3379FABB" w14:textId="77777777" w:rsidR="00196045" w:rsidRDefault="00196045">
@@ -2973,7 +2976,10 @@
    </pkg:part>
    <pkg:part pkg:name="/word/footnotes.xml" pkg:contentType="application/vnd.openxmlformats-officedocument.wordprocessingml.footnotes+xml">
        <pkg:xmlData>
            <w:footnotes xmlns:wpc="http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas" xmlns:cx="http://schemas.microsoft.com/office/drawing/2014/chartex" xmlns:cx1="http://schemas.microsoft.com/office/drawing/2015/9/8/chartex" xmlns:cx2="http://schemas.microsoft.com/office/drawing/2015/10/21/chartex" xmlns:cx3="http://schemas.microsoft.com/office/drawing/2016/5/9/chartex" xmlns:cx4="http://schemas.microsoft.com/office/drawing/2016/5/10/chartex" xmlns:cx5="http://schemas.microsoft.com/office/drawing/2016/5/11/chartex" xmlns:cx6="http://schemas.microsoft.com/office/drawing/2016/5/12/chartex" xmlns:cx7="http://schemas.microsoft.com/office/drawing/2016/5/13/chartex" xmlns:cx8="http://schemas.microsoft.com/office/drawing/2016/5/14/chartex" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:aink="http://schemas.microsoft.com/office/drawing/2016/ink" xmlns:am3d="http://schemas.microsoft.com/office/drawing/2017/model3d" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:oel="http://schemas.microsoft.com/office/2019/extlst" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:wp14="http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing" xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:w14="http://schemas.microsoft.com/office/word/2010/wordml" xmlns:w15="http://schemas.microsoft.com/office/word/2012/wordml" xmlns:w16cex="http://schemas.microsoft.com/office/word/2018/wordml/cex" xmlns:w16cid="http://schemas.microsoft.com/office/word/2016/wordml/cid" xmlns:w16="http://schemas.microsoft.com/office/word/2018/wordml" xmlns:w16sdtdh="http://schemas.microsoft.com/office/word/2020/wordml/sdtdatahash" xmlns:w16se="http://schemas.microsoft.com/office/word/2015/wordml/symex" xmlns:wpg="http://schemas.microsoft.com/office/word/2010/wordprocessingGroup" xmlns:wpi="http://schemas.microsoft.com/office/word/2010/wordprocessingInk" xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml" xmlns:wps="http://schemas.microsoft.com/office/word/2010/wordprocessingShape" mc:Ignorable="w14 w15 w16se w16cid w16 w16cex w16sdtdh wp14">
            <w:footnotes xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:o="urn:schemas-microsoft-com:office:office"
                         xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math" xmlns:v="urn:schemas-microsoft-com:vml"
                         xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:w14="http://schemas.microsoft.com/office/word/2010/wordml" xmlns:w15="http://schemas.microsoft.com/office/word/2012/wordml"
                         mc:Ignorable="w14 w15 w16se w16cid w16 w16cex w16sdtdh wp14">
                <w:footnote w:type="separator" w:id="-1">
                    <w:p w14:paraId="0DF65365" w14:textId="77777777" w:rsidR="008A0800" w:rsidRDefault="008A0800" w:rsidP="00776A88">
                        <w:r>
@@ -2993,7 +2999,10 @@
    </pkg:part>
    <pkg:part pkg:name="/word/endnotes.xml" pkg:contentType="application/vnd.openxmlformats-officedocument.wordprocessingml.endnotes+xml">
        <pkg:xmlData>
            <w:endnotes xmlns:wpc="http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas" xmlns:cx="http://schemas.microsoft.com/office/drawing/2014/chartex" xmlns:cx1="http://schemas.microsoft.com/office/drawing/2015/9/8/chartex" xmlns:cx2="http://schemas.microsoft.com/office/drawing/2015/10/21/chartex" xmlns:cx3="http://schemas.microsoft.com/office/drawing/2016/5/9/chartex" xmlns:cx4="http://schemas.microsoft.com/office/drawing/2016/5/10/chartex" xmlns:cx5="http://schemas.microsoft.com/office/drawing/2016/5/11/chartex" xmlns:cx6="http://schemas.microsoft.com/office/drawing/2016/5/12/chartex" xmlns:cx7="http://schemas.microsoft.com/office/drawing/2016/5/13/chartex" xmlns:cx8="http://schemas.microsoft.com/office/drawing/2016/5/14/chartex" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:aink="http://schemas.microsoft.com/office/drawing/2016/ink" xmlns:am3d="http://schemas.microsoft.com/office/drawing/2017/model3d" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:oel="http://schemas.microsoft.com/office/2019/extlst" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:wp14="http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing" xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:w14="http://schemas.microsoft.com/office/word/2010/wordml" xmlns:w15="http://schemas.microsoft.com/office/word/2012/wordml" xmlns:w16cex="http://schemas.microsoft.com/office/word/2018/wordml/cex" xmlns:w16cid="http://schemas.microsoft.com/office/word/2016/wordml/cid" xmlns:w16="http://schemas.microsoft.com/office/word/2018/wordml" xmlns:w16sdtdh="http://schemas.microsoft.com/office/word/2020/wordml/sdtdatahash" xmlns:w16se="http://schemas.microsoft.com/office/word/2015/wordml/symex" xmlns:wpg="http://schemas.microsoft.com/office/word/2010/wordprocessingGroup" xmlns:wpi="http://schemas.microsoft.com/office/word/2010/wordprocessingInk" xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml" xmlns:wps="http://schemas.microsoft.com/office/word/2010/wordprocessingShape" mc:Ignorable="w14 w15 w16se w16cid w16 w16cex w16sdtdh wp14">
            <w:endnotes xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:o="urn:schemas-microsoft-com:office:office"
                        xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math" xmlns:v="urn:schemas-microsoft-com:vml"
                        xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:w14="http://schemas.microsoft.com/office/word/2010/wordml" xmlns:w15="http://schemas.microsoft.com/office/word/2012/wordml"
                        mc:Ignorable="w14 w15 w16se w16cid w16 w16cex w16sdtdh wp14">
                <w:endnote w:type="separator" w:id="-1">
                    <w:p w14:paraId="3B7E58DE" w14:textId="77777777" w:rsidR="008A0800" w:rsidRDefault="008A0800" w:rsidP="00776A88">
                        <w:r>
@@ -3275,7 +3284,10 @@
    </pkg:part>
    <pkg:part pkg:name="/word/settings.xml" pkg:contentType="application/vnd.openxmlformats-officedocument.wordprocessingml.settings+xml">
        <pkg:xmlData>
            <w:settings xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:w14="http://schemas.microsoft.com/office/word/2010/wordml" xmlns:w15="http://schemas.microsoft.com/office/word/2012/wordml" xmlns:w16cex="http://schemas.microsoft.com/office/word/2018/wordml/cex" xmlns:w16cid="http://schemas.microsoft.com/office/word/2016/wordml/cid" xmlns:w16="http://schemas.microsoft.com/office/word/2018/wordml" xmlns:w16sdtdh="http://schemas.microsoft.com/office/word/2020/wordml/sdtdatahash" xmlns:w16se="http://schemas.microsoft.com/office/word/2015/wordml/symex" xmlns:sl="http://schemas.openxmlformats.org/schemaLibrary/2006/main" mc:Ignorable="w14 w15 w16se w16cid w16 w16cex w16sdtdh">
            <w:settings xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:o="urn:schemas-microsoft-com:office:office"
                        xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math" xmlns:v="urn:schemas-microsoft-com:vml"
                        xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:w14="http://schemas.microsoft.com/office/word/2010/wordml" xmlns:w15="http://schemas.microsoft.com/office/word/2012/wordml"
                        mc:Ignorable="w14 w15 w16se w16cid w16 w16cex w16sdtdh">
                <w:zoom w:percent="90"/>
                <w:bordersDoNotSurroundHeader/>
                <w:bordersDoNotSurroundFooter/>
@@ -3372,7 +3384,8 @@
    </pkg:part>
    <pkg:part pkg:name="/word/styles.xml" pkg:contentType="application/vnd.openxmlformats-officedocument.wordprocessingml.styles+xml">
        <pkg:xmlData>
            <w:styles xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:w14="http://schemas.microsoft.com/office/word/2010/wordml" xmlns:w15="http://schemas.microsoft.com/office/word/2012/wordml" xmlns:w16cex="http://schemas.microsoft.com/office/word/2018/wordml/cex" xmlns:w16cid="http://schemas.microsoft.com/office/word/2016/wordml/cid" xmlns:w16="http://schemas.microsoft.com/office/word/2018/wordml" xmlns:w16sdtdh="http://schemas.microsoft.com/office/word/2020/wordml/sdtdatahash" xmlns:w16se="http://schemas.microsoft.com/office/word/2015/wordml/symex" mc:Ignorable="w14 w15 w16se w16cid w16 w16cex w16sdtdh">
            <w:styles xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:w14="http://schemas.microsoft.com/office/word/2010/wordml" xmlns:w15="http://schemas.microsoft.com/office/word/2012/wordml"
                      mc:Ignorable="w14 w15 w16se w16cid w16 w16cex w16sdtdh">
                <w:docDefaults>
                    <w:rPrDefault>
                        <w:rPr>
@@ -3884,7 +3897,8 @@
    </pkg:part>
    <pkg:part pkg:name="/word/webSettings.xml" pkg:contentType="application/vnd.openxmlformats-officedocument.wordprocessingml.webSettings+xml">
        <pkg:xmlData>
            <w:webSettings xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:w14="http://schemas.microsoft.com/office/word/2010/wordml" xmlns:w15="http://schemas.microsoft.com/office/word/2012/wordml" xmlns:w16cex="http://schemas.microsoft.com/office/word/2018/wordml/cex" xmlns:w16cid="http://schemas.microsoft.com/office/word/2016/wordml/cid" xmlns:w16="http://schemas.microsoft.com/office/word/2018/wordml" xmlns:w16sdtdh="http://schemas.microsoft.com/office/word/2020/wordml/sdtdatahash" xmlns:w16se="http://schemas.microsoft.com/office/word/2015/wordml/symex" mc:Ignorable="w14 w15 w16se w16cid w16 w16cex w16sdtdh">
            <w:webSettings xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:w14="http://schemas.microsoft.com/office/word/2010/wordml" xmlns:w15="http://schemas.microsoft.com/office/word/2012/wordml"
                           mc:Ignorable="w14 w15 w16se w16cid w16 w16cex w16sdtdh">
                <w:divs>
                    <w:div w:id="776869707">
                        <w:bodyDiv w:val="1"/>
@@ -3921,7 +3935,8 @@
    </pkg:part>
    <pkg:part pkg:name="/word/fontTable.xml" pkg:contentType="application/vnd.openxmlformats-officedocument.wordprocessingml.fontTable+xml">
        <pkg:xmlData>
            <w:fonts xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:w14="http://schemas.microsoft.com/office/word/2010/wordml" xmlns:w15="http://schemas.microsoft.com/office/word/2012/wordml" xmlns:w16cex="http://schemas.microsoft.com/office/word/2018/wordml/cex" xmlns:w16cid="http://schemas.microsoft.com/office/word/2016/wordml/cid" xmlns:w16="http://schemas.microsoft.com/office/word/2018/wordml" xmlns:w16sdtdh="http://schemas.microsoft.com/office/word/2020/wordml/sdtdatahash" xmlns:w16se="http://schemas.microsoft.com/office/word/2015/wordml/symex" mc:Ignorable="w14 w15 w16se w16cid w16 w16cex w16sdtdh">
            <w:fonts xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:w14="http://schemas.microsoft.com/office/word/2010/wordml" xmlns:w15="http://schemas.microsoft.com/office/word/2012/wordml"
                     mc:Ignorable="w14 w15 w16se w16cid w16 w16cex w16sdtdh">
                <w:font w:name="等线">
                    <w:altName w:val="DengXian"/>
                    <w:panose1 w:val="02010600030101010101"/>
@@ -3964,7 +3979,8 @@
    </pkg:part>
    <pkg:part pkg:name="/docProps/core.xml" pkg:contentType="application/vnd.openxmlformats-package.core-properties+xml" pkg:padding="256">
        <pkg:xmlData>
            <cp:coreProperties xmlns:cp="http://schemas.openxmlformats.org/package/2006/metadata/core-properties" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dcterms="http://purl.org/dc/terms/" xmlns:dcmitype="http://purl.org/dc/dcmitype/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
            <cp:coreProperties xmlns:cp="http://schemas.openxmlformats.org/package/2006/metadata/core-properties" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dcterms="http://purl.org/dc/terms/"
                               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
                <dc:title/>
                <dc:subject/>
                <dc:creator>hzsz</dc:creator>
@@ -3979,7 +3995,7 @@
    </pkg:part>
    <pkg:part pkg:name="/docProps/app.xml" pkg:contentType="application/vnd.openxmlformats-officedocument.extended-properties+xml" pkg:padding="256">
        <pkg:xmlData>
            <Properties xmlns="http://schemas.openxmlformats.org/officeDocument/2006/extended-properties" xmlns:vt="http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes">
            <Properties xmlns="http://schemas.openxmlformats.org/officeDocument/2006/extended-properties">
                <Template>Normal.dotm</Template>
                <TotalTime>35</TotalTime>
                <Pages>2</Pages>

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

@@ -1656,7 +1656,7 @@
                    </w:p>
                    <w:p w:rsidR="00196045" w:rsidRDefault="00D61E43" w:rsidP="00196045">
                        <w:pPr>
                            <w:ind w:left="840" w:firstLineChars="200" w:firstLine="420"/>
                            <w:ind w:left="0" w:firstLineChars="200" w:firstLine="420"/>
                        </w:pPr>
                        <w:r w:rsidRPr="00D61E43">
                            <w:rPr>
@@ -1665,7 +1665,7 @@
                            <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">

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

@@ -1711,7 +1711,7 @@
                    </w:p>
                    <w:p w:rsidR="00196045" w:rsidRDefault="00D61E43" w:rsidP="00196045">
                        <w:pPr>
                            <w:ind w:left="840" w:firstLineChars="200" w:firstLine="420"/>
                            <w:ind w:left="0" w:firstLineChars="200" w:firstLine="420"/>
                        </w:pPr>
                        <w:r w:rsidRPr="00D61E43">
                            <w:rPr>
@@ -1720,7 +1720,7 @@
                            <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">

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

@@ -1060,7 +1060,7 @@
                    <w:p w14:paraId="3205BD07" w14:textId="77777777" w:rsidR="00196045" w:rsidRDefault="00D61E43"
                         w:rsidP="00196045">
                        <w:pPr>
                            <w:ind w:left="840" w:firstLineChars="200" w:firstLine="420"/>
                            <w:ind w:left="0" w:firstLineChars="200" w:firstLine="420"/>
                        </w:pPr>
                        <w:r w:rsidRPr="00D61E43">
                            <w:rPr>
@@ -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">

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

@@ -1400,7 +1400,7 @@
                    </w:p>
                    <w:p w:rsidR="00196045" w:rsidRDefault="00D61E43" w:rsidP="00196045">
                        <w:pPr>
                            <w:ind w:left="840" w:firstLineChars="200" w:firstLine="420"/>
                            <w:ind w:left="0" w:firstLineChars="200" w:firstLine="420"/>
                        </w:pPr>
                        <w:r w:rsidRPr="00D61E43">
                            <w:rPr>
@@ -1409,7 +1409,7 @@
                            <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">

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

@@ -1746,7 +1746,7 @@
                    </w:p>
                    <w:p w:rsidR="00196045" w:rsidRDefault="00D61E43" w:rsidP="00196045">
                        <w:pPr>
                            <w:ind w:left="840" w:firstLineChars="200" w:firstLine="420"/>
                            <w:ind w:left="0" w:firstLineChars="200" w:firstLine="420"/>
                        </w:pPr>
                        <w:r w:rsidRPr="00D61E43">
                            <w:rPr>
@@ -1755,7 +1755,7 @@
                            <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">

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

@@ -1621,7 +1621,7 @@
                            <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">

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

@@ -15,6 +15,7 @@
import com.ruoyi.project.mapper.*;
import com.ruoyi.project.service.*;
import com.ruoyi.system.mapper.SysUserMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -31,6 +32,7 @@
 * @author ruoyi
 * @date 2021-11-13
 */
@Slf4j
@Service
public class ServiceDonatebaseinfoServiceImpl extends ServiceImpl<ServiceDonatebaseinfoMapper, ServiceDonatebaseinfo> implements IServiceDonatebaseinfoService {

@@ -273,6 +275,7 @@

    @Override
    public Map<String, Object> getWorkFlow(Long id) {
        log.info("getWorkFlow的入参ID为：{}", id);
        //用于返回
        Map<String, Object> map = new ConcurrentHashMap<>();

@@ -302,14 +305,17 @@
        }
        donatebaseinfo.put("process", "");
        //封装serviceDonateorgan潜在捐献返回数据
        log.info("检查封装潜在捐献返回数据donatebaseinfo的值为：{}", donatebaseinfo);
        map.put("donatebaseinfo", donatebaseinfo);

        //封装医学评估
        log.info("检查serviceDonatebaseinfo.getWorkflow()的值为：{}", serviceDonatebaseinfo.getWorkflow());
        Map<String, String> medicalevaluation = new HashMap<>();
        if (serviceDonatebaseinfo.getWorkflow() >= 1) {
            ServiceMedicalevaluation serviceMedicalevaluation = new ServiceMedicalevaluation();
            serviceMedicalevaluation.setInfoid(id);
            List<ServiceMedicalevaluation> serviceMedicalevaluations = serviceMedicalevaluationService.queryList(serviceMedicalevaluation);
            log.info("检查serviceMedicalevaluationService的值为：{}", serviceMedicalevaluations.size());
            if (!CollectionUtils.isEmpty(serviceMedicalevaluations)) {
                medicalevaluation.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceMedicalevaluations.get(0).getCreateTime()));
                medicalevaluation.put("updatetime", serviceMedicalevaluations.get(0).getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceMedicalevaluations.get(0).getUpdateTime()) : null);
@@ -332,6 +338,7 @@
            }
        }
        //封装医学评估返回数据
        log.info("检查封装医学评估返回数据medicalevaluation的值为：{}", medicalevaluation);
        map.put("medicalevaluation", medicalevaluation);

        //封装捐献确认
@@ -340,6 +347,7 @@
            ServiceRelativesconfirmation serviceRelativesconfirmation = new ServiceRelativesconfirmation();
            serviceRelativesconfirmation.setInfoid(id);
            List<ServiceRelativesconfirmation> serviceRelativesconfirmations = serviceRelativesconfirmationService.queryList(serviceRelativesconfirmation);
            log.info("检查serviceRelativesconfirmations的值为：{}", serviceRelativesconfirmations.size());
            if (!CollectionUtils.isEmpty(serviceRelativesconfirmations)) {
                relativesconfirmation.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceRelativesconfirmations.get(0).getCreateTime()));
                relativesconfirmation.put("updatetime", serviceRelativesconfirmations.get(0).getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceRelativesconfirmations.get(0).getUpdateTime()) : "");
@@ -362,6 +370,7 @@
            }
        }
        //封装捐献确认返回数据
        log.info("检查封装捐献确认返回数据relativesconfirmation的值为：{}", relativesconfirmation);
        map.put("relativesconfirmation", relativesconfirmation);


@@ -371,6 +380,7 @@
            ServiceEthicalreviewopinions serviceDonateflowchart = new ServiceEthicalreviewopinions();
            serviceDonateflowchart.setInfoid(id);
            List<ServiceEthicalreviewopinions> serviceEthicalreviewopinionsList = iServiceEthicalreviewopinionsService.queryList(serviceDonateflowchart);
            log.info("检查serviceEthicalreviewopinionsList的值为：{}", serviceEthicalreviewopinionsList.size());
            if (!CollectionUtils.isEmpty(serviceEthicalreviewopinionsList)) {
                donateflowcharts.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceEthicalreviewopinionsList.get(0).getCreateTime()));
                donateflowcharts.put("updatetime", serviceEthicalreviewopinionsList.get(0).getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceEthicalreviewopinionsList.get(0).getUpdateTime()) : "");
@@ -394,6 +404,7 @@
            }
        }
        //封装伦理审查返回数据
        log.info("检查封装伦理审查返回数据donateflowcharts的值为：{}", donateflowcharts);
        map.put("donateflowcharts", donateflowcharts);

        //封装器官分配
@@ -402,6 +413,7 @@
            ServiceDonateorgan serviceDonateorgan = new ServiceDonateorgan();
            serviceDonateorgan.setInfoid(id);
            List<ServiceDonateorgan> serviceDonateorgans = serviceDonateorganService.queryList(serviceDonateorgan);
            log.info("检查serviceDonateorgans的值为：{}", serviceDonateorgans.size());
            if (!CollectionUtils.isEmpty(serviceDonateorgans)) {
                donateorgansService.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonateorgans.get(0).getCreateTime()));
                donateorgansService.put("updatetime", serviceDonateorgans.get(0).getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonateorgans.get(0).getUpdateTime()) : "");
@@ -424,6 +436,7 @@
                donateorgansService.put("process", "");
            }
        }
        log.info("检查封装器官分配返回数据donateorgansService的值为：{}", donateorgansService);
        //封装器官分配返回数据
        map.put("donateorgansService", donateorgansService);

@@ -431,6 +444,7 @@
        Map<String, String> donationwitness = new HashMap<>();
        if (serviceDonatebaseinfo.getWorkflow() >= 5) {
            ServiceDonationwitness serviceDonationwitness = serviceDonationwitnessService.getByInfoId(id);
            log.info("检查serviceDonationwitness的值为：{}", serviceDonationwitness);
            if (!ObjectUtils.isEmpty(serviceDonationwitness)) {
                donationwitness.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonationwitness.getCreateTime()));
                donationwitness.put("updatetime", serviceDonationwitness.getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonationwitness.getUpdateTime()) : "");
@@ -453,6 +467,7 @@
                donationwitness.put("process", "");
            }
        }
        log.info("检查封装获取见证返回数据donationwitness的值为：{}", donationwitness);
        //封装获取见证返回数据
        map.put("donationwitness", donationwitness);

@@ -462,6 +477,7 @@
            ServiceDonatecompletioninfo serviceDonatecompletioninfo = new ServiceDonatecompletioninfo();
            serviceDonatecompletioninfo.setInfoid(id);
            List<ServiceDonatecompletioninfo> serviceDonatecompletioninfos = serviceDonatecompletioninfoService.queryList(serviceDonatecompletioninfo);
            log.info("检查serviceDonatecompletioninfos的值为：{}", serviceDonatecompletioninfos);
            if (!CollectionUtils.isEmpty(serviceDonatecompletioninfos)) {
                donatecompletioninfo.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonatecompletioninfos.get(0).getCreateTime()));
                donatecompletioninfo.put("updatetime", serviceDonatecompletioninfos.get(0).getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonatecompletioninfos.get(0).getUpdateTime()) : "");
@@ -484,6 +500,7 @@
                donatecompletioninfo.put("process", "");
            }
        }
        log.info("检查封装完成登记返回数据donatecompletioninfo的值为：{}", donatecompletioninfo);
        //封装完成登记返回数据
        map.put("donatecompletioninfo", donatecompletioninfo);