mitao
2025-05-20 179c4d64313c9b7572778da4aaaf6c6584fe457d
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java
@@ -27,6 +27,8 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
@Slf4j
@@ -75,12 +77,28 @@
    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)
                                @RequestParam(value = "communityId", required = false)String communityId,
                                @RequestParam(value = "startTime", required = false) String startTime,
                                @RequestParam(value = "endTime", required = false) String endTime)
    {
        return newStriveForFeign.getNeedProblemList(pageNum,pageSize,search,status,kind,userId,getUserId()+"",communityId);
        Date start=null;
        Date end=null;
        try {
            if(!StringUtils.isEmpty(startTime)) {
                start = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(startTime);
            }
            if(!StringUtils.isEmpty(startTime)) {
                end = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(endTime);
            }
        } catch (ParseException e) {
            e.printStackTrace();
        }
        return newStriveForFeign.getNeedProblemList(pageNum,pageSize,search,classifyId,status,kind,userId,getUserId()+"",communityId,"1",start,end);
    }
@@ -90,9 +108,28 @@
                                      @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 = "kind", required = false)String kind,
                                      @RequestParam(value = "isDisplay", required = false)String isDisplay,
                                      @RequestParam(value = "startTime", required = false) String startTime,
                                      @RequestParam(value = "endTime", required = false) String endTime)
    {
        return newStriveForFeign.getMyJoinNeedProblemList(pageNum,pageSize,search,status,kind,getUserId()+"",getUserId()+"");
        Date start=null;
        Date end=null;
        try {
            if(!StringUtils.isEmpty(startTime)) {
                start = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(startTime);
            }
            if(!StringUtils.isEmpty(startTime)) {
                end = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(endTime);
            }
        } catch (ParseException e) {
            e.printStackTrace();
        }
        return newStriveForFeign.getMyJoinNeedProblemList(pageNum,pageSize,search,status,kind,getUserId()+"",getUserId()+"",isDisplay,start,end);
    }
@@ -191,10 +228,12 @@
    @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)
                             @RequestParam("pageSize") int pageSize,
                             @RequestParam(value = "unitId", required = false) String unitId,
                             @RequestParam(value = "kind", required = false) String kind,
                             @RequestParam(value = "status", required = false) String status)
    {
        return newStriveForFeign.getNeedTaskList(pageNum,pageSize,unitId);
        return newStriveForFeign.getNeedTaskList(pageNum,pageSize,unitId,kind,status);
    }
    @ApiOperation(value = "代单位任务报名详情", response = NeedProblemUnitTaskDTO.class)
@@ -235,10 +274,15 @@
    @ApiOperation(value = "社区共建项目列表", response = NewFightCommunityConstructionDTO.class)
    @GetMapping("/getNewFightCommunityList")
    public R getNewFightCommunityList(@RequestParam("pageNum") int pageNum,
                                      @RequestParam("pageSize") int pageSize)
                                      @RequestParam("pageSize") int pageSize,
                                      @RequestParam(value = "communityId", required = false)  String communityId)
    {
        if(StringUtils.isEmpty(communityId))
        {
            communityId=getCommunityId()+"";
        }
        return newStriveForFeign.getNewFightCommunityList(pageNum,pageSize,
                getCommunityId()+"",null);
                communityId,null);
    }
    @ApiOperation(value = "社区共建项目详情", response = NewFightCommunityConstructionDTO.class)
@@ -541,9 +585,11 @@
    @GetMapping("/getResourceSharingList")
    public R getResourceSharingList(@RequestParam("pageNum") int pageNum,
                                    @RequestParam("pageSize") int pageSize,
                                    @RequestParam(value = "communityId", required = false)String communityId)
                                    @RequestParam(value = "communityId", required = false)String communityId,
                                    @RequestParam(value = "unitId", required = false)String unitId,
                                    @RequestParam(value = "meritId", required = false) String meritId)
    {
        return newStriveForFeign.getResourceSharingList(pageNum,pageSize,communityId,null);
        return newStriveForFeign.getResourceSharingList(pageNum,pageSize,communityId,unitId,meritId);
    }
    @ApiOperation(value = "资源共享详情", response = NewFightResourceSharingDTO.class)
@@ -719,9 +765,9 @@
    @PostMapping("/orderAddData")
    public R orderAddData(@RequestBody NewFightShoppingOrderVO item)
    {
        item.setCommunityId(getCommunityId()+"");
        item.setUserId(getUserId()+"");
        item.setOrderType("1");
//        item.setCommunityId(getCommunityId()+"");
//        item.setUserId(getUserId()+"");
//        item.setOrderType("1");
        return newStriveForFeign.orderAddData(item);
    }