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
@@ -79,9 +81,24 @@
                                @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,classifyId,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);
    }
@@ -91,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);
    }