代码提交

liusheng

昨天 8e3a02c1facca35c5a90ce9b49505f373ae658f5

代码提交

 ruoyi-project/src/main/java/com/ruoyi/project/common/IdGeneratorUtils.java

@@ -26,6 +26,7 @@
            if (counter == 0) {
                // 同一毫秒内计数器用完，等待下一毫秒
                timestamp = waitNextMillis(lastTimestamp);
                counter = 0L;
            }
        } else {
            counter = 0L;

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

@@ -314,7 +314,11 @@
    @Excel(name = "系统编号")
    private String caseno;


    /**
     * 器官顺序
     */
    @ApiModelProperty("器官顺序")
    private Long sort;

    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")

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

@@ -292,6 +292,13 @@
    private String notgetreason;

    /**
     * 器官顺序
     */
    @ApiModelProperty("器官顺序")
    private Long sort;


    /**
     * 系统编号
     */
    @ApiModelProperty("系统编号")

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

@@ -45,6 +45,12 @@
    private String donorno;

    /**
     * 器官顺序
     */
    @ApiModelProperty("器官顺序")
    private Long sort;

    /**
     * 器官类别 详见字典sys_Organ
     */
    @ApiModelProperty("器官类别 详见字典sys_Organ")

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

@@ -2,8 +2,13 @@

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

import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
@@ -32,11 +37,13 @@
    /** 资金申请主表ID */
    @ApiModelProperty("资金申请主表ID")
    @Excel(name = "资金申请主表ID")
    @TableField("RBID")
    private Long rbid;

    /** 差旅报销单明细ID */
    @ApiModelProperty("差旅报销单明细ID")
    @Excel(name = "差旅报销单明细ID")
    @TableField("RDID")
    private Long rdid;

    /** 人员类别 */
@@ -52,104 +59,124 @@
    /** 顺序号 */
    @ApiModelProperty("顺序号")
    @Excel(name = "顺序号")
    @TableField("OrderNo")
    private Long orderno;

    /** 出发时间 */
    @ApiModelProperty("出发时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "出发时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    @TableField("StartTime")
    private Date starttime;

    /** 出发地点 */
    @ApiModelProperty("出发地点")
    @Excel(name = "出发地点")
    @TableField("Departure")
    private String departure;

    /** 到达时间 */
    @ApiModelProperty("到达时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "到达时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    @TableField("EndTime")
    private Date endtime;

    /** 到达地点 */
    @ApiModelProperty("到达地点")
    @Excel(name = "到达地点")
    @TableField("Destination")
    private String destination;

    /** 天数 */
    @ApiModelProperty("天数")
    @Excel(name = "天数")
    @TableField("Days")
    private Long days;

    /** 交通费 */
    @ApiModelProperty("交通费")
    @Excel(name = "交通费")
    @TableField("TrafficExpense")
    private BigDecimal trafficexpense;

    /** 交通工具 */
    @ApiModelProperty("交通工具")
    @Excel(name = "交通工具")
    @TableField("TrafficType")
    private String traffictype;

    /** 交通工具 */
    @ApiModelProperty("交通工具")
    @Excel(name = "交通工具")
    @TableField("TrafficType2")
    private String traffictype2;

    /** 市内交通费 */
    @ApiModelProperty("市内交通费")
    @Excel(name = "市内交通费")
    @TableField("CityFee")
    private BigDecimal cityfee;

    /** 住宿费 */
    @ApiModelProperty("住宿费")
    @Excel(name = "住宿费")
    @TableField("HotelExpense")
    private BigDecimal hotelexpense;

    /** 发票张数 */
    @ApiModelProperty("发票张数")
    @Excel(name = "发票张数")
    @TableField("InvoiceCount")
    private Long invoicecount;

    /** 附件张数 */
    @ApiModelProperty("附件张数")
    @Excel(name = "附件张数")
    @TableField("AttachCount")
    private Long attachcount;

    /** 杂费 */
    @ApiModelProperty("杂费")
    @Excel(name = "杂费")
    @TableField("OtherExpense")
    private BigDecimal otherexpense;

    /** 伙食费 */
    @ApiModelProperty("伙食费")
    @Excel(name = "伙食费")
    @TableField("FoodExpenses")
    private BigDecimal foodexpenses;

    /** 伙食费补助 */
    @ApiModelProperty("伙食费补助")
    @Excel(name = "伙食费补助")
    @TableField("FoodAllowance")
    private BigDecimal foodallowance;

    /** 附件表 */
    @ApiModelProperty("附件表")
    @Excel(name = "附件表")
    @TableField(value = "AnnexFiles", updateStrategy = FieldStrategy.IGNORED)
    private String annexfiles;

    /** 附件表 */
    @ApiModelProperty("发票附件表")
    @Excel(name = "发票附件表")
    @TableField(value = "InvoiceFiles", updateStrategy = FieldStrategy.IGNORED)
    private String invoicefiles;

    /** 上传标识 */
    @ApiModelProperty("上传标识")
    @Excel(name = "上传标识")
    @TableField("upload_flag")
    private String uploadFlag;

    /** 上传时间 */
    @ApiModelProperty("上传时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "上传时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    @TableField("upload_time")
    private Date uploadTime;

    /** 目的地省份 */

 ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DonateOrganVO.java

@@ -76,6 +76,7 @@
    private String leadername;
    private String businessarea;
    private String gainHospitalname;
    private Long sort;

    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")

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

@@ -127,6 +127,11 @@
        if (serviceDonateorgan.getEstimatedtime() != null) {
            wrappers.eq(ServiceDonateorgan::getEstimatedtime, serviceDonateorgan.getEstimatedtime());
        }
        if (serviceDonateorgan.getSort() != null) {
            wrappers.eq(ServiceDonateorgan::getSort, serviceDonateorgan.getSort());
        }
        // 按sort字段排序，null值放最后
        wrappers.last("ORDER BY CASE WHEN sort IS NULL THEN 1 ELSE 0 END, sort ASC");
        return this.list(wrappers);
    }


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

@@ -4,6 +4,7 @@
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.ServiceDonateorgan;
import com.ruoyi.project.domain.ServiceDonationwitnessorgan;
import com.ruoyi.project.mapper.ServiceDonationwitnessorganMapper;
import com.ruoyi.project.service.IServiceDonationwitnessorganService;
@@ -81,6 +82,11 @@
        if (StringUtils.isNotBlank(serviceDonationwitnessorgan.getIsdgf())) {
            wrappers.eq(ServiceDonationwitnessorgan::getIsdgf, serviceDonationwitnessorgan.getIsdgf());
        }
        if (serviceDonationwitnessorgan.getSort() != null) {
            wrappers.eq(ServiceDonationwitnessorgan::getSort, serviceDonationwitnessorgan.getSort());
        }
        // 按sort字段排序，null值放最后
        wrappers.last("ORDER BY CASE WHEN sort IS NULL THEN 1 ELSE 0 END, sort ASC");
        return this.list(wrappers);
    }


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

@@ -78,6 +78,9 @@
    IServiceReimbursementpayeeSharedService payeeSharedService;

    @Autowired
    IServiceReimbursementpayeeService payeeService;

    @Autowired
    IServiceFundflowruleService serviceFundflowruleService;

    @Autowired
@@ -210,7 +213,17 @@
        List<ServiceReimbursementShared> serviceReimbursementShareds = sharedService.queryList(reimbursementShared1);
        log.info("serviceReimbursementShareds的查询结果 :{}", serviceReimbursementShareds.size());
        if (!CollectionUtils.isEmpty(serviceReimbursementShareds)) {
            return true;
            //如果不为空，则将分享表里的数据删除（因为接下去，老数据上传的附件，可能不是想要的了，还用老附件，是有问题的；所以需要将老的share数据删除，然后再新增，上传新附件）
            for (ServiceReimbursementShared serviceReimbursementShared : serviceReimbursementShareds) {
                sharedService.removeById(serviceReimbursementShared.getId());

                ServiceReimbursementdetailShared srds = new ServiceReimbursementdetailShared();
                srds.setRbid(serviceReimbursementShared.getId());
                List<ServiceReimbursementdetailShared> serviceReimbursementdetailShareds = detailSharedService.queryList(srds);
                for (ServiceReimbursementdetailShared serviceReimbursementdetailShared : serviceReimbursementdetailShareds) {
                    detailSharedService.removeById(serviceReimbursementdetailShared.getId());
                }
            }
        }

        //如果没有插入，则走下面的流程
@@ -234,7 +247,7 @@
//        //上传OA文件
        //将serviceReimbursementdetail表里的id赋值给Rdid; 将serviceReimbursementShared里的ID赋值给RBID,并将serviceReimbursementdetailShared表里的id置空，由数据库重新生成
        for (int i = 0; i < details.size(); i++) {
            serviceReimbursementdetailShareds.get(i).setRdid(serviceReimbursementdetailShareds.get(i).getId());
            serviceReimbursementdetailShareds.get(i).setRdid(details.get(i).getId());
            serviceReimbursementdetailShareds.get(i).setRbid(serviceReimbursementShared.getId());
            serviceReimbursementdetailShareds.get(i).setId(null);
            //上传OA文件
@@ -257,7 +270,16 @@
//        detailSharedService.saveBatch(serviceReimbursementdetailShareds);
        for (ServiceReimbursementdetailShared serviceReimbursementdetailShared : serviceReimbursementdetailShareds) {
            if (ObjectUtils.isNotEmpty(serviceReimbursementdetailShared)) {
                log.info("更新serviceReimbursementdetail表里的值为:{}", serviceReimbursementdetailShared);
                detailSharedService.save(serviceReimbursementdetailShared);

                log.info("更新serviceReimbursementdetail表里的附件字段:{},{}", serviceReimbursementdetailShared.getAnnexfiles(), serviceReimbursementdetailShared.getInvoicefiles());
                //更新serviceReimbursementdetail表里的附件字段
                ServiceReimbursementdetail serviceReimbursementdetail = new ServiceReimbursementdetail();
                serviceReimbursementdetail.setId(serviceReimbursementdetailShared.getRdid());
                serviceReimbursementdetail.setAnnexfiles(serviceReimbursementdetailShared.getAnnexfiles());
                serviceReimbursementdetail.setInvoicefiles(serviceReimbursementdetailShared.getInvoicefiles());
                serviceReimbursementdetailMapper.updateById(serviceReimbursementdetail);
            } else {
                log.info("serviceReimbursementdetailShared为空了");
            }
@@ -551,18 +573,15 @@
        addSharedData(serviceReimbursement.getId());
        List<ServiceReimbursementShared> serviceReimbursementSharedList = sharedService.getRemShareInfoByRemId(serviceReimbursement.getId());
        if (org.springframework.util.CollectionUtils.isEmpty(serviceReimbursementSharedList)) return false;

        log.info("serviceReimbursementSharedList的数据量为：{}", serviceReimbursementSharedList.size());

        //detail详情
        ServiceReimbursementdetailShared serviceReimbursementdetailShared = new ServiceReimbursementdetailShared();
        serviceReimbursementdetailShared.setRbid(serviceReimbursementSharedList.get(0).getId());
        List<ServiceReimbursementdetailShared> serviceReimbursementdetailShareds = detailSharedService.queryList(serviceReimbursementdetailShared);
        List<ServiceReimbursementdetail> serviceReimbursementdetailList = serviceReimbursementdetailMapper.getAllDetailsByRBID(serviceReimbursement.getId());

        //payee详情
        ServiceReimbursementpayeeShared serviceReimbursementpayeeShared = new ServiceReimbursementpayeeShared();
        serviceReimbursementpayeeShared.setRbid(serviceReimbursementSharedList.get(0).getId());
        List<ServiceReimbursementpayeeShared> serviceReimbursementpayeeShareds = payeeSharedService.queryList(serviceReimbursementpayeeShared);
        ServiceReimbursementpayee serviceReimbursementpayee = new ServiceReimbursementpayee();
        serviceReimbursementpayee.setRbid(serviceReimbursement.getId());
        List<ServiceReimbursementpayee> serviceReimbursementpayees = payeeService.queryList(serviceReimbursementpayee);


        // 数据的封装
@@ -576,10 +595,10 @@
        ServiceReimbursement sr = serviceReimbursementMapper.selectById(serviceReimbursement.getId());
        data2.put("formmain_1209", formmain_1209(sr));
        // 明细表字段数据，与附件的处理
        Map<String, List<Map<String, Object>>> map1 = formson_1210(serviceReimbursementdetailShareds);
        Map<String, List<Map<String, Object>>> map1 = formson_1210(serviceReimbursementdetailList);
        data2.put("formson_1210", map1.get("formson_1210"));
        data2.put("thirdAttachments", map1.get("annexfilesList"));
        data2.put("formson_1211", formson_1211(serviceReimbursementpayeeShareds));
        data2.put("formson_1211", formson_1211(serviceReimbursementpayees));
        data.put("data", data2);
        //模板编号，由致远方提供，该参数决定发起协同系统中哪个流程
        data.put("templateCode", "cyfbxd_rzhc_ceshi");
@@ -635,36 +654,36 @@
        return true;
    }

    private Map<String, List<Map<String, Object>>> formson_1210(List<ServiceReimbursementdetailShared> serviceReimbursementdetailSharedList) {
    private Map<String, List<Map<String, Object>>> formson_1210(List<ServiceReimbursementdetail> serviceReimbursementdetailList) {
        Map<String, List<Map<String, Object>>> allMap = new HashMap<>();
        List<Map<String, Object>> list = new ArrayList<>();
        List<Map<String, Object>> annexfilesList = new ArrayList<>();
        for (ServiceReimbursementdetailShared reimbursementdetailShared : serviceReimbursementdetailSharedList) {
        for (ServiceReimbursementdetail reimbursementdetail : serviceReimbursementdetailList) {
            Map<String, Object> map = new HashMap<>();
            map.put("交通工具", reimbursementdetailShared.getTraffictype());
            map.put("交通费", reimbursementdetailShared.getTrafficexpense());
            map.put("市内交通", reimbursementdetailShared.getCityfee());
            map.put("住宿费", reimbursementdetailShared.getHotelexpense());
            map.put("杂费", reimbursementdetailShared.getOtherexpense());
            map.put("伙食费报销", reimbursementdetailShared.getFoodexpenses());
            map.put("伙食费补助", reimbursementdetailShared.getFoodallowance());
            map.put("其他费用", reimbursementdetailShared.getOtherfeeamount());
            map.put("其他费用说明", reimbursementdetailShared.getOtherfeedesc());
            map.put("交通工具", reimbursementdetail.getTraffictype());
            map.put("交通费", reimbursementdetail.getTrafficexpense());
            map.put("市内交通", reimbursementdetail.getCityfee());
            map.put("住宿费", reimbursementdetail.getHotelexpense());
            map.put("杂费", reimbursementdetail.getOtherexpense());
            map.put("伙食费报销", reimbursementdetail.getFoodexpenses());
            map.put("伙食费补助", reimbursementdetail.getFoodallowance());
            map.put("其他费用", reimbursementdetail.getOtherfeeamount());
            map.put("其他费用说明", reimbursementdetail.getOtherfeedesc());
            map.put("金额合计", "");
            map.put("出差时间起", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(reimbursementdetailShared.getStarttime()));
            map.put("出发地点", reimbursementdetailShared.getDeparture());
            map.put("出差时间止", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(reimbursementdetailShared.getEndtime()));
            map.put("出差目的地", reimbursementdetailShared.getDestination());
            map.put("天数", reimbursementdetailShared.getDays());
            BigDecimal total = safe(reimbursementdetailShared.getCityfee()).add(safe(reimbursementdetailShared.getTrafficexpense())).add(safe(reimbursementdetailShared.getHotelexpense())).add(safe(reimbursementdetailShared.getOtherexpense())).add(safe(reimbursementdetailShared.getFoodexpenses())).add(safe(reimbursementdetailShared.getFoodallowance())).add(safe(reimbursementdetailShared.getOtherfeeamount()));
            map.put("出差时间起", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(reimbursementdetail.getStarttime()));
            map.put("出发地点", reimbursementdetail.getDeparture());
            map.put("出差时间止", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(reimbursementdetail.getEndtime()));
            map.put("出差目的地", reimbursementdetail.getDestination());
            map.put("天数", reimbursementdetail.getDays());
            BigDecimal total = safe(reimbursementdetail.getCityfee()).add(safe(reimbursementdetail.getTrafficexpense())).add(safe(reimbursementdetail.getHotelexpense())).add(safe(reimbursementdetail.getOtherexpense())).add(safe(reimbursementdetail.getFoodexpenses())).add(safe(reimbursementdetail.getFoodallowance())).add(safe(reimbursementdetail.getOtherfeeamount()));
            map.put("实际报销金额", total);
            map.put("财务备注", reimbursementdetailShared.getRemark());
            map.put("id", reimbursementdetailShared.getRdid());
            map.put("出差人", reimbursementdetailShared.getPersonname());
            map.put("财务备注", reimbursementdetail.getRemark());
            map.put("id", reimbursementdetail.getId());
            map.put("出差人", reimbursementdetail.getPersonname());
            map.put("回交通工具", "");
            map.put("人员类别", reimbursementdetailShared.getPersontype());
            map.put("人员类别", reimbursementdetail.getPersontype());
            map.put("住宿费标准", "");
            map.put("住宿费标准合计", reimbursementdetailShared.getHotelexpense());
            map.put("住宿费标准合计", reimbursementdetail.getHotelexpense());
            Long fpuuid = IdGeneratorUtils.nextId();
            map.put("发票附件", fpuuid);
            map.put("票据识别", "");
@@ -678,8 +697,8 @@
            list.add(map);

            //附件处理
            String annexfiles = reimbursementdetailShared.getAnnexfiles();
            String invoicefiles = reimbursementdetailShared.getInvoicefiles();
            String annexfiles = reimbursementdetail.getAnnexfiles();
            String invoicefiles = reimbursementdetail.getInvoicefiles();

            int i = 0;
            if (StringUtils.isNotEmpty(annexfiles)) {
@@ -714,18 +733,18 @@
        return val == null ? BigDecimal.ZERO : val;
    }

    private List<Map<String, Object>> formson_1211(List<ServiceReimbursementpayeeShared> serviceReimbursementpayeeShareds) {
    private List<Map<String, Object>> formson_1211(List<ServiceReimbursementpayee> serviceReimbursementpayees) {
        Map<String, List<Map<String, Object>>> allMap = new HashMap<>();

        List<Map<String, Object>> list = new ArrayList<>();
        for (ServiceReimbursementpayeeShared serviceReimbursementpayeeShared : serviceReimbursementpayeeShareds) {
        for (ServiceReimbursementpayee serviceReimbursementpayee : serviceReimbursementpayees) {
            Map<String, Object> map = new HashMap<>();

            map.put("收款人", serviceReimbursementpayeeShared.getPersonname());
            map.put("卡号", serviceReimbursementpayeeShared.getBankcardno());
            map.put("开户银行", serviceReimbursementpayeeShared.getBankname());
            map.put("打款金额", serviceReimbursementpayeeShared.getAmount());
            map.put("人员类别打款", serviceReimbursementpayeeShared.getPersontype());
            map.put("收款人", serviceReimbursementpayee.getPersonname());
            map.put("卡号", serviceReimbursementpayee.getBankcardno());
            map.put("开户银行", serviceReimbursementpayee.getBankname());
            map.put("打款金额", serviceReimbursementpayee.getAmount());
            map.put("人员类别打款", serviceReimbursementpayee.getPersontype());
            map.put("核算项目", "");
            map.put("预算项目", "");
            map.put("借方摘要", "");
@@ -808,7 +827,6 @@

    public int uploadOAFileAndUpdateDb(ServiceReimbursementdetailShared remShare) throws Exception {
        log.info("uploadOAFileAndUpdate方法的入参:{}", remShare);
        System.out.println("uploadOAFileAndUpdate方法的入参:" + remShare);
        //上传OA文件
        String strRes = getToken();


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

@@ -70,6 +70,7 @@
        <result property="organchargedesc" column="organchargedesc"/>
        <result property="notgetreason" column="notgetreason"/>
        <result property="transplantstate" column="transplantstate"/>
        <result property="sort" column="sort"/>
    </resultMap>

    <sql id="selectServiceDonateorganVo">
@@ -77,6 +78,7 @@
               InfoID,
               DonorNo,
               OrganNo,
               sort,
               OrganName,
               OrganState,
               OrganNumber,
@@ -149,6 +151,7 @@
        <include refid="selectServiceDonateorganVo"/>
        <where>
            <if test="infoid != null ">and InfoID = #{infoid}</if>
            <if test="sort != null ">and sort = #{sort}</if>
            <if test="donorno != null  and donorno != ''">and DonorNo = #{donorno}</if>
            <if test="organno != null  and organno != ''">and OrganNo = #{organno}</if>
            <if test="organname != null  and organname != ''">and OrganName like concat('%', #{organname}, '%')</if>
@@ -412,6 +415,7 @@
        `service_donatebaseinfo`.`ReportTime` AS `ReportTime`,
        `service_donatebaseinfo`.`RecordState` AS `RecordState`,
        `service_donateorgan`.`ID` AS `doID`,
        `service_donateorgan`.`sort` AS `sort`,
        `service_donateorgan`.`InfoID` AS `InfoID`,
        `service_donateorgan`.`DonorNo` AS `doDonorNo`,
        `service_donateorgan`.`OrganNo` AS `OrganNo`,

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

@@ -29,12 +29,14 @@
        <result property="updateTime" column="update_time"/>
        <result property="name" column="name"/>
        <result property="caseno" column="caseno"/>
        <result property="sort" column="sort"/>
        <result property="organStartTime" column="organ_start_time"/>
    </resultMap>

    <sql id="selectServiceDonationwitnessorganVo">
        select ID,
               InfoID,
               sort,
               DonorNo,
               organ_start_time,
               OrganNo,
@@ -68,6 +70,7 @@
        <include refid="selectServiceDonationwitnessorganVo"/>
        <where>
            <if test="infoid != null ">and InfoID = #{infoid}</if>
            <if test="sort != null ">and sort = #{sort}</if>
            <if test="donorno != null  and donorno != ''">and DonorNo = #{donorno}</if>
            <if test="organno != null  and organno != ''">and OrganNo = #{organno}</if>
            <if test="organname != null  and organname != ''">and OrganName like concat('%', #{organname}, '%')</if>

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

@@ -56,7 +56,7 @@
            <if test="rbid != null  and rbid != ''"> and RBID = #{rbid}</if>
        </where>
    </select>
    <select id="getRBDetailList" resultType="com.ruoyi.project.domain.ServiceReimbursementdetail">
    <select id="getRBDetailList" resultMap="ServiceReimbursementdetailResult">
        <include refid="selectServiceReimbursementdetailVo"/>
        where RBID = #{id} and del_flag = 0
        order by OrderNo
@@ -65,7 +65,7 @@
        select ID from service_reimbursementdetail
        where RBID = #{rbid}
    </select>
    <select id="getAllDetailsByRBID" resultType="com.ruoyi.project.domain.ServiceReimbursementdetail">
    <select id="getAllDetailsByRBID" resultMap="ServiceReimbursementdetailResult">
        <include refid="selectServiceReimbursementdetailVo"/>
        where RBID = #{id} and del_flag = 0 order by OrderNo
    </select>