代码提交

liusheng

2023-08-15 2c07f3c1cf4092fd42e3022c56d1bcf8fcc9438e

代码提交

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

@@ -88,53 +88,53 @@
    /** 税前金额合计 */
    @ApiModelProperty("税前金额合计")
    @Excel(name = "税前金额合计")
    private BigDecimal pretaxcost;
    private Double pretaxcost;

    /** 税后金额合计 */
    @ApiModelProperty("税后金额合计")
    @Excel(name = "税后金额合计")
    private BigDecimal taxedcost;
    private Double taxedcost;

    /** 费用总金额 */
    @ApiModelProperty("费用总金额")
    @Excel(name = "费用总金额")
    private BigDecimal totalcost;
    private Double totalcost;

    /** 获取专家总费用 */
    @ApiModelProperty("获取专家总费用")
    //数据库自增改成@TableId(type = IdType.AUTO)
    //@TableId(type = IdType.AUTO)
    private BigDecimal procurementcost;
    private Double procurementcost;

    /** 专家费用总金额 */
    @ApiModelProperty("专家费用总金额")
    @Excel(name = "专家费用总金额")
    private BigDecimal expertcost;
    private Double expertcost;

    /** 伦理审查费用总金额 */
    @ApiModelProperty("伦理审查费用总金额")
    @Excel(name = "伦理审查费用总金额")
    private BigDecimal ethicscost;
    private Double ethicscost;

    /** 捐献者医学成本总金额 */
    @ApiModelProperty("捐献者医学成本总金额")
    @Excel(name = "捐献者医学成本总金额")
    private BigDecimal medicalcost;
    private Double medicalcost;

    /** 捐献者家属食宿费总金额 */
    @ApiModelProperty("捐献者家属食宿费总金额")
    @Excel(name = "捐献者家属食宿费总金额")
    private BigDecimal familycost;
    private Double familycost;

    /** 捐献者善后成本总金额 */
    @ApiModelProperty("捐献者善后成本总金额")
    @Excel(name = "捐献者善后成本总金额")
    private BigDecimal aftercarecost;
    private Double aftercarecost;

    /** 申请金额 */
    @ApiModelProperty("申请金额")
    @Excel(name = "申请金额")
    private BigDecimal amountrequested;
    private Double amountrequested;

    /** 资金类别 见字典sys_ConsolationType */
    @ApiModelProperty("资金类别 见字典sys_ConsolationType")

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

@@ -162,37 +162,37 @@
    /** 数量 */
    @ApiModelProperty("数量")
    @Excel(name = "数量")
    private BigDecimal quantity;
    private Double quantity;

    /** 价格 */
    @ApiModelProperty("价格")
    @Excel(name = "价格")
    private BigDecimal price;
    private Double price;

    /** 申请金额 */
    @ApiModelProperty("申请金额")
    @Excel(name = "申请金额")
    private BigDecimal amount;
    private Double amount;

    /** 扣税金额 */
    @ApiModelProperty("扣税金额")
    @Excel(name = "扣税金额")
    private BigDecimal taxamount;
    private Double taxamount;

    /** 税后金额 */
    @ApiModelProperty("税后金额")
    @Excel(name = "税后金额")
    private BigDecimal taxedamount;
    private Double taxedamount;

    /** 预支金额 */
    @ApiModelProperty("预支金额")
    @Excel(name = "预支金额")
    private BigDecimal prepaidamount;
    private Double prepaidamount;

    /** 付款金额 */
    @ApiModelProperty("付款金额")
    @Excel(name = "付款金额")
    private BigDecimal paidamount;
    private Double paidamount;

    /** 付款时间 */
    @ApiModelProperty("付款时间")
@@ -269,7 +269,7 @@
    /** $column.columnComment */
    @ApiModelProperty("$column.columnComment")
    @Excel(name = "上传时间")
    private BigDecimal reimbursementamount;
    private Double reimbursementamount;

    /** 金额 */
    @ApiModelProperty("金额")

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

@@ -270,7 +270,7 @@
    private Long flowlevel;

    /**
     * 99:审批驳回    100：上传医院  199：医院驳回
     *  100：上传医院  199：医院驳回
     */
    @ApiModelProperty("退回时的审核级别")
    private Long backflowlevel;

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

@@ -20,4 +20,12 @@
     * @return 费用申请明细集合
     */
    public List<ServiceFunddetailShared> queryList(ServiceFunddetailShared serviceFunddetailShared);

    /**
     * 删除费用申请明细
     *
     * @param serviceFunddetailShared 费用申请明细
     * @return
     */
    public Boolean delFunddetailShare(ServiceFunddetailShared serviceFunddetailShared)
}

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

@@ -774,6 +774,7 @@
        String strFUrl = "http://129.88.242.39:8899/seeyon/rest/attachment?token=" + strRes;
        List<RbDetailFile> parseArray2 = new ArrayList<>();
        List<RbDetailFile> parseArray = JSON.parseArray(remShare.getAnnexfiles(), RbDetailFile.class);
        log.info("parseArray的值 : {}",parseArray);
        for (int i = 0; i < parseArray.size(); i++) {
            RbDetailFile rbDetailFile = parseArray.get(i);
            log.info("filePath的修改:{}", filePath);

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

@@ -1,14 +1,17 @@
package com.ruoyi.project.service.impl;

import java.util.List;

import com.ruoyi.common.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

import java.util.ArrayList;
import java.util.Map;

import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.project.mapper.ServiceFunddetailSharedMapper;
import com.ruoyi.project.domain.ServiceFunddetailShared;
@@ -16,172 +19,190 @@

/**
 * 费用申请明细Service业务层处理
 * 
 *
 * @author ruoyi
 * @date 2023-04-20
 */
@Service
public class ServiceFunddetailSharedServiceImpl extends ServiceImpl<ServiceFunddetailSharedMapper, ServiceFunddetailShared> implements IServiceFunddetailSharedService 
{
public class ServiceFunddetailSharedServiceImpl extends ServiceImpl<ServiceFunddetailSharedMapper, ServiceFunddetailShared> implements IServiceFunddetailSharedService {


    /**
     * 查询费用申请明细列表
     * 
     *
     * @param serviceFunddetailShared 费用申请明细
     * @return 费用申请明细
     */
    @Override
    public List<ServiceFunddetailShared> queryList(ServiceFunddetailShared serviceFunddetailShared) {
        LambdaQueryWrapper<ServiceFunddetailShared> wrappers = Wrappers.lambdaQuery();
        if (serviceFunddetailShared.getFundid() != null){
            wrappers.eq(ServiceFunddetailShared::getFundid ,serviceFunddetailShared.getFundid());
        if (serviceFunddetailShared.getFundid() != null) {
            wrappers.eq(ServiceFunddetailShared::getFundid, serviceFunddetailShared.getFundid());
        }
        if (serviceFunddetailShared.getOrderno() != null){
            wrappers.eq(ServiceFunddetailShared::getOrderno ,serviceFunddetailShared.getOrderno());
        if (serviceFunddetailShared.getOrderno() != null) {
            wrappers.eq(ServiceFunddetailShared::getOrderno, serviceFunddetailShared.getOrderno());
        }
        if (serviceFunddetailShared.getItemid() != null){
            wrappers.eq(ServiceFunddetailShared::getItemid ,serviceFunddetailShared.getItemid());
        if (serviceFunddetailShared.getItemid() != null) {
            wrappers.eq(ServiceFunddetailShared::getItemid, serviceFunddetailShared.getItemid());
        }
        if (StringUtils.isNotBlank(serviceFunddetailShared.getItemcode())){
            wrappers.eq(ServiceFunddetailShared::getItemcode ,serviceFunddetailShared.getItemcode());
        if (StringUtils.isNotBlank(serviceFunddetailShared.getItemcode())) {
            wrappers.eq(ServiceFunddetailShared::getItemcode, serviceFunddetailShared.getItemcode());
        }
        if (StringUtils.isNotBlank(serviceFunddetailShared.getItemname())){
            wrappers.like(ServiceFunddetailShared::getItemname ,serviceFunddetailShared.getItemname());
        if (StringUtils.isNotBlank(serviceFunddetailShared.getItemname())) {
            wrappers.like(ServiceFunddetailShared::getItemname, serviceFunddetailShared.getItemname());
        }
        if (StringUtils.isNotBlank(serviceFunddetailShared.getItemtype())){
            wrappers.eq(ServiceFunddetailShared::getItemtype ,serviceFunddetailShared.getItemtype());
        if (StringUtils.isNotBlank(serviceFunddetailShared.getItemtype())) {
            wrappers.eq(ServiceFunddetailShared::getItemtype, serviceFunddetailShared.getItemtype());
        }
        if (StringUtils.isNotBlank(serviceFunddetailShared.getApplytype())){
            wrappers.eq(ServiceFunddetailShared::getApplytype ,serviceFunddetailShared.getApplytype());
        if (StringUtils.isNotBlank(serviceFunddetailShared.getApplytype())) {
            wrappers.eq(ServiceFunddetailShared::getApplytype, serviceFunddetailShared.getApplytype());
        }
        if (StringUtils.isNotBlank(serviceFunddetailShared.getApplytypename())){
            wrappers.like(ServiceFunddetailShared::getApplytypename ,serviceFunddetailShared.getApplytypename());
        if (StringUtils.isNotBlank(serviceFunddetailShared.getApplytypename())) {
            wrappers.like(ServiceFunddetailShared::getApplytypename, serviceFunddetailShared.getApplytypename());
        }
        if (StringUtils.isNotBlank(serviceFunddetailShared.getBeneficiaryname())){
            wrappers.like(ServiceFunddetailShared::getBeneficiaryname ,serviceFunddetailShared.getBeneficiaryname());
        if (StringUtils.isNotBlank(serviceFunddetailShared.getBeneficiaryname())) {
            wrappers.like(ServiceFunddetailShared::getBeneficiaryname, serviceFunddetailShared.getBeneficiaryname());
        }
        if (StringUtils.isNotBlank(serviceFunddetailShared.getBeneficiaryno())){
            wrappers.eq(ServiceFunddetailShared::getBeneficiaryno ,serviceFunddetailShared.getBeneficiaryno());
        if (StringUtils.isNotBlank(serviceFunddetailShared.getBeneficiaryno())) {
            wrappers.eq(ServiceFunddetailShared::getBeneficiaryno, serviceFunddetailShared.getBeneficiaryno());
        }
        if (StringUtils.isNotBlank(serviceFunddetailShared.getUnitname())){
            wrappers.like(ServiceFunddetailShared::getUnitname ,serviceFunddetailShared.getUnitname());
        if (StringUtils.isNotBlank(serviceFunddetailShared.getUnitname())) {
            wrappers.like(ServiceFunddetailShared::getUnitname, serviceFunddetailShared.getUnitname());
        }
        if (StringUtils.isNotBlank(serviceFunddetailShared.getUnitno())){
            wrappers.eq(ServiceFunddetailShared::getUnitno ,serviceFunddetailShared.getUnitno());
        if (StringUtils.isNotBlank(serviceFunddetailShared.getUnitno())) {
            wrappers.eq(ServiceFunddetailShared::getUnitno, serviceFunddetailShared.getUnitno());
        }
        if (StringUtils.isNotBlank(serviceFunddetailShared.getUnituserno())){
            wrappers.eq(ServiceFunddetailShared::getUnituserno ,serviceFunddetailShared.getUnituserno());
        if (StringUtils.isNotBlank(serviceFunddetailShared.getUnituserno())) {
            wrappers.eq(ServiceFunddetailShared::getUnituserno, serviceFunddetailShared.getUnituserno());
        }
        if (StringUtils.isNotBlank(serviceFunddetailShared.getTitle())){
            wrappers.eq(ServiceFunddetailShared::getTitle ,serviceFunddetailShared.getTitle());
        if (StringUtils.isNotBlank(serviceFunddetailShared.getTitle())) {
            wrappers.eq(ServiceFunddetailShared::getTitle, serviceFunddetailShared.getTitle());
        }
        if (serviceFunddetailShared.getIdcardtype() != null){
            wrappers.eq(ServiceFunddetailShared::getIdcardtype ,serviceFunddetailShared.getIdcardtype());
        if (serviceFunddetailShared.getIdcardtype() != null) {
            wrappers.eq(ServiceFunddetailShared::getIdcardtype, serviceFunddetailShared.getIdcardtype());
        }
        if (StringUtils.isNotBlank(serviceFunddetailShared.getIdcardno())){
            wrappers.eq(ServiceFunddetailShared::getIdcardno ,serviceFunddetailShared.getIdcardno());
        if (StringUtils.isNotBlank(serviceFunddetailShared.getIdcardno())) {
            wrappers.eq(ServiceFunddetailShared::getIdcardno, serviceFunddetailShared.getIdcardno());
        }
        if (StringUtils.isNotBlank(serviceFunddetailShared.getSex())){
            wrappers.eq(ServiceFunddetailShared::getSex ,serviceFunddetailShared.getSex());
        if (StringUtils.isNotBlank(serviceFunddetailShared.getSex())) {
            wrappers.eq(ServiceFunddetailShared::getSex, serviceFunddetailShared.getSex());
        }
        if (StringUtils.isNotBlank(serviceFunddetailShared.getFamilyrelations())){
            wrappers.eq(ServiceFunddetailShared::getFamilyrelations ,serviceFunddetailShared.getFamilyrelations());
        if (StringUtils.isNotBlank(serviceFunddetailShared.getFamilyrelations())) {
            wrappers.eq(ServiceFunddetailShared::getFamilyrelations, serviceFunddetailShared.getFamilyrelations());
        }
        if (StringUtils.isNotBlank(serviceFunddetailShared.getPhone())){
            wrappers.eq(ServiceFunddetailShared::getPhone ,serviceFunddetailShared.getPhone());
        if (StringUtils.isNotBlank(serviceFunddetailShared.getPhone())) {
            wrappers.eq(ServiceFunddetailShared::getPhone, serviceFunddetailShared.getPhone());
        }
        if (StringUtils.isNotBlank(serviceFunddetailShared.getDepositbank())){
            wrappers.eq(ServiceFunddetailShared::getDepositbank ,serviceFunddetailShared.getDepositbank());
        if (StringUtils.isNotBlank(serviceFunddetailShared.getDepositbank())) {
            wrappers.eq(ServiceFunddetailShared::getDepositbank, serviceFunddetailShared.getDepositbank());
        }
        if (StringUtils.isNotBlank(serviceFunddetailShared.getBankcardno())){
            wrappers.eq(ServiceFunddetailShared::getBankcardno ,serviceFunddetailShared.getBankcardno());
        if (StringUtils.isNotBlank(serviceFunddetailShared.getBankcardno())) {
            wrappers.eq(ServiceFunddetailShared::getBankcardno, serviceFunddetailShared.getBankcardno());
        }
        if (StringUtils.isNotBlank(serviceFunddetailShared.getBranchbankname())){
            wrappers.like(ServiceFunddetailShared::getBranchbankname ,serviceFunddetailShared.getBranchbankname());
        if (StringUtils.isNotBlank(serviceFunddetailShared.getBranchbankname())) {
            wrappers.like(ServiceFunddetailShared::getBranchbankname, serviceFunddetailShared.getBranchbankname());
        }
        if (StringUtils.isNotBlank(serviceFunddetailShared.getAnnexbankcard())){
            wrappers.eq(ServiceFunddetailShared::getAnnexbankcard ,serviceFunddetailShared.getAnnexbankcard());
        if (StringUtils.isNotBlank(serviceFunddetailShared.getAnnexbankcard())) {
            wrappers.eq(ServiceFunddetailShared::getAnnexbankcard, serviceFunddetailShared.getAnnexbankcard());
        }
        if (StringUtils.isNotBlank(serviceFunddetailShared.getAnnexregistform())){
            wrappers.eq(ServiceFunddetailShared::getAnnexregistform ,serviceFunddetailShared.getAnnexregistform());
        if (StringUtils.isNotBlank(serviceFunddetailShared.getAnnexregistform())) {
            wrappers.eq(ServiceFunddetailShared::getAnnexregistform, serviceFunddetailShared.getAnnexregistform());
        }
        if (serviceFunddetailShared.getQuantity() != null){
            wrappers.eq(ServiceFunddetailShared::getQuantity ,serviceFunddetailShared.getQuantity());
        if (serviceFunddetailShared.getQuantity() != null) {
            wrappers.eq(ServiceFunddetailShared::getQuantity, serviceFunddetailShared.getQuantity());
        }
        if (serviceFunddetailShared.getPrice() != null){
            wrappers.eq(ServiceFunddetailShared::getPrice ,serviceFunddetailShared.getPrice());
        if (serviceFunddetailShared.getPrice() != null) {
            wrappers.eq(ServiceFunddetailShared::getPrice, serviceFunddetailShared.getPrice());
        }
        if (serviceFunddetailShared.getAmount() != null){
            wrappers.eq(ServiceFunddetailShared::getAmount ,serviceFunddetailShared.getAmount());
        if (serviceFunddetailShared.getAmount() != null) {
            wrappers.eq(ServiceFunddetailShared::getAmount, serviceFunddetailShared.getAmount());
        }
        if (serviceFunddetailShared.getTaxamount() != null){
            wrappers.eq(ServiceFunddetailShared::getTaxamount ,serviceFunddetailShared.getTaxamount());
        if (serviceFunddetailShared.getTaxamount() != null) {
            wrappers.eq(ServiceFunddetailShared::getTaxamount, serviceFunddetailShared.getTaxamount());
        }
        if (serviceFunddetailShared.getTaxedamount() != null){
            wrappers.eq(ServiceFunddetailShared::getTaxedamount ,serviceFunddetailShared.getTaxedamount());
        if (serviceFunddetailShared.getTaxedamount() != null) {
            wrappers.eq(ServiceFunddetailShared::getTaxedamount, serviceFunddetailShared.getTaxedamount());
        }
        if (serviceFunddetailShared.getPrepaidamount() != null){
            wrappers.eq(ServiceFunddetailShared::getPrepaidamount ,serviceFunddetailShared.getPrepaidamount());
        if (serviceFunddetailShared.getPrepaidamount() != null) {
            wrappers.eq(ServiceFunddetailShared::getPrepaidamount, serviceFunddetailShared.getPrepaidamount());
        }
        if (serviceFunddetailShared.getPaidamount() != null){
            wrappers.eq(ServiceFunddetailShared::getPaidamount ,serviceFunddetailShared.getPaidamount());
        if (serviceFunddetailShared.getPaidamount() != null) {
            wrappers.eq(ServiceFunddetailShared::getPaidamount, serviceFunddetailShared.getPaidamount());
        }
        if (serviceFunddetailShared.getPaidtime() != null){
            wrappers.eq(ServiceFunddetailShared::getPaidtime ,serviceFunddetailShared.getPaidtime());
        if (serviceFunddetailShared.getPaidtime() != null) {
            wrappers.eq(ServiceFunddetailShared::getPaidtime, serviceFunddetailShared.getPaidtime());
        }
        if (StringUtils.isNotBlank(serviceFunddetailShared.getPayterm())){
            wrappers.eq(ServiceFunddetailShared::getPayterm ,serviceFunddetailShared.getPayterm());
        if (StringUtils.isNotBlank(serviceFunddetailShared.getPayterm())) {
            wrappers.eq(ServiceFunddetailShared::getPayterm, serviceFunddetailShared.getPayterm());
        }
        if (serviceFunddetailShared.getInvoicecount() != null){
            wrappers.eq(ServiceFunddetailShared::getInvoicecount ,serviceFunddetailShared.getInvoicecount());
        if (serviceFunddetailShared.getInvoicecount() != null) {
            wrappers.eq(ServiceFunddetailShared::getInvoicecount, serviceFunddetailShared.getInvoicecount());
        }
        if (serviceFunddetailShared.getAttachcount() != null){
            wrappers.eq(ServiceFunddetailShared::getAttachcount ,serviceFunddetailShared.getAttachcount());
        if (serviceFunddetailShared.getAttachcount() != null) {
            wrappers.eq(ServiceFunddetailShared::getAttachcount, serviceFunddetailShared.getAttachcount());
        }
        if (StringUtils.isNotBlank(serviceFunddetailShared.getRemark())){
            wrappers.eq(ServiceFunddetailShared::getRemark ,serviceFunddetailShared.getRemark());
        if (StringUtils.isNotBlank(serviceFunddetailShared.getRemark())) {
            wrappers.eq(ServiceFunddetailShared::getRemark, serviceFunddetailShared.getRemark());
        }
        if (serviceFunddetailShared.getInfoid() != null){
            wrappers.eq(ServiceFunddetailShared::getInfoid ,serviceFunddetailShared.getInfoid());
        if (serviceFunddetailShared.getInfoid() != null) {
            wrappers.eq(ServiceFunddetailShared::getInfoid, serviceFunddetailShared.getInfoid());
        }
        if (StringUtils.isNotBlank(serviceFunddetailShared.getDonorno())){
            wrappers.eq(ServiceFunddetailShared::getDonorno ,serviceFunddetailShared.getDonorno());
        if (StringUtils.isNotBlank(serviceFunddetailShared.getDonorno())) {
            wrappers.eq(ServiceFunddetailShared::getDonorno, serviceFunddetailShared.getDonorno());
        }
        if (StringUtils.isNotBlank(serviceFunddetailShared.getDonorname())){
            wrappers.like(ServiceFunddetailShared::getDonorname ,serviceFunddetailShared.getDonorname());
        if (StringUtils.isNotBlank(serviceFunddetailShared.getDonorname())) {
            wrappers.like(ServiceFunddetailShared::getDonorname, serviceFunddetailShared.getDonorname());
        }
        if (StringUtils.isNotBlank(serviceFunddetailShared.getRecordstatus())){
            wrappers.eq(ServiceFunddetailShared::getRecordstatus ,serviceFunddetailShared.getRecordstatus());
        if (StringUtils.isNotBlank(serviceFunddetailShared.getRecordstatus())) {
            wrappers.eq(ServiceFunddetailShared::getRecordstatus, serviceFunddetailShared.getRecordstatus());
        }
        if (StringUtils.isNotBlank(serviceFunddetailShared.getUploadflag())){
            wrappers.eq(ServiceFunddetailShared::getUploadflag ,serviceFunddetailShared.getUploadflag());
        if (StringUtils.isNotBlank(serviceFunddetailShared.getUploadflag())) {
            wrappers.eq(ServiceFunddetailShared::getUploadflag, serviceFunddetailShared.getUploadflag());
        }
        if (serviceFunddetailShared.getUploadtime() != null){
            wrappers.eq(ServiceFunddetailShared::getUploadtime ,serviceFunddetailShared.getUploadtime());
        if (serviceFunddetailShared.getUploadtime() != null) {
            wrappers.eq(ServiceFunddetailShared::getUploadtime, serviceFunddetailShared.getUploadtime());
        }
        if (StringUtils.isNotBlank(serviceFunddetailShared.getServicesscope())){
            wrappers.eq(ServiceFunddetailShared::getServicesscope ,serviceFunddetailShared.getServicesscope());
        if (StringUtils.isNotBlank(serviceFunddetailShared.getServicesscope())) {
            wrappers.eq(ServiceFunddetailShared::getServicesscope, serviceFunddetailShared.getServicesscope());
        }
        if (StringUtils.isNotBlank(serviceFunddetailShared.getServicesscopename())){
            wrappers.like(ServiceFunddetailShared::getServicesscopename ,serviceFunddetailShared.getServicesscopename());
        if (StringUtils.isNotBlank(serviceFunddetailShared.getServicesscopename())) {
            wrappers.like(ServiceFunddetailShared::getServicesscopename, serviceFunddetailShared.getServicesscopename());
        }
        if (StringUtils.isNotBlank(serviceFunddetailShared.getServicetype())){
            wrappers.eq(ServiceFunddetailShared::getServicetype ,serviceFunddetailShared.getServicetype());
        if (StringUtils.isNotBlank(serviceFunddetailShared.getServicetype())) {
            wrappers.eq(ServiceFunddetailShared::getServicetype, serviceFunddetailShared.getServicetype());
        }
        if (StringUtils.isNotBlank(serviceFunddetailShared.getServicetypename())){
            wrappers.like(ServiceFunddetailShared::getServicetypename ,serviceFunddetailShared.getServicetypename());
        if (StringUtils.isNotBlank(serviceFunddetailShared.getServicetypename())) {
            wrappers.like(ServiceFunddetailShared::getServicetypename, serviceFunddetailShared.getServicetypename());
        }
        if (serviceFunddetailShared.getReimbursementamount() != null){
            wrappers.eq(ServiceFunddetailShared::getReimbursementamount ,serviceFunddetailShared.getReimbursementamount());
        if (serviceFunddetailShared.getReimbursementamount() != null) {
            wrappers.eq(ServiceFunddetailShared::getReimbursementamount, serviceFunddetailShared.getReimbursementamount());
        }
        if (StringUtils.isNotBlank(serviceFunddetailShared.getJine())){
            wrappers.eq(ServiceFunddetailShared::getJine ,serviceFunddetailShared.getJine());
        if (StringUtils.isNotBlank(serviceFunddetailShared.getJine())) {
            wrappers.eq(ServiceFunddetailShared::getJine, serviceFunddetailShared.getJine());
        }
        if (StringUtils.isNotBlank(serviceFunddetailShared.getLiyou())){
            wrappers.eq(ServiceFunddetailShared::getLiyou ,serviceFunddetailShared.getLiyou());
        if (StringUtils.isNotBlank(serviceFunddetailShared.getLiyou())) {
            wrappers.eq(ServiceFunddetailShared::getLiyou, serviceFunddetailShared.getLiyou());
        }
        return this.list(wrappers);
    }


    /**
     * 查询费用申请明细列表
     *
     * @param serviceFunddetailShared 费用申请明细
     * @return 费用申请明细
     */
    @Override
    public Boolean delFunddetailShare(ServiceFunddetailShared serviceFunddetailShared) {
        boolean update = false;
        LambdaQueryWrapper<ServiceFunddetailShared> wrappers = Wrappers.lambdaQuery();
        if (serviceFunddetailShared.getFundid() != null) {
            wrappers.eq(ServiceFunddetailShared::getFundid, serviceFunddetailShared.getFundid());
            update = update(wrappers);
        }

        return update;
    }

}

 ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java

@@ -34,6 +34,9 @@
    @Autowired
    private IServiceFundSharedService serviceFundSharedService;

    @Autowired
    private IServiceFunddetailSharedService serviceFunddetailSharedService;


    @Autowired
    private IServiceFundService serviceFundService;
@@ -66,6 +69,10 @@
                String phone = serviceFundShared.getPhone();
                //将分享里的该数据删除
                serviceFundSharedService.delfundsharedInfoById(serviceFundShared.getId());
                ServiceFunddetailShared serviceFunddetailShared = new ServiceFunddetailShared();
                log.info("fundShared的ID:{}", serviceFundShared.getId());
                serviceFunddetailShared.setFundid(serviceFundShared.getId());
                serviceFunddetailSharedService.delFunddetailShare(serviceFunddetailShared);

                ServiceFund serviceFund = new ServiceFund();
                serviceFund.setId(serviceFundShared.getSerfunid());
@@ -281,7 +288,11 @@
        for (ServiceReimbursementShared serviceReimbursementShared : serviceReimbursementShareds) {
            if (StringUtils.isNotBlank(serviceReimbursementShared.getOabdzt()) && serviceReimbursementShared.getOabdzt().equals("已撤销")) {
                String phone = serviceReimbursementShared.getPhone();
                String[] split = serviceReimbursementShared.getCxrjyj().split("&");
                String[] split = null;
                log.info("serviceReimbursementShared.getCxrjyj(): {}", serviceReimbursementShared.getCxrjyj());
                if (StringUtils.isNotBlank(serviceReimbursementShared.getCxrjyj())) {
                    split = serviceReimbursementShared.getCxrjyj().split("&");
                }

                //将分享里的该数据删除
                serviceReimbursementSharedService.delResharedInfoById(serviceReimbursementShared.getId());
@@ -517,17 +528,17 @@
        serviceFundflow.setFundid(fundId);
        fundflowService.save(serviceFundflow);

        ArrayList<ConcurrentHashMap<String, String>> contentList = new ArrayList<>();
        ConcurrentHashMap map = new ConcurrentHashMap();
        map.put("审批人", split[0]);
        map.put("审批时间", split[1]);
        map.put("意见", split[2]);
        contentList.add(map);
        DingTalkReqVo dingTalkReqVo = new DingTalkReqVo();
        dingTalkReqVo.setTitle("财务系统驳回信息");
        dingTalkReqVo.setNumber(phone);
        dingTalkReqVo.setContents(contentList);
        dingTalkService.sendNotification(dingTalkReqVo);
//        ArrayList<ConcurrentHashMap<String, String>> contentList = new ArrayList<>();
//        ConcurrentHashMap map = new ConcurrentHashMap();
//        map.put("审批人", split[0]);
//        map.put("审批时间", split[1]);
//        map.put("意见", split[2]);
//        contentList.add(map);
//        DingTalkReqVo dingTalkReqVo = new DingTalkReqVo();
//        dingTalkReqVo.setTitle("财务系统驳回信息");
//        dingTalkReqVo.setNumber(phone);
//        dingTalkReqVo.setContents(contentList);
//        dingTalkService.sendNotification(dingTalkReqVo);
    }

}