1.筛选

2.//TODO erp用户是否选择新部门为空，质检接口数据无对应问题,内部交易订单审核，审核规则，领用申请列表/退件列表/参数，坩埚下单，mes，刷新token，编辑任务担当无法修改.

app/src/main/AndroidManifest.xml

@@ -1634,6 +1634,15 @@
             android:screenOrientation="portrait"
             android:theme="@style/Work.Base"
             android:windowSoftInputMode="adjustPan" />
+
+        <activity
+            android:name=".ui.activity.mes.user.MesUserDataConditionActivity"
+            android:configChanges="keyboardHidden|orientation"
+            android:label="查询"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait"
+            android:theme="@style/Work.Base"
+            android:windowSoftInputMode="adjustPan" />
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="com.wd.workoffice.fileprovider"

app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesUserDataConditionActivity.java

+package com.wd.workoffice.ui.activity.mes.user;
+
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import com.alibaba.fastjson.JSON;
+import com.bigkoo.pickerview.listener.OnTimeSelectListener;
+import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
+import com.wd.workoffice.R;
+import com.wd.workoffice.app.WorkToolBarActivity;
+import com.wd.workoffice.util.DialogUtils;
+import com.wd.workoffice.util.PickTimeUtils;
+import com.wd.workoffice.util.WorkUtils;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Map;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+import flexible.xd.android_base.utils.TimeUtils;
+
+/**
+ * author : flexible
+ * email : lgd19940421@163.com
+ * github: https://github.com/FlexibleXd
+ **/
+public class MesUserDataConditionActivity extends WorkToolBarActivity {
+    @BindView(R.id.et_name)
+    EditText etName;
+    @BindView(R.id.et_factory)
+    EditText etFactory;
+    @BindView(R.id.et_machine)
+    EditText etMachine;
+    @BindView(R.id.tv_status)
+    TextView tvStatus;
+    @BindView(R.id.rl_status)
+    RelativeLayout rlStatus;
+    @BindView(R.id.tv_time)
+    TextView tvTime;
+    @BindView(R.id.rl_time)
+    RelativeLayout rlTime;
+    private QMUIDialog.MenuDialogBuilder statusDialog;
+    private String[] statusList = new String[]{"已提交", "已通过", "驳回"};
+    // 0草稿、1已提交、2执行中、3已总结、4已评价
+    private Integer[] statusValue = new Integer[]{0, 1, 2};
+    private Map<String, Object> param;
+
+    @Override
+    protected void initView() {
+        ButterKnife.bind(this);
+        param = WorkUtils.simpleParam();
+        statusDialog = DialogUtils.listDialog(this);
+        statusDialog.addItems(statusList, new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                tvStatus.setText(statusList[which]);
+                param.put("approvalStatus", statusValue[which]);
+                dialog.dismiss();
+            }
+        });
+    }
+
+
+    @Override
+    protected void initData() {
+    }
+
+    @Override
+    protected void initEvent() {
+    }
+
+    @Override
+    protected int layoutId() {
+        return R.layout.activity_mes_user_data_cnd;
+    }
+
+
+    @OnClick({R.id.rl_status, R.id.rl_time})
+    public void onViewClicked(View view) {
+        switch (view.getId()) {
+            case R.id.rl_status:
+                statusDialog.show();
+                break;
+            case R.id.rl_time:
+                PickTimeUtils.showPickThree(MesUserDataConditionActivity.this, new OnTimeSelectListener() {
+                    @Override
+                    public void onTimeSelect(Date date, View v) {
+                        String time = TimeUtils.date2String(date, new SimpleDateFormat("yyyy-MM-dd"));
+                        param.put("feedbackDateTime", time);
+                        tvTime.setText(time);
+                    }
+                }).show();
+                break;
+        }
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.menu_finish, menu);
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.finish:
+                if (!TextUtils.isEmpty(etFactory.getText().toString())) {
+                    param.put("steelmakingWorksName", etFactory.getText().toString());
+                }
+                if (!TextUtils.isEmpty(etMachine.getText().toString())) {
+                    param.put("continuousCasterName", etMachine.getText().toString());
+                }
+                if (!TextUtils.isEmpty(etName.getText().toString())) {
+                    param.put("salesCompanyName", etName.getText().toString());
+                }
+                Intent intent = new Intent();
+                intent.putExtra("param", JSON.toJSONString(param));
+                setResult(10001, intent);
+                finish();
+                break;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+}

app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesUserDataListActivity.java

 package com.wd.workoffice.ui.activity.mes.user;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.Menu;
@@ -21,6 +22,7 @@ import com.wd.workoffice.bean.mesBean.UserDataBean;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
 import com.wd.workoffice.ui.activity.mes.ticket.MesTicketAddActivity;
+import com.wd.workoffice.ui.activity.mes.ticket.MesTicketConditionActivity;
 import com.wd.workoffice.ui.activity.mes.ticket.MesTicketListActivity;
 import com.wd.workoffice.ui.activity.mes.ticket.MesTicketListTakeOnActivity;
 import com.wd.workoffice.ui.adapter.MesUserDataAdapter;
@@ -34,6 +36,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindView;
@@ -152,20 +155,31 @@ public class MesUserDataListActivity extends WorkToolBarActivity {
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.menu_ticket_add, menu);
+        getMenuInflater().inflate(R.menu.menu_search, menu);
         return super.onCreateOptionsMenu(menu);
     }
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
-            case R.id.add:
-                startActivity(MesUserDataAddActivity.class);
+            case R.id.search:
+                startActivityForResult(MesUserDataConditionActivity.class, 10001);
                 break;
         }
         return super.onOptionsItemSelected(item);
     }
 
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == 10001 && resultCode == 10001) {
+            String returnParam = data.getStringExtra("param");
+            param.put("paramMap", JSON.parseObject(returnParam,Map.class));
+            page = 1;
+            param.put("pageNum", page);
+            getData();
+        }
+    }
     @OnClick({R.id.tv_go, R.id.btn_add})
     public void onViewClicked(View view) {
         switch (view.getId()) {

app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesUserDataListCheckActivity.java

 package com.wd.workoffice.ui.activity.mes.user;
 
+import android.content.Intent;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -30,6 +31,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindView;
@@ -149,20 +151,31 @@ public class MesUserDataListCheckActivity extends WorkToolBarActivity {
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.menu_ticket_add, menu);
+        getMenuInflater().inflate(R.menu.menu_search, menu);
         return super.onCreateOptionsMenu(menu);
     }
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
-            case R.id.add:
-                startActivity(MesUserDataAddActivity.class);
+            case R.id.search:
+                startActivityForResult(MesUserDataConditionActivity.class, 10001);
                 break;
         }
         return super.onOptionsItemSelected(item);
     }
 
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == 10001 && resultCode == 10001) {
+            String returnParam = data.getStringExtra("param");
+            param.put("paramMap", JSON.parseObject(returnParam,Map.class));
+            page = 1;
+            param.put("pageNum", page);
+            getData();
+        }
+    }
 
     @OnClick({R.id.tv_go, R.id.btn_add})
     public void onViewClicked(View view) {

app/src/main/java/com/wd/workoffice/ui/adapter/MesUserDataAdapter.java

 package com.wd.workoffice.ui.adapter;
 
 
+import android.graphics.Color;
+
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.wd.workoffice.R;
@@ -28,9 +30,25 @@ public class MesUserDataAdapter extends BaseQuickAdapter<UserDataBean.ListBean,
     protected void convert(BaseViewHolder helper, UserDataBean.ListBean item) {
         helper.setText(R.id.tv_time, item.getApprovalDateTime());
         helper.setText(R.id.tv_client, item.getCustomerUserName());
-        helper.setText(R.id.tv_factory, item.getSalesManagerName());
+        helper.setText(R.id.tv_factory, item.getSteelmakingWorksName());
         helper.setText(R.id.tv_machine, item.getContinuousCasterName());
-        helper.setText(R.id.tv_status, item.getApprovalStatus() + "");
+        if (item.getApprovalStatus() != null) {
+            switch (item.getApprovalStatus()) {
+                case 0:
+                    helper.setTextColor(R.id.tv_status, Color.parseColor("#FF6AA3D4"));
+                    helper.setText(R.id.tv_status, "已提交");
+                    break;
+                case 1:
+                    helper.setTextColor(R.id.tv_status, Color.parseColor("#FF349A85"));
+                    helper.setText(R.id.tv_status, "已通过");
+                    break;
+                case 2:
+                    helper.setTextColor(R.id.tv_status, Color.parseColor("#FFB84D4D"));
+                    helper.setText(R.id.tv_status, "驳回");
+                    break;
+            }
+        }
+
     }
 }
 

app/src/main/res/layout/activity_mes_user_data_cnd.xml

+<?xml version="1.0" encoding="utf-8"?>
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@android:color/white"
+            android:paddingHorizontal="20mm"
+            android:paddingVertical="9mm">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:text="客户名称"
+                android:textSize="14sp" />
+
+            <EditText
+                android:id="@+id/et_name"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_alignParentRight="true"
+                android:layout_marginRight="10mm"
+                android:background="@null"
+                android:hint="请输入"
+                android:textColor="@color/flexible_text_gray"
+                android:textSize="14sp" />
+
+        </RelativeLayout>
+
+        <View style="@style/dividerX" />
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@android:color/white"
+            android:paddingHorizontal="20mm"
+            android:paddingVertical="9mm">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:text="炼钢厂"
+                android:textSize="14sp" />
+
+            <EditText
+                android:id="@+id/et_factory"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_alignParentRight="true"
+                android:layout_marginRight="10mm"
+                android:background="@null"
+                android:hint="请输入"
+                android:textColor="@color/flexible_text_gray"
+                android:textSize="14sp" />
+
+        </RelativeLayout>
+
+        <View style="@style/dividerX" />
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@android:color/white"
+            android:paddingHorizontal="20mm"
+            android:paddingVertical="9mm">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:text="连铸机"
+                android:textSize="14sp" />
+
+            <EditText
+                android:id="@+id/et_machine"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_alignParentRight="true"
+                android:layout_marginRight="10mm"
+                android:background="@null"
+                android:hint="请输入"
+                android:textColor="@color/flexible_text_gray"
+                android:textSize="14sp" />
+
+        </RelativeLayout>
+
+        <View style="@style/dividerX" />
+
+        <RelativeLayout
+            android:id="@+id/rl_status"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@android:color/white"
+            android:paddingHorizontal="20mm"
+            android:paddingVertical="9mm">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:text="状态"
+                android:textSize="14sp" />
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:gravity="center_vertical">
+
+                <TextView
+                    android:id="@+id/tv_status"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentLeft="true"
+                    android:layout_marginRight="3mm"
+                    android:text="请选择"
+                    android:textColor="@color/flexible_text_gray"
+                    android:textSize="14sp" />
+
+                <ImageView
+                    android:layout_width="15mm"
+                    android:layout_height="20mm"
+                    android:src="@mipmap/arrow_right_gray" />
+            </LinearLayout>
+        </RelativeLayout>
+
+        <View style="@style/dividerX" />
+
+        <RelativeLayout
+            android:id="@+id/rl_time"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@android:color/white"
+            android:paddingHorizontal="20mm"
+            android:paddingVertical="9mm">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:text="制单日期"
+                android:textSize="14sp" />
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:gravity="center_vertical">
+
+                <TextView
+                    android:id="@+id/tv_time"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentLeft="true"
+                    android:layout_marginRight="3mm"
+                    android:text="请选择"
+                    android:textColor="@color/flexible_text_gray"
+                    android:textSize="14sp" />
+
+                <ImageView
+                    android:layout_width="15mm"
+                    android:layout_height="20mm"
+                    android:src="@mipmap/arrow_right_gray" />
+            </LinearLayout>
+        </RelativeLayout>
+    </LinearLayout>
+</androidx.core.widget.NestedScrollView>
\ No newline at end of file