bug修改

101captain

2022-06-27 be94954b9447d5ef532a1bc455b006329e2bd441

bug修改

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ServiceStaticDTO.java

New file
@@ -0,0 +1,19 @@
package com.panzhihua.common.model.dtos.neighbor;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @author zzj
 */
@Data
@ApiModel("服务统计参数")
public class ServiceStaticDTO {
    @ApiModelProperty("单位id")
    private Long checkUnitId;
    @ApiModelProperty("手机号")
    private String phone;
    @ApiModelProperty("年份")
    private String year;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ServiceStaticsVO.java

New file
@@ -0,0 +1,26 @@
package com.panzhihua.common.model.vos.neighbor;

import com.panzhihua.common.model.vos.community.ComActActivityVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;

/**
 * @author zzj
 */
@Data
@ApiModel("服务统计返回")
public class ServiceStaticsVO {
    @ApiModelProperty("次数")
    private Integer times;
    @ApiModelProperty("时长")
    private Integer hours;
    @ApiModelProperty("服务项目列表")
    private List<ComActNeighborCircleAppVO> serviceProjecList;
    @ApiModelProperty("服务活动列表")
    private List<ComActActivityVO> serviceActivityList;
    @ApiModelProperty("单位活动列表")
    private List<ComActActivityVO> workActivityList;
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java

@@ -387,4 +387,8 @@
        return this.comActNeighborCircleService.orderAndSolve(editNeighborCircleAdminVO);
    }

    @PostMapping("/serviceStatic")
    public R serviceStatic(@RequestBody ServiceStaticDTO serviceStaticDTO){
        return this.comActNeighborCircleService.serviceStatic(serviceStaticDTO);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleDAO.java

@@ -5,6 +5,7 @@

import com.panzhihua.common.model.dtos.PageBaseDTO;
import com.panzhihua.common.model.vos.community.StatisticsCommVO;
import com.panzhihua.common.model.vos.neighbor.*;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@@ -14,10 +15,6 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAdminDTO;
import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAppDTO;
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleAdminVO;
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleAppVO;
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleDetailAppVO;
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCommentReplyAppVO;
import com.panzhihua.common.model.vos.screen.CarouselInfoVO;
import com.panzhihua.common.model.vos.screen.PieElementVO;
import com.panzhihua.common.model.vos.user.AdministratorsUserVO;
@@ -143,4 +140,6 @@
    StatisticsCommVO getNeighborTotalPolylineDate(@Param("communityId") Long communityId, @Param("date") String date);

    IPage<ComActNeighborCircleAdminVO> indexNeighborList(@Param("page") Page page, @Param("pageBaseDTO") PageBaseDTO pageBaseDTO);


}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActNeighborCircleService.java

@@ -235,4 +235,11 @@
     */
    R orderAndSolve(EditNeighborCircleAdminVO editNeighborCircleAdminVO);

    /**
     * 服务统计
     * @param serviceStaticDTO
     * @return
     */
    R serviceStatic(ServiceStaticDTO serviceStaticDTO);

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java

@@ -979,4 +979,9 @@
        }
        return R.ok(this.baseMapper.updateById(comActNeighborCircleDO));
    }

    @Override
    public R serviceStatic(ServiceStaticDTO serviceStaticDTO) {
        return null;
    }
}