From da3edb56ef670c58f6de09d28fde986d6be5a845 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 27 九月 2023 17:00:19 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceExternalpersonGroup.java | 55 +++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceEthicalreviewopinionsController.java | 2
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementEo.java | 7
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementpayeeController.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceExternalpersonGroupController.java | 117 ++++++
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailServiceImpl.java | 77 ++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseExpertfeetypeController.java | 28 -
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFundShared.java | 7
ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml | 4
ruoyi-project/src/main/resources/mapper/project/ServiceExternalpersonGroupMapper.xml | 71 ++++
ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementSharedMapper.xml | 4
ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFundService.java | 10
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java | 60 +++
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceExternalpersonGroupServiceImpl.java | 64 +++
ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceDocumentfilesMapper.java | 9
ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceExternalpersonGroupMapper.java | 29 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFunddetailController.java | 17 +
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateorgan.java | 46 +-
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementShared.java | 7
ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/ServicePersonInfoVo.java | 90 +++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementpayeeSharedController.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java | 13
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFunddetailSharedController.java | 2
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetail.java | 6
ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFunddetailService.java | 8
ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml | 48 +-
ruoyi-project/src/main/resources/mapper/project/ServiceFundSharedMapper.xml | 6
ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml | 7
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDocumentfilesController.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysStudentController.java | 2
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFund.java | 7
ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml | 7
ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceExternalpersonGroupService.java | 31 +
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursement.java | 7
ruoyi-common/src/main/java/com/ruoyi/common/tax/PerformanceTaxtUtils.java | 116 ++++++
ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/TaxMoneyByItemEO.java | 9
36 files changed, 881 insertions(+), 98 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseExpertfeetypeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseExpertfeetypeController.java
index a594fbf..c666fc6 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseExpertfeetypeController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseExpertfeetypeController.java
@@ -1,7 +1,8 @@
-package com.ruoyi.project.controller;
+package com.ruoyi.web.controller.project;
import java.util.Arrays;
import java.util.List;
+
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -26,15 +27,14 @@
/**
* 涓撳璐圭敤Controller
- *
+ *
* @author ruoyi
* @date 2022-04-19
*/
@Api("涓撳璐圭敤")
@RestController
@RequestMapping("/project/expertfeetype")
-public class BaseExpertfeetypeController extends BaseController
-{
+public class BaseExpertfeetypeController extends BaseController {
@Autowired
private IBaseExpertfeetypeService baseExpertfeetypeService;
@@ -43,8 +43,7 @@
*/
@ApiOperation("鏌ヨ涓撳璐圭敤鍒楄〃")
@GetMapping("/list")
- public TableDataInfo list(BaseExpertfeetype baseExpertfeetype)
- {
+ public TableDataInfo list(BaseExpertfeetype baseExpertfeetype) {
startPage();
List<BaseExpertfeetype> list = baseExpertfeetypeService.queryList(baseExpertfeetype);
return getDataTable(list);
@@ -56,8 +55,7 @@
@ApiOperation("瀵煎嚭涓撳璐圭敤鍒楄〃")
@Log(title = "涓撳璐圭敤", businessType = BusinessType.EXPORT)
@GetMapping("/export")
- public AjaxResult export(BaseExpertfeetype baseExpertfeetype)
- {
+ public AjaxResult export(BaseExpertfeetype baseExpertfeetype) {
List<BaseExpertfeetype> list = baseExpertfeetypeService.queryList(baseExpertfeetype);
ExcelUtil<BaseExpertfeetype> util = new ExcelUtil<BaseExpertfeetype>(BaseExpertfeetype.class);
return util.exportExcel(list, "涓撳璐圭敤鏁版嵁");
@@ -68,8 +66,7 @@
*/
@ApiOperation("鑾峰彇涓撳璐圭敤璇︾粏淇℃伅")
@GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
return AjaxResult.success(baseExpertfeetypeService.getById(id));
}
@@ -80,8 +77,7 @@
@Log(title = "涓撳璐圭敤", businessType = BusinessType.INSERT)
@PostMapping
@RepeatSubmit
- public AjaxResult add(@RequestBody BaseExpertfeetype baseExpertfeetype)
- {
+ public AjaxResult add(@RequestBody BaseExpertfeetype baseExpertfeetype) {
return toAjax(baseExpertfeetypeService.save(baseExpertfeetype));
}
@@ -91,9 +87,8 @@
@ApiOperation("淇敼涓撳璐圭敤")
@Log(title = "涓撳璐圭敤", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
- @RepeatSubmit
- public AjaxResult edit(@RequestBody BaseExpertfeetype baseExpertfeetype)
- {
+ @RepeatSubmit
+ public AjaxResult edit(@RequestBody BaseExpertfeetype baseExpertfeetype) {
return toAjax(baseExpertfeetypeService.updateById(baseExpertfeetype));
}
@@ -103,8 +98,7 @@
@ApiOperation("鍒犻櫎涓撳璐圭敤")
@Log(title = "涓撳璐圭敤", businessType = BusinessType.DELETE)
@DeleteMapping("/remove/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
+ public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(baseExpertfeetypeService.removeByIds(Arrays.asList(ids)));
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDocumentfilesController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDocumentfilesController.java
index 8f40c36..2197372 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDocumentfilesController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDocumentfilesController.java
@@ -1,4 +1,4 @@
-package com.ruoyi.project.controller;
+package com.ruoyi.web.controller.project;
import java.util.Arrays;
import java.util.List;
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 7f56e1f..8f3537b 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
@@ -1,4 +1,4 @@
-package com.ruoyi.project.controller;
+package com.ruoyi.web.controller.project;
import java.util.Arrays;
import java.util.List;
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceExternalpersonGroupController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceExternalpersonGroupController.java
new file mode 100644
index 0000000..b8e68f0
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceExternalpersonGroupController.java
@@ -0,0 +1,117 @@
+package com.ruoyi.web.controller.project;
+
+import java.util.Arrays;
+import java.util.List;
+
+import com.ruoyi.project.domain.ServiceExternalpersonGroup;
+import com.ruoyi.project.domain.vo.ServicePersonInfoVo;
+import com.ruoyi.project.service.IServiceExternalpersonGroupService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+
+/**
+ * 浜哄憳鍜屽垎缁勭粍鍒叧鑱擟ontroller
+ *
+ * @author ruoyi
+ * @date 2023-09-26
+ */
+@Api("浜哄憳鍜屽垎缁勭粍鍒叧鑱�")
+@RestController
+@RequestMapping("/externalperson/group")
+public class ServiceExternalpersonGroupController extends BaseController {
+ @Autowired
+ private IServiceExternalpersonGroupService serviceExternalpersonGroupService;
+
+// /**
+// * 鏌ヨ浜哄憳鍜屽垎缁勭粍鍒叧鑱斿垪琛�
+// */
+// @ApiOperation("鏌ヨ浜哄憳鍜屽垎缁勭粍鍒叧鑱斿垪琛�")
+// @PreAuthorize("@ss.hasPermi('system:group:list')")
+// @GetMapping("/list")
+// public TableDataInfo list(ServiceExternalpersonGroup serviceExternalpersonGroup) {
+// startPage();
+// List<ServiceExternalpersonGroup> list = serviceExternalpersonGroupService.queryList(serviceExternalpersonGroup);
+// return getDataTable(list);
+// }
+
+ /**
+ * 鏌ヨ浜哄憳鍜屽垎缁勭粍鍒叧鑱斿垪琛�
+ * @return
+ */
+ @ApiOperation("鏌ヨ浜哄憳鍜屽垎缁勭粍鍒叧鑱斿垪琛�")
+ @GetMapping("/getPersonInfo/{groupId}")
+ public AjaxResult getPersonInfo(@PathVariable("groupId") Long groupId) {
+ if (groupId == null) {
+ return error("缁処D涓嶈兘涓虹┖");
+ }
+ List<ServicePersonInfoVo> personInfo = serviceExternalpersonGroupService.getPersonInfo(groupId);
+ return AjaxResult.success(personInfo);
+ }
+
+ /**
+ * 瀵煎嚭浜哄憳鍜屽垎缁勭粍鍒叧鑱斿垪琛�
+ */
+ @ApiOperation("瀵煎嚭浜哄憳鍜屽垎缁勭粍鍒叧鑱斿垪琛�")
+ @PreAuthorize("@ss.hasPermi('system:group:export')")
+ @Log(title = "浜哄憳鍜屽垎缁勭粍鍒叧鑱�", businessType = BusinessType.EXPORT)
+ @GetMapping("/export")
+ public AjaxResult export(ServiceExternalpersonGroup serviceExternalpersonGroup) {
+ List<ServiceExternalpersonGroup> list = serviceExternalpersonGroupService.queryList(serviceExternalpersonGroup);
+ ExcelUtil<ServiceExternalpersonGroup> util = new ExcelUtil<ServiceExternalpersonGroup>(ServiceExternalpersonGroup.class);
+ return util.exportExcel(list, "浜哄憳鍜屽垎缁勭粍鍒叧鑱旀暟鎹�");
+ }
+
+ /**
+ * 鑾峰彇浜哄憳鍜屽垎缁勭粍鍒叧鑱旇缁嗕俊鎭�
+ */
+ @ApiOperation("鑾峰彇浜哄憳鍜屽垎缁勭粍鍒叧鑱旇缁嗕俊鎭�")
+ @PreAuthorize("@ss.hasPermi('system:group:query')")
+ @GetMapping(value = "/{id}")
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
+ return AjaxResult.success(serviceExternalpersonGroupService.getById(id));
+ }
+
+ /**
+ * 鏂板浜哄憳鍜屽垎缁勭粍鍒叧鑱�
+ */
+ @ApiOperation("鏂板浜哄憳鍜屽垎缁勭粍鍒叧鑱�")
+ @PreAuthorize("@ss.hasPermi('system:group:add')")
+ @Log(title = "浜哄憳鍜屽垎缁勭粍鍒叧鑱�", businessType = BusinessType.INSERT)
+ @PostMapping
+ @RepeatSubmit
+ public AjaxResult add(@RequestBody ServiceExternalpersonGroup serviceExternalpersonGroup) {
+ return toAjax(serviceExternalpersonGroupService.save(serviceExternalpersonGroup));
+ }
+
+ /**
+ * 淇敼浜哄憳鍜屽垎缁勭粍鍒叧鑱�
+ */
+ @ApiOperation("淇敼浜哄憳鍜屽垎缁勭粍鍒叧鑱�")
+ @PreAuthorize("@ss.hasPermi('system:group:edit')")
+ @Log(title = "浜哄憳鍜屽垎缁勭粍鍒叧鑱�", businessType = BusinessType.UPDATE)
+ @PostMapping("/edit")
+ @RepeatSubmit
+ public AjaxResult edit(@RequestBody ServiceExternalpersonGroup serviceExternalpersonGroup) {
+ return toAjax(serviceExternalpersonGroupService.updateById(serviceExternalpersonGroup));
+ }
+
+ /**
+ * 鍒犻櫎浜哄憳鍜屽垎缁勭粍鍒叧鑱�
+ */
+ @ApiOperation("鍒犻櫎浜哄憳鍜屽垎缁勭粍鍒叧鑱�")
+ @PreAuthorize("@ss.hasPermi('system:group:remove')")
+ @Log(title = "浜哄憳鍜屽垎缁勭粍鍒叧鑱�", businessType = BusinessType.DELETE)
+ @GetMapping("/remove/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids) {
+ return toAjax(serviceExternalpersonGroupService.removeByIds(Arrays.asList(ids)));
+ }
+}
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 499fc8d..e2ca705 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
@@ -2003,4 +2003,17 @@
}
+
+ /**
+ * 缁╂晥璁＄畻
+ */
+ @ApiOperation("缁╂晥璁＄畻")
+ @Log(title = "缁╂晥璁＄畻", businessType = BusinessType.INSERT)
+ @PostMapping("/performance")
+ @RepeatSubmit
+ public AjaxResult performance(@RequestBody ServiceFundVO serviceFundVO) {
+
+ return AjaxResult.success(serviceFundService.performance(serviceFundVO));
+ }
+
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFunddetailController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFunddetailController.java
index 69d353b..a0d8937 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFunddetailController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFunddetailController.java
@@ -3,6 +3,7 @@
import java.io.*;
import java.util.*;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.project.domain.FunddetailReqVo;
import com.ruoyi.project.domain.vo.TaxMoneyVO;
import io.swagger.annotations.Api;
@@ -167,4 +168,20 @@
public AjaxResult calculateTax(@RequestBody List<ServiceFunddetail> serviceFunddetails) {
return AjaxResult.success(serviceFunddetailService.calculateTax(serviceFunddetails));
}
+
+// /**
+// * 缁╂晥璁＄畻
+// * <p>
+// * beneficiaryNO 鍙楃泭浜虹紪鍙�
+// */
+// @ApiOperation("缁╂晥璁＄畻")
+// @PostMapping(value = "/performance")
+// public AjaxResult performance(@RequestBody ServiceFunddetail serviceFunddetail) {
+// if (StringUtils.isBlank(serviceFunddetail.getBeneficiaryno())) {
+// return AjaxResult.error("鍙楃泭浜虹紪鍙蜂负绌�");
+// }
+//
+// return AjaxResult.success(serviceFunddetailService.performance(serviceFunddetail));
+// }
+
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFunddetailSharedController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFunddetailSharedController.java
index 5f2e1b8..d1e4943 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFunddetailSharedController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFunddetailSharedController.java
@@ -1,4 +1,4 @@
-package com.ruoyi.project.controller;
+package com.ruoyi.web.controller.project;
import java.util.Arrays;
import java.util.List;
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementpayeeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementpayeeController.java
index 54e72a8..1689352 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementpayeeController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementpayeeController.java
@@ -1,4 +1,4 @@
-package com.ruoyi.project.controller;
+package com.ruoyi.web.controller.project;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementpayeeSharedController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementpayeeSharedController.java
index 6896ce1..0b6c394 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementpayeeSharedController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementpayeeSharedController.java
@@ -1,4 +1,4 @@
-package com.ruoyi.project.controller;
+package com.ruoyi.web.controller.project;
import java.util.Arrays;
import java.util.List;
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysStudentController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysStudentController.java
index 5c7a0db..5bff8ca 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysStudentController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysStudentController.java
@@ -1,4 +1,4 @@
-package com.ruoyi.system.controller;
+package com.ruoyi.web.controller.system;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/tax/PerformanceTaxtUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/tax/PerformanceTaxtUtils.java
new file mode 100644
index 0000000..a1adfbc
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/tax/PerformanceTaxtUtils.java
@@ -0,0 +1,116 @@
+package com.ruoyi.common.tax;
+
+import java.math.BigDecimal;
+import java.text.DecimalFormat;
+
+/**
+ * 缁╂晥涓◣璁＄畻瑙勫垯
+ *
+ * @author ls
+ */
+public class PerformanceTaxtUtils {
+ /**
+ * 鍒嗛殧绗�
+ */
+ public static final String SEPARATOR = ",";
+
+ /**
+ * 鑾峰彇涓◣
+ *
+ * @param wages 宸ヨ祫 (鎵ｆ帀5000鍏冨厤绋� 鍜� 鎵ｆ帀绀句繚鐨勯噾棰�)
+ */
+ public static BigDecimal getPersonTaxation(BigDecimal wages) {
+ BigDecimal firstTax = new BigDecimal(0.0);
+ BigDecimal secondTax = new BigDecimal(0.0);
+ BigDecimal thirdTax = new BigDecimal(0.0);
+ BigDecimal fourthTax = new BigDecimal(0.0);
+ BigDecimal fifthTax = new BigDecimal(0.0);
+ BigDecimal sixthTax = new BigDecimal(0.0);
+ BigDecimal seventhTax = new BigDecimal(0.0);
+
+
+ //褰揦<=36000鏃剁殑绋�
+ if (wages.doubleValue() <= 36000) {
+ firstTax = wages.multiply(BigDecimal.valueOf(0.03));
+ } else if (wages.doubleValue() > 36000) {
+ firstTax = BigDecimal.valueOf(36000).multiply(BigDecimal.valueOf(0.03));
+ }
+
+ // 璁＄畻36000鍒�144000涔嬮棿鐨勭◣
+ if (wages.doubleValue() > 36000 && wages.doubleValue() <= 144000) {
+ //濡傛灉宸ヨ祫灏忎簬144000锛屽氨鐩存帴杩涜璁＄畻锛屽厛鍑忓幓36000鐨勯儴鍒嗭紝鍐嶇畻绋�
+ BigDecimal subtract = wages.subtract(BigDecimal.valueOf(36000));
+ secondTax = subtract.multiply(BigDecimal.valueOf(0.1));
+ } else if (wages.doubleValue() > 144000) {
+ //濡傛灉宸ヨ祫澶т簬144000锛屽氨鐩存帴鐢�144000杩涜璁＄畻锛屽厛鍑忓幓36000鐨勯儴鍒嗭紝鍐嶇畻绋�
+ BigDecimal subtract1 = BigDecimal.valueOf(144000).subtract(BigDecimal.valueOf(36000));
+ secondTax = subtract1.multiply(BigDecimal.valueOf(0.1));
+ }
+
+ // 璁＄畻300000鍒�144000涔嬮棿鐨勭◣
+ if (wages.doubleValue() > 144000 && wages.doubleValue() <= 300000) {
+ //濡傛灉宸ヨ祫灏忎簬300000锛屽氨鐩存帴杩涜璁＄畻锛屽厛鍑忓幓144000鐨勯儴鍒嗭紝鍐嶇畻绋�
+ BigDecimal subtract = wages.subtract(new BigDecimal(144000));
+ thirdTax = subtract.multiply(BigDecimal.valueOf(0.2));
+ } else if (wages.doubleValue() > 300000) {
+ //濡傛灉宸ヨ祫澶т簬300000锛屽氨鐩存帴鐢�300000杩涜璁＄畻锛屽厛鍑忓幓144000鐨勯儴鍒嗭紝鍐嶇畻绋�
+ BigDecimal subtract1 = BigDecimal.valueOf(300000).subtract(BigDecimal.valueOf(144000));
+ thirdTax = subtract1.multiply(BigDecimal.valueOf(0.2));
+ }
+
+ // 璁＄畻300000鍒�420000涔嬮棿鐨勭◣
+ if (wages.doubleValue() > 300000 && wages.doubleValue() <= 420000) {
+ //濡傛灉宸ヨ祫灏忎簬420000锛屽氨鐩存帴杩涜璁＄畻锛屽厛鍑忓幓300000鐨勯儴鍒嗭紝鍐嶇畻绋�
+ BigDecimal subtract = wages.subtract(BigDecimal.valueOf(300000));
+ fourthTax = subtract.multiply(BigDecimal.valueOf(0.25));
+ } else if (wages.doubleValue() > 420000) {
+ //濡傛灉宸ヨ祫澶т簬420000锛屽氨鐩存帴鐢�420000杩涜璁＄畻锛屽厛鍑忓幓300000鐨勯儴鍒嗭紝鍐嶇畻绋�
+ BigDecimal subtract1 = BigDecimal.valueOf(420000).subtract(BigDecimal.valueOf(300000));
+ fourthTax = subtract1.multiply(BigDecimal.valueOf(0.25));
+ }
+
+ //璁＄畻660000鍒�420000涔嬮棿鐨勭◣
+ if (wages.doubleValue() > 420000 && wages.doubleValue() <= 660000) {
+ //濡傛灉宸ヨ祫灏忎簬660000锛屽氨鐩存帴杩涜璁＄畻锛屽厛鍑忓幓420000鐨勯儴鍒嗭紝鍐嶇畻绋�
+ BigDecimal subtract = wages.subtract(BigDecimal.valueOf(420000));
+ fifthTax = subtract.multiply(BigDecimal.valueOf(0.3));
+ } else if (wages.doubleValue() > 660000) {
+ //濡傛灉宸ヨ祫澶т簬660000锛屽氨鐩存帴鐢�660000杩涜璁＄畻锛屽厛鍑忓幓420000鐨勯儴鍒嗭紝鍐嶇畻绋�
+ BigDecimal subtract1 = BigDecimal.valueOf(660000).subtract(BigDecimal.valueOf(420000));
+ fifthTax = subtract1.multiply(BigDecimal.valueOf(0.3));
+ }
+
+ // 璁＄畻660000鍒�960000涔嬮棿鐨勭◣
+ if (wages.doubleValue() > 660000 && wages.doubleValue() <= 960000) {
+ //濡傛灉宸ヨ祫灏忎簬960000锛屽氨鐩存帴杩涜璁＄畻锛屽厛鍑忓幓660000鐨勯儴鍒嗭紝鍐嶇畻绋�
+ BigDecimal subtract = wages.subtract(BigDecimal.valueOf(660000));
+ sixthTax = subtract.multiply(BigDecimal.valueOf(0.35));
+ } else if (wages.doubleValue() > 960000) {
+ //濡傛灉宸ヨ祫澶т簬960000锛屽氨鐩存帴鐢�960000杩涜璁＄畻锛屽厛鍑忓幓660000鐨勯儴鍒嗭紝鍐嶇畻绋�
+ BigDecimal subtract1 = BigDecimal.valueOf(960000).subtract(BigDecimal.valueOf(660000));
+ sixthTax = subtract1.multiply(BigDecimal.valueOf(0.35));
+ }
+
+ //960000浠ヤ笂鐨勭◣
+ if (wages.doubleValue() > 960000) {
+ //濡傛灉宸ヨ祫澶т簬960000锛屽氨鐩存帴杩涜璁＄畻锛屽厛鍑忓幓660000鐨勯儴鍒嗭紝鍐嶇畻绋�
+ BigDecimal subtract = wages.subtract(BigDecimal.valueOf(960000));
+ seventhTax = subtract.multiply(BigDecimal.valueOf(0.45));
+ }
+
+ //灏嗚绠楃殑绋庣浉鍔�
+ BigDecimal result = firstTax.add(secondTax).add(thirdTax).add(fourthTax).add(fifthTax).add(sixthTax).add(seventhTax);
+
+ return result;
+ }
+
+
+ public static void main(String[] args) {
+ BigDecimal personTaxation = getPersonTaxation(new BigDecimal(7654321));
+// String taxationBefore = getTaxationBefore(new BigDecimal(52000));
+
+
+ System.out.println(personTaxation);
+ }
+
+}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateorgan.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateorgan.java
index 7cc1686..f28723d 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateorgan.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateorgan.java
@@ -188,47 +188,47 @@
@ApiModelProperty("鐢宠浜虹紪鍙�")
- private String applicantUserID;
+ private String applicantuserid;
@ApiModelProperty("鐢宠浜哄鍚�")
- private String applicantUserName;
+ private String applicantusername;
@ApiModelProperty("鐢宠鏃堕棿")
- private Date applicantTime;
+ private Date applicanttime;
@ApiModelProperty("瀹℃牳浜虹紪鍙�")
- private String checkUserID;
+ private String checkuserid;
@ApiModelProperty("瀹℃牳浜哄鍚�")
- private String checkUserName;
+ private String checkusername;
@ApiModelProperty("瀹℃牳鏃堕棿")
- private Date checkTime;
+ private Date checktime;
@ApiModelProperty("瀹℃牳鎰忚")
- private String checkSuggestion;
+ private String checksuggestion;
@ApiModelProperty("0:鎻愪氦鍒嗛厤锛�1锛氬鏍搁�氳繃锛�2锛氬鏍告嫆缁�")
- private Integer allocationStatus;
+ private Integer allocationstatus;
@ApiModelProperty("绉绘浜哄鍚�")
private String name;
@ApiModelProperty("绉绘浜烘�у埆 鏍规嵁瀛楀吀sys_user_sex")
- private Integer sexOMMENT;
+ private Integer sex;
@ApiModelProperty("绉绘浜鸿瘉浠剁被鍨� 鏍规嵁瀛楀吀sys_IDType")
- private Integer idCardType;
+ private Integer idcardtype;
@ApiModelProperty("绉绘浜鸿瘉浠跺彿鐮�")
- private String idCardNo;
+ private String idcardno;
@ApiModelProperty("绉绘浜哄勾榫�")
private Integer age;
@ApiModelProperty("绉绘浜哄勾榫勫崟浣� 鏍规嵁瀛楀吀sys_AgeUnit")
- private String ageUnit;
+ private String ageunit;
@ApiModelProperty("绉绘浜哄嚭鐢熸棩鏈�")
private String birthday;
@@ -237,37 +237,37 @@
private String phone;
@ApiModelProperty("绉绘浜虹幇浣忓湴鍧�")
- private String residenceAddress;
+ private String residenceaddress;
@ApiModelProperty("绉绘浜虹幇浣忓湴鍧�鐪佷唬鐮�")
- private String residenceProvince;
+ private String residenceprovince;
@ApiModelProperty("绉绘浜虹幇浣忓湴鍧�鐪佸悕绉�")
- private String residenceProvinceName;
+ private String residenceprovincename;
@ApiModelProperty("绉绘浜哄競缂栧彿 鏍规嵁琛屾斂鍖哄垝琛�")
- private String residenceCity;
+ private String residencecity;
@ApiModelProperty("绉绘浜哄競鍚嶇О")
- private String residenceCityName;
+ private String residencecityname;
@ApiModelProperty("绉绘浜烘墍灞炶閬擄紙闀囷級鏍规嵁琛屾斂鍖哄垝琛�")
- private String residenceTown;
+ private String residencetown;
@ApiModelProperty("绉绘浜烘墍灞炶閬擄紙闀囷級鍚嶇О")
- private String residenceTownName;
+ private String residencetownname;
@ApiModelProperty("绉绘浜虹ぞ鍖猴紙鏉戯級缂栧彿 鏍规嵁琛屾斂鍖哄垝琛�")
- private String residenceCommunity;
+ private String residencecommunity;
@ApiModelProperty("绉绘浜虹ぞ鍖猴紙鏉戯級鍚嶇О")
- private String residenceCommunityName;
+ private String residencecommunityname;
@ApiModelProperty("绉绘浜烘墍灞炲尯鍩熺紪鍙� 鏍规嵁琛屾斂鍖哄垝琛�")
- private String residenceCountyCode;
+ private String residencecountycode;
@ApiModelProperty("绉绘浜烘墍灞炲尯鍩熷悕绉�")
- private String residenceCountyName;
+ private String residencecountyname;
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceExternalpersonGroup.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceExternalpersonGroup.java
new file mode 100644
index 0000000..54da674
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceExternalpersonGroup.java
@@ -0,0 +1,55 @@
+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_externalperson_group
+ *
+ * @author ruoyi
+ * @date 2023-09-26
+ */
+@Data
+@ApiModel("浜哄憳鍜屽垎缁勭粍鍒叧鑱�")
+public class ServiceExternalpersonGroup extends BaseEntity
+{
+ private static final long serialVersionUID = 1L;
+
+ /** id */
+ @ApiModelProperty("id")
+ //鏁版嵁搴撹嚜澧炴敼鎴怈TableId(type = IdType.AUTO)
+ @TableId(type = IdType.AUTO)
+ private Long id;
+
+ /** 浜哄憳ID */
+ @ApiModelProperty("浜哄憳ID")
+ @Excel(name = "浜哄憳ID")
+ private Long userId;
+
+ /** 浜哄憳鍒嗙粍ID */
+ @ApiModelProperty("浜哄憳鍒嗙粍ID")
+ @Excel(name = "浜哄憳鍒嗙粍ID")
+ private Long groupId;
+
+ /** 缁勫埆璇存槑 */
+ @ApiModelProperty("缁勫埆璇存槑")
+ @Excel(name = "缁勫埆璇存槑")
+ private String groupdesc;
+
+ /** 浜哄憳缂栧彿 */
+ @ApiModelProperty("浜哄憳缂栧彿")
+ @Excel(name = "浜哄憳缂栧彿")
+ private String userNo;
+
+ /** 浜哄憳濮撳悕 */
+ @ApiModelProperty("浜哄憳濮撳悕")
+ @Excel(name = "浜哄憳濮撳悕")
+ private String userName;
+
+}
+
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 c60dcd8..08e3e8b 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
@@ -332,5 +332,12 @@
@ApiModelProperty("棰勫鐘舵�侊細1銆佸緟棰勫锛�2銆侀绠楅�氳繃锛岀瓑寰呯焊璐ㄦ姤閿�鏉愭枡锛�3銆佹敹鍒扮焊璐ㄦ姤閿�鏉愭枡")
@Excel(name = "棰勫鐘舵�侊細1銆佸緟棰勫锛�2銆侀绠楅�氳繃锛岀瓑寰呯焊璐ㄦ姤閿�鏉愭枡锛�3銆佹敹鍒扮焊璐ㄦ姤閿�鏉愭枡")
private Integer checkstatus;
+
+ /**
+ * 缁╂晥锛�1銆佹湀搴︺��2瀛ｅ害銆�3骞村害
+ */
+ @ApiModelProperty("缁╂晥锛�1銆佹湀搴︺��2瀛ｅ害銆�3骞村害")
+ @Excel(name = "缁╂晥锛�1銆佹湀搴︺��2瀛ｅ害銆�3骞村害")
+ private Integer performancetype;
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFundShared.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFundShared.java
index 9d88f84..f268af3 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFundShared.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFundShared.java
@@ -381,5 +381,12 @@
*/
@ApiModelProperty("棰勫鐘舵�侊細1銆佸緟棰勫锛�2銆侀绠楅�氳繃锛岀瓑寰呯焊璐ㄦ姤閿�鏉愭枡锛�3銆佹敹鍒扮焊璐ㄦ姤閿�鏉愭枡")
private Integer checkstatus;
+
+ /**
+ * 缁╂晥锛�1銆佹湀搴︺��2瀛ｅ害銆�3骞村害
+ */
+ @ApiModelProperty("缁╂晥锛�1銆佹湀搴︺��2瀛ｅ害銆�3骞村害")
+ @Excel(name = "缁╂晥锛�1銆佹湀搴︺��2瀛ｅ害銆�3骞村害")
+ private Integer performancetype;
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetail.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetail.java
index 2854d23..2362ef7 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetail.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetail.java
@@ -341,5 +341,11 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date taxTime;
+ /**
+ * 缁╂晥鏃ユ湡
+ */
+ @ApiModelProperty("缁╂晥鏃ユ湡")
+ private String jxrq;
+
}
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 939bf3f..e6dd99f 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
@@ -330,6 +330,13 @@
@Excel(name = "棰勫鐘舵�侊細1銆佸緟棰勫锛�2銆侀绠楅�氳繃锛岀瓑寰呯焊璐ㄦ姤閿�鏉愭枡锛�3銆佹敹鍒扮焊璐ㄦ姤閿�鏉愭枡")
private Integer checkstatus;
+ /**
+ * 缁╂晥锛�1銆佹湀搴︺��2瀛ｅ害銆�3骞村害
+ */
+ @ApiModelProperty("缁╂晥锛�1銆佹湀搴︺��2瀛ｅ害銆�3骞村害")
+ @Excel(name = "缁╂晥锛�1銆佹湀搴︺��2瀛ｅ害銆�3骞村害")
+ private Integer performancetype;
+
// @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 370394c..fb888f5 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
@@ -350,5 +350,12 @@
@ApiModelProperty("甯傚唴浜ら�氳垂")
private BigDecimal cityfee;
+
+ /**
+ * 缁╂晥锛�1銆佹湀搴︺��2瀛ｅ害銆�3骞村害
+ */
+ @ApiModelProperty("缁╂晥锛�1銆佹湀搴︺��2瀛ｅ害銆�3骞村害")
+ @Excel(name = "缁╂晥锛�1銆佹湀搴︺��2瀛ｅ害銆�3骞村害")
+ private Integer performancetype;
}
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 e97622d..deff20c 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
@@ -380,6 +380,11 @@
@ApiModelProperty("棰勫鐘舵�侊細1銆佸緟棰勫锛�2銆侀绠楅�氳繃锛岀瓑寰呯焊璐ㄦ姤閿�鏉愭枡锛�3銆佹敹鍒扮焊璐ㄦ姤閿�鏉愭枡")
private Integer checkstatus;
-
+ /**
+ * 缁╂晥锛�1銆佹湀搴︺��2瀛ｅ害銆�3骞村害
+ */
+ @ApiModelProperty("缁╂晥锛�1銆佹湀搴︺��2瀛ｅ害銆�3骞村害")
+ @Excel(name = "缁╂晥锛�1銆佹湀搴︺��2瀛ｅ害銆�3骞村害")
+ private Integer performancetype;
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/ServicePersonInfoVo.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/ServicePersonInfoVo.java
new file mode 100644
index 0000000..3e22af4
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/ServicePersonInfoVo.java
@@ -0,0 +1,90 @@
+package com.ruoyi.project.domain.vo;
+
+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;
+
+/**
+ * 浜哄憳鍜屽垎缁勭粍鍒叧鑱斿璞� ServicePersonInfoVo
+ *
+ * @author ruoyi
+ * @date 2023-09-26
+ */
+@Data
+@ApiModel("浜哄憳鍜屽垎缁勭粍鍒叧鑱�")
+public class ServicePersonInfoVo extends BaseEntity
+{
+
+ /** 浜哄憳ID */
+ @ApiModelProperty("浜哄憳ID")
+ @Excel(name = "浜哄憳ID")
+ private Long userId;
+
+ /** 浜哄憳鍒嗙粍ID */
+ @ApiModelProperty("浜哄憳鍒嗙粍ID")
+ @Excel(name = "浜哄憳鍒嗙粍ID")
+ private Long groupId;
+
+ /** 缁勫埆璇存槑 */
+ @ApiModelProperty("缁勫埆璇存槑")
+ @Excel(name = "缁勫埆璇存槑")
+ private String groupdesc;
+
+ /** 浜哄憳缂栧彿 */
+ @ApiModelProperty("浜哄憳缂栧彿")
+ @Excel(name = "浜哄憳缂栧彿")
+ private String userNo;
+
+ /** 浜哄憳濮撳悕 */
+ @ApiModelProperty("浜哄憳濮撳悕")
+ @Excel(name = "浜哄憳濮撳悕")
+ private String userName;
+
+ /** 韬唤璇佸彿 */
+ @ApiModelProperty("韬唤璇佸彿")
+ @Excel(name = "韬唤璇佸彿")
+ private String IDCardNo;
+
+
+ /** 鎵嬫満鍙� */
+ @ApiModelProperty("鎵嬫満鍙�")
+ @Excel(name = "鎵嬫満鍙�")
+ private String telephone;
+
+ /** 鎵嬫満鍙� */
+ @ApiModelProperty("鎵嬫満鍙�")
+ @Excel(name = "鎵嬫満鍙�")
+ private String userType;
+
+ /** 鍗曚綅鍚嶇О */
+ @ApiModelProperty("鍗曚綅鍚嶇О")
+ @Excel(name = "鍗曚綅鍚嶇О")
+ private String unitName;
+
+ /** 鍗曚綅缂栧彿 */
+ @ApiModelProperty("鍗曚綅缂栧彿")
+ @Excel(name = "鍗曚綅缂栧彿")
+ private String unitNo;
+
+ /** 鎵嬫満鍙� */
+ @ApiModelProperty("鑱岀О,瑙佸瓧鍏竤ys_professionaltitle")
+ @Excel(name = "鑱岀О,瑙佸瓧鍏竤ys_professionaltitle")
+ private String title;
+
+ /** 寮�鎴烽摱琛� */
+ @ApiModelProperty("寮�鎴烽摱琛�")
+ @Excel(name = "寮�鎴烽摱琛�")
+ private String depositBank;
+
+ /** 鎵嬫満鍙� */
+ @ApiModelProperty("鍗″彿")
+ @Excel(name = "鍗″彿")
+ private String bankCardNo;
+
+
+}
+
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/TaxMoneyByItemEO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/TaxMoneyByItemEO.java
index 6688623..936ec16 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/TaxMoneyByItemEO.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/TaxMoneyByItemEO.java
@@ -11,9 +11,14 @@
public class TaxMoneyByItemEO extends BaseEntity {
/**
- * 鍙楃泭浜虹紪鍙�
+ * 鍙楃泭浜虹紪鍙�(杩欎釜涓嶈兘鐢ㄤ簡锛屾湁閲嶅)
*/
private String beneficiaryNo;
+
+ /**
+ * 韬唤璇佸彿
+ */
+ private String IDCard;
/**
* 璐圭敤鍒涘缓鏃堕棿
@@ -30,7 +35,7 @@
/**
* 浜哄憳绫诲埆
*/
- private List<Long> applyTypes;
+ private List<String> applyTypes;
/**
* 璧勯噾鐢宠涓昏〃ID
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceDocumentfilesMapper.java b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceDocumentfilesMapper.java
index 38293e3..0e61551 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceDocumentfilesMapper.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceDocumentfilesMapper.java
@@ -2,17 +2,20 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
import java.util.List;
+
import com.ruoyi.project.domain.ServiceDocumentfiles;
+import org.apache.ibatis.annotations.Mapper;
/**
* 鎹愮尞闄勪欢Mapper鎺ュ彛
- *
+ *
* @author ruoyi
* @date 2022-04-08
*/
-public interface ServiceDocumentfilesMapper extends BaseMapper<ServiceDocumentfiles>
-{
+@Mapper
+public interface ServiceDocumentfilesMapper extends BaseMapper<ServiceDocumentfiles> {
/**
* 鏌ヨ鎹愮尞闄勪欢鍒楄〃
*
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceExternalpersonGroupMapper.java b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceExternalpersonGroupMapper.java
new file mode 100644
index 0000000..d31e432
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceExternalpersonGroupMapper.java
@@ -0,0 +1,29 @@
+package com.ruoyi.project.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.project.domain.ServiceExternalpersonGroup;
+import com.ruoyi.project.domain.vo.ServicePersonInfoVo;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 浜哄憳鍜屽垎缁勭粍鍒叧鑱擬apper鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2023-09-26
+ */
+@Mapper
+public interface ServiceExternalpersonGroupMapper extends BaseMapper<ServiceExternalpersonGroup> {
+ /**
+ * 鏌ヨ浜哄憳鍜屽垎缁勭粍鍒叧鑱斿垪琛�
+ *
+ * @param serviceExternalpersonGroup 浜哄憳鍜屽垎缁勭粍鍒叧鑱�
+ * @return 浜哄憳鍜屽垎缁勭粍鍒叧鑱旈泦鍚�
+ */
+ public List<ServiceExternalpersonGroup> selectServiceExternalpersonGroupList(ServiceExternalpersonGroup serviceExternalpersonGroup);
+
+ public List<ServicePersonInfoVo> getPersonInfo(Long groupId);
+
+}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceExternalpersonGroupService.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceExternalpersonGroupService.java
new file mode 100644
index 0000000..6a8d18c
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceExternalpersonGroupService.java
@@ -0,0 +1,31 @@
+package com.ruoyi.project.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.project.domain.ServiceExternalpersonGroup;
+import com.ruoyi.project.domain.vo.ServicePersonInfoVo;
+
+import java.util.List;
+
+/**
+ * 浜哄憳鍜屽垎缁勭粍鍒叧鑱擲ervice鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2023-09-26
+ */
+public interface IServiceExternalpersonGroupService extends IService<ServiceExternalpersonGroup> {
+
+ /**
+ * 鏌ヨ浜哄憳鍜屽垎缁勭粍鍒叧鑱斿垪琛�
+ *
+ * @param serviceExternalpersonGroup 浜哄憳鍜屽垎缁勭粍鍒叧鑱�
+ * @return 浜哄憳鍜屽垎缁勭粍鍒叧鑱旈泦鍚�
+ */
+ public List<ServiceExternalpersonGroup> queryList(ServiceExternalpersonGroup serviceExternalpersonGroup);
+
+ /**
+ * 鏌ヨ浜哄憳鍜屽垎缁勭粍鍒叧鑱斿垪琛�
+ * @param groupId
+ * @return
+ */
+ List<ServicePersonInfoVo> getPersonInfo(Long groupId);
+}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFundService.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFundService.java
index 322fa54..afce50b 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFundService.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFundService.java
@@ -1,6 +1,7 @@
package com.ruoyi.project.service;
import java.util.List;
+import java.util.Map;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.project.domain.ServiceFund;
@@ -42,7 +43,6 @@
List<ServiceFund> selectServiceFundList(ServiceFund serviceFund);
-
List<FundVO> selectVOList(FundVO fundVO);
@@ -57,4 +57,12 @@
int countItem(Long infoid, Long itemid);
Long addOrUpdateNew(ServiceFundVO serviceFundVO);
+
+ /**
+ * 缁╂晥璁＄畻
+ *
+ * @param serviceFundVO
+ * @return
+ */
+ Map<String,Long> performance(ServiceFundVO serviceFundVO);
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFunddetailService.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFunddetailService.java
index 799ea55..b0ce052 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFunddetailService.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFunddetailService.java
@@ -1,6 +1,7 @@
package com.ruoyi.project.service;
import java.util.List;
+import java.util.Map;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -67,4 +68,11 @@
* @param serviceFunddetails
*/
public Boolean calculateTax(List<ServiceFunddetail> serviceFunddetails);
+
+ /**
+ * 缁╂晥璁＄畻
+ * <p>
+ * beneficiaryNO 鍙楃泭浜虹紪鍙�
+ */
+ Map<String, Double> performance(ServiceFunddetail serviceFunddetail);
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceExternalpersonGroupServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceExternalpersonGroupServiceImpl.java
new file mode 100644
index 0000000..4f08414
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceExternalpersonGroupServiceImpl.java
@@ -0,0 +1,64 @@
+package com.ruoyi.project.service.impl;
+
+import java.util.List;
+
+import com.ruoyi.project.domain.ServiceExternalpersonGroup;
+import com.ruoyi.project.domain.vo.ServicePersonInfoVo;
+import com.ruoyi.project.mapper.ServiceExternalpersonGroupMapper;
+import com.ruoyi.project.service.IServiceExternalpersonGroupService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+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;
+
+/**
+ * 浜哄憳鍜屽垎缁勭粍鍒叧鑱擲ervice涓氬姟灞傚鐞�
+ *
+ * @author ruoyi
+ * @date 2023-09-26
+ */
+@Service
+public class ServiceExternalpersonGroupServiceImpl extends ServiceImpl<ServiceExternalpersonGroupMapper, ServiceExternalpersonGroup> implements IServiceExternalpersonGroupService {
+ @Autowired
+ ServiceExternalpersonGroupMapper serviceExternalpersonGroupMapper;
+
+
+ /**
+ * 鏌ヨ浜哄憳鍜屽垎缁勭粍鍒叧鑱斿垪琛�
+ *
+ * @param serviceExternalpersonGroup 浜哄憳鍜屽垎缁勭粍鍒叧鑱�
+ * @return 浜哄憳鍜屽垎缁勭粍鍒叧鑱�
+ */
+ @Override
+ public List<ServiceExternalpersonGroup> queryList(ServiceExternalpersonGroup serviceExternalpersonGroup) {
+ LambdaQueryWrapper<ServiceExternalpersonGroup> wrappers = Wrappers.lambdaQuery();
+ if (serviceExternalpersonGroup.getUserId() != null) {
+ wrappers.eq(ServiceExternalpersonGroup::getUserId, serviceExternalpersonGroup.getUserId());
+ }
+ if (serviceExternalpersonGroup.getGroupId() != null) {
+ wrappers.eq(ServiceExternalpersonGroup::getGroupId, serviceExternalpersonGroup.getGroupId());
+ }
+ if (StringUtils.isNotBlank(serviceExternalpersonGroup.getGroupdesc())) {
+ wrappers.eq(ServiceExternalpersonGroup::getGroupdesc, serviceExternalpersonGroup.getGroupdesc());
+ }
+ if (StringUtils.isNotBlank(serviceExternalpersonGroup.getUserNo())) {
+ wrappers.eq(ServiceExternalpersonGroup::getUserNo, serviceExternalpersonGroup.getUserNo());
+ }
+ if (StringUtils.isNotBlank(serviceExternalpersonGroup.getUserName())) {
+ wrappers.like(ServiceExternalpersonGroup::getUserName, serviceExternalpersonGroup.getUserName());
+ }
+ return this.list(wrappers);
+ }
+
+ @Override
+ public List<ServicePersonInfoVo> getPersonInfo(Long groupId) {
+ if (groupId != null) {
+ List<ServicePersonInfoVo> personInfo = serviceExternalpersonGroupMapper.getPersonInfo(groupId);
+ return personInfo;
+ }
+ return null;
+ }
+
+}
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 dd8a559..2b30630 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
@@ -682,14 +682,8 @@
public Long addOrUpdateNew(ServiceFundVO serviceFundVO) {
Long id = null;
//灏嗘暟鎹繚瀛樺埌fund琛�
- if (ObjectUtils.isNotEmpty(serviceFundVO) && serviceFundVO.getId() == null) {
- serviceFundVO.setCheckstatus(serviceFundVO.getCheckstatus() == null ? 1 : 2);
- save(serviceFundVO);
- id = serviceFundVO.getId();
- } else {
- updateById(serviceFundVO);
- id = serviceFundVO.getId();
- }
+ id = saveFund(serviceFundVO);
+
List<ServiceFunddetailVO> serviceFunddetails = serviceFundVO.getServiceFunddetails();
if (CollectionUtils.isEmpty(serviceFunddetails)) {
System.out.println("serviceFunddetails涓虹┖鍠�");
@@ -712,6 +706,42 @@
}
return id;
+ }
+
+ @Override
+ public Map<String, Long> performance(ServiceFundVO serviceFundVO) {
+ Long id = null;
+ //灏嗘暟鎹繚瀛樺埌fund琛�
+ id = saveFund(serviceFundVO);
+
+ List<ServiceFunddetailVO> serviceFunddetails = serviceFundVO.getServiceFunddetails();
+ if (CollectionUtils.isEmpty(serviceFunddetails)) {
+ System.out.println("serviceFunddetails涓虹┖鍠�");
+ return null;
+ }
+
+ //鎬荤◣鍓�
+ Double pretaxcosts = 0.00;
+ //鎬荤◣鍚�
+ Double taxedcosts = 0.00;
+ for (ServiceFunddetailVO serviceFunddetailVO : serviceFunddetails) {
+ serviceFunddetailVO.setFundid(id);
+
+ ServiceFunddetail serviceFunddetail = DtoConversionUtils.sourceToTarget(serviceFunddetailVO, ServiceFunddetail.class);
+ Map<String, Double> performance = serviceFunddetailService.performance(serviceFunddetail);
+ if (!performance.isEmpty()) {
+ Double amount = performance.get("amount");
+ Double taxedamount = performance.get("taxedamount");
+ pretaxcosts = pretaxcosts + amount;
+ taxedcosts = taxedcosts + taxedamount;
+ }
+ serviceFundVO.setPretaxcost(pretaxcosts);
+ serviceFundVO.setTaxedcost(taxedcosts);
+ updateById(serviceFundVO);
+ }
+ Map map = new HashMap();
+ map.put("fundId", id);
+ return map;
}
int uploadOAFileAndUpdateDb(ServiceFunddetailShared remShare) {
@@ -869,4 +899,18 @@
// return 0;
// }
+ public long saveFund(ServiceFundVO serviceFundVO) {
+ Long id = null;
+ //灏嗘暟鎹繚瀛樺埌fund琛�
+ if (ObjectUtils.isNotEmpty(serviceFundVO) && serviceFundVO.getId() == null) {
+ serviceFundVO.setCheckstatus(serviceFundVO.getCheckstatus() == null ? 1 : 2);
+ save(serviceFundVO);
+ id = serviceFundVO.getId();
+ } else {
+ updateById(serviceFundVO);
+ id = serviceFundVO.getId();
+ }
+ return id;
+ }
+
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailServiceImpl.java
index cce249e..ffafa84 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailServiceImpl.java
@@ -5,12 +5,11 @@
import java.time.LocalDate;
import java.time.ZoneId;
import java.time.temporal.TemporalAdjusters;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.ruoyi.common.tax.PerformanceTaxtUtils;
import com.ruoyi.common.tax.TaxtUtils;
import com.ruoyi.common.utils.bean.DtoConversionUtils;
import com.ruoyi.project.domain.*;
@@ -81,6 +80,18 @@
}
if (serviceFunddetail.getUploadtime() != null) {
wrappers.eq(ServiceFunddetail::getUploadtime, serviceFunddetail.getUploadtime());
+ }
+ if (serviceFunddetail.getJxrq() != null) {
+ wrappers.like(ServiceFunddetail::getJxrq, serviceFunddetail.getJxrq());
+ }
+ if (StringUtils.isNotBlank(serviceFunddetail.getIdcardno())) {
+ wrappers.eq(ServiceFunddetail::getIdcardno, serviceFunddetail.getIdcardno());
+ }
+ if (StringUtils.isNotBlank(serviceFunddetail.getApplytype())) {
+ wrappers.eq(ServiceFunddetail::getApplytype, serviceFunddetail.getApplytype());
+ }
+ if (serviceFunddetail.getDel_flag() != null) {
+ wrappers.eq(ServiceFunddetail::getDel_flag, serviceFunddetail.getDel_flag());
}
return this.list(wrappers);
}
@@ -256,7 +267,8 @@
taxMoneyVO.setFirstDay(firstDay);
// taxMoneyVO.setApplyType(Long.valueOf(serviceFunddetail.getApplytype()));
taxMoneyVO.setFundID(serviceFunddetail.getFundid());
- taxMoneyVO.setBeneficiaryNo(serviceFunddetail.getBeneficiaryno());
+// taxMoneyVO.setBeneficiaryNo(serviceFunddetail.getBeneficiaryno());
+ taxMoneyVO.setIDCard(serviceFunddetail.getIdcardno());
//鏌ュ嚭绋庡墠銆佺◣銆佺◣鍚庣殑鎬婚锛堜笉鍖呭惈鏈锛�
TaxMoneySumEO taxSum = serviceFunddetailMapper.getTaxSum(taxMoneyVO);
if (ObjectUtils.isEmpty(taxSum)) {
@@ -329,4 +341,61 @@
return true;
}
+ @Override
+ public Map<String, Double> performance(ServiceFunddetail serviceFunddetail) {
+ //鏍规嵁"鍙楃泭浜虹紪鍙�"鍜�"缁╂晥鏃ユ湡(骞翠唤)"鏌ヨ涓汉鍘嗗彶缁╂晥
+ ServiceFunddetail serviceFunddetailEo = new ServiceFunddetail();
+ serviceFunddetailEo.setIdcardno(serviceFunddetail.getIdcardno());
+ serviceFunddetailEo.setApplytype("5");
+ Calendar cal = Calendar.getInstance();
+ //榛樿鏈勾搴�
+ serviceFunddetailEo.setJxrq(String.valueOf(cal.get(Calendar.YEAR)));
+ List<ServiceFunddetail> serviceFunddetails = queryList(serviceFunddetailEo);
+
+ //缁熻鍘嗗彶鐨勭◣
+ BigDecimal historyTax = BigDecimal.valueOf(0.00);
+ //璁＄畻鎵ｅ幓姣忔湀5000鐨勫巻鍙茬◣鍓嶉噾棰�
+ BigDecimal historyTaxBefore = BigDecimal.valueOf(0.00);
+ //鏈湀鏄惁宸茬粡绠楄繃缁╂晥锛堜笅闈㈡墸闄�5000闇�瑕佺敤鍒拌繖涓紝濡傛灉鏈湀宸茬粡鎵ｈ繃5000锛屽氨涓嶅啀鎵ｄ簡锛�
+ Boolean deduct = false;
+ //鑾峰彇褰撳墠鏈堜唤
+ Date date = new Date();
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
+ String nowMonth = sdf.format(date);
+
+ for (ServiceFunddetail serviceFunddetail1 : serviceFunddetails) {
+ historyTaxBefore = historyTaxBefore.add(BigDecimal.valueOf(serviceFunddetail1.getAmount())).subtract(BigDecimal.valueOf(5000));
+ historyTax = historyTax.add(BigDecimal.valueOf(serviceFunddetail1.getTaxamount()));
+ if (serviceFunddetail1.getJxrq().equals(nowMonth)) {
+ deduct = true;
+ }
+ }
+ BigDecimal allValue = BigDecimal.valueOf(0.00);
+ //鍏堟煡璇竴涓嬫湰鏈堟槸鍚﹀凡缁忕畻杩囩哗鏁堬紙涓�涓湀鍙噺涓�娆�5000锛屽鏋滀笂涓�娆″凡缁忓噺杩囷紝杩欎竴娆″氨涓嶅湪鍑忎簡锛�
+ if (deduct == true) {
+ //鏈湀宸茬粡鍑忚繃5000浜�
+ allValue = historyTaxBefore.add(BigDecimal.valueOf(serviceFunddetail.getAmount()));
+ } else {
+ BigDecimal subtract = BigDecimal.valueOf(serviceFunddetail.getAmount()).subtract(BigDecimal.valueOf(5000));
+ allValue = historyTaxBefore.add(subtract);
+ }
+ //璁＄畻鍔犱笂鏈鐨勭◣鍓嶉噾棰濈殑鎬荤◣
+ BigDecimal personTaxation = PerformanceTaxtUtils.getPersonTaxation(allValue);
+ //璁＄畻鏈鐨勭◣
+ BigDecimal nowSingleTax = personTaxation.subtract(historyTax);
+ //璁＄畻鏈鐨勭◣鍚�
+ BigDecimal taxAfter = BigDecimal.valueOf(serviceFunddetail.getAmount()).subtract(nowSingleTax);
+
+ //灏嗚绠楀嚭鏉ョ殑鏁版嵁鏀惧埌serviceFunddetail涓�
+ serviceFunddetail.setTaxamount(nowSingleTax.doubleValue());
+ serviceFunddetail.setTaxedamount(taxAfter.doubleValue());
+ serviceFunddetail.setJxrq(nowMonth);
+
+ save(serviceFunddetail);
+ Map map = new HashMap();
+ map.put("amount", serviceFunddetail.getAmount());
+ map.put("taxedamount", taxAfter.doubleValue());
+ return map;
+ }
+
}
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml
index 507efb9..8dd7cb9 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml
@@ -33,33 +33,33 @@
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
- <result property="applicantUserID" column="ApplicantUserID"/>
- <result property="applicantUserName" column="ApplicantUserName"/>
- <result property="applicantTime" column="ApplicantTime"/>
- <result property="checkUserID" column="CheckUserID"/>
- <result property="checkUserName" column="CheckUserName"/>
- <result property="checkTime" column="CheckTime"/>
- <result property="checkSuggestion" column="CheckSuggestion"/>
- <result property="allocationStatus" column="AllocationStatus"/>
+ <result property="applicantuserid" column="ApplicantUserID"/>
+ <result property="applicantusername" column="ApplicantUserName"/>
+ <result property="applicanttime" column="ApplicantTime"/>
+ <result property="checkuserid" column="CheckUserID"/>
+ <result property="checkusername" column="CheckUserName"/>
+ <result property="checktime" column="CheckTime"/>
+ <result property="checksuggestion" column="CheckSuggestion"/>
+ <result property="allocationstatus" column="AllocationStatus"/>
<result property="name" column="Name"/>
- <result property="sexOMMENT" column="SexOMMENT"/>
- <result property="idCardType" column="IDCardType"/>
- <result property="idCardNo" column="IDCardNo"/>
+ <result property="sex" column="Sex"/>
+ <result property="idcardtype" column="IDCardType"/>
+ <result property="idcardno" column="IDCardNo"/>
<result property="age" column="Age"/>
- <result property="ageUnit" column="AgeUnit"/>
+ <result property="ageunit" column="AgeUnit"/>
<result property="birthday" column="Birthday"/>
<result property="phone" column="Phone"/>
- <result property="residenceAddress" column="ResidenceAddress"/>
- <result property="residenceProvince" column="ResidenceProvince"/>
- <result property="residenceProvinceName" column="ResidenceProvinceName"/>
- <result property="residenceCity" column="ResidenceCity"/>
- <result property="residenceCityName" column="ResidenceCityName"/>
- <result property="residenceTown" column="ResidenceTown"/>
- <result property="residenceTownName" column="ResidenceTownName"/>
- <result property="residenceCommunity" column="ResidenceCommunity"/>
- <result property="residenceCommunityName" column="ResidenceCommunityName"/>
- <result property="residenceCountyCode" column="ResidenceCountyCode"/>
- <result property="residenceCountyName" column="ResidenceCountyName"/>
+ <result property="residenceaddress" column="ResidenceAddress"/>
+ <result property="residenceprovince" column="ResidenceProvince"/>
+ <result property="residenceprovincename" column="ResidenceProvinceName"/>
+ <result property="residencecity" column="ResidenceCity"/>
+ <result property="residencecityname" column="ResidenceCityName"/>
+ <result property="residencetown" column="ResidenceTown"/>
+ <result property="residencetownname" column="ResidenceTownName"/>
+ <result property="residencecommunity" column="ResidenceCommunity"/>
+ <result property="residencecommunityname" column="ResidenceCommunityName"/>
+ <result property="residencecountycode" column="ResidenceCountyCode"/>
+ <result property="residencecountyname" column="ResidenceCountyName"/>
</resultMap>
<sql id="selectServiceDonateorganVo">
@@ -103,7 +103,7 @@
CheckSuggestion,
AllocationStatus,
Name,
- SexOMMENT,
+ Sex,
IDCardType,
IDCardNo,
Age,
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceExternalpersonGroupMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceExternalpersonGroupMapper.xml
new file mode 100644
index 0000000..d14dbe9
--- /dev/null
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceExternalpersonGroupMapper.xml
@@ -0,0 +1,71 @@
+<?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.ServiceExternalpersonGroupMapper">
+
+ <resultMap type="com.ruoyi.project.domain.ServiceExternalpersonGroup" id="ServiceExternalpersonGroupResult">
+ <result property="id" column="id"/>
+ <result property="userId" column="user_id"/>
+ <result property="groupId" column="group_id"/>
+ <result property="groupdesc" column="groupdesc"/>
+ <result property="userNo" column="user_no"/>
+ <result property="userName" column="user_name"/>
+ </resultMap>
+
+ <resultMap type="com.ruoyi.project.domain.vo.ServicePersonInfoVo" id="ServicePersonInfo">
+ <result property="userId" column="user_id"/>
+ <result property="groupId" column="group_id"/>
+ <result property="groupdesc" column="groupdesc"/>
+ <result property="userNo" column="user_no"/>
+ <result property="userName" column="user_name"/>
+ <result property="IDCardNo" column="IDCardNo"/>
+ <result property="telephone" column="Telephone"/>
+ <result property="userType" column="UserType"/>
+ <result property="unitName" column="UnitName"/>
+ <result property="unitNo" column="UnitNo"/>
+ <result property="title" column="Title"/>
+ <result property="depositBank" column="DepositBank"/>
+ <result property="bankCardNo" column="BankCardNo"/>
+ </resultMap>
+
+ <sql id="selectServiceExternalpersonGroupVo">
+ select id, user_id, group_id, groupdesc, user_no, user_name
+ from service_externalperson_group
+ </sql>
+
+ <select id="selectServiceExternalpersonGroupList"
+ parameterType="com.ruoyi.project.domain.ServiceExternalpersonGroup"
+ resultMap="ServiceExternalpersonGroupResult">
+ <include refid="selectServiceExternalpersonGroupVo"/>
+ <where>
+ <if test="userId != null ">and user_id = #{userId}</if>
+ <if test="groupId != null ">and group_id = #{groupId}</if>
+ <if test="groupdesc != null and groupdesc != ''">and groupdesc = #{groupdesc}</if>
+ <if test="userNo != null and userNo != ''">and user_no = #{userNo}</if>
+ <if test="userName != null and userName != ''">and user_name like concat('%', #{userName}, '%')</if>
+ </where>
+ </select>
+
+
+ <select id="getPersonInfo" parameterType="java.lang.Long" resultMap="ServicePersonInfo">
+ SELECT user_id,
+ group_id,
+ groupdesc,
+ user_no,
+ user_name,
+ IDCardNo,
+ Telephone,
+ UserType,
+ UnitName,
+ UnitNo,
+ Title,
+ DepositBank,
+ BankCardNo
+ FROM service_externalperson_group
+ JOIN service_externalperson ON service_externalperson_group.user_id = service_externalperson.ID
+ AND service_externalperson.del_flag = 0 and service_externalperson.userstatus = 1 and group_id = #{groupId}
+ </select>
+
+
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml
index af294be..edd80fb 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml
@@ -56,6 +56,7 @@
<result property="riqi" column="riqi"/>
<result property="bh" column="bh"/>
<result property="checkstatus" column="checkstatus"/>
+ <result property="performancetype" column="performancetype"/>
</resultMap>
@@ -111,11 +112,13 @@
zffs,
riqi,
bh,
- checkstatus
+ checkstatus,
+ performancetype
from service_fund
</sql>
- <select id="selectServiceFundList" parameterType="com.ruoyi.project.domain.ServiceFund" resultMap="ServiceFundResult">
+ <select id="selectServiceFundList" parameterType="com.ruoyi.project.domain.ServiceFund"
+ resultMap="ServiceFundResult">
<include refid="selectServiceFundVo"/>
where del_flag = '0'
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceFundSharedMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceFundSharedMapper.xml
index a05bebf..916a662 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceFundSharedMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceFundSharedMapper.xml
@@ -60,7 +60,8 @@
<result property="zffs" column="zffs"/>
<result property="riqi" column="riqi"/>
<result property="bh" column="bh"/>
- <result property="checkstatus" column="checkstatus"/>
+ <result property="checkstatus" column="checkstatus"/>
+ <result property="performancetype" column="performancetype"/>
</resultMap>
<sql id="selectServiceFundSharedVo">
@@ -119,7 +120,8 @@
zffs,
riqi,
bh,
- checkstatus
+ checkstatus,
+ performancetype
from service_fund_shared
</sql>
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml
index 57f8c7e..dae5778 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml
@@ -58,6 +58,7 @@
<result property="subjecttypename" column="subjecttypename"/>
<result property="annexfiles" column="AnnexFiles"/>
<result property="taxTime" column="tax_time"/>
+ <result property="jxrq" column="jxrq"/>
</resultMap>
<sql id="selectServiceFunddetailVo">
@@ -113,7 +114,8 @@
subjecttype,
subjecttypename,
AnnexFiles,
- tax_time
+ tax_time,
+ jxrq
from service_funddetail
</sql>
@@ -261,8 +263,7 @@
where fundID < #{fundID}
and tax_time < #{taxTime}
and tax_time >= #{firstDay}
- -- and ApplyType = #{applyType}
- and BeneficiaryNo = #{beneficiaryNo}
+ and IDCardNo=#{IDCard}
and ApplyType in (1, 2)
</select>
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml
index ecbf8f8..1874589 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml
@@ -61,6 +61,7 @@
<result property="riqi" column="riqi"/>
<result property="bh" column="bh"/>
<result property="checkstatus" column="checkstatus"/>
+ <result property="performancetype" column="performancetype"/>
</resultMap>
<sql id="selectServiceReimbursementVo">
@@ -117,7 +118,8 @@
zffs,
riqi,
bh,
- checkstatus
+ checkstatus,
+ performancetype
from service_reimbursement
</sql>
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementSharedMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementSharedMapper.xml
index ce192d9..a150213 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementSharedMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementSharedMapper.xml
@@ -64,6 +64,7 @@
<result property="riqi" column="riqi"/>
<result property="bh" column="bh"/>
<result property="checkstatus" column="checkstatus"/>
+ <result property="performancetype" column="performancetype"/>
</resultMap>
<sql id="selectServiceReimbursementSharedVo">
@@ -125,7 +126,8 @@
zffs,
riqi,
bh,
- checkstatus
+ checkstatus,
+ performancetype
from service_reimbursement_shared
</sql>
--
Gitblit v1.9.3