代码提交

liusheng

2024-03-14 9c9b4bec68df57356425441c62466651150e3b6e

代码提交

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

@@ -55,17 +55,18 @@
    public TableDataInfo list(ServiceDonateorgan serviceDonateorgan) {
        startPage();
        List<ServiceDonateorgan> list = serviceDonateorganService.queryList(serviceDonateorgan);
        if (!CollectionUtils.isEmpty(list)) {
            List<ServiceDonateorganVO> serviceDonateorganVOS = DtoConversionUtils.sourceToTarget(list, ServiceDonateorganVO.class);
//            for (ServiceDonateorganVO serviceDonateorganVO : serviceDonateorganVOS) {
//                ServiceOrganallocation serviceOrganallocation = new ServiceOrganallocation();
//                serviceOrganallocation.setOrganid(serviceDonateorganVO.getId());
//                List<ServiceOrganallocation> serviceOrganallocations = serviceOrganallocationService.selectServiceOrganallocationList(serviceOrganallocation);
//                serviceDonateorganVO.setServiceOrganallocations(serviceOrganallocations);
//            }
            return getDataTable(serviceDonateorganVOS);
        }
        return getDataTable(list);
    }


    /**
     * å™¨å®˜åˆ†é…ç´¯è®¡
     */
    @ApiOperation("器官分配累计")
    @GetMapping("/countList")
    public TableDataInfo countList(ServiceDonateorgan serviceDonateorgan) {
        startPage();
        List<ServiceDonateorgan> list = serviceDonateorganService.countList(serviceDonateorgan);
        return getDataTable(list);
    }


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

@@ -6,9 +6,12 @@
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.PageDomain;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.page.TableSupport;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.bean.DtoConversionUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -63,8 +66,7 @@
                serviceDonorchargeorganVO.setAnnexFilesList(rbDetailFiles);
            }
        }

        return getDataTable(serviceDonorchargeorganVOList);
        return getDataTable2(serviceDonorchargeorganVOList, list);
    }

    /**

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,110 @@
package com.ruoyi.web.controller.project;

import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
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.ServiceFundtax;
import com.ruoyi.project.service.IServiceFundtaxService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

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

/**
 * ä¸“家费用算税申请主Controller
 * 
 * @author ruoyi
 * @date 2024-03-13
 */
@Api("专家费用算税申请主")
@RestController
@RequestMapping("/system/fundtax")
public class ServiceFundtaxController extends BaseController
{
    @Autowired
    private IServiceFundtaxService serviceFundtaxService;

    /**
     * æŸ¥è¯¢ä¸“家费用算税申请主列表
     */
    @ApiOperation("查询专家费用算税申请主列表")
    @PreAuthorize("@ss.hasPermi('system:fundtax:list')")
    @GetMapping("/list")
    public TableDataInfo list(ServiceFundtax serviceFundtax)
    {
        startPage();
        List<ServiceFundtax> list = serviceFundtaxService.queryList(serviceFundtax);
        return getDataTable(list);
    }

    /**
     * å¯¼å‡ºä¸“家费用算税申请主列表
     */
    @ApiOperation("导出专家费用算税申请主列表")
    @PreAuthorize("@ss.hasPermi('system:fundtax:export')")
    @Log(title = "专家费用算税申请主", businessType = BusinessType.EXPORT)
    @GetMapping("/export")
    public AjaxResult export(ServiceFundtax serviceFundtax)
    {
        List<ServiceFundtax> list = serviceFundtaxService.queryList(serviceFundtax);
        ExcelUtil<ServiceFundtax> util = new ExcelUtil<ServiceFundtax>(ServiceFundtax.class);
        return util.exportExcel(list, "专家费用算税申请主数据");
    }

    /**
     * èŽ·å–专家费用算税申请主详细信息
     */
    @ApiOperation("获取专家费用算税申请主详细信息")
    @PreAuthorize("@ss.hasPermi('system:fundtax:query')")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id)
    {
        return AjaxResult.success(serviceFundtaxService.getById(id));
    }

    /**
     * æ–°å¢žä¸“家费用算税申请主
     */
    @ApiOperation("新增专家费用算税申请主")
    @PreAuthorize("@ss.hasPermi('system:fundtax:add')")
    @Log(title = "专家费用算税申请主", businessType = BusinessType.INSERT)
    @PostMapping
    @RepeatSubmit
    public AjaxResult add(@RequestBody ServiceFundtax serviceFundtax)
    {
        return toAjax(serviceFundtaxService.save(serviceFundtax));
    }

    /**
     * ä¿®æ”¹ä¸“家费用算税申请主
     */
    @ApiOperation("修改专家费用算税申请主")
    @PreAuthorize("@ss.hasPermi('system:fundtax:edit')")
    @Log(title = "专家费用算税申请主", businessType = BusinessType.UPDATE)
    @PutMapping
    @RepeatSubmit    
    public AjaxResult edit(@RequestBody ServiceFundtax serviceFundtax)
    {
        return toAjax(serviceFundtaxService.updateById(serviceFundtax));
    }

    /**
     * åˆ é™¤ä¸“家费用算税申请主
     */
    @ApiOperation("删除专家费用算税申请主")
    @PreAuthorize("@ss.hasPermi('system:fundtax:remove')")
    @Log(title = "专家费用算税申请主", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
        return toAjax(serviceFundtaxService.removeByIds(Arrays.asList(ids)));
    }
}

 ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java

@@ -91,6 +91,20 @@
    }

    /**
     * å“åº”请求分页数据
     */
    @SuppressWarnings({ "rawtypes", "unchecked" })
    protected TableDataInfo getDataTable2(List<?> list,List<?> list2)
    {
        TableDataInfo rspData = new TableDataInfo();
        rspData.setCode(HttpStatus.SUCCESS);
        rspData.setMsg("查询成功");
        rspData.setRows(list);
        rspData.setTotal(new PageInfo(list2).getTotal());
        return rspData;
    }

    /**
     * å“åº”批量保存数据
     */
    @SuppressWarnings({ "rawtypes", "unchecked" })

 ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,41 @@
package com.ruoyi.common.utils;

import com.github.pagehelper.PageHelper;
import com.ruoyi.common.core.page.PageDomain;
import com.ruoyi.common.core.page.TableSupport;
import com.ruoyi.common.utils.sql.SqlUtil;

/**
 * åˆ†é¡µå·¥å…·ç±»
 *
 * @author ruoyi
 */
public class PageUtils extends PageHelper {
    /**
     * è®¾ç½®è¯·æ±‚分页数据
     */
    public static void startPage() {
        PageDomain pageDomain = TableSupport.buildPageRequest();
        Integer pageNum = pageDomain.getPageNum();
        Integer pageSize = pageDomain.getPageSize();
        String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy());
        Boolean reasonable = pageDomain.getReasonable();
        PageHelper.startPage(pageNum, pageSize, orderBy).setReasonable(reasonable);
    }

    /**
     * è®¾ç½®è¯·æ±‚分页数据
     */
    public static void startPageByPost(Integer pageNum, Integer pageSize) {
        if (pageNum == null) pageNum = 1;
        if (pageSize == null) pageSize = 10;
        PageHelper.startPage(pageNum, pageSize, "").setReasonable(true);
    }

    /**
     * æ¸…理分页的线程变量
     */
    public static void clearPage() {
        PageHelper.clearPage();
    }
}

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

@@ -1,6 +1,7 @@
package com.ruoyi.project.domain;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
@@ -317,5 +318,27 @@
    private String caseno;



    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @TableField(exist = false)
    private Date starttime;


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

    @TableField(exist = false)
    private String city;

    /**
     * æŠ¥å‘Šè€…编号
     */
    @TableField(exist = false)
    private String reporterno;


}


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

@@ -98,8 +98,8 @@
     * è´¹ç”¨å½•å…¥æ—¶é—´
     */
    @ApiModelProperty("费用录入时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "费用录入时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd")
    @Excel(name = "费用录入时间", width = 30, dateFormat = "yyyy-MM-dd")
    private Date organtime;

    /**
@@ -177,7 +177,7 @@
     * æŽ¥æ”¶æ—¥æœŸ
     */
    @ApiModelProperty("接收日期")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date receiveTime;

}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,191 @@
package com.ruoyi.project.domain;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

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

/**
 * ä¸“家费用算税申请主对象 service_fundtax
 * 
 * @author ruoyi
 * @date 2024-03-13
 */
@Data
@ApiModel("专家费用算税申请主")
public class ServiceFundtax extends BaseEntity
{
    private static final long serialVersionUID = 1L;

    /** ä¸»é”®id */
    @ApiModelProperty("主键id")
    //数据库自增改成@TableId(type = IdType.AUTO)
    @TableId(type = IdType.AUTO)
    private Long id;

    /** ç”³è¯·ç¼–号 */
    @ApiModelProperty("申请编号")
    @Excel(name = "申请编号")
    private String applyno;

    /** ç®—税时间 */
    @ApiModelProperty("算税时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "算税时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date taxedtime;

    /** ç”³è¯·äººç¼–号 */
    @ApiModelProperty("申请人编号")
    @Excel(name = "申请人编号")
    private String userno;

    /** ç”³è¯·äººå§“名 */
    @ApiModelProperty("申请人姓名")
    @Excel(name = "申请人姓名")
    private String username;

    /** éƒ¨é—¨ç¼–号 */
    @ApiModelProperty("部门编号")
    @Excel(name = "部门编号")
    private String deptmentno;

    /** éƒ¨é—¨åç§° */
    @ApiModelProperty("部门名称")
    @Excel(name = "部门名称")
    private String deptmentname;

    /** éƒ¨é—¨ä¸»ç®¡å·¥å· */
    @ApiModelProperty("部门主管工号")
    @Excel(name = "部门主管工号")
    private String managerno;

    /** éƒ¨é—¨ä¸»ç®¡åå­— */
    @ApiModelProperty("部门主管名字")
    @Excel(name = "部门主管名字")
    private String managername;

    /** ç¨Žå‰é‡‘额合计 */
    @ApiModelProperty("税前金额合计")
    @Excel(name = "税前金额合计")
    private BigDecimal pretaxamount;

    /** ç¨ŽåŽé‡‘额合计 */
    @ApiModelProperty("税后金额合计")
    @Excel(name = "税后金额合计")
    private BigDecimal taxedamount;

    /** è´¹ç”¨æ€»é‡‘额 */
    @ApiModelProperty("费用总金额")
    @Excel(name = "费用总金额")
    private BigDecimal taxamount;

    /** åŒ»å­¦æˆæœ¬åˆè®¡ */
    @ApiModelProperty("医学成本合计")
    @Excel(name = "医学成本合计")
    private BigDecimal medicalcost;

    /** é—体修复支持成本合计 */
    @ApiModelProperty("遗体修复支持成本合计")
    @Excel(name = "遗体修复支持成本合计")
    private BigDecimal bodymaintaincost;

    /** å™¨å®˜èŽ·å–成本合计 */
    @ApiModelProperty("器官获取成本合计")
    @Excel(name = "器官获取成本合计")
    private BigDecimal organgaincost;

    /** å™¨å®˜åŒ»å­¦æ”¯æŒæˆæœ¬ */
    @ApiModelProperty("器官医学支持成本")
    @Excel(name = "器官医学支持成本")
    private BigDecimal organmaintaincost;

    /** è®°å½•çŠ¶æ€ */
    @ApiModelProperty("记录状态")
    @Excel(name = "记录状态")
    private Long recordstatus;

    /** é¢„审状态：1、待预审；2、预算通过，等待纸质报销材料；3、收到纸质报销材料 */
    @ApiModelProperty("预审状态：1、待预审；2、预算通过，等待纸质报销材料；3、收到纸质报销材料")
    @Excel(name = "预审状态：1、待预审；2、预算通过，等待纸质报销材料；3、收到纸质报销材料")
    private Long checkstatus;

    /** å½“前审核级别 å¤„于哪个阶段 0：申请；1：一级审核；2：二级审核；3：三级审核等 */
    @ApiModelProperty("当前审核级别 å¤„于哪个阶段 0：申请；1：一级审核；2：二级审核；3：三级审核等")
    @Excel(name = "当前审核级别 å¤„于哪个阶段 0：申请；1：一级审核；2：二级审核；3：三级审核等")
    private Long flowlevel;

    /** è´¢åŠ¡é€€å›ž199；上传医院100； */
    @ApiModelProperty("财务退回199；上传医院100；")
    @Excel(name = "财务退回199；上传医院100；")
    private Long backflowlevel;

    /** å‘放状态 */
    @ApiModelProperty("发放状态")
    @Excel(name = "发放状态")
    private String isdistribute;

    /** ä»˜æ¬¾æ—¥æœŸ */
    @ApiModelProperty("付款日期")
    @Excel(name = "付款日期")
    private String riqi;

    /** ä¸­å¿ƒç­¾å­— */
    @ApiModelProperty("中心签字")
    @Excel(name = "中心签字")
    private String opochecker;

    /** è´¢åŠ¡å‰¯é™¢é•¿ç­¾å­— */
    @ApiModelProperty("财务副院长签字")
    @Excel(name = "财务副院长签字")
    private String finvicepresident;

    /** ä¸šåŠ¡å‰¯é™¢é•¿ç­¾å­— */
    @ApiModelProperty("业务副院长签字")
    @Excel(name = "业务副院长签字")
    private String busvicepresident;

    /** é™¢é•¿å®¡æ‰¹ */
    @ApiModelProperty("院长审批")
    @Excel(name = "院长审批")
    private String president;

    /** åŠžå…¬å®¤ä¸»ä»»ç­¾å­— */
    @ApiModelProperty("办公室主任签字")
    @Excel(name = "办公室主任签字")
    private String officedirector;

    /** è´¢åŠ¡å®¤ä¸»ä»»ç­¾å­— */
    @ApiModelProperty("财务室主任签字")
    @Excel(name = "财务室主任签字")
    private String financedirector;

    /** è´¢åŠ¡å®¡æ ¸ */
    @ApiModelProperty("财务审核")
    @Excel(name = "财务审核")
    private String financechecher;

    /** æ•°æ®æ˜¯å¦å…è®¸è¿›å…¥shared表   0：否     1：是，2：已进入 */
    @ApiModelProperty("数据是否允许进入shared表   0：否     1：是，2：已进入")
    @Excel(name = "数据是否允许进入shared表   0：否     1：是，2：已进入")
    private String uploadflag;

    /** ä¸Šä¼ æ—¶é—´ */
    @ApiModelProperty("上传时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "上传时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date uploadtime;

    /** æ¥ç”¨è®°å½•æ’入分享表失败 */
    @ApiModelProperty("来用记录插入分享表失败")
    @Excel(name = "来用记录插入分享表失败")
    private String updownremark;

}


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

@@ -1,14 +1,9 @@
package com.ruoyi.project.domain;

import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Date;

import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
@@ -16,6 +11,8 @@
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

import java.util.Date;

/**
 * å™¨å®˜åˆ†é…å¯¹è±¡ service_organallocation
 *

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

@@ -1,90 +1,595 @@
package com.ruoyi.project.domain.vo;

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

import java.util.Date;

@Data
public class EthicalReviewVO {
public class EthicalReviewVO extends BaseEntity {

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

    /**
     * å§“名
     */
    @ApiModelProperty("姓名")
    @Excel(name = "姓名")
    private String name;

    /**
     * æ€§åˆ«
     */
    @ApiModelProperty("性别")
    private String sex;
    //private Long idcardtype;

    /**
     * è¯ä»¶ç±»åž‹
     */
    @ApiModelProperty("证件类型")
    private Long idcardtype;

    /**
     * è¯ä»¶å·ç 
     */
    @ApiModelProperty("证件号码")
    private String idcardno;

    /**
     * å¹´é¾„
     */
    @ApiModelProperty("年龄")
    private Long age;
    private String birthday;

    /**
     * å¹´é¾„单位
     */
    @ApiModelProperty("年龄单位")
    private String ageunit;

    /**
     * å‡ºç”Ÿæ—¥æœŸ
     */
    @ApiModelProperty("出生日期")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date birthday;

    /**
     * è”系电话
     */
    @ApiModelProperty("联系电话")
    private String phone;

    /**
     * çŽ°ä½åœ°å€
     */
    @ApiModelProperty("现住地址")
    private String residenceaddress;

    /**
     * å›½ç±
     */
    @ApiModelProperty("国籍")
    private String nationality;

    /**
     * çœ(区/市)
     */
    @ApiModelProperty("省(区/市)")
    @Excel(name = "省(区/市)")
    private String residenceprovince;

    /**
     * ç±è´¯
     */
    @ApiModelProperty("籍贯")
    @Excel(name = "籍贯")
    private String nativeplace;

    /**
     * çŽ°ä½åœ°å€çœåç§°
     */
    @ApiModelProperty("现住地址省名称")
    private String residenceprovincename;

    /**
     * æ°‘族
     */
    @ApiModelProperty("民族")
    private String nation;

    /**
     * èŒä¸š
     */
    @ApiModelProperty("职业")
    private String occupation;

    /**
     * å¸‚(州)
     */
    @ApiModelProperty("市(州)")
    private String residencecity;

    /**
     * å¸‚名称
     */
    @ApiModelProperty("市名称")
    private String residencecityname;

    /**
     * å­¦åŽ†
     */
    @ApiModelProperty("学历")
    private String education;

    /**
     * åŽ¿ï¼ˆå¸‚/区）
     */
    @ApiModelProperty("县（市/区）")
    private String residencetown;

    /**
     * æ‰€å±žè¡—道（镇）名称
     */
    @ApiModelProperty("所属街道（镇）名称")
    private String residencetownname;

    /**
     * ç¤¾åŒºï¼ˆæ‘）编号 æ ¹æ®è¡Œæ”¿åŒºåˆ’表
     */
    @ApiModelProperty("社区（村）编号 æ ¹æ®è¡Œæ”¿åŒºåˆ’表")
    private String residencecommunity;

    /**
     * ç¤¾åŒºï¼ˆæ‘）名称
     */
    @ApiModelProperty("社区（村）名称")
    private String residencecommunityname;

    /**
     * æ‰€å±žåŒºåŸŸç¼–号  æ ¹æ®è¡Œæ”¿åŒºåˆ’表
     */
    @ApiModelProperty("所属区域编号  æ ¹æ®è¡Œæ”¿åŒºåˆ’表")
    private String residencecountycode;

    /**
     * æ‰€å±žåŒºåŸŸåç§°
     */
    @ApiModelProperty("所属区域名称")
    private String residencecountyname;

    /**
     * æˆ·ç±åœ°å€
     */
    @ApiModelProperty("户籍地址")
    private String registeraddress;

    /**
     * çœ(区/市)
     */
    @ApiModelProperty("省(区/市)")
    private String registerprovince;

    /**
     * æˆ·ç±åœ°å€çœåç§°
     */
    @ApiModelProperty("户籍地址省名称")
    private String registerprovincename;

    /**
     * å¸‚(州)
     */
    @ApiModelProperty("市(州)")
    private String registercity;

    /**
     * å¸‚名称
     */
    @ApiModelProperty("市名称")
    private String registercityname;

    /**
     * åŽ¿ï¼ˆå¸‚/区）
     */
    @ApiModelProperty("县（市/区）")
    private String registertown;

    /**
     * æ‰€å±žè¡—道（镇）名称
     */
    @ApiModelProperty("所属街道（镇）名称")
    private String registertownname;

    /**
     * ç¤¾åŒºï¼ˆæ‘）编号 æ ¹æ®è¡Œæ”¿åŒºåˆ’表
     */
    @ApiModelProperty("社区（村）编号 æ ¹æ®è¡Œæ”¿åŒºåˆ’表")
    private String registercommunity;

    /**
     * ç¤¾åŒºï¼ˆæ‘）名称
     */
    @ApiModelProperty("社区（村）名称")
    private String registercommunityname;

    /**
     * æ‰€å±žåŒºåŸŸç¼–号  æ ¹æ®è¡Œæ”¿åŒºåˆ’表
     */
    @ApiModelProperty("所属区域编号  æ ¹æ®è¡Œæ”¿åŒºåˆ’表")
    private String registercountycode;

    /**
     * æ‰€å±žåŒºåŸŸåç§°
     */
    @ApiModelProperty("所属区域名称")
    private String registercountyname;

    /**
     * è®°å½•çŠ¶æ€
     */
    @ApiModelProperty("记录状态")
    @Excel(name = "记录状态")
    private String recordstate;

    /**
     * æ²»ç–—医院
     */
    @ApiModelProperty("治疗医院")
    private String treatmenthospitalno;

    /**
     * æ‰€åœ¨åŒ»ç–—机构
     */
    @ApiModelProperty("所在医疗机构")
    @Excel(name = "所在医疗机构")
    private String treatmenthospitalname;

    /**
     * ç§‘室
     */
    @ApiModelProperty("科室")
    private String treatmentdeptname;

    /**
     * ç–¾ç—…诊断
     */
    @ApiModelProperty("疾病诊断")
    private String diagnosisno;

    /**
     * ç–¾ç—…诊断名称
     */
    @ApiModelProperty("疾病诊断名称")
    private String diagnosisname;
    private String reporterno;
    private String reportername;
    private String reporterphone;
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date reporttime;

    /**
     * è¡€åž‹
     */
    @ApiModelProperty("血型 ")
    private String bloodtype;
    private Long rhyin;

    /**
     * ä½é™¢å·
     */
    @ApiModelProperty("住院号")
    private String inpatientno;

    /**
     * Rh阴性
     */
    @ApiModelProperty("Rh阴性")
    private String rhyin;

    /**
     * æçŒ®è€…编号
     */
    @ApiModelProperty("捐献者编号")
    private String donorno;

    /**
     * æçŒ®ç±»åˆ«
     */
    @ApiModelProperty("捐献类别")
    private String donationcategory;

    /**
     * ç—…情概况
     */
    @ApiModelProperty("病情概况")
    private String illnessoverview;

    /**
     * ç–¾ç—…类型
     */
    @ApiModelProperty("疾病类型")
    private String diseasetype;

    /**
     * ä¼ æŸ“病情况
     */
    @ApiModelProperty("传染病情况")
    private String infectious;

    /**
     * æœ¬äººæ„æ„¿
     */
    @ApiModelProperty("本人意愿 ")
    private String selfwill;

    /**
     * å…¶ä»–情况
     */
    @ApiModelProperty("其他情况")
    private String othercases;

    /**
     * äº²å±žæ„æ„¿
     */
    @ApiModelProperty("亲属意愿")
    private Long kinshipwill;

    /**
     * å…¶ä»–
     */
    @ApiModelProperty("其他")
    private String diseasetypeOther;

    /**
     * äº²å±žå…³ç³»çŠ¶å†µ
     */
    @ApiModelProperty("亲属关系状况")
    private String kinship;

    /**
     * ä¿¡æ¯æ¥æº
     */
    @ApiModelProperty("信息来源")
    private String infosources;

    /**
     * çº¢åå­—会机构编号 é€‰è‡ªæœºæž„表
     */
    @ApiModelProperty("红十字会机构编号 é€‰è‡ªæœºæž„表")
    private String redorganno;

    /**
     * çº¢åå­—会机构名称
     */
    @ApiModelProperty("红十字会机构名称")
    private String redorganname;

    /**
     * çº¢åå­—会联系人
     */
    @ApiModelProperty("红十字会联系人")
    private String contactperson;

    /**
     * å…¶ä»–
     */
    @ApiModelProperty("其他")
    private String infectiousOther;

    /**
     * çº¢åå­—会联系电话
     */
    @ApiModelProperty("红十字会联系电话")
    private String contactnumber;

    /**
     * æŠ¥å‘Šè€…编号
     */
    @ApiModelProperty("报告者编号")
    private String reporterno;

    /**
     * æŠ¥å‘Šè€…姓名
     */
    @ApiModelProperty("报告者姓名")
    @Excel(name = "报告者姓名")
    private String reportername;

    /**
     * ç—…人状况
     */
    @ApiModelProperty("病人状况")
    private String patientstate;
    private Long fcid;
//    private String expertopinion;
//    private String expertconclusion;
//    private String expertname;
//    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
//    private Date conclusiontime;
//    private String conclusionannex;
//    private String conclusionorder;

    private Long infoid;
    private String fcdonorno;
    private String flowname;
    private String flowannex;
    private String flowcontent;
    private String flowconclusion;
    private Long delFlag;
    private String createBy;
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createTime;
    private String updateBy;
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date updateTime;
    /**
     * æŠ¥å‘Šè€…联系电话
     */
    @ApiModelProperty("报告者联系电话")
    private String reporterphone;

    private String basecreateby;
    /**
     * ä¿¡æ¯æ¥æºå…¶ä»–
     */
    @ApiModelProperty("信息来源其他")
    private String infosourcesOther;

    /**
     * æŠ¥å‘Šæ—¶é—´
     */
    @ApiModelProperty("报告时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "报告时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date reporttime;

    /**
     * å…¶ä»–
     */
    @ApiModelProperty("其他")
    private String kinshipOther;

    /**
     * ä¸»è¦äº²å±ž
     */
    @ApiModelProperty("主要亲属")
    private String majorrelatives;

    /**
     * ä¸Žæèµ è€…关系
     */
    @ApiModelProperty("与捐赠者关系")
    private String familyrelations;

    /**
     * èŽ·å–组织编号
     */
    @ApiModelProperty("获取组织编号")
    private String acquisitiontissueno;

    /**
     * èŽ·å–组织名称
     */
    @ApiModelProperty("获取组织名称")
    private String acquisitiontissuename;

    /**
     * ä¿¡æ¯å‘˜å§“名
     */
    @ApiModelProperty("信息员姓名")
    private String infoname;

    /**
     * ä¿¡æ¯å‘˜è”系方式
     */
    @ApiModelProperty("信息员联系方式")
    private String infophone;

    /**
     * è”系时间
     */
    @ApiModelProperty("联系时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date contacttime;


    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @TableField(exist = false)
    private Date starttime;


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

    @TableField(exist = false)
    private String city;


    private Long deptid;

    @ApiModelProperty("部门名称")
    @Excel(name = "部门名称")
    private String deptname;

    @ApiModelProperty("组长编码")
    @Excel(name = "组长编码")
    private String leaderno;

    @ApiModelProperty("组长名称")
    @Excel(name = "组长名称")
    private String leadername;

    @ApiModelProperty("业务地区")
    @Excel(name = "业务地区")
    private String businessarea;


    @ApiModelProperty("附件地址")
    @Excel(name = "附件地址")
    private String annexfiles;


    @ApiModelProperty("工作流")
    @Excel(name = "工作流")
    private Integer workflow;


    @ApiModelProperty("终止案例：0开启，1终止    é»˜è®¤å€¼ï¼š0")
    @Excel(name = "终止案例")
    private Integer terminationCase;

    @ApiModelProperty("案例时间")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date donatetime;

    @ApiModelProperty("案例序号")
    private String donateno;

    @ApiModelProperty("service_ethicalreviewopinions的主键")
    private Long fcid;

    @ApiModelProperty("delFlag")
    private Long delFlag;

    /**
     * ä¸“家意见
     */
    @ApiModelProperty("专家意见")
    @Excel(name = "专家意见")
    private String expertopinion;

    /**
     * ä¸“家结论  è§å­—å…¸ sys_0_1
     */
    @ApiModelProperty("专家结论  è§å­—å…¸ sys_0_1 ")
    @Excel(name = "专家结论  è§å­—å…¸ sys_0_1 ")
    private Long expertconclusion;


    /**
     * ä¸“家名字
     */
    @ApiModelProperty("专家名字")
    @Excel(name = "专家名字")
    private String expertname;

    /**
     * ç»“论时间
     */
    @ApiModelProperty("结论时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "结论时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date conclusiontime;

    /**
     * ç»“论附件 å¯ç©º å¤šä¸ªç”¨;号隔开
     */
    @ApiModelProperty("结论附件 å¯ç©º å¤šä¸ªç”¨;号隔开")
    @Excel(name = "结论附件 å¯ç©º å¤šä¸ªç”¨;号隔开")
    private String conclusionannex;


    /**
     * ç»“论顺序
     */
    @ApiModelProperty("结论顺序")
    @Excel(name = "结论顺序")
    private Long conclusionorder;

    /**
     * Basecreateby
     */
    @ApiModelProperty("Basecreateby")
    @TableField(exist = false)
    private String basecreateby;

}

 ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceDonateorganMapper.java

@@ -75,4 +75,6 @@
    String getOrganNameByNo(String organno);

    List<ServiceDonateorgan> selectAll(TimeVO timeVO);

    List<ServiceDonateorgan> countList(ServiceDonateorgan serviceDonateorgan);
}

 ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceFundtaxMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,24 @@
package com.ruoyi.project.mapper;


import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.project.domain.ServiceFundtax;

import java.util.List;

/**
 * ä¸“家费用算税申请主Mapper接口
 * 
 * @author ruoyi
 * @date 2024-03-13
 */
public interface ServiceFundtaxMapper extends BaseMapper<ServiceFundtax>
{
    /**
     * æŸ¥è¯¢ä¸“家费用算税申请主列表
     *
     * @param serviceFundtax ä¸“家费用算税申请主
     * @return ä¸“家费用算税申请主集合
     */
    public List<ServiceFundtax> selectServiceFundtaxList(ServiceFundtax serviceFundtax);
}

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

@@ -76,5 +76,7 @@

    Boolean editArrayData(List<ServiceDonateorgan> serviceDonateorgans);

    List<ServiceDonateorgan> countList(ServiceDonateorgan serviceDonateorgan);


}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,24 @@
package com.ruoyi.project.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.project.domain.ServiceFundtax;

import java.util.List;

/**
 * ä¸“家费用算税申请主Service接口
 * 
 * @author ruoyi
 * @date 2024-03-13
 */
public interface IServiceFundtaxService extends IService<ServiceFundtax>
{

    /**
     * æŸ¥è¯¢ä¸“家费用算税申请主列表
     * 
     * @param serviceFundtax ä¸“家费用算税申请主
     * @return ä¸“家费用算税申请主集合
     */
    public List<ServiceFundtax> queryList(ServiceFundtax serviceFundtax);
}

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

@@ -14,6 +14,7 @@
import com.ruoyi.project.domain.vo.countByRecordStateVO;
import com.ruoyi.project.mapper.*;
import com.ruoyi.project.service.*;
import com.ruoyi.system.mapper.SysUserMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -71,6 +72,8 @@

    @Autowired
    private IServiceDonatecompletioninfoService serviceDonatecompletioninfoService;
    @Autowired
    private SysUserMapper sysUserMapper;


    /**
@@ -285,17 +288,17 @@
        donatebaseinfo.put("updatetime", serviceDonatebaseinfo.getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonatebaseinfo.getUpdateTime()) : "");
        donatebaseinfo.put("createperson", null);
        if (StringUtils.isNotBlank(serviceDonatebaseinfo.getCreateBy())) {
            ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
            serviceFundflowrule.setCheckuserno(serviceDonatebaseinfo.getCreateBy());
            List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
            donatebaseinfo.put("createperson", serviceFundflowrules.get(0).getCheckusername());
            SysUser sysUser = sysUserMapper.selectUserByUserName(serviceDonatebaseinfo.getCreateBy());
            if (!ObjectUtils.isEmpty(sysUser)) {
                donatebaseinfo.put("createperson", sysUser.getNickName());
            }
        }
        donatebaseinfo.put("updateperson", null);
        if (StringUtils.isNotBlank(serviceDonatebaseinfo.getUpdateBy())) {
            ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
            serviceFundflowrule.setCheckuserno(serviceDonatebaseinfo.getUpdateBy());
            List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
            donatebaseinfo.put("updateperson", serviceFundflowrules.get(0).getCheckusername());
            SysUser sysUser = sysUserMapper.selectUserByUserName(serviceDonatebaseinfo.getUpdateBy());
            if (!ObjectUtils.isEmpty(sysUser)) {
                donatebaseinfo.put("updateperson", sysUser.getNickName());
            }
        }
        donatebaseinfo.put("process", "");
        //封装serviceDonateorgan潜在捐献返回数据
@@ -312,17 +315,18 @@
                medicalevaluation.put("updatetime", serviceMedicalevaluations.get(0).getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceMedicalevaluations.get(0).getUpdateTime()) : null);
                medicalevaluation.put("createperson", null);
                if (StringUtils.isNotBlank(serviceMedicalevaluations.get(0).getCreateBy())) {
                    ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
                    serviceFundflowrule.setCheckuserno(serviceMedicalevaluations.get(0).getCreateBy());
                    List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
                    medicalevaluation.put("createperson", serviceFundflowrules.get(0).getCheckusername());
                    SysUser sysUser = sysUserMapper.selectUserByUserName(serviceMedicalevaluations.get(0).getCreateBy());
                    if (!ObjectUtils.isEmpty(sysUser)) {
                        medicalevaluation.put("createperson", sysUser.getNickName());
                    }
                }
                medicalevaluation.put("updateperson", null);
                if (StringUtils.isNotBlank(serviceMedicalevaluations.get(0).getUpdateBy())) {
                    ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
                    serviceFundflowrule.setCheckuserno(serviceMedicalevaluations.get(0).getUpdateBy());
                    List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
                    medicalevaluation.put("updateperson", serviceFundflowrules.get(0).getCheckusername());
                    SysUser sysUser = sysUserMapper.selectUserByUserName(serviceMedicalevaluations.get(0).getUpdateBy());
                    if (!ObjectUtils.isEmpty(sysUser)) {
                        medicalevaluation.put("updateperson", sysUser.getNickName());
                    }

                }
                medicalevaluation.put("process", "");
            }
@@ -341,17 +345,18 @@
                relativesconfirmation.put("updatetime", serviceRelativesconfirmations.get(0).getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceRelativesconfirmations.get(0).getUpdateTime()) : "");
                relativesconfirmation.put("createperson", null);
                if (StringUtils.isNotBlank(serviceRelativesconfirmations.get(0).getCreateBy())) {
                    ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
                    serviceFundflowrule.setCheckuserno(serviceRelativesconfirmations.get(0).getCreateBy());
                    List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
                    relativesconfirmation.put("createperson", serviceFundflowrules.get(0).getCheckusername());
                    SysUser sysUser = sysUserMapper.selectUserByUserName(serviceRelativesconfirmations.get(0).getCreateBy());
                    if (!ObjectUtils.isEmpty(sysUser)) {
                        relativesconfirmation.put("createperson", sysUser.getNickName());
                    }

                }
                relativesconfirmation.put("updateperson", null);
                if (StringUtils.isNotBlank(serviceRelativesconfirmations.get(0).getUpdateBy())) {
                    ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
                    serviceFundflowrule.setCheckuserno(serviceRelativesconfirmations.get(0).getUpdateBy());
                    List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
                    relativesconfirmation.put("updateperson", serviceFundflowrules.get(0).getCheckusername());
                    SysUser sysUser = sysUserMapper.selectUserByUserName(serviceRelativesconfirmations.get(0).getUpdateBy());
                    if (!ObjectUtils.isEmpty(sysUser)) {
                        relativesconfirmation.put("updateperson", sysUser.getNickName());
                    }
                }
                relativesconfirmation.put("process", "");
            }
@@ -371,17 +376,19 @@
                donateflowcharts.put("updatetime", serviceEthicalreviewopinionsList.get(0).getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceEthicalreviewopinionsList.get(0).getUpdateTime()) : "");
                donateflowcharts.put("createperson", null);
                if (StringUtils.isNotBlank(serviceEthicalreviewopinionsList.get(0).getCreateBy())) {
                    ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
                    serviceFundflowrule.setCheckuserno(serviceEthicalreviewopinionsList.get(0).getCreateBy());
                    List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
                    donateflowcharts.put("createperson", serviceFundflowrules.get(0).getCheckusername());
                    SysUser sysUser = sysUserMapper.selectUserByUserName(serviceEthicalreviewopinionsList.get(0).getCreateBy());
                    if (!ObjectUtils.isEmpty(sysUser)) {
                        donateflowcharts.put("createperson", sysUser.getNickName());
                    }

                }
                donateflowcharts.put("updateperson", null);
                if (StringUtils.isNotBlank(serviceEthicalreviewopinionsList.get(0).getUpdateBy())) {
                    ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
                    serviceFundflowrule.setCheckuserno(serviceEthicalreviewopinionsList.get(0).getUpdateBy());
                    List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
                    donateflowcharts.put("updateperson", serviceFundflowrules.get(0).getCheckusername());
                    SysUser sysUser = sysUserMapper.selectUserByUserName(serviceEthicalreviewopinionsList.get(0).getUpdateBy());
                    if (!ObjectUtils.isEmpty(sysUser)) {
                        donateflowcharts.put("updateperson", sysUser.getNickName());
                    }

                }
                donateflowcharts.put("process", "");
            }
@@ -401,17 +408,18 @@

                donateorgansService.put("createperson", null);
                if (StringUtils.isNotBlank(serviceDonateorgans.get(0).getCreateBy())) {
                    ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
                    serviceFundflowrule.setCheckuserno(serviceDonateorgans.get(0).getCreateBy());
                    List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
                    donateorgansService.put("createperson", serviceFundflowrules.get(0).getCheckusername());
                    SysUser sysUser = sysUserMapper.selectUserByUserName(serviceDonateorgans.get(0).getCreateBy());
                    if (!ObjectUtils.isEmpty(sysUser)) {
                        donateorgansService.put("createperson", sysUser.getNickName());
                    }

                }
                donateorgansService.put("updateperson", null);
                if (StringUtils.isNotBlank(serviceDonateorgans.get(0).getUpdateBy())) {
                    ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
                    serviceFundflowrule.setCheckuserno(serviceDonateorgans.get(0).getUpdateBy());
                    List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
                    donateorgansService.put("updateperson", serviceFundflowrules.get(0).getCheckusername());
                    SysUser sysUser = sysUserMapper.selectUserByUserName(serviceDonateorgans.get(0).getUpdateBy());
                    if (!ObjectUtils.isEmpty(sysUser)) {
                        donateorgansService.put("updateperson", sysUser.getNickName());
                    }
                }
                donateorgansService.put("process", "");
            }
@@ -429,17 +437,17 @@

                donationwitness.put("createperson", null);
                if (StringUtils.isNotBlank(serviceDonationwitness.getCreateBy())) {
                    ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
                    serviceFundflowrule.setCheckuserno(serviceDonationwitness.getCreateBy());
                    List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
                    donationwitness.put("createperson", serviceFundflowrules.get(0).getCheckusername());
                    SysUser sysUser = sysUserMapper.selectUserByUserName(serviceDonationwitness.getCreateBy());
                    if (!ObjectUtils.isEmpty(sysUser)) {
                        donationwitness.put("createperson", sysUser.getNickName());
                    }
                }
                donationwitness.put("updateperson", null);
                if (StringUtils.isNotBlank(serviceDonationwitness.getUpdateBy())) {
                    ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
                    serviceFundflowrule.setCheckuserno(serviceDonationwitness.getUpdateBy());
                    List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
                    donationwitness.put("updateperson", serviceFundflowrules.get(0).getCheckusername());
                    SysUser sysUser = sysUserMapper.selectUserByUserName(serviceDonationwitness.getUpdateBy());
                    if (!ObjectUtils.isEmpty(sysUser)) {
                        donationwitness.put("updateperson", sysUser.getNickName());
                    }
                }

                donationwitness.put("process", "");
@@ -460,17 +468,17 @@

                donatecompletioninfo.put("createperson", null);
                if (StringUtils.isNotBlank(serviceDonatecompletioninfos.get(0).getCreateBy())) {
                    ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
                    serviceFundflowrule.setCheckuserno(serviceDonatecompletioninfos.get(0).getCreateBy());
                    List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
                    donatecompletioninfo.put("createperson", serviceFundflowrules.get(0).getCheckusername());
                    SysUser sysUser = sysUserMapper.selectUserByUserName(serviceDonatecompletioninfos.get(0).getCreateBy());
                    if (!ObjectUtils.isEmpty(sysUser)) {
                        donatecompletioninfo.put("createperson", sysUser.getNickName());
                    }
                }
                donatecompletioninfo.put("updateperson", null);
                if (StringUtils.isNotBlank(serviceDonatecompletioninfos.get(0).getUpdateBy())) {
                    ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
                    serviceFundflowrule.setCheckuserno(serviceDonatecompletioninfos.get(0).getUpdateBy());
                    List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
                    donatecompletioninfo.put("updateperson", serviceFundflowrules.get(0).getCheckusername());
                    SysUser sysUser = sysUserMapper.selectUserByUserName(serviceDonatecompletioninfos.get(0).getUpdateBy());
                    if (!ObjectUtils.isEmpty(sysUser)) {
                        donatecompletioninfo.put("updateperson", sysUser.getNickName());
                    }
                }

                donatecompletioninfo.put("process", "");

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

@@ -6,7 +6,10 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.project.domain.*;
import com.ruoyi.project.domain.vo.*;
@@ -145,15 +148,6 @@
                map_accept.put(org_accept.getCity(), map_accept.getOrDefault(org_accept.getCity(), 0) + 1);
            }
        }
//        List<BasePrcaddressDict> city = basePrcaddressDictMapper.getAllCityOfZJ();
//        for(BasePrcaddressDict c : city){
//            NumberOfOrgans numberOfOrgans = new NumberOfOrgans();
//            numberOfOrgans.setDistrict(c.getAreaname());
//            numberOfOrgans.setNumberOfHospitals(baseOrganizationMapper.getOrganizationByCity(c.getAreanumber()));
//            numberOfOrgans.setDonateNumber(map_donate.getOrDefault(c.getAreaname(),0));
//            numberOfOrgans.setAcceptNumber(map_accept.getOrDefault(c.getAreaname(),0));
//            list.add(numberOfOrgans);
//        }

        List<String> regions = new ArrayList<String>();
        regions.add("0");
@@ -771,17 +765,6 @@
            log.info("serviceDonateorgan的数据为: {}", serviceDonateorgan);
            boolean save = this.save(serviceDonateorgan);


//            //保存service_organallocation
//            ServiceOrganallocation serviceOrganallocation = new ServiceOrganallocation();
//            serviceOrganallocation.setAgeunit(serviceDonateorgan.getAgeunit());
//            serviceOrganallocation.setApplicanttime(serviceDonateorgan.getApplicanttime());
//            serviceOrganallocation.setIdcardno(serviceDonateorgan.getIdcardno());
//            serviceOrganallocation.setIdcardtype(Long.valueOf(serviceDonateorgan.getIdcardtype()));
//            serviceOrganallocation.setOrganid(serviceDonateorgan.getId());
//            serviceOrganallocation.setOrgannumber(serviceDonateorgan.getOrgannumber());
//            log.info("serviceOrganallocation的数据为: {}", serviceOrganallocation);
//            serviceOrganallocationService.save(serviceOrganallocation);
        }
        return serviceDonateorgans;
    }
@@ -799,52 +782,6 @@
        return true;
    }


//    @Override
//    public List<DonateByRegionVO> OrgansOfHospitalByMonth() {
//        List<BaseOrganization> baseOrganizations = baseOrganizationMapper.getHospitalList();
//        List<DonateByRegionVO> l = new ArrayList<>();
//        List<ServiceDonatebaseinfo> serviceDonatebaseinfos = serviceDonatebaseinfoMapper.getAllDonateBaseInfo();
//
//        for(BaseOrganization b : baseOrganizations){
//            HashMap<String, Integer> map_baseinfo_count = new HashMap<String, Integer>();
//            HashMap<String, Integer> map_completion_count = new HashMap<String, Integer>();
//            //List<ServiceDonatebaseinfo> serviceDonatebaseinfos = serviceDonatebaseinfoMapper.getBaseInfoByHospital(b.getOrganizationid());
//            List<ServiceDonatebaseinfo> serviceDonatebaseinfoOfThisHospital = new ArrayList<>();
//            for(ServiceDonatebaseinfo sd : serviceDonatebaseinfos){
//                if(b.getOrganizationid().equals(sd.getTreatmenthospitalno())){
//                    serviceDonatebaseinfoOfThisHospital.add(sd);
//                }
//            }
//            for(ServiceDonatebaseinfo s : serviceDonatebaseinfoOfThisHospital){
//                Date dt = s.getReporttime();
//                SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
//                String date = formatter.format(dt);
//                String month = date.substring(0, 7);
//                map_baseinfo_count.put(month, map_baseinfo_count.getOrDefault(month,0) + 1);
//                ServiceDonatecompletioninfo sc = serviceDonatecompletioninfoMapper.getByInfoId(s.getId());
//                if(sc != null){
//                    map_completion_count.put(month, map_completion_count.getOrDefault(month,0) + 1);
//                }
//                else{
//                    map_completion_count.put(month, map_completion_count.getOrDefault(month,0));
//                }
//
//            }
//
//            for(Map.Entry<String, Integer> entry: map_baseinfo_count.entrySet()) {
//                DonateByRegionVO d = new DonateByRegionVO();
//                d.setHospitalNumber(b.getOrganizationid());
//                d.setHospitalName(b.getOrganizationname());
//                d.setRegionLevel(b.getRegionallevel());
//                d.setMonth(entry.getKey());
//                d.setBaseInfoCount(entry.getValue());
//                d.setCompletionCount(map_completion_count.get(entry.getKey()));
//                l.add(d);
//            }
//        }
//        return l;
//    }

    @Override
    public List<DonateNumberByMonth> getDonatePeopleByMonth(TimeVO timeVO) {
@@ -979,5 +916,20 @@
        return l;
    }

    @Override
    public List<ServiceDonateorgan> countList(ServiceDonateorgan serviceDonateorgan) {
        SysUser user = SecurityUtils.getLoginUser().getUser();
        List<SysRole> l = user.getRoles();
        Boolean b = false;
        for (SysRole r : l) {
            if (r.getRoleId().longValue() == 3) {
                b = true;
            }
        }
        if (b) {
            serviceDonateorgan.setCreateBy(user.getUserName());
        }
        return serviceDonateorganMapper.countList(serviceDonateorgan);
    }

}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,133 @@
package com.ruoyi.project.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.ServiceFundtax;
import com.ruoyi.project.mapper.ServiceFundtaxMapper;
import com.ruoyi.project.service.IServiceFundtaxService;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * ä¸“家费用算税申请主Service业务层处理
 * 
 * @author ruoyi
 * @date 2024-03-13
 */
@Service
public class ServiceFundtaxServiceImpl extends ServiceImpl<ServiceFundtaxMapper, ServiceFundtax> implements IServiceFundtaxService
{


    /**
     * æŸ¥è¯¢ä¸“家费用算税申请主列表
     * 
     * @param serviceFundtax ä¸“家费用算税申请主
     * @return ä¸“家费用算税申请主
     */
    @Override
    public List<ServiceFundtax> queryList(ServiceFundtax serviceFundtax) {
        LambdaQueryWrapper<ServiceFundtax> wrappers = Wrappers.lambdaQuery();
        if (StringUtils.isNotBlank(serviceFundtax.getApplyno())){
            wrappers.eq(ServiceFundtax::getApplyno ,serviceFundtax.getApplyno());
        }
        if (serviceFundtax.getTaxedtime() != null){
            wrappers.eq(ServiceFundtax::getTaxedtime ,serviceFundtax.getTaxedtime());
        }
        if (StringUtils.isNotBlank(serviceFundtax.getUserno())){
            wrappers.eq(ServiceFundtax::getUserno ,serviceFundtax.getUserno());
        }
        if (StringUtils.isNotBlank(serviceFundtax.getUsername())){
            wrappers.like(ServiceFundtax::getUsername ,serviceFundtax.getUsername());
        }
        if (StringUtils.isNotBlank(serviceFundtax.getDeptmentno())){
            wrappers.eq(ServiceFundtax::getDeptmentno ,serviceFundtax.getDeptmentno());
        }
        if (StringUtils.isNotBlank(serviceFundtax.getDeptmentname())){
            wrappers.like(ServiceFundtax::getDeptmentname ,serviceFundtax.getDeptmentname());
        }
        if (StringUtils.isNotBlank(serviceFundtax.getManagerno())){
            wrappers.eq(ServiceFundtax::getManagerno ,serviceFundtax.getManagerno());
        }
        if (StringUtils.isNotBlank(serviceFundtax.getManagername())){
            wrappers.like(ServiceFundtax::getManagername ,serviceFundtax.getManagername());
        }
        if (serviceFundtax.getPretaxamount() != null){
            wrappers.eq(ServiceFundtax::getPretaxamount ,serviceFundtax.getPretaxamount());
        }
        if (serviceFundtax.getTaxedamount() != null){
            wrappers.eq(ServiceFundtax::getTaxedamount ,serviceFundtax.getTaxedamount());
        }
        if (serviceFundtax.getTaxamount() != null){
            wrappers.eq(ServiceFundtax::getTaxamount ,serviceFundtax.getTaxamount());
        }
        if (serviceFundtax.getMedicalcost() != null){
            wrappers.eq(ServiceFundtax::getMedicalcost ,serviceFundtax.getMedicalcost());
        }
        if (serviceFundtax.getBodymaintaincost() != null){
            wrappers.eq(ServiceFundtax::getBodymaintaincost ,serviceFundtax.getBodymaintaincost());
        }
        if (serviceFundtax.getOrgangaincost() != null){
            wrappers.eq(ServiceFundtax::getOrgangaincost ,serviceFundtax.getOrgangaincost());
        }
        if (serviceFundtax.getOrganmaintaincost() != null){
            wrappers.eq(ServiceFundtax::getOrganmaintaincost ,serviceFundtax.getOrganmaintaincost());
        }
        if (StringUtils.isNotBlank(serviceFundtax.getRemark())){
            wrappers.eq(ServiceFundtax::getRemark ,serviceFundtax.getRemark());
        }
        if (serviceFundtax.getRecordstatus() != null){
            wrappers.eq(ServiceFundtax::getRecordstatus ,serviceFundtax.getRecordstatus());
        }
        if (serviceFundtax.getCheckstatus() != null){
            wrappers.eq(ServiceFundtax::getCheckstatus ,serviceFundtax.getCheckstatus());
        }
        if (serviceFundtax.getFlowlevel() != null){
            wrappers.eq(ServiceFundtax::getFlowlevel ,serviceFundtax.getFlowlevel());
        }
        if (serviceFundtax.getBackflowlevel() != null){
            wrappers.eq(ServiceFundtax::getBackflowlevel ,serviceFundtax.getBackflowlevel());
        }
        if (StringUtils.isNotBlank(serviceFundtax.getIsdistribute())){
            wrappers.eq(ServiceFundtax::getIsdistribute ,serviceFundtax.getIsdistribute());
        }
        if (StringUtils.isNotBlank(serviceFundtax.getRiqi())){
            wrappers.eq(ServiceFundtax::getRiqi ,serviceFundtax.getRiqi());
        }
        if (StringUtils.isNotBlank(serviceFundtax.getOpochecker())){
            wrappers.eq(ServiceFundtax::getOpochecker ,serviceFundtax.getOpochecker());
        }
        if (StringUtils.isNotBlank(serviceFundtax.getFinvicepresident())){
            wrappers.eq(ServiceFundtax::getFinvicepresident ,serviceFundtax.getFinvicepresident());
        }
        if (StringUtils.isNotBlank(serviceFundtax.getBusvicepresident())){
            wrappers.eq(ServiceFundtax::getBusvicepresident ,serviceFundtax.getBusvicepresident());
        }
        if (StringUtils.isNotBlank(serviceFundtax.getPresident())){
            wrappers.eq(ServiceFundtax::getPresident ,serviceFundtax.getPresident());
        }
        if (StringUtils.isNotBlank(serviceFundtax.getOfficedirector())){
            wrappers.eq(ServiceFundtax::getOfficedirector ,serviceFundtax.getOfficedirector());
        }
        if (StringUtils.isNotBlank(serviceFundtax.getFinancedirector())){
            wrappers.eq(ServiceFundtax::getFinancedirector ,serviceFundtax.getFinancedirector());
        }
        if (StringUtils.isNotBlank(serviceFundtax.getFinancechecher())){
            wrappers.eq(ServiceFundtax::getFinancechecher ,serviceFundtax.getFinancechecher());
        }
        if (StringUtils.isNotBlank(serviceFundtax.getUploadflag())){
            wrappers.eq(ServiceFundtax::getUploadflag ,serviceFundtax.getUploadflag());
        }
        if (serviceFundtax.getUploadtime() != null){
            wrappers.eq(ServiceFundtax::getUploadtime ,serviceFundtax.getUploadtime());
        }
        if (StringUtils.isNotBlank(serviceFundtax.getUpdownremark())){
            wrappers.eq(ServiceFundtax::getUpdownremark ,serviceFundtax.getUpdownremark());
        }
        return this.list(wrappers);
    }

}

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

@@ -529,5 +529,48 @@
        and OrganGetTime >= #{starttime} and OrganGetTime &lt;= #{endtime}
    </select>

    <select id="countList" parameterType="com.ruoyi.project.domain.ServiceOrganallocation" resultMap="ServiceDonateorganResult">
        select service_donateorgan.* from service_donateorgan
        LEFT JOIN service_donatebaseinfo on service_donateorgan.InfoID=service_donatebaseinfo.ID
        LEFT JOIN base_organization on base_organization.OrganizationID = service_donatebaseinfo.TreatmentHospitalNo
        <where>
            <if test="id != null "> and service_donateorgan.ID = #{id}</if>
            <if test="organnumber != null  and organnumber != ''"> and service_donateorgan.OrganNumber = #{organnumber}</if>
            <if test="applicantuserid != null  and applicantuserid != ''"> and service_donateorgan.ApplicantUserID = #{applicantuserid}</if>
            <if test="applicantusername != null  and applicantusername != ''"> and service_donateorgan.ApplicantUserName like concat('%', #{applicantusername}, '%')</if>
            <if test="applicanttime != null "> and service_donateorgan.ApplicantTime = #{applicanttime}</if>
            <if test="checkuserid != null  and checkuserid != ''"> and service_donateorgan.CheckUserID = #{checkuserid}</if>
            <if test="checkusername != null  and checkusername != ''"> and service_donateorgan.CheckUserName like concat('%', #{checkusername}, '%')</if>
            <if test="checktime != null "> and service_donateorgan.CheckTime = #{checktime}</if>
            <if test="checksuggestion != null  and checksuggestion != ''"> and service_donateorgan.CheckSuggestion = #{checksuggestion}</if>
            <if test="allocationstatus != null "> and service_donateorgan.AllocationStatus = #{allocationstatus}</if>
            <if test="name != null  and name != ''"> and service_donateorgan.Name like concat('%', #{name}, '%')</if>
            <if test="sex != null "> and service_donateorgan.Sex = #{sex}</if>
            <if test="idcardtype != null "> and service_donateorgan.IDCardType = #{idcardtype}</if>
            <if test="idcardno != null  and idcardno != ''"> and service_donateorgan.IDCardNo = #{idcardno}</if>
            <if test="age != null "> and service_donateorgan.Age = #{age}</if>
            <if test="ageunit != null  and ageunit != ''"> and service_donateorgan.AgeUnit = #{ageunit}</if>
            <if test="birthday != null  and birthday != ''"> and service_donateorgan.Birthday = #{birthday}</if>
            <if test="phone != null  and phone != ''"> and service_donateorgan.Phone = #{phone}</if>
            <if test="residenceaddress != null  and residenceaddress != ''"> and service_donateorgan.ResidenceAddress = #{residenceaddress}</if>
            <if test="residenceprovince != null  and residenceprovince != ''"> and service_donateorgan.ResidenceProvince = #{residenceprovince}</if>
            <if test="residenceprovincename != null  and residenceprovincename != ''"> and service_donateorgan.ResidenceProvinceName like concat('%', #{residenceprovincename}, '%')</if>
            <if test="residencecity != null  and residencecity != ''"> and service_donateorgan.ResidenceCity = #{residencecity}</if>
            <if test="residencecityname != null  and residencecityname != ''"> and service_donateorgan.ResidenceCityName like concat('%', #{residencecityname}, '%')</if>
            <if test="residencetown != null  and residencetown != ''"> and service_donateorgan.ResidenceTown = #{residencetown}</if>
            <if test="residencetownname != null  and residencetownname != ''"> and service_donateorgan.ResidenceTownName like concat('%', #{residencetownname}, '%')</if>
            <if test="residencecommunity != null  and residencecommunity != ''"> and service_donateorgan.ResidenceCommunity = #{residencecommunity}</if>
            <if test="residencecommunityname != null  and residencecommunityname != ''"> and service_donateorgan.ResidenceCommunityName like concat('%', #{residencecommunityname}, '%')</if>
            <if test="residencecountycode != null  and residencecountycode != ''"> and service_donateorgan.ResidenceCountyCode = #{residencecountycode}</if>
            <if test="residencecountyname != null  and residencecountyname != ''"> and service_donateorgan.ResidenceCountyName like concat('%', #{residencecountyname}, '%')</if>
            <if test="createBy != null  and createBy != ''"> and service_donateorgan.create_by = #{createBy}</if>
            <if test="starttime != null "> and `service_donateorgan`.ApplicantTime >= #{starttime} </if>
            <if test="endtime != null ">  and `service_donateorgan`.ApplicantTime &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>
        </where>

        order by create_time desc
    </select>

</mapper>

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

@@ -168,6 +168,7 @@
        `base_organization`.`OrganizationID` = `service_donatebaseinfo`.`TreatmentHospitalNo`

        <where>
            service_donationwitness.del_flag=0
            <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>
@@ -187,7 +188,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>
            <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

@@ -56,65 +56,68 @@
    </select>
    <select id="selectVOList" resultType="com.ruoyi.project.domain.vo.EthicalReviewVO">
        SELECT
        `service_donatebaseinfo`.`ID` AS `ID`,
        `service_donatebaseinfo`.`Name` AS `Name`,
        `service_donatebaseinfo`.`Sex` AS `Sex`,
        `service_donatebaseinfo`.`IDCardNo` AS `IDCardNo`,
        `service_donatebaseinfo`.`Age` AS `Age`,
        `service_donatebaseinfo`.`Birthday` AS `Birthday`,
        `service_donatebaseinfo`.`Nationality` AS `Nationality`,
        `service_donatebaseinfo`.`Nation` AS `Nation`,
        `service_donatebaseinfo`.`RegisterAddress` AS `RegisterAddress`,
        `service_donatebaseinfo`.`RegisterProvince` AS `RegisterProvince`,
        `service_donatebaseinfo`.`RegisterProvinceName` AS `RegisterProvinceName`,
        `service_donatebaseinfo`.`RegisterCity` AS `RegisterCity`,
        `service_donatebaseinfo`.`RegisterCityName` AS `RegisterCityName`,
        `service_donatebaseinfo`.`RegisterTown` AS `RegisterTown`,
        `service_donatebaseinfo`.`RegisterTownName` AS `RegisterTownName`,
        `service_donatebaseinfo`.`RegisterCommunity` AS `RegisterCommunity`,
        `service_donatebaseinfo`.`RegisterCommunityName` AS `RegisterCommunityName`,
        `service_donatebaseinfo`.`RegisterCountyCode` AS `RegisterCountyCode`,
        `service_donatebaseinfo`.`RegisterCountyName` AS `RegisterCountyName`,
        `service_donatebaseinfo`.`RecordState` AS `RecordState`,
        `service_donatebaseinfo`.`TreatmentHospitalNo` AS `TreatmentHospitalNo`,
        `service_donatebaseinfo`.`TreatmentHospitalName` AS `TreatmentHospitalName`,
        `service_donatebaseinfo`.`TreatmentDeptName` AS `TreatmentDeptName`,
        `service_donatebaseinfo`.`DiagnosisNo` AS `DiagnosisNo`,
        `service_donatebaseinfo`.`DiagnosisName` AS `DiagnosisName`,
        `service_donatebaseinfo`.`DonorNo` AS `DonorNo`,
        `service_donatebaseinfo`.`ReporterNo` AS `ReporterNo`,
        `service_donatebaseinfo`.`ReporterName` AS `ReporterName`,
        `service_donatebaseinfo`.`ReporterPhone` AS `ReporterPhone`,
        `service_donatebaseinfo`.`ReportTime` AS `ReportTime`,
        `service_donatebaseinfo`.`BloodType` AS `BloodType`,
        `service_donatebaseinfo`.`RhYin` AS `RhYin`,
        `service_donatebaseinfo`.`InpatientNo` AS `InpatientNo`,
        `service_donatebaseinfo`.`IllnessOverview` AS `IllnessOverview`,
        `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`,
        `service_donateflowchart`.`del_flag` AS `delFlag`,
        `service_donateflowchart`.`create_by` AS `createBy`,
        `service_donateflowchart`.`create_time` AS `createTime`,
        `service_donateflowchart`.`update_by` AS `updateBy`,
        `service_donateflowchart`.`update_time` AS `updateTime`,
        `service_donateflowchart`.`FlowName` AS `FlowName`,
        `service_donateflowchart`.`FlowAnnex` AS `FlowAnnex`,
        `service_donateflowchart`.`FlowContent` AS `FlowContent`,
        `service_donateflowchart`.`FlowConclusion` AS `FlowConclusion`
        service_donatebaseinfo.ID as id,
        service_donatebaseinfo.`Name` as name,
        service_donatebaseinfo.IDCardNo as idcardno,
        service_donatebaseinfo.IDCardType as idcardtype,
        service_donatebaseinfo.Sex as sex,
        service_donatebaseinfo.Age as age,
        service_donatebaseinfo.AgeUnit as ageUnit,
        service_donatebaseinfo.Birthday as irthday,
        service_donatebaseinfo.Phone as phone,
        service_donatebaseinfo.Nationality as nationality,
        service_donatebaseinfo.NativePlace as nativePlace,
        service_donatebaseinfo.Nation as nation,
        service_donatebaseinfo.RegisterAddress as registerAddress,
        service_donatebaseinfo.RegisterProvince as registerProvince,
        service_donatebaseinfo.RegisterProvinceName as registerProvinceName,
        service_donatebaseinfo.RegisterCity as registerCity,
        service_donatebaseinfo.RegisterCityName aS registerCityName,
        service_donatebaseinfo.RegisterTown as registerTown,
        service_donatebaseinfo.RegisterTownName as registerTownName,
        service_donatebaseinfo.RegisterCommunity as registerCommunity,
        service_donatebaseinfo.RegisterCommunityName as registerCommunityName,
        service_donatebaseinfo.RegisterCountyCode as registerCountyCode,
        service_donatebaseinfo.RegisterCountyName as registerCountyName,
        service_donatebaseinfo.RecordState as recordState,
        service_donatebaseinfo.TreatmentHospitalNo as treatmentHospitalNo,
        service_donatebaseinfo.TreatmentHospitalName as treatmentHospitalName,
        service_donatebaseinfo.TreatmentDeptName as treatmentDeptName,
        service_donatebaseinfo.DiagnosisNo as diagnosisNo,
        service_donatebaseinfo.DiagnosisName as diagnosisName,
        service_donatebaseinfo.BloodType as bloodType,
        service_donatebaseinfo.RhYin as rhYin,
        service_donatebaseinfo.InpatientNo as inpatientNo,
        service_donatebaseinfo.DonorNo as donorNo,
        service_donatebaseinfo.DonationCategory as donationcategory,
        service_donatebaseinfo.IllnessOverview as illnessoverview,
        service_donatebaseinfo.DiseaseType as diseasetype,
        service_donatebaseinfo.DiseaseType_Other as diseasetypeOther,
        service_donatebaseinfo.create_by as createBy,
        service_donatebaseinfo.create_time as createTime,
        service_donatebaseinfo.del_flag as delFlag,
        service_donatebaseinfo.workflow,
        service_donatebaseinfo.termination_case as terminationCase,
        service_donatebaseinfo.donatetime,
        service_donatebaseinfo.donateno,
        service_donatebaseinfo.deptid,
        service_donatebaseinfo.deptname,
        service_ethicalreviewopinions.ID as fcid,
        service_ethicalreviewopinions.ExpertOpinion as expertopinion,
        service_ethicalreviewopinions.ExpertConclusion as expertconclusion,
        service_ethicalreviewopinions.ExpertName as expertname,
        service_ethicalreviewopinions.ConclusionTime as conclusiontime,
        service_ethicalreviewopinions.ConclusionAnnex as conclusionannex,
        service_ethicalreviewopinions.ConclusionOrder as conclusionorder
        FROM
        service_donatebaseinfo
        LEFT JOIN
        service_ethicalreviewopinions
        ON
        service_donatebaseinfo.ID = service_ethicalreviewopinions.InfoID
        LEFT JOIN base_organization ON
        base_organization.OrganizationID = service_donatebaseinfo.TreatmentHospitalNo

        `service_donatebaseinfo`
        LEFT JOIN `service_donateflowchart` ON
        `service_donatebaseinfo`.`ID` = `service_donateflowchart`.`InfoID`
        AND `service_donateflowchart`.`FlowName` = '伦理审查'
        LEFT JOIN `base_organization` ON
        `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}, '%')
@@ -129,17 +132,17 @@
            <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="starttime != null ">and `service_ethicalreviewopinions`.ConclusionTime >= #{starttime}</if>
            <if test="endtime != null ">and `service_ethicalreviewopinions`.ConclusionTime &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="fcid != null ">and `service_donateflowchart`.`ID` = #{fcid}</if>
            <if test="fcid != null ">and `service_ethicalreviewopinions`.`ID` = #{fcid}</if>
            <if test="workflow != null "> and `service_donatebaseinfo`.`workflow` = #{workflow}</if>
        </where>

        order by `service_donateflowchart`.`create_time` desc
        order by `service_ethicalreviewopinions`.`ConclusionTime` desc

    </select>
    <select id="countNumber" resultType="java.lang.Integer">

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,135 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.mapper.ServiceFundtaxMapper">

    <resultMap type="com.ruoyi.project.domain.ServiceFundtax" id="ServiceFundtaxResult">
        <result property="id" column="ID"/>
        <result property="applyno" column="ApplyNo"/>
        <result property="taxedtime" column="taxedtime"/>
        <result property="userno" column="UserNo"/>
        <result property="username" column="UserName"/>
        <result property="deptmentno" column="DeptmentNo"/>
        <result property="deptmentname" column="DeptmentName"/>
        <result property="managerno" column="ManagerNo"/>
        <result property="managername" column="ManagerName"/>
        <result property="pretaxamount" column="Pretaxamount"/>
        <result property="taxedamount" column="TaxedAmount"/>
        <result property="taxamount" column="TaxAmount"/>
        <result property="medicalcost" column="MedicalCost"/>
        <result property="bodymaintaincost" column="BodyMaintainCost"/>
        <result property="organgaincost" column="OrganGainCost"/>
        <result property="organmaintaincost" column="OrganMaintainCost"/>
        <result property="remark" column="Remark"/>
        <result property="recordstatus" column="RecordStatus"/>
        <result property="checkstatus" column="checkstatus"/>
        <result property="flowlevel" column="FlowLevel"/>
        <result property="backflowlevel" column="backFlowLevel"/>
        <result property="isdistribute" column="Isdistribute"/>
        <result property="riqi" column="riqi"/>
        <result property="opochecker" column="OPOchecker"/>
        <result property="finvicepresident" column="FinVicePresident"/>
        <result property="busvicepresident" column="BusVicePresident"/>
        <result property="president" column="president"/>
        <result property="officedirector" column="OfficeDirector"/>
        <result property="financedirector" column="FinanceDirector"/>
        <result property="financechecher" column="FinanceChecher"/>
        <result property="delFlag" column="del_flag"/>
        <result property="createBy" column="create_by"/>
        <result property="createTime" column="create_time"/>
        <result property="updateBy" column="update_by"/>
        <result property="updateTime" column="update_time"/>
        <result property="uploadflag" column="uploadflag"/>
        <result property="uploadtime" column="uploadtime"/>
        <result property="updownremark" column="updownremark"/>
    </resultMap>

    <sql id="selectServiceFundtaxVo">
        select ID,
               ApplyNo,
               taxedtime,
               UserNo,
               UserName,
               DeptmentNo,
               DeptmentName,
               ManagerNo,
               ManagerName,
               Pretaxamount,
               TaxedAmount,
               TaxAmount,
               MedicalCost,
               BodyMaintainCost,
               OrganGainCost,
               OrganMaintainCost,
               Remark,
               RecordStatus,
               checkstatus,
               FlowLevel,
               backFlowLevel,
               Isdistribute,
               riqi,
               OPOchecker,
               FinVicePresident,
               BusVicePresident,
               president,
               OfficeDirector,
               FinanceDirector,
               FinanceChecher,
               del_flag,
               create_by,
               create_time,
               update_by,
               update_time,
               uploadflag,
               uploadtime,
               updownremark
        from service_fundtax
    </sql>

    <select id="selectServiceFundtaxList" parameterType="com.ruoyi.project.domain.ServiceFundtax"
            resultMap="ServiceFundtaxResult">
        <include refid="selectServiceFundtaxVo"/>
        <where>
            <if test="applyno != null  and applyno != ''">and ApplyNo = #{applyno}</if>
            <if test="taxedtime != null ">and taxedtime = #{taxedtime}</if>
            <if test="userno != null  and userno != ''">and UserNo = #{userno}</if>
            <if test="username != null  and username != ''">and UserName like concat('%', #{username}, '%')</if>
            <if test="deptmentno != null  and deptmentno != ''">and DeptmentNo = #{deptmentno}</if>
            <if test="deptmentname != null  and deptmentname != ''">and DeptmentName like concat('%', #{deptmentname},
                '%')
            </if>
            <if test="managerno != null  and managerno != ''">and ManagerNo = #{managerno}</if>
            <if test="managername != null  and managername != ''">and ManagerName like concat('%', #{managername},
                '%')
            </if>
            <if test="pretaxamount != null ">and Pretaxamount = #{pretaxamount}</if>
            <if test="taxedamount != null ">and TaxedAmount = #{taxedamount}</if>
            <if test="taxamount != null ">and TaxAmount = #{taxamount}</if>
            <if test="medicalcost != null ">and MedicalCost = #{medicalcost}</if>
            <if test="bodymaintaincost != null ">and BodyMaintainCost = #{bodymaintaincost}</if>
            <if test="organgaincost != null ">and OrganGainCost = #{organgaincost}</if>
            <if test="organmaintaincost != null ">and OrganMaintainCost = #{organmaintaincost}</if>
            <if test="remark != null  and remark != ''">and Remark = #{remark}</if>
            <if test="recordstatus != null ">and RecordStatus = #{recordstatus}</if>
            <if test="checkstatus != null ">and checkstatus = #{checkstatus}</if>
            <if test="flowlevel != null ">and FlowLevel = #{flowlevel}</if>
            <if test="backflowlevel != null ">and backFlowLevel = #{backflowlevel}</if>
            <if test="isdistribute != null  and isdistribute != ''">and Isdistribute = #{isdistribute}</if>
            <if test="riqi != null  and riqi != ''">and riqi = #{riqi}</if>
            <if test="opochecker != null  and opochecker != ''">and OPOchecker = #{opochecker}</if>
            <if test="finvicepresident != null  and finvicepresident != ''">and FinVicePresident = #{finvicepresident}
            </if>
            <if test="busvicepresident != null  and busvicepresident != ''">and BusVicePresident = #{busvicepresident}
            </if>
            <if test="president != null  and president != ''">and president = #{president}</if>
            <if test="officedirector != null  and officedirector != ''">and OfficeDirector = #{officedirector}</if>
            <if test="financedirector != null  and financedirector != ''">and FinanceDirector = #{financedirector}</if>
            <if test="financechecher != null  and financechecher != ''">and FinanceChecher = #{financechecher}</if>
            <if test="uploadflag != null  and uploadflag != ''">and uploadflag = #{uploadflag}</if>
            <if test="uploadtime != null ">and uploadtime = #{uploadtime}</if>
            <if test="updownremark != null  and updownremark != ''">and updownremark = #{updownremark}</if>
        </where>
    </select>

</mapper>

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

@@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.mapper.ServiceOrganallocationMapper">
    

    <resultMap type="com.ruoyi.project.domain.ServiceOrganallocation" id="ServiceOrganallocationResult">
        <result property="id"    column="ID"    />
        <result property="organid"    column="OrganID"    />