三社功能修改

101captain

2022-03-02 7a41ff7fc3215cb1c91b6b54d659ffff9ca9506b

三社功能修改

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

@@ -5,6 +5,7 @@
import javax.annotation.Resource;

import com.panzhihua.common.model.vos.community.*;
import org.springframework.util.ObjectUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@@ -314,4 +315,13 @@
    public R detailCommunity() {
        return communityService.detailCommunity(this.getCommunityId());
    }

    @ApiOperation(value = "查询活动报名名单集合",response = ActivitySignVO.class)
    @PostMapping("listactivitysign")
    public R listActivitySign(@RequestBody ActivitySignVO activitySignVO) {
        if (ObjectUtils.isEmpty(activitySignVO.getActivityId())) {
            return R.fail("活动id主键不能为空");
        }
        return communityService.listActivitySign(activitySignVO);
    }
}

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

@@ -110,6 +110,7 @@
    @ApiOperation("项目分类级联查询")
    @PostMapping("/queryLevel")
    public R queryLevel(@RequestBody ComActColumnVO comActColumnVO){
        comActColumnVO.setCommunityId(this.getCommunityId());
        return this.communityService.queryLevel(comActColumnVO);
    }
}

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

@@ -40,6 +40,7 @@
    @ApiOperation("分页查询所有数据")
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        commonPage.setCommunityId(this.getCommunityId());
        return communityService.selectAllComActSocialProjectMember(commonPage);
    }


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

@@ -57,4 +57,10 @@
     */
    IPage<ComActSocialWorkerVO> selectActivity(Page page,@Param("id") Long id);

    /**
     * 查询社工详情
     * @param id
     * @return
     */
    ComActSocialWorkerVO selectOneById(Long id);
}

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

@@ -74,9 +74,11 @@
    </select>

    <select id="selectOneById" resultType="com.panzhihua.common.model.vos.community.raffle.ComActRaffleRecordVO">
        select t.*, t1.`name`, t1.image
        select t.*, t1.`name`, t1.image,t2.phone, t2.`name` as username, t3.name as staffName
        from com_act_raffle_record t
        LEFT JOIN com_act_raffle_prize t1 on t.prize_id = t1.id
        left join sys_user t2 on t.user_id = t2.user_id
        left join sys_user t3 on t.staff_id = t3.user_id
        where t.id=#{id}
    </select>


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

@@ -39,7 +39,8 @@
                AND a.name like concat('%',#{pageComActSocialWorkerDTO.name},'%')
            </if>
            <if test="pageComActSocialWorkerDTO.keyword!=null and pageComActSocialWorkerDTO.keyword!=''">
                AND (a.name like concat('%',#{pageComActSocialWorkerDTO.keyword},'%') or  a.telephone like concat('%',#{pageComActSocialWorkerDTO.keyword},'%') )
                AND (a.name like concat('%',#{pageComActSocialWorkerDTO.keyword},'%') or a.telephone like
                concat('%',#{pageComActSocialWorkerDTO.keyword},'%') )
            </if>
            <if test="pageComActSocialWorkerDTO.ageBegin!=null">
                AND a.age>=#{pageComActSocialWorkerDTO.ageBegin}
@@ -70,7 +71,9 @@
    </select>

    <select id="queryAll" resultType="com.panzhihua.common.model.dtos.civil.ComActSocialWorkerExcelVO">
        SELECT a.social_org_id,a.name as name,a.birthday,a.telephone,a.gen,a.social_worker_code,a.skill_field,a.business_scope,b.name as socialOrgId,c.name as communityId,e.name as streetId
        SELECT a.social_org_id,a.name as
        name,a.birthday,a.telephone,a.gen,a.social_worker_code,a.skill_field,a.business_scope,b.name as
        socialOrgId,c.name as communityId,e.name as streetId
        FROM com_act_social_worker a left join com_act_social_org b on a.social_org_id = b.id
        left join com_act c on a.community_id = c.community_id
        left join com_street e on a.street_id = e.street_id
@@ -89,7 +92,7 @@
            </if>
        </where>
    </select>
    

    <select id="selectType" resultType="Integer">
        select count(id) from com_act_social_worker where street_id = 15
        <if test="type ==1">
@@ -106,11 +109,25 @@
        </if>
    </select>

    <select id="selectSkillType" resultType="com.panzhihua.common.model.vos.community.bigscreen.BigScreenHmkProjectTypeInfo">
        select count(*) count,t1.name from com_act_social_worker t INNER JOIN com_act_column t1 on t.skill_type = t1.id  where t.street_id = 15 <if test="communityId!=null"> and t.community_id = #{communityId}</if> GROUP BY t1.id
    <select id="selectSkillType"
            resultType="com.panzhihua.common.model.vos.community.bigscreen.BigScreenHmkProjectTypeInfo">
        select count(*) count,t1.name from com_act_social_worker t INNER JOIN com_act_column t1 on t.skill_type = t1.id
        where t.street_id = 15 <if test="communityId!=null">and t.community_id = #{communityId}</if> GROUP BY t1.id
    </select>

    <select id="selectActivity" resultType="com.panzhihua.common.model.vos.civil.ComActSocialWorkerVO">
        select t.* from com_act_social_worker t LEFT JOIN sys_user t1 on t.telephone = t1.phone where t1.user_id in (select distinct user_id from com_act_act_regist where activity_id =#{id} )
        select t.*
        from com_act_social_worker t
                 LEFT JOIN sys_user t1 on t.telephone = t1.phone
        where t1.user_id in (select distinct user_id from com_act_act_regist where activity_id = #{id})
    </select>

    <select id="selectOneById" resultType="com.panzhihua.common.model.vos.civil.ComActSocialWorkerVO">
        SELECT a.*, b.name as socialOrgId, c.name as communityName, e.name as streetId
        FROM com_act_social_worker a
                 left join com_act_social_org b on a.social_org_id = b.id
                 left join com_act c on a.community_id = c.community_id
                 left join com_street e on c.street_id = e.street_id
        where a.id =#{id}
    </select>
</mapper>