修改bug

huanghongfa

2021-07-12 9641ba3c1d91c3105966b2038f97a2db83bbe7b7

修改bug

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/BigScreenStatisticPartyActivityDTO.java

@@ -25,9 +25,17 @@
    private Integer type = 3;

    @ApiModelProperty(value = "日期", hidden = false, example = "2021-06-01", required = true)
    @NotNull(message = "时间不能为空")
//    @NotNull(message = "时间不能为空")
    @Pattern(regexp = "^\\d{4}-\\d{2}-\\d{2}$", message = "时间格式错误")
    private String date;

    @ApiModelProperty(value = "开始时间", hidden = false, example = "2021-06-01", required = true)
    @Pattern(regexp = "^\\d{4}-\\d{2}-\\d{2}$", message = "时间格式错误")
    private String startTime;

    @ApiModelProperty(value = "结束时间", hidden = false, example = "2021-06-01", required = true)
    @Pattern(regexp = "^\\d{4}-\\d{2}-\\d{2}$", message = "时间格式错误")
    private String endTime;


}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoDO.java

@@ -150,4 +150,14 @@
        int jl = 2;
        int pt = 3;
    }

    /**
     * 状态 1待审核   2进行中 3已驳回 4已完成
     */
    public interface status{
        int dsh = 1;
        int dfk = 2;
        int ybh = 3;
        int ywc = 4;
    }
}

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

@@ -201,6 +201,10 @@
        Date date = new Date();
        switch (type){
            case 1:
                cmActEasyPhotoDO = this.comActEasyPhotoDAO.selectById(comActEasyPhotoVO.getId());
                if(!cmActEasyPhotoDO.getStatus().equals(ComActEasyPhotoDO.status.dsh)){
                    return R.fail("该随手拍已审核，不可重复操作");
                }
                Integer isNeedFeedBack = comActEasyPhotoVO.getIsNeedFeedBack();
                if (isNeedFeedBack==1) {
                    cmActEasyPhotoDO.setStatus(2);//进行中
@@ -213,6 +217,10 @@
                comActUserWalletService.examineAddMoney(comActEasyPhotoVO.getActivityType(),comActEasyPhotoVO.getId(),comActEasyPhotoVO.getUserId());
                break;
            case 2:
                cmActEasyPhotoDO = this.comActEasyPhotoDAO.selectById(comActEasyPhotoVO.getId());
                if(!cmActEasyPhotoDO.getStatus().equals(ComActEasyPhotoDO.status.dsh)){
                    return R.fail("该随手拍已审核，不可重复操作");
                }
                cmActEasyPhotoDO.setStatus(3);//已驳回
                cmActEasyPhotoDO.setExamineAt(date);
                cmActEasyPhotoDO.setRejectReason(comActEasyPhotoVO.getRejectReason());

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventGridMemberRelationMapper.java

@@ -58,4 +58,8 @@

    List<GridMemberCascadeVO> getGridMemberCascade(@Param("type") Integer type,@Param("id") Long id);

    Integer getVillageCount(@Param("communityId") Long communityId);

    Integer getBuildingCount(@Param("villageId") Long villageId);

}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridMemberRelationServiceImpl.java

@@ -134,7 +134,30 @@
        if(memberCascadeAddDTO.getType() == null){
            return R.fail("参数错误");
        }
        return R.ok(this.baseMapper.getGridMemberCascade(memberCascadeAddDTO.getType(),memberCascadeAddDTO.getSuperiorId()));
        List<GridMemberCascadeVO> memberCascadeList = this.baseMapper.getGridMemberCascade(memberCascadeAddDTO.getType(),memberCascadeAddDTO.getSuperiorId());

        List<GridMemberCascadeVO> result = new ArrayList<>();
        if(!memberCascadeList.isEmpty()){
            memberCascadeList.forEach(cascade -> {
                if(memberCascadeAddDTO.getType().equals(1)){//过滤无小区的社区
                    Integer count = this.baseMapper.getVillageCount(cascade.getId());
                    if(count > 0){
                        result.add(cascade);
                    }
                }else if(memberCascadeAddDTO.getType().equals(2)){//过滤无楼栋的小区
                    Integer count = this.baseMapper.getBuildingCount(cascade.getId());
                    if(count > 0){
                        result.add(cascade);
                    }
                }else{
                    if(!cascade.getName().contains("栋")){
                        cascade.setName(cascade.getName() + "栋");
                    }
                    result.add(cascade);
                }
            });
        }
        return R.ok(result);
    }

}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventGridMemberRelationMapper.xml

@@ -333,4 +333,12 @@
        </if>
    </select>

    <select id="getVillageCount" resultType="Integer">
        select count(village_id) from com_mng_village where community_id = #{communityId}
    </select>

    <select id="getBuildingCount" resultType="Integer">
        select count(id) from com_mng_building where village_id = #{villageId}
    </select>

</mapper>