代码提交

liusheng

2024-02-23 52df965c9cbaa015520b4379393a0041eb9ae8da

代码提交

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

@@ -1,29 +1,21 @@
package com.ruoyi.web.controller.project;

import java.util.Arrays;
import java.util.List;

import com.ruoyi.common.annotation.NotRepeatCommit;
import com.ruoyi.project.domain.vo.EthicalReviewVO;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.NotRepeatCommit;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.project.domain.ServiceEthicalreviewopinions;
import com.ruoyi.project.service.IServiceEthicalreviewopinionsService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.project.domain.ServiceEthicalreviewopinions;
import com.ruoyi.project.domain.vo.EthicalReviewVO;
import com.ruoyi.project.service.IServiceEthicalreviewopinionsService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.Arrays;
import java.util.List;

/**
 * 伦理审查专家意见Controller

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

@@ -10,6 +10,7 @@
import com.ruoyi.common.constant.HttpStatus;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.page.TableDataInfo;
@@ -25,6 +26,7 @@
import com.ruoyi.project.domain.vo.*;
import com.ruoyi.project.mapper.ServiceFunddetailMapper;
import com.ruoyi.project.service.*;
import com.ruoyi.system.service.ISysDeptService;
import com.ruoyi.system.service.ISysPostService;
import freemarker.template.Configuration;
import freemarker.template.Template;
@@ -100,6 +102,9 @@

    @Autowired
    private TransactionDefinition transactionDefinition;

    @Autowired
    private ISysDeptService sysDeptService;

    public ServiceFundController() {
        configuration = new Configuration();
@@ -527,11 +532,11 @@
                }
                FlowLevel = FlowLevel + 1;

                if (serviceFund.getFlowlevel() == 1 && serviceFund.getBackflowlevel() == 100) {
                if (serviceFund.getFlowlevel() == Long.valueOf(serviceFundflowrules.get(0).getFlowlevel() - 1) && serviceFund.getBackflowlevel() == 100) {
                    log.info("财务退回再提交，出纳再次审批，之后提交到财务");
                    //说明是财务退回再提交的.需要出纳再看一遍，没问题之后，往分享表里新增
//                    serviceFundService.addFundSharedInfo(serviceFund.getId());
                    serviceFund.setFlowlevel(3L);
                    serviceFund.setFlowlevel(serviceFundflowrules.get(0).getTotallevel().longValue());
                    serviceFund.setFlowlevel(100L);
                    serviceFund.setRecordstatus(99);
                    serviceFundService.updateById(serviceFund);
@@ -648,6 +653,23 @@
        if (CollectionUtils.isEmpty(infoByInfoIdList)) {
            return toAjax(false);
        }

        Long flowLavel = null;

        LoginUser loginUser = getLoginUser();
//        SysUser user = loginUser.getUser();
//        //查询当前用户的组长
//        SysDept sysDept = new SysDept();
//        sysDept.setDeptId(loginUser.getDeptId());
//        List<SysDept> sysDepts = sysDeptService.selectDeptList(sysDept);

        //查询必审人
        ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
        serviceFundflowrule.setApplytype(serviceFund.getApplytype());
        serviceFundflowrule.setMustAudite(1);
        List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
        log.info("fund必审人的等级为：{}", serviceFundflowrules.get(0).getFlowlevel());

        for (ServiceFund sf : infoByInfoIdList) {
            sf.setApplyTime(new Date());
            //如果等于100，说明已经走到医院财务那边了；财务那边取数据是从分享表取，所以，这里直接往分享表里添加数据就行了
@@ -656,7 +678,7 @@
                sf.setBackflowlevel(100);

                //退回再提交，需要再到出纳那里
                sf.setFlowlevel(1L);
                sf.setFlowlevel(Long.valueOf(serviceFundflowrules.get(0).getFlowlevel() - 1));
                sf.setRecordstatus(0);
                serviceFundService.updateById(sf);

@@ -667,27 +689,25 @@
            } else if (sf.getBackflowlevel() != null && sf.getBackflowlevel() == 100) {
                //财务退回的数据再提交，到出纳那里没有过，再退回，导致backflowlevel是100,
                //退回再提交，需要再到出纳那里
                sf.setFlowlevel(1L);
                sf.setFlowlevel(Long.valueOf(serviceFundflowrules.get(0).getFlowlevel() - 1));
                sf.setRecordstatus(2);
                serviceFundService.updateById(sf);
            } else if (sf.getBackflowlevel() != null && sf.getBackflowlevel() == 2) {
            } else if (sf.getBackflowlevel() != null && sf.getBackflowlevel() >= serviceFundflowrules.get(0).getFlowlevel()) {
                //聂科退回的，也需要先到出纳那里
                sf.setFlowlevel(1L);
                sf.setFlowlevel(Long.valueOf(serviceFundflowrules.get(0).getFlowlevel() - 1));
                sf.setRecordstatus(2);
                serviceFundService.updateById(sf);
            } else {

                Integer TotalLevel = 0;
                LoginUser loginUser = getLoginUser();
                SysUser user = loginUser.getUser();
                List<Integer> postids = postService.selectPostListByUserId(loginUser.getUserId());
                if (!postids.contains(2)) {
                    serviceFund.setRecordstatus(2);
                    if (serviceFund.getBackflowlevel() != null) {
                        serviceFund.setFlowlevel(serviceFund.getBackflowlevel().longValue());
                    } else {
                        serviceFund.setBackflowlevel(1);
                        serviceFund.setFlowlevel(1L);
                        serviceFund.setBackflowlevel(serviceFundflowrules.get(0).getFlowlevel() - 1);
                        serviceFund.setFlowlevel(Long.valueOf(serviceFundflowrules.get(0).getFlowlevel() - 1));
                    }
                } else {
                    serviceFund.setRecordstatus(0);

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

@@ -7,6 +7,7 @@
import com.ruoyi.common.constant.HttpStatus;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.page.TableDataInfo;
@@ -21,6 +22,7 @@
import com.ruoyi.project.domain.vo.SpFinancialExpensesIn;
import com.ruoyi.project.domain.vo.SpFinancialExpensesReimbursementOut;
import com.ruoyi.project.service.*;
import com.ruoyi.system.service.ISysDeptService;
import com.ruoyi.system.service.ISysPostService;
import com.ruoyi.web.controller.enums.PersonType;
import freemarker.template.Configuration;
@@ -73,7 +75,7 @@
    private IServiceFundflowService serviceFundflowService;

    @Autowired
    private IServiceFundService serviceFundService;
    private ISysDeptService sysDeptService;

    @Autowired
    private IBaseOnlyvalueService baseOnlyvalueService;
@@ -244,14 +246,25 @@
    public AjaxResult travelexpensereport(@RequestBody CheckFundVO checkFundVO) {
        ServiceReimbursement serviceReimbursement = serviceReimbursementService.getById(checkFundVO.getFundid());
        serviceReimbursement.setApplyTime(new Date());
        Long flowLavel = null;

        LoginUser loginUser = getLoginUser();
        SysUser user = loginUser.getUser();

        //查询必审人
        ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
        serviceFundflowrule.setApplytype("0");
        serviceFundflowrule.setMustAudite(1);
        List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
        log.info("reimbursement必审人的等级为：{}", serviceFundflowrules.get(0).getFlowlevel());

        //如果等于100，说明已经走到医院财务那边了；财务那边取数据是从分享表取，所以，这里直接往分享表里添加数据就行了;
        if (!Objects.isNull(serviceReimbursement) && serviceReimbursement.getBackflowlevel() != null) {
            if (serviceReimbursement.getBackflowlevel() == 100 || serviceReimbursement.getBackflowlevel() == 199) {
//            if (serviceReimbursement.getBackflowlevel() == 199) {
                //将退回阶段设置成100
                serviceReimbursement.setBackflowlevel(100L);
                //退回再提交，需要再到出纳那里
                serviceReimbursement.setFlowlevel(1L);
                serviceReimbursement.setFlowlevel(Long.valueOf(serviceFundflowrules.get(0).getFlowlevel() - 1));
                serviceReimbursement.setRecordstatus(2);
                serviceReimbursementService.updateById(serviceReimbursement);

@@ -259,9 +272,9 @@
//                serviceReimbursementService.addSharedData(checkFundVO.getFundid());

                return success();
            } else if (serviceReimbursement.getBackflowlevel() == 2) {
            } else if (serviceReimbursement.getBackflowlevel() >= Long.valueOf(serviceFundflowrules.get(0).getFlowlevel())) {
                //聂科退回的，也需要走出纳那里
                serviceReimbursement.setFlowlevel(1L);
                serviceReimbursement.setFlowlevel(Long.valueOf(serviceFundflowrules.get(0).getFlowlevel() - 1));
                serviceReimbursement.setRecordstatus(2);
                serviceReimbursementService.updateById(serviceReimbursement);
                return success();
@@ -269,8 +282,6 @@
        }
        if (serviceReimbursement != null) {
            Integer TotalLevel = 0;
            LoginUser loginUser = getLoginUser();
            SysUser user = loginUser.getUser();
            List<Integer> postids = postService.selectPostListByUserId(loginUser.getUserId());

            if (!postids.contains(2)) {
@@ -278,8 +289,8 @@
                if (serviceReimbursement.getBackflowlevel() != null) {
                    serviceReimbursement.setFlowlevel(serviceReimbursement.getBackflowlevel());
                } else {
                    serviceReimbursement.setBackflowlevel(1L);
                    serviceReimbursement.setFlowlevel(1L);
                    serviceReimbursement.setBackflowlevel(Long.valueOf(serviceFundflowrules.get(0).getFlowlevel() - 1));
                    serviceReimbursement.setFlowlevel(Long.valueOf(serviceFundflowrules.get(0).getFlowlevel() - 1));
                }
            } else {
                serviceReimbursement.setRecordstatus(0);
@@ -301,7 +312,8 @@
                serviceFundflow.setApplytype("0");
                serviceFundflow.setFlowconclusion(1);
                serviceFundflow.setFlowcontent("非专职人员直接进入二级审核");
                serviceFundflow.setFlowlevel(1);

                serviceFundflow.setFlowlevel(serviceFundflowrules.get(0).getFlowlevel() - 1);
                serviceFundflowService.save(serviceFundflow);
            }

@@ -372,7 +384,7 @@
                    //说明是财务退回再提交的.需要出纳再看一遍，没问题之后，往分享表里新增
//                    serviceReimbursementService.addSharedData(serviceReimbursement.getId());

                    serviceReimbursement.setFlowlevel(3L);
                    serviceReimbursement.setFlowlevel(Long.valueOf(serviceFundflowrules.get(0).getTotallevel()));
                    serviceReimbursement.setFlowlevel(100L);
                    serviceReimbursement.setRecordstatus(99);
                    boolean b = serviceReimbursementService.updateById(serviceReimbursement);

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

@@ -16,50 +16,72 @@
 */
@Data
@ApiModel("资金审批规则")
public class ServiceFundflowrule extends BaseEntity
{
public class ServiceFundflowrule extends BaseEntity {
    private static final long serialVersionUID = 1L;

    /** $column.columnComment */
    /**
     * $column.columnComment
     */
    @ApiModelProperty("$column.columnComment")
    //数据库自增改成@TableId(type = IdType.AUTO)
    @TableId(type = IdType.AUTO)
    private Long id;

    /** 资金类别 见字典sys_ConsolationType */
    /**
     * 资金类别 见字典sys_ConsolationType
     */
    @ApiModelProperty("资金类别 见字典sys_ConsolationType")
    @Excel(name = "资金类别 见字典sys_ConsolationType")
    private String applytype;

    /** 审核人编号 */
    /**
     * 审核人编号
     */
    @ApiModelProperty("审核人编号")
    @Excel(name = "审核人编号")
    private String checkuserno;

    /** 审核人姓名 */
    /**
     * 审核人姓名
     */
    @ApiModelProperty("审核人姓名")
    @Excel(name = "审核人姓名")
    private String checkusername;

    /** 是否要验证部门，只审核同部门的 */
    /**
     * 是否要验证部门，只审核同部门的
     */
    @ApiModelProperty("是否要验证部门，只审核同部门的")
    @Excel(name = "是否要验证部门，只审核同部门的")
    private Integer verificationdept;

    /** 当前审核级别 */
    /**
     * 当前审核级别
     */
    @ApiModelProperty("当前审核级别")
    @Excel(name = "当前审核级别")
    private Integer flowlevel;

    /** 总审核级别 */
    /**
     * 总审核级别
     */
    @ApiModelProperty("总审核级别")
    @Excel(name = "总审核级别")
    private Integer totallevel;

    /** 费用类别  1：差旅费模块  2：费用申请模块 */
    /**
     * 费用类别  1：差旅费模块  2：费用申请模块
     */
    @ApiModelProperty("费用类别  1：差旅费模块  2：费用申请模块")
    @Excel(name = "费用类别  1：差旅费模块  2：费用申请模块")
    private Integer fundtype;

    /**
     * 是否为必审人   0：否     1：是
     */
    @ApiModelProperty("是否为必审人   0：否     1：是")
    @Excel(name = "是否为必审人   0：否     1：是")
    private Integer mustAudite;

}


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

@@ -3,6 +3,8 @@

import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

@@ -82,4 +84,8 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date endtime;
    private String city;
    private Integer workflow;

    @ApiModelProperty("终止案例：0开启，1终止    默认值：0")
    private Integer terminationCase;
}

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

@@ -102,6 +102,7 @@
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date endtime;

    private String city;
    private Integer workflow;
    private Integer terminationCase;
}

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

@@ -85,4 +85,6 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date endtime;
    private String city;
    private Integer workflow;
    private Integer terminationCase;
}

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

@@ -78,4 +78,6 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date endtime;
    private String city;
    private Integer workflow;
    private Integer terminationCase;
}

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

@@ -104,4 +104,6 @@
    private String city;
    private String operatorno;
    private String operatorname;
    private Integer workflow;
    private Integer terminationCase;
}

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

@@ -1,13 +1,16 @@
package com.ruoyi.project.service.impl;

import java.util.List;

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.ServiceFundflowruleMapper;
import com.ruoyi.project.domain.ServiceFundflowrule;
@@ -20,8 +23,7 @@
 * @date 2022-04-27
 */
@Service
public class ServiceFundflowruleServiceImpl extends ServiceImpl<ServiceFundflowruleMapper, ServiceFundflowrule> implements IServiceFundflowruleService 
{
public class ServiceFundflowruleServiceImpl extends ServiceImpl<ServiceFundflowruleMapper, ServiceFundflowrule> implements IServiceFundflowruleService {


    /**
@@ -54,6 +56,9 @@
        if (serviceFundflowrule.getFundtype() != null){
            wrappers.eq(ServiceFundflowrule::getFundtype ,serviceFundflowrule.getFundtype());
        }
        if (serviceFundflowrule.getMustAudite() != null) {
            wrappers.eq(ServiceFundflowrule::getMustAudite, serviceFundflowrule.getMustAudite());
        }
        return this.list(wrappers);
    }


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

@@ -214,6 +214,7 @@
            <if test="businessarea != null ">and businessarea = #{businessarea}</if>
            <if test="donatetime != null ">and donatetime = #{donatetime}</if>
            <if test="donateno != null ">and donateno = #{donateno}</if>
            <if test="workflow != null ">and workflow = #{workflow}</if>
        </where>

        order by ReportTime desc

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

@@ -73,6 +73,8 @@
        `service_donatebaseinfo`.`RegisterCountyCode` AS `RegisterCountyCode`,
        `service_donatebaseinfo`.`RegisterCountyName` AS `RegisterCountyName`,
        `service_donatebaseinfo`.`create_by` AS `basecreateby`,
        `service_donatebaseinfo`.`workflow` AS `workflow`,
        `service_donatebaseinfo`.`termination_case` AS `terminationCase`,
        `service_donatecompletioninfo`.`ID` AS `dcID`,
        `service_donatecompletioninfo`.`InfoID` AS `InfoID`,
        `service_donatecompletioninfo`.`DonorNo` AS `dcDonorNo`,
@@ -117,6 +119,7 @@
            <if test="reporterno != null  and reporterno != ''"> and `service_donatebaseinfo`.ReporterNo = #{reporterno}</if>
            <if test="city != null and city != ''"> and `base_organization`.`City` = #{city}</if>
            <if test="id != null "> and `service_donatebaseinfo`.`ID` = #{id}</if>
            <if test="workflow != null "> and `service_donatebaseinfo`.`workflow` = #{workflow}</if>
    </where>

        order by `service_donatecompletioninfo`.`create_time` desc

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

@@ -119,6 +119,8 @@
        `service_donatebaseinfo`.`ReporterPhone` AS `ReporterPhone`,
        `service_donatebaseinfo`.`ReportTime` AS `ReportTime`,
        `service_donatebaseinfo`.`create_by` AS `basecreateby`,
        `service_donatebaseinfo`.`workflow` AS `workflow`,
        `service_donatebaseinfo`.`termination_case` AS `terminationCase`,
        `service_donationwitness`.`ID` AS `dwID`,
        `service_donationwitness`.`InfoID` AS `InfoID`,
        `service_donationwitness`.`DonorNo` AS `dwDonorNo`,
@@ -185,6 +187,7 @@
                #{reporterno}
            </if>
            <if test="city != null and city != ''">and `base_organization`.`City` = #{city}</if>
            <if test="workflow != null "> and `service_donatebaseinfo`.`workflow` = #{workflow}</if>
        </where>

        order by `service_donationwitness`.`create_time` desc

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

@@ -22,10 +22,26 @@
    </resultMap>

    <sql id="selectServiceEthicalreviewopinionsVo">
        select ID, del_flag, create_by, create_time, update_by, update_time, InfoID, DonorNo, ExpertOpinion, ExpertConclusion, ExpertName, ConclusionTime, ConclusionAnnex, ConclusionOrder from service_ethicalreviewopinions
        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="com.ruoyi.project.domain.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>
@@ -77,6 +93,8 @@
        `service_donatebaseinfo`.`DiseaseType` AS `DiseaseType`,
        `service_donatebaseinfo`.`PatientState` AS `PatientState`,
        `service_donatebaseinfo`.`create_by` AS `basecreateby`,
        `service_donatebaseinfo`.`workflow` AS `workflow;`,
        `service_donatebaseinfo`.`termination_case` AS `terminationCase;`,
        `service_donateflowchart`.`ID` AS `fcID`,
        `service_donateflowchart`.`InfoID` AS `InfoID`,
        `service_donateflowchart`.`DonorNo` AS `fcDonorNo`,
@@ -99,24 +117,37 @@
        `base_organization`.`OrganizationID` = `service_donatebaseinfo`.`TreatmentHospitalNo`
        <where>
            <if test="donorno != null  and donorno != ''"> and `service_donatebaseinfo`.`DonorNo` = #{donorno}</if>
            <if test="name != null  and name != ''"> and `service_donatebaseinfo`.`Name` like concat('%', #{name}, '%')</if>
            <if test="name != null  and name != ''">and `service_donatebaseinfo`.`Name` like concat('%', #{name}, '%')
            </if>
            <if test="idcardno != null  and idcardno != ''"> and `service_donatebaseinfo`.`IDCardNo` = #{idcardno}</if>
            <if test="treatmenthospitalno != null  and treatmenthospitalno != ''"> and `service_donatebaseinfo`.`TreatmentHospitalNo` = #{treatmenthospitalno}</if>
            <if test="recordstate != null  and recordstate != ''"> and `service_donatebaseinfo`.`RecordState` = #{recordstate}</if>
            <if test="basecreateby != null  and basecreateby != ''"> and `service_donatebaseinfo`.`create_by` = #{basecreateby}</if>
            <if test="treatmenthospitalno != null  and treatmenthospitalno != ''">and
                `service_donatebaseinfo`.`TreatmentHospitalNo` = #{treatmenthospitalno}
            </if>
            <if test="recordstate != null  and recordstate != ''">and `service_donatebaseinfo`.`RecordState` =
                #{recordstate}
            </if>
            <if test="basecreateby != null  and basecreateby != ''">and `service_donatebaseinfo`.`create_by` =
                #{basecreateby}
            </if>
            <if test="starttime != null "> and `service_donateflowchart`.create_time >= #{starttime} </if>
            <if test="endtime != null ">  and `service_donateflowchart`.create_time &lt;= #{endtime}</if>
            <if test="reporterno != null  and reporterno != ''"> and `service_donatebaseinfo`.ReporterNo = #{reporterno}</if>
            <if test="reporterno != null  and reporterno != ''">and `service_donatebaseinfo`.ReporterNo =
                #{reporterno}
            </if>
            <if test="city != null and city != ''"> and `base_organization`.`City` = #{city}</if>
            <if test="fcid != null ">  and `service_donateflowchart`.`ID` = #{fcid}</if>
            <if test="workflow != null "> and `service_donatebaseinfo`.`workflow` = #{workflow}</if>
        </where>

        order by  `service_donateflowchart`.`create_time` desc

    </select>
    <select id="countNumber" resultType="java.lang.Integer">
        select count(*) from service_donateflowchart where `service_donateflowchart`.`FlowName` = '伦理审查'
        and create_time >= #{starttime} and create_time &lt;= #{endtime}
        select count(*)
        from service_donateflowchart
        where `service_donateflowchart`.`FlowName` = '伦理审查'
          and create_time >= #{starttime}
          and create_time &lt;= #{endtime}
    </select>

</mapper>

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

@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.mapper.ServiceFundflowruleMapper">
    
    <resultMap type="ServiceFundflowrule" id="ServiceFundflowruleResult">
    <resultMap type="com.ruoyi.project.domain.ServiceFundflowrule" id="ServiceFundflowruleResult">
        <result property="id"    column="ID"    />
        <result property="applytype"    column="ApplyType"    />
        <result property="checkuserno"    column="CheckUserNo"    />
@@ -13,13 +13,14 @@
        <result property="flowlevel"    column="FlowLevel"    />
        <result property="totallevel"    column="TotalLevel"    />
        <result property="fundtype"    column="FundType"    />
        <result property="mustAudite"    column="must_audite"    />
    </resultMap>

    <sql id="selectServiceFundflowruleVo">
        select ID, ApplyType, CheckUserNo, CheckUserName, VerificationDept, FlowLevel, TotalLevel, FundType from service_fundflowrule
    </sql>

    <select id="selectServiceFundflowruleList" parameterType="ServiceFundflowrule" resultMap="ServiceFundflowruleResult">
    <select id="selectServiceFundflowruleList" parameterType="com.ruoyi.project.domain.ServiceFundflowrule" resultMap="ServiceFundflowruleResult">
        <include refid="selectServiceFundflowruleVo"/>
        <where>
            <if test="applytype != null  and applytype != ''"> and ApplyType = #{applytype}</if>

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

@@ -23,7 +23,7 @@
        <result property="coreteamassesstime"    column="CoreTeamAssessTime"    />
        <result property="coreteamassessconclusion"    column="CoreTeamAssessConclusion"    />
        <result property="assessannex"    column="AssessAnnex"    />
        <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, InfoID, DonorNo, IllnessOverview, DiagnosisName, HospitalAssessContent, HospitalAssessDoctor, HospitalAssessTime, HospitalAssessConclusion, ProvincialAssessContent, ProvincialAssessDoctor, ProvincialAssessTime, ProvincialAssessConclusion, CoreTeamAssessContent, CoreTeamAssessDoctor, CoreTeamAssessTime, CoreTeamAssessConclusion, AssessAnnex, del_flag, create_by, create_time, update_by, update_time from service_medicalevaluation
    </sql>

    <select id="selectServiceMedicalevaluationList" parameterType="ServiceMedicalevaluation" resultMap="ServiceMedicalevaluationResult">
    <select id="selectServiceMedicalevaluationList" parameterType="com.ruoyi.project.domain.ServiceMedicalevaluation" resultMap="ServiceMedicalevaluationResult">
        <include refid="selectServiceMedicalevaluationVo"/>
        <where>
            <if test="donorno != null  and donorno != ''"> and DonorNo = #{donorno}</if>
@@ -69,6 +69,8 @@
        `service_donatebaseinfo`.`ReporterNo` AS `ReporterNo`,
        `service_donatebaseinfo`.`ReportTime` AS `ReportTime`,
        `service_donatebaseinfo`.`create_by` AS `basecreateby`,
        `service_donatebaseinfo`.`workflow` AS `workflow`,
        `service_donatebaseinfo`.`termination_case` AS `terminationCase`,
        `service_medicalevaluation`.`ID` AS `meID`,
        `service_medicalevaluation`.`HospitalAssessContent` AS `HospitalAssessContent`,
        `service_medicalevaluation`.`HospitalAssessConclusion` AS `HospitalAssessConclusion`,
@@ -112,6 +114,7 @@
            <if test="endtime != null ">  and `service_medicalevaluation`.CoreTeamAssessTime &lt;= #{endtime}</if>
            <if test="reporterno != null  and reporterno != ''"> and `service_donatebaseinfo`.ReporterNo = #{reporterno}</if>
            <if test="city != null and city != ''"> and `base_organization`.`City` = #{city}</if>
            <if test="workflow != null "> and `service_donatebaseinfo`.`workflow` = #{workflow}</if>
    </where>

        order by `service_medicalevaluation`.`create_time` desc,

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

@@ -104,6 +104,8 @@
        `service_donatebaseinfo`.`TreatmentHospitalName` AS `TreatmentHospitalName`,
        `service_donatebaseinfo`.`TreatmentDeptName` AS `TreatmentDeptName`,
        `service_donatebaseinfo`.`create_by` AS `basecreateby`,
        `service_donatebaseinfo`.`workflow` AS `workflow`,
        `service_donatebaseinfo`.`termination_case` AS `terminationCase`,
        `service_relativesconfirmation`.`ID` AS `rcID`,
        `service_relativesconfirmation`.`InfoID` AS `InfoID`,
        `service_relativesconfirmation`.`DonorNo` AS `rcDonroNo`,
@@ -169,6 +171,7 @@
            <if test="residenceprovince != null and residenceprovince != ''"> and `service_relativesconfirmation`.`ResidenceProvince` = #{residenceprovince}</if>
            <if test="residencecity != null and residencecity != ''"> and `service_relativesconfirmation`.`ResidenceCity` = #{residencecity}</if>
            <if test="residencetown != null and residencetown != ''"> and `service_relativesconfirmation`.`ResidenceTown` = #{residencetown}</if>
            <if test="workflow != null "> and `service_donatebaseinfo`.`workflow` = #{workflow}</if>

    </where>