bug修改

puhanshu

2022-03-14 dec24c9d3a66b3d4303b0c120818ec27bba611ef

bug修改

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

@@ -33,20 +33,38 @@
    @ApiModelProperty(value = "体育类党员人数")
    private Integer tyNum;

    @ApiModelProperty(value = "体育类党员人数百分比")
    private BigDecimal tyNumPercent = new BigDecimal(0);

    @ApiModelProperty(value = "美术类党员人数")
    private Integer msNum;

    @ApiModelProperty(value = "美术类党员人数百分比")
    private BigDecimal msNumPercent = new BigDecimal(0);

    @ApiModelProperty(value = "音乐类党员人数")
    private Integer yyNum;

    @ApiModelProperty(value = "音乐类党员人数百分比")
    private BigDecimal yyNumPercent = new BigDecimal(0);

    @ApiModelProperty(value = "舞蹈类党员人数")
    private Integer wdNum;

    @ApiModelProperty(value = "舞蹈类党员人数百分比")
    private BigDecimal wdNumPercent = new BigDecimal(0);

    @ApiModelProperty(value = "其他类党员人数")
    private Integer qtNum;

    @ApiModelProperty(value = "其他类党员人数百分比")
    private BigDecimal qtNumPercent = new BigDecimal(0);

    @ApiModelProperty(value = "无类型党员人数")
    private Integer wuNum;

    @ApiModelProperty(value = "无类型党员人数百分比")
    private BigDecimal wuNumPercent = new BigDecimal(0);

    @ApiModelProperty(value = "党员列表")
    private List<PartyBuildingMemberVO> partyMemberList;
@@ -60,15 +78,27 @@
    @ApiModelProperty(value = "参与志愿者活动次数")
    private Integer participateVolunteerActivityNum;

    @ApiModelProperty(value = "参与志愿者活动次数百分比")
    private BigDecimal participateVolunteerActivityNumPercent = new BigDecimal(0);

    @ApiModelProperty(value = "参与志愿者活动时长")
    private Integer participateVolunteerActivityDuration;

    @ApiModelProperty(value = "参与志愿者活动时长百分比")
    private BigDecimal participateVolunteerActivityDurationPercent = new BigDecimal(0);

    @ApiModelProperty(value = "参与党员活动次数")
    private Integer participatePartyActivityNum;

    @ApiModelProperty(value = "参与党员活动次数百分比")
    private BigDecimal participatePartyActivityNumPercent = new BigDecimal(0);

    @ApiModelProperty(value = "参与党员活动时长")
    private Integer participatePartyActivityDuration;

    @ApiModelProperty(value = "参与党员活动时长百分比")
    private BigDecimal participatePartyActivityDurationPercent = new BigDecimal(0);

    @ApiModelProperty(value = "月份统计list")
    private List<String> monthList;


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

@@ -302,6 +302,7 @@
        LoginUserInfoVO loginUserInfoVO = comActDiscussDAO.selectUserByUserId(userId);
        comActDiscussVO.setUserName(loginUserInfoVO.getName());
        comActDiscussVO.setUserNickName(loginUserInfoVO.getNickName());
        comActDiscussVO.setImageUrl(loginUserInfoVO.getImageUrl());

        //分页查询评论列表
        PageComActDiscussCommentDTO pageComActDiscussCommentDTO = new PageComActDiscussCommentDTO();

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

@@ -3,6 +3,7 @@
import java.io.Serializable;
import java.util.Date;

import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -56,6 +57,7 @@
    /**
     * 转正时间
     */
    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private Date employmentTime;

    /**

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java

@@ -48,6 +48,8 @@

import lombok.extern.slf4j.Slf4j;

import static java.util.Objects.nonNull;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 党员
@@ -263,6 +265,10 @@
            partyBuildingMemberVO.setOrgId(null);
        }
        BeanUtils.copyProperties(partyBuildingMemberVO, comPbMemberDO);
        Integer type = partyBuildingMemberVO.getType();
        if (nonNull(type) && type.equals(1)) {
            comPbMemberDO.setEmploymentTime(null);
        }
        comPbMemberDO.setAuditResult(partyBuildingMemberVO.getAuditResult());
        int i = comPbMemberDAO.updateById(comPbMemberDO);
        if (i > 0) {
@@ -404,8 +410,8 @@
            if (userId != null) {
                String userKey = UserConstants.LOGIN_USER_INFO + userId;
                stringRedisTemplate.delete(userKey);
                return R.ok();
            }
            return R.ok();
        }
        return R.fail();
    }
@@ -661,19 +667,19 @@
        if (partyBuildingMemberVO.getPhotoPath() != null) {
            comPbMemberDO.setPhotoPath(partyBuildingMemberVO.getPhotoPath());
        }
        if (Objects.nonNull(partyBuildingMemberVO.getType())) {
        if (nonNull(partyBuildingMemberVO.getType())) {
            comPbMemberDO.setType(partyBuildingMemberVO.getType());
        }
        if (StringUtils.isNotEmpty(partyBuildingMemberVO.getPosition())) {
            comPbMemberDO.setPosition(partyBuildingMemberVO.getPosition());
        }
        if (Objects.nonNull(partyBuildingMemberVO.getCheckUnitId())) {
        if (nonNull(partyBuildingMemberVO.getCheckUnitId())) {
            comPbMemberDO.setCheckUnitId(partyBuildingMemberVO.getCheckUnitId());
        }
        if (StringUtils.isNotEmpty(partyBuildingMemberVO.getFunction())) {
            comPbMemberDO.setFunction(partyBuildingMemberVO.getFunction());
        }
        if (Objects.nonNull(partyBuildingMemberVO.getSpecialtyCategory())) {
        if (nonNull(partyBuildingMemberVO.getSpecialtyCategory())) {
            comPbMemberDO.setSpecialtyCategory(partyBuildingMemberVO.getSpecialtyCategory());
            comPbMemberDO.setSpecialtyName(partyBuildingMemberVO.getSpecialtyName());
        }
@@ -811,15 +817,61 @@
        statisticsOrgVo.setCumulativeWishList(cumulativeWishList);
        statisticsOrgVo.setCumulativeEasyList(cumulativeEasyList);
        Integer partyMemberNum = statisticsOrgVo.getPartyMemberNum();
        if (Objects.nonNull(partyMemberNum) && partyMemberNum.intValue() > 0) {
        if (nonNull(partyMemberNum) && partyMemberNum.intValue() > 0) {
            Integer formalPartyMemberNum = statisticsOrgVo.getFormalPartyMemberNum();
            if (Objects.nonNull(formalPartyMemberNum) && formalPartyMemberNum.intValue() > 0) {
            if (nonNull(formalPartyMemberNum) && formalPartyMemberNum.intValue() > 0) {
                statisticsOrgVo.setFormalPartyMemberNumPercent(new BigDecimal(formalPartyMemberNum/partyMemberNum).setScale(2));
            }
            Integer preparePartyMemberNum = statisticsOrgVo.getPreparePartyMemberNum();
            if (Objects.nonNull(preparePartyMemberNum) && preparePartyMemberNum.intValue() > 0) {
            if (nonNull(preparePartyMemberNum) && preparePartyMemberNum.intValue() > 0) {
                statisticsOrgVo.setPreparePartyMemberNumPercent(new BigDecimal(preparePartyMemberNum/partyMemberNum).setScale(2));
            }
            Integer tyNum = statisticsOrgVo.getTyNum();
            if (nonNull(tyNum) && tyNum.intValue() > 0) {
                statisticsOrgVo.setTyNumPercent(new BigDecimal(tyNum/partyMemberNum).setScale(2));
            }
            Integer msNum = statisticsOrgVo.getMsNum();
            if (nonNull(msNum) && msNum.intValue() > 0) {
                statisticsOrgVo.setMsNumPercent(new BigDecimal(msNum/partyMemberNum).setScale(2));
            }
            Integer yyNum = statisticsOrgVo.getYyNum();
            if (nonNull(yyNum) && yyNum.intValue() > 0) {
                statisticsOrgVo.setYyNumPercent(new BigDecimal(yyNum/partyMemberNum).setScale(2));
            }
            Integer wdNum = statisticsOrgVo.getWdNum();
            if (nonNull(wdNum) && wdNum.intValue() > 0) {
                statisticsOrgVo.setWdNumPercent(new BigDecimal(wdNum/partyMemberNum).setScale(2));
            }
            Integer qtNum = statisticsOrgVo.getQtNum();
            if (nonNull(qtNum) && qtNum.intValue() > 0) {
                statisticsOrgVo.setQtNumPercent(new BigDecimal(qtNum/partyMemberNum).setScale(2));
            }
            Integer wuNum = statisticsOrgVo.getWuNum();
            if (nonNull(wuNum) && wuNum.intValue() > 0) {
                statisticsOrgVo.setWuNumPercent(new BigDecimal(wuNum/partyMemberNum).setScale(2));
            }
        }
        Integer participateActivityNum = statisticsOrgVo.getParticipateActivityNum();
        if (nonNull(participateActivityNum) && participateActivityNum.intValue() > 0) {
            Integer participateVolunteerActivityNum = statisticsOrgVo.getParticipateVolunteerActivityNum();
            if (nonNull(participateVolunteerActivityNum) && participateVolunteerActivityNum.intValue() > 0) {
                statisticsOrgVo.setParticipateVolunteerActivityNumPercent(new BigDecimal(participateVolunteerActivityNum/participateActivityNum).setScale(2));
            }
            Integer participatePartyActivityNum = statisticsOrgVo.getParticipatePartyActivityNum();
            if (nonNull(participatePartyActivityNum) && participatePartyActivityNum.intValue() > 0) {
                statisticsOrgVo.setParticipatePartyActivityNumPercent(new BigDecimal(participatePartyActivityNum/participateActivityNum).setScale(2));
            }
        }
        Integer participateActivityDuration = statisticsOrgVo.getParticipateActivityDuration();
        if (nonNull(participateActivityDuration) && participateActivityDuration.intValue() > 0) {
            Integer participateVolunteerActivityDuration = statisticsOrgVo.getParticipateVolunteerActivityDuration();
            if (nonNull(participateVolunteerActivityDuration) && participateVolunteerActivityDuration.intValue() > 0) {
                statisticsOrgVo.setParticipateVolunteerActivityDurationPercent(new BigDecimal(participateVolunteerActivityDuration/participateActivityDuration).setScale(2));
            }
            Integer participatePartyActivityDuration = statisticsOrgVo.getParticipatePartyActivityDuration();
            if (nonNull(participatePartyActivityDuration) && participatePartyActivityDuration.intValue() > 0) {
                statisticsOrgVo.setParticipatePartyActivityDurationPercent(new BigDecimal(participatePartyActivityDuration/participateActivityDuration).setScale(2));
            }
        }
        return R.ok(statisticsOrgVo);
    }

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbOrgMapper.xml

@@ -152,6 +152,7 @@
                and cpo.build_id = #{partyOrganizationVO.buildId}
            </if>
        </where>
        GROUP BY cpo.id
        ORDER BY cpo.id desc
    </select>