diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index 02adb90..ea5d73d 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -378,6 +378,8 @@ createStartTime: String, createEndTime: String, deptId: String, + planName: String, + planNo: String, director: String, effectiveCompany: String, trainStartTime: String, @@ -390,6 +392,8 @@ param.addProperty("createStartTime", createStartTime) param.addProperty("createEndTime", createEndTime) param.addProperty("deptId", deptId) + param.addProperty("planName", planName) + param.addProperty("planNo", planNo) param.addProperty("director", director) param.addProperty("effectiveCompany", effectiveCompany) param.addProperty("trainStartTime", trainStartTime) diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index 02adb90..ea5d73d 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -378,6 +378,8 @@ createStartTime: String, createEndTime: String, deptId: String, + planName: String, + planNo: String, director: String, effectiveCompany: String, trainStartTime: String, @@ -390,6 +392,8 @@ param.addProperty("createStartTime", createStartTime) param.addProperty("createEndTime", createEndTime) param.addProperty("deptId", deptId) + param.addProperty("planName", planName) + param.addProperty("planNo", planNo) param.addProperty("director", director) param.addProperty("effectiveCompany", effectiveCompany) param.addProperty("trainStartTime", trainStartTime) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index 512537a..e888afb 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -115,6 +115,8 @@ "", "", "", + "", + "", "jlglpxjhsp", arrayOf(), pageIndex diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index 02adb90..ea5d73d 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -378,6 +378,8 @@ createStartTime: String, createEndTime: String, deptId: String, + planName: String, + planNo: String, director: String, effectiveCompany: String, trainStartTime: String, @@ -390,6 +392,8 @@ param.addProperty("createStartTime", createStartTime) param.addProperty("createEndTime", createEndTime) param.addProperty("deptId", deptId) + param.addProperty("planName", planName) + param.addProperty("planNo", planNo) param.addProperty("director", director) param.addProperty("effectiveCompany", effectiveCompany) param.addProperty("trainStartTime", trainStartTime) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index 512537a..e888afb 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -115,6 +115,8 @@ "", "", "", + "", + "", "jlglpxjhsp", arrayOf(), pageIndex diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityActivity.kt index 7ecff7c..8fcc8cf 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityActivity.kt @@ -102,7 +102,7 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() initLayoutImmersionBar(rootView) - inputView.hint = "查询价格名称、编号" + inputView.hint = "请输入检校类型或者价格查询" } override fun onResume() { diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index 02adb90..ea5d73d 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -378,6 +378,8 @@ createStartTime: String, createEndTime: String, deptId: String, + planName: String, + planNo: String, director: String, effectiveCompany: String, trainStartTime: String, @@ -390,6 +392,8 @@ param.addProperty("createStartTime", createStartTime) param.addProperty("createEndTime", createEndTime) param.addProperty("deptId", deptId) + param.addProperty("planName", planName) + param.addProperty("planNo", planNo) param.addProperty("director", director) param.addProperty("effectiveCompany", effectiveCompany) param.addProperty("trainStartTime", trainStartTime) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index 512537a..e888afb 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -115,6 +115,8 @@ "", "", "", + "", + "", "jlglpxjhsp", arrayOf(), pageIndex diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityActivity.kt index 7ecff7c..8fcc8cf 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityActivity.kt @@ -102,7 +102,7 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() initLayoutImmersionBar(rootView) - inputView.hint = "查询价格名称、编号" + inputView.hint = "请输入检校类型或者价格查询" } override fun onResume() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerActivity.kt index 22a1ab5..a59f260 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerActivity.kt @@ -102,7 +102,7 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() initLayoutImmersionBar(rootView) - inputView.hint = "查询客户名称、编号" + inputView.hint = "请输入客户名称或者编号查询" } override fun onResume() { diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index 02adb90..ea5d73d 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -378,6 +378,8 @@ createStartTime: String, createEndTime: String, deptId: String, + planName: String, + planNo: String, director: String, effectiveCompany: String, trainStartTime: String, @@ -390,6 +392,8 @@ param.addProperty("createStartTime", createStartTime) param.addProperty("createEndTime", createEndTime) param.addProperty("deptId", deptId) + param.addProperty("planName", planName) + param.addProperty("planNo", planNo) param.addProperty("director", director) param.addProperty("effectiveCompany", effectiveCompany) param.addProperty("trainStartTime", trainStartTime) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index 512537a..e888afb 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -115,6 +115,8 @@ "", "", "", + "", + "", "jlglpxjhsp", arrayOf(), pageIndex diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityActivity.kt index 7ecff7c..8fcc8cf 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityActivity.kt @@ -102,7 +102,7 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() initLayoutImmersionBar(rootView) - inputView.hint = "查询价格名称、编号" + inputView.hint = "请输入检校类型或者价格查询" } override fun onResume() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerActivity.kt index 22a1ab5..a59f260 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerActivity.kt @@ -102,7 +102,7 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() initLayoutImmersionBar(rootView) - inputView.hint = "查询客户名称、编号" + inputView.hint = "请输入客户名称或者编号查询" } override fun onResume() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustActivity.kt index dc40e94..72c1823 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustActivity.kt @@ -102,7 +102,7 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() initLayoutImmersionBar(rootView) - inputView.hint = "查询委托书编号" + inputView.hint = "查询委托书编号或者客户名称查询" } override fun onResume() { diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index 02adb90..ea5d73d 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -378,6 +378,8 @@ createStartTime: String, createEndTime: String, deptId: String, + planName: String, + planNo: String, director: String, effectiveCompany: String, trainStartTime: String, @@ -390,6 +392,8 @@ param.addProperty("createStartTime", createStartTime) param.addProperty("createEndTime", createEndTime) param.addProperty("deptId", deptId) + param.addProperty("planName", planName) + param.addProperty("planNo", planNo) param.addProperty("director", director) param.addProperty("effectiveCompany", effectiveCompany) param.addProperty("trainStartTime", trainStartTime) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index 512537a..e888afb 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -115,6 +115,8 @@ "", "", "", + "", + "", "jlglpxjhsp", arrayOf(), pageIndex diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityActivity.kt index 7ecff7c..8fcc8cf 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityActivity.kt @@ -102,7 +102,7 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() initLayoutImmersionBar(rootView) - inputView.hint = "查询价格名称、编号" + inputView.hint = "请输入检校类型或者价格查询" } override fun onResume() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerActivity.kt index 22a1ab5..a59f260 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerActivity.kt @@ -102,7 +102,7 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() initLayoutImmersionBar(rootView) - inputView.hint = "查询客户名称、编号" + inputView.hint = "请输入客户名称或者编号查询" } override fun onResume() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustActivity.kt index dc40e94..72c1823 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustActivity.kt @@ -102,7 +102,7 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() initLayoutImmersionBar(rootView) - inputView.hint = "查询委托书编号" + inputView.hint = "查询委托书编号或者客户名称查询" } override fun onResume() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentActivity.kt index 0952071..6ecbda8 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentActivity.kt @@ -109,6 +109,6 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() initLayoutImmersionBar(rootView) - inputView.hint = "查询设备名称、编号" + inputView.hint = "请输入设备名称或者编号查询" } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index 02adb90..ea5d73d 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -378,6 +378,8 @@ createStartTime: String, createEndTime: String, deptId: String, + planName: String, + planNo: String, director: String, effectiveCompany: String, trainStartTime: String, @@ -390,6 +392,8 @@ param.addProperty("createStartTime", createStartTime) param.addProperty("createEndTime", createEndTime) param.addProperty("deptId", deptId) + param.addProperty("planName", planName) + param.addProperty("planNo", planNo) param.addProperty("director", director) param.addProperty("effectiveCompany", effectiveCompany) param.addProperty("trainStartTime", trainStartTime) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index 512537a..e888afb 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -115,6 +115,8 @@ "", "", "", + "", + "", "jlglpxjhsp", arrayOf(), pageIndex diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityActivity.kt index 7ecff7c..8fcc8cf 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityActivity.kt @@ -102,7 +102,7 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() initLayoutImmersionBar(rootView) - inputView.hint = "查询价格名称、编号" + inputView.hint = "请输入检校类型或者价格查询" } override fun onResume() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerActivity.kt index 22a1ab5..a59f260 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerActivity.kt @@ -102,7 +102,7 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() initLayoutImmersionBar(rootView) - inputView.hint = "查询客户名称、编号" + inputView.hint = "请输入客户名称或者编号查询" } override fun onResume() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustActivity.kt index dc40e94..72c1823 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustActivity.kt @@ -102,7 +102,7 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() initLayoutImmersionBar(rootView) - inputView.hint = "查询委托书编号" + inputView.hint = "查询委托书编号或者客户名称查询" } override fun onResume() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentActivity.kt index 0952071..6ecbda8 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentActivity.kt @@ -109,6 +109,6 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() initLayoutImmersionBar(rootView) - inputView.hint = "查询设备名称、编号" + inputView.hint = "请输入设备名称或者编号查询" } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt index d52c891..332865d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt @@ -115,22 +115,35 @@ getMeterageTrainList() } - //TODO 查询条件待定 private fun getMeterageTrainList() { if (param.isDigitsOnly()) { + //根据部门查 meterageTrainViewModel.getMeterageTrainList( - "", "", param, "", "", - "", "", "jlglpxjhsp", arrayOf(), pageIndex + "", "", param, "", "", "", + "", "", "", "jlglpxjhsp", arrayOf(), + pageIndex ) } else { if (param.length < 4) { //输入参数长度小于4，默认查名称 - + meterageTrainViewModel.getMeterageTrainList( + "", "", "", param, "", "", + "", "", "", "jlglpxjhsp", arrayOf(), + pageIndex + ) } else { if (AppMemoryCache.prefixCode.contains(param.substring(0, 4))) { - + meterageTrainViewModel.getMeterageTrainList( + "", "", "", "", param, "", + "", "", "", "jlglpxjhsp", arrayOf(), + pageIndex + ) } else { - + meterageTrainViewModel.getMeterageTrainList( + "", "", "", param, "", "", + "", "", "", "jlglpxjhsp", arrayOf(), + pageIndex + ) } } } diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index 02adb90..ea5d73d 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -378,6 +378,8 @@ createStartTime: String, createEndTime: String, deptId: String, + planName: String, + planNo: String, director: String, effectiveCompany: String, trainStartTime: String, @@ -390,6 +392,8 @@ param.addProperty("createStartTime", createStartTime) param.addProperty("createEndTime", createEndTime) param.addProperty("deptId", deptId) + param.addProperty("planName", planName) + param.addProperty("planNo", planNo) param.addProperty("director", director) param.addProperty("effectiveCompany", effectiveCompany) param.addProperty("trainStartTime", trainStartTime) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index 512537a..e888afb 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -115,6 +115,8 @@ "", "", "", + "", + "", "jlglpxjhsp", arrayOf(), pageIndex diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityActivity.kt index 7ecff7c..8fcc8cf 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityActivity.kt @@ -102,7 +102,7 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() initLayoutImmersionBar(rootView) - inputView.hint = "查询价格名称、编号" + inputView.hint = "请输入检校类型或者价格查询" } override fun onResume() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerActivity.kt index 22a1ab5..a59f260 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerActivity.kt @@ -102,7 +102,7 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() initLayoutImmersionBar(rootView) - inputView.hint = "查询客户名称、编号" + inputView.hint = "请输入客户名称或者编号查询" } override fun onResume() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustActivity.kt index dc40e94..72c1823 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustActivity.kt @@ -102,7 +102,7 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() initLayoutImmersionBar(rootView) - inputView.hint = "查询委托书编号" + inputView.hint = "查询委托书编号或者客户名称查询" } override fun onResume() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentActivity.kt index 0952071..6ecbda8 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentActivity.kt @@ -109,6 +109,6 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() initLayoutImmersionBar(rootView) - inputView.hint = "查询设备名称、编号" + inputView.hint = "请输入设备名称或者编号查询" } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt index d52c891..332865d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt @@ -115,22 +115,35 @@ getMeterageTrainList() } - //TODO 查询条件待定 private fun getMeterageTrainList() { if (param.isDigitsOnly()) { + //根据部门查 meterageTrainViewModel.getMeterageTrainList( - "", "", param, "", "", - "", "", "jlglpxjhsp", arrayOf(), pageIndex + "", "", param, "", "", "", + "", "", "", "jlglpxjhsp", arrayOf(), + pageIndex ) } else { if (param.length < 4) { //输入参数长度小于4，默认查名称 - + meterageTrainViewModel.getMeterageTrainList( + "", "", "", param, "", "", + "", "", "", "jlglpxjhsp", arrayOf(), + pageIndex + ) } else { if (AppMemoryCache.prefixCode.contains(param.substring(0, 4))) { - + meterageTrainViewModel.getMeterageTrainList( + "", "", "", "", param, "", + "", "", "", "jlglpxjhsp", arrayOf(), + pageIndex + ) } else { - + meterageTrainViewModel.getMeterageTrainList( + "", "", "", param, "", "", + "", "", "", "jlglpxjhsp", arrayOf(), + pageIndex + ) } } } diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceActivity.kt index 5897fcd..684a92b 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceActivity.kt @@ -108,6 +108,6 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() initLayoutImmersionBar(rootView) - inputView.hint = "查询标准装置名称、编号" + inputView.hint = "请输入标准装置名称或者编号查询" } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index 02adb90..ea5d73d 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -378,6 +378,8 @@ createStartTime: String, createEndTime: String, deptId: String, + planName: String, + planNo: String, director: String, effectiveCompany: String, trainStartTime: String, @@ -390,6 +392,8 @@ param.addProperty("createStartTime", createStartTime) param.addProperty("createEndTime", createEndTime) param.addProperty("deptId", deptId) + param.addProperty("planName", planName) + param.addProperty("planNo", planNo) param.addProperty("director", director) param.addProperty("effectiveCompany", effectiveCompany) param.addProperty("trainStartTime", trainStartTime) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index 512537a..e888afb 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -115,6 +115,8 @@ "", "", "", + "", + "", "jlglpxjhsp", arrayOf(), pageIndex diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityActivity.kt index 7ecff7c..8fcc8cf 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityActivity.kt @@ -102,7 +102,7 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() initLayoutImmersionBar(rootView) - inputView.hint = "查询价格名称、编号" + inputView.hint = "请输入检校类型或者价格查询" } override fun onResume() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerActivity.kt index 22a1ab5..a59f260 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerActivity.kt @@ -102,7 +102,7 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() initLayoutImmersionBar(rootView) - inputView.hint = "查询客户名称、编号" + inputView.hint = "请输入客户名称或者编号查询" } override fun onResume() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustActivity.kt index dc40e94..72c1823 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustActivity.kt @@ -102,7 +102,7 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() initLayoutImmersionBar(rootView) - inputView.hint = "查询委托书编号" + inputView.hint = "查询委托书编号或者客户名称查询" } override fun onResume() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentActivity.kt index 0952071..6ecbda8 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentActivity.kt @@ -109,6 +109,6 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() initLayoutImmersionBar(rootView) - inputView.hint = "查询设备名称、编号" + inputView.hint = "请输入设备名称或者编号查询" } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt index d52c891..332865d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt @@ -115,22 +115,35 @@ getMeterageTrainList() } - //TODO 查询条件待定 private fun getMeterageTrainList() { if (param.isDigitsOnly()) { + //根据部门查 meterageTrainViewModel.getMeterageTrainList( - "", "", param, "", "", - "", "", "jlglpxjhsp", arrayOf(), pageIndex + "", "", param, "", "", "", + "", "", "", "jlglpxjhsp", arrayOf(), + pageIndex ) } else { if (param.length < 4) { //输入参数长度小于4，默认查名称 - + meterageTrainViewModel.getMeterageTrainList( + "", "", "", param, "", "", + "", "", "", "jlglpxjhsp", arrayOf(), + pageIndex + ) } else { if (AppMemoryCache.prefixCode.contains(param.substring(0, 4))) { - + meterageTrainViewModel.getMeterageTrainList( + "", "", "", "", param, "", + "", "", "", "jlglpxjhsp", arrayOf(), + pageIndex + ) } else { - + meterageTrainViewModel.getMeterageTrainList( + "", "", "", param, "", "", + "", "", "", "jlglpxjhsp", arrayOf(), + pageIndex + ) } } } diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceActivity.kt index 5897fcd..684a92b 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceActivity.kt @@ -108,6 +108,6 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() initLayoutImmersionBar(rootView) - inputView.hint = "查询标准装置名称、编号" + inputView.hint = "请输入标准装置名称或者编号查询" } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt index 4d6df7b..2f34672 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt @@ -29,6 +29,8 @@ createStartTime: String, createEndTime: String, deptId: String, + planName: String, + planNo: String, director: String, effectiveCompany: String, trainStartTime: String, @@ -42,6 +44,8 @@ createStartTime, createEndTime, deptId, + planName, + planNo, director, effectiveCompany, trainStartTime,