添加路径

liusheng

2023-07-18 27a798ad231418135e8cfb78c3d0d2c1bcfb39ad

添加路径

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

@@ -1,9 +1,5 @@
package com.ruoyi.web.controller.project;

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.config.RuoYiConfig;
@@ -15,7 +11,6 @@
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.HttpClientKit;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.bean.DtoConversionUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -32,16 +27,13 @@
import freemarker.template.TemplateException;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang.ObjectUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.ibatis.annotations.Options;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;

import java.io.*;
import java.math.BigDecimal;
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
@@ -464,7 +456,7 @@
            serviceReimbursementSharedService.save(serviceReimbursementShared);

            //将退回阶段设置成100
            serviceReimbursement.setBackflowlevel(100L);     
            serviceReimbursement.setBackflowlevel(100L);
            serviceReimbursement.setFlowlevel(100L);
            serviceReimbursement.setRecordstatus(0);
            serviceReimbursementService.updateById(serviceReimbursement);

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

@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.mapper.BaseFinancesubjectMapper">
    
    <resultMap type="BaseFinancesubject" id="BaseFinancesubjectResult">
    <resultMap type="com.ruoyi.project.domain.BaseFinancesubject" id="BaseFinancesubjectResult">
        <result property="id"    column="ID"    />
        <result property="del_flag"    column="del_flag"    />
        <result property="createBy"    column="create_by"    />
@@ -29,7 +29,7 @@
        select ID, del_flag, create_by, create_time, update_by, update_time, SubjectType, ItemType, ItemTypeName, Remark, ItemName, ItemDescribe, ItemUnit, UseState, SubjectTypeName, ItemPinYin, ItemCode, OrderNo from base_financesubject
    </sql>

    <select id="selectBaseFinancesubjectList" parameterType="BaseFinancesubject" resultMap="BaseFinancesubjectResult">
    <select id="selectBaseFinancesubjectList" parameterType="com.ruoyi.project.domain.BaseFinancesubject" resultMap="BaseFinancesubjectResult">
        <include refid="selectBaseFinancesubjectVo"/>
        <where>
            <if test="itemtype != null  and itemtype != ''"> and ItemType = #{itemtype}</if>

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

@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.mapper.BaseItemexpenseMapper">
    
    <resultMap type="BaseItemexpense" id="BaseItemexpenseResult">
    <resultMap type="com.ruoyi.project.domain.BaseItemexpense" id="BaseItemexpenseResult">
        <result property="id"    column="Id"    />
        <result property="itemid"    column="ItemId"    />
        <result property="expense"    column="Expense"    />

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

@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.mapper.BaseOrganizationMapper">
    
    <resultMap type="BaseOrganization" id="BaseOrganizationResult">
    <resultMap type="com.ruoyi.project.domain.BaseOrganization" id="BaseOrganizationResult">
        <result property="id"    column="ID"    />
        <result property="organizationname"    column="OrganizationName"    />
        <result property="organizationid"    column="OrganizationID"    />
@@ -20,7 +20,7 @@
        <result property="hospitalnature"    column="HospitalNature"    />
        <result property="regionallevel"    column="RegionalLevel"    />
        <result property="medicalcode"    column="MedicalCode"    />
        <result property="delFlag"    column="del_flag"    />
        <result property="del_flag"    column="del_flag"    />
        <result property="createBy"    column="create_by"    />
        <result property="createTime"    column="create_time"    />
        <result property="updateBy"    column="update_by"    />

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

@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.mapper.BaseTravelcityMapper">
    
    <resultMap type="BaseTravelcity" id="BaseTravelcityResult">
    <resultMap type="com.ruoyi.project.domain.BaseTravelcity" id="BaseTravelcityResult">
        <result property="id"    column="id"    />
        <result property="citycode"    column="citycode"    />
        <result property="cityname"    column="cityname"    />
@@ -14,7 +14,7 @@
        <result property="others"    column="others"    />
        <result property="food"    column="food"    />
        <result property="remark"    column="remark"    />
        <result property="delFlag"    column="del_flag"    />
        <result property="del_flag"    column="del_flag"    />
        <result property="createBy"    column="create_by"    />
        <result property="createTime"    column="create_time"    />
        <result property="updateBy"    column="update_by"    />
@@ -25,7 +25,7 @@
        select id, citycode, cityname, province, transport, hotel, others, food, remark, del_flag, create_by, create_time, update_by, update_time from base_travelcity
    </sql>

    <select id="selectBaseTravelcityList" parameterType="BaseTravelcity" resultMap="BaseTravelcityResult">
    <select id="selectBaseTravelcityList" parameterType="com.ruoyi.project.domain.BaseTravelcity" resultMap="BaseTravelcityResult">
        <include refid="selectBaseTravelcityVo"/>
        <where>
            <if test="citycode != null  and citycode != ''"> and citycode = #{citycode}</if>

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

@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.mapper.ServiceDistributedetailMapper">
    
    <resultMap type="ServiceDistributedetail" id="ServiceDistributedetailResult">
    <resultMap type="com.ruoyi.project.domain.ServiceDistributedetail" id="ServiceDistributedetailResult">
        <result property="id"    column="ID"    />
        <result property="dsid"    column="DSID"    />
        <result property="beneficiaryname"    column="BeneficiaryName"    />
@@ -35,7 +35,7 @@
        <result property="prepaidamount"    column="PrepaidAmount"    />
        <result property="remark"    column="Remark"    />
        <result property="recordstatus"    column="RecordStatus"    />
        <result property="delFlag"    column="del_flag"    />
        <result property="del_flag"    column="del_flag"    />
        <result property="createBy"    column="create_by"    />
        <result property="createTime"    column="create_time"    />
        <result property="updateBy"    column="update_by"    />
@@ -48,7 +48,7 @@
        select ID, DSID, BeneficiaryName, BeneficiaryNo, UnitName, UnitNo, UnitUserNo, Title, IDCardType, IDCardNo, Sex, FamilyRelations, Phone, DepositBank, BankCardNo, BranchBankName, AnnexBankCard, AnnexRegistForm, ApplyType, ItemID, ItemName, ItemType, Quantity, Price, Amount, TaxAmount, TaxedAmount, PrepaidAmount, Remark, RecordStatus, del_flag, create_by, create_time, update_by, update_time, uploadflag, uploadtime from service_distributedetail
    </sql>

    <select id="selectServiceDistributedetailList" parameterType="ServiceDistributedetail" resultMap="ServiceDistributedetailResult">
    <select id="selectServiceDistributedetailList" parameterType="com.ruoyi.project.domain.ServiceDistributedetail" resultMap="ServiceDistributedetailResult">
        <include refid="selectServiceDistributedetailVo"/>
        <where>
            <if test="beneficiaryname != null  and beneficiaryname != ''"> and BeneficiaryName like concat('%', #{beneficiaryname}, '%')</if>

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

@@ -4,12 +4,12 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.mapper.ServiceDistributesummaryMapper">
    
    <resultMap type="ServiceDistributesummary" id="ServiceDistributesummaryResult">
    <resultMap type="com.ruoyi.project.domain.ServiceDistributesummary" id="ServiceDistributesummaryResult">
        <result property="id"    column="ID"    />
        <result property="infoid"    column="InfoID"    />
        <result property="donorno"    column="DonorNo"    />
        <result property="donorname"    column="DonorName"    />
        <result property="delFlag"    column="del_flag"    />
        <result property="del_flag"    column="del_flag"    />
        <result property="createBy"    column="create_by"    />
        <result property="createTime"    column="create_time"    />
        <result property="updateBy"    column="update_by"    />
@@ -41,7 +41,7 @@
        select ID, InfoID, DonorNo, DonorName, del_flag, create_by, create_time, update_by, update_time, UserNo, UserName, UnitName, UnitNo, UnitUserNo, CaseCount, CaseDescribe, TotalAmount, ApplyType, ManagerNo, ManagerName, DepartmentNo, DepartmentName, Operator, Checher, FinanceDirector, OPODirector, Remark, RecordStatus, uploadflag, uploadtime from service_distributesummary
    </sql>

    <select id="selectServiceDistributesummaryList" parameterType="ServiceDistributesummary" resultMap="ServiceDistributesummaryResult">
    <select id="selectServiceDistributesummaryList" parameterType="com.ruoyi.project.domain.ServiceDistributesummary" resultMap="ServiceDistributesummaryResult">
        <include refid="selectServiceDistributesummaryVo"/>
        <where>
            <if test="donorno != null  and donorno != ''"> and DonorNo = #{donorno}</if>

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

@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.mapper.ServiceDocumentfilesMapper">
    
    <resultMap type="ServiceDocumentfiles" id="ServiceDocumentfilesResult">
    <resultMap type="com.ruoyi.project.domain.ServiceDocumentfiles" id="ServiceDocumentfilesResult">
        <result property="id"    column="id"    />
        <result property="doctype"    column="doctype"    />
        <result property="filename"    column="filename"    />
@@ -31,7 +31,7 @@
        select id, doctype, filename, filetype, fileurl, status, provinceno, provincename, cityno, cityname, townno, townname, source, uploadtime, remark, del_flag, create_by, create_time, update_by, update_time from service_documentfiles
    </sql>

    <select id="selectServiceDocumentfilesList" parameterType="ServiceDocumentfiles" resultMap="ServiceDocumentfilesResult">
    <select id="selectServiceDocumentfilesList" parameterType="com.ruoyi.project.domain.ServiceDocumentfiles" resultMap="ServiceDocumentfilesResult">
        <include refid="selectServiceDocumentfilesVo"/>
        <where>
            del_flag = 0

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

@@ -4,11 +4,11 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.mapper.ServiceDonateannexMapper">
    
    <resultMap type="ServiceDonateannex" id="ServiceDonateannexResult">
    <resultMap type="com.ruoyi.project.domain.ServiceDonateannex" id="ServiceDonateannexResult">
        <result property="id"    column="ID"    />
        <result property="infoid"    column="InfoID"    />
        <result property="donorno"    column="DonorNo"    />
        <result property="delFlag"    column="del_flag"    />
        <result property="del_flag"    column="del_flag"    />
        <result property="createBy"    column="create_by"    />
        <result property="createTime"    column="create_time"    />
        <result property="updateBy"    column="update_by"    />
@@ -22,7 +22,7 @@
        select ID, InfoID, DonorNo, del_flag, create_by, create_time, update_by, update_time, AnnexName, AnnexNo, AnnexUrl from service_donateannex
    </sql>

    <select id="selectServiceDonateannexList" parameterType="ServiceDonateannex" resultMap="ServiceDonateannexResult">
    <select id="selectServiceDonateannexList" parameterType="com.ruoyi.project.domain.ServiceDonateannex" resultMap="ServiceDonateannexResult">
        <include refid="selectServiceDonateannexVo"/>
        <where>
            <if test="infoid != null "> and InfoID = #{infoid}</if>

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

@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.mapper.ServiceDonateannexrequirementMapper">
    
    <resultMap type="ServiceDonateannexrequirement" id="ServiceDonateannexrequirementResult">
    <resultMap type="com.ruoyi.project.domain.ServiceDonateannexrequirement" id="ServiceDonateannexrequirementResult">
        <result property="id"    column="ID"    />
        <result property="annexname"    column="AnnexName"    />
        <result property="annexno"    column="AnnexNo"    />
@@ -12,7 +12,7 @@
        <result property="isrequired"    column="IsRequired"    />
        <result property="flowname"    column="FlowName"    />
        <result property="donationcategory"    column="DonationCategory"    />
        <result property="delFlag"    column="del_flag"    />
        <result property="del_flag"    column="del_flag"    />
        <result property="createBy"    column="create_by"    />
        <result property="createTime"    column="create_time"    />
        <result property="updateBy"    column="update_by"    />
@@ -23,7 +23,7 @@
        select ID, AnnexName, AnnexNo, ExpiresTime, IsRequired, FlowName, DonationCategory, del_flag, create_by, create_time, update_by, update_time from service_donateannexrequirement
    </sql>

    <select id="selectServiceDonateannexrequirementList" parameterType="ServiceDonateannexrequirement" resultMap="ServiceDonateannexrequirementResult">
    <select id="selectServiceDonateannexrequirementList" parameterType="com.ruoyi.project.domain.ServiceDonateannexrequirement" resultMap="ServiceDonateannexrequirementResult">
        <include refid="selectServiceDonateannexrequirementVo"/>
        <where>
            <if test="annexname != null  and annexname != ''"> and AnnexName like concat('%', #{annexname}, '%')</if>

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

@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.mapper.ServiceDonatebaseinfoMapper">
    
    <resultMap type="ServiceDonatebaseinfo" id="ServiceDonatebaseinfoResult">
    <resultMap type="com.ruoyi.project.domain.ServiceDonatebaseinfo" id="ServiceDonatebaseinfoResult">
        <result property="id"    column="ID"    />
        <result property="name"    column="Name"    />
        <result property="sex"    column="Sex"    />
@@ -102,7 +102,7 @@
        where ID = #{id}
    </update>

    <select id="selectServiceDonatebaseinfoList" parameterType="ServiceDonatebaseinfo" resultMap="ServiceDonatebaseinfoResult">
    <select id="selectServiceDonatebaseinfoList" parameterType="com.ruoyi.project.domain.ServiceDonatebaseinfo" resultMap="ServiceDonatebaseinfoResult">
        <include refid="selectServiceDonatebaseinfoVo"/>
        <where>
            service_donatebaseinfo.del_flag = 0

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

@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.mapper.ServiceDonatecompletioninfoMapper">
    
    <resultMap type="ServiceDonatecompletioninfo" id="ServiceDonatecompletioninfoResult">
    <resultMap type="com.ruoyi.project.domain.ServiceDonatecompletioninfo" id="ServiceDonatecompletioninfoResult">
        <result property="id"    column="ID"    />
        <result property="infoid"    column="InfoID"    />
        <result property="donorno"    column="DonorNo"    />
@@ -31,7 +31,7 @@
        select ID, InfoID, DonorNo, del_flag, create_by, create_time, update_by, update_time, IsBodyDonation, ReceivingUnit, ReceivingUnitName, CompleteTime, ResponsibleUserID, ResponsibleUserName, CoordinatedUserIDO, CoordinatedUserNameO, CoordinatedUserIDT, CoordinatedUserNameT, AssessAnnex, DonateOrgan from service_donatecompletioninfo
    </sql>

    <select id="selectServiceDonatecompletioninfoList" parameterType="ServiceDonatecompletioninfo" resultMap="ServiceDonatecompletioninfoResult">
    <select id="selectServiceDonatecompletioninfoList" parameterType="com.ruoyi.project.domain.ServiceDonatecompletioninfo" resultMap="ServiceDonatecompletioninfoResult">
        <include refid="selectServiceDonatecompletioninfoVo"/>
        <where>
            <if test="donorno != null  and donorno != ''"> and DonorNo = #{donorno}</if>

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

@@ -4,11 +4,11 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.mapper.ServiceDonateconsolationfundMapper">
    
    <resultMap type="ServiceDonateconsolationfund" id="ServiceDonateconsolationfundResult">
    <resultMap type="com.ruoyi.project.domain.ServiceDonateconsolationfund" id="ServiceDonateconsolationfundResult">
        <result property="id"    column="ID"    />
        <result property="infoid"    column="InfoID"    />
        <result property="donorno"    column="DonorNo"    />
        <result property="delFlag"    column="del_flag"    />
        <result property="del_flag"    column="del_flag"    />
        <result property="createBy"    column="create_by"    />
        <result property="createTime"    column="create_time"    />
        <result property="updateBy"    column="update_by"    />
@@ -56,7 +56,7 @@
        select ID, InfoID, DonorNo, del_flag, create_by, create_time, update_by, update_time, FamilyRelations, Name, Sex, IDCardType, IDCardNo, Phone, DepositBank, BankProvince, BankProvinceName, BankCity, BankCityName, BankTown, BankTownName, BranchBankName, BankCardNo, AnnexBankCard, AnnexRegistForm, AmountRequested, ConsolationMark, ConsolationType, PrepaidAmount, InvoiceCount, AttachCount, ManagerNo, ManagerName, DeptmentNo, DeptmentName, OPOchecker, FinVicePresident, BusVicePresident, OfficeDirector, FinanceDirector, FinanceChecher, Remark, RecordStatus, uploadflag, uploadtime from service_donateconsolationfund
    </sql>

    <select id="selectServiceDonateconsolationfundList" parameterType="ServiceDonateconsolationfund" resultMap="ServiceDonateconsolationfundResult">
    <select id="selectServiceDonateconsolationfundList" parameterType="com.ruoyi.project.domain.ServiceDonateconsolationfund" resultMap="ServiceDonateconsolationfundResult">
        <include refid="selectServiceDonateconsolationfundVo"/>
        <where>
            <if test="donorno != null  and donorno != ''"> and DonorNo = #{donorno}</if>

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

@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.mapper.ServiceDonatefollowupMapper">
    
    <resultMap type="ServiceDonatefollowup" id="ServiceDonatefollowupResult">
    <resultMap type="com.ruoyi.project.domain.ServiceDonatefollowup" id="ServiceDonatefollowupResult">
        <result property="id"    column="ID"    />
        <result property="seqno"    column="seqNo"    />
        <result property="infoid"    column="InfoID"    />
@@ -22,7 +22,7 @@
        <result property="followupdescribe"    column="followupDescribe"    />
        <result property="followupno"    column="followupNo"    />
        <result property="followuptime"    column="followupTime"    />
        <result property="delFlag"    column="del_flag"    />
        <result property="del_flag"    column="del_flag"    />
        <result property="createBy"    column="create_by"    />
        <result property="createTime"    column="create_time"    />
        <result property="updateBy"    column="update_by"    />
@@ -33,7 +33,7 @@
        select ID, seqNo, InfoID, OrganID, recipientName, recipientPhone, recipientDescribe, hospitalNo, hospitalName, hospitalDept, doctorName, doctorPhone, doctorDescribe, donateResult, followupDescribe, followupNo, followupTime, del_flag, create_by, create_time, update_by, update_time from service_donatefollowup
    </sql>

    <select id="selectServiceDonatefollowupList" parameterType="ServiceDonatefollowup" resultMap="ServiceDonatefollowupResult">
    <select id="selectServiceDonatefollowupList" parameterType="com.ruoyi.project.domain.ServiceDonatefollowup" resultMap="ServiceDonatefollowupResult">
        <include refid="selectServiceDonatefollowupVo"/>
        <where>
            <if test="seqno != null "> and seqNo = #{seqno}</if>

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

@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.mapper.ServiceDonateorganMapper">
    
    <resultMap type="ServiceDonateorgan" id="ServiceDonateorganResult">
    <resultMap type="com.ruoyi.project.domain.ServiceDonateorgan" id="ServiceDonateorganResult">
        <result property="id"    column="ID"    />
        <result property="infoid"    column="InfoID"    />
        <result property="donorno"    column="DonorNo"    />
@@ -39,7 +39,7 @@
        select ID, InfoID, DonorNo, OrganNo, OrganName, OrganState, OrganNumber, OrganGetTime, OrganGetDoct, GainHospitalNo, GainHospitalName, TransplantHospitalNo, TransplantHospitalName, TransplantDoct, TransplantTime, AbandonReason, ReallocationReason, IsBiopsyBefore, IsBiopsyAfter, IsMarginalOrgan, IsPathogenPositive, IsPNF, IsDGF, del_flag, create_by, create_time, update_by, update_time from service_donateorgan
    </sql>

    <select id="selectServiceDonateorganList" parameterType="ServiceDonateorgan" resultMap="ServiceDonateorganResult">
    <select id="selectServiceDonateorganList" parameterType="com.ruoyi.project.domain.ServiceDonateorgan" resultMap="ServiceDonateorganResult">
        <include refid="selectServiceDonateorganVo"/>
        <where>
            <if test="infoid != null "> and InfoID = #{infoid}</if>

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

@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.mapper.ServiceDonationwitnessMapper">
    
    <resultMap type="ServiceDonationwitness" id="ServiceDonationwitnessResult">
    <resultMap type="com.ruoyi.project.domain.ServiceDonationwitness" id="ServiceDonationwitnessResult">
        <result property="id"    column="ID"    />
        <result property="infoid"    column="InfoID"    />
        <result property="donorno"    column="DonorNo"    />
@@ -49,7 +49,7 @@
        select ID, InfoID, DonorNo, GainHospitalNo, GainHospitalName, DeathTime, DeathReason, DeathJudgeDoctO, DeathJudgeDoctT, DeathJudgeAnnex, OperationBegTime, OperationEndTime, OperationDoctor, IsSpendRemember, IsRestoreRemains, RememberAnnex, ResponsibleUserID, ResponsibleUserName, CoordinatedUserIDO, CoordinatedUserNameO, CoordinatedUserIDT, CoordinatedUserNameT, AbdominalAortaCannulaTime, AbdominalAortaPerfusionTime, PortalVeinCannulaTime, PortalVeinPerfusionTime, PulmonaryArteryCannulaTime, PulmonaryArteryPerfusionTime, AortaCannulaTime, AortaPerfusionTime, del_flag, create_by, create_time, update_by, update_time, OrganDonation, OrganDonation_Other, DonationCategory from service_donationwitness
    </sql>

    <select id="selectServiceDonationwitnessList" parameterType="ServiceDonationwitness" resultMap="ServiceDonationwitnessResult">
    <select id="selectServiceDonationwitnessList" parameterType="com.ruoyi.project.domain.ServiceDonationwitness" resultMap="ServiceDonationwitnessResult">
        <include refid="selectServiceDonationwitnessVo"/>
        <where>
            <if test="donorno != null  and donorno != ''"> and DonorNo = #{donorno}</if>

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

@@ -4,9 +4,9 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.mapper.ServiceEthicalreviewopinionsMapper">
    
    <resultMap type="ServiceEthicalreviewopinions" id="ServiceEthicalreviewopinionsResult">
    <resultMap type="com.ruoyi.project.domain.ServiceEthicalreviewopinions" id="ServiceEthicalreviewopinionsResult">
        <result property="id"    column="ID"    />
        <result property="delFlag"    column="del_flag"    />
        <result property="del_flag"    column="del_flag"    />
        <result property="createBy"    column="create_by"    />
        <result property="createTime"    column="create_time"    />
        <result property="updateBy"    column="update_by"    />
@@ -25,7 +25,7 @@
        select ID, del_flag, create_by, create_time, update_by, update_time, InfoID, DonorNo, ExpertOpinion, ExpertConclusion, ExpertName, ConclusionTime, ConclusionAnnex, ConclusionOrder from service_ethicalreviewopinions
    </sql>

    <select id="selectServiceEthicalreviewopinionsList" parameterType="ServiceEthicalreviewopinions" resultMap="ServiceEthicalreviewopinionsResult">
    <select id="selectServiceEthicalreviewopinionsList" parameterType="com.ruoyi.project.domain.ServiceEthicalreviewopinions" resultMap="ServiceEthicalreviewopinionsResult">
        <include refid="selectServiceEthicalreviewopinionsVo"/>
        <where>
            <if test="infoid != null "> and InfoID = #{infoid}</if>

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

@@ -4,12 +4,12 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.ServiceExpertexpenseMapper">
    
    <resultMap type="ServiceExpertexpense" id="ServiceExpertexpenseResult">
    <resultMap type="com.ruoyi.project.domain.ServiceExpertexpense" id="ServiceExpertexpenseResult">
        <result property="id"    column="ID"    />
        <result property="infoid"    column="InfoID"    />
        <result property="donorno"    column="DonorNo"    />
        <result property="donorname"    column="DonorName"    />
        <result property="delFlag"    column="del_flag"    />
        <result property="del_flag"    column="del_flag"    />
        <result property="createBy"    column="create_by"    />
        <result property="createTime"    column="create_time"    />
        <result property="updateBy"    column="update_by"    />

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

@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.mapper.ServiceExternalpersonMapper">
    
    <resultMap type="ServiceExternalperson" id="ServiceExternalpersonResult">
    <resultMap type="com.ruoyi.project.domain.ServiceExternalperson" id="ServiceExternalpersonResult">
        <result property="id"    column="ID"    />
        <result property="userno"    column="UserNo"    />
        <result property="username"    column="UserName"    />
@@ -21,7 +21,7 @@
        <result property="depositbank"    column="DepositBank"    />
        <result property="branchbankname"    column="BranchBankName"    />
        <result property="bankcardno"    column="BankCardNo"    />
        <result property="delFlag"    column="del_flag"    />
        <result property="del_flag"    column="del_flag"    />
        <result property="createBy"    column="create_by"    />
        <result property="createTime"    column="create_time"    />
        <result property="updateBy"    column="update_by"    />
@@ -34,7 +34,7 @@
        select ID, UserNo, UserName, UserStatus, IDCardNo, UserType, PersonnelUnitNo, Sex, Telephone, Address, UnitNo, UnitName, Title, DepositBank, BranchBankName, BankCardNo, del_flag, create_by, create_time, update_by, update_time, PYM, WBM from service_externalperson
    </sql>

    <select id="selectServiceExternalpersonList" parameterType="ServiceExternalperson" resultMap="ServiceExternalpersonResult">
    <select id="selectServiceExternalpersonList" parameterType="com.ruoyi.project.domain.ServiceExternalperson" resultMap="ServiceExternalpersonResult">
        <include refid="selectServiceExternalpersonVo"/>
        <where>
            <if test="userno != null  and userno != ''"> and UserNo = #{userno}</if>

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

@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.mapper.ServiceFunddetailSharedMapper">
    
    <resultMap type="ServiceFunddetailShared" id="ServiceFunddetailSharedResult">
    <resultMap type="com.ruoyi.project.domain.ServiceFunddetailShared" id="ServiceFunddetailSharedResult">
        <result property="id"    column="ID"    />
        <result property="fundid"    column="fundID"    />
        <result property="orderno"    column="OrderNo"    />
@@ -46,7 +46,7 @@
        <result property="donorno"    column="DonorNo"    />
        <result property="donorname"    column="DonorName"    />
        <result property="recordstatus"    column="RecordStatus"    />
        <result property="delFlag"    column="del_flag"    />
        <result property="del_flag"    column="del_flag"    />
        <result property="createBy"    column="create_by"    />
        <result property="createTime"    column="create_time"    />
        <result property="updateBy"    column="update_by"    />
@@ -66,7 +66,7 @@
        select ID, fundID, OrderNo, ItemID, ItemCode, ItemName, ItemType, ApplyType, ApplyTypeName, BeneficiaryName, BeneficiaryNo, UnitName, UnitNo, UnitUserNo, Title, IDCardType, IDCardNo, Sex, FamilyRelations, Phone, DepositBank, BankCardNo, BranchBankName, AnnexBankCard, AnnexRegistForm, Quantity, Price, Amount, TaxAmount, TaxedAmount, PrepaidAmount, paidAmount, paidTime, payTerm, InvoiceCount, AttachCount, Remark, InfoId, DonorNo, DonorName, RecordStatus, del_flag, create_by, create_time, update_by, update_time, uploadflag, uploadtime, SERVICESSCOPE, SERVICESSCOPENAME, SERVICETYPE, SERVICETYPENAME, REIMBURSEMENTAMOUNT, jine, liyou from service_funddetail_shared
    </sql>

    <select id="selectServiceFunddetailSharedList" parameterType="ServiceFunddetailShared" resultMap="ServiceFunddetailSharedResult">
    <select id="selectServiceFunddetailSharedList" parameterType="com.ruoyi.project.domain.ServiceFunddetailShared" resultMap="ServiceFunddetailSharedResult">
        <include refid="selectServiceFunddetailSharedVo"/>
        <where>
            <if test="fundid != null "> and fundID = #{fundid}</if>

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

@@ -4,10 +4,10 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.mapper.ServiceFundflowMapper">
    
    <resultMap type="ServiceFundflow" id="ServiceFundflowResult">
    <resultMap type="com.ruoyi.project.domain.ServiceFundflow" id="ServiceFundflowResult">
        <result property="id"    column="ID"    />
        <result property="fundid"    column="FundID"    />
        <result property="delFlag"    column="del_flag"    />
        <result property="del_flag"    column="del_flag"    />
        <result property="createBy"    column="create_by"    />
        <result property="createTime"    column="create_time"    />
        <result property="updateBy"    column="update_by"    />
@@ -25,7 +25,7 @@
        select ID, FundID, del_flag, create_by, create_time, update_by, update_time, CheckUserNo, CheckUserName, FlowContent, FlowConclusion, FundType, ApplyType,FlowLevel from service_fundflow
    </sql>

    <select id="selectServiceFundflowList" parameterType="ServiceFundflow" resultMap="ServiceFundflowResult">
    <select id="selectServiceFundflowList" parameterType="com.ruoyi.project.domain.ServiceFundflow" resultMap="ServiceFundflowResult">
        <include refid="selectServiceFundflowVo"/>
        <where>
            <if test="fundid != null "> and FundID = #{fundid}</if>

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

@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.mapper.ServiceMedicalevaluationMapper">
    
    <resultMap type="ServiceMedicalevaluation" id="ServiceMedicalevaluationResult">
    <resultMap type="com.ruoyi.project.domain.ServiceMedicalevaluation" id="ServiceMedicalevaluationResult">
        <result property="id"    column="ID"    />
        <result property="infoid"    column="InfoID"    />
        <result property="donorno"    column="DonorNo"    />

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

@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.mapper.ServiceOrganallocationMapper">
    
    <resultMap type="ServiceOrganallocation" id="ServiceOrganallocationResult">
    <resultMap type="com.ruoyi.project.domain.ServiceOrganallocation" id="ServiceOrganallocationResult">
        <result property="id"    column="ID"    />
        <result property="organid"    column="OrganID"    />
        <result property="organnumber"    column="OrganNumber"    />

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

@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.mapper.ServiceReimbursementdetailMapper">
    
    <resultMap type="ServiceReimbursementdetail" id="ServiceReimbursementdetailResult">
    <resultMap type="com.ruoyi.project.domain.ServiceReimbursementdetail" id="ServiceReimbursementdetailResult">
        <result property="id"    column="ID"    />
        <result property="rbid"    column="RBID"    />
        <result property="starttime"    column="StartTime"    />
@@ -44,7 +44,7 @@
        select ID, RBID, StartTime, Departure, EndTime, Destination, Days, TrafficExpense, TrafficType,TrafficType2, CityFee, HotelExpense, InvoiceCount, AttachCount, OtherExpense, FoodExpenses, FoodAllowance, AnnexFiles, remark, del_flag, create_by, create_time, update_by, update_time, upload_flag, upload_time, travelprovince, travelprovincename, travelcity, travelcityname, traveltown, traveltownname, otherfeeamount, otherfeedesc, OrderNo,personname,persontype from service_reimbursementdetail
    </sql>

    <select id="selectServiceReimbursementdetailList" parameterType="ServiceReimbursementdetail" resultMap="ServiceReimbursementdetailResult">
    <select id="selectServiceReimbursementdetailList" parameterType="com.ruoyi.project.domain.ServiceReimbursementdetail" resultMap="ServiceReimbursementdetailResult">
        <include refid="selectServiceReimbursementdetailVo"/>
        <where>
            del_flag = '0'

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

@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.mapper.ServiceReimbursementdetailSharedMapper">
    
    <resultMap type="ServiceReimbursementdetailShared" id="ServiceReimbursementdetailSharedResult">
    <resultMap type="com.ruoyi.project.domain.ServiceReimbursementdetailShared" id="ServiceReimbursementdetailSharedResult">
        <result property="id"    column="ID"    />
        <result property="rbid"    column="RBID"    />
        <result property="persontype"    column="persontype"    />
@@ -26,7 +26,7 @@
        <result property="foodallowance"    column="FoodAllowance"    />
        <result property="annexfiles"    column="AnnexFiles"    />
        <result property="remark"    column="Remark"    />
        <result property="delFlag"    column="del_flag"    />
        <result property="del_flag"    column="del_flag"    />
        <result property="createBy"    column="create_by"    />
        <result property="createTime"    column="create_time"    />
        <result property="updateBy"    column="update_by"    />
@@ -41,15 +41,13 @@
        <result property="traveltownname"    column="traveltownname"    />
        <result property="otherfeeamount"    column="otherfeeamount"    />
        <result property="otherfeedesc"    column="otherfeedesc"    />
        <result property="jine"    column="jine"    />
        <result property="liyou"    column="liyou"    />
    </resultMap>

    <sql id="selectServiceReimbursementdetailSharedVo">
        select ID, RBID, persontype, personname, OrderNo, StartTime, Departure, EndTime, Destination, Days, TrafficExpense, TrafficType, CityFee, HotelExpense, InvoiceCount, AttachCount, OtherExpense, FoodExpenses, FoodAllowance, AnnexFiles, Remark, del_flag, create_by, create_time, update_by, update_time, upload_flag, upload_time, travelprovince, travelprovincename, travelcity, travelcityname, traveltown, traveltownname, otherfeeamount, otherfeedesc, jine, liyou from service_reimbursementdetail_shared
        select ID, RBID, persontype, personname, OrderNo, StartTime, Departure, EndTime, Destination, Days, TrafficExpense, TrafficType, CityFee, HotelExpense, InvoiceCount, AttachCount, OtherExpense, FoodExpenses, FoodAllowance, AnnexFiles, Remark, del_flag, create_by, create_time, update_by, update_time, upload_flag, upload_time, travelprovince, travelprovincename, travelcity, travelcityname, traveltown, traveltownname, otherfeeamount, otherfeedesc from service_reimbursementdetail_shared
    </sql>

    <select id="selectServiceReimbursementdetailSharedList" parameterType="ServiceReimbursementdetailShared" resultMap="ServiceReimbursementdetailSharedResult">
    <select id="selectServiceReimbursementdetailSharedList" parameterType="com.ruoyi.project.domain.ServiceReimbursementdetailShared" resultMap="ServiceReimbursementdetailSharedResult">
        <include refid="selectServiceReimbursementdetailSharedVo"/>
        <where>
            <if test="rbid != null "> and RBID = #{rbid}</if>

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

@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.mapper.ServiceReimbursementpayeeMapper">
    
    <resultMap type="ServiceReimbursementpayee" id="ServiceReimbursementpayeeResult">
    <resultMap type="com.ruoyi.project.domain.ServiceReimbursementpayee" id="ServiceReimbursementpayeeResult">
        <result property="id"    column="id"    />
        <result property="rbid"    column="rbid"    />
        <result property="orderno"    column="orderno"    />
@@ -17,7 +17,7 @@
        <result property="familyrelations"    column="familyrelations"    />
        <result property="paiddate"    column="paiddate"    />
        <result property="remark"    column="remark"    />
        <result property="delFlag"    column="del_flag"    />
        <result property="del_flag"    column="del_flag"    />
        <result property="createBy"    column="create_by"    />
        <result property="createTime"    column="create_time"    />
        <result property="updateBy"    column="update_by"    />
@@ -30,7 +30,7 @@
        select id, rbid, orderno, persontype, personname, bankname, bankcardno, amount, phone, familyrelations, paiddate, remark, del_flag, create_by, create_time, update_by, update_time, uploadflag, uploadtime from service_reimbursementpayee
    </sql>

    <select id="selectServiceReimbursementpayeeList" parameterType="ServiceReimbursementpayee" resultMap="ServiceReimbursementpayeeResult">
    <select id="selectServiceReimbursementpayeeList" parameterType="com.ruoyi.project.domain.ServiceReimbursementpayee" resultMap="ServiceReimbursementpayeeResult">
        <include refid="selectServiceReimbursementpayeeVo"/>
        <where>
            <if test="rbid != null "> and rbid = #{rbid}</if>

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

@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.mapper.ServiceRelativesconfirmationMapper">
    
    <resultMap type="ServiceRelativesconfirmation" id="ServiceRelativesconfirmationResult">
    <resultMap type="com.ruoyi.project.domain.ServiceRelativesconfirmation" id="ServiceRelativesconfirmationResult">
        <result property="id"    column="ID"    />
        <result property="infoid"    column="InfoID"    />
        <result property="donorno"    column="DonorNo"    />

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

@@ -4,9 +4,9 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.mapper.ServiceSystemmessageMapper">
    
    <resultMap type="ServiceSystemmessage" id="ServiceSystemmessageResult">
    <resultMap type="com.ruoyi.project.domain.ServiceSystemmessage" id="ServiceSystemmessageResult">
        <result property="id"    column="ID"    />
        <result property="delFlag"    column="del_flag"    />
        <result property="del_flag"    column="del_flag"    />
        <result property="createBy"    column="create_by"    />
        <result property="createTime"    column="create_time"    />
        <result property="updateBy"    column="update_by"    />
@@ -30,7 +30,7 @@
        select ID, del_flag, create_by, create_time, update_by, update_time, SendUserNo, SendUserName, ReceiveUserNo, ReceiveUserName, MessageContent, MessageType, IsRead, ReadTime, ApplyType, FundType,RelevantNo,MessageTitle from service_systemmessage
    </sql>

    <select id="selectServiceSystemmessageList" parameterType="ServiceSystemmessage" resultMap="ServiceSystemmessageResult">
    <select id="selectServiceSystemmessageList" parameterType="com.ruoyi.project.domain.ServiceSystemmessage" resultMap="ServiceSystemmessageResult">
        <include refid="selectServiceSystemmessageVo"/>
        <where>
            <if test="senduserno != null  and senduserno != ''"> and SendUserNo = #{senduserno}</if>

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

@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.mapper.ServiceTravelexpensestandardMapper">
    
    <resultMap type="ServiceTravelexpensestandard" id="ServiceTravelexpensestandardResult">
    <resultMap type="com.ruoyi.project.domain.ServiceTravelexpensestandard" id="ServiceTravelexpensestandardResult">
        <result property="id"    column="ID"    />
        <result property="provincecode"    column="PROVINCECODE"    />
        <result property="citycode"    column="CITYCODE"    />
@@ -23,7 +23,7 @@
        select ID, PROVINCECODE, CITYCODE, TOWNCODE, BEGINDATE, ENDDATE, FIRSTLEVELCOST, SECONDLEVELCOST, THIRDLEVELCOST from service_travelexpensestandard
    </sql>

    <select id="selectServiceTravelexpensestandardList" parameterType="ServiceTravelexpensestandard" resultMap="ServiceTravelexpensestandardResult">
    <select id="selectServiceTravelexpensestandardList" parameterType="com.ruoyi.project.domain.ServiceTravelexpensestandard" resultMap="ServiceTravelexpensestandardResult">
        <include refid="selectServiceTravelexpensestandardVo"/>
        <where>
            <if test="provincecode != null  and provincecode != ''"> and PROVINCECODE = #{provincecode}</if>