修改bug

puhanshu

2022-03-15 6886923150e5c2d079a4368aa4fd3523f2e982f2

修改bug

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

@@ -117,7 +117,7 @@
            resultType="com.panzhihua.common.model.vos.community.StatisticsCommVO">
        SELECT activity_type AS filed, COUNT(id) AS num
        FROM com_act_activity
        WHERE community_id = ${communityId}
        WHERE community_id = ${communityId} AND `status` IN(2,3,4,5)
        <if test="isResidentAct">
            AND `type` = 2
        </if>
@@ -156,7 +156,7 @@
        SELECT filed, SUM(num) AS num FROM (
            SELECT DATE_FORMAT( publish_at, '%Y-%m' ) AS filed, COUNT(id) AS num
            FROM com_act_activity
            WHERE community_id = ${communityId}
            WHERE community_id = ${communityId} AND `status` IN(2,3,4,5)
            <if test="isResidentAct">
                AND `type` = 2
            </if>
@@ -185,7 +185,7 @@
            resultType="com.panzhihua.common.model.vos.community.StatisticsCommVO">
        SELECT COUNT(id) AS num
        FROM com_act_activity
        WHERE community_id = ${communityId}
        WHERE community_id = ${communityId} AND `status` IN(2,3,4,5)
        <if test="isResidentAct">
            AND `type` = 2
        </if>

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

@@ -735,6 +735,11 @@
            comPbMemberDO.setSpecialtyName(partyBuildingMemberVO.getSpecialtyName());
        }

        Integer type = partyBuildingMemberVO.getType();
        if (nonNull(type) && type.equals(1)) {
            comPbMemberDO.setEmploymentTime(null);
        }


        if (comPbMemberDAO.updateById(comPbMemberDO) > 0) {
            PartyBuildingMemberVO rtVO = new PartyBuildingMemberVO();