代码提交

liusheng

2023-12-27 5c909da3050d2337015c0454d219d482add19a63

代码提交

 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) {

 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;

/**
 * æçŒ®æ¡ˆä¾‹å™¨å®˜åˆ—Controller
 * 
 * @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)));
    }
}

 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) {

 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;

/**
 * æçŒ®æ¡ˆä¾‹å™¨å®˜åˆ—Controller
 *
 * @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)));
    }
}

 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;

}


 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;

}


 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;
@@ -19,84 +20,120 @@
 */
@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;

 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;

/**
 * æçŒ®æ¡ˆä¾‹å™¨å®˜åˆ—Mapper接口
 *
 * @author ruoyi
 * @date 2023-12-27
 */
@Mapper
public interface ServiceDonateorganstaticsMapper extends BaseMapper<ServiceDonateorganstatics> {
    /**
     * æŸ¥è¯¢æçŒ®æ¡ˆä¾‹å™¨å®˜åˆ—列表
     *
     * @param serviceDonateorganstatics æçŒ®æ¡ˆä¾‹å™¨å®˜åˆ—
     * @return æçŒ®æ¡ˆä¾‹å™¨å®˜åˆ—集合
     */
    public List<ServiceDonateorganstatics> selectServiceDonateorganstaticsList(ServiceDonateorganstatics serviceDonateorganstatics);
}

 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;

/**
 * æçŒ®æ¡ˆä¾‹å™¨å®˜åˆ—Mapper接口
 *
 * @author ruoyi
 * @date 2023-12-27
 */
@Mapper
public interface ServiceDonorchargeMapper extends BaseMapper<ServiceDonorcharge> {
    /**
     * æŸ¥è¯¢æçŒ®æ¡ˆä¾‹å™¨å®˜åˆ—列表
     *
     * @param serviceDonorcharge æçŒ®æ¡ˆä¾‹å™¨å®˜åˆ—
     * @return æçŒ®æ¡ˆä¾‹å™¨å®˜åˆ—集合
     */
    public List<ServiceDonorcharge> selectServiceDonorchargeList(ServiceDonorcharge serviceDonorcharge);
}

 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;

/**
 * æçŒ®æ¡ˆä¾‹å™¨å®˜åˆ—Service接口
 *
 * @author ruoyi
 * @date 2023-12-27
 */
public interface IServiceDonateorganstaticsService extends IService<ServiceDonateorganstatics> {

    /**
     * æŸ¥è¯¢æçŒ®æ¡ˆä¾‹å™¨å®˜åˆ—列表
     *
     * @param serviceDonateorganstatics æçŒ®æ¡ˆä¾‹å™¨å®˜åˆ—
     * @return æçŒ®æ¡ˆä¾‹å™¨å®˜åˆ—集合
     */
    public List<ServiceDonateorganstatics> queryList(ServiceDonateorganstatics serviceDonateorganstatics);
}

 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;

/**
 * æçŒ®æ¡ˆä¾‹å™¨å®˜åˆ—Service接口
 * 
 * @author ruoyi
 * @date 2023-12-27
 */
public interface IServiceDonorchargeService extends IService<ServiceDonorcharge>
{

    /**
     * æŸ¥è¯¢æçŒ®æ¡ˆä¾‹å™¨å®˜åˆ—列表
     * 
     * @param serviceDonorcharge æçŒ®æ¡ˆä¾‹å™¨å®˜åˆ—
     * @return æçŒ®æ¡ˆä¾‹å™¨å®˜åˆ—集合
     */
    public List<ServiceDonorcharge> queryList(ServiceDonorcharge serviceDonorcharge);
}

 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;

/**
 * æçŒ®æ¡ˆä¾‹å™¨å®˜åˆ—Service业务层处理
 * 
 * @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);
    }

}

 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;

/**
 * æçŒ®æ¡ˆä¾‹å™¨å®˜åˆ—Service业务层处理
 *
 * @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);
    }

}

 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>

 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>

 ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml

@@ -2,11 +2,12 @@
<!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">
<mapper namespace="com.ruoyi.project.mapper.ServiceDonorchargeorganMapper">
    
    <resultMap type="ServiceDonorchargeorgan" id="ServiceDonorchargeorganResult">
    <resultMap type="com.ruoyi.project.domain.ServiceDonorchargeorgan" id="ServiceDonorchargeorganResult">
        <result property="id"    column="ID"    />
        <result property="infoid"    column="InfoID"    />
        <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"    />
@@ -28,15 +29,40 @@
    </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="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="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>