feat：工单按照周期查询

app/src/main/java/com/example/tyre/TyreSearchActivity.java

@@ -83,7 +83,7 @@ public class TyreSearchActivity extends AppCompatActivity {
 
     private void bindViews() {
         inSantext = binding.inSantext;
-        basemessage = binding.basemessage;
+        // basemessage = binding.basemessage;
         button = binding.button;
         pinpai = binding.pinpai;
         xinghao = binding.xinghao;

app/src/main/java/com/example/tyre/maintenance/WorkOrderActivity.java

@@ -33,7 +33,8 @@ import okhttp3.RequestBody;
 public class WorkOrderActivity extends BaseActivity implements OrderAdapter.SelectTagAdapterListener {
     private ActivityWorkOrderBinding binding;
     private ObservableBoolean status;
-    private DatePickerDialog datePickerDialog;
+    private DatePickerDialog datePickerDialogStart;
+    private DatePickerDialog datePickerDialogEnd;
     private ListPopupWindow listPopupWindow;
     private List<Order> list;
     private OrderAdapter adapter;
@@ -51,18 +52,8 @@ public class WorkOrderActivity extends BaseActivity implements OrderAdapter.Sele
         typeCode = intent.getStringExtra("typeCode");
         binding.setTitle(title);
         // 获取当前日期
-        Calendar calendar = Calendar.getInstance();
-        int year = calendar.get(Calendar.YEAR);
-        int month = calendar.get(Calendar.MONTH);
-        int day = calendar.get(Calendar.DAY_OF_MONTH);
-        binding.workOrderDate.setText(dateFormat.format(calendar.getTime()));
-        datePickerDialog = new DatePickerDialog(this, (view1, year1, monthOfYear, dayOfMonth) -> {
-            @SuppressLint("DefaultLocale") String selectedDate =
-                    year1 + "-" + String.format("%02d", (monthOfYear + 1)) + "-" + String.format("%02d", dayOfMonth);
-            binding.workOrderDate.setText(selectedDate);
-            selectWorkOrder(selectedDate, getDeptId(binding.workOrderSite.getText().toString()), status.get() ? "COMPLETED" : "PROCESSING");
+        initDataSelect();
 
-        }, year, month, day);
         // 初始化选择框
         listPopupWindow = new ListPopupWindow(this);
         listPopupWindow.setAnchorView(binding.workOrderSite);
@@ -73,25 +64,60 @@ public class WorkOrderActivity extends BaseActivity implements OrderAdapter.Sele
             binding.workOrderSite.setText(text);
             SharedPreferencesUtils.putstring("workOrderSite", text);
             listPopupWindow.dismiss();
-            selectWorkOrder(binding.workOrderDate.getText().toString(), getDeptId(text), status.get() ? "COMPLETED" : "PROCESSING");
+            selectWorkOrder(binding.workOrderDateStart.getText().toString(), binding.workOrderDateEnd.getText().toString(), getDeptId(text), status.get() ? "COMPLETED" : "PROCESSING");
         });
         adapter = new OrderAdapter(this, this);
         binding.setAdapter(adapter);
 
     }
 
-    private void selectWorkOrder(String selectedDate, int deptId, String state) {
+    private void initDataSelect() {
+        // 开始日期
+        Calendar calendarStart = Calendar.getInstance();
+        calendarStart.add(Calendar.DAY_OF_MONTH, -7);
+        binding.workOrderDateStart.setText(dateFormat.format(calendarStart.getTime()));
+        datePickerDialogStart = new DatePickerDialog(this, (view1, year, monthOfYear, dayOfMonth) -> {
+            @SuppressLint("DefaultLocale")
+            String selectedDate =
+                    year + "-" + String.format("%02d", (monthOfYear + 1)) + "-" + String.format("%02d", dayOfMonth);
+            binding.workOrderDateStart.setText(selectedDate);
+            // 查询
+            selectWorkOrder(selectedDate,
+                    binding.workOrderDateEnd.getText().toString(),
+                    getDeptId(binding.workOrderSite.getText().toString()),
+                    status.get() ? "COMPLETED" : "PROCESSING");
+
+        }, calendarStart.get(Calendar.YEAR), calendarStart.get(Calendar.MONTH), calendarStart.get(Calendar.DAY_OF_MONTH));
+
+        // 结束日期
+        Calendar calendarEnd = Calendar.getInstance();
+        binding.workOrderDateEnd.setText(dateFormat.format(calendarEnd.getTime()));
+        datePickerDialogEnd = new DatePickerDialog(this, (view1, year, monthOfYear, dayOfMonth) -> {
+            @SuppressLint("DefaultLocale")
+            String selectedDate =
+                    year + "-" + String.format("%02d", (monthOfYear + 1)) + "-" + String.format("%02d", dayOfMonth);
+            binding.workOrderDateEnd.setText(selectedDate);
+            selectWorkOrder(binding.workOrderDateStart.getText().toString(),
+                    selectedDate,
+                    getDeptId(binding.workOrderSite.getText().toString()),
+                    status.get() ? "COMPLETED" : "PROCESSING");
+        }, calendarEnd.get(Calendar.YEAR), calendarEnd.get(Calendar.MONTH), calendarEnd.get(Calendar.DAY_OF_MONTH));
+
+
+    }
+
+    // 查询工单
+    private void selectWorkOrder(String selectedDate1, String selectedDate2, int deptId, String state) {
         Map<String, Object> params = new HashMap<>();
         params.put("status", state);
-        params.put("maintainDate", selectedDate);
+        // params.put("maintainDateStart", selectedDate1);
+        params.put("maintainDate", selectedDate2);
         params.put("factoryId", deptId);
         if (typeCode != null && !typeCode.isEmpty()) {
             params.put("typeCode", typeCode);
         }
 
-        OkGo.<MyResult>post(url + "/tyre/order/PDAGetMaintenanceOrder")
-                .upRequestBody(RequestBody.create(JSON, gson.toJson(params)))
-                .execute(new MyRecultCall(dialog, this) {
+        OkGo.<MyResult>post(url + "/tyre/order/PDAGetMaintenanceOrder").upRequestBody(RequestBody.create(JSON, gson.toJson(params))).execute(new MyRecultCall(dialog, this) {
             @Override
             public void onSuccess(Response<MyResult> response) {
                 super.onSuccess(response);
@@ -107,8 +133,12 @@ public class WorkOrderActivity extends BaseActivity implements OrderAdapter.Sele
     }
 
     // 选日期
-    public void selectDate(View view) {
-        datePickerDialog.show();
+    public void selectDate1(View view) {
+        datePickerDialogStart.show();
+    }
+
+    public void selectDate2(View view) {
+        datePickerDialogEnd.show();
     }
 
     // 选站点
@@ -123,7 +153,10 @@ public class WorkOrderActivity extends BaseActivity implements OrderAdapter.Sele
 
     public void switchStatus(View view) {
         status.set(!status.get());
-        selectWorkOrder(binding.workOrderDate.getText().toString(), getDeptId(binding.workOrderSite.getText().toString()), status.get() ? "COMPLETED" : "PROCESSING");
+        selectWorkOrder(binding.workOrderDateStart.getText().toString(),
+                binding.workOrderDateEnd.getText().toString(),
+                getDeptId(binding.workOrderSite.getText().toString()),
+                status.get() ? "COMPLETED" : "PROCESSING");
     }
 
     // 执行工单
@@ -134,9 +167,9 @@ public class WorkOrderActivity extends BaseActivity implements OrderAdapter.Sele
         String typeCode1 = order.getTypeCode();
         if (typeCode1.equals("6")) {
             intent = new Intent(this, TireRepairActivity.class);
-        }else if (typeCode1.equals("7")){
+        } else if (typeCode1.equals("7")) {
             intent = new Intent(this, TireScrapActivity.class);
-        }else {
+        } else {
             intent = new Intent(this, WorkExecuteActivity.class);
         }
 
@@ -151,6 +184,6 @@ public class WorkOrderActivity extends BaseActivity implements OrderAdapter.Sele
     protected void onResume() {
         super.onResume();
         binding.workOrderSite.setText(SharedPreferencesUtils.getstring("workOrderSite", "光明修理厂"));
-        selectWorkOrder(binding.workOrderDate.getText().toString(), getDeptId(binding.workOrderSite.getText().toString()), "PROCESSING");
+        selectWorkOrder(binding.workOrderDateStart.getText().toString(), binding.workOrderDateEnd.getText().toString(), getDeptId(binding.workOrderSite.getText().toString()), "PROCESSING");
     }
 }

app/src/main/java/com/example/tyre/maintenance/dialog/TireChangeDialog.java

@@ -51,7 +51,7 @@ public class TireChangeDialog extends Dialog {
             String wheelPostion = tire.getWheelPostion();
             tyreMap.put(wheelPostion, tire);
             if (tire.getTyreNo() == null || tire.getTyreNo().equals("")) {
-                tire.setTyreNo("t:" + wheelPostion);
+                tire.setTyreNo("测试标识:" + wheelPostion);
             }
             initTire(wheelPostion, tire);
         });

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

@@ -12,6 +12,7 @@
         <variable
             name="status"
             type="androidx.databinding.ObservableBoolean" />
+
         <variable
             name="adapter"
             type="com.example.tyre.maintenance.adapter.OrderAdapter" />
@@ -39,17 +40,28 @@
             <TextView
                 android:layout_height="45dp"
                 android:gravity="left|center"
-                android:text="保养日期"
+                android:text="选择保养周期查询："
                 android:textColor="@color/textColor1"
+                app:layout_columnSpan="3" />
+
+            <TextView
+                android:id="@+id/work_order_date_start"
+                android:layout_height="45dp"
+                android:gravity="left|center"
+                android:onClick="selectDate1"
+                android:paddingEnd="10dp"
+                android:text="开始保养日期"
+                android:textColor="@color/textColor2"
+                android:textStyle="bold"
                 app:layout_columnWeight="1" />
 
             <TextView
-                android:id="@+id/work_order_date"
+                android:id="@+id/work_order_date_end"
                 android:layout_height="45dp"
                 android:gravity="right|center"
-                android:onClick="selectDate"
+                android:onClick="selectDate2"
                 android:paddingEnd="10dp"
-                android:text="保养日期"
+                android:text="结束保养日期"
                 android:textColor="@color/textColor2"
                 android:textStyle="bold"
                 app:layout_columnWeight="1" />
@@ -77,12 +89,12 @@
                 android:id="@+id/work_order_site"
                 android:layout_height="45dp"
                 android:gravity="right|center"
+                android:onClick="selectOrderSite"
                 android:paddingEnd="10dp"
+                android:text="光明修理厂"
                 android:textColor="@color/textColor2"
                 android:textStyle="bold"
                 app:layout_columnWeight="1"
-                android:text="光明修理厂"
-                android:onClick="selectOrderSite"
                 tools:ignore="RtlHardcoded,RtlSymmetry" />
 
             <ImageView
@@ -140,7 +152,7 @@
             <androidx.recyclerview.widget.RecyclerView
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-android:adapter="@{adapter}"
+                android:adapter="@{adapter}"
                 android:padding="12dp"
                 app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
 

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

@@ -407,7 +407,6 @@
                         android:textColor="@color/white"
                         android:textSize="16sp"
                         android:textStyle="bold"
-                        android:visibility="gone"
                         app:layout_columnSpan="2" />
 
                     <LinearLayout