From 4207b9bd1dd2f81eea512a82085c4083be5e6d44 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 09 四月 2024 17:33:21 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/resources/template/专家劳务费发放申请单.ftl | 4 +-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceEthicalreviewopinionsController.java | 4 +-
ruoyi-admin/src/main/resources/template/办公费用申请单.ftl | 4 +-
ruoyi-admin/src/main/resources/template/医学成本费用申请单.ftl | 4 +-
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java | 17 ++++++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoController.java | 4 +-
ruoyi-admin/src/main/resources/template/专家劳务费发放申请单(1).ftl | 38 +++++++++++++-----
ruoyi-admin/src/main/resources/template/差旅费报销申请单.ftl | 4 +-
ruoyi-admin/src/main/resources/template/费用报销单.ftl | 2
ruoyi-admin/src/main/resources/template/伦理专家劳务费发放申请单.ftl | 4 +-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java | 11 ++++-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessController.java | 21 ++++++----
12 files changed, 79 insertions(+), 38 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoController.java
index f2ca5ea..c6b55d2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoController.java
+++ b/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));
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessController.java
index 63a95a0..212a970 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessController.java
+++ b/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("*");
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceEthicalreviewopinionsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceEthicalreviewopinionsController.java
index c2e4a72..486783a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceEthicalreviewopinionsController.java
+++ b/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));
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java
index dd3e69b..3476b1a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java
+++ b/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锛宑lasspath锛屾暟鎹簱鏁欑▼瑁呰浇锛�
@@ -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();
}
diff --git "a/ruoyi-admin/src/main/resources/template/\344\270\223\345\256\266\345\212\263\345\212\241\350\264\271\345\217\221\346\224\276\347\224\263\350\257\267\345\215\225\0501\051.ftl" "b/ruoyi-admin/src/main/resources/template/\344\270\223\345\256\266\345\212\263\345\212\241\350\264\271\345\217\221\346\224\276\347\224\263\350\257\267\345\215\225\0501\051.ftl"
index 484ed59..c33c4d9 100644
--- "a/ruoyi-admin/src/main/resources/template/\344\270\223\345\256\266\345\212\263\345\212\241\350\264\271\345\217\221\346\224\276\347\224\263\350\257\267\345\215\225\0501\051.ftl"
+++ "b/ruoyi-admin/src/main/resources/template/\344\270\223\345\256\266\345\212\263\345\212\241\350\264\271\345\217\221\346\224\276\347\224\263\350\257\267\345\215\225\0501\051.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>
diff --git "a/ruoyi-admin/src/main/resources/template/\344\270\223\345\256\266\345\212\263\345\212\241\350\264\271\345\217\221\346\224\276\347\224\263\350\257\267\345\215\225.ftl" "b/ruoyi-admin/src/main/resources/template/\344\270\223\345\256\266\345\212\263\345\212\241\350\264\271\345\217\221\346\224\276\347\224\263\350\257\267\345\215\225.ftl"
index b850850..a8cdbdb 100644
--- "a/ruoyi-admin/src/main/resources/template/\344\270\223\345\256\266\345\212\263\345\212\241\350\264\271\345\217\221\346\224\276\347\224\263\350\257\267\345\215\225.ftl"
+++ "b/ruoyi-admin/src/main/resources/template/\344\270\223\345\256\266\345\212\263\345\212\241\350\264\271\345\217\221\346\224\276\347\224\263\350\257\267\345\215\225.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">
diff --git "a/ruoyi-admin/src/main/resources/template/\344\274\246\347\220\206\344\270\223\345\256\266\345\212\263\345\212\241\350\264\271\345\217\221\346\224\276\347\224\263\350\257\267\345\215\225.ftl" "b/ruoyi-admin/src/main/resources/template/\344\274\246\347\220\206\344\270\223\345\256\266\345\212\263\345\212\241\350\264\271\345\217\221\346\224\276\347\224\263\350\257\267\345\215\225.ftl"
index 9644f9d..7458f66 100644
--- "a/ruoyi-admin/src/main/resources/template/\344\274\246\347\220\206\344\270\223\345\256\266\345\212\263\345\212\241\350\264\271\345\217\221\346\224\276\347\224\263\350\257\267\345\215\225.ftl"
+++ "b/ruoyi-admin/src/main/resources/template/\344\274\246\347\220\206\344\270\223\345\256\266\345\212\263\345\212\241\350\264\271\345\217\221\346\224\276\347\224\263\350\257\267\345\215\225.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">
diff --git "a/ruoyi-admin/src/main/resources/template/\345\212\236\345\205\254\350\264\271\347\224\250\347\224\263\350\257\267\345\215\225.ftl" "b/ruoyi-admin/src/main/resources/template/\345\212\236\345\205\254\350\264\271\347\224\250\347\224\263\350\257\267\345\215\225.ftl"
index b4b8027..eeec01a 100644
--- "a/ruoyi-admin/src/main/resources/template/\345\212\236\345\205\254\350\264\271\347\224\250\347\224\263\350\257\267\345\215\225.ftl"
+++ "b/ruoyi-admin/src/main/resources/template/\345\212\236\345\205\254\350\264\271\347\224\250\347\224\263\350\257\267\345\215\225.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">
diff --git "a/ruoyi-admin/src/main/resources/template/\345\214\273\345\255\246\346\210\220\346\234\254\350\264\271\347\224\250\347\224\263\350\257\267\345\215\225.ftl" "b/ruoyi-admin/src/main/resources/template/\345\214\273\345\255\246\346\210\220\346\234\254\350\264\271\347\224\250\347\224\263\350\257\267\345\215\225.ftl"
index 77353d1..5a57ca0 100644
--- "a/ruoyi-admin/src/main/resources/template/\345\214\273\345\255\246\346\210\220\346\234\254\350\264\271\347\224\250\347\224\263\350\257\267\345\215\225.ftl"
+++ "b/ruoyi-admin/src/main/resources/template/\345\214\273\345\255\246\346\210\220\346\234\254\350\264\271\347\224\250\347\224\263\350\257\267\345\215\225.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">
diff --git "a/ruoyi-admin/src/main/resources/template/\345\267\256\346\227\205\350\264\271\346\212\245\351\224\200\347\224\263\350\257\267\345\215\225.ftl" "b/ruoyi-admin/src/main/resources/template/\345\267\256\346\227\205\350\264\271\346\212\245\351\224\200\347\224\263\350\257\267\345\215\225.ftl"
index 196e41e..fc7bf9d 100644
--- "a/ruoyi-admin/src/main/resources/template/\345\267\256\346\227\205\350\264\271\346\212\245\351\224\200\347\224\263\350\257\267\345\215\225.ftl"
+++ "b/ruoyi-admin/src/main/resources/template/\345\267\256\346\227\205\350\264\271\346\212\245\351\224\200\347\224\263\350\257\267\345\215\225.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">
diff --git "a/ruoyi-admin/src/main/resources/template/\350\264\271\347\224\250\346\212\245\351\224\200\345\215\225.ftl" "b/ruoyi-admin/src/main/resources/template/\350\264\271\347\224\250\346\212\245\351\224\200\345\215\225.ftl"
index 2601402..6d39fef 100644
--- "a/ruoyi-admin/src/main/resources/template/\350\264\271\347\224\250\346\212\245\351\224\200\345\215\225.ftl"
+++ "b/ruoyi-admin/src/main/resources/template/\350\264\271\347\224\250\346\212\245\351\224\200\345\215\225.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">
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java
index 54bcc4e..f0575f1 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java
+++ b/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鐨勫叆鍙侷D涓猴細{}", id);
//鐢ㄤ簬杩斿洖
Map<String, Object> map = new ConcurrentHashMap<>();
@@ -302,14 +305,17 @@
}
donatebaseinfo.put("process", "");
//灏佽serviceDonateorgan娼滃湪鎹愮尞杩斿洖鏁版嵁
+ log.info("妫�鏌ュ皝瑁呮綔鍦ㄦ崘鐚繑鍥炴暟鎹甦onatebaseinfo鐨勫�间负锛歿}", donatebaseinfo);
map.put("donatebaseinfo", donatebaseinfo);
//灏佽鍖诲璇勪及
+ log.info("妫�鏌erviceDonatebaseinfo.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("妫�鏌erviceMedicalevaluationService鐨勫�间负锛歿}", 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("妫�鏌ュ皝瑁呭尰瀛﹁瘎浼拌繑鍥炴暟鎹甿edicalevaluation鐨勫�间负锛歿}", medicalevaluation);
map.put("medicalevaluation", medicalevaluation);
//灏佽鎹愮尞纭
@@ -340,6 +347,7 @@
ServiceRelativesconfirmation serviceRelativesconfirmation = new ServiceRelativesconfirmation();
serviceRelativesconfirmation.setInfoid(id);
List<ServiceRelativesconfirmation> serviceRelativesconfirmations = serviceRelativesconfirmationService.queryList(serviceRelativesconfirmation);
+ log.info("妫�鏌erviceRelativesconfirmations鐨勫�间负锛歿}", 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("妫�鏌ュ皝瑁呮崘鐚‘璁よ繑鍥炴暟鎹畆elativesconfirmation鐨勫�间负锛歿}", relativesconfirmation);
map.put("relativesconfirmation", relativesconfirmation);
@@ -371,6 +380,7 @@
ServiceEthicalreviewopinions serviceDonateflowchart = new ServiceEthicalreviewopinions();
serviceDonateflowchart.setInfoid(id);
List<ServiceEthicalreviewopinions> serviceEthicalreviewopinionsList = iServiceEthicalreviewopinionsService.queryList(serviceDonateflowchart);
+ log.info("妫�鏌erviceEthicalreviewopinionsList鐨勫�间负锛歿}", 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("妫�鏌ュ皝瑁呬鸡鐞嗗鏌ヨ繑鍥炴暟鎹甦onateflowcharts鐨勫�间负锛歿}", donateflowcharts);
map.put("donateflowcharts", donateflowcharts);
//灏佽鍣ㄥ畼鍒嗛厤
@@ -402,6 +413,7 @@
ServiceDonateorgan serviceDonateorgan = new ServiceDonateorgan();
serviceDonateorgan.setInfoid(id);
List<ServiceDonateorgan> serviceDonateorgans = serviceDonateorganService.queryList(serviceDonateorgan);
+ log.info("妫�鏌erviceDonateorgans鐨勫�间负锛歿}", 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("妫�鏌ュ皝瑁呭櫒瀹樺垎閰嶈繑鍥炴暟鎹甦onateorgansService鐨勫�间负锛歿}", 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("妫�鏌erviceDonationwitness鐨勫�间负锛歿}", 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("妫�鏌ュ皝瑁呰幏鍙栬璇佽繑鍥炴暟鎹甦onationwitness鐨勫�间负锛歿}", donationwitness);
//灏佽鑾峰彇瑙佽瘉杩斿洖鏁版嵁
map.put("donationwitness", donationwitness);
@@ -462,6 +477,7 @@
ServiceDonatecompletioninfo serviceDonatecompletioninfo = new ServiceDonatecompletioninfo();
serviceDonatecompletioninfo.setInfoid(id);
List<ServiceDonatecompletioninfo> serviceDonatecompletioninfos = serviceDonatecompletioninfoService.queryList(serviceDonatecompletioninfo);
+ log.info("妫�鏌erviceDonatecompletioninfos鐨勫�间负锛歿}", 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("妫�鏌ュ皝瑁呭畬鎴愮櫥璁拌繑鍥炴暟鎹甦onatecompletioninfo鐨勫�间负锛歿}", donatecompletioninfo);
//灏佽瀹屾垚鐧昏杩斿洖鏁版嵁
map.put("donatecompletioninfo", donatecompletioninfo);
--
Gitblit v1.9.3