From a88e19be56fab4f06aae0248575b55fed41eaa1e Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期四, 04 一月 2024 09:47:20 +0800
Subject: [PATCH] yxh
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateorganstaticsController.java | 8 ++--
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorcharge.java | 19 +++++----
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorchargeorgan.java | 12 +++---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonorchargeorganServiceImpl.java | 2 +
ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml | 7 +--
ruoyi-project/src/main/java/com/ruoyi/project/domain/BaseOrgancharge.java | 9 ++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOrganchargeController.java | 14 +++---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonorchargeController.java | 8 ++--
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonorchargeorganController.java | 23 +++++------
9 files changed, 55 insertions(+), 47 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOrganchargeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOrganchargeController.java
index 09c5115..14258dd 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOrganchargeController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOrganchargeController.java
@@ -28,7 +28,7 @@
@Slf4j
@Api("浜轰綋鍣ㄥ畼鑾峰彇璐圭敤")
@RestController
-@RequestMapping("/organcharge")
+@RequestMapping("/project/organcharge")
public class BaseOrganchargeController extends BaseController {
@Autowired
private IBaseOrganchargeService baseOrganchargeService;
@@ -37,7 +37,7 @@
* 鏌ヨ浜轰綋鍣ㄥ畼鑾峰彇璐圭敤鍒楄〃
*/
@ApiOperation("鏌ヨ浜轰綋鍣ㄥ畼鑾峰彇璐圭敤鍒楄〃")
- @PreAuthorize("@ss.hasPermi('system:organcharge:list')")
+ @PreAuthorize("@ss.hasPermi('project:organcharge:list')")
@GetMapping("/list")
public TableDataInfo list(BaseOrgancharge baseOrgancharge) {
log.info("鏌ヨ浜轰綋鍣ㄥ畼鑾峰彇璐圭敤鍒楄〃{}锛�" , baseOrgancharge);
@@ -50,7 +50,7 @@
* 瀵煎嚭浜轰綋鍣ㄥ畼鑾峰彇璐圭敤鍒楄〃
*/
@ApiOperation("瀵煎嚭浜轰綋鍣ㄥ畼鑾峰彇璐圭敤鍒楄〃")
- @PreAuthorize("@ss.hasPermi('system:organcharge:export')")
+ @PreAuthorize("@ss.hasPermi('project:organcharge:export')")
@Log(title = "浜轰綋鍣ㄥ畼鑾峰彇璐圭敤", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(BaseOrgancharge baseOrgancharge) {
@@ -64,7 +64,7 @@
* 鑾峰彇浜轰綋鍣ㄥ畼鑾峰彇璐圭敤璇︾粏淇℃伅
*/
@ApiOperation("鑾峰彇浜轰綋鍣ㄥ畼鑾峰彇璐圭敤璇︾粏淇℃伅")
- @PreAuthorize("@ss.hasPermi('system:organcharge:query')")
+ @PreAuthorize("@ss.hasPermi('project:organcharge:query')")
@GetMapping(value = "/getInfo/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
log.info("鑾峰彇浜轰綋鍣ㄥ畼鑾峰彇璐圭敤璇︾粏淇℃伅{}锛�" , id);
@@ -75,7 +75,7 @@
* 鏂板浜轰綋鍣ㄥ畼鑾峰彇璐圭敤
*/
@ApiOperation("鏂板浜轰綋鍣ㄥ畼鑾峰彇璐圭敤")
- @PreAuthorize("@ss.hasPermi('system:organcharge:add')")
+ @PreAuthorize("@ss.hasPermi('project:organcharge:add')")
@Log(title = "浜轰綋鍣ㄥ畼鑾峰彇璐圭敤", businessType = BusinessType.INSERT)
@PostMapping("/add")
@RepeatSubmit
@@ -88,7 +88,7 @@
* 淇敼浜轰綋鍣ㄥ畼鑾峰彇璐圭敤
*/
@ApiOperation("淇敼浜轰綋鍣ㄥ畼鑾峰彇璐圭敤")
- @PreAuthorize("@ss.hasPermi('system:organcharge:edit')")
+ @PreAuthorize("@ss.hasPermi('project:organcharge:edit')")
@Log(title = "浜轰綋鍣ㄥ畼鑾峰彇璐圭敤", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
@RepeatSubmit
@@ -101,7 +101,7 @@
* 鍒犻櫎浜轰綋鍣ㄥ畼鑾峰彇璐圭敤
*/
@ApiOperation("鍒犻櫎浜轰綋鍣ㄥ畼鑾峰彇璐圭敤")
- @PreAuthorize("@ss.hasPermi('system:organcharge:remove')")
+ @PreAuthorize("@ss.hasPermi('project:organcharge:remove')")
@GetMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
log.info("鍒犻櫎浜轰綋鍣ㄥ畼鑾峰彇璐圭敤{}锛�" , 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
index 2113020..afcabbe 100644
--- 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
@@ -64,7 +64,7 @@
*/
@ApiOperation("鑾峰彇鎹愮尞妗堜緥鍣ㄥ畼鍒楄缁嗕俊鎭�")
@PreAuthorize("@ss.hasPermi('project:donateorganstatics:query')")
- @GetMapping(value = "/{id}")
+ @GetMapping(value = "/getInfo/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
return AjaxResult.success(serviceDonateorganstaticsService.getById(id));
@@ -76,7 +76,7 @@
@ApiOperation("鏂板鎹愮尞妗堜緥鍣ㄥ畼鍒�")
@PreAuthorize("@ss.hasPermi('project:donateorganstatics:add')")
@Log(title = "鎹愮尞妗堜緥鍣ㄥ畼鍒�", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
@RepeatSubmit
public AjaxResult add(@RequestBody ServiceDonateorganstatics serviceDonateorganstatics)
{
@@ -89,7 +89,7 @@
@ApiOperation("淇敼鎹愮尞妗堜緥鍣ㄥ畼鍒�")
@PreAuthorize("@ss.hasPermi('project:donateorganstatics:edit')")
@Log(title = "鎹愮尞妗堜緥鍣ㄥ畼鍒�", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
@RepeatSubmit
public AjaxResult edit(@RequestBody ServiceDonateorganstatics serviceDonateorganstatics)
{
@@ -102,7 +102,7 @@
@ApiOperation("鍒犻櫎鎹愮尞妗堜緥鍣ㄥ畼鍒�")
@PreAuthorize("@ss.hasPermi('project:donateorganstatics:remove')")
@Log(title = "鎹愮尞妗堜緥鍣ㄥ畼鍒�", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
+ @GetMapping("/remove/{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/ServiceDonorchargeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonorchargeController.java
index 402b6ef..63821d3 100644
--- 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
@@ -61,7 +61,7 @@
*/
@ApiOperation("鑾峰彇鎹愮尞妗堜緥鍣ㄥ畼鍒楄缁嗕俊鎭�")
@PreAuthorize("@ss.hasPermi('project:donorcharge:query')")
- @GetMapping(value = "/{id}")
+ @GetMapping(value = "/getInfo/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return AjaxResult.success(serviceDonorchargeService.getById(id));
}
@@ -72,7 +72,7 @@
@ApiOperation("鏂板鎹愮尞妗堜緥鍣ㄥ畼鍒�")
@PreAuthorize("@ss.hasPermi('project:donorcharge:add')")
@Log(title = "鎹愮尞妗堜緥鍣ㄥ畼鍒�", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
@RepeatSubmit
public AjaxResult add(@RequestBody ServiceDonorcharge serviceDonorcharge) {
return toAjax(serviceDonorchargeService.save(serviceDonorcharge));
@@ -84,7 +84,7 @@
@ApiOperation("淇敼鎹愮尞妗堜緥鍣ㄥ畼鍒�")
@PreAuthorize("@ss.hasPermi('project:donorcharge:edit')")
@Log(title = "鎹愮尞妗堜緥鍣ㄥ畼鍒�", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
@RepeatSubmit
public AjaxResult edit(@RequestBody ServiceDonorcharge serviceDonorcharge) {
return toAjax(serviceDonorchargeService.updateById(serviceDonorcharge));
@@ -96,7 +96,7 @@
@ApiOperation("鍒犻櫎鎹愮尞妗堜緥鍣ㄥ畼鍒�")
@PreAuthorize("@ss.hasPermi('project:donorcharge:remove')")
@Log(title = "鎹愮尞妗堜緥鍣ㄥ畼鍒�", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
+ @GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(serviceDonorchargeService.removeByIds(Arrays.asList(ids)));
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonorchargeorganController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonorchargeorganController.java
index 6d868e7..9b81e3c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonorchargeorganController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonorchargeorganController.java
@@ -8,7 +8,6 @@
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.project.domain.ServiceDonationwitnessorgan;
import com.ruoyi.project.domain.ServiceDonorchargeorgan;
import com.ruoyi.project.service.IServiceDonorchargeorganService;
import io.swagger.annotations.Api;
@@ -31,7 +30,7 @@
@Slf4j
@Api("鎹愮尞鍣ㄥ畼")
@RestController
-@RequestMapping("/system/donorchargeorgan")
+@RequestMapping("/project/donorchargeorgan")
public class ServiceDonorchargeorganController extends BaseController {
@Autowired
private IServiceDonorchargeorganService serviceDonorchargeorganService;
@@ -40,7 +39,7 @@
* 鏌ヨ鎹愮尞鍣ㄥ畼鍒楄〃
*/
@ApiOperation("鏌ヨ鎹愮尞鍣ㄥ畼鍒楄〃")
- @PreAuthorize("@ss.hasPermi('system:donorchargeorgan:list')")
+ @PreAuthorize("@ss.hasPermi('project:donorchargeorgan:list')")
@GetMapping("/list")
public TableDataInfo list(ServiceDonorchargeorgan serviceDonorchargeorgan) {
startPage();
@@ -52,7 +51,7 @@
* 瀵煎嚭鎹愮尞鍣ㄥ畼鍒楄〃
*/
@ApiOperation("瀵煎嚭鎹愮尞鍣ㄥ畼鍒楄〃")
- @PreAuthorize("@ss.hasPermi('system:donorchargeorgan:export')")
+ @PreAuthorize("@ss.hasPermi('project:donorchargeorgan:export')")
@Log(title = "鎹愮尞鍣ㄥ畼", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(ServiceDonorchargeorgan serviceDonorchargeorgan) {
@@ -65,8 +64,8 @@
* 鑾峰彇鎹愮尞鍣ㄥ畼璇︾粏淇℃伅
*/
@ApiOperation("鑾峰彇鎹愮尞鍣ㄥ畼璇︾粏淇℃伅")
- @PreAuthorize("@ss.hasPermi('system:donorchargeorgan:query')")
- @GetMapping(value = "/{id}")
+ @PreAuthorize("@ss.hasPermi('project:donorchargeorgan:query')")
+ @GetMapping(value = "/getInfo/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return AjaxResult.success(serviceDonorchargeorganService.getById(id));
}
@@ -75,9 +74,9 @@
* 鏂板鎹愮尞鍣ㄥ畼
*/
@ApiOperation("鏂板鎹愮尞鍣ㄥ畼")
- @PreAuthorize("@ss.hasPermi('system:donorchargeorgan:add')")
+ @PreAuthorize("@ss.hasPermi('project:donorchargeorgan:add')")
@Log(title = "鎹愮尞鍣ㄥ畼", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
@RepeatSubmit
public AjaxResult add(@RequestBody ServiceDonorchargeorgan serviceDonorchargeorgan) {
return toAjax(serviceDonorchargeorganService.save(serviceDonorchargeorgan));
@@ -87,9 +86,9 @@
* 淇敼鎹愮尞鍣ㄥ畼
*/
@ApiOperation("淇敼鎹愮尞鍣ㄥ畼")
- @PreAuthorize("@ss.hasPermi('system:donorchargeorgan:edit')")
+ @PreAuthorize("@ss.hasPermi('project:donorchargeorgan:edit')")
@Log(title = "鎹愮尞鍣ㄥ畼", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
@RepeatSubmit
public AjaxResult edit(@RequestBody ServiceDonorchargeorgan serviceDonorchargeorgan) {
return toAjax(serviceDonorchargeorganService.updateById(serviceDonorchargeorgan));
@@ -99,9 +98,9 @@
* 鍒犻櫎鎹愮尞鍣ㄥ畼
*/
@ApiOperation("鍒犻櫎鎹愮尞鍣ㄥ畼")
- @PreAuthorize("@ss.hasPermi('system:donorchargeorgan:remove')")
+ @PreAuthorize("@ss.hasPermi('project:donorchargeorgan:remove')")
@Log(title = "鎹愮尞鍣ㄥ畼", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
+ @GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(serviceDonorchargeorganService.removeByIds(Arrays.asList(ids)));
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/BaseOrgancharge.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/BaseOrgancharge.java
index d79c382..76868d6 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/BaseOrgancharge.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/BaseOrgancharge.java
@@ -1,6 +1,5 @@
package com.ruoyi.project.domain;
-import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.ruoyi.common.annotation.Excel;
@@ -8,6 +7,8 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+
+import java.math.BigDecimal;
/**
* 浜轰綋鍣ㄥ畼鑾峰彇璐圭敤瀵硅薄 base_organcharge
@@ -42,5 +43,11 @@
@Excel(name = "鑾峰彇璐圭敤")
private BigDecimal charge;
+ /** 鑾峰彇璐圭敤 */
+ @ApiModelProperty("澶囨敞")
+ @Excel(name = "澶囨敞")
+ private String remark;
+
+
}
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
index 4c87d93..f14cb4d 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorcharge.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorcharge.java
@@ -1,15 +1,16 @@
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.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_donorcharge
@@ -41,8 +42,8 @@
/** 鎹愮尞鏃堕棿 */
@ApiModelProperty("鎹愮尞鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "鎹愮尞鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "鎹愮尞鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
private Date donatetime;
/** 濮撳悕 */
@@ -52,8 +53,8 @@
/** 鍑虹敓骞存湀 */
@ApiModelProperty("鍑虹敓骞存湀")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "鍑虹敓骞存湀", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "鍑虹敓骞存湀", width = 30, dateFormat = "yyyy-MM-dd")
private Date borthdate;
/** 鎬у埆 */
@@ -67,8 +68,8 @@
private String age;
/** 鎹愮尞绫诲埆 鏍规嵁瀛楀吀sys_DonationCategory */
- @ApiModelProperty("鎹愮尞绫诲埆 鏍规嵁瀛楀吀sys_DonationCategory")
- @Excel(name = "鎹愮尞绫诲埆 鏍规嵁瀛楀吀sys_DonationCategory")
+ @ApiModelProperty("鎹愮尞绫诲埆")
+ @Excel(name = "鎹愮尞绫诲埆")
private String donationcategory;
/** 鎹愮尞鐨勫櫒瀹� */
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 e7e585f..d776cbf 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
@@ -1,16 +1,16 @@
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.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_donorchargeorgan
@@ -35,8 +35,8 @@
* 鍏宠仈service_donorcharge琛ㄧ殑ID
*/
@ApiModelProperty("鍏宠仈service_donorcharge琛ㄧ殑ID")
- //鏁版嵁搴撹嚜澧炴敼鎴怈TableId(type = IdType.AUTO)
- private Long donorchargelD;
+ @Excel(name = "鍏宠仈service_donorcharge琛ㄧ殑ID")
+ private Long donorchargeid;
/**
* 鍏宠仈service_donatebaseinfo琛ㄧ殑ID
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonorchargeorganServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonorchargeorganServiceImpl.java
index 971f64c..35c0c02 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonorchargeorganServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonorchargeorganServiceImpl.java
@@ -32,6 +32,8 @@
LambdaQueryWrapper<ServiceDonorchargeorgan> wrappers = Wrappers.lambdaQuery();
if (serviceDonorchargeorgan.getInfoid() != null) {
wrappers.eq(ServiceDonorchargeorgan::getInfoid, serviceDonorchargeorgan.getInfoid());
+ }if (serviceDonorchargeorgan.getDonorchargeid() != null) {
+ wrappers.eq(ServiceDonorchargeorgan::getDonorchargeid, serviceDonorchargeorgan.getDonorchargeid());
}
if (StringUtils.isNotBlank(serviceDonorchargeorgan.getDonorname())) {
wrappers.like(ServiceDonorchargeorgan::getDonorname, serviceDonorchargeorgan.getDonorname());
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml
index 8be7cdc..ee88a75 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml
@@ -6,8 +6,7 @@
<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="donorchargeid" column="donorchargeid"/>
<result property="donorname" column="donorname"/>
<result property="hospitalname" column="HospitalName"/>
<result property="hospitalno" column="HospitalNo"/>
@@ -30,7 +29,7 @@
<sql id="selectServiceDonorchargeorganVo">
select ID,
- donorchargelD,
+ donorchargeid,
InfoID,
donorname,
HospitalName,
@@ -58,7 +57,7 @@
<include refid="selectServiceDonorchargeorganVo"/>
<where>
<if test="infoid != null ">and InfoID = #{infoid}</if>
- <if test="donorchargelD != null ">and donorchargelD = #{donorchargelD}</if>
+ <if test="donorchargeid != null ">and donorchargeID = #{donorchargeid}</if>
<if test="donorname != null and donorname != ''">and donorname like concat('%', #{donorname}, '%')</if>
<if test="hospitalname != null and hospitalname != ''">and HospitalName like concat('%', #{hospitalname},
'%')
--
Gitblit v1.9.3