新增问题清单状态 搜索

lidongdong

2023-11-14 363e6e5357015a017b4e26c9ea153e0a8f06764f

新增问题清单状态   搜索

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

@@ -58,10 +58,12 @@
    @GetMapping("/NeedProblem/getList")
    public R getNeedProblemList(@RequestParam("pageNum") int pageNum,
                                @RequestParam("pageSize") int pageSize,
                                @RequestParam(value = "search", required = false)String search,
                                @RequestParam(value = "status", required = false)String status,
                                @RequestParam(value = "kind", required = false)String kind,
                                @RequestParam(value = "userId", required = false)String userId)
    {
        return newStriveForFeign.getNeedProblemList(pageNum,pageSize,kind,userId,getCommunityId()+"");
        return newStriveForFeign.getNeedProblemList(pageNum,pageSize,search,status,kind,userId,getCommunityId()+"");
    }


@@ -69,9 +71,11 @@
    @GetMapping("/getMyJoinNeedProblemList")
    public R getMyJoinNeedProblemList(@RequestParam("pageNum") int pageNum,
                                      @RequestParam("pageSize") int pageSize,
                                      @RequestParam(value = "search", required = false)String search,
                                      @RequestParam(value = "status", required = false)String status,
                                      @RequestParam(value = "kind", required = false)String kind)
    {
        return newStriveForFeign.getMyJoinNeedProblemList(pageNum,pageSize,kind,getUserId()+"");
        return newStriveForFeign.getMyJoinNeedProblemList(pageNum,pageSize,search,status,kind,getUserId()+"");
    }



 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/NeedProblemInventoryDTO.java

@@ -85,4 +85,10 @@

    @ApiModelProperty("创建人id")
    private String userId;

    @ApiModelProperty("状态 （1认领中   2进行中   3已完成）")
    private String status;



}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/NewStriveForFeign.java

@@ -46,6 +46,8 @@
    @GetMapping("/NeedProblem/getList")
    public R getNeedProblemList(@RequestParam("pageNum") int pageNum,
                                @RequestParam("pageSize") int pageSize,
                                @RequestParam(value = "search", required = false)String search,
                                @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);
@@ -53,6 +55,8 @@
    @GetMapping("/NeedProblem/getMyJoinNeedProblemList")
    public R getMyJoinNeedProblemList(@RequestParam("pageNum") int pageNum,
                                      @RequestParam("pageSize") int pageSize,
                                      @RequestParam(value = "search", required = false)String search,
                                      @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

@@ -19,20 +19,24 @@
    @GetMapping("/getList")
    public R getNeedProblemList(@RequestParam("pageNum") int pageNum,
                                @RequestParam("pageSize") int pageSize,
                                @RequestParam(value = "search", required = false)String search,
                                @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 R.ok(inventoryService.getList(pageNum,pageSize,kind,userId,communityId));
        return R.ok(inventoryService.getList(pageNum,pageSize,search,status,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)
                                      @RequestParam("pageSize") int pageSize,
                                      @RequestParam(value = "search", required = false) String search,
                                      @RequestParam(value = "status", required = false) String status,
                                      @RequestParam(value = "kind", required = false) String kind,
                                      @RequestParam(value = "userId", required = false)String userId)
    {
        return R.ok(inventoryService.getMyJoinList(pageNum,pageSize,kind,userId));
        return R.ok(inventoryService.getMyJoinList(pageNum,pageSize,search,status,kind,userId));
    }

    @GetMapping("/getDetails")

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

@@ -20,12 +20,18 @@
public interface NeedProblemInventoryDAO extends BaseMapper<NeedProblemInventoryDTO>
{

    IPage<NeedProblemInventoryDTO> getList(Page page,@Param("kind") String kind,
                                    @Param("userId") String userId,
                                    @Param("communityId") String communityId);
    IPage<NeedProblemInventoryDTO> getList(Page page,
                                           @Param("search") String search,
                                           @Param("status") String status,
                                           @Param("kind") String kind,
                                           @Param("userId") String userId,
                                           @Param("communityId") String communityId);

    IPage<NeedProblemInventoryDTO> getMyJoinList(Page page,@Param("kind") String kind,
                                                @Param("userId") String userId);
    IPage<NeedProblemInventoryDTO> getMyJoinList(Page page,
                                                 @Param("search") String search,
                                                 @Param("status") String status,
                                                 @Param("kind") String kind,
                                                 @Param("userId") String userId);

    NeedProblemInventoryDTO getDetails(@Param("id")String id);


 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NeedProblemInventoryService.java

@@ -17,9 +17,13 @@
public interface NeedProblemInventoryService
{

    IPage<NeedProblemInventoryDTO> getList(int pageNum, int pageSize, String kind,String userId,String communityId);
    IPage<NeedProblemInventoryDTO> getList(int pageNum, int pageSize,
                                           String search,String status,
                                           String kind,String userId,String communityId);

    IPage<NeedProblemInventoryDTO> getMyJoinList(int pageNum, int pageSize, String kind,String userId);
    IPage<NeedProblemInventoryDTO> getMyJoinList(int pageNum, int pageSize,
                                                 String search,String status,
                                                 String kind,String userId);

    NeedProblemInventoryDTO getDetails(String id);


 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NeedProblemInventoryServiceImpl.java

@@ -27,16 +27,16 @@


    @Override
    public IPage<NeedProblemInventoryDTO> getList(int pageNum, int pageSize, String kind, String userId,String communityId)
    public IPage<NeedProblemInventoryDTO> getList(int pageNum, int pageSize,String search,String status, String kind, String userId,String communityId)
    {
        Page page = new Page<>(pageNum,pageSize);
        return baseMapper.getList(page,kind,userId,communityId);
        return baseMapper.getList(page, search, status,kind,userId,communityId);
    }

    @Override
    public IPage<NeedProblemInventoryDTO> getMyJoinList(int pageNum, int pageSize, String kind, String userId) {
    public IPage<NeedProblemInventoryDTO> getMyJoinList(int pageNum, int pageSize,String search,String status, String kind, String userId) {
        Page page = new Page<>(pageNum,pageSize);
        return baseMapper.getMyJoinList(page,kind,userId);
        return baseMapper.getMyJoinList(page, search, status,kind,userId);
    }

    @Override
@@ -46,6 +46,7 @@

    @Override
    public int addData(NeedProblemInventoryDTO item) {
        item.setStatus("1");
        return baseMapper.addData(item);
    }


 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/NeedProblemInventoryMapper.xml

@@ -56,11 +56,18 @@
            nfpi.update_time,
            nfpi.kind,
            nfpi.community_id,
            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
        <where>
            1=1
            <if test="search !=null and search != '' ">
                and nfpi.title like concat ('%',#{search},'%')
            </if>
            <if test="status !=null and status != '' ">
                and nfpi.status =#{status}
            </if>
            <if test="kind !=null and kind != '' ">
                and nfpi.kind =#{kind}
            </if>
@@ -99,11 +106,18 @@
            nfpi.update_time,
            nfpi.kind,
            nfpi.community_id,
            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
        <where>
            1=1
            <if test="search !=null and search != '' ">
                and nfpi.title like concat ('%',#{search},'%')
            </if>
            <if test="status !=null and status != '' ">
                and nfpi.status =#{status}
            </if>
            <if test="kind !=null and kind != '' ">
                and nfpi.kind =#{kind}
            </if>
@@ -139,6 +153,7 @@
            nfpi.update_time,
            nfpi.kind,
            nfpi.community_id,
            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
@@ -217,6 +232,9 @@
            <if test="item.communityId != null and item.communityId !='' " >
                community_id,
            </if>
            <if test="item.status != null and item.status !='' " >
                status,
            </if>
            creation_time
        </trim>
        values
@@ -283,6 +301,9 @@
            </if>
            <if test="item.communityId != null and item.communityId !='' " >
                #{item.communityId},
            </if>
            <if test="item.status != null and item.status !='' " >
                #{item.status},
            </if>
            sysdate()
        </trim>
@@ -357,6 +378,9 @@
            <if test="item.communityId != null and item.communityId !='' " >
                community_id=#{item.communityId},
            </if>
            <if test="item.status != null and item.status !='' " >
                status=#{item.status},
            </if>
            update_time=sysdate()
        </set>
        where id = #{item.id}