bug修复

huanghongfa

2021-10-25 553a3085f7caf5e71f16442db13dc22f6bd87f50

bug修复

 springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventManageApi.java

@@ -58,7 +58,7 @@
        LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
        pageEventManageDTO.setUserId(loginUserInfoVO.getUserId());
        // pageEventManageDTO.setCommunityId(loginUserInfoVO.getCommunityId());
        pageEventManageDTO.setRevokeType(1);
//        pageEventManageDTO.setRevokeType(1);
        return gridService.queryEventToManage(pageEventManageDTO);
    }


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

@@ -43,7 +43,7 @@
    @Select("select village_id,alley,house_num,group_at,type,address,update_at from com_mng_village where village_id = #{villageId}")
    ComMngVillageVO getVillageById(@Param("villageId") Long villageId);

    @Select("<script> " + "SELECT " + " village_id, " + " `name` AS userName, " + " build_sum, " + " address, "
    @Select("<script> " + "SELECT " + " village_id, " + " `name` AS userName, " + " (select count(id) from com_mng_building where village_id = cmv.village_id) as buildSum, " + " address, "
        + " create_at as createAt, " + " lng, " + " lat, "
        + " ( SELECT count( id ) FROM com_mng_population WHERE village_id = cmv.village_id ) AS userSum, "
        + " ( SELECT count( id ) FROM com_mng_population_house WHERE village_id = cmv.village_id ) AS houseNum, "

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

@@ -169,7 +169,7 @@
    List<PopulationListVO> getGridVillageBuildingPopulationList(@Param("houseId") Long houseId,
        @Param("relation") Integer relation, @Param("relationId") Integer relationId);

    @Select("select id as houseId,floor from com_mng_population_house where village_id = #{villageId} order by create_at asc")
    @Select("select id as houseId,floor from com_mng_population_house where village_id = #{villageId} and floor is not null order by create_at asc")
    List<ComMngSubordinateVO> getHouseLevelByFloors(@Param("villageId") Long villageId);

    @Select("select id as houseId,unit_no from com_mng_population_house where village_id = #{villageId} and floor = #{floor} order by create_at asc")

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

@@ -289,7 +289,8 @@
        for (ComSwRotaExcelVO comSwRotaExcelVO : list) {
            Date date = DateUtil.parse(comSwRotaExcelVO.getRotaDate(), parsePatterns);
            Integer count =
                comSwRotaDAO.selectCount(new QueryWrapper<ComSwRotaDO>().lambda().eq(ComSwRotaDO::getRotaDate, date));
                comSwRotaDAO.selectCount(new QueryWrapper<ComSwRotaDO>().lambda().eq(ComSwRotaDO::getRotaDate, date)
                        .eq(ComSwRotaDO::getCommunityId,communityId));
            if (count > 0) {
                return R.fail("值班日期已存在，" + comSwRotaExcelVO.getRotaDate() + "重复");
            }

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

@@ -51,6 +51,7 @@
     * @param comActEasyPhotoAddDTO
     * @return 新增结果
     */
    @Override
    public R add(ComActEasyPhotoAddDTO comActEasyPhotoAddDTO) {
        ComActEasyPhotoDO comActEasyPhotoDO = new ComActEasyPhotoDO();
        BeanUtils.copyProperties(comActEasyPhotoAddDTO, comActEasyPhotoDO);
@@ -67,6 +68,7 @@
     * @param comActEasyPhotoEditDTO
     * @return 维护结果
     */
    @Override
    public R edit(ComActEasyPhotoEditDTO comActEasyPhotoEditDTO) {
        ComActEasyPhotoDO comActEasyPhotoDO = new ComActEasyPhotoDO();
        BeanUtils.copyProperties(comActEasyPhotoEditDTO, comActEasyPhotoDO);
@@ -83,6 +85,7 @@
     * @param easyAppDTO
     * @return 维护结果
     */
    @Override
    public R<IPage<ComActEasyPhotoVO>> query(PageEasyAppDTO easyAppDTO) {
        Page page = new Page(easyAppDTO.getPageNum(), easyAppDTO.getPageSize());
        if (easyAppDTO.getStatus() != null) {
@@ -97,7 +100,7 @@
                    easyAppDTO.setIsPublicity(1);
                    break;
                case 4:
                    easyAppDTO.setIsPublicity(0);
                    easyAppDTO.setIsPublicity(2);
                    break;
                default:
                    break;
@@ -112,6 +115,7 @@
     * @param ComActEasyPhotoDeleteDTO
     * @return 平台用户信息
     */
    @Override
    public R delete(ComActEasyPhotoDeleteDTO ComActEasyPhotoDeleteDTO) {
        return R.fail();
    }
@@ -123,6 +127,7 @@
     *            社区活动 》随手拍 id
     * @return 查找结果
     */
    @Override
    public R<ComActEasyPhotoDetailsVO> comActEasyPhotoDetails(Long id) {
        ComActEasyPhotoDO comActEasyPhotoDO = comActEasyPhotoMapper.selectById(id);
        if (comActEasyPhotoDO != null) {

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

@@ -1376,10 +1376,11 @@
        } else {
            return R.fail("事件所属错误");
        }
        eventDO.setInvalid(false);
//        eventDO.setInvalid(false);
        // 标为无效后， 交给网格员处理
        eventDO.setUpdateBy(eventRevokeDTO.getUserId());
        eventDO.setEventStatus(4);// 4、撤销
        eventDO.setEventDealStatus(6);// 4、撤销
        eventDO.setProcessType(1);// 网格员处理
        eventDO.setCommunityProcess(0);// 非 社区处理
        eventDO.setRevokeId(eventRevokeDTO.getRevokeId());
@@ -1399,11 +1400,13 @@
        if (eventDO == null) {
            return R.fail("事件不存在");
        }
        boolean canRepulish = eventDO.getEventDealStatus() == 7 | eventDO.getEventDealStatus() == 5; // 已失效状态
        boolean canRepulish = eventDO.getEventDealStatus() == 7 || eventDO.getEventDealStatus() == 5 || eventDO.getEventDealStatus() == 6; // 已失效状态
        if (!canRepulish) {
            return R.fail("当前事件不是已失效状态/草稿状态，不能重新发布");
            return R.fail("当前事件不是已失效状态/草稿状态/撤销状态，不能重新发布");
        }
        eventDO.setInvalid(true);
        eventDO.setEventStatus(2);
        eventDO.setEventDealStatus(1);
        int updated = this.getBaseMapper().updateById(eventDO);
        if (updated == 1) {
            addTransferRecord(eventDO.getId(), commonEventRepublishDTO.getUserId(),