lidongdong
2023-11-14 21aeafe992d86248de4f331daaca70488888f37e
修改问题任务报名人员列表
6个文件已修改
26 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/NewStriveForFeign.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NeedProblemClaimApi.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/NeedProblemClaimDAO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NeedProblemClaimService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NeedProblemClaimServiceImpl.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java
@@ -116,13 +116,11 @@
     *******************************************************************************************************/
    @ApiOperation(value = "任务报名列表", response = NeedProblemClaimDTO.class)
    @GetMapping("/getNeedClaimList")
    public R getNeedClaimList(@RequestParam("pageNum") int pageNum,
                              @RequestParam("pageSize") int pageSize,
                              @RequestParam(value = "taskId", required = false) String taskId,
    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(pageNum,pageSize,taskId,userId,unitId);
        return newStriveForFeign.getNeedClaimList(taskId,userId,unitId);
    }
    @ApiOperation(value = "任务报名详情", response = NeedProblemClaimDTO.class)
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/NewStriveForFeign.java
@@ -82,9 +82,7 @@
     *
     *******************************************************************************************************/
    @GetMapping("/NeedClaim/getNeedClaimList")
    public R getNeedClaimList(@RequestParam("pageNum") int pageNum,
                              @RequestParam("pageSize") int pageSize,
                              @RequestParam(value = "taskId", required = false) String taskId,
    public R getNeedClaimList(@RequestParam(value = "taskId", required = false) String taskId,
                              @RequestParam(value = "userId", required = false) String userId,
                              @RequestParam(value = "unitId", required = false) String unitId);
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NeedProblemClaimApi.java
@@ -17,13 +17,12 @@
    private NeedProblemClaimService claimService;
    @GetMapping("/getNeedClaimList")
    public R getNeedClaimList(@RequestParam("pageNum") int pageNum,
                     @RequestParam("pageSize") int pageSize,
    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 R.ok(claimService.getList(pageNum,pageSize,taskId,userId,unitId));
        return R.ok(claimService.getList(taskId,userId,unitId));
    }
    @GetMapping("/getNeedClaimDetails")
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/NeedProblemClaimDAO.java
@@ -18,7 +18,7 @@
public interface NeedProblemClaimDAO extends BaseMapper<NeedProblemClaimDTO>
{
    IPage<NeedProblemClaimDTO> getList(Page page,@Param("taskId") String taskId,
    IPage<NeedProblemClaimDTO> getList(@Param("taskId") String taskId,
                                    @Param("userId") String userId,
                                    @Param("unitId") String unitId);
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NeedProblemClaimService.java
@@ -16,7 +16,7 @@
public interface NeedProblemClaimService
{
    IPage<NeedProblemClaimDTO> getList(int pageNum, int pageSize, String taskId, String userId,String unitId);
    IPage<NeedProblemClaimDTO> getList(String taskId, String userId,String unitId);
    NeedProblemClaimDTO getDetails(String id);
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NeedProblemClaimServiceImpl.java
@@ -30,11 +30,10 @@
    private NeedProblemInventoryService inventoryService;
    @Override
    public IPage<NeedProblemClaimDTO> getList(int pageNum, int pageSize,
                                              String taskId, String userId,String unitId)
    public IPage<NeedProblemClaimDTO> getList(String taskId, String userId,String unitId)
    {
        Page page = new Page<>(pageNum,pageSize);
        return baseMapper.getList(page,taskId,userId,unitId);
//        Page page = new Page<>(pageNum,pageSize);
        return baseMapper.getList(taskId,userId,unitId);
    }
    @Override