sinake
2026-11-03 7426f4da7d59cc3897c39b7cc977ad02949e8df5
器官费用增加删除
已修改5个文件
31 ■■■■■ 文件已修改
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonorchargeorganController.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceDonorchargeorganMapper.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonorchargeorganService.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonorchargeorganServiceImpl.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonorchargeorganController.java
@@ -207,7 +207,7 @@
    @Log(title = "捐献器官", businessType = BusinessType.DELETE)
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids) {
        return toAjax(serviceDonorchargeorganService.removeByIds(Arrays.asList(ids)));
        return toAjax(serviceDonorchargeorganService.removeByIds(ids) > 0);
    }
    @RepeatSubmit
ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceDonorchargeorganMapper.java
@@ -31,6 +31,11 @@
    public Boolean updateDonorchargeorgan(ServiceDonorchargeorgan serviceDonorchargeorgan);
    /**
     * 逻辑删除:不限定 del_flag 当前值(兼容 NULL),统一置为 1
     */
    public int removeByIds(@Param("ids") Long[] ids);
    public List<SpStatChange> getListBySpStatChange(@Param("PABEGTIME") String PABEGTIME, @Param("PAENDTIME") String PAENDTIME, @Param("PAHOSPITALNAME") String PAHOSPITALNAME);
ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonorchargeorganService.java
@@ -27,6 +27,11 @@
    public Boolean updateDonorchargeorgan(ServiceDonorchargeorgan serviceDonorchargeorgan);
    /**
     * 逻辑删除器官费用(del_flag 置 1)
     */
    public int removeByIds(Long[] ids);
    public List<ServiceDonorchargeorgan> queryListBypaymentidIsNull(ServiceDonorchargeorgan serviceDonorchargeorgan);
    /**
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonorchargeorganServiceImpl.java
@@ -106,6 +106,14 @@
    }
    @Override
    public int removeByIds(Long[] ids) {
        if (ids == null || ids.length == 0) {
            return 0;
        }
        return serviceDonorchargeorganMapper.removeByIds(ids);
    }
    @Override
    public List<ServiceDonorchargeorgan> queryListBypaymentidIsNull(ServiceDonorchargeorgan serviceDonorchargeorgan) {
        List<ServiceDonorchargeorgan> serviceDonorchargeorgans = serviceDonorchargeorganMapper.queryListBypaymentidIsNull(serviceDonorchargeorgan);
        return serviceDonorchargeorgans;
ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml
@@ -76,6 +76,7 @@
            resultMap="ServiceDonorchargeorganResult">
        <include refid="selectServiceDonorchargeorganVo"/>
        <where>
            and (del_flag = 0 or del_flag is null)
            <if test="infoid != null ">and InfoID = #{infoid}</if>
            <if test="receiveTime != null ">and receive_time = #{receiveTime}</if>
            <if test="paymentid != null ">and paymentid = #{paymentid}</if>
@@ -135,6 +136,7 @@
        from service_donorchargeorgan o
                 left join service_donatebaseinfo b on b.ID = o.InfoID
        <where>
            and (o.del_flag = 0 or o.del_flag is null)
            <if test="selectAll != true ">
               and (o.paymentid IS NULL or o.paymentid=0 or organcharge-amount>0)
               and (organ_charge_state =0 OR organ_charge_state IS null)
@@ -164,6 +166,15 @@
        order by b.donatetime
    </select>
    <update id="removeByIds">
        update service_donorchargeorgan
        set del_flag = 1
        where id in
        <foreach collection="ids" item="id" open="(" separator="," close=")">
            #{id}
        </foreach>
    </update>
    <update id="updateDonorchargeorgan" parameterType="com.ruoyi.project.domain.ServiceDonorchargeorgan">
        update service_donorchargeorgan
        <set>