代码提交

liusheng

2023-10-08 8b8ca4fb9791a5b79107e354cde500ed6f278219

代码提交

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOrganchargeController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,102 @@
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.BaseOrgancharge;
import com.ruoyi.project.service.IBaseOrganchargeService;
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-10-08
 */
@Api("人体器官获取费用")
@RestController
@RequestMapping("/organcharge")
public class BaseOrganchargeController extends BaseController {
    @Autowired
    private IBaseOrganchargeService baseOrganchargeService;

    /**
     * æŸ¥è¯¢äººä½“器官获取费用列表
     */
    @ApiOperation("查询人体器官获取费用列表")
    @PreAuthorize("@ss.hasPermi('system:organcharge:list')")
    @GetMapping("/list")
    public TableDataInfo list(BaseOrgancharge baseOrgancharge) {
        startPage();
        List<BaseOrgancharge> list = baseOrganchargeService.queryList(baseOrgancharge);
        return getDataTable(list);
    }

    /**
     * å¯¼å‡ºäººä½“器官获取费用列表
     */
    @ApiOperation("导出人体器官获取费用列表")
    @PreAuthorize("@ss.hasPermi('system:organcharge:export')")
    @Log(title = "人体器官获取费用", businessType = BusinessType.EXPORT)
    @GetMapping("/export")
    public AjaxResult export(BaseOrgancharge baseOrgancharge) {
        List<BaseOrgancharge> list = baseOrganchargeService.queryList(baseOrgancharge);
        ExcelUtil<BaseOrgancharge> util = new ExcelUtil<BaseOrgancharge>(BaseOrgancharge.class);
        return util.exportExcel(list, "人体器官获取费用数据");
    }

    /**
     * èŽ·å–人体器官获取费用详细信息
     */
    @ApiOperation("获取人体器官获取费用详细信息")
    @PreAuthorize("@ss.hasPermi('system:organcharge:query')")
    @GetMapping(value = "/getInfo/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id) {
        return AjaxResult.success(baseOrganchargeService.getById(id));
    }

    /**
     * æ–°å¢žäººä½“器官获取费用
     */
    @ApiOperation("新增人体器官获取费用")
    @PreAuthorize("@ss.hasPermi('system:organcharge:add')")
    @Log(title = "人体器官获取费用", businessType = BusinessType.INSERT)
    @PostMapping("/add")
    @RepeatSubmit
    public AjaxResult add(@RequestBody BaseOrgancharge baseOrgancharge) {
        return toAjax(baseOrganchargeService.save(baseOrgancharge));
    }

    /**
     * ä¿®æ”¹äººä½“器官获取费用
     */
    @ApiOperation("修改人体器官获取费用")
    @PreAuthorize("@ss.hasPermi('system:organcharge:edit')")
    @Log(title = "人体器官获取费用", businessType = BusinessType.UPDATE)
    @PostMapping("/edit")
    @RepeatSubmit
    public AjaxResult edit(@RequestBody BaseOrgancharge baseOrgancharge) {
        return toAjax(baseOrganchargeService.updateById(baseOrgancharge));
    }

    /**
     * åˆ é™¤äººä½“器官获取费用
     */
    @ApiOperation("删除人体器官获取费用")
    @PreAuthorize("@ss.hasPermi('system:organcharge:remove')")
    @GetMapping("/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids) {
        return toAjax(baseOrganchargeService.removeByIds(Arrays.asList(ids)));
    }
}

 ruoyi-project/src/main/java/com/ruoyi/project/domain/BaseOrgancharge.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,46 @@
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;
import com.ruoyi.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * äººä½“器官获取费用对象 base_organcharge
 * 
 * @author ruoyi
 * @date 2023-10-08
 */
@Data
@ApiModel("人体器官获取费用")
public class BaseOrgancharge extends BaseEntity
{
    private static final long serialVersionUID = 1L;

    /** $column.columnComment */
    @ApiModelProperty("$column.columnComment")
    //数据库自增改成@TableId(type = IdType.AUTO)
    @TableId(type = IdType.AUTO)
    private Long id;

    /** å™¨å®˜ç¼–码 */
    @ApiModelProperty("器官编码")
    @Excel(name = "器官编码")
    private String organcode;

    /** å™¨å®˜åç§° */
    @ApiModelProperty("器官名称")
    @Excel(name = "器官名称")
    private String organname;

    /** èŽ·å–费用 */
    @ApiModelProperty("获取费用")
    @Excel(name = "获取费用")
    private BigDecimal charge;

}


 ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateorgan.java

@@ -8,6 +8,7 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.apache.poi.hpsf.Decimal;

import java.util.Date;

@@ -269,6 +270,30 @@
    @ApiModelProperty("移植人所属区域名称")
    private String residencecountyname;

    @ApiModelProperty("器官费用")
    private Double organcharge;

    @ApiModelProperty("器官费用")
    private String organchargeoperator;

    @ApiModelProperty("器官实际收到费用时间")
    private Date organchargedate;

    @ApiModelProperty("器官实际收到费用")
    private Double organamount;

    @ApiModelProperty("器官费用收取状态: 0: æœªæ”¶å–，1: å·²æ”¶å–")
    private Integer chargestate;

    @ApiModelProperty("器官实际收到费用说明")
    private String organchargedesc;

    @ApiModelProperty("未获取原因")
    private String notgetreason;

    @ApiModelProperty("官移恒状态 : 0: æœªç§»: 1: å·²ç§»æ¤")
    private Integer transplantstate;


}


 ruoyi-project/src/main/java/com/ruoyi/project/mapper/BaseOrganchargeMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,24 @@
package com.ruoyi.project.mapper;


import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.project.domain.BaseOrgancharge;

import java.util.List;

/**
 * äººä½“器官获取费用Mapper接口
 * 
 * @author ruoyi
 * @date 2023-10-08
 */
public interface BaseOrganchargeMapper extends BaseMapper<BaseOrgancharge>
{
    /**
     * æŸ¥è¯¢äººä½“器官获取费用列表
     *
     * @param baseOrgancharge äººä½“器官获取费用
     * @return äººä½“器官获取费用集合
     */
    public List<BaseOrgancharge> selectBaseOrganchargeList(BaseOrgancharge baseOrgancharge);
}

 ruoyi-project/src/main/java/com/ruoyi/project/service/IBaseOrganchargeService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,24 @@
package com.ruoyi.project.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.project.domain.BaseOrgancharge;

import java.util.List;

/**
 * äººä½“器官获取费用Service接口
 * 
 * @author ruoyi
 * @date 2023-10-08
 */
public interface IBaseOrganchargeService extends IService<BaseOrgancharge>
{

    /**
     * æŸ¥è¯¢äººä½“器官获取费用列表
     * 
     * @param baseOrgancharge äººä½“器官获取费用
     * @return äººä½“器官获取费用集合
     */
    public List<BaseOrgancharge> queryList(BaseOrgancharge baseOrgancharge);
}

 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/BaseOrganchargeServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,46 @@
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.BaseOrgancharge;
import com.ruoyi.project.mapper.BaseOrganchargeMapper;
import com.ruoyi.project.service.IBaseOrganchargeService;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * äººä½“器官获取费用Service业务层处理
 * 
 * @author ruoyi
 * @date 2023-10-08
 */
@Service
public class BaseOrganchargeServiceImpl extends ServiceImpl<BaseOrganchargeMapper, BaseOrgancharge> implements IBaseOrganchargeService
{


    /**
     * æŸ¥è¯¢äººä½“器官获取费用列表
     * 
     * @param baseOrgancharge äººä½“器官获取费用
     * @return äººä½“器官获取费用
     */
    @Override
    public List<BaseOrgancharge> queryList(BaseOrgancharge baseOrgancharge) {
        LambdaQueryWrapper<BaseOrgancharge> wrappers = Wrappers.lambdaQuery();
        if (StringUtils.isNotBlank(baseOrgancharge.getOrgancode())){
            wrappers.eq(BaseOrgancharge::getOrgancode ,baseOrgancharge.getOrgancode());
        }
        if (StringUtils.isNotBlank(baseOrgancharge.getOrganname())){
            wrappers.like(BaseOrgancharge::getOrganname ,baseOrgancharge.getOrganname());
        }
        if (baseOrgancharge.getCharge() != null){
            wrappers.eq(BaseOrgancharge::getCharge ,baseOrgancharge.getCharge());
        }
        return this.list(wrappers);
    }

}

 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailServiceImpl.java

@@ -343,7 +343,7 @@

    @Override
    public Map<String, Double> performance(ServiceFunddetail serviceFunddetail) {
        //根据"受益人编号"和"绩效日期(年份)"查询个人历史绩效
        //根据"身份证号"和"绩效日期(年份)"查询个人历史绩效
        ServiceFunddetail serviceFunddetailEo = new ServiceFunddetail();
        serviceFunddetailEo.setIdcardno(serviceFunddetail.getIdcardno());
        serviceFunddetailEo.setApplytype("5");

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,33 @@
<?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.BaseOrganchargeMapper">
    
    <resultMap type="com.ruoyi.project.domain.BaseOrgancharge" id="BaseOrganchargeResult">
        <result property="id"    column="ID"    />
        <result property="organcode"    column="organcode"    />
        <result property="organname"    column="organname"    />
        <result property="charge"    column="charge"    />
        <result property="del_flag"    column="del_flag"    />
        <result property="remark"    column="remark"    />
        <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="selectBaseOrganchargeVo">
        select ID, organcode, organname, charge, del_flag, remark, create_by, create_time, update_by, update_time from base_organcharge
    </sql>

    <select id="selectBaseOrganchargeList" parameterType="com.ruoyi.project.domain.BaseOrgancharge" resultMap="BaseOrganchargeResult">
        <include refid="selectBaseOrganchargeVo"/>
        <where>
            <if test="organcode != null  and organcode != ''"> and organcode = #{organcode}</if>
            <if test="organname != null  and organname != ''"> and organname like concat('%', #{organname}, '%')</if>
            <if test="charge != null "> and charge = #{charge}</if>
        </where>
    </select>

</mapper>

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

@@ -60,6 +60,14 @@
        <result property="residencecommunityname" column="ResidenceCommunityName"/>
        <result property="residencecountycode" column="ResidenceCountyCode"/>
        <result property="residencecountyname" column="ResidenceCountyName"/>
        <result property="organcharge" column="organcharge"/>
        <result property="organchargeoperator" column="organchargeoperator"/>
        <result property="organchargedate" column="organchargedate"/>
        <result property="organamount" column="organamount"/>
        <result property="chargestate" column="chargestate"/>
        <result property="organchargedesc" column="organchargedesc"/>
        <result property="notgetreason" column="notgetreason"/>
        <result property="transplantstate" column="transplantstate"/>
    </resultMap>

    <sql id="selectServiceDonateorganVo">
@@ -120,7 +128,15 @@
               ResidenceCommunity,
               ResidenceCommunityName,
               ResidenceCountyCode,
               ResidenceCountyName
               ResidenceCountyName,
               organcharge,
               organchargeoperator,
               organchargedate,
               organamount,
               chargestate,
               organchargedesc,
               notgetreason,
               transplantstate
        from service_donateorgan
    </sql>