yxh
3 天以前 88d0598e43a959375187485891a6cf13712ac768
修改了统计
已修改21个文件
322 ■■■■■ 文件已修改
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecomporganController.java 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFunddetailController.java 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/SpStatCaseController.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/SpStatExpenseController.java 37 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatecomporgan.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatBonus.java 32 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatCase.java 81 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatCaseReq.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatExpense.java 76 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatExpenseReq.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/mapper/SpstatCaseMapper.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/mapper/SpstatExpenseMapper.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailServiceImpl.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/SpstatCaseServiceImpl.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/SpstatExpenseServiceImpl.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/resources/mapper/project/ServiceDonatecomporganMapper.xml 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessorganMapper.xml 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/resources/mapper/project/SpStatBonusMapper.xml 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/resources/mapper/project/SpstatCaseMapper.xml 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/resources/mapper/project/SpstatExpenseMapper.xml 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecomporganController.java
@@ -166,6 +166,7 @@
                i = serviceDonatecomporganService.updateById(serviceDonatecompletion);
            }
            if (i) {
                serviceDonorchargeorgan.setId(null);
                QueryWrapper<ServiceDonorchargeorgan> queryWrapper = new QueryWrapper();
                queryWrapper.eq("InfoID", serviceDonorchargeorgan.getInfoid())
                        .eq("OrganNo", serviceDonorchargeorgan.getOrganno());
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFunddetailController.java
@@ -11,6 +11,7 @@
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.project.domain.FunddetailReqVo;
import com.ruoyi.project.domain.ServiceFunddetail;
import com.ruoyi.project.domain.SpStatBonus;
import com.ruoyi.project.domain.SpStatBonusReq;
import com.ruoyi.project.domain.vo.TaxMoneyByItemEO;
import com.ruoyi.project.domain.vo.TaxMoneySumEO;
@@ -22,6 +23,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.ZoneId;
import java.time.temporal.TemporalAdjusters;
@@ -220,4 +222,24 @@
        startPage();
        return getDataTable(serviceFunddetailService.getListBySpStatBonus(spStatBonusReq));
    }
    /**
     * 导出绩效奖金统计
     */
    @ApiOperation("导出绩效奖金统计")
    @Log(title = "绩效统计", businessType = BusinessType.EXPORT)
    @GetMapping("/exportBonus")
    public AjaxResult exportBonus(SpStatBonusReq spStatBonusReq) {
        List<SpStatBonus> list = serviceFunddetailService.getListBySpStatBonus(spStatBonusReq);
        // 金额 0.00 不显示
        for (SpStatBonus row : list) {
            row.setAmount(blankZero(row.getAmount()));
        }
        ExcelUtil<SpStatBonus> util = new ExcelUtil<SpStatBonus>(SpStatBonus.class);
        return util.exportExcel(list, "绩效统计数据");
    }
    private BigDecimal blankZero(BigDecimal value) {
        return (value == null || value.compareTo(BigDecimal.ZERO) == 0) ? null : value;
    }
}
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/SpStatCaseController.java
@@ -72,5 +72,17 @@
        return getDataTable(spstatCaseService.getListBypower(spStatCaseReq));
    }
    /**
     * 导出案例统计
     */
    @ApiOperation("导出案例统计")
    @Log(title = "案例统计", businessType = BusinessType.EXPORT)
    @GetMapping("/export")
    public AjaxResult export(SpStatCaseReq spStatCaseReq) {
        List<SpStatCase> list = spstatCaseService.getListBypower(spStatCaseReq);
        ExcelUtil<SpStatCase> util = new ExcelUtil<SpStatCase>(SpStatCase.class);
        return util.exportExcel(list, "案例统计数据");
    }
}
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/SpStatExpenseController.java
@@ -1,19 +1,26 @@
package com.ruoyi.web.controller.project;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.project.domain.SpStatCaseReq;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.project.domain.SpStatExpense;
import com.ruoyi.project.domain.SpStatExpenseReq;
import com.ruoyi.project.service.SpstatCaseService;
import com.ruoyi.project.service.SpstatExpenseService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
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.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.math.BigDecimal;
import java.util.List;
/**
 * 报销统计
@@ -31,7 +38,7 @@
    SpstatExpenseService spstatExpenseService;
    /**
     * 查询案例统计
     * 查询费用统计
     */
    @ApiOperation("查询报销统计")
    @PostMapping("/spStatExpenselist")
@@ -40,5 +47,29 @@
        return getDataTable(spstatExpenseService.getListBySpstatExpense(spStatExpenseReq));
    }
    /**
     * 导出费用统计
     */
    @ApiOperation("导出费用统计")
    @Log(title = "费用统计", businessType = BusinessType.EXPORT)
    @GetMapping("/export")
    public AjaxResult export(SpStatExpenseReq spStatExpenseReq) {
        List<SpStatExpense> list = spstatExpenseService.getListBySpstatExpense(spStatExpenseReq);
        // 金额保留 2 位小数;0.00 不显示(置空)
        for (SpStatExpense row : list) {
            row.setAmount(blankZero(row.getAmount()));
            row.setExpertfee(blankZero(row.getExpertfee()));
            row.setEthicalistfee(blankZero(row.getEthicalistfee()));
            row.setMedicalcost(blankZero(row.getMedicalcost()));
            row.setOfficecost(blankZero(row.getOfficecost()));
            row.setReimcost(blankZero(row.getReimcost()));
        }
        ExcelUtil<SpStatExpense> util = new ExcelUtil<SpStatExpense>(SpStatExpense.class);
        return util.exportExcel(list, "费用统计数据");
    }
    private BigDecimal blankZero(BigDecimal value) {
        return (value == null || value.compareTo(BigDecimal.ZERO) == 0) ? null : value;
    }
}
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatecomporgan.java
@@ -242,6 +242,11 @@
    @Excel(name = "移植人所属区域名称")
    private String donorname;
    /**
     * 器官排队序号(取自字典 sys_Organ 的 dict_sort)
     */
    @ApiModelProperty("器官排队序号")
    private Long sort;
}
ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatBonus.java
@@ -5,6 +5,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
 * SP_STAT_BONUS
 *
@@ -17,16 +19,10 @@
    private static final long serialVersionUID = 1L;
    /**
     * 绩效:1、月度、2季度、3年度
     * 统计月份
     */
    @ApiModelProperty("绩效:1、月度、2季度、3年度")
    @Excel(name = "绩效:1、月度、2季度、3年度")
    private Integer performancetype;
    /**
     * 绩效日期
     */
    @ApiModelProperty("绩效日期")
    @ApiModelProperty("统计月份")
    @Excel(name = "统计月份", sort = 1)
    private String bonusmonth;
    /**
@@ -39,27 +35,27 @@
     * 部门名称
     */
    @ApiModelProperty("部门名称")
    @Excel(name = "业务组", sort = 2)
    private String deptName;
    /**
     * 收益人编号
     */
    @ApiModelProperty("收益人编号")
    @Excel(name = "收益人编号")
    private String beneficiaryno;
    /**
     * 收益人编号
     * 收益人姓名
     */
    @ApiModelProperty("收益人")
    @Excel(name = "收益人")
    @ApiModelProperty("收益人姓名")
    @Excel(name = "专职人员", sort = 3)
    private String beneficiaryname;
    /**
     * 收益人编号
     * 金额
     */
    @ApiModelProperty("申请金额")
    @Excel(name = "申请金额")
    private double amount;
    @ApiModelProperty("金额")
    @Excel(name = "金额", sort = 4, scale = 2)
    private BigDecimal amount;
}
ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatCase.java
@@ -27,6 +27,7 @@
     * donationmonth
     */
    @ApiModelProperty("donationmonth")
    @Excel(name = "统计月份", sort = 1)
    private String donationmonth;
    /**
@@ -39,6 +40,7 @@
     * deptname
     */
    @ApiModelProperty("deptname")
    @Excel(name = "业务组", sort = 2)
    private String deptname;
    /**
@@ -51,13 +53,90 @@
     * reportername
     */
    @ApiModelProperty("reportername")
    @Excel(name = "专职人员", sort = 3)
    private String reportername;
    /**
     * casesum
     */
    @ApiModelProperty("casesum")
    @Excel(name = "案例累计", sort = 4, cellType = Excel.ColumnType.NUMERIC)
    private String casesum;
}
    /**
     * 环节 0:潜在捐献
     */
    @ApiModelProperty("潜在捐献")
    @Excel(name = "潜在捐献", sort = 5, cellType = Excel.ColumnType.NUMERIC)
    private String workflow0;
    /**
     * 环节 1:医学评估
     */
    @ApiModelProperty("医学评估")
    @Excel(name = "医学评估", sort = 6, cellType = Excel.ColumnType.NUMERIC)
    private String workflow1;
    /**
     * 环节 2:家属确认
     */
    @ApiModelProperty("家属确认")
    @Excel(name = "家属确认", sort = 7, cellType = Excel.ColumnType.NUMERIC)
    private String workflow2;
    /**
     * 环节 3:伦理审查
     */
    @ApiModelProperty("伦理审查")
    @Excel(name = "伦理审查", sort = 8, cellType = Excel.ColumnType.NUMERIC)
    private String workflow3;
    /**
     * 环节 4:器官分配
     */
    @ApiModelProperty("器官分配")
    @Excel(name = "器官分配", sort = 9, cellType = Excel.ColumnType.NUMERIC)
    private String workflow4;
    /**
     * 环节 5:获取见证
     */
    @ApiModelProperty("获取见证")
    @Excel(name = "获取见证", sort = 10, cellType = Excel.ColumnType.NUMERIC)
    private String workflow5;
    /**
     * 环节 6:捐献完成
     */
    @ApiModelProperty("捐献完成")
    @Excel(name = "捐献完成", sort = 11, cellType = Excel.ColumnType.NUMERIC)
    private String workflow6;
    /**
     * 环节 7:归档撤销
     */
    @ApiModelProperty("归档撤销")
    @Excel(name = "归档撤销", sort = 12, cellType = Excel.ColumnType.NUMERIC)
    private String workflow7;
    /**
     * 环节 8:案例归档
     */
    @ApiModelProperty("案例归档")
    @Excel(name = "案例归档", sort = 13, cellType = Excel.ColumnType.NUMERIC)
    private String workflow8;
    /**
     * 环节 9:案例终止(页面已隐藏该列,导出也不输出)
     */
    @ApiModelProperty("案例终止")
    private String workflow9;
    /**
     * 终止案例数(termination_case=1)
     */
    @ApiModelProperty("终止案例数")
    @Excel(name = "终止案例", sort = 14, cellType = Excel.ColumnType.NUMERIC)
    private String terminationcase;
}
ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatCaseReq.java
@@ -40,12 +40,6 @@
    @ApiModelProperty("pauserno")
    private String pausername = "";
    /**
     * pacasestate
     */
    @ApiModelProperty("pacasestate")
    private String pacasestate = "";
}
ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatExpense.java
@@ -5,6 +5,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
 * SP_STAT_EXPENSE
 *
@@ -16,55 +18,79 @@
public class SpStatExpense {
    private static final long serialVersionUID = 1L;
    /**
     * 收益人编号
     * 统计月份
     */
    @ApiModelProperty("收益人编号")
    @Excel(name = "收益人编号")
    @ApiModelProperty("统计月份")
    @Excel(name = "统计月份", sort = 1)
    private String applymonth;
    /**
     * 收益人编号
     * 人员编号
     */
    @ApiModelProperty("收益人编号")
    @Excel(name = "收益人编号")
    @ApiModelProperty("人员编号")
    private String userno;
    /**
     * 收益人编号
     * 人员姓名
     */
    @ApiModelProperty("收益人编号")
    @Excel(name = "收益人编号")
    @ApiModelProperty("人员姓名")
    @Excel(name = "专职人员", sort = 3)
    private String username;
    /**
     * 收益人编号
     * 部门编号
     */
    @ApiModelProperty("收益人编号")
    @Excel(name = "收益人编号")
    @ApiModelProperty("部门编号")
    private String deptmentno;
    /**
     * 收益人编号
     * 部门名称
     */
    @ApiModelProperty("收益人")
    @Excel(name = "收益人")
    @ApiModelProperty("部门名称")
    @Excel(name = "业务组", sort = 2)
    private String deptmentName;
    /**
     * 收益人编号
     * 金额合计
     */
    @ApiModelProperty("收益人编号")
    @Excel(name = "收益人编号")
    private String AmountRequested;
    @ApiModelProperty("金额合计")
    @Excel(name = "报销总金额", sort = 4, scale = 2)
    private BigDecimal amount;
    /**
     * 收益人编号
     * 专家劳务费
     */
    @ApiModelProperty("收益人编号")
    @Excel(name = "收益人编号")
    private String applyType;
    @ApiModelProperty("专家劳务费")
    @Excel(name = "专家费", sort = 5, scale = 2)
    private BigDecimal expertfee;
    /**
     * 伦理专家费
     */
    @ApiModelProperty("伦理专家费")
    @Excel(name = "伦理专家费", sort = 6, scale = 2)
    private BigDecimal ethicalistfee;
    /**
     * 医学成本
     */
    @ApiModelProperty("医学成本")
    @Excel(name = "医学成本", sort = 7, scale = 2)
    private BigDecimal medicalcost;
    /**
     * 办公费
     */
    @ApiModelProperty("办公费")
    @Excel(name = "办公费", sort = 8, scale = 2)
    private BigDecimal officecost;
    /**
     * 差旅费
     */
    @ApiModelProperty("差旅费")
    @Excel(name = "差旅费", sort = 9, scale = 2)
    private BigDecimal reimcost;
}
ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatExpenseReq.java
@@ -35,13 +35,13 @@
    /**
     * pausername
     * pauserno
     */
    @ApiModelProperty("pausername")
    private String pausername = "";
    @ApiModelProperty("pauserno")
    private String pauserno = "";
    /**
     * pacasestate
     * paexpensetype
     */
    @ApiModelProperty("paexpensetype")
    private String paexpensetype = "";
ruoyi-project/src/main/java/com/ruoyi/project/mapper/SpstatCaseMapper.java
@@ -17,6 +17,6 @@
@Mapper
public interface SpstatCaseMapper extends BaseMapper<SpStatCase> {
    List<SpStatCase> getListBypower(@Param("PABEGTIME") String PABEGTIME, @Param("PAENDTIME") String PAENDTIME, @Param("PADEPTNO") String PADEPTNO, @Param("PAUSERNAME") String PAUSERNAME, @Param("PACASESTATE") String PACASESTATE);
    List<SpStatCase> getListBypower(@Param("PABEGTIME") String PABEGTIME, @Param("PAENDTIME") String PAENDTIME, @Param("PADEPTNO") String PADEPTNO, @Param("PAUSERNAME") String PAUSERNAME);
}
ruoyi-project/src/main/java/com/ruoyi/project/mapper/SpstatExpenseMapper.java
@@ -18,6 +18,6 @@
@Mapper
public interface SpstatExpenseMapper extends BaseMapper<SpStatExpense> {
    List<SpStatExpense> getListBySpstatExpense(@Param("PABEGTIME") String PABEGTIME, @Param("PAENDTIME") String PAENDTIME, @Param("PADEPTNO") String PADEPTNO, @Param("PAUSERNAME") String PAUSERNAME, @Param("PAEXPENSETYPE") String PAEXPENSETYPE);
    List<SpStatExpense> getListBySpstatExpense(@Param("PABEGTIME") String PABEGTIME, @Param("PAENDTIME") String PAENDTIME, @Param("PADEPTNO") String PADEPTNO, @Param("PAUSERNO") String PAUSERNO, @Param("PAEXPENSETYPE") String PAEXPENSETYPE);
}
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailServiceImpl.java
@@ -505,6 +505,11 @@
    @Override
    public List<SpStatBonus> getListBySpStatBonus(SpStatBonusReq spStatBonusReq) {
        return spStatBonusMapper.getListBySpStatBonus(spStatBonusReq.getPabegtime(), spStatBonusReq.getPaendtime(), spStatBonusReq.getPadeptno(), spStatBonusReq.getPausername(), spStatBonusReq.getPabonustype());
        // PABONUSTYPE 在存储过程中是 INTEGER,空串会报 Incorrect integer value;空值按 0(全部)处理
        String bonusType = spStatBonusReq.getPabonustype();
        if (bonusType == null || bonusType.trim().isEmpty()) {
            bonusType = "0";
        }
        return spStatBonusMapper.getListBySpStatBonus(spStatBonusReq.getPabegtime(), spStatBonusReq.getPaendtime(), spStatBonusReq.getPadeptno(), spStatBonusReq.getPausername(), bonusType);
    }
}
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/SpstatCaseServiceImpl.java
@@ -45,7 +45,7 @@
    @Override
    public List<SpStatCase> getListBypower(SpStatCaseReq spStatCaseReq) {
        return spstatCaseMapper.getListBypower(spStatCaseReq.getPabegtime(), spStatCaseReq.getPaendtime(), spStatCaseReq.getPadeptno(), spStatCaseReq.getPausername(), spStatCaseReq.getPacasestate());
        return spstatCaseMapper.getListBypower(spStatCaseReq.getPabegtime(), spStatCaseReq.getPaendtime(), spStatCaseReq.getPadeptno(), spStatCaseReq.getPausername());
    }
}
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/SpstatExpenseServiceImpl.java
@@ -28,7 +28,7 @@
    @Override
    public List<SpStatExpense> getListBySpstatExpense(SpStatExpenseReq spStatExpenseReq) {
        return spstatExpenseMapper.getListBySpstatExpense(spStatExpenseReq.getPabegtime(), spStatExpenseReq.getPaendtime(), spStatExpenseReq.getPadeptno(), spStatExpenseReq.getPausername(), spStatExpenseReq.getPaexpensetype());
        return spstatExpenseMapper.getListBySpstatExpense(spStatExpenseReq.getPabegtime(), spStatExpenseReq.getPaendtime(), spStatExpenseReq.getPadeptno(), spStatExpenseReq.getPauserno(), spStatExpenseReq.getPaexpensetype());
    }
}
ruoyi-project/src/main/resources/mapper/project/ServiceDonatecomporganMapper.xml
@@ -34,6 +34,8 @@
        <result property="residencecommunityname" column="ResidenceCommunityName"/>
        <result property="residencecountycode" column="ResidenceCountyCode"/>
        <result property="residencecountyname" column="ResidenceCountyName"/>
        <!-- 2026-10-23:器官排队序号 -->
        <result property="sort" column="sort"/>
        <result property="delFlag" column="del_flag"/>
        <result property="createBy" column="create_by"/>
        <result property="createTime" column="create_time"/>
@@ -48,6 +50,7 @@
               InfoID,
               OrganNo,
               OrganName,
               sort,
               transplantstate,
               AbandonReason,
               TransplantTime,
@@ -140,6 +143,8 @@
                concat('%', #{residencecountyname}, '%')
            </if>
        </where>
        <!-- 2026-10-23:按器官排队序号排序(空的排最后,再按主键兜底) -->
        order by (sort is null or sort = 0), sort asc, ID asc
    </select>
</mapper>
ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml
@@ -182,6 +182,8 @@
            <if test="isdgf != null ">and isDGF = #{isdgf}</if>
        </where>
        <!-- 2026-10-23:按器官排队序号排序(空的排最后,再按主键兜底) -->
        order by (sort is null or sort = 0), sort asc, ID asc
    </select>
    <select id="getAllDonateOrgans" resultType="com.ruoyi.project.domain.ServiceDonateorgan">
        <include refid="selectServiceDonateorganVo"/>
ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessorganMapper.xml
@@ -93,6 +93,8 @@
            <if test="isdgf != null  and isdgf != ''">and IsDGF = #{isdgf}</if>
            <if test="organStartTime != null">and organ_start_time = #{organStartTime}</if>
        </where>
        <!-- 2026-10-23:按器官排队序号排序(空的排最后,再按主键兜底) -->
        order by (sort is null or sort = 0), sort asc, ID asc
    </select>
</mapper>
ruoyi-project/src/main/resources/mapper/project/SpStatBonusMapper.xml
@@ -4,11 +4,20 @@
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.mapper.SpStatBonusMapper">
    <!-- 新 SP 返回 dept_id / dept_name 下划线列,项目未开启 mapUnderscoreToCamelCase,需显式映射 -->
    <resultMap id="SpStatBonusResult" type="com.ruoyi.project.domain.SpStatBonus">
        <result property="bonusmonth" column="bonusmonth"/>
        <result property="deptId" column="dept_id"/>
        <result property="deptName" column="dept_name"/>
        <result property="beneficiaryno" column="BeneficiaryNo"/>
        <result property="beneficiaryname" column="BeneficiaryName"/>
        <result property="amount" column="amount"/>
    </resultMap>
    <select id="getListBySpStatBonus" statementType="CALLABLE"
            resultType="com.ruoyi.project.domain.SpStatBonus">
            resultMap="SpStatBonusResult">
        call `SP_STAT_BONUS`(#{PABEGTIME,mode=IN,jdbcType=VARCHAR},#{PAENDTIME,mode=IN,jdbcType=VARCHAR},#{PADEPTNO,mode=IN,jdbcType=VARCHAR},#{PAUSERNAME,mode=IN,jdbcType=VARCHAR},#{PABONUSTYPE,mode=IN,jdbcType=VARCHAR
        })
    </select>
</mapper>
</mapper>
ruoyi-project/src/main/resources/mapper/project/SpstatCaseMapper.xml
@@ -7,7 +7,6 @@
    <select id="getListBypower" statementType="CALLABLE"
            resultType="com.ruoyi.project.domain.SpStatCase">
        call `SP_STAT_CASE`(#{PABEGTIME,mode=IN,jdbcType=VARCHAR},#{PAENDTIME,mode=IN,jdbcType=VARCHAR},#{PADEPTNO,mode=IN,jdbcType=VARCHAR},#{PAUSERNAME,mode=IN,jdbcType=VARCHAR
        },#{PACASESTATE,mode=IN,jdbcType=VARCHAR})
        call `SP_STAT_CASE`(#{PABEGTIME,mode=IN,jdbcType=VARCHAR},#{PAENDTIME,mode=IN,jdbcType=VARCHAR},#{PADEPTNO,mode=IN,jdbcType=VARCHAR},#{PAUSERNAME,mode=IN,jdbcType=VARCHAR})
    </select>
</mapper>
ruoyi-project/src/main/resources/mapper/project/SpstatExpenseMapper.xml
@@ -7,6 +7,6 @@
    <select id="getListBySpstatExpense" statementType="CALLABLE"
            resultType="com.ruoyi.project.domain.SpStatExpense">
        call `SP_STAT_EXPENSE`(#{PABEGTIME,mode=IN,jdbcType=VARCHAR},#{PAENDTIME,mode=IN,jdbcType=VARCHAR},#{PADEPTNO,mode=IN,jdbcType=VARCHAR},#{PAUSERNAME,mode=IN,jdbcType=VARCHAR},#{PAEXPENSETYPE,mode=IN,jdbcType=VARCHAR})
        call `SP_STAT_EXPENSE`(#{PABEGTIME,mode=IN,jdbcType=VARCHAR},#{PAENDTIME,mode=IN,jdbcType=VARCHAR},#{PADEPTNO,mode=IN,jdbcType=VARCHAR},#{PAUSERNO,mode=IN,jdbcType=VARCHAR},#{PAEXPENSETYPE,mode=IN,jdbcType=VARCHAR})
    </select>
</mapper>