yxh

yxh

2024-03-08 25fb6d7ba484738ebe9c577eba4f3596520caf60

yxh

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

@@ -1,17 +1,16 @@
package com.ruoyi.project.domain;

import java.math.BigDecimal;
import java.util.Date;

import com.baomidou.mybatisplus.annotation.TableField;
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_donorpayment
@@ -128,7 +127,14 @@
     */
    @ApiModelProperty("经办人")
    @Excel(name = "经办人")
    private String handledPerson ;
    private String userName ;

    /**
     * 经办人
     */
    @ApiModelProperty("经办人")
    @Excel(name = "经办人")
    private String userNo ;

    /**
     * 收款时间

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

@@ -7,7 +7,8 @@
import com.ruoyi.common.constant.HttpStatus;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.project.domain.*;
import com.ruoyi.project.domain.ServiceDonorchargeorgan;
import com.ruoyi.project.domain.ServiceDonorpayment;
import com.ruoyi.project.mapper.ServiceDonorchargeorganMapper;
import com.ruoyi.project.mapper.ServiceDonorpaymentMapper;
import com.ruoyi.project.service.IServiceDonorpaymentService;
@@ -17,7 +18,6 @@

import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.util.*;

/**
@@ -59,8 +59,11 @@
        if (StringUtils.isNotBlank(serviceDonorpayment.getHospitalname())) {
            wrappers.eq(ServiceDonorpayment::getHospitalname, serviceDonorpayment.getHospitalname());
        }
        if (StringUtils.isNotBlank(serviceDonorpayment.getHandledPerson())) {
            wrappers.eq(ServiceDonorpayment::getHandledPerson, serviceDonorpayment.getHandledPerson());
        if (StringUtils.isNotBlank(serviceDonorpayment.getUserName())) {
            wrappers.eq(ServiceDonorpayment::getUserName, serviceDonorpayment.getUserName());
        }
        if (StringUtils.isNotBlank(serviceDonorpayment.getUserNo())) {
            wrappers.eq(ServiceDonorpayment::getUserNo, serviceDonorpayment.getUserNo());
        }
        if (StringUtils.isNotBlank(serviceDonorpayment.getHospitalno())) {
            wrappers.eq(ServiceDonorpayment::getHospitalno, serviceDonorpayment.getHospitalno());
@@ -99,7 +102,7 @@

        dataMap.put("RQ", simpleDateFormat.format(new Date()));
        dataMap.put("FKDW", serviceDonorpayment.getHospitalname());
        dataMap.put("JBR", StringUtils.isEmpty(serviceDonorpayment.getHandledPerson()) ? "" : serviceDonorpayment.getHandledPerson());
        dataMap.put("JBR", StringUtils.isEmpty(serviceDonorpayment.getUserName()) ? "" : serviceDonorpayment.getUserName());
        ServiceDonorchargeorgan serviceDonorchargeorgan = new ServiceDonorchargeorgan();
        serviceDonorchargeorgan.setPaymentid(id);
        List<ServiceDonorchargeorgan> serviceDonorchargeorgans = serviceDonorchargeorganMapper.selectServiceDonorchargeorganList(serviceDonorchargeorgan);

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

@@ -25,11 +25,12 @@
        <result property="createTime"    column="create_time"    />
        <result property="updateBy"    column="update_by"    />
        <result property="updateTime"    column="update_time"    />
        <result property="handledPerson"    column="handled_person"    />
        <result property="userName"    column="user_name"    />
        <result property="userNo"    column="user_no"    />
    </resultMap>

    <sql id="selectServiceDonorpaymentVo">
        select id, paymentno, paymenttime, paystatus, contactinfo, hospitalname, hospitalno, hospitalcontactinfo, receivableamount, beneficiary, beneficiarybank, beneficiaryaccount, receivedamount, receivedtime, remark, del_flag, create_by, create_time, update_by, update_time,handled_person from service_donorpayment
        select id, paymentno, paymenttime, paystatus, contactinfo, hospitalname, hospitalno, hospitalcontactinfo, receivableamount, beneficiary, beneficiarybank, beneficiaryaccount, receivedamount, receivedtime, remark, del_flag, create_by, create_time, update_by, update_time,user_name,user_no from service_donorpayment
    </sql>

    <select id="selectServiceDonorpaymentList" parameterType="com.ruoyi.project.domain.ServiceDonorpayment" resultMap="ServiceDonorpaymentResult">
@@ -46,7 +47,8 @@
            <if test="beneficiary != null  and beneficiary != ''"> and beneficiary = #{beneficiary}</if>
            <if test="beneficiarybank != null  and beneficiarybank != ''"> and beneficiarybank = #{beneficiarybank}</if>
            <if test="beneficiaryaccount != null  and beneficiaryaccount != ''"> and beneficiaryaccount = #{beneficiaryaccount}</if>
            <if test="handledPerson != null  and handledPerson != ''"> and handled_person = #{handledPerson}</if>
            <if test="userName != null  and userName != ''"> and user_name = #{userName}</if>
            <if test="userNo != null  and userNo != ''"> and user_no = #{userNo}</if>
            <if test="receivedamount != null "> and receivedamount = #{receivedamount}</if>
            <if test="receivedtime != null "> and receivedtime = #{receivedtime}</if>
        </where>