Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuish...

101captain

2022-08-18 fc4813199d911650aa18d9175448a26791aef4bf

Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng_test

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

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

import javax.annotation.Resource;
import javax.validation.Valid;
import javax.validation.constraints.NotEmpty;

import com.panzhihua.common.model.dtos.community.ComActDiscussVoteOptionDTO;
import org.springframework.util.ObjectUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
@@ -200,21 +202,19 @@
    @ApiOperation(value = "一起议-投票")
    @PostMapping("discussoptionuser")
    public R addDiscussOptionUser(@RequestBody @Valid DiscussVoteOptionDTO discussVoteOptionDTO) {
        List<Long> optionIds = discussVoteOptionDTO.getOptionIds();
        if (optionIds.isEmpty()) {
            return R.fail("选项主键不能为空");
        List<ComActDiscussVoteOptionDTO> options = discussVoteOptionDTO.getOptions();
        if (options.isEmpty()) {
            return R.fail("选项内容不能为空");
        }
        ComActDiscussOptionUserDTO comActDiscussOptionUserDTO = new ComActDiscussOptionUserDTO();
        comActDiscussOptionUserDTO.setDiscussOptionIds(optionIds);
        comActDiscussOptionUserDTO.setUserId(this.getUserId());
        optionIds.forEach(optionId -> {
        discussVoteOptionDTO.setUserId(this.getUserId());
        options.forEach(option -> {
            // 议事投票计算积分
            AddComActIntegralUserDTO integralUserDTO = new AddComActIntegralUserDTO(optionId,
            AddComActIntegralUserDTO integralUserDTO = new AddComActIntegralUserDTO(option.getId(),
                    AddComActIntegralUserDTO.integralType.cyystp, this.getCommunityId(), this.getUserId());
            integralUserDTO.setIsComment(2);
            communityService.addIntegralTradeAdmin(integralUserDTO);
        });
        return communityService.addDiscussOptionUser(comActDiscussOptionUserDTO);
        return communityService.addDiscussOptionUser(discussVoteOptionDTO);
    }

    @ApiOperation(value = "一起议-增加浏览量")

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

@@ -55,6 +55,7 @@
        if (loginUserInfo != null) {
            neighborCircleAppDTO.setPhone(loginUserInfo.getPhone());
            neighborCircleAppDTO.setUserId(loginUserInfo.getUserId());
            neighborCircleAppDTO.setCheckUnitId(loginUserInfo.getCheckUnitId());
        }
        return communityService.pageRelationList(neighborCircleAppDTO);
    }

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

@@ -92,6 +92,12 @@
    @ApiModelProperty("议事内容类型（1.社区议事 2.院落议事 3.党群议事）")
    private Integer contentType;

    @ApiModelProperty("投票范围（1.全部居民 2.志愿者 3.党员）")
    private Integer voteScope;

    @ApiModelProperty("是否需要签名")
    private Boolean needSign;

    /**
     * 类型 1 议事 2 投票
     */

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

@@ -20,4 +20,7 @@
    @ApiModelProperty("选项内容")
    private String optionContent;

    @ApiModelProperty("是否需要填写原因")
    private Boolean needReason;

}

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

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

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

/**
 * @title: ComActDiscussVoteOptionDTO
 * @projectName:
 * @description: 一起议投票内容参数
 * @author: hans
 * @date: 2022/08/17 14:49
 */
@Data
@ApiModel("一起议投票内容参数")
public class ComActDiscussVoteOptionDTO {

    @ApiModelProperty("选项id")
    private Long id;

    @ApiModelProperty("投票原因")
    private String reason;

    @ApiModelProperty("签名")
    private String signUrl;

}

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

@@ -18,8 +18,10 @@
@Data
@ApiModel("一起议投票请求参数")
public class DiscussVoteOptionDTO {
    @ApiModelProperty("投票内容")
    @NotEmpty(message = "投票内容不能为空")
    private List<ComActDiscussVoteOptionDTO> options;

    @ApiModelProperty("主键")
    @NotEmpty(message = "投票选项不能为空")
    private List<Long> optionIds;
    @ApiModelProperty(value = "投票人id", hidden = true)
    private Long userId;
}

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

@@ -60,4 +60,9 @@

    @ApiModelProperty("议事内容类型（1.社区议事 2.院落议事 3.党群议事）")
    private Integer contentType;

    @ApiModelProperty(value = "是否党员", hidden = true)
    private Integer isPbMember;
    @ApiModelProperty(value = "是否志愿者", hidden = true)
    private Integer isVolunteer;
}

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

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

import javax.validation.constraints.NotNull;

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

/**
 * @title: PageVoteSituationDTO
 * @projectName:
 * @description: 分页查询一起议投票情况
 * @author: hans
 * @date: 2022/08/17 16:43
 */
@Data
@ApiModel("分页查询一起议投票情况")
public class PageVoteSituationDTO {

    @ApiModelProperty(value = "议事投票id")
    @NotNull
    private Long discussId;

    @ApiModelProperty(value = "分页-当前页数", example = "1")
    private Long pageNum = 1L;

    @ApiModelProperty(value = "分页-每页记录数", example = "10")
    private Long pageSize = 10L;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/acid/BatchCheckAcidRecordDTO.java

New file
@@ -0,0 +1,28 @@
package com.panzhihua.common.model.dtos.community.acid;

import java.util.List;

import javax.validation.constraints.NotEmpty;

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

/**
 * @title: BatchCheckAcidRecordDTO
 * @projectName:
 * @description:批量核对填报记录
 * @author: hans
 * @date: 2022/08/18 10:18
 */
@Data
@ApiModel("批量核对填报记录")
public class BatchCheckAcidRecordDTO {

    @ApiModelProperty("填报记录id")
    @NotEmpty
    private List<Long> ids;

    @ApiModelProperty("备注")
    private String remark;
}

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

@@ -52,6 +52,9 @@
    private Integer orderType;
    @ApiModelProperty("清单状态")
    private Integer status;

    @ApiModelProperty(value = "单位id", hidden = true)
    private Long checkUnitId;
    /**
     * 使用类型（1.邻里圈 2.问题清单 3.需求清单）
     */

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

@@ -25,6 +25,7 @@
    private Long id;

    @ApiModelProperty("一起议主键")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long discussId;

    @ApiModelProperty("评论内容")
@@ -41,6 +42,7 @@
    private Integer isAuthor;

    @ApiModelProperty("上级评论id 默认0表示一级评论")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long parentId;

    @ApiModelProperty("用户主键")

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

@@ -2,6 +2,8 @@

import java.util.Date;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -21,15 +23,18 @@
    private Long id;

    @ApiModelProperty("一起议选项id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long discussOptionId;

    @ApiModelProperty("投票人id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long userId;

    @ApiModelProperty("投票时间")
    private Date createAt;

    @ApiModelProperty("一起议id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long discussId;

    @ApiModelProperty("投票人昵称")
@@ -37,4 +42,16 @@

    @ApiModelProperty("投票人头像")
    private String imageUrl;

    @ApiModelProperty("签名")
    private String signUrl;

    @ApiModelProperty("投票原因")
    private String reason;

    @ApiModelProperty("选项内容")
    private String optionContent;

    @ApiModelProperty("选项图片url")
    private String optionUrl;
}

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

@@ -25,6 +25,7 @@
    private Long id;

    @ApiModelProperty("一起议主键")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long discussId;

    @ApiModelProperty("选项内容")
@@ -48,4 +49,7 @@

    @ApiModelProperty("投票选项占比")
    private BigDecimal percent;

    @ApiModelProperty("是否需要填写原因")
    private Boolean needReason;
}

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

@@ -38,9 +38,11 @@
    private String address;

    @ApiModelProperty("发布人主键")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long userId;

    @ApiModelProperty("社区主键")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long communityId;

    @ApiModelProperty("create_at")
@@ -135,6 +137,12 @@
    @ApiModelProperty("已参与投票人数")
    private Integer votedPersonNum;

    @ApiModelProperty("投票范围（1.全部居民 2.志愿者 3.党员）")
    private Integer voteScope;

    @ApiModelProperty("是否需要签名")
    private Boolean needSign;

    /**
     * 类型 1 议事 2 投票
     */

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

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

import com.panzhihua.common.model.dtos.PageBaseDTO;
import com.panzhihua.common.model.dtos.community.ActivityInviteDTO;
import com.panzhihua.common.model.dtos.community.DiscussVoteOptionDTO;
import com.panzhihua.common.model.dtos.community.PageActivityInviteDTO;
import com.panzhihua.common.model.dtos.community.PageVoteSituationDTO;
import com.panzhihua.common.model.dtos.community.acid.*;
import com.panzhihua.common.model.dtos.community.dpc.AddDpcDTO;
import com.panzhihua.common.model.dtos.community.dpc.EditDpcDTO;
@@ -1635,12 +1637,12 @@
    /**
     * 议事投票-投票
     *
     * @param comActDiscussOptionUserDTO
     * @param discussVoteOptionDTO
     *            投票信息
     * @return 投票结果
     */
    @PostMapping("adddiscussoptionuser")
    R addDiscussOptionUser(@RequestBody ComActDiscussOptionUserDTO comActDiscussOptionUserDTO);
    R addDiscussOptionUser(@RequestBody DiscussVoteOptionDTO discussVoteOptionDTO);

    /**
     * 议事投票-评论-点赞、取消点赞
@@ -10317,4 +10319,28 @@
     */
    @PostMapping("/neighbor/pageRelationList")
    R pageRelationList(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO);

    /**
     * 投票情况-分页查询
     * @param pageVoteSituationDTO
     * @return
     */
    @PostMapping("pageVoteSituation")
    R pageVoteSituation(@RequestBody PageVoteSituationDTO pageVoteSituationDTO);

    /**
     * 投票情况详情
     * @param optionUserId
     * @return
     */
    @GetMapping("detailVoteSituation")
    R detailVoteSituation(@RequestParam("optionUserId") Long optionUserId);

    /**
     * 批量核对防疫信息数据
     * @param batchCheckAcidRecordDTO
     * @return
     */
    @PostMapping("/comActAcidRecord/batchCheck")
    R batchCheck(@RequestBody BatchCheckAcidRecordDTO batchCheckAcidRecordDTO);
}

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

@@ -10,6 +10,7 @@
import com.panzhihua.common.constants.Constants;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.interfaces.OperLog;
import com.panzhihua.common.model.dtos.community.acid.BatchCheckAcidRecordDTO;
import com.panzhihua.common.model.dtos.community.acid.ComActAcidRecordDTO;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
@@ -35,6 +36,7 @@
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import javax.validation.Valid;
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
@@ -42,6 +44,9 @@
import java.net.URL;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;

import static org.apache.commons.lang3.ObjectUtils.isEmpty;

/**
 * (ComActAcidRecord)表控制层
@@ -142,6 +147,14 @@
        return this.communityService.updateComActAcidRecord(comActAcidRecordVO);
    }


    @OperLog(operModul = "批量核对防疫信息数据", operType = 1)
    @ApiOperation(value = "批量核对防疫信息数据")
    @PostMapping("/batchCheck")
    public R batchCheck(@RequestBody @Valid BatchCheckAcidRecordDTO batchCheckAcidRecordDTO) {
        return this.communityService.batchCheck(batchCheckAcidRecordDTO);
    }

    /**
     * 删除数据
     *

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

@@ -1,24 +1,39 @@
package com.panzhihua.community_backstage.api;

import javax.annotation.Resource;
import javax.validation.Valid;

import com.panzhihua.common.model.dtos.community.discuss.ComActDiscussDetailDTO;
import com.panzhihua.common.model.dtos.community.discuss.ComActDiscussPublishResultDTO;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.*;
import com.panzhihua.common.model.dtos.community.ComActDiscussCommentDTO;
import com.panzhihua.common.model.dtos.community.ComActDiscussDTO;
import com.panzhihua.common.model.dtos.community.PageComActDiscussCommentDTO;
import com.panzhihua.common.model.dtos.community.PageComActDiscussDTO;
import com.panzhihua.common.model.dtos.community.PageVoteSituationDTO;
import com.panzhihua.common.model.dtos.community.discuss.ComActDiscussDetailDTO;
import com.panzhihua.common.model.dtos.community.discuss.ComActDiscussPublishResultDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActDiscussCommentVO;
import com.panzhihua.common.model.vos.community.ComActDiscussOptionUserVO;
import com.panzhihua.common.model.vos.community.ComActDiscussVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.validated.AddGroup;

import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;

@@ -117,6 +132,19 @@
        return communityService.pageDiscussAdmin(pageComActDiscussDTO);
    }

    @ApiOperation(value = "投票情况-分页查询", response = ComActDiscussOptionUserVO.class)
    @PostMapping("pageVoteSituation")
    public R pageVoteSituation(@RequestBody @Valid PageVoteSituationDTO pageVoteSituationDTO) {
        return communityService.pageVoteSituation(pageVoteSituationDTO);
    }

    @ApiOperation(value = "投票情况详情", response = ComActDiscussOptionUserVO.class)
    @ApiImplicitParam(name = "optionUserId", value = "投票记录id", required = true)
    @GetMapping("detailVoteSituation")
    public R detailVoteSituation(@RequestParam("optionUserId") Long optionUserId) {
        return communityService.detailVoteSituation(optionUserId);
    }

    @ApiOperation(value = "议事投票-评论详情", response = ComActDiscussCommentVO.class)
    @GetMapping("discusscomment")
    public R detailDiscussComment(@RequestParam("id") Long id) {

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

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

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.api.ApiController;
import com.panzhihua.common.model.dtos.community.acid.BatchCheckAcidRecordDTO;
import com.panzhihua.common.model.dtos.community.acid.ComActAcidRecordDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.dtos.property.CommonPage;
@@ -103,6 +104,16 @@
    }

    /**
     * 批量核对防疫信息数据
     * @param batchCheckAcidRecordDTO
     * @return
     */
    @PostMapping("/batchCheck")
    public R batchCheck(@RequestBody BatchCheckAcidRecordDTO batchCheckAcidRecordDTO) {
        return this.comActAcidRecordService.batchCheck(batchCheckAcidRecordDTO);
    }

    /**
     * 小程序修改填报记录
     *
     * @param comActAcidRecordVO 实体对象

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

@@ -118,6 +118,26 @@
    }

    /**
     * 投票情况-分页查询
     * @param pageVoteSituationDTO
     * @return
     */
    @PostMapping("pageVoteSituation")
    public R pageVoteSituation(@RequestBody PageVoteSituationDTO pageVoteSituationDTO) {
        return comActDiscussService.pageVoteSituation(pageVoteSituationDTO);
    }

    /**
     * 投票情况详情
     * @param optionUserId
     * @return
     */
    @GetMapping("detailVoteSituation")
    public R detailVoteSituation(@RequestParam("optionUserId") Long optionUserId) {
        return comActDiscussService.detailVoteSituation(optionUserId);
    }

    /**
     * 议事投票-评论-查看
     * 
     * @param id
@@ -240,13 +260,13 @@
    /**
     * 议事投票-投票
     * 
     * @param comActDiscussOptionUserDTO
     * @param discussVoteOptionDTO
     *            投票信息
     * @return 投票结果
     */
    @PostMapping("adddiscussoptionuser")
    public R addDiscussOptionUser(@RequestBody ComActDiscussOptionUserDTO comActDiscussOptionUserDTO) {
        return comActDiscussService.addDiscussOptionUser(comActDiscussOptionUserDTO);
    public R addDiscussOptionUser(@RequestBody DiscussVoteOptionDTO discussVoteOptionDTO) {
        return comActDiscussService.addDiscussOptionUser(discussVoteOptionDTO);
    }

    /**

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

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.community.acid.BatchCheckAcidRecordDTO;
import com.panzhihua.common.model.dtos.community.acid.ComActAcidRecordDTO;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.community.acid.*;
@@ -123,4 +124,10 @@
     */
    List<ComActAcidChartsVO> selectCheck(@Param("date") String date,@Param("localCity") String localCity);

    /**
     * 批量核对防疫信息数据
     * @param batchCheckAcidRecordDTO
     * @return
     */
    void batchCheck(@Param("batchCheckAcidRecordDTO") BatchCheckAcidRecordDTO batchCheckAcidRecordDTO);
}

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

@@ -1,5 +1,8 @@
package com.panzhihua.service_community.dao;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.community.PageVoteSituationDTO;
import com.panzhihua.common.model.vos.community.ComActDiscussOptionUserVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -57,4 +60,18 @@
     * @return
     */
    int selectVotedPersonNum(@Param("discussId") Long discussId);

    /**
     * 投票情况-分页查询
     * @param pageVoteSituationDTO
     * @return
     */
    IPage<ComActDiscussOptionUserVO> pageVoteSituation(@Param("page") Page page, @Param("pageVoteSituationDTO") PageVoteSituationDTO pageVoteSituationDTO);

    /**
     * 投票情况详情
     * @param optionUserId
     * @return
     */
    ComActDiscussOptionUserVO detailVoteSituation(@Param("optionUserId") Long optionUserId);
}

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

@@ -161,6 +161,14 @@
     * 议事内容类型（1.社区议事 2.院落议事 3.党群议事）
     */
    private Integer contentType;
    /**
     * 投票范围（1.全部居民 2.志愿者 3.党员）
     */
    private Integer voteScope;
    /**
     * 是否需要签名
     */
    private Boolean needSign;

    /**
     * 类型 1 议事 2 投票

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

@@ -44,4 +44,9 @@
     */
    @TableField(fill = FieldFill.INSERT)
    private Date createAt;

    /**
     * 是否需要填写原因
     */
    private Boolean needReason;
}

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

@@ -45,4 +45,14 @@
     * 一起议id
     */
    private Long discussId;

    /**
     * 签名
     */
    private String signUrl;

    /**
     * 投票原因
     */
    private String reason;
}

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

@@ -1,5 +1,6 @@
package com.panzhihua.service_community.service;

import com.panzhihua.common.model.dtos.community.acid.BatchCheckAcidRecordDTO;
import com.panzhihua.common.model.dtos.community.acid.ComActAcidRecordDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.dtos.property.CommonPage;
@@ -7,6 +8,8 @@
import com.panzhihua.common.model.vos.community.acid.ComActAcidRecordVO;
import com.panzhihua.service_community.entity.ComActAcidRecord;
import org.springframework.web.bind.annotation.RequestParam;

import java.util.List;

/**
 * (ComActAcidRecord)表服务接口
@@ -106,4 +109,11 @@
    R detailByCommunity(Long id);

    R test();

    /**
     * 批量核对防疫信息数据
     * @param batchCheckAcidRecordDTO
     * @return
     */
    R batchCheck(BatchCheckAcidRecordDTO batchCheckAcidRecordDTO);
}

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

@@ -165,11 +165,11 @@
    /**
     * 议事投票-投票
     * 
     * @param comActDiscussOptionUserDTO
     * @param discussVoteOptionDTO
     *            投票信息
     * @return 投票结果
     */
    R addDiscussOptionUser(ComActDiscussOptionUserDTO comActDiscussOptionUserDTO);
    R addDiscussOptionUser(DiscussVoteOptionDTO discussVoteOptionDTO);

    /**
     * 议事投票-评论-点赞、取消点赞
@@ -256,4 +256,18 @@
     * @return
     */
    R getDiscussPermissions(ComActDiscussDTO comActDiscussDTO);

    /**
     * 投票情况-分页查询
     * @param pageVoteSituationDTO
     * @return
     */
    R pageVoteSituation(PageVoteSituationDTO pageVoteSituationDTO);

    /**
     * 投票情况详情
     * @param optionUserId
     * @return
     */
    R detailVoteSituation(Long optionUserId);
}

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

@@ -8,6 +8,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.community.acid.BatchCheckAcidRecordDTO;
import com.panzhihua.common.model.dtos.community.acid.ComActAcidRecordDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.acid.*;
@@ -565,6 +566,17 @@
        return null;
    }

    /**
     * 批量核对防疫信息数据
     * @param batchCheckAcidRecordDTO
     * @return
     */
    @Override
    public R batchCheck(BatchCheckAcidRecordDTO batchCheckAcidRecordDTO) {
        this.baseMapper.batchCheck(batchCheckAcidRecordDTO);
        return R.ok();
    }

    public static void areaCheck(ComCun area,ComStreetDO comStreetDO){
        switch (area.getArea()){
            case "西区": comStreetDO.setAreaCode(510423); break;

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

@@ -17,7 +17,12 @@
import java.util.stream.Collectors;

import javax.annotation.Resource;
import javax.validation.constraints.NotEmpty;

import com.panzhihua.common.model.dtos.community.ComActDiscussVoteOptionDTO;
import com.panzhihua.common.model.dtos.community.DiscussVoteOptionDTO;
import com.panzhihua.common.model.dtos.community.PageVoteSituationDTO;
import com.panzhihua.service_community.dao.ComPbMemberDAO;
import org.springframework.beans.BeanUtils;
import org.springframework.data.redis.connection.StringRedisConnection;
import org.springframework.data.redis.core.RedisCallback;
@@ -114,6 +119,8 @@
    private UserService userService;
    @Resource
    private StringRedisTemplate stringRedisTemplate;
    @Resource
    private ComPbMemberDAO pbMemberDAO;

    /**
     * 议事投票-新增
@@ -163,6 +170,7 @@
                    comActDiscussOptionDO.setDiscussId(comActDiscussDO1Id);
                    comActDiscussOptionDO.setOptionContent(s.getOptionContent());
                    comActDiscussOptionDO.setOptionUrl(s.getOptionUrl());
                    comActDiscussOptionDO.setNeedReason(s.getNeedReason());
                    comActDiscussOptionDOS.add(comActDiscussOptionDO);
                });
                comActDiscussOptionService.saveBatch(comActDiscussOptionDOS);
@@ -615,6 +623,12 @@
        }
        page.setSize(pageSize);
        page.setCurrent(pageNum);
        pageComActDiscussDTO.setIsPbMember(0);
        pageComActDiscussDTO.setIsVolunteer(0);
        if (nonNull(loginUserId)) {
            pageComActDiscussDTO.setIsPbMember(pbMemberDAO.checkIsPbMember(loginUserId) > 0 ? 1 : 0);
            pageComActDiscussDTO.setIsVolunteer(pbMemberDAO.checkIsVolunteer(loginUserId) > 0 ? 1 : 0);
        }
        IPage<ComActDiscussVO> iPage = comActDiscussDAO.pageDiscussApplets(page, pageComActDiscussDTO);
        List<ComActDiscussVO> records = iPage.getRecords();
        if (!ObjectUtils.isEmpty(records)) {
@@ -949,14 +963,14 @@
    /**
     * 议事投票-投票
     *
     * @param comActDiscussOptionUserDTO 投票信息
     * @param discussVoteOptionDTO 投票信息
     * @return 投票结果
     */
    @Override
    public R addDiscussOptionUser(ComActDiscussOptionUserDTO comActDiscussOptionUserDTO) {
        List<Long> discussOptionIds = comActDiscussOptionUserDTO.getDiscussOptionIds();
        Long discussOptionId = discussOptionIds.get(0);
        Long userId = comActDiscussOptionUserDTO.getUserId();
    public R addDiscussOptionUser(DiscussVoteOptionDTO discussVoteOptionDTO) {
        List<ComActDiscussVoteOptionDTO> options = discussVoteOptionDTO.getOptions();
        Long discussOptionId = options.get(0).getId();
        Long userId = discussVoteOptionDTO.getUserId();
        ComActDiscussOptionDO comActDiscussOptionDO = comActDiscussOptionDAO.selectById(discussOptionId);
        if (ObjectUtils.isEmpty(comActDiscussOptionDO)) {
            return R.fail("选项不存在");
@@ -973,7 +987,7 @@
        }
        boolean isRepeat = comActDiscussDO.getIsRepeat().intValue() == 1;
        int usableVoteVotes = comActDiscussDO.getCount().intValue();
        int currentVoteNum = discussOptionIds.size();
        int currentVoteNum = options.size();
        if (isRepeat) {
            //可重复投票
            int votedVotesInToday = comActDiscussOptionUserDAO.selectVotedVotesInToday(discussId, userId);
@@ -990,11 +1004,13 @@
            }
        }
        List<ComActDiscussOptionUserDO> comActDiscussOptionUserDOList = new ArrayList<>();
        discussOptionIds.forEach(optionId -> {
        options.forEach(option -> {
            ComActDiscussOptionUserDO comActDiscussOptionUserDO = new ComActDiscussOptionUserDO();
            comActDiscussOptionUserDO.setUserId(userId);
            comActDiscussOptionUserDO.setDiscussOptionId(optionId);
            comActDiscussOptionUserDO.setDiscussOptionId(option.getId());
            comActDiscussOptionUserDO.setDiscussId(discussId);
            comActDiscussOptionUserDO.setSignUrl(option.getSignUrl());
            comActDiscussOptionUserDO.setReason(option.getReason());
            comActDiscussOptionUserDAO.insert(comActDiscussOptionUserDO);
        });
        return R.ok();
@@ -1297,6 +1313,29 @@
    }

    /**
     * 投票情况-分页查询
     * @param pageVoteSituationDTO
     * @return
     */
    @Override
    public R pageVoteSituation(PageVoteSituationDTO pageVoteSituationDTO) {
        Page page = new Page<>();
        page.setCurrent(pageVoteSituationDTO.getPageNum());
        page.setSize(pageVoteSituationDTO.getPageSize());
        return R.ok(comActDiscussOptionUserDAO.pageVoteSituation(page, pageVoteSituationDTO));
    }

    /**
     * 投票情况详情
     * @param optionUserId
     * @return
     */
    @Override
    public R detailVoteSituation(Long optionUserId) {
        return R.ok(comActDiscussOptionUserDAO.detailVoteSituation(optionUserId));
    }

    /**
     * 将redis中浏览量写入表中
     * @return 执行结果
     */

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

@@ -21,6 +21,16 @@
        <result property="vaccination" column="vaccination"/>
        <result property="acidTest" column="acid_test"/>
    </resultMap>
    <update id="batchCheck">
        UPDATE com_act_acid_record SET check_status = 1
        <if test="batchCheckAcidRecordDTO.remark != null and batchCheckAcidRecordDTO.remark != &quot;&quot;">
            ,remark = #{batchCheckAcidRecordDTO.remark}
        </if>
        WHERE id IN
        <foreach collection="batchCheckAcidRecordDTO.ids" item="id" index="index" open="(" separator="," close=")">
            #{id}
        </foreach>
    </update>

    <select id="pageList" resultType="com.panzhihua.common.model.vos.community.acid.ComActAcidRecordVO">
        select * from com_act_acid_record

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

@@ -359,7 +359,15 @@
        LEFT JOIN com_act ca ON a.community_id = ca.community_id
        WHERE 1 = 1
        <if test ="comActActivityVO.communityId != null and comActActivityVO.communityId != 0">
            <if test="comActActivityVO.checkUnitId != null">
                AND (a.community_id = ${comActActivityVO.communityId} OR a.check_unit_id = #{comActActivityVO.checkUnitId})
            </if>
            <if test="comActActivityVO.checkUnitId == null">
            AND a.community_id = ${comActActivityVO.communityId}
                <if test="comActActivityVO.type == null">
                    AND a.`type` != 5
                </if>
            </if>
        </if>
        <if test ="comActActivityVO.phone != null and comActActivityVO.phone != &quot;&quot;">
            AND a.phone = ${comActActivityVO.phone}
@@ -367,7 +375,7 @@
        <if test ="comActActivityVO.areaCode != null">
            AND ca.area_code = ${comActActivityVO.areaCode}
        </if>
        <if test ="comActActivityVO.checkUnitId != null">
        <if test ="comActActivityVO.checkUnitId != null and comActActivityVO.communityId == null">
            AND a.check_unit_id = #{comActActivityVO.checkUnitId}
        </if>
        <if test="comActActivityVO.activityName != null and comActActivityVO.activityName.trim() != &quot;&quot;">

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

@@ -183,6 +183,12 @@
                LEFT JOIN com_act_discuss_option_user ou ON do.id=ou.discuss_option_id AND ou.user_id=#{pageComActDiscussDTO.loginUserId}
            </if>
            WHERE d.community_id = ${pageComActDiscussDTO.communityId} AND d.is_del = 2 AND d.status != 1
                <if test="pageComActDiscussDTO.isPbMember == 0">
                    AND d.vote_scope != 3
                </if>
                <if test="pageComActDiscussDTO.isVolunteer == 0">
                    AND d.vote_scope != 2
                </if>
                <if test='pageComActDiscussDTO.type != null '>
                    AND d.`type` = #{pageComActDiscussDTO.type}
                </if>

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

@@ -34,4 +34,27 @@
        FROM `com_act_discuss_option_user`
        WHERE discuss_id = #{discussId}
    </select>
    <select id="pageVoteSituation"
            resultType="com.panzhihua.common.model.vos.community.ComActDiscussOptionUserVO">
        SELECT
            cadou.*,
            su.nick_name,
            su.image_url
        FROM `com_act_discuss_option_user` cadou
        LEFT JOIN `sys_user` su ON cadou.user_id = su.user_id
        WHERE cadou.discuss_id = #{pageVoteSituationDTO.discussId}
    </select>
    <select id="detailVoteSituation"
            resultType="com.panzhihua.common.model.vos.community.ComActDiscussOptionUserVO">
        SELECT
            cadou.*,
            su.nick_name,
            su.image_url,
            cado.option_content,
            cado.option_url
        FROM `com_act_discuss_option_user` cadou
        LEFT JOIN com_act_discuss_option cado ON cadou.discuss_option_id = cado.id
        LEFT JOIN `sys_user` su ON cadou.user_id = su.user_id
        WHERE cadou.id = #{optionUserId}
    </select>
</mapper>

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

@@ -249,7 +249,7 @@
         select count(t1.checkId) as times,COALESCE(sum(t1.hours),0) as hours from
         ((select real_service_time as hours,solve_unit_id  as checkId  from com_act_neighbor_circle  where order_type = 1 AND is_del = 2 and solve_status = 4 and solve_unit_id = #{checkUnitId} and order_time between concat(#{date},'-01-01 00:00:00') and concat(#{date},'-12-31 23:59:59'))
          union all
         (select duration as hours,check_unit_id as checkId from com_act_activity  where check_unit_id = #{checkUnitId} and publish_at between concat(#{date},'-01-01 00:00:00') and concat(#{date},'-12-31 23:59:59'))
         (select duration as hours,check_unit_id as checkId from com_act_activity  where check_unit_id = #{checkUnitId} AND `status` = 5 and publish_at between concat(#{date},'-01-01 00:00:00') and concat(#{date},'-12-31 23:59:59'))
          union all
         (SELECT a.duration AS hours,s.check_unit_id AS checkId FROM com_act_activity a LEFT JOIN com_act_act_regist s ON a.id = s.activity_id
            WHERE s.end_time IS NOT NULL AND s.check_unit_id = #{checkUnitId} AND s.start_time BETWEEN concat( #{date}, '-01-01 00:00:00' ) AND concat( #{date}, '-12-31 23:59:59' ) GROUP BY a.id)
@@ -314,6 +314,7 @@
                com_act_activity
                WHERE
                check_unit_id = #{checkUnitId}
                AND `status` = 5
                AND publish_at BETWEEN concat( #{date}, '-01-01 00:00:00' )
                AND concat( #{date}, '-12-31 23:59:59' )
            ) temp ORDER BY serviceAt
@@ -362,6 +363,7 @@
            com_act_activity
            WHERE
            check_unit_id = #{checkUnitId}
            AND `status` = 5
            AND publish_at BETWEEN concat( #{date}, '-01-01 00:00:00' )
            AND concat( #{date}, '-12-31 23:59:59' )
            ORDER BY serviceAt
@@ -372,6 +374,7 @@
        <if test="serviceType == null">
            SELECT * FROM (
            SELECT
            canc.id AS serviceId,
            canc.order_time AS serviceAt,
            canc.real_service_time AS serviceTime,
            1 AS serviceType
@@ -388,6 +391,7 @@
            <if test="checkUnitId != null">
                UNION ALL
                SELECT
                a.id AS serviceId,
                a.publish_at AS serviceAt,
                a.duration AS serviceTime,
                2 AS serviceType
@@ -406,6 +410,7 @@
            </if>
            UNION ALL
            SELECT
            a.id AS serviceId,
            a.publish_at AS serviceAt,
            a.duration AS serviceTime,
            3 AS serviceType
@@ -423,6 +428,7 @@
            a.id
            UNION ALL
            SELECT
            a.id AS serviceId,
            a.publish_at AS serviceAt,
            a.duration AS serviceTime,
            4 AS serviceType
@@ -443,6 +449,7 @@
        </if>
        <if test="serviceType == 1">
            SELECT
            canc.id AS serviceId,
            canc.order_time AS serviceAt,
            canc.real_service_time AS serviceTime,
            1 AS serviceType
@@ -460,6 +467,7 @@
        </if>
        <if test="serviceType == 2 and checkUnitId != null">
            SELECT
            a.id AS serviceId,
            a.publish_at AS serviceAt,
            a.duration AS serviceTime,
            2 AS serviceType
@@ -478,6 +486,7 @@
        </if>
        <if test="serviceType == 3">
            SELECT
            a.id AS serviceId,
            a.publish_at AS serviceAt,
            a.duration AS serviceTime,
            3 AS serviceType
@@ -496,6 +505,7 @@
        </if>
        <if test="serviceType == 4">
            SELECT
            a.id AS serviceId,
            a.publish_at AS serviceAt,
            a.duration AS serviceTime,
            4 AS serviceType
@@ -567,7 +577,7 @@
            unitId,caa.community_id as communityId,cpcu.belong_to
            FROM com_act_activity as caa
            left join com_pb_check_unit as cpcu on caa.check_unit_id=cpcu.id
            where caa.check_unit_id&lt;>''
            where caa.`status` = 5 AND caa.check_unit_id&lt;>''
            and caa.type=5
            <if test="beginTime != null">
                and caa.publish_at between #{beginTime} and #{endTime}
@@ -605,12 +615,13 @@
            resultType="com.panzhihua.common.model.vos.neighbor.PartyMemberAnalysisVO">
        SELECT count(id) as serviceTimes, sum(duration) as serviceTime, unitId,
        communityId, memberId, memberName, belongUnit, belongCommunity, belong_to FROM (
            SELECT caa.id, caa.duration, cpcu.check_unit_id as unitId, cpcu.community_id as communityId, su.user_id as
            SELECT caa.id, caa.duration, cpcu.id as unitId, cpcu.community_id as communityId, su.user_id as
            memberId, su.name as memberName, su.relation_name as belongUnit, ca.name as belongCommunity, cpcu.belong_to
            FROM `com_act_activity` as caa
            left join com_act_act_regist as caar on caa.id=caar.activity_id
            left join sys_user as su on caar.user_id=su.user_id
            left join com_pb_check_unit as cpcu on su.phone=cpcu.phone
            left join com_pb_member as cpm on su.phone=cpm.phone
            left join com_pb_check_unit as cpcu on cpm.check_unit_id=cpcu.id
            left join com_act as ca on cpcu.community_id=ca.community_id
            where caar.sign_identity = 2 AND cpcu.id IS NOT NULL
            <if test="beginTime != null">
@@ -623,7 +634,7 @@
                and cpcu.community_id=#{communityId}
            </if>
            <if test="unitId != null">
                and cpcu.check_unit_id=#{unitId}
                and cpcu.id=#{unitId}
            </if>
            GROUP BY caa.id,caar.user_id
        ) temp GROUP BY memberId
@@ -636,7 +647,8 @@
        ,cpcu.community_id as communityId,canc.solve_id as memberId,su.name as memberName,su.relation_name as belongUnit,ca.name as belongCommunity,cpcu.belong_to
        FROM `com_act_neighbor_circle` as canc
        left join sys_user as su on canc.solve_id=su.user_id
        left join com_pb_check_unit as cpcu on su.phone=cpcu.phone
        left join com_pb_member as cpm on su.phone=cpm.phone
        left join com_pb_check_unit as cpcu on cpm.check_unit_id=cpcu.id
        left join com_act as ca on cpcu.community_id=ca.community_id
        where cpcu.id IS NOT NULL
        <if test="beginTime != null">
@@ -701,9 +713,12 @@
        left join com_act_neighbor_circle_topic as canct on canct.id = canc.topic_id
        left join com_act as ca on ca.community_id = canc.community_id
        LEFT JOIN com_act_activity t ON canc.id = t.relation_id
        where is_del = 2 and canc.status = 2 and canc.community_id = ${neighborCircleAppDTO.communityId} AND t.id IS NULL
        where is_del = 2 and canc.status = 2 AND canc.order_type = 1 and canc.solve_status in (2,3,4) and canc.community_id = ${neighborCircleAppDTO.communityId} AND t.id IS NULL
        <if test='neighborCircleAppDTO.topicId != null '>
            and canc.topic_id = #{neighborCircleAppDTO.topicId}
        </if>
        <if test='neighborCircleAppDTO.checkUnitId != null '>
            and canc.solve_unit_id = #{neighborCircleAppDTO.checkUnitId}
        </if>
        <if test='neighborCircleAppDTO.belongType != null '>
            and canc.belong_type = #{neighborCircleAppDTO.belongType}
@@ -715,17 +730,6 @@
        </if>
        <if test="neighborCircleAppDTO.isHelp ==1">
            and (canc.help_member_content like concat ('%',#{neighborCircleAppDTO.phone},'%') or canc.help_org_content like concat ('%',#{neighborCircleAppDTO.phone},'%') )
        </if>
        <if test="neighborCircleAppDTO.solveStatus !=null">
            <if test="neighborCircleAppDTO.solveStatus ==1">
                and canc.solve_status in (0,1)
            </if>
            <if test="neighborCircleAppDTO.solveStatus ==2">
                and canc.solve_status =2
            </if>
            <if test="neighborCircleAppDTO.solveStatus ==3">
                and canc.solve_status in(3,4)
            </if>
        </if>
        order by canc.create_at desc
    </select>