花城 修改【小程序】【需求清单】位接单后，切换问题、需求数据一样

lidongdong

2024-06-28 0ceb3c850cc2d6df73819985dbbc67630b435314

花城 修改【小程序】【需求清单】位接单后，切换问题、需求数据一样

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

@@ -229,9 +229,10 @@
    @GetMapping("/getNeedTaskList")
    public R getNeedTaskList(@RequestParam("pageNum") int pageNum,
                             @RequestParam("pageNum") int pageSize,
                             @RequestParam(value = "unitId", required = false) String unitId)
                             @RequestParam(value = "unitId", required = false) String unitId,
                             @RequestParam(value = "kind", required = false) String kind)
    {
        return newStriveForFeign.getNeedTaskList(pageNum,pageSize,unitId);
        return newStriveForFeign.getNeedTaskList(pageNum,pageSize,unitId,kind);
    }

    @ApiOperation(value = "代单位任务报名详情", response = NeedProblemUnitTaskDTO.class)

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

@@ -128,7 +128,8 @@
    @GetMapping("/NeedTask/getNeedTaskList")
    public R getNeedTaskList(@RequestParam("pageNum") int pageNum,
                             @RequestParam("pageNum") int pageSize,
                             @RequestParam(value = "unitId", required = false) String unitId);
                             @RequestParam(value = "unitId", required = false) String unitId,
                             @RequestParam(value = "kind", required = false) String kind);

    @GetMapping("/NeedTask/getNeedTaskDetails")
    public R  getNeedTaskDetails(@RequestParam("id") String id);

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/NewStriveApi.java

@@ -192,9 +192,10 @@
    @GetMapping("/getNeedTaskList")
    public R getNeedTaskList(@RequestParam("pageNum") int pageNum,
                             @RequestParam("pageNum") int pageSize,
                             @RequestParam(value = "unitId", required = false) String unitId)
                             @RequestParam(value = "unitId", required = false) String unitId,
                             @RequestParam(value = "kind", required = false) String kind)
    {
        return newStriveForFeign.getNeedTaskList(pageNum,pageSize,unitId);
        return newStriveForFeign.getNeedTaskList(pageNum,pageSize,unitId,kind);
    }

    @ApiOperation(value = "代单位任务报名详情", response = NeedProblemUnitTaskDTO.class)

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

@@ -19,9 +19,10 @@
    @GetMapping("/getNeedTaskList")
    public R getNeedTaskList(@RequestParam("pageNum") int pageNum,
                             @RequestParam("pageNum") int pageSize,
                             @RequestParam(value = "unitId", required = false) String unitId)
                             @RequestParam(value = "unitId", required = false) String unitId,
                             @RequestParam(value = "kind", required = false) String kind)
    {
        return R.ok(taskService.getList(pageNum,pageSize,unitId));
        return R.ok(taskService.getList(pageNum,pageSize,unitId,kind));
    }

    @GetMapping("/getNeedTaskDetails")

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

@@ -22,7 +22,8 @@


    IPage<NeedProblemUnitTaskDTO> getList(Page page,
                                          @Param("unitId") String unitId);
                                          @Param("unitId") String unitId,
                                          @Param("kind") String kind);

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


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

@@ -13,7 +13,7 @@
public interface NeedProblemUnitTaskService
{

    IPage<NeedProblemUnitTaskDTO> getList(int pageNum, int pageSize, String unitId);
    IPage<NeedProblemUnitTaskDTO> getList(int pageNum, int pageSize, String unitId,String kind);

    NeedProblemUnitTaskDTO getDetails(String id);


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

@@ -25,10 +25,10 @@


    @Override
    public IPage<NeedProblemUnitTaskDTO> getList(int pageNum, int pageSize, String unitId)
    public IPage<NeedProblemUnitTaskDTO> getList(int pageNum, int pageSize, String unitId,String kind)
    {
        Page page = new Page<>(pageNum,pageSize);
        return baseMapper.getList(page,unitId);
        return baseMapper.getList(page,unitId,kind);
    }

    @Override

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

@@ -51,6 +51,9 @@
            <if test="unitId !=null and unitId != '' ">
                and nput.unit_id =#{unitId}
            </if>
            <if test="kind !=null and kind != '' ">
                and npi.kind =#{kind}
            </if>
        </where>
        GROUP BY nput.id
    </select>