bug修改

101captain

2022-07-28 779270381c0d659aaa4f8ef2635446f31c0aac47

bug修改

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

@@ -47,4 +47,6 @@

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

 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

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

    private String activityName;

    private Long activityId;
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date activityDate;

}

 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/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;
@@ -242,7 +243,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 +268,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(

 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>