liusheng
4 天以前 a2562974917ee6ef93325bb0a9ba785c82222792
代码提交
已修改3个文件
21 ■■■■ 文件已修改
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoController.java 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfo.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoController.java
@@ -79,12 +79,21 @@
     * 查询捐献基础列表
     */
    @ApiOperation("潜在捐献信息列表")
    @GetMapping("/list")
    public TableDataInfo list(ServiceDonatebaseinfo serviceDonatebaseinfo) {
    @PostMapping("/list")
    public  Map<String, Object>  list(@RequestBody ServiceDonatebaseinfo serviceDonatebaseinfo) {
        log.info("潜在捐献信息列表:{}", serviceDonatebaseinfo);
        startPage();
        Integer offset = PageUtils.getOffset(serviceDonatebaseinfo.getPageNum(), serviceDonatebaseinfo.getPageSize());
        serviceDonatebaseinfo.setPageNum(offset);
        List<ServiceDonatebaseinfo> list = serviceDonatebaseinfoService.selectServiceDonatebaseinfoList(serviceDonatebaseinfo);
        return getDataTable(list);
        //获取总数
        serviceDonatebaseinfo.setPageNum(null);
        serviceDonatebaseinfo.setPageSize(null);
        Integer totalCount = 0;
        List<ServiceDonatebaseinfo> total = serviceDonatebaseinfoService.selectServiceDonatebaseinfoList(serviceDonatebaseinfo);
        if (!CollectionUtils.isEmpty(total)) totalCount = total.size();
        return getDataTable(list, totalCount);
    }
    @ApiOperation("小程序端潜在捐献信息列表")
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfo.java
@@ -599,7 +599,7 @@
     * 案例时间
     */
    @ApiModelProperty("案例时间")
    @TableField(fill = FieldFill.INSERT_UPDATE)
//    @TableField(fill = FieldFill.INSERT_UPDATE)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date donatetime;
ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml
@@ -242,7 +242,7 @@
        </where>
        order by ReportTime desc
        <if test="pageNum != null and pageSize != null">limit #{pageNum},#{pageSize}</if>
    </select>
    <select id="getDonateNumberById" resultType="java.lang.String">