bug修改

101captain

2022-08-01 57d98932c3820b60743699c890ff5cf45f3ca8a2

bug修改

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

@@ -255,6 +255,16 @@
        return this.communityService.serviceStatic(serviceStaticDTO);
    }


    /**
     * 求助我的问题数量统计
     * @param type
     * @param phone
     * @return
     */
    @ApiOperation(value = "求助我的问题数量统计")
    @GetMapping("/selectCount")
    public R selectCount(@RequestParam("type")Integer type,@RequestParam(value = "phone",required = false)String phone,@RequestParam("communityId")Long communityId){
        return this.communityService.selectCount(type,phone,communityId);
    }
}


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleAdminDTO.java

@@ -47,4 +47,8 @@

    @ApiModelProperty("使用类型（1.邻里圈 2.问题清单 3.需求清单）")
    private Integer belongType;
    @ApiModelProperty("话题id")
    private Long topicId;

    private Integer solveStatus;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleAppDTO.java

@@ -50,6 +50,8 @@

    @ApiModelProperty("接单类型 1单位 2个人")
    private Integer orderType;
    @ApiModelProperty("清单状态")
    private Integer status;
    /**
     * 使用类型（1.邻里圈 2.问题清单 3.需求清单）
     */

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleDetailAppVO.java

@@ -134,4 +134,10 @@
    private Integer belongType;
    private Long solveUnitId;

    private String activityName;
    @JsonSerialize(using = ToStringSerializer.class)
    private Long activityId;
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date activityDate;

}

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

@@ -5951,6 +5951,14 @@
    @PostMapping("/neighbor/serviceStatic")
    R serviceStatic(@RequestBody ServiceStaticDTO serviceStaticDTO);

    /**
     * 求助我的问题数量统计
     * @param type
     * @param phone
     * @return
     */
    @GetMapping("/neighbor/selectCount")
    R selectCount(@RequestParam("type")Integer type,@RequestParam(value = "phone",required = false)String phone,@RequestParam("communityId")Long communityId);

    /**
     * 获取系统配置value

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

@@ -218,5 +218,12 @@
    public R order(@RequestBody EditNeighborCircleAdminVO editNeighborCircleAdminVO){
        return this.communityService.order(editNeighborCircleAdminVO);
    }
    @ApiOperation(value = "查询社区邻里圈话题列表", response = ComActNeighborCircleTopicAppVO.class)
    @GetMapping("topic/list")
    public R getNeighborTopicByApp(
            @RequestParam(value = "name",defaultValue = "",required = false) String name) {
        return communityService.getNeighborTopicByApp(name);
    }


}

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

@@ -421,6 +421,14 @@
    public R serviceStaticBackstage(@RequestBody ServiceStaticBackstageDTO serviceStaticDTO){
        return this.comActNeighborCircleService.serviceStaticBackstage(serviceStaticDTO);
    }


    /**
     * 求助我的问题数量统计
     * @param type
     * @param phone
     * @return
     */
    @GetMapping("/selectCount")
    public R selectCount(@RequestParam("type")Integer type,@RequestParam(value = "phone",required = false)String phone,@RequestParam("communityId")Long communityId){
        return this.comActNeighborCircleService.selectCount(type,phone,communityId);
    }
}

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

@@ -158,4 +158,12 @@
    List<PartyMemberAnalysisVO> institutionalPartyMemberServiceAnalysis(@Param("beginTime") String beginTime, @Param("endTime") String endTIme, @Param("belongTo") String belongTo,@Param("communityId") Long communityId,@Param("unitId") Long unitId);
    List<PartyMemberAnalysisVO> institutionalPartyMemberActAnalysis(@Param("beginTime") String beginTime, @Param("endTime") String endTIme, @Param("belongTo") String belongTo,@Param("communityId") Long communityId,@Param("unitId") Long unitId);
    List<PartyMemberAnalysisVO> institutionalPartyMemberServiceAnalysisByServicesTimes(@Param("beginTime") String beginTime, @Param("endTime") String endTIme, @Param("belongTo") String belongTo);

    /**
     * 查询我的问题数量
     * @param type
     * @param phone
     * @return
     */
    Integer selectCount(@Param("type") Integer type,@Param("phone") String phone,@Param("communityId") Long communityId);
}

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

@@ -93,6 +93,7 @@
    @TableField(fill = FieldFill.INSERT)
    private Date createAt;

    private String instruction;
    /**
     * 最后回复时间
     */

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

@@ -8,6 +8,7 @@
import com.panzhihua.common.model.vos.neighbor.ChangeCommentStatusByAdminVO;
import com.panzhihua.common.model.vos.neighbor.EditNeighborCircleAdminVO;
import com.panzhihua.service_community.model.dos.ComActNeighborCircleDO;
import org.springframework.web.bind.annotation.RequestParam;

/**
 * @auther lyq
@@ -255,6 +256,11 @@
     */
    R serviceStaticBackstage(ServiceStaticBackstageDTO serviceStaticDTO);



    /**
     * 求助我的问题数量统计
     * @param type
     * @param phone
     * @return
     */
    R selectCount(@RequestParam("type")Integer type, @RequestParam("phone")String phone,@RequestParam("communityId")Long communityId);
}

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

@@ -10,6 +10,7 @@
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.PageVO;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.SensitiveUtil;
import com.panzhihua.service_community.entity.ComPbCheckUnit;
import com.panzhihua.service_community.service.ComActNeighborCircleTopicService;
import org.apache.commons.lang3.ObjectUtils;
@@ -36,6 +37,7 @@

import lombok.extern.slf4j.Slf4j;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.RequestParam;

/**
 * @auther lyq
@@ -242,7 +244,7 @@
        if(circleDetailAppVO.getOrderType()!=null){
            if(circleDetailAppVO.getOrderType()==2){
                AdministratorsUserVO user1 = this.baseMapper.selectUserByUserId(circleDetailAppVO.getSolveId());
                circleDetailAppVO.setSolveName(user1.getName());
                circleDetailAppVO.setSolveName(SensitiveUtil.replaceName(user1.getName()));
            }
            if(circleDetailAppVO.getOrderType()==1){
                ComPbCheckUnit comPbCheckUnit=comPbCheckUnitDao.selectById(circleDetailAppVO.getSolveUnitId());
@@ -267,7 +269,12 @@
                circleDetailAppVO.setHaveSign(2);
            }
        }

        ComActActivityDO comActActivityDO=comActActivityDAO.selectOne(new QueryWrapper<ComActActivityDO>().lambda().eq(ComActActivityDO::getRelationId,neighborCircleAppDTO.getCircleId()));
        if(comActActivityDO!=null){
            circleDetailAppVO.setActivityDate(comActActivityDO.getCreateAt());
            circleDetailAppVO.setActivityId(comActActivityDO.getId());
            circleDetailAppVO.setActivityName(comActActivityDO.getActivityName());
        }
        // 查询邻里圈下评论列表
        IPage<ComActNeighborCircleCommentAppVO> circleCommentAppPage =
            comActNeighborCircleCommentDAO.pageNeighborCommentByApp(
@@ -1190,6 +1197,11 @@
        return null;
    }

    @Override
    public R selectCount(Integer type, String phone,Long communityId) {
        return R.ok(this.baseMapper.selectCount(type,phone,communityId));
    }

    /**
     * 判断活动统计列表中是否已有该单位的数据
     * */

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

@@ -62,6 +62,17 @@
        <if test="neighborCircleAppDTO.isHelp ==1">
            and (canc.help_member_content like concat ('%',#{neighborCircleAppDTO.phone},'%') or canc.help_org_content like concat ('%',#{neighborCircleAppDTO.phone},'%') )
        </if>
        <if test="neighborCircleAppDTO.solveStatus !=null">
            <if test="neighborCircleAppDTO.solveStatus ==1">
                and canc.solve_status in (0,1)
            </if>
            <if test="neighborCircleAppDTO.solveStatus ==2">
                and canc.solve_status =2
            </if>
            <if test="neighborCircleAppDTO.solveStatus ==3">
                and canc.solve_status in(3,4)
            </if>
        </if>
        order by canc.create_at desc
    </select>

@@ -88,6 +99,9 @@
            <if test='neighborCircleAdminDTO.releaseContent != null and neighborCircleAdminDTO.releaseContent != &quot;&quot;'>
                and nc.release_content like concat('%',#{neighborCircleAdminDTO.releaseContent},'%')
            </if>
            <if test='neighborCircleAdminDTO.topicId != null '>
                and canc.topic_id = #{neighborCircleAdminDTO.topicId}
            </if>
            <if test='neighborCircleAdminDTO.topicName != null and neighborCircleAdminDTO.topicName != &quot;&quot;'>
                and canct.`name` = #{neighborCircleAdminDTO.topicName}
            </if>
@@ -104,6 +118,17 @@
            </if>
            <if test='neighborCircleAdminDTO.belongType != null '>
                and nc.belong_type = #{neighborCircleAdminDTO.belongType}
            </if>
            <if test="neighborCircleAdminDTO.solveStatus !=null">
                <if test="neighborCircleAdminDTO.solveStatus ==1">
                    and nc.solve_status in (0,1)
                </if>
                <if test="neighborCircleAdminDTO.solveStatus ==2">
                    and nc.solve_status =2
                </if>
                <if test="neighborCircleAdminDTO.solveStatus ==3">
                    and nc.solve_status in(3,4)
                </if>
            </if>
        </where>
        order by
@@ -371,4 +396,18 @@
        having serviceTimes&lt;>'' and serviceTime&lt;>''
        order by serviceTimes desc
    </select>
    <select id="selectCount" resultType="Integer">
        select count(id)  from com_act_neighbor_circle
        <where>
            <if test="type!=null">
                and belong_type = #{type}
            </if>
            <if test="phone!=null and phone !=''">
                and (help_member_content like concat('%',#{phone},'%') or help_org_content like concat('%',#{phone},'%') )
            </if>
            <if test="communityId!=null">
                and community_id = #{communityId}
            </if>
        </where>
    </select>
</mapper>