From e91d1f0251d30dc3c59b38d5318266357a64c12c Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 20 九月 2023 09:52:40 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java | 8
ruoyi-admin/src/main/resources/template/差旅费报销申请单.ftl | 44 ++++
ruoyi-admin/src/main/resources/template/伦理专家劳务费发放申请单.ftl | 44 ++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java | 28 +-
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java | 77 +++++---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementdetailSharedServiceImpl.java | 3
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementSharedServiceImpl.java | 5
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java | 124 +++++++++++++
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFund.java | 2
ruoyi-admin/src/main/resources/template/办公费用申请单.ftl | 44 ++++
ruoyi-admin/src/main/resources/template/医学成本费用申请单.ftl | 53 +++++
ruoyi-admin/src/main/resources/template/专家劳务费发放申请单(1).ftl | 44 ++++
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java | 13 +
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundSharedServiceImpl.java | 3
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailSharedServiceImpl.java | 3
15 files changed, 438 insertions(+), 57 deletions(-)
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 6f79bf9..493efff 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
@@ -491,7 +491,7 @@
Integer CheckFlag = 0;
Integer RecordStatus = serviceFund.getRecordstatus();
- Integer FlowLevel = serviceFund.getFlowlevel();
+ Integer FlowLevel = serviceFund.getFlowlevel().intValue();
Integer OriginalFlowLevel = FlowLevel;
if (checkFundVO.getFlowconclusion() == 1) {
CheckFlag = 1;
@@ -523,7 +523,7 @@
}
serviceFund.setRecordstatus(RecordStatus);
- serviceFund.setFlowlevel(FlowLevel);
+ serviceFund.setFlowlevel(FlowLevel.longValue());
// serviceFund.setBackflowlevel(serviceFund.getFlowlevel());
ServiceFundflow serviceFundflow = new ServiceFundflow();
@@ -543,7 +543,7 @@
serviceFundflowService.save(serviceFundflow);
//001瀹℃壒閫氳繃涔嬪悗锛屽氨闇�瑕佹妸鈥滃姙鍏涓讳换鈥濈殑鍚嶅瓧濉笂
- if (checkFundVO.getFlowconclusion() == 1 && user.getUserId().equals("001")) {
+ if (checkFundVO.getFlowconclusion() == 1 && user.getUserName().equals("001")) {
serviceFund.setOfficedirector(user.getNickName());
}
serviceFundService.updateById(serviceFund);
@@ -614,17 +614,17 @@
if (!postids.contains(2)) {
serviceFund.setRecordstatus(2);
if (serviceFund.getBackflowlevel() != null) {
- serviceFund.setFlowlevel(serviceFund.getBackflowlevel());
+ serviceFund.setFlowlevel(serviceFund.getBackflowlevel().longValue());
} else {
serviceFund.setBackflowlevel(1);
- serviceFund.setFlowlevel(1);
+ serviceFund.setFlowlevel(1L);
}
} else {
serviceFund.setRecordstatus(0);
if (serviceFund.getBackflowlevel() != null) {
- serviceFund.setFlowlevel(serviceFund.getBackflowlevel());
+ serviceFund.setFlowlevel(serviceFund.getBackflowlevel().longValue());
} else {
- serviceFund.setFlowlevel(0);
+ serviceFund.setFlowlevel(0L);
serviceFund.setBackflowlevel(0);
}
@@ -705,6 +705,7 @@
String time = date.substring(0, 10);
dataMap.put("XZBH", serviceFund.getBh() == null ? "" : serviceFund.getBh());
+ dataMap.put("ZB", serviceFund.getDeptmentname() == null ? "" : serviceFund.getDeptmentname());
dataMap.put("TBYYMMDD", time);
dataMap.put("BXDFJ", serviceFund.getAttachcount() == 0 ? " " : serviceFund.getAttachcount());
dataMap.put("JXZXM", serviceFund.getDonorname() == null ? "" : serviceFund.getDonorname());
@@ -1086,6 +1087,7 @@
List<Map<String, Object>> newList = new ArrayList<Map<String, Object>>();
int seqno = 0;
+ dataMap.put("ZB", serviceFund.getDeptmentname() == null ? "" : serviceFund.getDeptmentname());
dataMap.put("XZBH", serviceFund.getBh() == null ? "" : serviceFund.getBh());
dataMap.put("TBYYMMDD", time);
dataMap.put("BXDFJ", serviceFund.getAttachcount() == 0 ? " " : serviceFund.getAttachcount());
@@ -1115,18 +1117,18 @@
//濡傛灉鏄尰鐤楁垚鏈紝鍒欐妸閾惰鍗″姞涓婃瘡鏉℃槑缁嗙殑鍚庨潰
if (serviceFund.getApplytype().equals("3")) {
i = i + 1;
- bz += f.getUnitname() == null ? "(" + i + ")" : "(" + i + ")" + f.getUnitname() + "锛�";
+ bz += f.getBeneficiaryname() == null ? "(" + i + ")" : "(" + i + ")" + f.getBeneficiaryname() + "锛�";
+ bz += "閲戦 : " + f.getAmount() + "鍏�" + "锛�";
bz += f.getDepositbank() == null ? "" : f.getDepositbank() + ": ";
- bz += f.getBankcardno() == null ? "" : f.getBankcardno() + "锛�";
- bz += "閲戦 : " + f.getAmount() + "鍏�";
+ bz += f.getBankcardno() == null ? "" : f.getBankcardno();
bz += "<w:br/>";
}
if (serviceFund.getApplytype().equals("4")) {
i = i + 1;
bz += f.getBeneficiaryname() == null ? "(" + i + ")" : "(" + i + ")" + f.getBeneficiaryname() + "锛�";
+ bz += "閲戦 : " + f.getAmount() + "鍏�" + "锛�";
bz += f.getDepositbank() == null ? "" : f.getDepositbank() + ": ";
- bz += f.getBankcardno() == null ? "" : f.getBankcardno() + "锛�";
- bz += "閲戦 : " + f.getAmount() + "鍏�";
+ bz += f.getBankcardno() == null ? "" : f.getBankcardno();
bz += "<w:br/>";
}
@@ -1908,6 +1910,7 @@
String date = formatter.format(dt);
String time = date.substring(0, 10);
+ dataMap.put("ZB", serviceFund.getDeptmentname() == null ? "" : serviceFund.getDeptmentname());
dataMap.put("XZBH", serviceFund.getBh() == null ? "" : serviceFund.getBh());
dataMap.put("TBYYMMDD", time);
dataMap.put("BXDFJ", serviceFund.getAttachcount() == 0 ? " " : serviceFund.getAttachcount());
@@ -1964,7 +1967,6 @@
dataMap.put("SHHJ", String.format("%.2f", sh).toString() + "");
dataMap.put("SQZE", String.format("%.2f", sh).toString() + "");
-
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java
index 0a759dd..b80bee6 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java
@@ -162,13 +162,14 @@
}
//鏍规嵁閲戦绛涢��
if (spFinancialExpensesIn.getMoney() != null) {
- list = list.stream().filter(reimbursementOut -> new BigDecimal(reimbursementOut.getAmountrequested()) == new BigDecimal(spFinancialExpensesIn.getMoney())).collect(Collectors.toList());
+ list = list.stream().filter(reimbursementOut -> new BigDecimal(reimbursementOut.getAmountrequested()).compareTo(new BigDecimal(spFinancialExpensesIn.getMoney())) == 0).collect(Collectors.toList());
+
}
//鏍规嵁鍒涘缓鏃堕棿鎺掑簭
Collections.sort(list, new Comparator<SpFinancialExpensesReimbursementOut>() {
@Override
public int compare(SpFinancialExpensesReimbursementOut o1, SpFinancialExpensesReimbursementOut o2) {
- return o2.getCreateTime().compareTo(o1.getCreateTime());
+ return o1.getCreateTime().compareTo(o2.getCreateTime());
}
});
return getCustomDataTable(list, pageNum, pageSize);
@@ -629,7 +630,7 @@
}
//001瀹℃壒閫氳繃涔嬪悗锛屽氨闇�瑕佹妸鈥滃姙鍏涓讳换鈥濈殑鍚嶅瓧濉笂
- if (checkFundVO.getFlowconclusion() == 1 && user.getUserId().equals("001")) {
+ if (checkFundVO.getFlowconclusion() == 1 && user.getUserName().equals("001")) {
serviceReimbursement.setOfficedirector(user.getNickName());
}
@@ -900,6 +901,7 @@
String date = formatter.format(dt);
String time = date.substring(0, 10);
+ dataMap.put("ZB", rdInfoByItem.get(0).getDeptmentname() == null ? "" : rdInfoByItem.get(0).getDeptmentname());
dataMap.put("XZBH", rdInfoByItem.get(0).getBh() == null ? "" : rdInfoByItem.get(0).getBh());
dataMap.put("TBYYMMDD", time);
dataMap.put("BXDFJ", rdInfoByItem.get(0).getAttachcount() == null ? " " : "" + rdInfoByItem.get(0).getAttachcount());
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 679cab0..484ed59 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"
@@ -155,6 +155,50 @@
<w:szCs w:val="24"/>
</w:rPr>
</w:pPr>
+ <w:r>
+ <w:rPr>
+ <w:rFonts w:ascii="瀹嬩綋" w:eastAsia="瀹嬩綋" w:hAnsi="瀹嬩綋" w:cs="瀹嬩綋"/>
+ <w:b/>
+ <w:bCs/>
+ <w:color w:val="000000"/>
+ <w:kern w:val="0"/>
+ <w:sz w:val="32"/>
+ <w:szCs w:val="32"/>
+ </w:rPr>
+ <w:t xml:space="preserve"> </w:t>
+ </w:r>
+ <w:r w:rsidR="00196045">
+ <w:rPr>
+ <w:rFonts w:ascii="瀹嬩綋" w:eastAsia="瀹嬩綋" w:hAnsi="瀹嬩綋" w:cs="瀹嬩綋" w:hint="eastAsia"/>
+ <w:b/>
+ <w:bCs/>
+ <w:color w:val="000000"/>
+ <w:kern w:val="0"/>
+ <w:sz w:val="22"/>
+ </w:rPr>
+ <w:t xml:space="preserve"> </w:t>
+ </w:r>
+ <w:r w:rsidRPr="00D61E43">
+ <w:rPr>
+ <w:rFonts w:ascii="瀹嬩綋" w:eastAsia="瀹嬩綋" w:hAnsi="瀹嬩綋" w:cs="瀹嬩綋" w:hint="eastAsia"/>
+ <w:b/>
+ <w:bCs/>
+ <w:color w:val="000000"/>
+ <w:kern w:val="0"/>
+ <w:sz w:val="22"/>
+ </w:rPr>
+ <w:t xml:space="preserve"> </w:t>
+ </w:r>
+ <w:r w:rsidRPr="00D61E43">
+ <w:rPr>
+ <w:rFonts w:ascii="瀹嬩綋" w:eastAsia="瀹嬩綋" w:hAnsi="瀹嬩綋" w:cs="瀹嬩綋" w:hint="eastAsia"/>
+ <w:color w:val="000000"/>
+ <w:kern w:val="0"/>
+ <w:sz w:val="28"/>
+ <w:szCs w:val="28"/>
+ </w:rPr>
+ <w:t>缁勫埆锛�${ZB}</w:t>
+ </w:r>
</w:p>
<w:p w14:paraId="02AC4519" w14:textId="77777777" w:rsidR="00D61E43" w:rsidRPr="0039783B" w:rsidRDefault="00D61E43" w:rsidP="00196045">
<w:pPr>
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 3dd61d8..9644f9d 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"
@@ -169,6 +169,50 @@
<w:szCs w:val="28"/>
</w:rPr>
</w:pPr>
+ <w:r>
+ <w:rPr>
+ <w:rFonts w:ascii="瀹嬩綋" w:eastAsia="瀹嬩綋" w:hAnsi="瀹嬩綋" w:cs="瀹嬩綋"/>
+ <w:b/>
+ <w:bCs/>
+ <w:color w:val="000000"/>
+ <w:kern w:val="0"/>
+ <w:sz w:val="32"/>
+ <w:szCs w:val="32"/>
+ </w:rPr>
+ <w:t xml:space="preserve"> </w:t>
+ </w:r>
+ <w:r w:rsidR="00196045">
+ <w:rPr>
+ <w:rFonts w:ascii="瀹嬩綋" w:eastAsia="瀹嬩綋" w:hAnsi="瀹嬩綋" w:cs="瀹嬩綋" w:hint="eastAsia"/>
+ <w:b/>
+ <w:bCs/>
+ <w:color w:val="000000"/>
+ <w:kern w:val="0"/>
+ <w:sz w:val="22"/>
+ </w:rPr>
+ <w:t xml:space="preserve"> </w:t>
+ </w:r>
+ <w:r w:rsidRPr="00D61E43">
+ <w:rPr>
+ <w:rFonts w:ascii="瀹嬩綋" w:eastAsia="瀹嬩綋" w:hAnsi="瀹嬩綋" w:cs="瀹嬩綋" w:hint="eastAsia"/>
+ <w:b/>
+ <w:bCs/>
+ <w:color w:val="000000"/>
+ <w:kern w:val="0"/>
+ <w:sz w:val="22"/>
+ </w:rPr>
+ <w:t xml:space="preserve"> </w:t>
+ </w:r>
+ <w:r w:rsidRPr="00D61E43">
+ <w:rPr>
+ <w:rFonts w:ascii="瀹嬩綋" w:eastAsia="瀹嬩綋" w:hAnsi="瀹嬩綋" w:cs="瀹嬩綋" w:hint="eastAsia"/>
+ <w:color w:val="000000"/>
+ <w:kern w:val="0"/>
+ <w:sz w:val="28"/>
+ <w:szCs w:val="28"/>
+ </w:rPr>
+ <w:t>缁勫埆锛�${ZB}</w:t>
+ </w:r>
</w:p>
<w:p w:rsidR="00D61E43" w:rsidRPr="00D61E43" w:rsidRDefault="00D61E43" w:rsidP="00196045">
<w:pPr>
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 aee91bf..b4b8027 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"
@@ -221,6 +221,50 @@
<w:szCs w:val="28"/>
</w:rPr>
</w:pPr>
+ <w:r>
+ <w:rPr>
+ <w:rFonts w:ascii="瀹嬩綋" w:eastAsia="瀹嬩綋" w:hAnsi="瀹嬩綋" w:cs="瀹嬩綋"/>
+ <w:b/>
+ <w:bCs/>
+ <w:color w:val="000000"/>
+ <w:kern w:val="0"/>
+ <w:sz w:val="32"/>
+ <w:szCs w:val="32"/>
+ </w:rPr>
+ <w:t xml:space="preserve"> </w:t>
+ </w:r>
+ <w:r w:rsidR="00196045">
+ <w:rPr>
+ <w:rFonts w:ascii="瀹嬩綋" w:eastAsia="瀹嬩綋" w:hAnsi="瀹嬩綋" w:cs="瀹嬩綋" w:hint="eastAsia"/>
+ <w:b/>
+ <w:bCs/>
+ <w:color w:val="000000"/>
+ <w:kern w:val="0"/>
+ <w:sz w:val="22"/>
+ </w:rPr>
+ <w:t xml:space="preserve"> </w:t>
+ </w:r>
+ <w:r w:rsidRPr="00D61E43">
+ <w:rPr>
+ <w:rFonts w:ascii="瀹嬩綋" w:eastAsia="瀹嬩綋" w:hAnsi="瀹嬩綋" w:cs="瀹嬩綋" w:hint="eastAsia"/>
+ <w:b/>
+ <w:bCs/>
+ <w:color w:val="000000"/>
+ <w:kern w:val="0"/>
+ <w:sz w:val="22"/>
+ </w:rPr>
+ <w:t xml:space="preserve"> </w:t>
+ </w:r>
+ <w:r w:rsidRPr="00D61E43">
+ <w:rPr>
+ <w:rFonts w:ascii="瀹嬩綋" w:eastAsia="瀹嬩綋" w:hAnsi="瀹嬩綋" w:cs="瀹嬩綋" w:hint="eastAsia"/>
+ <w:color w:val="000000"/>
+ <w:kern w:val="0"/>
+ <w:sz w:val="28"/>
+ <w:szCs w:val="28"/>
+ </w:rPr>
+ <w:t>缁勫埆锛�${ZB}</w:t>
+ </w:r>
</w:p>
<w:p w14:paraId="249E373E" w14:textId="77777777" w:rsidR="00D61E43" w:rsidRPr="00D61E43"
w:rsidRDefault="00D61E43" w:rsidP="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 454a618..77353d1 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"
@@ -153,6 +153,7 @@
</w:rPr>
<w:t>璐圭敤鎶ラ攢鍗�</w:t>
</w:r>
+
</w:p>
<w:p w:rsidR="004A1007" w:rsidRPr="004A1007" w:rsidRDefault="004A1007" w:rsidP="00D61E43">
<w:pPr>
@@ -168,6 +169,50 @@
<w:szCs w:val="28"/>
</w:rPr>
</w:pPr>
+ <w:r>
+ <w:rPr>
+ <w:rFonts w:ascii="瀹嬩綋" w:eastAsia="瀹嬩綋" w:hAnsi="瀹嬩綋" w:cs="瀹嬩綋"/>
+ <w:b/>
+ <w:bCs/>
+ <w:color w:val="000000"/>
+ <w:kern w:val="0"/>
+ <w:sz w:val="32"/>
+ <w:szCs w:val="32"/>
+ </w:rPr>
+ <w:t xml:space="preserve"> </w:t>
+ </w:r>
+ <w:r w:rsidR="00196045">
+ <w:rPr>
+ <w:rFonts w:ascii="瀹嬩綋" w:eastAsia="瀹嬩綋" w:hAnsi="瀹嬩綋" w:cs="瀹嬩綋" w:hint="eastAsia"/>
+ <w:b/>
+ <w:bCs/>
+ <w:color w:val="000000"/>
+ <w:kern w:val="0"/>
+ <w:sz w:val="22"/>
+ </w:rPr>
+ <w:t xml:space="preserve"> </w:t>
+ </w:r>
+ <w:r w:rsidRPr="00D61E43">
+ <w:rPr>
+ <w:rFonts w:ascii="瀹嬩綋" w:eastAsia="瀹嬩綋" w:hAnsi="瀹嬩綋" w:cs="瀹嬩綋" w:hint="eastAsia"/>
+ <w:b/>
+ <w:bCs/>
+ <w:color w:val="000000"/>
+ <w:kern w:val="0"/>
+ <w:sz w:val="22"/>
+ </w:rPr>
+ <w:t xml:space="preserve"> </w:t>
+ </w:r>
+ <w:r w:rsidRPr="00D61E43">
+ <w:rPr>
+ <w:rFonts w:ascii="瀹嬩綋" w:eastAsia="瀹嬩綋" w:hAnsi="瀹嬩綋" w:cs="瀹嬩綋" w:hint="eastAsia"/>
+ <w:color w:val="000000"/>
+ <w:kern w:val="0"/>
+ <w:sz w:val="28"/>
+ <w:szCs w:val="28"/>
+ </w:rPr>
+ <w:t>缁勫埆锛�${ZB}</w:t>
+ </w:r>
</w:p>
<w:p w:rsidR="00D61E43" w:rsidRPr="00D61E43" w:rsidRDefault="00D61E43" w:rsidP="00196045">
<w:pPr>
@@ -1364,7 +1409,7 @@
<w:t>涓績璐熻矗浜猴細</w:t>
</w:r>
<w:r w:rsidRPr="00D61E43">
- <w:t xml:space="preserve"> 璐㈠姟鍓櫌闀匡細 涓氬姟鍓櫌闀匡細 鍔炲叕瀹や富浠伙細 璐㈠姟閮ㄤ富浠伙細 璐㈠姟瀹℃牳锛�</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">
@@ -2739,7 +2784,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>
@@ -2770,7 +2815,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>
@@ -2801,7 +2846,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>
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 98b6829..196e41e 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"
@@ -204,6 +204,50 @@
<w:szCs w:val="28"/>
</w:rPr>
</w:pPr>
+ <w:r>
+ <w:rPr>
+ <w:rFonts w:ascii="瀹嬩綋" w:eastAsia="瀹嬩綋" w:hAnsi="瀹嬩綋" w:cs="瀹嬩綋"/>
+ <w:b/>
+ <w:bCs/>
+ <w:color w:val="000000"/>
+ <w:kern w:val="0"/>
+ <w:sz w:val="32"/>
+ <w:szCs w:val="32"/>
+ </w:rPr>
+ <w:t xml:space="preserve"> </w:t>
+ </w:r>
+ <w:r w:rsidR="00196045">
+ <w:rPr>
+ <w:rFonts w:ascii="瀹嬩綋" w:eastAsia="瀹嬩綋" w:hAnsi="瀹嬩綋" w:cs="瀹嬩綋" w:hint="eastAsia"/>
+ <w:b/>
+ <w:bCs/>
+ <w:color w:val="000000"/>
+ <w:kern w:val="0"/>
+ <w:sz w:val="22"/>
+ </w:rPr>
+ <w:t xml:space="preserve"> </w:t>
+ </w:r>
+ <w:r w:rsidRPr="00D61E43">
+ <w:rPr>
+ <w:rFonts w:ascii="瀹嬩綋" w:eastAsia="瀹嬩綋" w:hAnsi="瀹嬩綋" w:cs="瀹嬩綋" w:hint="eastAsia"/>
+ <w:b/>
+ <w:bCs/>
+ <w:color w:val="000000"/>
+ <w:kern w:val="0"/>
+ <w:sz w:val="22"/>
+ </w:rPr>
+ <w:t xml:space="preserve"> </w:t>
+ </w:r>
+ <w:r w:rsidRPr="00D61E43">
+ <w:rPr>
+ <w:rFonts w:ascii="瀹嬩綋" w:eastAsia="瀹嬩綋" w:hAnsi="瀹嬩綋" w:cs="瀹嬩綋" w:hint="eastAsia"/>
+ <w:color w:val="000000"/>
+ <w:kern w:val="0"/>
+ <w:sz w:val="28"/>
+ <w:szCs w:val="28"/>
+ </w:rPr>
+ <w:t>缁勫埆锛�${ZB}</w:t>
+ </w:r>
</w:p>
<w:p w:rsidR="00D61E43" w:rsidRPr="00D61E43" w:rsidRDefault="00D61E43" w:rsidP="00196045">
<w:pPr>
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFund.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFund.java
index 5e46739..a712532 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFund.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFund.java
@@ -208,7 +208,7 @@
/** 褰撳墠瀹℃牳绾у埆 澶勪簬鍝釜闃舵 0锛氱敵璇凤紱1锛氫竴绾у鏍革紱2锛氫簩绾у鏍革紱3锛氫笁绾у鏍哥瓑 */
@ApiModelProperty("褰撳墠瀹℃牳绾у埆")
- private int flowlevel;
+ private Long flowlevel;
/**
* 澶勪簬鍝釜闃舵 0锛氱敵璇凤紱1锛氫竴绾у鏍革紱2锛氫簩绾у鏍革紱3锛氫笁绾у鏍哥瓑 100锛氬尰闄㈣储鍔� 199:鍖婚櫌椹冲洖
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java
index 1cb4537..3edc1f1 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java
@@ -21,6 +21,7 @@
import com.ruoyi.project.service.IServiceFunddetailService;
import com.ruoyi.project.service.IServiceFunddetailSharedService;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -104,6 +105,9 @@
if (serviceFund.getUploadtime() != null) {
wrappers.eq(ServiceFund::getUploadtime, serviceFund.getUploadtime());
}
+ if (serviceFund.getFlowlevel() != null) {
+ wrappers.eq(ServiceFund::getFlowlevel, serviceFund.getFlowlevel());
+ }
return this.list(wrappers);
}
@@ -154,7 +158,14 @@
//鏁版嵁鍙戦�佺粰璐㈠姟
uploadOAFileAndUpdateDb(serviceFunddetailShareds.get(i));
}
- boolean result = detailSharedService.saveBatch(serviceFunddetailShareds);
+ boolean result = false;
+ for (ServiceFunddetailShared serviceFunddetailShared : serviceFunddetailShareds) {
+ if (ObjectUtils.isNotEmpty(serviceFunddetailShared)) {
+ result = detailSharedService.save(serviceFunddetailShared);
+ } else {
+ log.info("serviceFunddetailShared涓虹┖浜嗭紒锛侊紒");
+ }
+ }
return result;
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundSharedServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundSharedServiceImpl.java
index 8b6321f..34c8fde 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundSharedServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundSharedServiceImpl.java
@@ -39,6 +39,9 @@
if (serviceFundShared.getInfoid() != null){
wrappers.eq(ServiceFundShared::getInfoid ,serviceFundShared.getInfoid());
}
+ if (Long.valueOf(serviceFundShared.getSerfunid()) != null){
+ wrappers.eq(ServiceFundShared::getSerfunid ,serviceFundShared.getSerfunid());
+ }
if (StringUtils.isNotBlank(serviceFundShared.getDonorno())){
wrappers.eq(ServiceFundShared::getDonorno ,serviceFundShared.getDonorno());
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailSharedServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailSharedServiceImpl.java
index 5ba6990..936874c 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailSharedServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailSharedServiceImpl.java
@@ -39,6 +39,9 @@
if (serviceFunddetailShared.getFundid() != null) {
wrappers.eq(ServiceFunddetailShared::getFundid, serviceFunddetailShared.getFundid());
}
+ if (serviceFunddetailShared.getFdid() != null) {
+ wrappers.eq(ServiceFunddetailShared::getFdid, serviceFunddetailShared.getFdid());
+ }
if (serviceFunddetailShared.getOrderno() != null) {
wrappers.eq(ServiceFunddetailShared::getOrderno, serviceFunddetailShared.getOrderno());
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java
index e46998b..e2427b8 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java
@@ -148,7 +148,7 @@
Map<String, Object> columnMap = new HashMap<>();
columnMap.put("rbid", id);
//鑾峰彇璇︽儏鏁版嵁
- List<ServiceReimbursementdetail> details = serviceReimbursementdetailMapper.selectByMap(columnMap);
+ List<ServiceReimbursementdetail> details = serviceReimbursementdetailMapper.selectByMap(columnMap);
log.info("serviceReimbursementdetailMapper.selectByMap鏂规硶鐨勮繑鍙傚弬 :{}", CollectionUtils.isEmpty(details) ? null : details.size());
//鑾峰彇鏀粯鏁版嵁
List<ServiceReimbursementpayee> serviceReimbursementpayees = reimbursementpayeeMapper.selectByMap(columnMap);
@@ -173,7 +173,14 @@
uploadOAFileAndUpdateDb(serviceReimbursementdetailShareds.get(i));
}
- detailSharedService.saveBatch(serviceReimbursementdetailShareds);
+// detailSharedService.saveBatch(serviceReimbursementdetailShareds);
+ for (ServiceReimbursementdetailShared serviceReimbursementdetailShared : serviceReimbursementdetailShareds) {
+ if (ObjectUtils.isNotEmpty(serviceReimbursementdetailShared)) {
+ detailSharedService.save(serviceReimbursementdetailShared);
+ } else {
+ log.info("serviceReimbursementdetailShared涓虹┖浜�");
+ }
+ }
//灏唖erviceReimbursementpayee琛ㄩ噷鐨刬d璧嬪�肩粰Rpid; 灏唖erviceReimbursementShared閲岀殑ID璧嬪�肩粰RBID,骞跺皢serviceReimbursementpayeeShared琛ㄩ噷鐨刬d缃┖锛岀敱鏁版嵁搴撻噸鏂扮敓鎴�
for (int i = 0; i < serviceReimbursementpayees.size(); i++) {
@@ -181,8 +188,14 @@
serviceReimbursementpayeeShareds.get(i).setRbid(serviceReimbursementShared.getId());
serviceReimbursementpayeeShareds.get(i).setId(null);
}
- payeeSharedService.saveBatch(serviceReimbursementpayeeShareds);
+ for (ServiceReimbursementpayeeShared serviceReimbursementpayeeShared : serviceReimbursementpayeeShareds) {
+ if (ObjectUtils.isNotEmpty(serviceReimbursementpayeeShared)) {
+ payeeSharedService.save(serviceReimbursementpayeeShared);
+ } else {
+ log.info("serviceReimbursementpayeeShared涓虹┖浜嗭紒");
+ }
+ }
return true;
}
@@ -239,38 +252,40 @@
List<RbDetailFile> parseArray2 = new ArrayList<>();
List<RbDetailFile> parseArray = JSON.parseArray(remShare.getAnnexfiles(), RbDetailFile.class);
- for (int i = 0; i < parseArray.size(); i++) {
- RbDetailFile rbDetailFile = parseArray.get(i);
+ if (!CollectionUtils.isEmpty(parseArray)) {
+ for (int i = 0; i < parseArray.size(); i++) {
+ RbDetailFile rbDetailFile = parseArray.get(i);
- log.info("filePath鐨勪慨鏀�:{}", filePath);
- String url = rbDetailFile.getUrl();
- //file鐢ㄧ殑鏄粷瀵逛綅缃�
- String substring = url.substring(url.indexOf("/profile/upload") + "/profile/upload".length());
- String strFile = rbDetailFile.getUrl().replace(filePath, "/profile/upload");
- System.out.println("reimbursement鏈嶅姟鐨刦ilePath + substring鏄贡鐮佸悧: " + filePath + substring);
- File filetest = new File(filePath + substring);
- try {
- log.info("璇锋眰绗笁鏂圭殑鍏ュ弬strFile : {}, strFUrl : {}", strFile, filePath);
- String struploadResult = HttpClientKit.sendPostWithFile(filetest, strFUrl);
- log.info("绗笁鏂逛紶鍥炵殑鏁版嵁: {}", struploadResult);
- if (StringUtils.isEmpty(struploadResult)) {
- log.info("HttpClientKit.sendPostWithFile 璇锋眰涓虹┖浜� filetest:{}, strFUrl:{} ", filetest, strFUrl);
- return 0;
- }
+ log.info("filePath鐨勪慨鏀�:{}", filePath);
+ String url = rbDetailFile.getUrl();
+ //file鐢ㄧ殑鏄粷瀵逛綅缃�
+ String substring = url.substring(url.indexOf("/profile/upload") + "/profile/upload".length());
+ String strFile = rbDetailFile.getUrl().replace(filePath, "/profile/upload");
+ System.out.println("reimbursement鏈嶅姟鐨刦ilePath + substring鏄贡鐮佸悧: " + filePath + substring);
+ File filetest = new File(filePath + substring);
+ try {
+ log.info("璇锋眰绗笁鏂圭殑鍏ュ弬strFile : {}, strFUrl : {}", strFile, filePath);
+ String struploadResult = HttpClientKit.sendPostWithFile(filetest, strFUrl);
+ log.info("绗笁鏂逛紶鍥炵殑鏁版嵁: {}", struploadResult);
+ if (StringUtils.isEmpty(struploadResult)) {
+ log.info("HttpClientKit.sendPostWithFile 璇锋眰涓虹┖浜� filetest:{}, strFUrl:{} ", filetest, strFUrl);
+ return 0;
+ }
- //鑾峰彇fileid
- JSONObject jsonR = JSONObject.parseObject(struploadResult);
- JSONArray jsonArr = jsonR.getJSONArray("atts");
- log.info("绗笁鏂逛紶鍥炵殑鏁版嵁鑾峰彇鐨刟tts : {}", jsonArr);
- for (int j = 0; j < jsonArr.size(); j++) {
- JSONObject jsonRet = jsonArr.getJSONObject(j);
- rbDetailFile.setFileid(jsonRet.get("fileUrl").toString());
+ //鑾峰彇fileid
+ JSONObject jsonR = JSONObject.parseObject(struploadResult);
+ JSONArray jsonArr = jsonR.getJSONArray("atts");
+ log.info("绗笁鏂逛紶鍥炵殑鏁版嵁鑾峰彇鐨刟tts : {}", jsonArr);
+ for (int j = 0; j < jsonArr.size(); j++) {
+ JSONObject jsonRet = jsonArr.getJSONObject(j);
+ rbDetailFile.setFileid(jsonRet.get("fileUrl").toString());
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error("HttpClientKit.sendPostWithFile 鎶ラ敊浜� : " + e.getMessage());
}
- } catch (Exception e) {
- e.printStackTrace();
- log.error("HttpClientKit.sendPostWithFile 鎶ラ敊浜� : " + e.getMessage());
+ parseArray2.add(rbDetailFile);
}
- parseArray2.add(rbDetailFile);
}
remShare.setAnnexfiles(JSON.toJSONString(parseArray2));
log.info("ServiceReimbursementdetailShared 鏄惁鍔犱笂浜唂ileid : {}", remShare);
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementSharedServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementSharedServiceImpl.java
index 3afa62a..b6c33c0 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementSharedServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementSharedServiceImpl.java
@@ -37,6 +37,9 @@
if (StringUtils.isNotBlank(serviceReimbursementShared.getUserno())) {
wrappers.eq(ServiceReimbursementShared::getUserno, serviceReimbursementShared.getUserno());
}
+ if (serviceReimbursementShared.getReimid() != null) {
+ wrappers.eq(ServiceReimbursementShared::getReimid, serviceReimbursementShared.getReimid());
+ }
if (StringUtils.isNotBlank(serviceReimbursementShared.getUsername())) {
wrappers.like(ServiceReimbursementShared::getUsername, serviceReimbursementShared.getUsername());
}
@@ -165,7 +168,7 @@
public List<ServiceReimbursementShared> queryReShareList() {
LambdaQueryWrapper<ServiceReimbursementShared> wrappers = Wrappers.lambdaQuery();
wrappers.eq(ServiceReimbursementShared::getDelFlag, 0);
- // wrappers.isNotNull(ServiceReimbursementShared::getCxrjyj);
+ // wrappers.isNotNull(ServiceReimbursementShared::getCxrjyj);
return this.list(wrappers);
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementdetailSharedServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementdetailSharedServiceImpl.java
index bbd97a3..defae91 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementdetailSharedServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementdetailSharedServiceImpl.java
@@ -37,6 +37,9 @@
if (serviceReimbursementdetailShared.getRbid() != null){
wrappers.eq(ServiceReimbursementdetailShared::getRbid ,serviceReimbursementdetailShared.getRbid());
}
+ if (serviceReimbursementdetailShared.getRdid() != null){
+ wrappers.eq(ServiceReimbursementdetailShared::getRdid ,serviceReimbursementdetailShared.getRdid());
+ }
if (StringUtils.isNotBlank(serviceReimbursementdetailShared.getPersontype())){
wrappers.eq(ServiceReimbursementdetailShared::getPersontype ,serviceReimbursementdetailShared.getPersontype());
}
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
index be4cbbc..7e713e2 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
@@ -1,5 +1,6 @@
package com.ruoyi.quartz.task;
+import com.ruoyi.common.utils.bean.DtoConversionUtils;
import com.ruoyi.project.domain.*;
import com.ruoyi.project.service.*;
import lombok.extern.slf4j.Slf4j;
@@ -7,6 +8,7 @@
import org.springframework.stereotype.Component;
import com.ruoyi.common.utils.StringUtils;
import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
import java.text.ParseException;
import java.text.SimpleDateFormat;
@@ -25,6 +27,9 @@
private DingTalkService dingTalkService;
@Autowired
+ private IServiceReimbursementService serviceReimbursementService;
+
+ @Autowired
private IServiceTasknumService ServiceTasknumService;
@Autowired
@@ -36,12 +41,22 @@
@Autowired
private IServiceFunddetailSharedService serviceFunddetailSharedService;
+ @Autowired
+ private IServiceFunddetailService serviceFunddetailService;
+
+
+ @Autowired
+ private IServiceReimbursementdetailService serviceReimbursementdetailService;
+
+ @Autowired
+ private IServiceReimbursementdetailSharedService reimbursementdetailSharedService;
@Autowired
private IServiceFundService serviceFundService;
- @Autowired
- private IServiceReimbursementService serviceReimbursementService;
+// @Autowired
+// private IServiceReimbursementService serviceReimbursementService;
+
@Autowired
private IServiceFundflowService fundflowService;
@@ -58,6 +73,109 @@
System.out.println("鎵ц鏃犲弬鏂规硶");
}
+// public void checkDBInfo() {
+// ServiceFund serviceFund = new ServiceFund();
+// serviceFund.setFlowlevel(3L);
+// List<ServiceFund> serviceFunds = serviceFundService.queryList(serviceFund);
+// for (ServiceFund serviceFund1 : serviceFunds) {
+// ServiceFundShared serviceFundShared = new ServiceFundShared();
+// serviceFundShared.setSerfunid(serviceFund1.getId());
+// List<ServiceFundShared> serviceFundShareds = serviceFundSharedService.queryList(serviceFundShared);
+// if (CollectionUtils.isEmpty(serviceFundShareds)) {
+// ServiceFundShared serviceFundShared1 = DtoConversionUtils.sourceToTarget(serviceFund1, ServiceFundShared.class);
+// serviceFundShared1.setSerfunid(serviceFund1.getId());
+// serviceFundShared1.setId(null);
+// serviceFundSharedService.save(serviceFundShared1);
+// }
+// }
+// //FUND
+// List<ServiceFunddetail> serviceFunddetailnew = new ArrayList<>();
+// List<ServiceFunddetail> serviceFunddetails = serviceFunddetailService.queryList(new ServiceFunddetail());
+// for (ServiceFunddetail serviceFunddetail : serviceFunddetails) {
+//// if (!ObjectUtils.isEmpty(serviceFunddetail.getAnnexfiles())) {
+//// serviceFunddetailnew.add(serviceFunddetail);
+//// } else {
+// Long fundid = serviceFunddetail.getFundid();
+// ServiceFund byId = serviceFundService.getById(fundid);
+// if (!ObjectUtils.isEmpty(byId)) {
+// if (byId.getFlowlevel() != null && byId.getFlowlevel() == 3) {
+// serviceFunddetailnew.add(serviceFunddetail);
+// }
+//// }
+// }
+// }
+// for (ServiceFunddetail serviceFunddetail1 : serviceFunddetailnew) {
+// //闇�瑕佸厛鏌ヤ竴涓嬭繖涓搴旂殑fdid锛坰hared琛級鍦ㄨ鎯呭浠借〃鏄惁瀛樺湪
+// ServiceFunddetailShared serviceFunddetailShared = new ServiceFunddetailShared();
+// serviceFunddetailShared.setFdid(serviceFunddetail1.getId());
+// List<ServiceFunddetailShared> serviceFunddetailShareds = serviceFunddetailSharedService.queryList(serviceFunddetailShared);
+// if (CollectionUtils.isEmpty(serviceFunddetailShareds)) {
+// serviceFundService.addFundSharedInfo(serviceFunddetail1.getFundid());
+// }
+//// ServiceFunddetailShared serviceFunddetailShared = new ServiceFunddetailShared();
+//// serviceFunddetailShared.setFdid(serviceFunddetail1.getId());
+//// List<ServiceFunddetailShared> serviceFunddetailShareds = serviceFunddetailSharedService.queryList(serviceFunddetailShared);
+//// if (CollectionUtils.isEmpty(serviceFunddetailShareds)) {
+//// ServiceFunddetailShared serviceFunddetailShared1 = DtoConversionUtils.sourceToTarget(serviceFunddetail1, ServiceFunddetailShared.class);
+//// serviceFunddetailShared1.setId(null);
+//// ServiceFundShared serviceFundShared = new ServiceFundShared();
+//// serviceFundShared.setSerfunid(serviceFunddetail1.getFundid());
+//// List<ServiceFundShared> serviceFundShareds = serviceFundSharedService.queryList(serviceFundShared);
+//// serviceFunddetailShared1.setFundid(serviceFundShareds.get(0).getId());
+//// serviceFunddetailShared1.setFdid(serviceFunddetail1.getId());
+//// serviceFunddetailSharedService.save(serviceFunddetailShared1);
+//// }
+// }
+//
+//
+// //reimbursement
+// List<ServiceReimbursementdetail> serviceReimbursementdetailsNew = new ArrayList<>();
+// List<ServiceReimbursementdetail> serviceReimbursementdetails = serviceReimbursementdetailService.queryList(new ServiceReimbursementdetail());
+// for (ServiceReimbursementdetail reimbursementdetail : serviceReimbursementdetails) {
+//// if (!ObjectUtils.isEmpty(reimbursementdetail.getAnnexfiles())) {
+//// serviceReimbursementdetailsNew.add(reimbursementdetail);
+//// } else {
+// Long rbid = reimbursementdetail.getRbid();
+// ServiceReimbursement byId = serviceReimbursementService.getById(rbid);
+// if (!ObjectUtils.isEmpty(byId)) {
+// if (byId.getFlowlevel() != null && byId.getFlowlevel() == 3) {
+// serviceReimbursementdetailsNew.add(reimbursementdetail);
+// }
+//// }
+// }
+// }
+// for (ServiceReimbursementdetail serviceReimbursementdetail : serviceReimbursementdetailsNew) {
+// //闇�瑕佸厛鏌ヤ竴涓嬭繖涓搴旂殑rbid锛坰hared琛級鍦ㄨ鎯呭浠借〃鏄惁瀛樺湪
+// ServiceReimbursementdetailShared serviceReimbursementdetailShared = new ServiceReimbursementdetailShared();
+// serviceReimbursementdetailShared.setRdid(serviceReimbursementdetail.getId());
+// List<ServiceReimbursementdetailShared> serviceReimbursementdetailShareds = reimbursementdetailSharedService.queryList(serviceReimbursementdetailShared);
+// if (CollectionUtils.isEmpty(serviceReimbursementdetailShareds)) {
+// serviceReimbursementService.addSharedData(serviceReimbursementdetail.getRbid());
+// }
+// }
+//// ServiceReimbursementdetailShared serviceReimbursementdetailShared = new ServiceReimbursementdetailShared();
+//// serviceReimbursementdetailShared.setRdid(serviceReimbursementdetail.getId());
+//// if (serviceReimbursementdetail.getRbid() == 872) {
+//// System.out.println("-------------------");
+//// }
+//// List<ServiceReimbursementdetailShared> serviceReimbursementdetailShareds = reimbursementdetailSharedService.queryList(serviceReimbursementdetailShared);
+////
+//// if (CollectionUtils.isEmpty(serviceReimbursementdetailShareds)) {
+//// ServiceReimbursementdetailShared reimbursementdetailShared = DtoConversionUtils.sourceToTarget(serviceReimbursementdetail, ServiceReimbursementdetailShared.class);
+//// reimbursementdetailShared.setId(null);
+//// ServiceReimbursementShared serviceReimbursementShared = new ServiceReimbursementShared();
+//// serviceReimbursementShared.setReimid(serviceReimbursementdetail.getRbid());
+//// List<ServiceReimbursementShared> serviceReimbursementShareds = serviceReimbursementSharedService.queryList(serviceReimbursementShared);
+//// if (!CollectionUtils.isEmpty(serviceReimbursementShareds) && !ObjectUtils.isEmpty(serviceReimbursementShareds.get(0))) {
+//// reimbursementdetailShared.setRbid(serviceReimbursementShareds.get(0).getId());
+//// reimbursementdetailShared.setRdid(serviceReimbursementdetail.getId());
+//// reimbursementdetailSharedService.save(reimbursementdetailShared);
+//// }
+//// }
+//// }
+//
+// }
+
public void checkReportInfo() {
//鏌ュ嚭鎵�鏈夎鍖婚櫌閫�鍥炵殑Fund鏁版嵁
List<ServiceFundShared> serviceFundShareds = serviceFundSharedService.queryFundShareList();
@@ -73,7 +191,7 @@
serviceFund.setId(serviceFundShared.getSerfunid());
List<ServiceFund> serviceFunds = serviceFundService.queryList(serviceFund);
ServiceFund serviceFund1 = serviceFunds.get(0);
- serviceFund1.setFlowlevel(100);
+ serviceFund1.setFlowlevel(100L);
serviceFund1.setDel_flag(0);
serviceFund1.setRecordstatus(-1);
serviceFund1.setBackflowlevel(199);
--
Gitblit v1.9.3