Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-11-05 0d5b156f0f2c48a06974361532b7505e92db633b

Merge remote-tracking branch 'origin/test' into test

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java

@@ -4,7 +4,7 @@

import javax.annotation.Resource;

import com.panzhihua.common.model.vos.community.MyActivityEvaluateVO;
import com.panzhihua.common.model.vos.community.*;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@@ -21,18 +21,6 @@
import com.panzhihua.common.model.dtos.community.PageVolunteerDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ActivitySignInRecordVO;
import com.panzhihua.common.model.vos.community.ActivitySignVO;
import com.panzhihua.common.model.vos.community.ComActActEvaluateVO;
import com.panzhihua.common.model.vos.community.ComActActRegistVO;
import com.panzhihua.common.model.vos.community.ComActActivityVO;
import com.panzhihua.common.model.vos.community.ComActDynVO;
import com.panzhihua.common.model.vos.community.ComMngCarVO;
import com.panzhihua.common.model.vos.community.ComMngStructAreaVO;
import com.panzhihua.common.model.vos.community.ComMngVillageVO;
import com.panzhihua.common.model.vos.community.ComMngVolunteerMngAppletsVO;
import com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO;
import com.panzhihua.common.model.vos.community.SignactivityVO;
import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.partybuilding.PartyBuildingService;
@@ -321,4 +309,9 @@
        required = true) @RequestParam(value = "provinceAdcode") Integer provinceAdcode) {
        return communityService.getCityTreeByProvinceCode(provinceAdcode);
    }
    @ApiOperation(value = "社区详情", response = ComActVO.class)
    @GetMapping("community")
    public R detailCommunity() {
        return communityService.detailCommunity(this.getCommunityId());
    }
}

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java

@@ -257,7 +257,7 @@
        Long userId = loginUserInfo.getUserId();
        Long communityId = loginUserInfo.getCommunityId();
        List<ComActActivityVO> comActActivityVOS = new ArrayList<>();
        R r = communityService.listActivity(userId, status);
        R r = communityService.listActivity(userId);
        if (R.isOk(r)) {
            comActActivityVOS = (List<ComActActivityVO>)r.getData();
        }

 springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/impl/LoginServiceImpl.java

@@ -235,7 +235,6 @@
        loginReturnVO.setToken(token);
        loginReturnVO.setRefreshToken(refeshToken);
        loginReturnVO.setUserId(loginUser.getUserId());
        loginReturnVO.setCommunityId(loginUser.getCommunityId());
        return loginReturnVO;
    }


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActColumnVO.java

@@ -56,4 +56,6 @@
    @ApiModelProperty(value = "分类类型 1服务类型分类 2技能分类 3通知公告")
    private Integer type;

    private Long communityId;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDynVO.java

@@ -94,4 +94,7 @@

    @ApiModelProperty(value = "社区动态跳转链接")
    private String jumpUrl;

    @ApiModelProperty("跳转状态")
    private Integer jumpType;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoRewardVO.java

@@ -3,6 +3,7 @@
import java.math.BigDecimal;
import java.util.List;

import com.panzhihua.common.model.vos.community.easyPhoto.BannerVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -38,4 +39,7 @@
    @ApiModelProperty("应用预约/登记列表")
    private List<ComActReserveIndexVo> comActReserveIndexApplicationVos;

    @ApiModelProperty("动态banner")
    private List<BannerVO> bannerVOS;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/easyPhoto/BannerVO.java

@@ -21,4 +21,8 @@
    private Date showTime;
    @ApiModelProperty("图片路径")
    private String cover;
    @ApiModelProperty("跳转地址")
    private String jumpUrl;
    @ApiModelProperty("跳转类型")
    private String jumpType;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingComPbDynVO.java

@@ -84,4 +84,7 @@

    @ApiModelProperty("跳转链接")
    private String jumpUrl;

    @ApiModelProperty("跳转状态")
    private Integer jumpType;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

Diff too large

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/AssemblyUtils.java

@@ -3,11 +3,16 @@
import com.panzhihua.common.model.vos.community.ComActQuestnaireAnswerContentVO;
import lombok.extern.slf4j.Slf4j;

import javax.imageio.ImageIO;
import javax.xml.bind.DatatypeConverter;
import java.io.ByteArrayInputStream;
import java.awt.image.BufferedImage;
import java.io.*;
import java.net.URL;
import java.nio.file.Files;
import java.util.ArrayList;
import java.util.Base64;
import java.util.List;
import java.util.UUID;

/**
 * @author lyq
@@ -95,7 +100,7 @@
                        if(userAnswers.getOptionType().equals(12)){
                            reserveSubId = userAnswers.getReserveSubId();
                            try {
                                userData.add(new ByteArrayInputStream(DatatypeConverter.parseBase64Binary(userAnswers.getAnswerContent().substring(userAnswers.getAnswerContent().indexOf("，")+ 1))));
                                userData.add(DatatypeConverter.parseBase64Binary(userAnswers.getAnswerContent().substring(userAnswers.getAnswerContent().indexOf(",") + 1)));
                            }catch (Exception e){
                                userData.add(" ");
                                log.error("导出转换图片失败！");
@@ -139,7 +144,8 @@
                        if(userAnswers.getOptionType().equals(12)){
                            reserveSubId = userAnswers.getReserveSubId();
                            try {
                                userData.add(new ByteArrayInputStream(DatatypeConverter.parseBase64Binary(userAnswers.getAnswerContent().substring(userAnswers.getAnswerContent().indexOf("，")+ 1))));
                                //userData.add(new URL("http://image.panzhihua.nhys.cdnhxx.com//idcard/967dbdef3ef3465a9169fbea204f9aa7.jpg"));
                                userData.add(DatatypeConverter.parseBase64Binary(userAnswers.getAnswerContent().substring(userAnswers.getAnswerContent().indexOf(",") + 1)));
                            }catch (Exception e){
                                userData.add(" ");
                                log.error("导出转换图片失败！");

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActAnnouncementApi.java

@@ -69,6 +69,7 @@
    public R insert(@RequestBody ComActAnnouncementVO comActAnnouncementVO) {
        comActAnnouncementVO.setCreateTime(new Date());
        comActAnnouncementVO.setCommunityId(this.getCommunityId());
        comActAnnouncementVO.setUserId(this.getUserId());
       return this.communityService.comActAnnouncementInsert(comActAnnouncementVO);
    }


 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActColumnApi.java

@@ -41,6 +41,7 @@
    @ApiOperation(value = "分页查询所有数据",response = ComActColumnVO.class)
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        commonPage.setCommunityId(this.getCommunityId());
        return this.communityService.comActColumnSelectAll(commonPage);
    }

@@ -65,6 +66,7 @@
    @ApiOperation("新增数据")
    @PostMapping
    public R insert(@RequestBody ComActColumnVO comActColumnVO) {
        comActColumnVO.setCommunityId(this.getCommunityId());
        comActColumnVO.setStatus(1);
        comActColumnVO.setCreateTime(new Date());
        if(StringUtils.isNotEmpty(this.getLoginUserInfo().getName())){

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActReserveApi.java

@@ -67,8 +67,10 @@
    @ApiOperation(value = "分页查询预约登记列表", response = ComActReserveListAdminVO.class)
    @PostMapping("/page")
    public R page(@RequestBody PageReserveAdminDTO pageReserveDTO) {
        if(pageReserveDTO.getCommunityId()==null){
        Long communityId = this.getCommunityId();
        pageReserveDTO.setCommunityId(communityId);
        }
        return communityService.pageReserveAdmin(pageReserveDTO);
    }

@@ -536,7 +538,8 @@
                    HorizontalCellStyleStrategy horizontalCellStyleStrategy =
                            new HorizontalCellStyleStrategy(headWriteCellStyle, contentWriteCellStyle);

                    excelWriter = EasyExcel.write(fileName, ComMngPopulationExcelVo.class)

                    excelWriter = EasyExcel.write(fileName)
                            .registerWriteHandler(horizontalCellStyleStrategy).registerWriteHandler(new Custemhandler())
                            .registerWriteHandler(new CustomSheetWriteHandler()).build();
                    WriteSheet writeSheet = EasyExcel.writerSheet("登记明细导出数据").head(headList).build();

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/EldersAuthApi.java

@@ -592,6 +592,28 @@
        return communityService.signPensionAuthRecords(comPensionAuthRecordVO);
    }


    /**
     * 高龄认证添加
     * @param comElderAuthRecordVO
     * @return
     */
    @ApiOperation(value = "高龄认证添加")
    @PostMapping("/authRecord/add")
    R addAuthRecord(@RequestBody ComElderAuthRecordVO comElderAuthRecordVO){
        return communityService.addAuthRecord(comElderAuthRecordVO);
    }
    /**
     * 养老认证添加
     * @param comElderAuthRecordVO
     * @return
     */
    @ApiOperation(value = "养老认证添加")
    @PostMapping("/pensionAuthRecord/add")
    R addPensionAuthRecordVO(@RequestBody ComElderAuthRecordVO comElderAuthRecordVO){
        return communityService.addPensionAuthRecordVO(comElderAuthRecordVO);
    }

    /**
     * 养老认证导出 exportPensionAuthRecords  养老认证导出
     * @param    ids   养老认证记录id集合

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

@@ -89,6 +89,6 @@
     */
    @GetMapping("del")
    public R delete(@RequestParam("id") Long id) {
        return R.ok(this.comActColumnService.removeById(id));
        return this.comActColumnService.delete(id);
    }
}

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

@@ -378,6 +378,25 @@
    }

    /**
     * 高龄认证添加
     * @param comElderAuthRecordVO
     * @return
     */
    @PostMapping("/authRecord/add")
    R addAuthRecord(@RequestBody ComElderAuthRecordVO comElderAuthRecordVO){
        return comElderAuthRecordsService.add(comElderAuthRecordVO);
    }
    /**
     * 养老认证添加
     * @param comElderAuthRecordVO
     * @return
     */
    @PostMapping("/pensionAuthRecord/add")
    R addPensionAuthRecordVO(@RequestBody ComElderAuthRecordVO comElderAuthRecordVO){
        return comPensionAuthRecordService.add(comElderAuthRecordVO);
    }

    /**
     * 导出养老认证记录 exportPensionAuthRecordsStatistic  导出养老认证记录
     * @param    pageElderAuthRecordsDTO   查询参数
     * @return    R  查询结果

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

@@ -24,7 +24,7 @@
@Mapper
public interface ComActDynDAO extends BaseMapper<ComActDynDO> {
    @Select("<script> " + "SELECT  " + "d.id, " + "d.title, " + "COUNT(u.id)readNum, " + "d.`status`, "
        + "d.`content`, " + "d.`cover`, " + "d.`type`, " + "d.`cover_mode`, " + "d.is_topping, " + "d.publish_at, "
        + "d.`content`, " + "d.`cover`, " + "d.`type`, " + "d.`cover_mode`, d.jump_url,d.jump_type, " + "d.is_topping, " + "d.publish_at, "
        + "d.create_at, " + "cadt.`name` as typeName, " + "cadt.color as typeColor, " + "ca.name as communityName  "
        + "FROM " + "com_act_dyn d " + "LEFT JOIN com_act_dyn_user u ON d.id = u.dyn_id  "
        + "LEFT JOIN com_act_dyn_type as cadt ON cadt.id = d.type  "

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActColumn.java

@@ -81,4 +81,7 @@
    @ApiModelProperty(value = "描述")
    private String description;


    private Long communityId;

}

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

@@ -82,4 +82,9 @@
     * 跳转链接
     */
    private String jumpUrl;

    /**
     * 跳转状态
     */
    private Integer jumpType;
}

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

@@ -19,4 +19,11 @@
     * @return
     */
    R pageList(CommonPage commonPage);

    /**
     * 删除
     * @param id
     * @return
     */
    R delete(Long id);
}

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

@@ -114,4 +114,11 @@
     * @return 认证记录详情
     */
    R retrieveElderAuthDetail(Long identityAuthId);

    /**
     * 高龄认证添加
     * @param comElderAuthRecordVO
     * @return
     */
    R add(ComElderAuthRecordVO comElderAuthRecordVO);
}

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

@@ -8,6 +8,7 @@
import com.panzhihua.common.model.dtos.community.PageElderAuthRecordsDTO;
import com.panzhihua.common.model.dtos.community.PageIdentityAuthRecordDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComElderAuthRecordVO;
import com.panzhihua.common.model.vos.community.ComPensionAuthRecordImportExcelVO;
import com.panzhihua.common.model.vos.community.ComPensionAuthRecordVO;
import com.panzhihua.service_community.model.dos.ComPensionAuthRecordDO;
@@ -130,4 +131,11 @@
     * @return 认证记录详情
     */
    R retrievePensionAuthDetail(Long identityAuthId);

    /**
     * 新增认证
     * @param comElderAuthRecordVO
     * @return
     */
    R add(ComElderAuthRecordVO comElderAuthRecordVO);
}

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

@@ -1,9 +1,12 @@
package com.panzhihua.service_community.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.dao.ComActAnnouncementDao;
import com.panzhihua.service_community.entity.ComActAnnouncement;
import com.panzhihua.service_community.entity.ComActColumn;
import com.panzhihua.service_community.dao.ComActColumnDao;
import com.panzhihua.service_community.service.ComActColumnService;
@@ -23,9 +26,19 @@
public class ComActColumnServiceImpl extends ServiceImpl<ComActColumnDao, ComActColumn> implements ComActColumnService {
    @Resource
    private ComActColumnDao comActColumnDao;
    @Resource
    private ComActAnnouncementDao comActAnnouncementDao;
    @Override
    public R pageList(CommonPage commonPage) {
        return R.ok(this.comActColumnDao.pageList(new Page(commonPage.getPage(),commonPage.getSize()),commonPage));
    }

    @Override
    public R delete(Long id) {
        if(!comActAnnouncementDao.selectList(new QueryWrapper<ComActAnnouncement>().lambda().eq(ComActAnnouncement::getColumnId,id)).isEmpty()){
            return R.fail("当前类型无法删除，请先处理绑定数据");
        }
        return R.ok(comActColumnDao.deleteById(id));
    }

}

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

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

import javax.annotation.Resource;

import com.panzhihua.common.model.vos.community.easyPhoto.BannerVO;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -619,82 +620,87 @@
     */
    @Override
    public R getUserReward(Long userId, Long communityId) {
//        // 结果返回参数
//        ComActEasyPhotoRewardVO easyPhotoRewardVO = new ComActEasyPhotoRewardVO();
//        // 查询随手拍活动
//        ComActEasyPhotoActivityVO photoActivityVO = new ComActEasyPhotoActivityVO();
//        Date nowDate = DateUtils.getCurrentDate(DateUtils.ymdhms_format);
//        List<ComActEasyPhotoActivityDO> photoActivityDOS =
//            comActEasyPhotoActivityMapper.selectList(new QueryWrapper<ComActEasyPhotoActivityDO>().lambda()
//                .eq(ComActEasyPhotoActivityDO::getCommunityId, communityId)
//                .eq(ComActEasyPhotoActivityDO::getStatus, ComActEasyPhotoActivityDO.status.jxz)
//                .le(ComActEasyPhotoActivityDO::getActivityStartAt, nowDate)
//                .ge(ComActEasyPhotoActivityDO::getActivityEndAt, nowDate));
//        if (!photoActivityDOS.isEmpty()) {
//            ComActEasyPhotoActivityDO photoActivityDO = photoActivityDOS.get(0);
//            BeanUtils.copyProperties(photoActivityDO, photoActivityVO);
//            easyPhotoRewardVO.setEasyPhotoActivityVO(photoActivityVO);
//        }
//
//        if (userId != null && userId != 0L) {
//            // 查询用户未读奖励金额
//            BigDecimal amount = comActEasyPhotoRewardMapper.getUserReward(userId, communityId);
//            if (amount != null) {
//                easyPhotoRewardVO.setAmount(amount);
//            }
//        }
//
//        // 查询当前社区正在进行中的弹窗调查问卷
//        ComActQuestnaireDO popupQuestnaireDO = comActQuestnaireDAO.selectOne(new QueryWrapper<ComActQuestnaireDO>()
//            .lambda().le(ComActQuestnaireDO::getStartTime, nowDate).ge(ComActQuestnaireDO::getEndTime, nowDate)
//            .eq(ComActQuestnaireDO::getCommunityId, communityId).eq(ComActQuestnaireDO::getState, 2)
//            .eq(ComActQuestnaireDO::getAdverPositionPopup, ComActQuestnaireDO.isOk.yes));
//        if (popupQuestnaireDO != null) {
//            ComActQuestnaireAppVO popupQuestnaireVO = new ComActQuestnaireAppVO();
//            BeanUtils.copyProperties(popupQuestnaireDO, popupQuestnaireVO);
//            if (userId != null) {
//                if (popupQuestnaireDO.getIsForce().equals(ComActQuestnaireDO.isOk.no)) {
//                    // 查询用户是否已点击不再提醒
//                    Integer count = comActQuestnaireDAO.getNoRemindCount(userId, popupQuestnaireVO.getId());
//                    if (count <= 0) {
//                        popupQuestnaireVO.setIsDisplay(ComActQuestnaireDO.isOk.yes);
//                    }
//                } else {
//                    popupQuestnaireVO.setIsDisplay(ComActQuestnaireDO.isOk.yes);
//                }
//            }
//            easyPhotoRewardVO.setPopupQuestnaireVO(popupQuestnaireVO);
//        }
//
//        // 查询社区正在进行中的banner位置调查问卷列表
//        List<ComActQuestnaireAppVO> bannerQuestnaireList = comActQuestnaireDAO.getIndexTopQuestnaireList(communityId);
//        if (!bannerQuestnaireList.isEmpty()) {
//            easyPhotoRewardVO.setBannerQuestnaireList(bannerQuestnaireList);
//        }
//
//        //查询社区正在进行中的banner位置的社区活动
//        List<ComActActivityVO> comActActivityVOList = comActActivityDAO.getIndexTopActivityList(communityId);
//        if (!comActActivityVOList.isEmpty()) {
//            easyPhotoRewardVO.setBannerActivityList(comActActivityVOList);
//        }
//
//        // 查询社区正在进行中的应用位置调查问卷列表
//        List<ComActQuestnaireAppVO> applicationQuestnaireList =
//            comActQuestnaireDAO.getIndexApplicationQuestnaireList(communityId);
//        if (!applicationQuestnaireList.isEmpty()) {
//            easyPhotoRewardVO.setApplicationQuestnaireList(applicationQuestnaireList);
//        }
//        //查询社区正在进行中的banner预约/登记列表
//        List<ComActReserveIndexVo> comActReserveIndexVos=comActReserveMapper.indexBanner(communityId);
//        if(!comActReserveIndexVos.isEmpty()){
//            easyPhotoRewardVO.setComActReserveIndexBannerVos(comActReserveIndexVos);
//        }
//        //查询社区正在进行中的应用预约/登记列表
//        List<ComActReserveIndexVo> comActReserveIndexApplicationVos=comActReserveMapper.indexApplication(communityId);
//        if(!comActReserveIndexApplicationVos.isEmpty()){
//            easyPhotoRewardVO.setComActReserveIndexApplicationVos(comActReserveIndexApplicationVos);
//        }
        return R.ok(this.comActEasyPhotoDAO.banner(communityId));
        // 结果返回参数
        ComActEasyPhotoRewardVO easyPhotoRewardVO = new ComActEasyPhotoRewardVO();
        // 查询随手拍活动
        ComActEasyPhotoActivityVO photoActivityVO = new ComActEasyPhotoActivityVO();
        Date nowDate = DateUtils.getCurrentDate(DateUtils.ymdhms_format);
        List<ComActEasyPhotoActivityDO> photoActivityDOS =
            comActEasyPhotoActivityMapper.selectList(new QueryWrapper<ComActEasyPhotoActivityDO>().lambda()
                .eq(ComActEasyPhotoActivityDO::getCommunityId, communityId)
                .eq(ComActEasyPhotoActivityDO::getStatus, ComActEasyPhotoActivityDO.status.jxz)
                .le(ComActEasyPhotoActivityDO::getActivityStartAt, nowDate)
                .ge(ComActEasyPhotoActivityDO::getActivityEndAt, nowDate));
        if (!photoActivityDOS.isEmpty()) {
            ComActEasyPhotoActivityDO photoActivityDO = photoActivityDOS.get(0);
            BeanUtils.copyProperties(photoActivityDO, photoActivityVO);
            easyPhotoRewardVO.setEasyPhotoActivityVO(photoActivityVO);
        }

        if (userId != null && userId != 0L) {
            // 查询用户未读奖励金额
            BigDecimal amount = comActEasyPhotoRewardMapper.getUserReward(userId, communityId);
            if (amount != null) {
                easyPhotoRewardVO.setAmount(amount);
            }
        }

        // 查询当前社区正在进行中的弹窗调查问卷
        ComActQuestnaireDO popupQuestnaireDO = comActQuestnaireDAO.selectOne(new QueryWrapper<ComActQuestnaireDO>()
            .lambda().le(ComActQuestnaireDO::getStartTime, nowDate).ge(ComActQuestnaireDO::getEndTime, nowDate)
            .eq(ComActQuestnaireDO::getCommunityId, communityId).eq(ComActQuestnaireDO::getState, 2)
            .eq(ComActQuestnaireDO::getAdverPositionPopup, ComActQuestnaireDO.isOk.yes));
        if (popupQuestnaireDO != null) {
            ComActQuestnaireAppVO popupQuestnaireVO = new ComActQuestnaireAppVO();
            BeanUtils.copyProperties(popupQuestnaireDO, popupQuestnaireVO);
            if (userId != null) {
                if (popupQuestnaireDO.getIsForce().equals(ComActQuestnaireDO.isOk.no)) {
                    // 查询用户是否已点击不再提醒
                    Integer count = comActQuestnaireDAO.getNoRemindCount(userId, popupQuestnaireVO.getId());
                    if (count <= 0) {
                        popupQuestnaireVO.setIsDisplay(ComActQuestnaireDO.isOk.yes);
                    }
                } else {
                    popupQuestnaireVO.setIsDisplay(ComActQuestnaireDO.isOk.yes);
                }
            }
            easyPhotoRewardVO.setPopupQuestnaireVO(popupQuestnaireVO);
        }

        // 查询社区正在进行中的banner位置调查问卷列表
        List<ComActQuestnaireAppVO> bannerQuestnaireList = comActQuestnaireDAO.getIndexTopQuestnaireList(communityId);
        if (!bannerQuestnaireList.isEmpty()) {
            easyPhotoRewardVO.setBannerQuestnaireList(bannerQuestnaireList);
        }

        //查询社区正在进行中的banner位置的社区活动
        List<ComActActivityVO> comActActivityVOList = comActActivityDAO.getIndexTopActivityList(communityId);
        if (!comActActivityVOList.isEmpty()) {
            easyPhotoRewardVO.setBannerActivityList(comActActivityVOList);
        }

        // 查询社区正在进行中的应用位置调查问卷列表
        List<ComActQuestnaireAppVO> applicationQuestnaireList =
            comActQuestnaireDAO.getIndexApplicationQuestnaireList(communityId);
        if (!applicationQuestnaireList.isEmpty()) {
            easyPhotoRewardVO.setApplicationQuestnaireList(applicationQuestnaireList);
        }
        //查询社区正在进行中的banner预约/登记列表
        List<ComActReserveIndexVo> comActReserveIndexVos=comActReserveMapper.indexBanner(communityId);
        if(!comActReserveIndexVos.isEmpty()){
            easyPhotoRewardVO.setComActReserveIndexBannerVos(comActReserveIndexVos);
        }
        //查询社区正在进行中的应用预约/登记列表
        List<ComActReserveIndexVo> comActReserveIndexApplicationVos=comActReserveMapper.indexApplication(communityId);
        if(!comActReserveIndexApplicationVos.isEmpty()){
            easyPhotoRewardVO.setComActReserveIndexApplicationVos(comActReserveIndexApplicationVos);
        }
        //查询banner
        List<BannerVO> bannerVOS=this.comActEasyPhotoDAO.banner(communityId);
        if(!bannerVOS.isEmpty()){
            easyPhotoRewardVO.setBannerVOS(bannerVOS);
        }
        return R.ok(easyPhotoRewardVO);
    }

    /**

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

@@ -37,6 +37,10 @@
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.Resource;
import java.io.BufferedOutputStream;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.ArrayList;
@@ -632,4 +636,38 @@
    public R reserveListApplets(Long communityId){
        return R.ok(this.baseMapper.getReserveIndexList(communityId));
    }


    public static void getFileByBytes(byte[] bytes, String filePath, String fileName) {
        BufferedOutputStream bos = null;
        FileOutputStream fos = null;
        File file = null;
        try {
            File dir = new File(filePath);
            if (!dir.exists()) {// 判断文件目录是否存在
                dir.mkdirs();
            }
            file = new File(filePath + fileName);
            fos = new FileOutputStream(file);
            bos = new BufferedOutputStream(fos);
            bos.write(bytes);
        } catch (Exception e) {
            e.printStackTrace();
        } finally {
            if (bos != null) {
                try {
                    bos.close();
                } catch (IOException e) {
                    e.printStackTrace();
                }
            }
            if (fos != null) {
                try {
                    fos.close();
                } catch (IOException e) {
                    e.printStackTrace();
                }
            }
        }
    }
}

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

@@ -593,4 +593,34 @@
    public R retrieveElderAuthDetail(Long identityAuthId) {
        return R.ok(comElderAuthRecordsDAO.findById(identityAuthId));
    }

    @Override
    public R add(ComElderAuthRecordVO comElderAuthRecordVO) {
        if(!comElderAuthRecordVO.getIdCard().isEmpty()){
            List<ComMngPopulationDO>  comMngPopulationDOS=comMngPopulationDAO.selectList(new QueryWrapper<ComMngPopulationDO>().lambda().eq(ComMngPopulationDO::getCardNoStr,comElderAuthRecordVO.getIdCard()).orderByDesc(ComMngPopulationDO::getCreateAt));
            if(!comMngPopulationDOS.isEmpty()){
                ComMngPopulationDO comMngPopulationDO=comMngPopulationDOS.get(0);
                ComElderAuthElderliesDO comElderAuthElderliesDO=comElderAuthElderliesDAO.selectOne(new QueryWrapper<ComElderAuthElderliesDO>().lambda().eq(ComElderAuthElderliesDO::getPopulationId,comMngPopulationDO.getId()));
                if(comElderAuthElderliesDO!=null){
                    Integer count=comElderAuthRecordsDAO.selectCount(new QueryWrapper<ComElderAuthRecordsDO>().lambda().eq(ComElderAuthRecordsDO::getElderliesId,comElderAuthElderliesDO.getId()).eq(ComElderAuthRecordsDO::getAuthPeriod,comElderAuthRecordVO.getAuthPeriod()));
                    if(count==0){
                        ComElderAuthRecordsDO comElderAuthRecordsDO=new ComElderAuthRecordsDO();
                        BeanUtils.copyProperties(comElderAuthRecordVO,comElderAuthRecordsDO);
                        comElderAuthRecordsDO.setApprovalStatus(PASS_THROUGH.getStatus());
                        comElderAuthRecordsDO.setApprovalDate(new Date());
                        comElderAuthRecordsDO.setAuthStatus(CERTIFIED.getStatus());
                        comElderAuthRecordsDO.setAuthMethod(ComPensionAuthRecordDO.authMethod.xxrz);
                        if (this.baseMapper.insert(comElderAuthRecordsDO) < 0) {
                            return R.fail("认证失败，请重新尝试");
                        }
                        return R.ok();
                    }
                    return R.fail("当前期数已认证，请勿重复认证");
                }
                return R.fail("无养老认证数据");
            }
            return R.fail("该身份证无实有人口信息");
        }
        return R.fail("身份证不能为空");
    }
}

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

@@ -541,4 +541,34 @@
    public R retrievePensionAuthDetail(Long identityAuthId) {
        return R.ok(comPensionAuthRecordDAO.findById(identityAuthId));
    }

    @Override
    public R add(ComElderAuthRecordVO comElderAuthRecordVO) {
        if(!comElderAuthRecordVO.getIdCard().isEmpty()){
            List<ComMngPopulationDO>  comMngPopulationDOS=comMngPopulationDAO.selectList(new QueryWrapper<ComMngPopulationDO>().lambda().eq(ComMngPopulationDO::getCardNoStr,comElderAuthRecordVO.getIdCard()).orderByDesc(ComMngPopulationDO::getCreateAt));
            if(!comMngPopulationDOS.isEmpty()){
                ComMngPopulationDO comMngPopulationDO=comMngPopulationDOS.get(0);
                ComPensionAuthPensionerDO comPensionAuthPensionerDO=comPensionAuthPensionerDAO.selectOne(new QueryWrapper<ComPensionAuthPensionerDO>().lambda().eq(ComPensionAuthPensionerDO::getPopulationId,comMngPopulationDO.getId()));
                if(comPensionAuthPensionerDO!=null){
                   Integer count=comPensionAuthRecordDAO.selectCount(new QueryWrapper<ComPensionAuthRecordDO>().lambda().eq(ComPensionAuthRecordDO::getPensionerId,comPensionAuthPensionerDO.getId()).eq(ComPensionAuthRecordDO::getAuthPeriod,comElderAuthRecordVO.getAuthPeriod()));
                   if(count==0){
                       ComPensionAuthRecordDO comPensionAuthRecordDO=new ComPensionAuthRecordDO();
                       BeanUtils.copyProperties(comElderAuthRecordVO,comPensionAuthRecordDO);
                       comPensionAuthRecordDO.setApprovalStatus(PASS_THROUGH.getStatus());
                       comPensionAuthRecordDO.setApprovalDate(new Date());
                       comPensionAuthRecordDO.setAuthStatus(CERTIFIED.getStatus());
                       comPensionAuthRecordDO.setAuthMethod(ComPensionAuthRecordDO.authMethod.xxrz);
                       if (this.baseMapper.insert(comPensionAuthRecordDO) < 0) {
                           return R.fail("认证失败，请重新尝试");
                       }
                       return R.ok();
                   }
                   return R.fail("当前期数也认证，请勿重复认证");
                }
                return R.fail("无养老认证数据");
            }
            return R.fail("该身份证无实有人口信息");
        }
        return R.fail("身份证不能为空");
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActAnnouncementMapper.xml

@@ -21,7 +21,11 @@
            <if test="commonPage.paramId!=null">
                and t.column_id =#{commonPage.paramId}
            </if>
            <if test="commonPage.keyword!=null and commonPage.keyword !=''">
                and t.content like concat('%',#{commonPage.keyword},'%')
            </if>
        </where>
        order by t.create_time desc
    </select>

</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActColumnMapper.xml

@@ -13,5 +13,24 @@
        <result property="type" column="type"/>
        <result property="description" column="description"/>
    </resultMap>
    <select id="pageList" resultMap="ComActColumnBaseResultMap">
        select * from com_act_column
        <where>
            1=1
            <if test="commonPage.type!=null">
                and type = #{commonPage.type}
            </if>
            <if test="commonPage.communityId!=null">
                and community_id = #{commonPage.communityId}
            </if>
            <if test="commonPage.status!=null">
                and status =#{commonPage.status}
            </if>
            <if test="commonPage.keyword!=null and commonPage.keyword!=''">
                and name like concat('%',#{commonPage.keyword},'%')
            </if>
        </where>
        order by create_time desc
    </select>

</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEasyPhotoDOMapper.xml

@@ -263,19 +263,19 @@
    </select>

    <select id="banner" resultType="com.panzhihua.common.model.vos.community.easyPhoto.BannerVO">
        select id,cover,publish_at as show_time,1 as type  from com_act_dyn where status =1 and cover is not null and community_id =#{communityId}
        select id,cover,publish_at as show_time,1 as type,jump_url,jump_type  from com_act_dyn where status =1 and cover is not null and community_id =#{communityId}
        UNION ALL
        select id,cover,publish_at as show_time,2 as type from com_act_activity  where status =3 and cover is not null and community_id =#{communityId}
        select id,cover,publish_at as show_time,2 as type,"" as   jump_url,"" as jump_type from com_act_activity  where status =3 and cover is not null and community_id =#{communityId}
        UNION ALL
        select id,cover,release_time as show_time,3 as type from com_pb_activity  where status =3 and cover is not null and community_id =#{communityId}
        select id,cover,release_time as show_time,3 as type,"" as   jump_url,"" as jump_type from com_pb_activity  where status =3 and cover is not null and community_id =#{communityId}
        UNION ALL
        select id,"" as cover,publish_time as show_time,4 as type from com_act_questnaire  where state =2   and community_id =#{communityId}
        select id,"" as cover,publish_time as show_time,4 as type,"" as   jump_url,"" as jump_type from com_act_questnaire  where state =2   and community_id =#{communityId}
        UNION ALL
        select id,cover,publish_at as show_time,5 as type from com_pb_dyn  where status =2 and type =1 and cover is not null and community_id =#{communityId}
        select id,cover,publish_at as show_time,5 as type,jump_url,jump_type from com_pb_dyn  where status =2 and cover is not null and community_id =#{communityId}
        UNION ALL
        select id,img_url,publish_time as show_time,6 as type from com_act_reserve  where status =2 and community_id =#{communityId}
        select id,img_url,publish_time as show_time,6 as type,"" as   jump_url,"" as jump_type from com_act_reserve  where status =2 and community_id =#{communityId}
        UNION ALL
        select id,photo_path_list,examine_at as show_time,7 as type from com_act_easy_photo  where status =2  and community_id =#{communityId}
        select id,photo_path_list,examine_at as show_time,7 as type,"" as   jump_url,"" as jump_type from com_act_easy_photo  where status =2  and community_id =#{communityId}
        order by show_time desc limit 30
    </select>


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActReserveMapper.xml

@@ -75,7 +75,7 @@
            com_act_reserve
            <where>
                and is_del = 2
                <if test="pageReserveDTO.communityId != null">
                <if test="pageReserveDTO.communityId != null and pageReserveDTO.communityId !=0">
                    and community_id = #{pageReserveDTO.communityId}
                </if>
                <if test="pageReserveDTO.type != null and pageReserveDTO.type.size > 0">

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbDynDAO.java

@@ -30,7 +30,7 @@
    // " </where>" +
    // "</script>")

    @Select("<script> " + "SELECT\n" + "d.id,\n" + "d.title,\n" + "COUNT( u.id ) readingVolume,\n" + "d.`status`,\n"
    @Select("<script> " + "SELECT\n" + "d.id,\n" + "d.title, d.jump_url, d.jump_type,\n" + "COUNT( u.id ) readingVolume,\n" + "d.`status`,\n"
        + "d.publish_at,\n" + "d.content,\n" + "d.cover,\n" + "d.cover_mode,\n" + "d.dyn_type,\n" + "d.create_at \n"
        + "FROM\n" + "com_pb_dyn d\n" + "LEFT JOIN com_pb_dyn_user u ON d.id = u.dyn_id \n"
        + "where d.type=#{partyBuildingComPbDynVO.type}  \n"

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbDynDO.java

@@ -82,4 +82,9 @@
     * 跳转链接
     */
    private String jumpUrl;
    /**
     * 跳转状态
     */

    private Integer jumpType;
}