通知公告接口修改

baselib/src/main/java/com/tenlionsoft/baselib/constant/PathConfig.java

@@ -306,4 +306,5 @@ public class PathConfig {
     public static final String PATH_MODULE_OA_FRAGMENT_OA_FLOW_APPLY = "/oamodule/fragment/oaFlowCenter";//发起流程
     public static final String PATH_MODULE_OA_FRAGMENT_OA_FLOW_MINE_TODO = "/oamodule/fragment/mineUpcoming";//我的待办、已办
     public static final String PATH_MODULE_OA_FRAGMENT_OA_FLOW_MINE_READ = "/oamodule/fragment/mineRead";//我的待阅、已阅
+    public static final String NOTICE_CONFIG_ID ="bce4ab73-45dc-41a1-ac9d-305e83300e49";
 }

baselib/src/main/java/com/tenlionsoft/baselib/core/retrofit_net/BaseUrlApi.java

@@ -7,8 +7,8 @@ package com.tenlionsoft.baselib.core.retrofit_net;
  */
 public class BaseUrlApi {
 
-        public static final String IP = "http://192.168.0.120:8080/";/* 测试IP */
+//        public static final String IP = "http://192.168.0.120:8080/";/* 测试IP */
-//    public static final String IP = "http://121.36.71.250/";/* 测试IP */
+    public static final String IP = "http://121.36.71.250/";/* 测试IP */
     //    public static final String IP = "http://www.wlcbsyzl.cn/";/* 正式IP */
     public static final String SYS_USERCENTER = "usercenter/";
     public static final String SYS_POPULATION = "population/";/*人口系统*/

oamodule/src/main/java/com/tenlionsoft/oamodule/activity/notify/NoticeListActivity.java

@@ -10,6 +10,9 @@ import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.bigkoo.pickerview.builder.TimePickerBuilder;
@@ -32,8 +35,6 @@ import com.tenlionsoft.oamodule.net.OAApi;
 import java.util.ArrayList;
 import java.util.List;
 
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import io.reactivex.rxjava3.annotations.NonNull;
@@ -234,7 +235,7 @@ public class NoticeListActivity extends BaseActivity {
     }
 
     /**
-     * 我接受的工作
+     * 通知公告列表
      */
     private void getNoticeList(int currentPage) {
         mCurrentPage = currentPage;
@@ -242,7 +243,7 @@ public class NoticeListActivity extends BaseActivity {
         String end = mTvEndDate.getText().toString().trim();
         RetrofitManager.getInstance()
                 .create(OAApi.class)
-            .getNoticeList(start, end, mKeywords, mCurrentPage + "", "20")
+                .getNoticeList("2", PathConfig.NOTICE_CONFIG_ID, start, end, mKeywords, mCurrentPage + "", "20")
                 .compose(RxTransformer.getTransformer())
                 .subscribe(new Observer<NoticeListBean>() {
                     @Override

oamodule/src/main/java/com/tenlionsoft/oamodule/fragments/OaMainFragment.java

@@ -268,7 +268,7 @@ public class OaMainFragment extends BaseFragment {
     private void getNoticeList() {
         RetrofitManager.getInstance()
             .create(OAApi.class)
-            .getNoticeList("", "", "", "1", "15")
+            .getNoticeList("2",PathConfig.NOTICE_CONFIG_ID,"", "", "", "1", "15")
             .compose(RxTransformer.getTransformer())
             .subscribe(new Observer<NoticeListBean>() {
                 @Override

oamodule/src/main/java/com/tenlionsoft/oamodule/net/OAApi.java

@@ -674,8 +674,14 @@ public interface OAApi {
      * 获取通知公告列表
      */
     @Headers({"base_url_name:oa", "need_token:true", "Content-Type: application/json", "Accept: application/json"})
-    @GET("app/notice/listpage")
+    @GET("app/notice/mylistpage")
-    Observable<NoticeListBean> getNoticeList(@Query("startTime") String start, @Query("endTime") String end, @Query("keywords") String key, @Query("page") String page, @Query("rows") String rows);
+    Observable<NoticeListBean> getNoticeList(@Query("noticeCheckStatus")String status,
+                                             @Query("noticeConfigId") String id,
+                                             @Query("startTime") String start,
+                                             @Query("endTime") String end,
+                                             @Query("keywords") String key,
+                                             @Query("page") String page,
+                                             @Query("rows") String rows);
 
     /**
      * 获取通知公告详情

oamodule/src/main/java/com/tenlionsoft/oamodule/pad/fragments/PadOaMainFragment.java

@@ -440,7 +440,7 @@ public class PadOaMainFragment extends BaseFragment {
     private void getNoticeList() {
         RetrofitManager.getInstance()
             .create(OAApi.class)
-            .getNoticeList("", "", "", "1", "10")
+            .getNoticeList("2",PathConfig.NOTICE_CONFIG_ID,"", "", "", "1", "10")
             .compose(RxTransformer.getTransformer())
             .subscribe(new Observer<NoticeListBean>() {
                 @Override

oamodule/src/main/java/com/tenlionsoft/oamodule/pad/fragments/home/notice/NoticeListFragment.java

@@ -262,7 +262,7 @@ public class NoticeListFragment extends BaseFragment {
         String end = mTvEndDate.getText().toString().trim();
         RetrofitManager.getInstance()
             .create(OAApi.class)
-            .getNoticeList(start, end, mKeywords, mCurrentPage + "", "10")
+            .getNoticeList("2",PathConfig.NOTICE_CONFIG_ID,start, end, mKeywords, mCurrentPage + "", "10")
             .compose(RxTransformer.getTransformer())
             .subscribe(new Observer<NoticeListBean>() {
                 @Override