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); 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))); 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))); } 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))); } 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; }
@@ -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; /** 捐献的器官 */ 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 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()); 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}, '%')
