lidongdong
2023-11-13 48a703dec596b5d2c1b04b0b4f7ed0f28c1ca898
新增社区共建评论模块2
7个文件已修改
145 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/NewStriveForFeign.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NeedProblemApi.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/NeedProblemInventoryDAO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NeedProblemInventoryService.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NeedProblemInventoryServiceImpl.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/NeedProblemInventoryMapper.xml 106 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java
@@ -64,6 +64,18 @@
        return newStriveForFeign.getNeedProblemList(pageNum,pageSize,kind,userId,getCommunityId()+"");
    }
    @ApiOperation(value = "任务需求清单我认领的列表", response = NeedProblemInventoryDTO.class)
    @GetMapping("/getMyJoinNeedProblemList")
    public R getMyJoinNeedProblemList(@RequestParam("pageNum") int pageNum,
                                      @RequestParam("pageSize") int pageSize,
                                      @RequestParam(value = "kind", required = false)String kind)
    {
        return newStriveForFeign.getMyJoinNeedProblemList(pageNum,pageSize,kind,getUserId()+"");
    }
    @ApiOperation(value = "任务需求清单详情", response = NeedProblemInventoryDTO.class)
    @GetMapping("/NeedProblem/getDetails")
    public R getNeedProblemDetails(@RequestParam("id") String id)
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/NewStriveForFeign.java
@@ -50,6 +50,13 @@
                                @RequestParam(value = "userId", required = false)String userId,
                                @RequestParam(value = "communityId", required = false)String communityId);
    @GetMapping("/NeedProblem/getMyJoinNeedProblemList")
    public R getMyJoinNeedProblemList(@RequestParam("pageNum") int pageNum,
                                      @RequestParam("pageSize") int pageSize,
                                      @RequestParam(value = "kind", required = false)String kind,
                                      @RequestParam(value = "userId", required = false)String userId);
    @GetMapping("/NeedProblem/getDetails")
    public R getNeedProblemDetails(@RequestParam("id") String id);
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NeedProblemApi.java
@@ -26,6 +26,15 @@
        return R.ok(inventoryService.getList(pageNum,pageSize,kind,userId,communityId));
    }
    @GetMapping("/getMyJoinNeedProblemList")
    public R getMyJoinNeedProblemList(@RequestParam("pageNum") int pageNum,
                                @RequestParam("pageSize") int pageSize,
                                @RequestParam(value = "kind", required = false)String kind,
                                @RequestParam(value = "userId", required = false)String userId)
    {
        return R.ok(inventoryService.getMyJoinList(pageNum,pageSize,kind,userId));
    }
    @GetMapping("/getDetails")
    public R getNeedProblemDetails(@RequestParam("id") String id)
    {
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/NeedProblemInventoryDAO.java
@@ -24,6 +24,9 @@
                                    @Param("userId") String userId,
                                    @Param("communityId") String communityId);
    IPage<NeedProblemInventoryDTO> getMyJoinList(Page page,@Param("kind") String kind,
                                                @Param("userId") String userId);
    NeedProblemInventoryDTO getDetails(@Param("id")String id);
    int addData(@Param("item") NeedProblemInventoryDTO userIds);
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NeedProblemInventoryService.java
@@ -19,6 +19,8 @@
    IPage<NeedProblemInventoryDTO> getList(int pageNum, int pageSize, String kind,String userId,String communityId);
    IPage<NeedProblemInventoryDTO> getMyJoinList(int pageNum, int pageSize, String kind,String userId);
    NeedProblemInventoryDTO getDetails(String id);
    int addData(NeedProblemInventoryDTO item);
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NeedProblemInventoryServiceImpl.java
@@ -34,6 +34,12 @@
    }
    @Override
    public IPage<NeedProblemInventoryDTO> getMyJoinList(int pageNum, int pageSize, String kind, String userId) {
        Page page = new Page<>(pageNum,pageSize);
        return baseMapper.getMyJoinList(page,kind,userId);
    }
    @Override
    public NeedProblemInventoryDTO getDetails(String id) {
        return baseMapper.getDetails(id);
    }
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/NeedProblemInventoryMapper.xml
@@ -33,19 +33,82 @@
    <select id="getList" resultType="com.panzhihua.common.model.dtos.partybuilding.NeedProblemInventoryDTO">
        SELECT
            <include refid="Base_Column_List" />
        FROM
        new_fight_need_problem_inventory
            nfpi.id,
            nfpi.title,
            nfpi.classify_id,
            canct.name as classifyName,
            nfpi.claim_num,
            nfpi.address,
            nfpi.lat,
            nfpi.lon,
            nfpi.claim_start_time,
            nfpi.claim_end_time,
            nfpi.need_start_time,
            nfpi.need_end_time,
            nfpi.linkman,
            nfpi.phone,
            nfpi.sign_in_scope,
            nfpi.sign_out_scope,
            nfpi.award,
            nfpi.content,
            nfpi.imgs_url,
            nfpi.creation_time,
            nfpi.update_time,
            nfpi.kind,
            nfpi.community_id,
            nfpi.user_id
        FROM new_fight_need_problem_inventory as nfpi
        left join com_act_neighbor_circle_topic as canct on canct.id=nfpi.classify_id
        <where>
            1=1
            <if test="kind !=null and kind != '' ">
                and kind =#{kind}
                and nfpi.kind =#{kind}
            </if>
            <if test="communityId !=null and communityId != '' ">
                and community_id =#{communityId}
                and nfpi.community_id =#{communityId}
            </if>
            <if test="userId !=null and userId != '' ">
                and user_id =#{userId}
                and nfpi.user_id =#{userId}
            </if>
        </where>
    </select>
    <select id="getMyJoinList" resultType="com.panzhihua.common.model.dtos.partybuilding.NeedProblemInventoryDTO">
        SELECT
            nfpi.id,
            nfpi.title,
            nfpi.classify_id,
            canct.name as classifyName,
            nfpi.claim_num,
            nfpi.address,
            nfpi.lat,
            nfpi.lon,
            nfpi.claim_start_time,
            nfpi.claim_end_time,
            nfpi.need_start_time,
            nfpi.need_end_time,
            nfpi.linkman,
            nfpi.phone,
            nfpi.sign_in_scope,
            nfpi.sign_out_scope,
            nfpi.award,
            nfpi.content,
            nfpi.imgs_url,
            nfpi.creation_time,
            nfpi.update_time,
            nfpi.kind,
            nfpi.community_id,
            nfpi.user_id
        FROM new_fight_need_problem_inventory as nfpi
        left join com_act_neighbor_circle_topic as canct on canct.id=nfpi.classify_id
        <where>
            1=1
            <if test="kind !=null and kind != '' ">
                and nfpi.kind =#{kind}
            </if>
            <if test="userId !=null and userId != '' ">
                and nfpi.id in(SELECT task_id FROM new_fight_need_problem_claim where user_id=#{userId} )
            </if>
        </where>
    </select>
@@ -53,13 +116,36 @@
    <select id="getDetails" resultType="com.panzhihua.common.model.dtos.partybuilding.NeedProblemInventoryDTO">
        SELECT
            <include refid="Base_Column_List" />
        FROM
        new_fight_need_problem_inventory
            nfpi.id,
            nfpi.title,
            nfpi.classify_id,
            canct.name as classifyName,
            nfpi.claim_num,
            nfpi.address,
            nfpi.lat,
            nfpi.lon,
            nfpi.claim_start_time,
            nfpi.claim_end_time,
            nfpi.need_start_time,
            nfpi.need_end_time,
            nfpi.linkman,
            nfpi.phone,
            nfpi.sign_in_scope,
            nfpi.sign_out_scope,
            nfpi.award,
            nfpi.content,
            nfpi.imgs_url,
            nfpi.creation_time,
            nfpi.update_time,
            nfpi.kind,
            nfpi.community_id,
            nfpi.user_id
        FROM new_fight_need_problem_inventory as nfpi
        left join com_act_neighbor_circle_topic as canct on canct.id=nfpi.classify_id
        <where>
            1=1
            <if test="id !=null and id != '' ">
                and id =#{id}
                and nfpi.id =#{id}
            </if>
        </where>
    </select>