已收金额，未收金额钻取数据列表

sinake

18 小时以前 b88b42be258535e65d38888823ac85fd8467b571

已收金额，未收金额钻取数据列表

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

@@ -242,6 +242,17 @@
    }

    /**
     * 收费统计明细（点击已收/未收金额钻取）
     */
    @ApiOperation("收费统计明细")
    @PostMapping("/getSpStatChangeDetail")
    public TableDataInfo getSpStatChangeDetail(@RequestBody SpStatChangeDetailReq spStatChangeDetailReq) {
        startPage();
        List<SpStatChangeDetail> list = serviceDonorchargeorganService.getSpStatChangeDetail(spStatChangeDetailReq);
        return getDataTable(list);
    }

    /**
     * 导出收款统计
     */
    @ApiOperation("导出收款统计")

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

@@ -5,6 +5,7 @@
import com.ruoyi.project.domain.ServiceDonorchargeorgan;
import com.ruoyi.project.domain.SpStatBonus;
import com.ruoyi.project.domain.SpStatChange;
import com.ruoyi.project.domain.SpStatChangeDetail;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

@@ -33,4 +34,6 @@

    public List<SpStatChange> getListBySpStatChange(@Param("PABEGTIME") String PABEGTIME, @Param("PAENDTIME") String PAENDTIME, @Param("PAHOSPITALNAME") String PAHOSPITALNAME);

    public List<SpStatChangeDetail> getSpStatChangeDetail(@Param("PABEGTIME") String PABEGTIME, @Param("PAENDTIME") String PAENDTIME, @Param("PAHOSPITALNAME") String PAHOSPITALNAME, @Param("PACHARGESTATE") String PACHARGESTATE);

}

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

@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.project.domain.ServiceDonorchargeorgan;
import com.ruoyi.project.domain.SpStatChange;
import com.ruoyi.project.domain.SpStatChangeDetail;
import com.ruoyi.project.domain.SpStatChangeDetailReq;
import com.ruoyi.project.domain.SpStatChangeReq;

import java.util.List;
@@ -33,4 +35,12 @@
     * @return
     */
    public List<SpStatChange> getListBySpStatChange(SpStatChangeReq spStatChangeReq);

    /**
     * 收款统计明细（钻取）
     *
     * @param req 查询条件
     * @return 明细集合
     */
    public List<SpStatChangeDetail> getSpStatChangeDetail(SpStatChangeDetailReq req);
}

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

@@ -6,6 +6,8 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.project.domain.ServiceDonorchargeorgan;
import com.ruoyi.project.domain.SpStatChange;
import com.ruoyi.project.domain.SpStatChangeDetail;
import com.ruoyi.project.domain.SpStatChangeDetailReq;
import com.ruoyi.project.domain.SpStatChangeReq;
import com.ruoyi.project.mapper.ServiceDonorchargeorganMapper;
import com.ruoyi.project.service.IServiceDonorchargeorganService;
@@ -117,4 +119,13 @@
                spStatChangeReq.getPahospitalname());
    }

    @Override
    public List<SpStatChangeDetail> getSpStatChangeDetail(SpStatChangeDetailReq req) {
        return serviceDonorchargeorganMapper.getSpStatChangeDetail(
                req.getPabegtime(),
                req.getPaendtime(),
                req.getPahospitalname(),
                req.getPachargestate());
    }

}

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

@@ -213,4 +213,39 @@
        )
    </select>

    <resultMap id="SpStatChangeDetailResult" type="com.ruoyi.project.domain.SpStatChangeDetail">
        <result property="donatetime" column="donatetime"/>
        <result property="donorname" column="donorname"/>
        <result property="organno" column="OrganNo"/>
        <result property="organname" column="OrganName"/>
        <result property="name" column="name"/>
        <result property="caseno" column="caseno"/>
        <result property="hospitalname" column="HospitalName"/>
        <result property="organcharge" column="organcharge"/>
        <result property="amount" column="amount"/>
        <result property="nonpayment" column="nonpayment"/>
    </resultMap>

    <select id="getSpStatChangeDetail" resultMap="SpStatChangeDetailResult">
        select b.donatetime,
               o.donorname,
               o.OrganNo,
               o.OrganName,
               o.name,
               o.caseno,
               o.HospitalName,
               o.organcharge,
               o.amount,
               (ifnull(o.organcharge, 0) - ifnull(o.amount, 0)) as nonpayment
        from service_donorchargeorgan o
                 left join service_donatebaseinfo b on b.ID = o.InfoID
        where o.del_flag = 0
        <if test="PABEGTIME != null and PABEGTIME != ''">and b.donatetime &gt;= #{PABEGTIME}</if>
        <if test="PAENDTIME != null and PAENDTIME != ''">and b.donatetime &lt;= #{PAENDTIME}</if>
        <if test="PAHOSPITALNAME != null and PAHOSPITALNAME != ''">and o.HospitalName = #{PAHOSPITALNAME}</if>
        <if test='"1".equals(PACHARGESTATE)'>and ifnull(o.amount, 0) &gt; 0</if>
        <if test='"0".equals(PACHARGESTATE)'>and (ifnull(o.organcharge, 0) - ifnull(o.amount, 0)) &gt; 0</if>
        order by b.donatetime
    </select>

</mapper>