三社功能修改

101captain

2022-03-03 ca853891096522be00ce1575e9718271ce787503

三社功能修改

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

@@ -41,9 +41,7 @@
    @ApiOperation(value = "分页查询",response = ComActRaffleVO.class)
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        commonPage.setCommunityId(this.getCommunityId());
        commonPage.setType(1);
        commonPage.setUserId(this.getUserId());
        return this.communityService.selectAllComActRaffle(commonPage);
    }


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

@@ -98,7 +98,7 @@
     */
    @GetMapping("/{id}")
    @ApiOperation(value = "查询社工详细信息")
    R<ComActSocialWorkerDetailsVO> details(@PathVariable("id") Long id){
    R<ComActSocialWorkerVO> details(@PathVariable("id") Long id){
        return communityService.comActSocialWorkerDetails(id);
    }


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/property/CommonPage.java

@@ -63,4 +63,8 @@
    private Long streetId;
    @ApiModelProperty("分类2")
    private Integer type2;
    @ApiModelProperty("一级分类")
    private Integer columnId;
    @ApiModelProperty("二级分类")
    private Integer secondColumnId;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/ComActSocialMemberVO.java

@@ -90,4 +90,6 @@
     * 用户id
     */
    private Long userId;

    private Long communityId;
}

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

@@ -63,4 +63,6 @@

    @ApiModelProperty("街道id")
    private Long streetId;

    private String description;
}

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

@@ -115,6 +115,12 @@
    private String streetPhone;

    /**
     * 社区电话
     */
    @ApiModelProperty(value = "社区电话")
    private String communityPhone;

    /**
     * 分类id
     */
    @ApiModelProperty(value = "分类id")

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

@@ -22,6 +22,7 @@
import com.panzhihua.common.model.dtos.neighbor.*;
import com.panzhihua.common.model.vos.*;
import com.panzhihua.common.model.vos.civil.ComActSocialWorkerDetailsVO;
import com.panzhihua.common.model.vos.civil.ComActSocialWorkerVO;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.community.cluster.admin.ComClusterMemberExcelVO;
import com.panzhihua.common.model.vos.community.raffle.ComActRaffleRecordVO;
@@ -7822,7 +7823,7 @@
     * @return 查找结果
     */
    @PostMapping("/comActSocialWorker/{id}")
    R<ComActSocialWorkerDetailsVO> comActSocialWorkerDetails(@PathVariable("id") Long id);
    R<ComActSocialWorkerVO> comActSocialWorkerDetails(@PathVariable("id") Long id);

    /**
     * 批量导入社工

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

@@ -78,7 +78,9 @@
        else {
            comActColumnVO.setCommunityId(this.getCommunityId());
        }
        comActColumnVO.setStatus(1);
        if(comActColumnVO.getStatus()==null){
            comActColumnVO.setStatus(1);
        }
        comActColumnVO.setCreateTime(new Date());
        if(StringUtils.isNotEmpty(this.getLoginUserInfo().getName())){
            comActColumnVO.setCreateBy(this.getLoginUserInfo().getName());

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

@@ -40,6 +40,12 @@
    @ApiOperation(value = "分页查询所有数据",response = ComActSocialMemberVO.class)
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        if(this.getLoginUserInfo().getStreetId()!=null){
            commonPage.setStreetId(this.getLoginUserInfo().getStreetId());
        }
        else {
            commonPage.setCommunityId(this.getCommunityId());
        }
        return this.communityService.comActSocialMemberSelectAll(commonPage);
    }

@@ -64,6 +70,7 @@
    @ApiOperation("新增数据")
    @PostMapping
    public R insert(@RequestBody ComActSocialMemberVO comActSocialMember) {
        comActSocialMember.setCommunityId(this.getCommunityId());
        return this.communityService.comActSocialMemberInsert(comActSocialMember);
    }
    /**

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

@@ -116,7 +116,7 @@
     */
    @GetMapping("/{id}")
    @ApiOperation(value = "查询社工详细信息")
    R<ComActSocialWorkerDetailsVO> details(@PathVariable("id") Long id){
    R<ComActSocialWorkerVO> details(@PathVariable("id") Long id){
        return communityService.comActSocialWorkerDetails(id);
    }


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

@@ -93,6 +93,10 @@
     */
    @PostMapping("/update")
    public R update(@RequestBody ComActRaffleRecordVO comActRaffleRecordVO) {
        ComActRaffleRecord comActRaffleRecord1=comActRaffleRecordService.getById(comActRaffleRecordVO.getId());
        if(comActRaffleRecord1.getStatus().equals(comActRaffleRecordVO.getStatus())){
            return R.fail("不可重复核销");
        }
        ComActRaffleRecord comActRaffleRecord=new ComActRaffleRecord();
        BeanUtils.copyProperties(comActRaffleRecordVO,comActRaffleRecord);
        return R.ok(this.comActRaffleRecordService.updateById(comActRaffleRecord));

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

@@ -91,6 +91,6 @@

    @PostMapping("/batch")
    public R insertBatch(@RequestBody ComActSocialProjectMemberVO comActSocialProjectMemberVO){
        return R.ok(this.comActSocialProjectMemberService.insertBatch(comActSocialProjectMemberVO));
        return this.comActSocialProjectMemberService.insertBatch(comActSocialProjectMemberVO);
    }
}

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

@@ -79,7 +79,7 @@
     * @return 查找结果
     */
    @PostMapping("/{id}")
    R<ComActSocialWorkerDetailsVO> comActSocialWorkerDetails(@PathVariable("id") Long id){
    R<ComActSocialWorkerVO> comActSocialWorkerDetails(@PathVariable("id") Long id){
        return comActSocialWorkerService.comActSocialWorkerDetails(id);
    }


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

@@ -51,7 +51,7 @@
     * @param id 社工 id
     * @return 查找结果
     */
    R<ComActSocialWorkerDetailsVO> comActSocialWorkerDetails(Long id);
    R<ComActSocialWorkerVO> comActSocialWorkerDetails(Long id);

    /**
     * 导出

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

@@ -87,7 +87,7 @@
                if(comActSocialProjectMemberVO.getType()==1){
                    ComActSocialWorker comActSocialWorker=comActSocialWorkerDao.selectById(id);
                    if(comActSocialWorker!=null){
                        List<ComActSocialProjectMember> list= comActSocialProjectMemberDao.selectList(new QueryWrapper<ComActSocialProjectMember>().lambda().eq(ComActSocialProjectMember::getPhone,comActSocialWorker.getTelephone()).eq(ComActSocialProjectMember::getType,comActSocialProjectMemberVO.getType()).eq(ComActSocialProjectMember::getProjectId,comActSocialProjectMemberVO.getProjectId()));
                        List<ComActSocialProjectMember> list= comActSocialProjectMemberDao.selectList(new QueryWrapper<ComActSocialProjectMember>().lambda().eq(ComActSocialProjectMember::getPhone,comActSocialWorker.getTelephone()).eq(ComActSocialProjectMember::getType,comActSocialProjectMemberVO.getType()).eq(ComActSocialProjectMember::getProjectId,comActSocialProjectMemberVO.getParamId()));
                        if(CollectionUtils.isEmpty(list)){
                            ComActSocialProjectMember comActSocialProjectMember=new ComActSocialProjectMember();
                            BeanUtils.copyProperties(comActSocialProjectMemberVO,comActSocialProjectMember);

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

@@ -23,6 +23,7 @@

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;

/**
@@ -54,6 +55,7 @@
        ComActSocialWorker comActSocialWorkerDO = new ComActSocialWorker();
        BeanUtils.copyProperties(comActSocialWorkerAddDTO, comActSocialWorkerDO);
        comActSocialWorkerDO.setCreateBy(comActSocialWorkerAddDTO.getUserId());
        comActSocialWorkerDO.setCreateAt(new Date());
        if(comActSocialWorkerMapper.insert(comActSocialWorkerDO)>0){
            return R.ok();
        }
@@ -109,14 +111,9 @@
     * @return 查找结果
     */
    @Override
    public R<ComActSocialWorkerDetailsVO> comActSocialWorkerDetails(Long id){
        ComActSocialWorker comActSocialWorkerDO = comActSocialWorkerMapper.selectById(id);
        if(comActSocialWorkerDO!=null) {
            ComActSocialWorkerDetailsVO comActSocialWorkerDetailsVO = new ComActSocialWorkerDetailsVO();
            BeanUtils.copyProperties(comActSocialWorkerDO, comActSocialWorkerDetailsVO);
            return R.ok(comActSocialWorkerDetailsVO);
        }
        return R.fail();
    public R<ComActSocialWorkerVO> comActSocialWorkerDetails(Long id){
        ComActSocialWorkerVO comActSocialWorkerDO = comActSocialWorkerMapper.selectOneById(id);
        return R.ok(comActSocialWorkerDO);
    }

    @Override

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

@@ -32,6 +32,9 @@
            <if test="commonPage.keyword!=null and commonPage.keyword!=''">
                and name like concat('%',#{commonPage.keyword},'%')
            </if>
            <if test="commonPage.name!=null and commonPage.name!=''">
                and name like concat('%',#{commonPage.name},'%')
            </if>
            <if test="commonPage.paramId !=null">
                and parent_id = #{commonPage.paramId}
            </if>

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

@@ -18,7 +18,9 @@
    </resultMap>

    <select id="pageList" resultType="com.panzhihua.common.model.vos.ComActSocialMemberVO">
        select t.*,t1.name as orgName from com_act_social_member t left join com_act_social_org t1 on t.org_id = t1.id
        select t.*,t1.name as orgName from com_act_social_member t
        left join com_act_social_org t1 on t.org_id = t1.id
        left join com_act t2 on t.community_id = t2.community_id
        <where>
            1=1
            <if test="commonPage.keyword!=null and commonPage.keyword !=''">
@@ -31,7 +33,10 @@
                and t.org_id = #{commonPage.paramId}
            </if>
            <if test="commonPage.streetId!=null ">
                and t.street_id = #{commonPage.streetId}
                and t2.street_id = #{commonPage.streetId}
            </if>
            <if test="commonPage.communityId!=null ">
                and t2.community_id = #{commonPage.communityId}
            </if>
        </where>
        order by t.create_time desc

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

@@ -50,16 +50,32 @@
            <if test="commonPage.endTime !=null">
                and #{commonPage.endTime} >= t.create_time
            </if>
            <if test="commonPage.paramId!=null and commonPage.paramId !=0">
                and t.parent_id = #{commonPage.paramId}
            </if>
            <if test="commonPage.paramId ==0 and commonPage.streetId!=null">
                and t.parent_id = #{commonPage.paramId}
            </if>
            <if test="commonPage.columnId !=null">
                and t.column_id = #{commonPage.columnId}
            </if>
            <if test="commonPage.columnId !=null">
                and t.column_id = #{commonPage.columnId}
            </if>
            <if test="commonPage.secondColumnId !=null">
                and t.second_column_id = #{commonPage.secondColumnId}
            </if>
        </where>
        order by t.create_time desc
    </select>

    <select id="getByApplet" resultType="com.panzhihua.common.model.vos.community.social.SocialProjectVO">
        select t.*, t1.phone as streetPhone, t2.name as columnName, t3.name as secondColumnName
        select t.*, t1.phone as streetPhone, t2.name as columnName, t3.name as secondColumnName,t1.name as streetName,t4.name as communityName,t4.phone as communityPhone
        from com_act_social_project t
                 LEFT JOIN com_street t1 on t.street_id = t1.street_id
                 LEFT JOIN com_act_column t2 on t.column_id = t2.id
                 LEFT JOIN com_act_column t3 on t.second_column_id = t3.id
                 LEFT JOIN com_act  t4 on t.community_id = t1.community_id
        where t.id = #{id}
    </select>

@@ -116,7 +132,7 @@
               #{year}, '-',
               #{date}, '-00')), '%Y-%m-%d 23:59:59') >=publish_at) y,
            (
        select count (id)
        select count(id)
        from com_act_activity
        where status!=6
          and is_project = 1

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

@@ -19,6 +19,9 @@
            <if test="commonPage.paramId !=null">
                and t.project_id =#{commonPage.paramId}
            </if>
            <if test="commonPage.communityId !=null">
                and t1.community_id =#{commonPage.communityId}
            </if>
        </where>
        order by is_top desc,create_time desc
    </select>

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbDynDAO.java

@@ -57,7 +57,7 @@
    int timedTaskPartyBuildingStatus();

    @Select("<script> " + "SELECT\n" + " distinct COUNT( u.id ) readingVolume,\n"
        + " d.community_id, d.content, d.cover, d.cover_mode, d.create_at, d.create_by, d.dyn_type, d.id, d.publish_at, d.status, d.title, d.type,a.policy_type, \n"
        + " d.community_id, d.content, d.cover, d.cover_mode, d.create_at, d.create_by, d.dyn_type, d.id, d.publish_at, d.status, d.title, d.type,d.policy_type, \n"
        + " act.name as createByName,d.jump_type,d.jump_url " + "FROM\n"
        + "com_pb_dyn d LEFT JOIN com_act act ON d.community_id = act.community_id  \n"
        + "LEFT JOIN com_pb_dyn_user u ON d.id = u.dyn_id " + "where d.id = #{id} " + " group by d.id " + "</script>")

 springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/filters/JWTAuthenticationTokenFilter.java

@@ -271,6 +271,7 @@
                noLoginUrl.add("/api/applets/renting/houses/nearby");
                noLoginUrl.add("/api/applets/renting/houses/houseList");
                noLoginUrl.add("/api/applets/renting/houses/getConfig");
                noLoginUrl.add("/api/applets/comActRaffle/queryAll");
                noLoginUrl.add("/api/communitybackstage/screen/comprehensive/street/list");
                noLoginUrl.add("/api/communitybackstage/screen/comprehensive/population");
                noLoginUrl.add("/api/communitybackstage/screen/getWestScreenStatics");