From 8b8ca4fb9791a5b79107e354cde500ed6f278219 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期日, 08 十月 2023 18:27:53 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateorgan.java | 25 ++++
ruoyi-project/src/main/java/com/ruoyi/project/mapper/BaseOrganchargeMapper.java | 24 ++++
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/BaseOrganchargeServiceImpl.java | 46 +++++++
ruoyi-project/src/main/resources/mapper/project/BaseOrganchargeMapper.xml | 33 +++++
ruoyi-project/src/main/java/com/ruoyi/project/service/IBaseOrganchargeService.java | 24 ++++
ruoyi-project/src/main/java/com/ruoyi/project/domain/BaseOrgancharge.java | 46 +++++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOrganchargeController.java | 102 +++++++++++++++++
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailServiceImpl.java | 2
ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml | 18 ++
9 files changed, 318 insertions(+), 2 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
new file mode 100644
index 0000000..cff3e12
--- /dev/null
+++ b/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)));
+ }
+}
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
new file mode 100644
index 0000000..d79c382
--- /dev/null
+++ b/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;
+
+}
+
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateorgan.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateorgan.java
index f28723d..b7ede30 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateorgan.java
+++ b/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;
+
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/BaseOrganchargeMapper.java b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/BaseOrganchargeMapper.java
new file mode 100644
index 0000000..c8b3e83
--- /dev/null
+++ b/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);
+}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/IBaseOrganchargeService.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/IBaseOrganchargeService.java
new file mode 100644
index 0000000..4710248
--- /dev/null
+++ b/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);
+}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/BaseOrganchargeServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/BaseOrganchargeServiceImpl.java
new file mode 100644
index 0000000..927a417
--- /dev/null
+++ b/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);
+ }
+
+}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailServiceImpl.java
index ffafa84..d9524a6 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailServiceImpl.java
+++ b/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");
diff --git a/ruoyi-project/src/main/resources/mapper/project/BaseOrganchargeMapper.xml b/ruoyi-project/src/main/resources/mapper/project/BaseOrganchargeMapper.xml
new file mode 100644
index 0000000..5692921
--- /dev/null
+++ b/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>
\ No newline at end of file
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml
index 8dd7cb9..cefad7b 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml
+++ b/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>
--
Gitblit v1.9.3