微心愿、随手拍处理人改版

luoyuanqiao

2022-03-01 f7a4bb7fb603ad927e9aa9f343fba3bb9f4ed695

微心愿、随手拍处理人改版

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

@@ -43,7 +43,7 @@
    @ApiModelProperty("发起人头像")
    private String imageUrl;

    @ApiModelProperty("状态 1待审核  2进行中 3已驳回 4已完成")
    @ApiModelProperty("状态 1待审核  2进行中 3已驳回 4待评价 5.已完成")
    private Integer status;

    @ApiModelProperty("处理人id")
@@ -207,4 +207,8 @@
    @ApiModelProperty(value = "单张图片高度")
    private BigDecimal imgHeight;

    @ApiModelProperty(value = "评价时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date evaluateDate;

}

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

@@ -1096,7 +1096,7 @@

    @ApiOperation(value = "查询微心愿处理人列表接口")
    @GetMapping("wish/handle/list")
    @ApiImplicitParam(name = "type", value = "处理人类型（1.后台用户  2.党员  3.志愿者）", required = true)
    @ApiImplicitParam(name = "type", value = "处理人类型（1.后台用户  2.党员  3.志愿者 4.社工 5.四长四员）", required = true)
    public R wishHandleListAdmin(@RequestParam("type") Integer type) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        if (loginUserInfo == null) {

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

@@ -36,7 +36,7 @@
    private String happenAddr;

    /**
     * 状态 1待审核 2进行中 3已驳回 4已完成
     * 状态 1待审核 2进行中 3已驳回 4待评价 5.已完成
     */
    private Integer status;

@@ -180,6 +180,10 @@
     * 单张图片高度
     */
    private BigDecimal imgHeight;
    /**
     * 评价时间
     */
    private Date evaluateDate;

    /**
     * 参加活动标签（1.优质 2.精良 3.普通 4.一般）

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

@@ -102,6 +102,9 @@
        <if test="type != null and type == 3">
            select user_id,IFNULL(`name`,nick_name) as `name` from sys_user where `type` = 1 and community_id = ${communityId} and status = 1 and is_volunteer = 1
        </if>
        <if test="type != null and type == 5">
            select user_id,IFNULL(`name`,nick_name) as `name` from sys_user where user_id in (select user_id from com_act_four_member where community_id = ${communityId})
        </if>
    </select>

    <select id="getUserByUserId" resultType="com.panzhihua.common.model.vos.user.SysUserVO">

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

@@ -193,7 +193,7 @@
            IFNULL(( SELECT integral_available_volunteer FROM com_act_integral_user WHERE user_id = #{userId} AND community_id = #{communityId} ), 0 ) AS volunteerActivityIntegral,
            ( SELECT count( caas.id ) FROM com_act_act_sign AS caas
            LEFT JOIN com_act_activity AS caa ON caa.id = caas.activity_id
            WHERE caas.user_id = #{userId} and caas.status = 1 and caa.community_id = #{communityId}
            WHERE caas.user_id = #{userId} and caas.status = 1 and caa.type = 1 and caa.community_id = #{communityId}
            ) AS volunteerActivityCount,
            IFNULL((
                SELECT
@@ -202,7 +202,7 @@
                    com_act_act_sign AS caas
                    LEFT JOIN com_act_activity AS caa ON caa.id = caas.activity_id
                WHERE
                    caas.user_id = #{userId} and caas.status = 1 and caa.community_id = #{communityId}
                    caas.user_id = #{userId} and caas.status = 1 and caa.type = 1 and caa.community_id = #{communityId}
                    ),
                0
            ) AS volunteerActivityDuration,
@@ -298,7 +298,7 @@

    <select id="getOrgDataStatisticsLeftDown" resultType="com.panzhihua.common.model.vos.partybuilding.ComDataStatisticsOrgVo">
        SELECT
            count( id ) AS participateVolunteerActivityNum,
            count( caas1.id ) AS participateVolunteerActivityNum,
            (
            SELECT
                IFNULL( sum( caa.duration ), 0 )
@@ -307,7 +307,7 @@
                LEFT JOIN com_act_activity AS caa ON caa.id = caas.activity_id
            WHERE
                caas.`status` = 1
                AND caas.is_volunteer = 1
                AND caas.is_volunteer = 1 and caa.type = 1
                AND caas.user_id IN ( SELECT user_id FROM com_pb_member WHERE audit_result = 1 AND community_id = #{communityId} AND user_id IS NOT NULL
        <if test="orgIds != null and orgIds.size > 0">
            AND org_id in
@@ -338,19 +338,20 @@
        </if>
            ) AS participatePartyActivityNum
        FROM
            com_act_act_sign
            com_act_act_sign as caas1
            left join com_act_activity as caa1 on caa1.id = caas1.activity_id
        WHERE
            `status` = 1
            AND is_volunteer = 1
            AND user_id IN ( SELECT user_id FROM com_pb_member WHERE audit_result = 1 AND community_id = #{communityId} AND user_id IS NOT NULL
        caas1.`status` = 1 and caa1.type = 1
            AND caas1.is_volunteer = 1
            AND caas1.user_id IN ( SELECT user_id FROM com_pb_member WHERE audit_result = 1 AND community_id = #{communityId} AND user_id IS NOT NULL
        <if test="orgIds != null and orgIds.size > 0">
            AND org_id in
            AND caas1.org_id in
            <foreach collection="orgIds" item="item" open="(" separator="," close=")">
                #{item}
            </foreach>
        </if>
            )
            AND create_at BETWEEN #{startTime}
            AND caas1.create_at BETWEEN #{startTime}
            AND #{endTime}
    </select>