新增问题清单列表 详情增加搜索 是否打卡 是否参加字段

lidongdong

2023-11-14 4e6d844f4e117dd8d22ab812c907dd3c759400d1

新增问题清单列表  详情增加搜索  是否打卡  是否参加字段

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

@@ -63,7 +63,7 @@
                                @RequestParam(value = "kind", required = false)String kind,
                                @RequestParam(value = "userId", required = false)String userId)
    {
        return newStriveForFeign.getNeedProblemList(pageNum,pageSize,search,status,kind,userId,getCommunityId()+"");
        return newStriveForFeign.getNeedProblemList(pageNum,pageSize,search,status,kind,userId,getUserId()+"",getCommunityId()+"");
    }


@@ -75,7 +75,7 @@
                                      @RequestParam(value = "status", required = false)String status,
                                      @RequestParam(value = "kind", required = false)String kind)
    {
        return newStriveForFeign.getMyJoinNeedProblemList(pageNum,pageSize,search,status,kind,getUserId()+"");
        return newStriveForFeign.getMyJoinNeedProblemList(pageNum,pageSize,search,status,kind,getUserId()+"",getUserId()+"");
    }


@@ -84,7 +84,7 @@
    @GetMapping("/NeedProblem/getDetails")
    public R getNeedProblemDetails(@RequestParam("id") String id)
    {
        return newStriveForFeign.getNeedProblemDetails(id);
        return newStriveForFeign.getNeedProblemDetails(id,getUserId()+"");
    }

    @ApiOperation(value = "新增任务需求")

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

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

    @ApiModelProperty("是否参加任务 0未参加  1参加")
    private String isJoin;

    @ApiModelProperty("开始时间打卡")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date punch_start_time;

    @ApiModelProperty("结束时间打卡")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date punch_end_time;


}

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

@@ -50,6 +50,7 @@
                                @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);

    @GetMapping("/NeedProblem/getMyJoinNeedProblemList")
@@ -58,11 +59,12 @@
                                      @RequestParam(value = "search", required = false)String search,
                                      @RequestParam(value = "status", required = false)String status,
                                      @RequestParam(value = "kind", required = false)String kind,
                                      @RequestParam(value = "userIds", required = false)String userIds,
                                      @RequestParam(value = "userId", required = false)String userId);


    @GetMapping("/NeedProblem/getDetails")
    public R getNeedProblemDetails(@RequestParam("id") String id);
    public R getNeedProblemDetails(@RequestParam("id") String id,@RequestParam("userIds") String userIds);

    @PostMapping("/NeedProblem/addData")
    public R addNeedProblemData(@RequestBody NeedProblemInventoryDTO item);

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NeedProblemApi.java

@@ -23,9 +23,10 @@
                                @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,communityId));
        return R.ok(inventoryService.getList(pageNum,pageSize,search,status,kind,userIds,userId,communityId));
    }

    @GetMapping("/getMyJoinNeedProblemList")
@@ -34,15 +35,16 @@
                                      @RequestParam(value = "search", required = false) String search,
                                      @RequestParam(value = "status", required = false) String status,
                                      @RequestParam(value = "kind", required = false) String kind,
                                      @RequestParam(value = "userIds", required = false) String userIds,
                                      @RequestParam(value = "userId", required = false)String userId)
    {
        return R.ok(inventoryService.getMyJoinList(pageNum,pageSize,search,status,kind,userId));
        return R.ok(inventoryService.getMyJoinList(pageNum,pageSize,search,status,kind,userIds,userId));
    }

    @GetMapping("/getDetails")
    public R getNeedProblemDetails(@RequestParam("id") String id)
    public R getNeedProblemDetails(@RequestParam("id") String id,@RequestParam("userIds") String userIds)
    {
        return R.ok(inventoryService.getDetails(id));
        return R.ok(inventoryService.getDetails(id,userIds));
    }

    @PostMapping("/addData")

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

@@ -25,15 +25,17 @@
                                           @Param("status") String status,
                                           @Param("kind") String kind,
                                           @Param("userId") String userId,
                                           @Param("userIds") String userIds,
                                           @Param("communityId") String communityId);

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

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

    int addData(@Param("item") NeedProblemInventoryDTO userIds);


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

@@ -19,13 +19,18 @@

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

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

    NeedProblemInventoryDTO getDetails(String id);
    NeedProblemInventoryDTO getDetails(String id,String userIds);

    int addData(NeedProblemInventoryDTO item);


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

@@ -27,21 +27,28 @@


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

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

    @Override
    public NeedProblemInventoryDTO getDetails(String id) {
        return baseMapper.getDetails(id);
    public NeedProblemInventoryDTO getDetails(String id,String userIds) {
        return baseMapper.getDetails(id,userIds);
    }

    @Override

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

@@ -12,8 +12,7 @@
        service_time,
        unit_id,
        creation_time,
        update_time,

        update_time
    </sql>



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

@@ -56,10 +56,14 @@
            nfpi.update_time,
            nfpi.kind,
            nfpi.community_id,
            nfnpc.punch_start_time,
            nfnpc.punch_end_time,
            count(nfnpc.id) as isJoin,
            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 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 != '' ">
@@ -106,10 +110,14 @@
            nfpi.update_time,
            nfpi.kind,
            nfpi.community_id,
            nfnpc.punch_start_time,
            nfnpc.punch_end_time,
            count(nfnpc.id) as isJoin,
            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 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 != '' ">
@@ -153,10 +161,14 @@
            nfpi.update_time,
            nfpi.kind,
            nfpi.community_id,
            nfnpc.punch_start_time,
            nfnpc.punch_end_time,
            count(nfnpc.id) as isJoin,
            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 new_fight_need_problem_claim as nfnpc on nfnpc.task_id=nfpi.id and nfnpc.user_id=#{userIds}
        <where>
            1=1
            <if test="id !=null and id != '' ">