From 5c909da3050d2337015c0454d219d482add19a63 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 27 十二月 2023 18:53:57 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceDonorchargeMapper.java | 25 +
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorcharge.java | 90 ++++
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorchargeorgan.java | 73 ++
ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceDonateorganstaticsMapper.java | 26 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessorganController.java | 12
ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml | 108 +++-
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonorchargeServiceImpl.java | 69 +++
ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeMapper.xml | 69 +++
ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonateorganstaticsService.java | 23 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecomporganController.java | 12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonorchargeController.java | 103 ++++
ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonorchargeService.java | 24 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateorganstaticsController.java | 110 +++++
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateorganstatics.java | 226 ++++++++++
ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganstaticsMapper.xml | 138 ++++++
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganstaticsServiceImpl.java | 151 +++++++
16 files changed, 1,188 insertions(+), 71 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecomporganController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecomporganController.java
index 4118058..646c7c0 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecomporganController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecomporganController.java
@@ -40,7 +40,7 @@
* 鏌ヨ鎹愮尞鍣ㄥ畼绉绘鍒楄〃
*/
@ApiOperation("鏌ヨ鎹愮尞鍣ㄥ畼绉绘鍒楄〃")
- // @PreAuthorize("@ss.hasPermi('project:donatecomporgan:list')")
+ @PreAuthorize("@ss.hasPermi('project:donatecomporgan:list')")
@GetMapping("/list")
public TableDataInfo list(ServiceDonatecomporgan serviceDonatecomporgan) {
startPage();
@@ -52,7 +52,7 @@
* 瀵煎嚭鎹愮尞鍣ㄥ畼绉绘鍒楄〃
*/
@ApiOperation("瀵煎嚭鎹愮尞鍣ㄥ畼绉绘鍒楄〃")
- // @PreAuthorize("@ss.hasPermi('project:donatecomporgan:export')")
+ @PreAuthorize("@ss.hasPermi('project:donatecomporgan:export')")
@Log(title = "鎹愮尞鍣ㄥ畼绉绘", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(ServiceDonatecomporgan serviceDonatecomporgan) {
@@ -65,7 +65,7 @@
* 鑾峰彇鎹愮尞鍣ㄥ畼绉绘璇︾粏淇℃伅
*/
@ApiOperation("鑾峰彇鎹愮尞鍣ㄥ畼绉绘璇︾粏淇℃伅")
- // @PreAuthorize("@ss.hasPermi('project:donatecomporgan:query')")
+ @PreAuthorize("@ss.hasPermi('project:donatecomporgan:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return AjaxResult.success(serviceDonatecomporganService.getById(id));
@@ -75,7 +75,7 @@
* 鏂板鎹愮尞鍣ㄥ畼绉绘
*/
@ApiOperation("鏂板鎹愮尞鍣ㄥ畼绉绘")
- // @PreAuthorize("@ss.hasPermi('project:donatecomporgan:add')")
+ @PreAuthorize("@ss.hasPermi('project:donatecomporgan:add')")
@Log(title = "鎹愮尞鍣ㄥ畼绉绘", businessType = BusinessType.INSERT)
@PostMapping("/add")
@RepeatSubmit
@@ -87,7 +87,7 @@
* 淇敼鎹愮尞鍣ㄥ畼绉绘
*/
@ApiOperation("淇敼鎹愮尞鍣ㄥ畼绉绘")
- // @PreAuthorize("@ss.hasPermi('project:donatecomporgan:edit')")
+ @PreAuthorize("@ss.hasPermi('project:donatecomporgan:edit')")
@Log(title = "鎹愮尞鍣ㄥ畼绉绘", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
@RepeatSubmit
@@ -99,7 +99,7 @@
* 鍒犻櫎鎹愮尞鍣ㄥ畼绉绘
*/
@ApiOperation("鍒犻櫎鎹愮尞鍣ㄥ畼绉绘")
- // @PreAuthorize("@ss.hasPermi('project:donatecomporgan:remove')")
+ @PreAuthorize("@ss.hasPermi('project:donatecomporgan:remove')")
@Log(title = "鎹愮尞鍣ㄥ畼绉绘", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateorganstaticsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateorganstaticsController.java
new file mode 100644
index 0000000..2113020
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateorganstaticsController.java
@@ -0,0 +1,110 @@
+package com.ruoyi.web.controller.project;
+
+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.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.project.domain.ServiceDonateorganstatics;
+import com.ruoyi.project.service.IServiceDonateorganstaticsService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 鎹愮尞妗堜緥鍣ㄥ畼鍒桟ontroller
+ *
+ * @author ruoyi
+ * @date 2023-12-27
+ */
+@Api("鎹愮尞妗堜緥鍣ㄥ畼鍒�")
+@RestController
+@RequestMapping("/project/donateorganstatics")
+public class ServiceDonateorganstaticsController extends BaseController
+{
+ @Autowired
+ private IServiceDonateorganstaticsService serviceDonateorganstaticsService;
+
+ /**
+ * 鏌ヨ鎹愮尞妗堜緥鍣ㄥ畼鍒楀垪琛�
+ */
+ @ApiOperation("鏌ヨ鎹愮尞妗堜緥鍣ㄥ畼鍒楀垪琛�")
+ @PreAuthorize("@ss.hasPermi('project:donateorganstatics:list')")
+ @GetMapping("/list")
+ public TableDataInfo list(ServiceDonateorganstatics serviceDonateorganstatics)
+ {
+ startPage();
+ List<ServiceDonateorganstatics> list = serviceDonateorganstaticsService.queryList(serviceDonateorganstatics);
+ return getDataTable(list);
+ }
+
+ /**
+ * 瀵煎嚭鎹愮尞妗堜緥鍣ㄥ畼鍒楀垪琛�
+ */
+ @ApiOperation("瀵煎嚭鎹愮尞妗堜緥鍣ㄥ畼鍒楀垪琛�")
+ @PreAuthorize("@ss.hasPermi('project:donateorganstatics:export')")
+ @Log(title = "鎹愮尞妗堜緥鍣ㄥ畼鍒�", businessType = BusinessType.EXPORT)
+ @GetMapping("/export")
+ public AjaxResult export(ServiceDonateorganstatics serviceDonateorganstatics)
+ {
+ List<ServiceDonateorganstatics> list = serviceDonateorganstaticsService.queryList(serviceDonateorganstatics);
+ ExcelUtil<ServiceDonateorganstatics> util = new ExcelUtil<ServiceDonateorganstatics>(ServiceDonateorganstatics.class);
+ return util.exportExcel(list, "鎹愮尞妗堜緥鍣ㄥ畼鍒楁暟鎹�");
+ }
+
+ /**
+ * 鑾峰彇鎹愮尞妗堜緥鍣ㄥ畼鍒楄缁嗕俊鎭�
+ */
+ @ApiOperation("鑾峰彇鎹愮尞妗堜緥鍣ㄥ畼鍒楄缁嗕俊鎭�")
+ @PreAuthorize("@ss.hasPermi('project:donateorganstatics:query')")
+ @GetMapping(value = "/{id}")
+ public AjaxResult getInfo(@PathVariable("id") Long id)
+ {
+ return AjaxResult.success(serviceDonateorganstaticsService.getById(id));
+ }
+
+ /**
+ * 鏂板鎹愮尞妗堜緥鍣ㄥ畼鍒�
+ */
+ @ApiOperation("鏂板鎹愮尞妗堜緥鍣ㄥ畼鍒�")
+ @PreAuthorize("@ss.hasPermi('project:donateorganstatics:add')")
+ @Log(title = "鎹愮尞妗堜緥鍣ㄥ畼鍒�", businessType = BusinessType.INSERT)
+ @PostMapping
+ @RepeatSubmit
+ public AjaxResult add(@RequestBody ServiceDonateorganstatics serviceDonateorganstatics)
+ {
+ return toAjax(serviceDonateorganstaticsService.save(serviceDonateorganstatics));
+ }
+
+ /**
+ * 淇敼鎹愮尞妗堜緥鍣ㄥ畼鍒�
+ */
+ @ApiOperation("淇敼鎹愮尞妗堜緥鍣ㄥ畼鍒�")
+ @PreAuthorize("@ss.hasPermi('project:donateorganstatics:edit')")
+ @Log(title = "鎹愮尞妗堜緥鍣ㄥ畼鍒�", businessType = BusinessType.UPDATE)
+ @PutMapping
+ @RepeatSubmit
+ public AjaxResult edit(@RequestBody ServiceDonateorganstatics serviceDonateorganstatics)
+ {
+ return toAjax(serviceDonateorganstaticsService.updateById(serviceDonateorganstatics));
+ }
+
+ /**
+ * 鍒犻櫎鎹愮尞妗堜緥鍣ㄥ畼鍒�
+ */
+ @ApiOperation("鍒犻櫎鎹愮尞妗堜緥鍣ㄥ畼鍒�")
+ @PreAuthorize("@ss.hasPermi('project:donateorganstatics:remove')")
+ @Log(title = "鎹愮尞妗堜緥鍣ㄥ畼鍒�", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids)
+ {
+ return toAjax(serviceDonateorganstaticsService.removeByIds(Arrays.asList(ids)));
+ }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessorganController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessorganController.java
index 56f4c31..dc23d22 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessorganController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessorganController.java
@@ -40,7 +40,7 @@
* 鏌ヨ鎹愮尞鍣ㄥ畼鑾峰彇鍒楄〃
*/
@ApiOperation("鏌ヨ鎹愮尞鍣ㄥ畼鑾峰彇鍒楄〃")
- @PreAuthorize("@ss.hasPermi('system:donationwitnessorgan:list')")
+// @PreAuthorize("@ss.hasPermi('project:donationwitnessorgan:list')")
@GetMapping("/list")
public TableDataInfo list(ServiceDonationwitnessorgan serviceDonationwitnessorgan) {
startPage();
@@ -52,7 +52,7 @@
* 瀵煎嚭鎹愮尞鍣ㄥ畼鑾峰彇鍒楄〃
*/
@ApiOperation("瀵煎嚭鎹愮尞鍣ㄥ畼鑾峰彇鍒楄〃")
- @PreAuthorize("@ss.hasPermi('system:donationwitnessorgan:export')")
+// @PreAuthorize("@ss.hasPermi('project:donationwitnessorgan:export')")
@Log(title = "鎹愮尞鍣ㄥ畼鑾峰彇", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(ServiceDonationwitnessorgan serviceDonationwitnessorgan) {
@@ -65,7 +65,7 @@
* 鑾峰彇鎹愮尞鍣ㄥ畼鑾峰彇璇︾粏淇℃伅
*/
@ApiOperation("鑾峰彇鎹愮尞鍣ㄥ畼鑾峰彇璇︾粏淇℃伅")
- @PreAuthorize("@ss.hasPermi('system:donationwitnessorgan:query')")
+// @PreAuthorize("@ss.hasPermi('project:donationwitnessorgan:query')")
@GetMapping(value = "/getInfo/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return AjaxResult.success(serviceDonationwitnessorganService.getById(id));
@@ -75,7 +75,7 @@
* 鏂板鎹愮尞鍣ㄥ畼鑾峰彇
*/
@ApiOperation("鏂板鎹愮尞鍣ㄥ畼鑾峰彇")
- @PreAuthorize("@ss.hasPermi('system:donationwitnessorgan:add')")
+// @PreAuthorize("@ss.hasPermi('project:donationwitnessorgan:add')")
@Log(title = "鎹愮尞鍣ㄥ畼鑾峰彇", businessType = BusinessType.INSERT)
@PostMapping("/add")
@RepeatSubmit
@@ -87,7 +87,7 @@
* 淇敼鎹愮尞鍣ㄥ畼鑾峰彇
*/
@ApiOperation("淇敼鎹愮尞鍣ㄥ畼鑾峰彇")
- @PreAuthorize("@ss.hasPermi('system:donationwitnessorgan:edit')")
+// @PreAuthorize("@ss.hasPermi('project:donationwitnessorgan:edit')")
@Log(title = "鎹愮尞鍣ㄥ畼鑾峰彇", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
@RepeatSubmit
@@ -99,7 +99,7 @@
* 鍒犻櫎鎹愮尞鍣ㄥ畼鑾峰彇
*/
@ApiOperation("鍒犻櫎鎹愮尞鍣ㄥ畼鑾峰彇")
- @PreAuthorize("@ss.hasPermi('system:donationwitnessorgan:remove')")
+// @PreAuthorize("@ss.hasPermi('project:donationwitnessorgan:remove')")
@Log(title = "鎹愮尞鍣ㄥ畼鑾峰彇", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonorchargeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonorchargeController.java
new file mode 100644
index 0000000..402b6ef
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonorchargeController.java
@@ -0,0 +1,103 @@
+package com.ruoyi.web.controller.project;
+
+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.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.project.domain.ServiceDonorcharge;
+import com.ruoyi.project.service.IServiceDonorchargeService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 鎹愮尞妗堜緥鍣ㄥ畼鍒桟ontroller
+ *
+ * @author ruoyi
+ * @date 2023-12-27
+ */
+@Api("鎹愮尞妗堜緥鍣ㄥ畼鍒�")
+@RestController
+@RequestMapping("/project/donorcharge")
+public class ServiceDonorchargeController extends BaseController {
+ @Autowired
+ private IServiceDonorchargeService serviceDonorchargeService;
+
+ /**
+ * 鏌ヨ鎹愮尞妗堜緥鍣ㄥ畼鍒楀垪琛�
+ */
+ @ApiOperation("鏌ヨ鎹愮尞妗堜緥鍣ㄥ畼鍒楀垪琛�")
+ @PreAuthorize("@ss.hasPermi('project:donorcharge:list')")
+ @GetMapping("/list")
+ public TableDataInfo list(ServiceDonorcharge serviceDonorcharge) {
+ startPage();
+ List<ServiceDonorcharge> list = serviceDonorchargeService.queryList(serviceDonorcharge);
+ return getDataTable(list);
+ }
+
+ /**
+ * 瀵煎嚭鎹愮尞妗堜緥鍣ㄥ畼鍒楀垪琛�
+ */
+ @ApiOperation("瀵煎嚭鎹愮尞妗堜緥鍣ㄥ畼鍒楀垪琛�")
+ @PreAuthorize("@ss.hasPermi('project:donorcharge:export')")
+ @Log(title = "鎹愮尞妗堜緥鍣ㄥ畼鍒�", businessType = BusinessType.EXPORT)
+ @GetMapping("/export")
+ public AjaxResult export(ServiceDonorcharge serviceDonorcharge) {
+ List<ServiceDonorcharge> list = serviceDonorchargeService.queryList(serviceDonorcharge);
+ ExcelUtil<ServiceDonorcharge> util = new ExcelUtil<ServiceDonorcharge>(ServiceDonorcharge.class);
+ return util.exportExcel(list, "鎹愮尞妗堜緥鍣ㄥ畼鍒楁暟鎹�");
+ }
+
+ /**
+ * 鑾峰彇鎹愮尞妗堜緥鍣ㄥ畼鍒楄缁嗕俊鎭�
+ */
+ @ApiOperation("鑾峰彇鎹愮尞妗堜緥鍣ㄥ畼鍒楄缁嗕俊鎭�")
+ @PreAuthorize("@ss.hasPermi('project:donorcharge:query')")
+ @GetMapping(value = "/{id}")
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
+ return AjaxResult.success(serviceDonorchargeService.getById(id));
+ }
+
+ /**
+ * 鏂板鎹愮尞妗堜緥鍣ㄥ畼鍒�
+ */
+ @ApiOperation("鏂板鎹愮尞妗堜緥鍣ㄥ畼鍒�")
+ @PreAuthorize("@ss.hasPermi('project:donorcharge:add')")
+ @Log(title = "鎹愮尞妗堜緥鍣ㄥ畼鍒�", businessType = BusinessType.INSERT)
+ @PostMapping
+ @RepeatSubmit
+ public AjaxResult add(@RequestBody ServiceDonorcharge serviceDonorcharge) {
+ return toAjax(serviceDonorchargeService.save(serviceDonorcharge));
+ }
+
+ /**
+ * 淇敼鎹愮尞妗堜緥鍣ㄥ畼鍒�
+ */
+ @ApiOperation("淇敼鎹愮尞妗堜緥鍣ㄥ畼鍒�")
+ @PreAuthorize("@ss.hasPermi('project:donorcharge:edit')")
+ @Log(title = "鎹愮尞妗堜緥鍣ㄥ畼鍒�", businessType = BusinessType.UPDATE)
+ @PutMapping
+ @RepeatSubmit
+ public AjaxResult edit(@RequestBody ServiceDonorcharge serviceDonorcharge) {
+ return toAjax(serviceDonorchargeService.updateById(serviceDonorcharge));
+ }
+
+ /**
+ * 鍒犻櫎鎹愮尞妗堜緥鍣ㄥ畼鍒�
+ */
+ @ApiOperation("鍒犻櫎鎹愮尞妗堜緥鍣ㄥ畼鍒�")
+ @PreAuthorize("@ss.hasPermi('project:donorcharge:remove')")
+ @Log(title = "鎹愮尞妗堜緥鍣ㄥ畼鍒�", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids) {
+ return toAjax(serviceDonorchargeService.removeByIds(Arrays.asList(ids)));
+ }
+}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateorganstatics.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateorganstatics.java
new file mode 100644
index 0000000..b84d45f
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateorganstatics.java
@@ -0,0 +1,226 @@
+package com.ruoyi.project.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+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;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 鎹愮尞妗堜緥鍣ㄥ畼鍒楀璞� service_donateorganstatics
+ *
+ * @author ruoyi
+ * @date 2023-12-27
+ */
+@Data
+@ApiModel("鎹愮尞妗堜緥鍣ㄥ畼鍒�")
+public class ServiceDonateorganstatics 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 infoid;
+
+ /** OPO缂栧彿 */
+ @ApiModelProperty("OPO缂栧彿")
+ @Excel(name = "OPO缂栧彿")
+ private String donateno;
+
+ /** 鎹愮尞鏃堕棿 */
+ @ApiModelProperty("鎹愮尞鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "鎹愮尞鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date donatetime;
+
+ /** 濮撳悕 */
+ @ApiModelProperty("濮撳悕")
+ @Excel(name = "濮撳悕")
+ private String name;
+
+ /** 鍑虹敓骞存湀 */
+ @ApiModelProperty("鍑虹敓骞存湀")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "鍑虹敓骞存湀", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date borthdate;
+
+ /** 鎬у埆 */
+ @ApiModelProperty("鎬у埆")
+ @Excel(name = "鎬у埆")
+ private String sex;
+
+ /** 骞撮緞锛堝寘鍚湀锛� */
+ @ApiModelProperty("骞撮緞锛堝寘鍚湀锛�")
+ @Excel(name = "骞撮緞", readConverterExp = "鍖�=鍚湀")
+ private String age;
+
+ /** 鎹愮尞绫诲埆 鏍规嵁瀛楀吀sys_DonationCategory */
+ @ApiModelProperty("鎹愮尞绫诲埆 鏍规嵁瀛楀吀sys_DonationCategory")
+ @Excel(name = "鎹愮尞绫诲埆 鏍规嵁瀛楀吀sys_DonationCategory")
+ private String donationcategory;
+
+ /** 鍏ㄨ倽鎺ュ彈鍖婚櫌 */
+ @ApiModelProperty("鍏ㄨ倽鎺ュ彈鍖婚櫌")
+ @Excel(name = "鍏ㄨ倽鎺ュ彈鍖婚櫌")
+ private String hospitalC22;
+
+ /** 鍏ㄨ倽璐圭敤 */
+ @ApiModelProperty("鍏ㄨ倽璐圭敤")
+ @Excel(name = "鍏ㄨ倽璐圭敤")
+ private BigDecimal feeC22;
+
+ /** 宸﹁倽鎺ュ彈鍖婚櫌 */
+ @ApiModelProperty("宸﹁倽鎺ュ彈鍖婚櫌")
+ @Excel(name = "宸﹁倽鎺ュ彈鍖婚櫌")
+ private String hospitalC22l;
+
+ /** 宸﹁倽璐圭敤 */
+ @ApiModelProperty("宸﹁倽璐圭敤")
+ @Excel(name = "宸﹁倽璐圭敤")
+ private BigDecimal feeC22l;
+
+ /** 宸﹀鍙舵帴鍙楀尰闄� */
+ @ApiModelProperty("宸﹀鍙舵帴鍙楀尰闄�")
+ @Excel(name = "宸﹀鍙舵帴鍙楀尰闄�")
+ private String hospitalC22le;
+
+ /** 宸﹀璐圭敤 */
+ @ApiModelProperty("宸﹀璐圭敤")
+ @Excel(name = "宸﹀璐圭敤")
+ private BigDecimal feeC22le;
+
+ /** 鍙宠倽鎺ュ彈鍖婚櫌 */
+ @ApiModelProperty("鍙宠倽鎺ュ彈鍖婚櫌")
+ @Excel(name = "鍙宠倽鎺ュ彈鍖婚櫌")
+ private String hospitalC22r;
+
+ /** 鍙宠倽璐圭敤 */
+ @ApiModelProperty("鍙宠倽璐圭敤")
+ @Excel(name = "鍙宠倽璐圭敤")
+ private BigDecimal feeC22r;
+
+ /** 宸﹁偩鎺ュ彈鍖婚櫌 */
+ @ApiModelProperty("宸﹁偩鎺ュ彈鍖婚櫌")
+ @Excel(name = "宸﹁偩鎺ュ彈鍖婚櫌")
+ private String hospitalC64l;
+
+ /** 宸﹁偩璐圭敤 */
+ @ApiModelProperty("宸﹁偩璐圭敤")
+ @Excel(name = "宸﹁偩璐圭敤")
+ private BigDecimal feeC64l;
+
+ /** 鍙宠偩鎺ュ彈鍖婚櫌 */
+ @ApiModelProperty("鍙宠偩鎺ュ彈鍖婚櫌")
+ @Excel(name = "鍙宠偩鎺ュ彈鍖婚櫌")
+ private String hospitalC64r;
+
+ /** 鍙宠偩璐圭敤 */
+ @ApiModelProperty("鍙宠偩璐圭敤")
+ @Excel(name = "鍙宠偩璐圭敤")
+ private BigDecimal feeC64r;
+
+ /** 蹇冭剰鎺ュ彈鍖婚櫌 */
+ @ApiModelProperty("蹇冭剰鎺ュ彈鍖婚櫌")
+ @Excel(name = "蹇冭剰鎺ュ彈鍖婚櫌")
+ private String hospitalC38;
+
+ /** 蹇冭剰璐圭敤 */
+ @ApiModelProperty("蹇冭剰璐圭敤")
+ @Excel(name = "蹇冭剰璐圭敤")
+ private BigDecimal feeC38;
+
+ /** 鍙岃偤鎺ュ彈鍖婚櫌 */
+ @ApiModelProperty("鍙岃偤鎺ュ彈鍖婚櫌")
+ @Excel(name = "鍙岃偤鎺ュ彈鍖婚櫌")
+ private String hospitalC34;
+
+ /** 鍙岃偤璐圭敤 */
+ @ApiModelProperty("鍙岃偤璐圭敤")
+ @Excel(name = "鍙岃偤璐圭敤")
+ private BigDecimal feeC34;
+
+ /** 宸﹁偤鎺ュ彈鍖婚櫌 */
+ @ApiModelProperty("宸﹁偤鎺ュ彈鍖婚櫌")
+ @Excel(name = "宸﹁偤鎺ュ彈鍖婚櫌")
+ private String hospitalC34l;
+
+ /** 宸﹁偤璐圭敤 */
+ @ApiModelProperty("宸﹁偤璐圭敤")
+ @Excel(name = "宸﹁偤璐圭敤")
+ private BigDecimal feeC34l;
+
+ /** 鍙宠偤绉绘鍖婚櫌 */
+ @ApiModelProperty("鍙宠偤绉绘鍖婚櫌")
+ @Excel(name = "鍙宠偤绉绘鍖婚櫌")
+ private String hospitalC34r;
+
+ /** 鍙宠偤璐圭敤 */
+ @ApiModelProperty("鍙宠偤璐圭敤")
+ @Excel(name = "鍙宠偤璐圭敤")
+ private BigDecimal feeC34r;
+
+ /** 灏忚偁鎺ュ彈鍖婚櫌 */
+ @ApiModelProperty("灏忚偁鎺ュ彈鍖婚櫌")
+ @Excel(name = "灏忚偁鎺ュ彈鍖婚櫌")
+ private String hospitalC17;
+
+ /** 灏忚偁璐圭敤 */
+ @ApiModelProperty("灏忚偁璐圭敤")
+ @Excel(name = "灏忚偁璐圭敤")
+ private BigDecimal feeC17;
+
+ /** 宸︾溂缁勭粐鎺ュ彈鍖婚櫌 */
+ @ApiModelProperty("宸︾溂缁勭粐鎺ュ彈鍖婚櫌")
+ @Excel(name = "宸︾溂缁勭粐鎺ュ彈鍖婚櫌")
+ private String hospitalC69l;
+
+ /** 宸︾溂缁勭粐璐圭敤 */
+ @ApiModelProperty("宸︾溂缁勭粐璐圭敤")
+ @Excel(name = "宸︾溂缁勭粐璐圭敤")
+ private BigDecimal feeC69l;
+
+ /** 鍙崇溂缁勭粐鎺ュ彈鍖婚櫌 */
+ @ApiModelProperty("鍙崇溂缁勭粐鎺ュ彈鍖婚櫌")
+ @Excel(name = "鍙崇溂缁勭粐鎺ュ彈鍖婚櫌")
+ private String hospitalC69r;
+
+ /** 鍙崇溂缁勭粐璐圭敤 */
+ @ApiModelProperty("鍙崇溂缁勭粐璐圭敤")
+ @Excel(name = "鍙崇溂缁勭粐璐圭敤")
+ private BigDecimal feeC69r;
+
+ /** 鍏朵粬缁勭粐鎺ュ彈鍖婚櫌 */
+ @ApiModelProperty("鍏朵粬缁勭粐鎺ュ彈鍖婚櫌")
+ @Excel(name = "鍏朵粬缁勭粐鎺ュ彈鍖婚櫌")
+ private String hospitalC01;
+
+ /** 鍏朵粬缁勭粐璐圭敤 */
+ @ApiModelProperty("鍏朵粬缁勭粐璐圭敤")
+ @Excel(name = "鍏朵粬缁勭粐璐圭敤")
+ private BigDecimal feeC01;
+
+ /** 閬椾綋鎺ュ彈鍗曚綅 */
+ @ApiModelProperty("閬椾綋鎺ュ彈鍗曚綅")
+ @Excel(name = "閬椾綋鎺ュ彈鍗曚綅")
+ private String unitBody;
+
+ /** 鍚堣璐圭敤 */
+ @ApiModelProperty("鍚堣璐圭敤")
+ @Excel(name = "鍚堣璐圭敤")
+ private BigDecimal feeCount;
+
+}
+
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorcharge.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorcharge.java
new file mode 100644
index 0000000..4c87d93
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorcharge.java
@@ -0,0 +1,90 @@
+package com.ruoyi.project.domain;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+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_donorcharge
+ *
+ * @author ruoyi
+ * @date 2023-12-27
+ */
+@Data
+@ApiModel("鎹愮尞妗堜緥鍣ㄥ畼鍒�")
+public class ServiceDonorcharge 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 infoid;
+
+ /** OPO缂栧彿 */
+ @ApiModelProperty("OPO缂栧彿")
+ @Excel(name = "OPO缂栧彿")
+ private String donateno;
+
+ /** 鎹愮尞鏃堕棿 */
+ @ApiModelProperty("鎹愮尞鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "鎹愮尞鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date donatetime;
+
+ /** 濮撳悕 */
+ @ApiModelProperty("濮撳悕")
+ @Excel(name = "濮撳悕")
+ private String name;
+
+ /** 鍑虹敓骞存湀 */
+ @ApiModelProperty("鍑虹敓骞存湀")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "鍑虹敓骞存湀", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date borthdate;
+
+ /** 鎬у埆 */
+ @ApiModelProperty("鎬у埆")
+ @Excel(name = "鎬у埆")
+ private String sex;
+
+ /** 骞撮緞锛堝寘鍚湀锛� */
+ @ApiModelProperty("骞撮緞锛堝寘鍚湀锛�")
+ @Excel(name = "骞撮緞", readConverterExp = "鍖�=鍚湀")
+ private String age;
+
+ /** 鎹愮尞绫诲埆 鏍规嵁瀛楀吀sys_DonationCategory */
+ @ApiModelProperty("鎹愮尞绫诲埆 鏍规嵁瀛楀吀sys_DonationCategory")
+ @Excel(name = "鎹愮尞绫诲埆 鏍规嵁瀛楀吀sys_DonationCategory")
+ private String donationcategory;
+
+ /** 鎹愮尞鐨勫櫒瀹� */
+ @ApiModelProperty("鎹愮尞鐨勫櫒瀹�")
+ @Excel(name = "鎹愮尞鐨勫櫒瀹�")
+ private String donateorgan;
+
+ /** 鍚堣璐圭敤 */
+ @ApiModelProperty("鍚堣璐圭敤")
+ @Excel(name = "鍚堣璐圭敤")
+ private BigDecimal chargeamount;
+
+ /** 鍚堣瀹為檯鑾峰彇璐圭敤 */
+ @ApiModelProperty("鍚堣瀹為檯鑾峰彇璐圭敤")
+ @Excel(name = "鍚堣瀹為檯鑾峰彇璐圭敤")
+ private BigDecimal chargeamounted;
+
+}
+
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorchargeorgan.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorchargeorgan.java
index 7b19381..e7e585f 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorchargeorgan.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorchargeorgan.java
@@ -2,6 +2,7 @@
import java.math.BigDecimal;
import java.util.Date;
+
import com.fasterxml.jackson.annotation.JsonFormat;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -13,90 +14,126 @@
/**
* 鎹愮尞鍣ㄥ畼瀵硅薄 service_donorchargeorgan
- *
+ *
* @author ruoyi
* @date 2023-12-25
*/
@Data
@ApiModel("鎹愮尞鍣ㄥ畼")
-public class ServiceDonorchargeorgan extends BaseEntity
-{
+public class ServiceDonorchargeorgan extends BaseEntity {
private static final long serialVersionUID = 1L;
- /** $column.columnComment */
+ /**
+ * $column.columnComment
+ */
@ApiModelProperty("$column.columnComment")
//鏁版嵁搴撹嚜澧炴敼鎴怈TableId(type = IdType.AUTO)
@TableId(type = IdType.AUTO)
private Long id;
- /** 鍏宠仈service_donatebaseinfo琛ㄧ殑ID */
+ /**
+ * 鍏宠仈service_donorcharge琛ㄧ殑ID
+ */
+ @ApiModelProperty("鍏宠仈service_donorcharge琛ㄧ殑ID")
+ //鏁版嵁搴撹嚜澧炴敼鎴怈TableId(type = IdType.AUTO)
+ private Long donorchargelD;
+
+ /**
+ * 鍏宠仈service_donatebaseinfo琛ㄧ殑ID
+ */
@ApiModelProperty("鍏宠仈service_donatebaseinfo琛ㄧ殑ID")
@Excel(name = "鍏宠仈service_donatebaseinfo琛ㄧ殑ID")
private Long infoid;
- /** 鎹愮尞浜哄悕瀛� */
+ /**
+ * 鎹愮尞浜哄悕瀛�
+ */
@ApiModelProperty("鎹愮尞浜哄悕瀛�")
@Excel(name = "鎹愮尞浜哄悕瀛�")
private String donorname;
- /** 鍣ㄥ畼绉绘鏈烘瀯鍚嶇О 瀵瑰簲鏈烘瀯琛� */
+ /**
+ * 鍣ㄥ畼绉绘鏈烘瀯鍚嶇О 瀵瑰簲鏈烘瀯琛�
+ */
@ApiModelProperty("鍣ㄥ畼绉绘鏈烘瀯鍚嶇О 瀵瑰簲鏈烘瀯琛�")
@Excel(name = "鍣ㄥ畼绉绘鏈烘瀯鍚嶇О 瀵瑰簲鏈烘瀯琛�")
private String hospitalname;
- /** 鍣ㄥ畼绉绘鏈烘瀯缂栧彿 瀵瑰簲鏈烘瀯琛� */
+ /**
+ * 鍣ㄥ畼绉绘鏈烘瀯缂栧彿 瀵瑰簲鏈烘瀯琛�
+ */
@ApiModelProperty("鍣ㄥ畼绉绘鏈烘瀯缂栧彿 瀵瑰簲鏈烘瀯琛�")
@Excel(name = "鍣ㄥ畼绉绘鏈烘瀯缂栧彿 瀵瑰簲鏈烘瀯琛�")
private String hospitalno;
- /** 鍣ㄥ畼绫诲埆 璇﹁瀛楀吀sys_Organ */
+ /**
+ * 鍣ㄥ畼绫诲埆 璇﹁瀛楀吀sys_Organ
+ */
@ApiModelProperty("鍣ㄥ畼绫诲埆 璇﹁瀛楀吀sys_Organ")
@Excel(name = "鍣ㄥ畼绫诲埆 璇﹁瀛楀吀sys_Organ")
private String organno;
- /** 鍣ㄥ畼绫诲埆鍚嶇О 璇﹁瀛楀吀sys_Organ */
+ /**
+ * 鍣ㄥ畼绫诲埆鍚嶇О 璇﹁瀛楀吀sys_Organ
+ */
@ApiModelProperty("鍣ㄥ畼绫诲埆鍚嶇О 璇﹁瀛楀吀sys_Organ")
@Excel(name = "鍣ㄥ畼绫诲埆鍚嶇О 璇﹁瀛楀吀sys_Organ")
private String organname;
- /** 鍣ㄥ畼搴旀敹璐圭敤 */
+ /**
+ * 鍣ㄥ畼搴旀敹璐圭敤
+ */
@ApiModelProperty("鍣ㄥ畼搴旀敹璐圭敤")
@Excel(name = "鍣ㄥ畼搴旀敹璐圭敤")
private BigDecimal organcharge;
- /** 璐圭敤褰曞叆鏃堕棿 */
+ /**
+ * 璐圭敤褰曞叆鏃堕棿
+ */
@ApiModelProperty("璐圭敤褰曞叆鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "璐圭敤褰曞叆鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date organtime;
- /** 璐圭敤褰曞叆浜� */
+ /**
+ * 璐圭敤褰曞叆浜�
+ */
@ApiModelProperty("璐圭敤褰曞叆浜�")
@Excel(name = "璐圭敤褰曞叆浜�")
private String chargeoperator;
- /** 鍣ㄥ畼瀹為檯鏀跺埌璐圭敤 */
+ /**
+ * 鍣ㄥ畼瀹為檯鏀跺埌璐圭敤
+ */
@ApiModelProperty("鍣ㄥ畼瀹為檯鏀跺埌璐圭敤")
@Excel(name = "鍣ㄥ畼瀹為檯鏀跺埌璐圭敤")
private BigDecimal amount;
- /** 鍣ㄥ畼瀹為檯鏀跺埌璐圭敤鏃堕棿 */
+ /**
+ * 鍣ㄥ畼瀹為檯鏀跺埌璐圭敤鏃堕棿
+ */
@ApiModelProperty("鍣ㄥ畼瀹為檯鏀跺埌璐圭敤鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "鍣ㄥ畼瀹為檯鏀跺埌璐圭敤鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date amounttime;
- /** 鏀惰垂褰曞叆浜� */
+ /**
+ * 鏀惰垂褰曞叆浜�
+ */
@ApiModelProperty("鏀惰垂褰曞叆浜�")
@Excel(name = "鏀惰垂褰曞叆浜�")
private String amountoperator;
- /** 鍣ㄥ畼璐圭敤鏀跺彇鐘舵�侊細0锛氭湭鏀跺彇锛�1锛氬凡鏀跺彇锛�2锛氭斁寮� */
+ /**
+ * 鍣ㄥ畼璐圭敤鏀跺彇鐘舵�侊細0锛氭湭鏀跺彇锛�1锛氬凡鏀跺彇锛�2锛氭斁寮�
+ */
@ApiModelProperty("鍣ㄥ畼璐圭敤鏀跺彇鐘舵�侊細0锛氭湭鏀跺彇锛�1锛氬凡鏀跺彇锛�2锛氭斁寮�")
@Excel(name = "鍣ㄥ畼璐圭敤鏀跺彇鐘舵�侊細0锛氭湭鏀跺彇锛�1锛氬凡鏀跺彇锛�2锛氭斁寮�")
private Long chargestate;
- /** 鍣ㄥ畼瀹為檯鏀跺埌璐圭敤璇存槑 */
+ /**
+ * 鍣ㄥ畼瀹為檯鏀跺埌璐圭敤璇存槑
+ */
@ApiModelProperty("鍣ㄥ畼瀹為檯鏀跺埌璐圭敤璇存槑")
@Excel(name = "鍣ㄥ畼瀹為檯鏀跺埌璐圭敤璇存槑")
private String organchargedesc;
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceDonateorganstaticsMapper.java b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceDonateorganstaticsMapper.java
new file mode 100644
index 0000000..6bfc8b4
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceDonateorganstaticsMapper.java
@@ -0,0 +1,26 @@
+package com.ruoyi.project.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
+
+import com.ruoyi.project.domain.ServiceDonateorganstatics;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 鎹愮尞妗堜緥鍣ㄥ畼鍒桵apper鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2023-12-27
+ */
+@Mapper
+public interface ServiceDonateorganstaticsMapper extends BaseMapper<ServiceDonateorganstatics> {
+ /**
+ * 鏌ヨ鎹愮尞妗堜緥鍣ㄥ畼鍒楀垪琛�
+ *
+ * @param serviceDonateorganstatics 鎹愮尞妗堜緥鍣ㄥ畼鍒�
+ * @return 鎹愮尞妗堜緥鍣ㄥ畼鍒楅泦鍚�
+ */
+ public List<ServiceDonateorganstatics> selectServiceDonateorganstaticsList(ServiceDonateorganstatics serviceDonateorganstatics);
+}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceDonorchargeMapper.java b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceDonorchargeMapper.java
new file mode 100644
index 0000000..5016e70
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceDonorchargeMapper.java
@@ -0,0 +1,25 @@
+package com.ruoyi.project.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.project.domain.ServiceDonorcharge;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 鎹愮尞妗堜緥鍣ㄥ畼鍒桵apper鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2023-12-27
+ */
+@Mapper
+public interface ServiceDonorchargeMapper extends BaseMapper<ServiceDonorcharge> {
+ /**
+ * 鏌ヨ鎹愮尞妗堜緥鍣ㄥ畼鍒楀垪琛�
+ *
+ * @param serviceDonorcharge 鎹愮尞妗堜緥鍣ㄥ畼鍒�
+ * @return 鎹愮尞妗堜緥鍣ㄥ畼鍒楅泦鍚�
+ */
+ public List<ServiceDonorcharge> selectServiceDonorchargeList(ServiceDonorcharge serviceDonorcharge);
+}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonateorganstaticsService.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonateorganstaticsService.java
new file mode 100644
index 0000000..b425b7a
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonateorganstaticsService.java
@@ -0,0 +1,23 @@
+package com.ruoyi.project.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.project.domain.ServiceDonateorganstatics;
+
+import java.util.List;
+
+/**
+ * 鎹愮尞妗堜緥鍣ㄥ畼鍒桽ervice鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2023-12-27
+ */
+public interface IServiceDonateorganstaticsService extends IService<ServiceDonateorganstatics> {
+
+ /**
+ * 鏌ヨ鎹愮尞妗堜緥鍣ㄥ畼鍒楀垪琛�
+ *
+ * @param serviceDonateorganstatics 鎹愮尞妗堜緥鍣ㄥ畼鍒�
+ * @return 鎹愮尞妗堜緥鍣ㄥ畼鍒楅泦鍚�
+ */
+ public List<ServiceDonateorganstatics> queryList(ServiceDonateorganstatics serviceDonateorganstatics);
+}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonorchargeService.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonorchargeService.java
new file mode 100644
index 0000000..9a63781
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonorchargeService.java
@@ -0,0 +1,24 @@
+package com.ruoyi.project.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.project.domain.ServiceDonorcharge;
+
+import java.util.List;
+
+/**
+ * 鎹愮尞妗堜緥鍣ㄥ畼鍒桽ervice鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2023-12-27
+ */
+public interface IServiceDonorchargeService extends IService<ServiceDonorcharge>
+{
+
+ /**
+ * 鏌ヨ鎹愮尞妗堜緥鍣ㄥ畼鍒楀垪琛�
+ *
+ * @param serviceDonorcharge 鎹愮尞妗堜緥鍣ㄥ畼鍒�
+ * @return 鎹愮尞妗堜緥鍣ㄥ畼鍒楅泦鍚�
+ */
+ public List<ServiceDonorcharge> queryList(ServiceDonorcharge serviceDonorcharge);
+}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganstaticsServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganstaticsServiceImpl.java
new file mode 100644
index 0000000..23c4f46
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganstaticsServiceImpl.java
@@ -0,0 +1,151 @@
+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.ServiceDonateorganstatics;
+import com.ruoyi.project.mapper.ServiceDonateorganstaticsMapper;
+import com.ruoyi.project.service.IServiceDonateorganstaticsService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 鎹愮尞妗堜緥鍣ㄥ畼鍒桽ervice涓氬姟灞傚鐞�
+ *
+ * @author ruoyi
+ * @date 2023-12-27
+ */
+@Service
+public class ServiceDonateorganstaticsServiceImpl extends ServiceImpl<ServiceDonateorganstaticsMapper, ServiceDonateorganstatics> implements IServiceDonateorganstaticsService
+{
+
+
+ /**
+ * 鏌ヨ鎹愮尞妗堜緥鍣ㄥ畼鍒楀垪琛�
+ *
+ * @param serviceDonateorganstatics 鎹愮尞妗堜緥鍣ㄥ畼鍒�
+ * @return 鎹愮尞妗堜緥鍣ㄥ畼鍒�
+ */
+ @Override
+ public List<ServiceDonateorganstatics> queryList(ServiceDonateorganstatics serviceDonateorganstatics) {
+ LambdaQueryWrapper<ServiceDonateorganstatics> wrappers = Wrappers.lambdaQuery();
+ if (serviceDonateorganstatics.getInfoid() != null){
+ wrappers.eq(ServiceDonateorganstatics::getInfoid ,serviceDonateorganstatics.getInfoid());
+ }
+ if (StringUtils.isNotBlank(serviceDonateorganstatics.getDonateno())){
+ wrappers.eq(ServiceDonateorganstatics::getDonateno ,serviceDonateorganstatics.getDonateno());
+ }
+ if (serviceDonateorganstatics.getDonatetime() != null){
+ wrappers.eq(ServiceDonateorganstatics::getDonatetime ,serviceDonateorganstatics.getDonatetime());
+ }
+ if (StringUtils.isNotBlank(serviceDonateorganstatics.getName())){
+ wrappers.like(ServiceDonateorganstatics::getName ,serviceDonateorganstatics.getName());
+ }
+ if (serviceDonateorganstatics.getBorthdate() != null){
+ wrappers.eq(ServiceDonateorganstatics::getBorthdate ,serviceDonateorganstatics.getBorthdate());
+ }
+ if (StringUtils.isNotBlank(serviceDonateorganstatics.getSex())){
+ wrappers.eq(ServiceDonateorganstatics::getSex ,serviceDonateorganstatics.getSex());
+ }
+ if (StringUtils.isNotBlank(serviceDonateorganstatics.getAge())){
+ wrappers.eq(ServiceDonateorganstatics::getAge ,serviceDonateorganstatics.getAge());
+ }
+ if (StringUtils.isNotBlank(serviceDonateorganstatics.getDonationcategory())){
+ wrappers.eq(ServiceDonateorganstatics::getDonationcategory ,serviceDonateorganstatics.getDonationcategory());
+ }
+ if (StringUtils.isNotBlank(serviceDonateorganstatics.getHospitalC22())){
+ wrappers.eq(ServiceDonateorganstatics::getHospitalC22 ,serviceDonateorganstatics.getHospitalC22());
+ }
+ if (serviceDonateorganstatics.getFeeC22() != null){
+ wrappers.eq(ServiceDonateorganstatics::getFeeC22 ,serviceDonateorganstatics.getFeeC22());
+ }
+ if (StringUtils.isNotBlank(serviceDonateorganstatics.getHospitalC22l())){
+ wrappers.eq(ServiceDonateorganstatics::getHospitalC22l ,serviceDonateorganstatics.getHospitalC22l());
+ }
+ if (serviceDonateorganstatics.getFeeC22l() != null){
+ wrappers.eq(ServiceDonateorganstatics::getFeeC22l ,serviceDonateorganstatics.getFeeC22l());
+ }
+ if (StringUtils.isNotBlank(serviceDonateorganstatics.getHospitalC22le())){
+ wrappers.eq(ServiceDonateorganstatics::getHospitalC22le ,serviceDonateorganstatics.getHospitalC22le());
+ }
+ if (serviceDonateorganstatics.getFeeC22le() != null){
+ wrappers.eq(ServiceDonateorganstatics::getFeeC22le ,serviceDonateorganstatics.getFeeC22le());
+ }
+ if (StringUtils.isNotBlank(serviceDonateorganstatics.getHospitalC22r())){
+ wrappers.eq(ServiceDonateorganstatics::getHospitalC22r ,serviceDonateorganstatics.getHospitalC22r());
+ }
+ if (serviceDonateorganstatics.getFeeC22r() != null){
+ wrappers.eq(ServiceDonateorganstatics::getFeeC22r ,serviceDonateorganstatics.getFeeC22r());
+ }
+ if (StringUtils.isNotBlank(serviceDonateorganstatics.getHospitalC64l())){
+ wrappers.eq(ServiceDonateorganstatics::getHospitalC64l ,serviceDonateorganstatics.getHospitalC64l());
+ }
+ if (serviceDonateorganstatics.getFeeC64l() != null){
+ wrappers.eq(ServiceDonateorganstatics::getFeeC64l ,serviceDonateorganstatics.getFeeC64l());
+ }
+ if (StringUtils.isNotBlank(serviceDonateorganstatics.getHospitalC64r())){
+ wrappers.eq(ServiceDonateorganstatics::getHospitalC64r ,serviceDonateorganstatics.getHospitalC64r());
+ }
+ if (serviceDonateorganstatics.getFeeC64r() != null){
+ wrappers.eq(ServiceDonateorganstatics::getFeeC64r ,serviceDonateorganstatics.getFeeC64r());
+ }
+ if (StringUtils.isNotBlank(serviceDonateorganstatics.getHospitalC38())){
+ wrappers.eq(ServiceDonateorganstatics::getHospitalC38 ,serviceDonateorganstatics.getHospitalC38());
+ }
+ if (serviceDonateorganstatics.getFeeC38() != null){
+ wrappers.eq(ServiceDonateorganstatics::getFeeC38 ,serviceDonateorganstatics.getFeeC38());
+ }
+ if (StringUtils.isNotBlank(serviceDonateorganstatics.getHospitalC34())){
+ wrappers.eq(ServiceDonateorganstatics::getHospitalC34 ,serviceDonateorganstatics.getHospitalC34());
+ }
+ if (serviceDonateorganstatics.getFeeC34() != null){
+ wrappers.eq(ServiceDonateorganstatics::getFeeC34 ,serviceDonateorganstatics.getFeeC34());
+ }
+ if (StringUtils.isNotBlank(serviceDonateorganstatics.getHospitalC34l())){
+ wrappers.eq(ServiceDonateorganstatics::getHospitalC34l ,serviceDonateorganstatics.getHospitalC34l());
+ }
+ if (serviceDonateorganstatics.getFeeC34l() != null){
+ wrappers.eq(ServiceDonateorganstatics::getFeeC34l ,serviceDonateorganstatics.getFeeC34l());
+ }
+ if (StringUtils.isNotBlank(serviceDonateorganstatics.getHospitalC34r())){
+ wrappers.eq(ServiceDonateorganstatics::getHospitalC34r ,serviceDonateorganstatics.getHospitalC34r());
+ }
+ if (serviceDonateorganstatics.getFeeC34r() != null){
+ wrappers.eq(ServiceDonateorganstatics::getFeeC34r ,serviceDonateorganstatics.getFeeC34r());
+ }
+ if (StringUtils.isNotBlank(serviceDonateorganstatics.getHospitalC17())){
+ wrappers.eq(ServiceDonateorganstatics::getHospitalC17 ,serviceDonateorganstatics.getHospitalC17());
+ }
+ if (serviceDonateorganstatics.getFeeC17() != null){
+ wrappers.eq(ServiceDonateorganstatics::getFeeC17 ,serviceDonateorganstatics.getFeeC17());
+ }
+ if (StringUtils.isNotBlank(serviceDonateorganstatics.getHospitalC69l())){
+ wrappers.eq(ServiceDonateorganstatics::getHospitalC69l ,serviceDonateorganstatics.getHospitalC69l());
+ }
+ if (serviceDonateorganstatics.getFeeC69l() != null){
+ wrappers.eq(ServiceDonateorganstatics::getFeeC69l ,serviceDonateorganstatics.getFeeC69l());
+ }
+ if (StringUtils.isNotBlank(serviceDonateorganstatics.getHospitalC69r())){
+ wrappers.eq(ServiceDonateorganstatics::getHospitalC69r ,serviceDonateorganstatics.getHospitalC69r());
+ }
+ if (serviceDonateorganstatics.getFeeC69r() != null){
+ wrappers.eq(ServiceDonateorganstatics::getFeeC69r ,serviceDonateorganstatics.getFeeC69r());
+ }
+ if (StringUtils.isNotBlank(serviceDonateorganstatics.getHospitalC01())){
+ wrappers.eq(ServiceDonateorganstatics::getHospitalC01 ,serviceDonateorganstatics.getHospitalC01());
+ }
+ if (serviceDonateorganstatics.getFeeC01() != null){
+ wrappers.eq(ServiceDonateorganstatics::getFeeC01 ,serviceDonateorganstatics.getFeeC01());
+ }
+ if (StringUtils.isNotBlank(serviceDonateorganstatics.getUnitBody())){
+ wrappers.eq(ServiceDonateorganstatics::getUnitBody ,serviceDonateorganstatics.getUnitBody());
+ }
+ if (serviceDonateorganstatics.getFeeCount() != null){
+ wrappers.eq(ServiceDonateorganstatics::getFeeCount ,serviceDonateorganstatics.getFeeCount());
+ }
+ return this.list(wrappers);
+ }
+
+}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonorchargeServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonorchargeServiceImpl.java
new file mode 100644
index 0000000..3e01e47
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonorchargeServiceImpl.java
@@ -0,0 +1,69 @@
+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.ServiceDonorcharge;
+import com.ruoyi.project.mapper.ServiceDonorchargeMapper;
+import com.ruoyi.project.service.IServiceDonorchargeService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 鎹愮尞妗堜緥鍣ㄥ畼鍒桽ervice涓氬姟灞傚鐞�
+ *
+ * @author ruoyi
+ * @date 2023-12-27
+ */
+@Service
+public class ServiceDonorchargeServiceImpl extends ServiceImpl<ServiceDonorchargeMapper, ServiceDonorcharge> implements IServiceDonorchargeService {
+
+
+ /**
+ * 鏌ヨ鎹愮尞妗堜緥鍣ㄥ畼鍒楀垪琛�
+ *
+ * @param serviceDonorcharge 鎹愮尞妗堜緥鍣ㄥ畼鍒�
+ * @return 鎹愮尞妗堜緥鍣ㄥ畼鍒�
+ */
+ @Override
+ public List<ServiceDonorcharge> queryList(ServiceDonorcharge serviceDonorcharge) {
+ LambdaQueryWrapper<ServiceDonorcharge> wrappers = Wrappers.lambdaQuery();
+ if (serviceDonorcharge.getInfoid() != null) {
+ wrappers.eq(ServiceDonorcharge::getInfoid, serviceDonorcharge.getInfoid());
+ }
+ if (StringUtils.isNotBlank(serviceDonorcharge.getDonateno())) {
+ wrappers.eq(ServiceDonorcharge::getDonateno, serviceDonorcharge.getDonateno());
+ }
+ if (serviceDonorcharge.getDonatetime() != null) {
+ wrappers.eq(ServiceDonorcharge::getDonatetime, serviceDonorcharge.getDonatetime());
+ }
+ if (StringUtils.isNotBlank(serviceDonorcharge.getName())) {
+ wrappers.like(ServiceDonorcharge::getName, serviceDonorcharge.getName());
+ }
+ if (serviceDonorcharge.getBorthdate() != null) {
+ wrappers.eq(ServiceDonorcharge::getBorthdate, serviceDonorcharge.getBorthdate());
+ }
+ if (StringUtils.isNotBlank(serviceDonorcharge.getSex())) {
+ wrappers.eq(ServiceDonorcharge::getSex, serviceDonorcharge.getSex());
+ }
+ if (StringUtils.isNotBlank(serviceDonorcharge.getAge())) {
+ wrappers.eq(ServiceDonorcharge::getAge, serviceDonorcharge.getAge());
+ }
+ if (StringUtils.isNotBlank(serviceDonorcharge.getDonationcategory())) {
+ wrappers.eq(ServiceDonorcharge::getDonationcategory, serviceDonorcharge.getDonationcategory());
+ }
+ if (StringUtils.isNotBlank(serviceDonorcharge.getDonateorgan())) {
+ wrappers.eq(ServiceDonorcharge::getDonateorgan, serviceDonorcharge.getDonateorgan());
+ }
+ if (serviceDonorcharge.getChargeamount() != null) {
+ wrappers.eq(ServiceDonorcharge::getChargeamount, serviceDonorcharge.getChargeamount());
+ }
+ if (serviceDonorcharge.getChargeamounted() != null) {
+ wrappers.eq(ServiceDonorcharge::getChargeamounted, serviceDonorcharge.getChargeamounted());
+ }
+ return this.list(wrappers);
+ }
+
+}
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganstaticsMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganstaticsMapper.xml
new file mode 100644
index 0000000..42495ba
--- /dev/null
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganstaticsMapper.xml
@@ -0,0 +1,138 @@
+<?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.ServiceDonateorganstaticsMapper">
+
+ <resultMap type="com.ruoyi.project.domain.ServiceDonateorganstatics" id="ServiceDonateorganstaticsResult">
+ <result property="id" column="id"/>
+ <result property="infoid" column="infoid"/>
+ <result property="donateno" column="donateno"/>
+ <result property="donatetime" column="donatetime"/>
+ <result property="name" column="name"/>
+ <result property="borthdate" column="borthdate"/>
+ <result property="sex" column="sex"/>
+ <result property="age" column="age"/>
+ <result property="donationcategory" column="DonationCategory"/>
+ <result property="hospitalC22" column="hospital_C22"/>
+ <result property="feeC22" column="fee_C22"/>
+ <result property="hospitalC22l" column="hospital_C22L"/>
+ <result property="feeC22l" column="fee_C22L"/>
+ <result property="hospitalC22le" column="hospital_C22LE"/>
+ <result property="feeC22le" column="fee_C22LE"/>
+ <result property="hospitalC22r" column="hospital_C22R"/>
+ <result property="feeC22r" column="fee_C22R"/>
+ <result property="hospitalC64l" column="hospital_C64L"/>
+ <result property="feeC64l" column="fee_C64L"/>
+ <result property="hospitalC64r" column="hospital_C64R"/>
+ <result property="feeC64r" column="fee_C64R"/>
+ <result property="hospitalC38" column="hospital_C38"/>
+ <result property="feeC38" column="fee_C38"/>
+ <result property="hospitalC34" column="hospital_C34"/>
+ <result property="feeC34" column="fee_C34"/>
+ <result property="hospitalC34l" column="hospital_C34L"/>
+ <result property="feeC34l" column="fee_C34L"/>
+ <result property="hospitalC34r" column="hospital_C34R"/>
+ <result property="feeC34r" column="fee_C34R"/>
+ <result property="hospitalC17" column="hospital_C17"/>
+ <result property="feeC17" column="fee_C17"/>
+ <result property="hospitalC69l" column="hospital_C69L"/>
+ <result property="feeC69l" column="fee_C69L"/>
+ <result property="hospitalC69r" column="hospital_C69R"/>
+ <result property="feeC69r" column="fee_C69R"/>
+ <result property="hospitalC01" column="hospital_C01"/>
+ <result property="feeC01" column="fee_C01"/>
+ <result property="unitBody" column="unit_body"/>
+ <result property="feeCount" column="fee_count"/>
+ </resultMap>
+
+ <sql id="selectServiceDonateorganstaticsVo">
+ select id,
+ infoid,
+ donateno,
+ donatetime,
+ name,
+ borthdate,
+ sex,
+ age,
+ DonationCategory,
+ hospital_C22,
+ fee_C22,
+ hospital_C22L,
+ fee_C22L,
+ hospital_C22LE,
+ fee_C22LE,
+ hospital_C22R,
+ fee_C22R,
+ hospital_C64L,
+ fee_C64L,
+ hospital_C64R,
+ fee_C64R,
+ hospital_C38,
+ fee_C38,
+ hospital_C34,
+ fee_C34,
+ hospital_C34L,
+ fee_C34L,
+ hospital_C34R,
+ fee_C34R,
+ hospital_C17,
+ fee_C17,
+ hospital_C69L,
+ fee_C69L,
+ hospital_C69R,
+ fee_C69R,
+ hospital_C01,
+ fee_C01,
+ unit_body,
+ fee_count
+ from service_donateorganstatics
+ </sql>
+
+ <select id="selectServiceDonateorganstaticsList" parameterType="com.ruoyi.project.domain.ServiceDonateorganstatics"
+ resultMap="ServiceDonateorganstaticsResult">
+ <include refid="selectServiceDonateorganstaticsVo"/>
+ <where>
+ <if test="infoid != null ">and infoid = #{infoid}</if>
+ <if test="donateno != null and donateno != ''">and donateno = #{donateno}</if>
+ <if test="donatetime != null ">and donatetime = #{donatetime}</if>
+ <if test="name != null and name != ''">and name like concat('%', #{name}, '%')</if>
+ <if test="borthdate != null ">and borthdate = #{borthdate}</if>
+ <if test="sex != null and sex != ''">and sex = #{sex}</if>
+ <if test="age != null and age != ''">and age = #{age}</if>
+ <if test="donationcategory != null and donationcategory != ''">and DonationCategory = #{donationcategory}
+ </if>
+ <if test="hospitalC22 != null and hospitalC22 != ''">and hospital_C22 = #{hospitalC22}</if>
+ <if test="feeC22 != null ">and fee_C22 = #{feeC22}</if>
+ <if test="hospitalC22l != null and hospitalC22l != ''">and hospital_C22L = #{hospitalC22l}</if>
+ <if test="feeC22l != null ">and fee_C22L = #{feeC22l}</if>
+ <if test="hospitalC22le != null and hospitalC22le != ''">and hospital_C22LE = #{hospitalC22le}</if>
+ <if test="feeC22le != null ">and fee_C22LE = #{feeC22le}</if>
+ <if test="hospitalC22r != null and hospitalC22r != ''">and hospital_C22R = #{hospitalC22r}</if>
+ <if test="feeC22r != null ">and fee_C22R = #{feeC22r}</if>
+ <if test="hospitalC64l != null and hospitalC64l != ''">and hospital_C64L = #{hospitalC64l}</if>
+ <if test="feeC64l != null ">and fee_C64L = #{feeC64l}</if>
+ <if test="hospitalC64r != null and hospitalC64r != ''">and hospital_C64R = #{hospitalC64r}</if>
+ <if test="feeC64r != null ">and fee_C64R = #{feeC64r}</if>
+ <if test="hospitalC38 != null and hospitalC38 != ''">and hospital_C38 = #{hospitalC38}</if>
+ <if test="feeC38 != null ">and fee_C38 = #{feeC38}</if>
+ <if test="hospitalC34 != null and hospitalC34 != ''">and hospital_C34 = #{hospitalC34}</if>
+ <if test="feeC34 != null ">and fee_C34 = #{feeC34}</if>
+ <if test="hospitalC34l != null and hospitalC34l != ''">and hospital_C34L = #{hospitalC34l}</if>
+ <if test="feeC34l != null ">and fee_C34L = #{feeC34l}</if>
+ <if test="hospitalC34r != null and hospitalC34r != ''">and hospital_C34R = #{hospitalC34r}</if>
+ <if test="feeC34r != null ">and fee_C34R = #{feeC34r}</if>
+ <if test="hospitalC17 != null and hospitalC17 != ''">and hospital_C17 = #{hospitalC17}</if>
+ <if test="feeC17 != null ">and fee_C17 = #{feeC17}</if>
+ <if test="hospitalC69l != null and hospitalC69l != ''">and hospital_C69L = #{hospitalC69l}</if>
+ <if test="feeC69l != null ">and fee_C69L = #{feeC69l}</if>
+ <if test="hospitalC69r != null and hospitalC69r != ''">and hospital_C69R = #{hospitalC69r}</if>
+ <if test="feeC69r != null ">and fee_C69R = #{feeC69r}</if>
+ <if test="hospitalC01 != null and hospitalC01 != ''">and hospital_C01 = #{hospitalC01}</if>
+ <if test="feeC01 != null ">and fee_C01 = #{feeC01}</if>
+ <if test="unitBody != null and unitBody != ''">and unit_body = #{unitBody}</if>
+ <if test="feeCount != null ">and fee_count = #{feeCount}</if>
+ </where>
+ </select>
+
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeMapper.xml
new file mode 100644
index 0000000..5a1267c
--- /dev/null
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeMapper.xml
@@ -0,0 +1,69 @@
+<?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.ServiceDonorchargeMapper">
+
+ <resultMap type="com.ruoyi.project.domain.ServiceDonorcharge" id="ServiceDonorchargeResult">
+ <result property="id" column="id"/>
+ <result property="infoid" column="infoid"/>
+ <result property="donateno" column="donateno"/>
+ <result property="donatetime" column="donatetime"/>
+ <result property="name" column="name"/>
+ <result property="borthdate" column="borthdate"/>
+ <result property="sex" column="sex"/>
+ <result property="age" column="age"/>
+ <result property="donationcategory" column="DonationCategory"/>
+ <result property="donateorgan" column="donateorgan"/>
+ <result property="chargeamount" column="chargeamount"/>
+ <result property="chargeamounted" column="chargeamounted"/>
+ <result property="remark" column="remark"/>
+ <result property="del_flag" column="del_flag"/>
+ <result property="createBy" column="create_by"/>
+ <result property="createTime" column="create_time"/>
+ <result property="updateBy" column="update_by"/>
+ <result property="updateTime" column="update_time"/>
+ </resultMap>
+
+ <sql id="selectServiceDonorchargeVo">
+ select id,
+ infoid,
+ donateno,
+ donatetime,
+ name,
+ borthdate,
+ sex,
+ age,
+ DonationCategory,
+ donateorgan,
+ chargeamount,
+ chargeamounted,
+ remark,
+ del_flag,
+ create_by,
+ create_time,
+ update_by,
+ update_time
+ from service_donorcharge
+ </sql>
+
+ <select id="selectServiceDonorchargeList" parameterType="com.ruoyi.project.domain.ServiceDonorcharge"
+ resultMap="ServiceDonorchargeResult">
+ <include refid="selectServiceDonorchargeVo"/>
+ <where>
+ <if test="infoid != null ">and infoid = #{infoid}</if>
+ <if test="donateno != null and donateno != ''">and donateno = #{donateno}</if>
+ <if test="donatetime != null ">and donatetime = #{donatetime}</if>
+ <if test="name != null and name != ''">and name like concat('%', #{name}, '%')</if>
+ <if test="borthdate != null ">and borthdate = #{borthdate}</if>
+ <if test="sex != null and sex != ''">and sex = #{sex}</if>
+ <if test="age != null and age != ''">and age = #{age}</if>
+ <if test="donationcategory != null and donationcategory != ''">and DonationCategory = #{donationcategory}
+ </if>
+ <if test="donateorgan != null and donateorgan != ''">and donateorgan = #{donateorgan}</if>
+ <if test="chargeamount != null ">and chargeamount = #{chargeamount}</if>
+ <if test="chargeamounted != null ">and chargeamounted = #{chargeamounted}</if>
+ </where>
+ </select>
+
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml
index 6f5d8a8..8be7cdc 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml
@@ -1,53 +1,79 @@
<?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.system.mapper.ServiceDonorchargeorganMapper">
-
- <resultMap type="ServiceDonorchargeorgan" id="ServiceDonorchargeorganResult">
- <result property="id" column="ID" />
- <result property="infoid" column="InfoID" />
- <result property="donorname" column="donorname" />
- <result property="hospitalname" column="HospitalName" />
- <result property="hospitalno" column="HospitalNo" />
- <result property="organno" column="OrganNo" />
- <result property="organname" column="OrganName" />
- <result property="organcharge" column="organcharge" />
- <result property="organtime" column="organtime" />
- <result property="chargeoperator" column="chargeoperator" />
- <result property="amount" column="amount" />
- <result property="amounttime" column="amounttime" />
- <result property="amountoperator" column="amountoperator" />
- <result property="chargestate" column="chargestate" />
- <result property="organchargedesc" column="organchargedesc" />
- <result property="delFlag" column="del_flag" />
- <result property="createBy" column="create_by" />
- <result property="createTime" column="create_time" />
- <result property="updateBy" column="update_by" />
- <result property="updateTime" column="update_time" />
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.project.mapper.ServiceDonorchargeorganMapper">
+
+ <resultMap type="com.ruoyi.project.domain.ServiceDonorchargeorgan" id="ServiceDonorchargeorganResult">
+ <result property="id" column="ID"/>
+ <result property="id" column="ID"/>
+ <result property="donorchargelD" column="donorchargelD"/>
+ <result property="donorname" column="donorname"/>
+ <result property="hospitalname" column="HospitalName"/>
+ <result property="hospitalno" column="HospitalNo"/>
+ <result property="organno" column="OrganNo"/>
+ <result property="organname" column="OrganName"/>
+ <result property="organcharge" column="organcharge"/>
+ <result property="organtime" column="organtime"/>
+ <result property="chargeoperator" column="chargeoperator"/>
+ <result property="amount" column="amount"/>
+ <result property="amounttime" column="amounttime"/>
+ <result property="amountoperator" column="amountoperator"/>
+ <result property="chargestate" column="chargestate"/>
+ <result property="organchargedesc" column="organchargedesc"/>
+ <result property="delFlag" column="del_flag"/>
+ <result property="createBy" column="create_by"/>
+ <result property="createTime" column="create_time"/>
+ <result property="updateBy" column="update_by"/>
+ <result property="updateTime" column="update_time"/>
</resultMap>
<sql id="selectServiceDonorchargeorganVo">
- select ID, InfoID, donorname, HospitalName, HospitalNo, OrganNo, OrganName, organcharge, organtime, chargeoperator, amount, amounttime, amountoperator, chargestate, organchargedesc, del_flag, create_by, create_time, update_by, update_time from service_donorchargeorgan
+ select ID,
+ donorchargelD,
+ InfoID,
+ donorname,
+ HospitalName,
+ HospitalNo,
+ OrganNo,
+ OrganName,
+ organcharge,
+ organtime,
+ chargeoperator,
+ amount,
+ amounttime,
+ amountoperator,
+ chargestate,
+ organchargedesc,
+ del_flag,
+ create_by,
+ create_time,
+ update_by,
+ update_time
+ from service_donorchargeorgan
</sql>
- <select id="selectServiceDonorchargeorganList" parameterType="ServiceDonorchargeorgan" resultMap="ServiceDonorchargeorganResult">
+ <select id="selectServiceDonorchargeorganList" parameterType="com.ruoyi.project.domain.ServiceDonorchargeorgan"
+ resultMap="ServiceDonorchargeorganResult">
<include refid="selectServiceDonorchargeorganVo"/>
<where>
- <if test="infoid != null "> and InfoID = #{infoid}</if>
- <if test="donorname != null and donorname != ''"> and donorname like concat('%', #{donorname}, '%')</if>
- <if test="hospitalname != null and hospitalname != ''"> and HospitalName like concat('%', #{hospitalname}, '%')</if>
- <if test="hospitalno != null and hospitalno != ''"> and HospitalNo = #{hospitalno}</if>
- <if test="organno != null and organno != ''"> and OrganNo = #{organno}</if>
- <if test="organname != null and organname != ''"> and OrganName like concat('%', #{organname}, '%')</if>
- <if test="organcharge != null "> and organcharge = #{organcharge}</if>
- <if test="organtime != null "> and organtime = #{organtime}</if>
- <if test="chargeoperator != null and chargeoperator != ''"> and chargeoperator = #{chargeoperator}</if>
- <if test="amount != null "> and amount = #{amount}</if>
- <if test="amounttime != null "> and amounttime = #{amounttime}</if>
- <if test="amountoperator != null and amountoperator != ''"> and amountoperator = #{amountoperator}</if>
- <if test="chargestate != null "> and chargestate = #{chargestate}</if>
- <if test="organchargedesc != null and organchargedesc != ''"> and organchargedesc = #{organchargedesc}</if>
+ <if test="infoid != null ">and InfoID = #{infoid}</if>
+ <if test="donorchargelD != null ">and donorchargelD = #{donorchargelD}</if>
+ <if test="donorname != null and donorname != ''">and donorname like concat('%', #{donorname}, '%')</if>
+ <if test="hospitalname != null and hospitalname != ''">and HospitalName like concat('%', #{hospitalname},
+ '%')
+ </if>
+ <if test="hospitalno != null and hospitalno != ''">and HospitalNo = #{hospitalno}</if>
+ <if test="organno != null and organno != ''">and OrganNo = #{organno}</if>
+ <if test="organname != null and organname != ''">and OrganName like concat('%', #{organname}, '%')</if>
+ <if test="organcharge != null ">and organcharge = #{organcharge}</if>
+ <if test="organtime != null ">and organtime = #{organtime}</if>
+ <if test="chargeoperator != null and chargeoperator != ''">and chargeoperator = #{chargeoperator}</if>
+ <if test="amount != null ">and amount = #{amount}</if>
+ <if test="amounttime != null ">and amounttime = #{amounttime}</if>
+ <if test="amountoperator != null and amountoperator != ''">and amountoperator = #{amountoperator}</if>
+ <if test="chargestate != null ">and chargestate = #{chargestate}</if>
+ <if test="organchargedesc != null and organchargedesc != ''">and organchargedesc = #{organchargedesc}</if>
</where>
</select>
--
Gitblit v1.9.3