lidongdong
2024-06-26 8e83da5730846a3e996e08ebf08ee22d55148760
花城 后台添加  需求问题清单模块
2个文件已修改
169 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/NewStriveApi.java 168 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/NewFightCommunityConstructionMapper.xml 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/NewStriveApi.java
@@ -2,9 +2,7 @@
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.partybuilding.NewFightCommunityConstructionDTO;
import com.panzhihua.common.model.dtos.partybuilding.NewFightProjectPlanDTO;
import com.panzhihua.common.model.dtos.partybuilding.NewFightResourceSharingDTO;
import com.panzhihua.common.model.dtos.partybuilding.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.building.NewFightConfigVO;
import com.panzhihua.common.model.vos.community.building.NewFightConvenientMerchantVO;
@@ -30,6 +28,170 @@
    @Resource
    private NewStriveForFeign newStriveForFeign;
    /*****************************************************************************************************************
     *
     *                                   任务需求清单
     *
     ******************************************************************************************************************/
    @ApiOperation(value = "任务需求清单列表", response = NeedProblemInventoryDTO.class)
    @GetMapping("/NeedProblem/getList")
    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,classifyId,status,kind,userId,getUserId()+"",communityId);
    }
    @ApiOperation(value = "任务需求清单我认领的列表", response = NeedProblemInventoryDTO.class)
    @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,search,status,kind,getUserId()+"",getUserId()+"");
    }
    @ApiOperation(value = "任务需求清单详情", response = NeedProblemInventoryDTO.class)
    @GetMapping("/NeedProblem/getDetails")
    public R getNeedProblemDetails(@RequestParam("id") String id)
    {
        return newStriveForFeign.getNeedProblemDetails(id,getUserId()+"");
    }
    @ApiOperation(value = "新增任务需求")
    @PostMapping("/NeedProblem/addData")
    public R addNeedProblemData(@RequestBody NeedProblemInventoryDTO item)
    {
        return newStriveForFeign.addNeedProblemData(item);
    }
    @ApiOperation(value = "编辑任务需求")
    @PostMapping("/NeedProblem/editData")
    public R editNeedProblemData(@RequestBody NeedProblemInventoryDTO item)
    {
        return newStriveForFeign.editNeedProblemData(item);
    }
    @ApiOperation(value = "删除任务需求")
    @DeleteMapping("/NeedProblem/expurgateData")
    public R expurgateNeedProblemData(@RequestParam("id") String id)
    {
        return newStriveForFeign.expurgateNeedProblemData(id);
    }
    /*******************************************************************************************************
     *
     *         任务需求报名
     *
     *******************************************************************************************************/
    @ApiOperation(value = "任务报名列表", response = NeedProblemClaimDTO.class)
    @GetMapping("/getNeedClaimList")
    public R getNeedClaimList(@RequestParam(value = "taskId", required = false) String taskId,
                              @RequestParam(value = "userId", required = false) String userId,
                              @RequestParam(value = "unitId", required = false) String unitId)
    {
        return newStriveForFeign.getNeedClaimList(taskId,userId,unitId);
    }
    @ApiOperation(value = "任务报名详情", response = NeedProblemClaimDTO.class)
    @GetMapping("/getNeedClaimDetails")
    public R getNeedClaimDetails(@RequestParam(value = "id", required = false) String id,
                                 @RequestParam(value = "taskId", required = false) String taskId,
                                 @RequestParam(value = "userId", required = false) String userId)
    {
        return newStriveForFeign.getNeedClaimDetails(id,taskId,userId);
    }
    @ApiOperation(value = "任务报名")
    @PostMapping("/addNeedClaimData")
    public R addNeedClaimData(@RequestBody NeedProblemClaimDTO item)
    {
        return newStriveForFeign.addNeedClaimData(item);
    }
    @ApiOperation(value = "修改任务报名")
    @PostMapping("/editNeedClaimData")
    public R editNeedClaimData(@RequestBody NeedProblemClaimDTO item)
    {
        return newStriveForFeign.editNeedClaimData(item);
    }
    @ApiOperation(value = "取消报名")
    @DeleteMapping("/expurgateNeedClaimData")
    public R expurgateNeedClaimData(@RequestParam(value = "id", required = false) String id,
                                    @RequestParam(value = "taskId", required = false) String taskId,
                                    @RequestParam(value = "userId", required = false) String userId)
    {
        return newStriveForFeign.expurgateNeedClaimData(id,taskId,userId);
    }
    @ApiOperation(value = "打卡")
    @GetMapping("/needClaimSignIn")
    public R needClaimSignIn(@RequestParam("taskId") String taskId,
                             @RequestParam("userId") String userId,
                             @RequestParam("type") String type)
    {
        return newStriveForFeign.needClaimSignIn(taskId,userId,type);
    }
    /***************************************************************************************************************
     *
     *                 代单位接受
     *
     *************************************************************************************************************/
    @ApiOperation(value = "代单位任务报名列表", response = NeedProblemUnitTaskDTO.class)
    @GetMapping("/getNeedTaskList")
    public R getNeedTaskList(@RequestParam("pageNum") int pageNum,
                             @RequestParam("pageNum") int pageSize,
                             @RequestParam(value = "unitId", required = false) String unitId)
    {
        return newStriveForFeign.getNeedTaskList(pageNum,pageSize,unitId);
    }
    @ApiOperation(value = "代单位任务报名详情", response = NeedProblemUnitTaskDTO.class)
    @GetMapping("/getNeedTaskDetails")
    public R  getNeedTaskDetails(@RequestParam("id") String id)
    {
        return newStriveForFeign.getNeedTaskDetails(id);
    }
    @ApiOperation(value = "代单位任务添加")
    @PostMapping("/addNeedTaskData")
    public R  addNeedTaskData(@RequestBody NeedProblemUnitTaskDTO item)
    {
        return newStriveForFeign.addNeedTaskData(item);
    }
    @ApiOperation(value = "代单位任务修改")
    @PostMapping("/editNeedTaskData")
    public R  editNeedTaskData(@RequestBody NeedProblemUnitTaskDTO item)
    {
        return newStriveForFeign.editNeedTaskData(item);
    }
    @ApiOperation(value = "代单位任务删除")
    @DeleteMapping("/expurgateNeedTaskData")
    public R  expurgateNeedTaskData(@RequestParam("id") String id)
    {
        return newStriveForFeign.expurgateNeedTaskData(id);
    }
    /*******************************************************************************************************************
     *
     *                              新双争双评社区共建
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/NewFightCommunityConstructionMapper.xml
@@ -46,6 +46,7 @@
            </if>
        </where>
        GROUP BY nfcc.id
        order by nfcc.creation_time desc
    </select>
    <select id="getDetails" resultType="com.panzhihua.common.model.dtos.partybuilding.NewFightCommunityConstructionDTO">