lidongdong
2024-03-07 8d564e6cb6fa837b71d2a135b54ae21e27697ba9
修改双争双评问题列表没数据3
7个文件已修改
21 ■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/NewStriveForFeign.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NeedProblemApi.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/NeedProblemInventoryDAO.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NeedProblemInventoryService.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NeedProblemInventoryServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/NeedProblemInventoryMapper.xml 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java
@@ -75,12 +75,13 @@
    public R getNeedProblemList(@RequestParam("pageNum") int pageNum,
                                @RequestParam("pageSize") int pageSize,
                                @RequestParam(value = "search", required = false)String search,
                                @RequestParam(value = "classifyId", required = false)String classifyId,
                                @RequestParam(value = "status", required = false)String status,
                                @RequestParam(value = "kind", required = false)String kind,
                                @RequestParam(value = "userId", required = false)String userId,
                                @RequestParam(value = "communityId", required = false)String communityId)
    {
        return newStriveForFeign.getNeedProblemList(pageNum,pageSize,search,status,kind,userId,getUserId()+"",communityId);
        return newStriveForFeign.getNeedProblemList(pageNum,pageSize,search,classifyId,status,kind,userId,getUserId()+"",communityId);
    }
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/NewStriveForFeign.java
@@ -49,6 +49,7 @@
    public R getNeedProblemList(@RequestParam("pageNum") int pageNum,
                                @RequestParam("pageSize") int pageSize,
                                @RequestParam(value = "search", required = false)String search,
                                @RequestParam(value = "classifyId", required = false)String classifyId,
                                @RequestParam(value = "status", required = false)String status,
                                @RequestParam(value = "kind", required = false)String kind,
                                @RequestParam(value = "userId", required = false)String userId,
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NeedProblemApi.java
@@ -20,13 +20,14 @@
    public R getNeedProblemList(@RequestParam("pageNum") int pageNum,
                                @RequestParam("pageSize") int pageSize,
                                @RequestParam(value = "search", required = false)String search,
                                @RequestParam(value = "classifyId", required = false)String classifyId,
                                @RequestParam(value = "status", required = false)String status,
                                @RequestParam(value = "kind", required = false)String kind,
                                @RequestParam(value = "userId", required = false)String userId,
                                @RequestParam(value = "userIds", required = false)String userIds,
                                @RequestParam(value = "communityId", required = false)String communityId)
    {
        return R.ok(inventoryService.getList(pageNum,pageSize,search,status,kind,userId,userIds,communityId));
        return R.ok(inventoryService.getList(pageNum,pageSize,search,classifyId,status,kind,userId,userIds,communityId));
    }
    @GetMapping("/getMyJoinNeedProblemList")
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/NeedProblemInventoryDAO.java
@@ -23,6 +23,7 @@
    IPage<NeedProblemInventoryDTO> getList(Page page,
                                           @Param("search") String search,
                                           @Param("classifyId") String classifyId,
                                           @Param("status") String status,
                                           @Param("kind") String kind,
                                           @Param("userId") String userId,
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NeedProblemInventoryService.java
@@ -19,7 +19,9 @@
{
    IPage<NeedProblemInventoryDTO> getList(int pageNum, int pageSize,
                                           String search,String status,
                                           String search,
                                           String classifyId,
                                           String status,
                                           String kind,
                                           String userId,
                                           String userIds,
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NeedProblemInventoryServiceImpl.java
@@ -28,14 +28,14 @@
{
    @Override
    public IPage<NeedProblemInventoryDTO> getList(int pageNum, int pageSize,String search,String status,
    public IPage<NeedProblemInventoryDTO> getList(int pageNum, int pageSize,String search,String classifyId,String status,
                                                  String kind,
                                                  String userId,
                                                  String userIds,
                                                  String communityId)
    {
        Page page = new Page<>(pageNum,pageSize);
        return baseMapper.getList(page, search, status,kind,userId,userIds,communityId);
        return baseMapper.getList(page, search, classifyId,status,kind,userId,userIds,communityId);
    }
    @Override
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/NeedProblemInventoryMapper.xml
@@ -64,13 +64,16 @@
            nfpi.status,
            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
        left join com_act_neighbor_circle_topic_new as canct on canct.id=nfpi.classify_id
        left join new_fight_need_problem_claim as nfnpc on nfnpc.task_id=nfpi.id and nfnpc.user_id=#{userIds}
        <where>
            1=1
            <if test="search !=null and search != '' ">
                and nfpi.title like concat ('%',#{search},'%')
            </if>
            <if test="classifyId !=null and classifyId != '' ">
                and nfpi.classify_id=#{classifyId},
            </if>
            <if test="status !=null and status != '' ">
                and nfpi.status =#{status}
            </if>