From d51450c60f95c7e6fb7034451e9c1f7497b2b116 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 31 八月 2023 17:38:07 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java | 5
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementShared.java | 11
ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceTasknumService.java | 24 ++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java | 2
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementEo.java | 167 ++++++++++++----
ruoyi-admin/src/main/resources/template/差旅费报销申请单.ftl | 26 ++
ruoyi-admin/src/main/resources/template/伦理专家劳务费发放申请单.ftl | 24 ++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java | 26 +
ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml | 6
ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceTasknumMapper.java | 23 ++
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java | 60 +++++
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFund.java | 4
ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml | 4
ruoyi-admin/src/main/resources/template/办公费用申请单.ftl | 24 ++
ruoyi-admin/src/main/resources/template/医学成本费用申请单.ftl | 24 ++
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursement.java | 6
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceTasknum.java | 45 ++++
ruoyi-admin/src/main/resources/template/专家劳务费发放申请单(1).ftl | 24 ++
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java | 11 +
ruoyi-project/src/main/resources/mapper/project/ServiceTasknumMapper.xml | 29 ++
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceTasknumServiceImpl.java | 46 ++++
21 files changed, 512 insertions(+), 79 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
index 7fa790e..259a1ff 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
@@ -85,7 +85,7 @@
log.info("url1鐨勫�紀ld :{}", url1);
if (url1.contains("8032")) {
//杩欓噷鐨�8032涓嶆槸tomcat鐨勶紝鎵�浠ヨ杞垚tomcat鐨�
- url1 = url1.replace("8032", "8099");
+ url1 = url1.replace("8032", "8032/prod-api");
}
log.info("url1鐨勫�糿ew :{}", url1);
String url = url1 + fileName;
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 7bf6d64..69f9cbe 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
@@ -658,6 +658,7 @@
String date = formatter.format(dt);
String time = date.substring(0, 10);
+ dataMap.put("XZBH", serviceFund.getBh() == null ? "" : serviceFund.getBh());
dataMap.put("TBYYMMDD", time);
dataMap.put("BXDFJ", serviceFund.getAttachcount() == 0 ? " " : serviceFund.getAttachcount());
dataMap.put("JXZXM", serviceFund.getDonorname() == null ? "" : serviceFund.getDonorname());
@@ -971,7 +972,7 @@
@GetMapping(value = "/downloadYX/{id}")
public Map downloadInfoYX(@PathVariable("id") Long id) throws IOException {
Map dataMap = new HashMap();
- getDataYX(dataMap, id);
+ String dataYX = getDataYX(dataMap, id);
String filePath = getClass().getResource("/template/").getPath();
System.out.println(filePath);
//璁剧疆妯℃湰瑁呯疆鏂规硶鍜岃矾寰�,FreeMarker鏀寔澶氱妯℃澘瑁呰浇鏂规硶銆傚彲浠ラ噸servlet锛宑lasspath锛屾暟鎹簱鏁欑▼瑁呰浇锛�
@@ -980,15 +981,22 @@
Template t = null;
try {
//鎹愮尞琛�.ftl涓鸿瑁呰浇鐨勬ā鏉�
-// t = configuration.getTemplate("鍖诲鎴愭湰璐圭敤鐢宠鍗�.ftl");
- t = configuration.getTemplate("鍔炲叕璐圭敤鐢宠鍗�.ftl");
+ //涓撳鍔冲姟璐圭敵璇� 1 浼︾悊璇勪及鍔冲姟璐圭敵璇� 2 鍖诲鎴愭湰璐圭敤鐢宠 3 鍔炲叕璐圭敤鎶ラ攢鐢宠 4
+ if (dataYX.equals("3")) {
+ t = configuration.getTemplate("鍖诲鎴愭湰璐圭敤鐢宠鍗�.ftl");
+ } else if (dataYX.equals("4")) {
+ t = configuration.getTemplate("鍔炲叕璐圭敤鐢宠鍗�.ftl");
+ }
} catch (IOException e) {
e.printStackTrace();
}
String newTime = String.valueOf(Calendar.getInstance().getTimeInMillis());
-// String name = "鍖诲鎴愭湰璐圭敤鐢宠鍗昣" + dataMap.get("XM") + "_" + newTime;
- String name = "鍔炲叕璐圭敤鐢宠鍗昣" + dataMap.get("XM") + "_" + newTime;
-
+ String name = null;
+ if (dataYX.equals("3")) {
+ name = "鍖诲鎴愭湰璐圭敤鐢宠鍗昣" + dataMap.get("XM") + "_" + newTime;
+ } else if (dataYX.equals("4")) {
+ name = "鍔炲叕璐圭敤鐢宠鍗昣" + dataMap.get("XM") + "_" + newTime;
+ }
//杈撳嚭鏂囨。璺緞鍙婂悕绉�
File outFile = new File(RuoYiConfig.getProfile() + "/download/wordtemplate/" + name + ".doc");
Writer out = null;
@@ -1009,7 +1017,7 @@
return map;
}
- private void getDataYX(Map dataMap, Long id) {
+ private String getDataYX(Map dataMap, Long id) {
ServiceFund serviceFund = serviceFundService.getById(id);
if (serviceFund == null) {
throw new ServiceException("涓嬭浇澶辫触锛岀敤鎴蜂俊鎭嚭閿�", HttpStatus.NO_CONTENT);
@@ -1032,6 +1040,7 @@
List<Map<String, Object>> newList = new ArrayList<Map<String, Object>>();
int seqno = 0;
+ dataMap.put("XZBH", serviceFund.getBh() == null ? "" : serviceFund.getBh());
dataMap.put("TBYYMMDD", time);
dataMap.put("BXDFJ", serviceFund.getAttachcount() == 0 ? " " : serviceFund.getAttachcount());
dataMap.put("JXZXM", serviceFund.getDonorname() == null ? "" : serviceFund.getDonorname());
@@ -1103,6 +1112,7 @@
dataMap.put("CWBZR2", serviceFund.getFinancedirector() == null ? "" : serviceFund.getFinancedirector());
dataMap.put("CWSH2", serviceFund.getFinancechecher() == null ? "" : serviceFund.getFinancechecher());
+ return serviceFund.getApplytype();
}
public List<Map<String, Object>> checkList(List<Map<String, Object>> list) {
@@ -1737,6 +1747,7 @@
String date = formatter.format(dt);
String time = date.substring(0, 10);
+ dataMap.put("XZBH", serviceFund.getBh() == null ? "" : serviceFund.getBh());
dataMap.put("YYMMDD", time);
dataMap.put("XM", serviceFund.getDonorname() == null ? "" : serviceFund.getDonorname());
dataMap.put("GZRY", serviceFund.getUsername() == null ? "" : serviceFund.getUsername());
@@ -1823,6 +1834,7 @@
String date = formatter.format(dt);
String time = date.substring(0, 10);
+ dataMap.put("XZBH", serviceFund.getBh() == null ? "" : serviceFund.getBh());
dataMap.put("TBYYMMDD", time);
dataMap.put("BXDFJ", serviceFund.getAttachcount() == 0 ? " " : serviceFund.getAttachcount());
dataMap.put("JXZXM", serviceFund.getDonorname() == null ? "" : serviceFund.getDonorname());
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 ff1f92c..f7c93fe 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
@@ -690,8 +690,8 @@
*/
@ApiOperation("鍒犻櫎鎶ラ攢鐢宠")
//@PreAuthorize("@ss.hasPermi('project:reimbursement:remove')")
- @Log(title = "鎶ラ攢鐢宠", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
+ @Log(title = "鎶ラ攢鐢宠")
+ @GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(serviceReimbursementService.removeByIds(Arrays.asList(ids)));
}
@@ -878,6 +878,7 @@
String date = formatter.format(dt);
String time = date.substring(0, 10);
+ 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());
dataMap.put("JXZXM", rdInfoByItem.get(0).getDonorname() == null ? "" : rdInfoByItem.get(0).getDonorname());
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 0fc600e..679cab0 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"
@@ -178,7 +178,7 @@
<w:sz w:val="24"/>
<w:szCs w:val="24"/>
</w:rPr>
- <w:t>濉〃鏃ユ湡锛�${TBYYMMDD}</w:t>
+ <w:t>缂栧彿锛�${XZBH}</w:t>
</w:r>
<w:r w:rsidR="00A72865" w:rsidRPr="0039783B">
<w:rPr>
@@ -188,8 +188,28 @@
<w:sz w:val="24"/>
<w:szCs w:val="24"/>
</w:rPr>
- <w:t xml:space="preserve"> </w:t>
+ <w:t xml:space="preserve"> </w:t>
</w:r>
+ <w:r w:rsidRPr="0039783B">
+ <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="24"/>
+ <w:szCs w:val="24"/>
+ </w:rPr>
+ <w:t>濉〃鏃ユ湡锛�${TBYYMMDD}</w:t>
+ </w:r>
+<#-- <w:r w:rsidR="00A72865" w:rsidRPr="0039783B">-->
+<#-- <w:rPr>-->
+<#-- <w:rFonts w:ascii="瀹嬩綋" w:eastAsia="瀹嬩綋" w:hAnsi="瀹嬩綋" w:cs="瀹嬩綋"/>-->
+<#-- <w:color w:val="000000"/>-->
+<#-- <w:kern w:val="0"/>-->
+<#-- <w:sz w:val="24"/>-->
+<#-- <w:szCs w:val="24"/>-->
+<#-- </w:rPr>-->
+<#-- <w:t xml:space="preserve"> </w:t>-->
+<#-- </w:r>-->
<w:r w:rsidR="004A1007" w:rsidRPr="0039783B">
<w:rPr>
<w:rFonts w:ascii="瀹嬩綋" w:eastAsia="瀹嬩綋" w:hAnsi="瀹嬩綋" w:cs="瀹嬩綋"/>
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 0fcc663..3dd61d8 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"
@@ -192,7 +192,7 @@
<w:sz w:val="24"/>
<w:szCs w:val="24"/>
</w:rPr>
- <w:t>濉〃鏃ユ湡锛�${TBYYMMDD}</w:t>
+ <w:t>缂栧彿锛�${XZBH}</w:t>
</w:r>
<w:r w:rsidR="00A72865">
<w:rPr>
@@ -202,8 +202,28 @@
<w:sz w:val="24"/>
<w:szCs w:val="24"/>
</w:rPr>
- <w:t xml:space="preserve"> </w:t>
+ <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="24"/>
+ <w:szCs w:val="24"/>
+ </w:rPr>
+ <w:t>濉〃鏃ユ湡锛�${TBYYMMDD}</w:t>
+ </w:r>
+<#-- <w:r w:rsidR="00A72865">-->
+<#-- <w:rPr>-->
+<#-- <w:rFonts w:ascii="瀹嬩綋" w:eastAsia="瀹嬩綋" w:hAnsi="瀹嬩綋" w:cs="瀹嬩綋"/>-->
+<#-- <w:color w:val="000000"/>-->
+<#-- <w:kern w:val="0"/>-->
+<#-- <w:sz w:val="24"/>-->
+<#-- <w:szCs w:val="24"/>-->
+<#-- </w:rPr>-->
+<#-- <w:t xml:space="preserve"> </w:t>-->
+<#-- </w:r>-->
<w:r w:rsidR="004A1007">
<w:rPr>
<w:rFonts w:ascii="瀹嬩綋" w:eastAsia="瀹嬩綋" w:hAnsi="瀹嬩綋" w:cs="瀹嬩綋"/>
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 02c5e9d..aee91bf 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"
@@ -245,7 +245,7 @@
<w:sz w:val="24"/>
<w:szCs w:val="24"/>
</w:rPr>
- <w:t>濉〃鏃ユ湡锛�2023-08-03</w:t>
+ <w:t>缂栧彿锛�${XZBH}</w:t>
</w:r>
<w:r w:rsidR="00A72865">
<w:rPr>
@@ -255,8 +255,28 @@
<w:sz w:val="24"/>
<w:szCs w:val="24"/>
</w:rPr>
- <w:t xml:space="preserve"> </w:t>
+ <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="24"/>
+ <w:szCs w:val="24"/>
+ </w:rPr>
+ <w:t>濉〃鏃ユ湡锛�${TBYYMMDD}</w:t>
+ </w:r>
+<#-- <w:r w:rsidR="00A72865">-->
+<#-- <w:rPr>-->
+<#-- <w:rFonts w:ascii="瀹嬩綋" w:eastAsia="瀹嬩綋" w:hAnsi="瀹嬩綋" w:cs="瀹嬩綋"/>-->
+<#-- <w:color w:val="000000"/>-->
+<#-- <w:kern w:val="0"/>-->
+<#-- <w:sz w:val="24"/>-->
+<#-- <w:szCs w:val="24"/>-->
+<#-- </w:rPr>-->
+<#-- <w:t xml:space="preserve"> </w:t>-->
+<#-- </w:r>-->
<w:r w:rsidR="004A1007">
<w:rPr>
<w:rFonts w:ascii="瀹嬩綋" w:eastAsia="瀹嬩綋" w:hAnsi="瀹嬩綋" w:cs="瀹嬩綋"/>
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 1505b94..454a618 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"
@@ -191,7 +191,7 @@
<w:sz w:val="24"/>
<w:szCs w:val="24"/>
</w:rPr>
- <w:t>濉〃鏃ユ湡锛�${TBYYMMDD}</w:t>
+ <w:t>缂栧彿锛�${XZBH}</w:t>
</w:r>
<w:r w:rsidR="00A72865">
<w:rPr>
@@ -201,8 +201,28 @@
<w:sz w:val="24"/>
<w:szCs w:val="24"/>
</w:rPr>
- <w:t xml:space="preserve"> </w:t>
+ <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="24"/>
+ <w:szCs w:val="24"/>
+ </w:rPr>
+ <w:t>濉〃鏃ユ湡锛�${TBYYMMDD}</w:t>
+ </w:r>
+<#-- <w:r w:rsidR="00A72865">-->
+<#-- <w:rPr>-->
+<#-- <w:rFonts w:ascii="瀹嬩綋" w:eastAsia="瀹嬩綋" w:hAnsi="瀹嬩綋" w:cs="瀹嬩綋"/>-->
+<#-- <w:color w:val="000000"/>-->
+<#-- <w:kern w:val="0"/>-->
+<#-- <w:sz w:val="24"/>-->
+<#-- <w:szCs w:val="24"/>-->
+<#-- </w:rPr>-->
+<#-- <w:t xml:space="preserve"> </w:t>-->
+<#-- </w:r>-->
<w:r w:rsidR="004A1007">
<w:rPr>
<w:rFonts w:ascii="瀹嬩綋" w:eastAsia="瀹嬩綋" w:hAnsi="瀹嬩綋" w:cs="瀹嬩綋"/>
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 3693534..025dc42 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"
@@ -227,7 +227,7 @@
<w:sz w:val="24"/>
<w:szCs w:val="24"/>
</w:rPr>
- <w:t>濉〃鏃ユ湡锛�${TBYYMMDD}</w:t>
+ <w:t>缂栧彿锛�${XZBH}</w:t>
</w:r>
<w:r w:rsidR="00A72865">
<w:rPr>
@@ -237,8 +237,28 @@
<w:sz w:val="24"/>
<w:szCs w:val="24"/>
</w:rPr>
- <w:t xml:space="preserve"> </w:t>
+ <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="24"/>
+ <w:szCs w:val="24"/>
+ </w:rPr>
+ <w:t>濉〃鏃ユ湡锛�${TBYYMMDD}</w:t>
+ </w:r>
+<#-- <w:r w:rsidR="00A72865">-->
+<#-- <w:rPr>-->
+<#-- <w:rFonts w:ascii="瀹嬩綋" w:eastAsia="瀹嬩綋" w:hAnsi="瀹嬩綋" w:cs="瀹嬩綋"/>-->
+<#-- <w:color w:val="000000"/>-->
+<#-- <w:kern w:val="0"/>-->
+<#-- <w:sz w:val="24"/>-->
+<#-- <w:szCs w:val="24"/>-->
+<#-- </w:rPr>-->
+<#-- <w:t xml:space="preserve"> </w:t>-->
+<#-- </w:r>-->
<w:r w:rsidR="004A1007">
<w:rPr>
<w:rFonts w:ascii="瀹嬩綋" w:eastAsia="瀹嬩綋" w:hAnsi="瀹嬩綋" w:cs="瀹嬩綋"/>
@@ -247,7 +267,7 @@
<w:sz w:val="24"/>
<w:szCs w:val="24"/>
</w:rPr>
- <w:t xml:space="preserve"> </w:t>
+ <w:t xml:space="preserve"> </w:t>
</w:r>
<w:r w:rsidRPr="00D61E43">
<w:rPr>
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 243ee14..43155dc 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
@@ -237,5 +237,9 @@
@ApiModelProperty("浠樻鏃ユ湡")
private String riqi;
+ /** 缂栧彿(鎵撳嵃鐨勬椂鍊欙紝鍦ㄦ枃妗ｄ笂鏄剧ず) */
+ @ApiModelProperty("缂栧彿(鎵撳嵃鐨勬椂鍊欙紝鍦ㄦ枃妗ｄ笂鏄剧ず)")
+ @Excel(name = "缂栧彿")
+ private String bh;
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursement.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursement.java
index c99c425..7b40b12 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursement.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursement.java
@@ -317,6 +317,12 @@
@ApiModelProperty("浠樻鏃ユ湡")
private String riqi;
+
+ /** 缂栧彿(鎵撳嵃鐨勬椂鍊欙紝鍦ㄦ枃妗ｄ笂鏄剧ず) */
+ @ApiModelProperty("缂栧彿(鎵撳嵃鐨勬椂鍊欙紝鍦ㄦ枃妗ｄ笂鏄剧ず)")
+ @Excel(name = "缂栧彿")
+ private String bh;
+
// @ApiModelProperty("寮�濮嬫椂闂�")
// private Date starttime;
//
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementEo.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementEo.java
index 6f1a801..6b4598d 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementEo.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementEo.java
@@ -14,193 +14,264 @@
/**
* 鎶ラ攢鐢宠瀵硅薄鍏ュ弬瀵硅薄
- *
+ *
* @author 鍒樼渷
* @date 2023-04-28
*/
@Data
@ApiModel("鎶ラ攢鐢宠鍏ュ弬EO")
-public class ServiceReimbursementEo extends BaseEntity
-{
+public class ServiceReimbursementEo extends BaseEntity {
- /** $column.columnComment */
+ /**
+ * $column.columnComment
+ */
@ApiModelProperty("$column.columnComment")
//鏁版嵁搴撹嚜澧炴敼鎴怈TableId(type = IdType.AUTO)
@TableId(type = IdType.AUTO)
private Long id;
- /** 鎶ラ攢浜虹紪鍙� */
+ /**
+ * 鎶ラ攢浜虹紪鍙�
+ */
@ApiModelProperty("鎶ラ攢浜虹紪鍙�")
@Excel(name = "鎶ラ攢浜虹紪鍙�")
private String userno;
- /** 鎶ラ攢浜哄鍚� */
+ /**
+ * 鎶ラ攢浜哄鍚�
+ */
@ApiModelProperty("鎶ラ攢浜哄鍚�")
@Excel(name = "鎶ラ攢浜哄鍚�")
private String username;
- /** 璇佷欢绫诲瀷 鏍规嵁瀛楀吀sys_IDType */
+ /**
+ * 璇佷欢绫诲瀷 鏍规嵁瀛楀吀sys_IDType
+ */
@ApiModelProperty("璇佷欢绫诲瀷 鏍规嵁瀛楀吀sys_IDType")
@Excel(name = "璇佷欢绫诲瀷 鏍规嵁瀛楀吀sys_IDType")
private String idcardtype;
- /** 璇佷欢鍙风爜 */
+ /**
+ * 璇佷欢鍙风爜
+ */
@ApiModelProperty("璇佷欢鍙风爜")
@Excel(name = "璇佷欢鍙风爜")
private String idcardno;
- /** 鑱旂郴鐢佃瘽 */
+ /**
+ * 鑱旂郴鐢佃瘽
+ */
@ApiModelProperty("鑱旂郴鐢佃瘽")
@Excel(name = "鑱旂郴鐢佃瘽")
private String phone;
- /** 寮�鎴烽摱琛� */
+ /**
+ * 寮�鎴烽摱琛�
+ */
@ApiModelProperty("寮�鎴烽摱琛�")
@Excel(name = "寮�鎴烽摱琛�")
private String depositbank;
- /** 鍗″彿 */
+ /**
+ * 鍗″彿
+ */
@ApiModelProperty("鍗″彿")
@Excel(name = "鍗″彿")
private String bankcardno;
- /** 鍒嗚鍚嶇О */
+ /**
+ * 鍒嗚鍚嶇О
+ */
@ApiModelProperty("鍒嗚鍚嶇О")
@Excel(name = "鍒嗚鍚嶇О")
private String branchbankname;
- /** 閾惰鍗＄収鐗囪矾寰� 澶氫釜鐢�;鍒嗗紑 */
+ /**
+ * 閾惰鍗＄収鐗囪矾寰� 澶氫釜鐢�;鍒嗗紑
+ */
@ApiModelProperty("閾惰鍗＄収鐗囪矾寰� 澶氫釜鐢�;鍒嗗紑")
@Excel(name = "閾惰鍗＄収鐗囪矾寰� 澶氫釜鐢�;鍒嗗紑")
private String annexbankcard;
- /** 闄勪欢璺緞 澶氫釜鐢�;鍒嗗紑 */
+ /**
+ * 闄勪欢璺緞 澶氫釜鐢�;鍒嗗紑
+ */
@ApiModelProperty("闄勪欢璺緞 澶氫釜鐢�;鍒嗗紑")
@Excel(name = "闄勪欢璺緞 澶氫釜鐢�;鍒嗗紑")
private String annexfiles;
- /** 鐢宠閲戦 */
+ /**
+ * 鐢宠閲戦
+ */
@ApiModelProperty("鐢宠閲戦")
@Excel(name = "鐢宠閲戦")
private BigDecimal amountrequested;
- /** 浜ら�氳垂 */
+ /**
+ * 浜ら�氳垂
+ */
@ApiModelProperty("浜ら�氳垂")
@Excel(name = "浜ら�氳垂")
private BigDecimal trafficexpense;
- /** 浣忓璐� */
+ /**
+ * 浣忓璐�
+ */
@ApiModelProperty("浣忓璐�")
@Excel(name = "浣忓璐�")
private BigDecimal hotelexpense;
- /** 浼欓璐� */
+ /**
+ * 浼欓璐�
+ */
@ApiModelProperty("浼欓璐�")
@Excel(name = "浼欓璐�")
private BigDecimal foodexpenses;
- /** 浼欓璐硅ˉ鍔� */
+ /**
+ * 浼欓璐硅ˉ鍔�
+ */
@ApiModelProperty("浼欓璐硅ˉ鍔�")
@Excel(name = "浼欓璐硅ˉ鍔�")
private BigDecimal foodallowance;
- /** 鏉傝垂 */
+ /**
+ * 鏉傝垂
+ */
@ApiModelProperty("鏉傝垂")
@Excel(name = "鏉傝垂")
private BigDecimal otherexpense;
- /** 鍏朵粬璐圭敤閲戦 */
+ /**
+ * 鍏朵粬璐圭敤閲戦
+ */
@ApiModelProperty("鍏朵粬璐圭敤閲戦")
@Excel(name = "鍏朵粬璐圭敤閲戦")
private BigDecimal otherfeeamount;
- /** 棰勬敮璐圭敤 */
+ /**
+ * 棰勬敮璐圭敤
+ */
@ApiModelProperty("棰勬敮璐圭敤")
@Excel(name = "棰勬敮璐圭敤")
private Double prepaidamount;
- /** 鍙戠エ寮犳暟 */
+ /**
+ * 鍙戠エ寮犳暟
+ */
@ApiModelProperty("鍙戠エ寮犳暟")
@Excel(name = "鍙戠エ寮犳暟")
private Long invoicecount;
- /** 闄勪欢鏁� */
+ /**
+ * 闄勪欢鏁�
+ */
@ApiModelProperty("闄勪欢鏁�")
@Excel(name = "闄勪欢鏁�")
private Long attachcount;
- /** 閮ㄩ棬涓荤宸ュ彿 */
+ /**
+ * 閮ㄩ棬涓荤宸ュ彿
+ */
@ApiModelProperty("閮ㄩ棬涓荤宸ュ彿")
@Excel(name = "閮ㄩ棬涓荤宸ュ彿")
private String managerno;
- /** 閮ㄩ棬涓荤鍚嶅瓧 */
+ /**
+ * 閮ㄩ棬涓荤鍚嶅瓧
+ */
@ApiModelProperty("閮ㄩ棬涓荤鍚嶅瓧")
@Excel(name = "閮ㄩ棬涓荤鍚嶅瓧")
private String managername;
- /** 閮ㄩ棬缂栧彿 */
+ /**
+ * 閮ㄩ棬缂栧彿
+ */
@ApiModelProperty("閮ㄩ棬缂栧彿")
@Excel(name = "閮ㄩ棬缂栧彿")
private String deptmentno;
- /** 閮ㄩ棬鍚嶇О */
+ /**
+ * 閮ㄩ棬鍚嶇О
+ */
@ApiModelProperty("閮ㄩ棬鍚嶇О")
@Excel(name = "閮ㄩ棬鍚嶇О")
private String deptmentname;
- /** 涓績绛惧瓧 */
+ /**
+ * 涓績绛惧瓧
+ */
@ApiModelProperty("涓績绛惧瓧")
@Excel(name = "涓績绛惧瓧")
private String opochecker;
- /** 璐㈠姟鍓櫌闀跨瀛� */
+ /**
+ * 璐㈠姟鍓櫌闀跨瀛�
+ */
@ApiModelProperty("璐㈠姟鍓櫌闀跨瀛�")
@Excel(name = "璐㈠姟鍓櫌闀跨瀛�")
private String finvicepresident;
- /** 涓氬姟鍓櫌闀跨瀛� */
+ /**
+ * 涓氬姟鍓櫌闀跨瀛�
+ */
@ApiModelProperty("涓氬姟鍓櫌闀跨瀛�")
@Excel(name = "涓氬姟鍓櫌闀跨瀛�")
private String busvicepresident;
- /** 鍔炲叕瀹や富浠荤瀛� */
+ /**
+ * 鍔炲叕瀹や富浠荤瀛�
+ */
@ApiModelProperty("鍔炲叕瀹や富浠荤瀛�")
@Excel(name = "鍔炲叕瀹や富浠荤瀛�")
private String officedirector;
- /** 璐㈠姟瀹や富浠荤瀛� */
+ /**
+ * 璐㈠姟瀹や富浠荤瀛�
+ */
@ApiModelProperty("璐㈠姟瀹や富浠荤瀛�")
@Excel(name = "璐㈠姟瀹や富浠荤瀛�")
private String financedirector;
- /** 璐㈠姟瀹℃牳 */
+ /**
+ * 璐㈠姟瀹℃牳
+ */
@ApiModelProperty("璐㈠姟瀹℃牳")
@Excel(name = "璐㈠姟瀹℃牳")
private String financechecher;
- /** 鍏宠仈service_donatebaseinfo琛ㄧ殑ID */
+ /**
+ * 鍏宠仈service_donatebaseinfo琛ㄧ殑ID
+ */
@ApiModelProperty("鍏宠仈service_donatebaseinfo琛ㄧ殑ID")
@Excel(name = "鍏宠仈service_donatebaseinfo琛ㄧ殑ID")
private Long infoid;
- /** 鎹愮尞鑰呯紪鍙� */
+ /**
+ * 鎹愮尞鑰呯紪鍙�
+ */
@ApiModelProperty("鎹愮尞鑰呯紪鍙�")
@Excel(name = "鎹愮尞鑰呯紪鍙�")
private String donorno;
- /** 璁板綍鐘舵�� */
+ /**
+ * 璁板綍鐘舵��
+ */
@ApiModelProperty("璁板綍鐘舵��")
@Excel(name = "璁板綍鐘舵��")
private Integer recordstatus;
- /** 涓婁紶鏍囧織 */
+ /**
+ * 涓婁紶鏍囧織
+ */
@ApiModelProperty("涓婁紶鏍囧織")
@Excel(name = "涓婁紶鏍囧織")
private String uploadflag;
- /** 涓婁紶鏃堕棿 */
+ /**
+ * 涓婁紶鏃堕棿
+ */
@ApiModelProperty("涓婁紶鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "涓婁紶鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@@ -222,22 +293,30 @@
@ApiModelProperty("鎬婚噾棰濈殑澶у啓")
private String bigstrmoney;
- /** 闄勪欢鍦板潃锛宎dd by yangjb 20221124 */
+ /**
+ * 闄勪欢鍦板潃锛宎dd by yangjb 20221124
+ */
@ApiModelProperty("闄勪欢鍦板潃")
private String fileurl;
private String remark;
- /** 褰撳墠瀹℃牳绾у埆 澶勪簬鍝釜闃舵 0锛氱敵璇凤紱1锛氫竴绾у鏍革紱2锛氫簩绾у鏍革紱3锛氫笁绾у鏍哥瓑 */
+ /**
+ * 褰撳墠瀹℃牳绾у埆 澶勪簬鍝釜闃舵 0锛氱敵璇凤紱1锛氫竴绾у鏍革紱2锛氫簩绾у鏍革紱3锛氫笁绾у鏍哥瓑
+ */
@ApiModelProperty("褰撳墠瀹℃牳绾у埆")
private Long flowlevel;
- /** 璐圭敤褰掑睘锛�0锛氬叾浠栦汉鍛橈紱1锛氫笓鑱屼汉鍛橈紱2锛氬崗璋冨憳锛�3锛氫笓瀹讹紱4锛氭崘鐚�呭灞� */
+ /**
+ * 璐圭敤褰掑睘锛�0锛氬叾浠栦汉鍛橈紱1锛氫笓鑱屼汉鍛橈紱2锛氬崗璋冨憳锛�3锛氫笓瀹讹紱4锛氭崘鐚�呭灞�
+ */
@ApiModelProperty("璐圭敤褰掑睘")
private String persontype;
- /** 璐圭敤褰掑睘鎻忚堪 */
+ /**
+ * 璐圭敤褰掑睘鎻忚堪
+ */
@ApiModelProperty("璐圭敤褰掑睘鎻忚堪")
private String costtypename;
@@ -266,5 +345,7 @@
@ApiModelProperty("鐢宠鏃堕棿")
private Date endtime;
+ @ApiModelProperty("涓嬭浇缂栧彿")
+ private String bh;
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementShared.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementShared.java
index d257d51..a4ffa05 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementShared.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementShared.java
@@ -10,7 +10,6 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import java.math.BigDecimal;
import java.util.Date;
/**
@@ -114,14 +113,14 @@
*/
@ApiModelProperty("鐢宠閲戦")
@Excel(name = "鐢宠閲戦")
- private BigDecimal amountrequested;
+ private Double amountrequested;
/**
* 棰勬敮璐圭敤
*/
@ApiModelProperty("棰勬敮璐圭敤")
@Excel(name = "棰勬敮璐圭敤")
- private BigDecimal prepaidamount;
+ private Double prepaidamount;
/**
* 鍙戠エ寮犳暟
@@ -179,7 +178,9 @@
@Excel(name = "璐㈠姟鍓櫌闀跨瀛�")
private String finvicepresident;
- /** 闄㈤暱绛惧瓧 */
+ /**
+ * 闄㈤暱绛惧瓧
+ */
@ApiModelProperty("闄㈤暱绛惧瓧")
@Excel(name = "闄㈤暱绛惧瓧")
private String president;
@@ -267,7 +268,7 @@
*/
@ApiModelProperty("鎬婚噾棰�")
@Excel(name = "鎬婚噾棰�")
- private BigDecimal totalamount;
+ private Double totalamount;
/**
* 鎬婚噾棰濈殑澶у啓
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceTasknum.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceTasknum.java
new file mode 100644
index 0000000..6cb325f
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceTasknum.java
@@ -0,0 +1,45 @@
+package com.ruoyi.project.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 宸梾锛屼笓瀹讹紝鍔炲叕锛屽尰瀛︼紝浼︾悊 ...... 浠诲姟缂栧彿瀵硅薄 service_tasknum
+ *
+ * @author ruoyi
+ * @date 2023-08-31
+ */
+@Data
+@ApiModel("宸梾锛屼笓瀹讹紝鍔炲叕锛屽尰瀛︼紝浼︾悊 ...... 浠诲姟缂栧彿")
+public class ServiceTasknum
+{
+ private static final long serialVersionUID = 1L;
+
+ /** $column.columnComment */
+ @ApiModelProperty("$column.columnComment")
+ //鏁版嵁搴撹嚜澧炴敼鎴怈TableId(type = IdType.AUTO)
+ @TableId(type = IdType.AUTO)
+ private Long id;
+
+ /** 绫诲瀷 */
+ @ApiModelProperty("绫诲瀷")
+ @Excel(name = "绫诲瀷")
+ private String apptype;
+
+ /** 骞存湀 */
+ @ApiModelProperty("骞存湀")
+ @Excel(name = "骞存湀")
+ private String yearmonth;
+
+ /** 鍞竴鍊� */
+ @ApiModelProperty("鍞竴鍊�")
+ @Excel(name = "鍞竴鍊�")
+ private Long serialnumber;
+
+}
+
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceTasknumMapper.java b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceTasknumMapper.java
new file mode 100644
index 0000000..632dfa4
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceTasknumMapper.java
@@ -0,0 +1,23 @@
+package com.ruoyi.project.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import java.util.List;
+import com.ruoyi.project.domain.ServiceTasknum;
+
+/**
+ * 宸梾锛屼笓瀹讹紝鍔炲叕锛屽尰瀛︼紝浼︾悊 ...... 浠诲姟缂栧彿Mapper鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2023-08-31
+ */
+public interface ServiceTasknumMapper extends BaseMapper<ServiceTasknum>
+{
+ /**
+ * 鏌ヨ宸梾锛屼笓瀹讹紝鍔炲叕锛屽尰瀛︼紝浼︾悊 ...... 浠诲姟缂栧彿鍒楄〃
+ *
+ * @param serviceTasknum 宸梾锛屼笓瀹讹紝鍔炲叕锛屽尰瀛︼紝浼︾悊 ...... 浠诲姟缂栧彿
+ * @return 宸梾锛屼笓瀹讹紝鍔炲叕锛屽尰瀛︼紝浼︾悊 ...... 浠诲姟缂栧彿闆嗗悎
+ */
+ public List<ServiceTasknum> selectServiceTasknumList(ServiceTasknum serviceTasknum);
+}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceTasknumService.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceTasknumService.java
new file mode 100644
index 0000000..e80d1b7
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceTasknumService.java
@@ -0,0 +1,24 @@
+package com.ruoyi.project.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.project.domain.ServiceTasknum;
+
+import java.util.List;
+
+/**
+ * 宸梾锛屼笓瀹讹紝鍔炲叕锛屽尰瀛︼紝浼︾悊 ...... 浠诲姟缂栧彿Service鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2023-08-31
+ */
+public interface IServiceTasknumService extends IService<ServiceTasknum>
+{
+
+ /**
+ * 鏌ヨ宸梾锛屼笓瀹讹紝鍔炲叕锛屽尰瀛︼紝浼︾悊 ...... 浠诲姟缂栧彿鍒楄〃
+ *
+ * @param serviceTasknum 宸梾锛屼笓瀹讹紝鍔炲叕锛屽尰瀛︼紝浼︾悊 ...... 浠诲姟缂栧彿
+ * @return 宸梾锛屼笓瀹讹紝鍔炲叕锛屽尰瀛︼紝浼︾悊 ...... 浠诲姟缂栧彿闆嗗悎
+ */
+ public List<ServiceTasknum> queryList(ServiceTasknum serviceTasknum);
+}
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 4857017..db211f1 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
@@ -695,6 +695,8 @@
if (serviceFunddetailVO.getTaxedamount() != null && serviceFunddetailVO.getAmount() != null && serviceFunddetailVO.getTaxedamount() != 0.0 && serviceFunddetailVO.getAmount() != 0.0) {
// 绋庡墠绋庡悗閮戒笉涓虹┖
ServiceFunddetail serviceFunddetail = DtoConversionUtils.sourceToTarget(serviceFunddetailVO, ServiceFunddetail.class);
+
+
if (serviceFunddetailVO.getId() == null) {
serviceFunddetailService.save(serviceFunddetail);
} else {
@@ -746,6 +748,15 @@
//灏嗙◣鍓嶃�佺◣鍚庨噾棰濇洿鏂板埌fund琛ㄤ腑
serviceFundVO.setPretaxcost(taxBefore);
serviceFundVO.setTaxedcost(taxAfter);
+ //鐢宠閲戦涓哄惈绋庨噾棰�
+ if (serviceFundVO.getApplytype().equals("1") || serviceFundVO.getApplytype().equals("2")) {
+ //涓◣ 绋庡墠锛堟湁绋庯級 - 绋� = 绋庡悗
+ serviceFundVO.setAmountrequested(taxBefore);
+ } else {
+ //閲囪喘 绋庡墠锛堟棤绋庯級 + 绋� = 绋庡悗锛堝惈绋庨噾棰濓級
+ serviceFundVO.setAmountrequested(taxAfter);
+ }
+
updateById(serviceFundVO);
return id;
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceTasknumServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceTasknumServiceImpl.java
new file mode 100644
index 0000000..9846650
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceTasknumServiceImpl.java
@@ -0,0 +1,46 @@
+package com.ruoyi.project.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.project.domain.ServiceTasknum;
+import com.ruoyi.project.mapper.ServiceTasknumMapper;
+import com.ruoyi.project.service.IServiceTasknumService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 宸梾锛屼笓瀹讹紝鍔炲叕锛屽尰瀛︼紝浼︾悊 ...... 浠诲姟缂栧彿Service涓氬姟灞傚鐞�
+ *
+ * @author ruoyi
+ * @date 2023-08-31
+ */
+@Service
+public class ServiceTasknumServiceImpl extends ServiceImpl<ServiceTasknumMapper, ServiceTasknum> implements IServiceTasknumService
+{
+
+
+ /**
+ * 鏌ヨ宸梾锛屼笓瀹讹紝鍔炲叕锛屽尰瀛︼紝浼︾悊 ...... 浠诲姟缂栧彿鍒楄〃
+ *
+ * @param serviceTasknum 宸梾锛屼笓瀹讹紝鍔炲叕锛屽尰瀛︼紝浼︾悊 ...... 浠诲姟缂栧彿
+ * @return 宸梾锛屼笓瀹讹紝鍔炲叕锛屽尰瀛︼紝浼︾悊 ...... 浠诲姟缂栧彿
+ */
+ @Override
+ public List<ServiceTasknum> queryList(ServiceTasknum serviceTasknum) {
+ LambdaQueryWrapper<ServiceTasknum> wrappers = Wrappers.lambdaQuery();
+ if (StringUtils.isNotBlank(serviceTasknum.getApptype())){
+ wrappers.eq(ServiceTasknum::getApptype ,serviceTasknum.getApptype());
+ }
+ if (StringUtils.isNotBlank(serviceTasknum.getYearmonth())){
+ wrappers.eq(ServiceTasknum::getYearmonth ,serviceTasknum.getYearmonth());
+ }
+ if (serviceTasknum.getSerialnumber() != null){
+ wrappers.eq(ServiceTasknum::getSerialnumber ,serviceTasknum.getSerialnumber());
+ }
+ return this.list(wrappers);
+ }
+
+}
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml
index 4f24a2c..030503a 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml
@@ -54,6 +54,7 @@
<result property="backflowlevel" column="backFlowLevel"/>
<result property="zffs" column="zffs"/>
<result property="riqi" column="riqi"/>
+ <result property="bh" column="bh"/>
</resultMap>
@@ -107,7 +108,8 @@
backflowlevel,
FlowLevel,
zffs,
- riqi
+ riqi,
+ bh
from service_fund
</sql>
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml
index 21aa1f1..7bfcf22 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml
@@ -59,6 +59,7 @@
<result property="backflowlevel" column="backFlowLevel"/>
<result property="zffs" column="zffs"/>
<result property="riqi" column="riqi"/>
+ <result property="bh" column="bh"/>
</resultMap>
<sql id="selectServiceReimbursementVo">
@@ -113,7 +114,8 @@
donorrelatives,
backFlowLevel,
zffs,
- riqi
+ riqi,
+ bh
from service_reimbursement
</sql>
@@ -165,7 +167,7 @@
<select id="getRDInfoByItem" resultType="com.ruoyi.project.domain.ServiceReimbursementEo">
SELECT a.id as id,a.UserNo as userno,a.FlowLevel as recordstatus,b.persontype as persontype,a.create_time as
- createTime,a.managername as managername,
+ createTime,a.managername as managername,a.bh as bh,
a.UserName as username,b.personname as travelers,a.AmountRequested as amountrequested,a.Reason as reason,a.Phone
as phone,a.DepositBank as depositbank,a.BankCardNo as bankcardno,a.DonorName as donorname,b.trafficexpense as
trafficexpense,b.hotelexpense as hotelexpense,b.FoodExpenses as foodexpenses, b.foodallowance as foodallowance,
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceTasknumMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceTasknumMapper.xml
new file mode 100644
index 0000000..89f0ecd
--- /dev/null
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceTasknumMapper.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.project.mapper.ServiceTasknumMapper">
+
+ <resultMap type="com.ruoyi.project.domain.ServiceTasknum" id="ServiceTasknumResult">
+ <result property="id" column="id"/>
+ <result property="apptype" column="apptype"/>
+ <result property="yearmonth" column="yearmonth"/>
+ <result property="serialnumber" column="serialnumber"/>
+ </resultMap>
+
+ <sql id="selectServiceTasknumVo">
+ select id, apptype, yearmonth, serialnumber
+ from service_tasknum
+ </sql>
+
+ <select id="selectServiceTasknumList" parameterType="com.ruoyi.project.domain.ServiceTasknum"
+ resultMap="ServiceTasknumResult">
+ <include refid="selectServiceTasknumVo"/>
+ <where>
+ <if test="apptype != null and apptype != ''">and apptype = #{apptype}</if>
+ <if test="yearmonth != null and yearmonth != ''">and yearmonth = #{yearmonth}</if>
+ <if test="serialnumber != null ">and serialnumber = #{serialnumber}</if>
+ </where>
+ </select>
+
+</mapper>
\ No newline at end of file
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 b7f39b1..be4cbbc 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,21 +1,17 @@
package com.ruoyi.quartz.task;
import com.ruoyi.project.domain.*;
-import com.ruoyi.project.domain.vo.DingTalkReqVo;
import com.ruoyi.project.service.*;
-import com.ruoyi.project.service.impl.DingTalkServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import com.ruoyi.common.utils.StringUtils;
import org.springframework.util.CollectionUtils;
-import java.lang.reflect.Array;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.locks.ReentrantLock;
/**
* 瀹氭椂浠诲姟璋冨害娴嬭瘯
@@ -27,6 +23,9 @@
public class RyTask {
@Autowired
private DingTalkService dingTalkService;
+
+ @Autowired
+ private IServiceTasknumService ServiceTasknumService;
@Autowired
private IServiceReimbursementSharedService serviceReimbursementSharedService;
@@ -83,8 +82,10 @@
} else {
//涓嶆槸閫�鍥炵殑鎿嶄綔
if (StringUtils.isNotBlank(serviceFundShared.getZffs()) && serviceFundShared.getSpjg() == 0) {
+ String bh = myMethod();
//閽卞凡缁忓埌甯�,骞朵笖瀹℃壒缁撴灉涓�0锛岃鏄庡鎵圭粨鏉燂紝浣嗘暟鎹繕娌℃湁鍚屾鍒癴und琛ㄥ拰fundflow琛�;瀵筬und琛ㄥ拰fundflow琛ㄨ繘琛屾洿鏂帮紝骞跺皢0鏀规垚1
ServiceFund serviceFund = new ServiceFund();
+ serviceFund.setBh(bh);
serviceFund.setId(serviceFundShared.getSerfunid());
serviceFund.setZffs(serviceFundShared.getZffs());
if (StringUtils.isNotBlank(serviceFundShared.getPresident())) {
@@ -308,12 +309,13 @@
//涓嶆槸閫�鍥炵殑鎿嶄綔
if (StringUtils.isNotBlank(serviceReimbursementShared.getZffs()) && serviceReimbursementShared.getSpjg() == 0) {
- //閽卞凡缁忓埌甯�,骞朵笖瀹℃壒缁撴灉涓�0锛岃鏄庡鎵圭粨鏉燂紝浣嗘暟鎹繕娌℃湁鍚屾鍒癴und琛ㄥ拰fundflow琛�;瀵筬und琛ㄥ拰fundflow琛ㄨ繘琛屾洿鏂帮紝骞跺皢0鏀规垚1
+ String bh = myMethod();
+ //閽卞凡缁忓埌甯�,骞朵笖瀹℃壒缁撴灉涓�0(0涓哄鎵逛腑)锛岃鏄庡鎵圭粨鏉燂紝浣嗘暟鎹繕娌℃湁鍚屾鍒癴und琛ㄥ拰fundflow琛�;瀵筬und琛ㄥ拰fundflow琛ㄨ繘琛屾洿鏂帮紝骞跺皢0鏀规垚1锛�1瀹℃壒缁撴潫锛�
ServiceReimbursement serviceReimbursement = new ServiceReimbursement();
serviceReimbursement.setId(serviceReimbursementShared.getReimid());
serviceReimbursement.setZffs(serviceReimbursementShared.getZffs());
serviceReimbursement.setRiqi(serviceReimbursementShared.getRiqi());
-
+ serviceReimbursement.setBh(bh);
if (StringUtils.isNotBlank(serviceReimbursementShared.getPresident())) {
serviceReimbursement.setPresident(serviceReimbursementShared.getPresident());
}
@@ -537,4 +539,48 @@
// dingTalkService.sendNotification(dingTalkReqVo);
}
+ private ReentrantLock lock = new ReentrantLock();
+
+ public String myMethod() {
+ lock.lock();
+ String bh = null;
+ try {
+ // 浠ｇ爜鍧�
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMM");
+ String format = simpleDateFormat.format(new Date());
+ ServiceTasknum serviceTasknum = new ServiceTasknum();
+ serviceTasknum.setYearmonth(format);
+ //CW 璐㈠姟
+ serviceTasknum.setApptype("CW");
+ List<ServiceTasknum> serviceTasknums = ServiceTasknumService.queryList(serviceTasknum);
+ long nums = 1;
+ if (CollectionUtils.isEmpty(serviceTasknums)) {
+ //杩涜鎻掑叆鎿嶄綔
+ serviceTasknum.setSerialnumber(nums);
+ ServiceTasknumService.save(serviceTasknum);
+ bh = serviceTasknum.getYearmonth() + "0" + nums;
+ } else {
+ //鑾峰彇鍞竴鍊肩殑鏈�澶у��
+ nums = serviceTasknums.stream().mapToLong(ServiceTasknum::getSerialnumber).max().getAsLong() + 1;
+
+ ServiceTasknum serviceTasknum1 = serviceTasknums.get(0);
+ serviceTasknum1.setSerialnumber(nums);
+ //瀵硅鏉℃暟鎹殑鍞竴鍊煎姞1
+ ServiceTasknumService.updateById(serviceTasknum1);
+ //灏嗙敓鎴愮殑缂栧彿杩斿洖
+ if (nums < 10) {
+ bh = serviceTasknums.get(0).getYearmonth() + "0" + nums;
+ } else {
+ bh = serviceTasknums.get(0).getYearmonth() + nums;
+ }
+ }
+ } catch (Exception e) {
+ log.error("鑾峰彇缂栧彿澶辫触浜唟}", e.getStackTrace());
+ } finally {
+ lock.unlock();
+ }
+ return bh;
+ }
+
+
}
--
Gitblit v1.9.3