diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt index 45e3780..f496089 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -3,9 +3,11 @@ import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.ApprovalProcessAdapter +import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_certificate_approval_process.* +import kotlinx.android.synthetic.main.include_empty_view.* class ApprovalProcessFragment(private val processId: String) : KotlinBaseFragment() { @@ -16,9 +18,14 @@ certificateViewModel.getApprovalProcess(processId) certificateViewModel.processResult.observe(this) { if (it.code == 200) { - logRecyclerView.adapter = ApprovalProcessAdapter( - requireContext(), it.data, it.data.last().first() - ) + if (it.data.isEmpty()) { + emptyView.showEmptyPage("该证书暂无相关审批记录") + } else { + emptyView.hide() + logRecyclerView.adapter = ApprovalProcessAdapter( + requireContext(), it.data, it.data.last().first() + ) + } } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt index 45e3780..f496089 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -3,9 +3,11 @@ import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.ApprovalProcessAdapter +import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_certificate_approval_process.* +import kotlinx.android.synthetic.main.include_empty_view.* class ApprovalProcessFragment(private val processId: String) : KotlinBaseFragment() { @@ -16,9 +18,14 @@ certificateViewModel.getApprovalProcess(processId) certificateViewModel.processResult.observe(this) { if (it.code == 200) { - logRecyclerView.adapter = ApprovalProcessAdapter( - requireContext(), it.data, it.data.last().first() - ) + if (it.data.isEmpty()) { + emptyView.showEmptyPage("该证书暂无相关审批记录") + } else { + emptyView.hide() + logRecyclerView.adapter = ApprovalProcessAdapter( + requireContext(), it.data, it.data.last().first() + ) + } } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt index bc3f6d1..0d2cd2b 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt @@ -1,12 +1,33 @@ package com.casic.xz.meterage.fragment.outfield +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.ApprovalProcessAdapter +import com.casic.xz.meterage.extensions.showEmptyPage +import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_od_approval_log.* +import kotlinx.android.synthetic.main.include_empty_view.* -class ApprovalLogFragment : KotlinBaseFragment() { +class ApprovalLogFragment(private val processId: String) : KotlinBaseFragment() { + + private lateinit var certificateViewModel: CertificateViewModel override fun initData() { - + certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] + certificateViewModel.getApprovalProcess(processId) + certificateViewModel.processResult.observe(this) { + if (it.code == 200) { + if (it.data.isEmpty()) { + emptyView.showEmptyPage("该外场检测申请暂无相关审批记录") + } else { + emptyView.hide() + logRecyclerView.adapter = ApprovalProcessAdapter( + requireContext(), it.data, it.data.last().first() + ) + } + } + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt index 45e3780..f496089 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -3,9 +3,11 @@ import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.ApprovalProcessAdapter +import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_certificate_approval_process.* +import kotlinx.android.synthetic.main.include_empty_view.* class ApprovalProcessFragment(private val processId: String) : KotlinBaseFragment() { @@ -16,9 +18,14 @@ certificateViewModel.getApprovalProcess(processId) certificateViewModel.processResult.observe(this) { if (it.code == 200) { - logRecyclerView.adapter = ApprovalProcessAdapter( - requireContext(), it.data, it.data.last().first() - ) + if (it.data.isEmpty()) { + emptyView.showEmptyPage("该证书暂无相关审批记录") + } else { + emptyView.hide() + logRecyclerView.adapter = ApprovalProcessAdapter( + requireContext(), it.data, it.data.last().first() + ) + } } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt index bc3f6d1..0d2cd2b 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt @@ -1,12 +1,33 @@ package com.casic.xz.meterage.fragment.outfield +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.ApprovalProcessAdapter +import com.casic.xz.meterage.extensions.showEmptyPage +import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_od_approval_log.* +import kotlinx.android.synthetic.main.include_empty_view.* -class ApprovalLogFragment : KotlinBaseFragment() { +class ApprovalLogFragment(private val processId: String) : KotlinBaseFragment() { + + private lateinit var certificateViewModel: CertificateViewModel override fun initData() { - + certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] + certificateViewModel.getApprovalProcess(processId) + certificateViewModel.processResult.observe(this) { + if (it.code == 200) { + if (it.data.isEmpty()) { + emptyView.showEmptyPage("该外场检测申请暂无相关审批记录") + } else { + emptyView.hide() + logRecyclerView.adapter = ApprovalProcessAdapter( + requireContext(), it.data, it.data.last().first() + ) + } + } + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt index c979c21..f1e3601 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt @@ -138,7 +138,7 @@ R.id.hazardSourceView, item.hazardSourceAndPreventionMethod ) .setText(R.id.remarkView, remark) - .setText(R.id.fullAddressView, "详细地址：${item.fullAddress}") + .setText(R.id.fullAddressView, "详细地址：${item.customerAddress}") .setText( R.id.executiveEnvironmentView, "现场环境：${item.executiveEnvironment}" @@ -148,8 +148,8 @@ "申请时间：${item.applyTime.formatToYearMonthDay()}" ) .setText(R.id.overTimeView, "${deltaT / 24}天前") - .setText(R.id.directorView, item.director) - .setText(R.id.phoneView, item.phone) + .setText(R.id.directorView, item.directorName) + .setText(R.id.phoneView, item.customerPhone) } } outfieldRecyclerView.addItemDecoration( diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt index 45e3780..f496089 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -3,9 +3,11 @@ import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.ApprovalProcessAdapter +import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_certificate_approval_process.* +import kotlinx.android.synthetic.main.include_empty_view.* class ApprovalProcessFragment(private val processId: String) : KotlinBaseFragment() { @@ -16,9 +18,14 @@ certificateViewModel.getApprovalProcess(processId) certificateViewModel.processResult.observe(this) { if (it.code == 200) { - logRecyclerView.adapter = ApprovalProcessAdapter( - requireContext(), it.data, it.data.last().first() - ) + if (it.data.isEmpty()) { + emptyView.showEmptyPage("该证书暂无相关审批记录") + } else { + emptyView.hide() + logRecyclerView.adapter = ApprovalProcessAdapter( + requireContext(), it.data, it.data.last().first() + ) + } } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt index bc3f6d1..0d2cd2b 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt @@ -1,12 +1,33 @@ package com.casic.xz.meterage.fragment.outfield +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.ApprovalProcessAdapter +import com.casic.xz.meterage.extensions.showEmptyPage +import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_od_approval_log.* +import kotlinx.android.synthetic.main.include_empty_view.* -class ApprovalLogFragment : KotlinBaseFragment() { +class ApprovalLogFragment(private val processId: String) : KotlinBaseFragment() { + + private lateinit var certificateViewModel: CertificateViewModel override fun initData() { - + certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] + certificateViewModel.getApprovalProcess(processId) + certificateViewModel.processResult.observe(this) { + if (it.code == 200) { + if (it.data.isEmpty()) { + emptyView.showEmptyPage("该外场检测申请暂无相关审批记录") + } else { + emptyView.hide() + logRecyclerView.adapter = ApprovalProcessAdapter( + requireContext(), it.data, it.data.last().first() + ) + } + } + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt index c979c21..f1e3601 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt @@ -138,7 +138,7 @@ R.id.hazardSourceView, item.hazardSourceAndPreventionMethod ) .setText(R.id.remarkView, remark) - .setText(R.id.fullAddressView, "详细地址：${item.fullAddress}") + .setText(R.id.fullAddressView, "详细地址：${item.customerAddress}") .setText( R.id.executiveEnvironmentView, "现场环境：${item.executiveEnvironment}" @@ -148,8 +148,8 @@ "申请时间：${item.applyTime.formatToYearMonthDay()}" ) .setText(R.id.overTimeView, "${deltaT / 24}天前") - .setText(R.id.directorView, item.director) - .setText(R.id.phoneView, item.phone) + .setText(R.id.directorView, item.directorName) + .setText(R.id.phoneView, item.customerPhone) } } outfieldRecyclerView.addItemDecoration( diff --git a/app/src/main/java/com/casic/xz/meterage/model/OutfieldDetectionListModel.java b/app/src/main/java/com/casic/xz/meterage/model/OutfieldDetectionListModel.java index 1397228..4dff94d 100644 --- a/app/src/main/java/com/casic/xz/meterage/model/OutfieldDetectionListModel.java +++ b/app/src/main/java/com/casic/xz/meterage/model/OutfieldDetectionListModel.java @@ -53,29 +53,26 @@ } public static class RowsModel { - private String addressAreaName; - private String addressCityName; - private String addressCountryName; - private String addressProvinceName; private String applyTime; private String approvalStatus; private String approvalStatusName; private String createTime; + private String customerAddress; private String customerId; private String customerName; + private String customerPhone; private String decisionItem; - private String director; + private String deliverer; + private String delivererTel; private String directorId; private String directorName; private String executiveAddress; private String executiveEnvironment; private String executiveItem; - private String fullAddress; private String hazardSourceAndPreventionMethod; private String id; - private String isDel; + private int isDel; private String orderId; - private String phone; private String preCost; private String preEndTime; private String preStartTime; @@ -88,38 +85,6 @@ private String taskSourceName; private String updateTime; - public String getAddressAreaName() { - return addressAreaName; - } - - public void setAddressAreaName(String addressAreaName) { - this.addressAreaName = addressAreaName; - } - - public String getAddressCityName() { - return addressCityName; - } - - public void setAddressCityName(String addressCityName) { - this.addressCityName = addressCityName; - } - - public String getAddressCountryName() { - return addressCountryName; - } - - public void setAddressCountryName(String addressCountryName) { - this.addressCountryName = addressCountryName; - } - - public String getAddressProvinceName() { - return addressProvinceName; - } - - public void setAddressProvinceName(String addressProvinceName) { - this.addressProvinceName = addressProvinceName; - } - public String getApplyTime() { return applyTime; } @@ -152,6 +117,14 @@ this.createTime = createTime; } + public String getCustomerAddress() { + return customerAddress; + } + + public void setCustomerAddress(String customerAddress) { + this.customerAddress = customerAddress; + } + public String getCustomerId() { return customerId; } @@ -168,6 +141,14 @@ this.customerName = customerName; } + public String getCustomerPhone() { + return customerPhone; + } + + public void setCustomerPhone(String customerPhone) { + this.customerPhone = customerPhone; + } + public String getDecisionItem() { return decisionItem; } @@ -176,12 +157,20 @@ this.decisionItem = decisionItem; } - public String getDirector() { - return director; + public String getDeliverer() { + return deliverer; } - public void setDirector(String director) { - this.director = director; + public void setDeliverer(String deliverer) { + this.deliverer = deliverer; + } + + public String getDelivererTel() { + return delivererTel; + } + + public void setDelivererTel(String delivererTel) { + this.delivererTel = delivererTel; } public String getDirectorId() { @@ -224,14 +213,6 @@ this.executiveItem = executiveItem; } - public String getFullAddress() { - return fullAddress; - } - - public void setFullAddress(String fullAddress) { - this.fullAddress = fullAddress; - } - public String getHazardSourceAndPreventionMethod() { return hazardSourceAndPreventionMethod; } @@ -248,11 +229,11 @@ this.id = id; } - public String getIsDel() { + public int getIsDel() { return isDel; } - public void setIsDel(String isDel) { + public void setIsDel(int isDel) { this.isDel = isDel; } @@ -264,14 +245,6 @@ this.orderId = orderId; } - public String getPhone() { - return phone; - } - - public void setPhone(String phone) { - this.phone = phone; - } - public String getPreCost() { return preCost; } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt index 45e3780..f496089 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -3,9 +3,11 @@ import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.ApprovalProcessAdapter +import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_certificate_approval_process.* +import kotlinx.android.synthetic.main.include_empty_view.* class ApprovalProcessFragment(private val processId: String) : KotlinBaseFragment() { @@ -16,9 +18,14 @@ certificateViewModel.getApprovalProcess(processId) certificateViewModel.processResult.observe(this) { if (it.code == 200) { - logRecyclerView.adapter = ApprovalProcessAdapter( - requireContext(), it.data, it.data.last().first() - ) + if (it.data.isEmpty()) { + emptyView.showEmptyPage("该证书暂无相关审批记录") + } else { + emptyView.hide() + logRecyclerView.adapter = ApprovalProcessAdapter( + requireContext(), it.data, it.data.last().first() + ) + } } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt index bc3f6d1..0d2cd2b 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt @@ -1,12 +1,33 @@ package com.casic.xz.meterage.fragment.outfield +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.ApprovalProcessAdapter +import com.casic.xz.meterage.extensions.showEmptyPage +import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_od_approval_log.* +import kotlinx.android.synthetic.main.include_empty_view.* -class ApprovalLogFragment : KotlinBaseFragment() { +class ApprovalLogFragment(private val processId: String) : KotlinBaseFragment() { + + private lateinit var certificateViewModel: CertificateViewModel override fun initData() { - + certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] + certificateViewModel.getApprovalProcess(processId) + certificateViewModel.processResult.observe(this) { + if (it.code == 200) { + if (it.data.isEmpty()) { + emptyView.showEmptyPage("该外场检测申请暂无相关审批记录") + } else { + emptyView.hide() + logRecyclerView.adapter = ApprovalProcessAdapter( + requireContext(), it.data, it.data.last().first() + ) + } + } + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt index c979c21..f1e3601 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt @@ -138,7 +138,7 @@ R.id.hazardSourceView, item.hazardSourceAndPreventionMethod ) .setText(R.id.remarkView, remark) - .setText(R.id.fullAddressView, "详细地址：${item.fullAddress}") + .setText(R.id.fullAddressView, "详细地址：${item.customerAddress}") .setText( R.id.executiveEnvironmentView, "现场环境：${item.executiveEnvironment}" @@ -148,8 +148,8 @@ "申请时间：${item.applyTime.formatToYearMonthDay()}" ) .setText(R.id.overTimeView, "${deltaT / 24}天前") - .setText(R.id.directorView, item.director) - .setText(R.id.phoneView, item.phone) + .setText(R.id.directorView, item.directorName) + .setText(R.id.phoneView, item.customerPhone) } } outfieldRecyclerView.addItemDecoration( diff --git a/app/src/main/java/com/casic/xz/meterage/model/OutfieldDetectionListModel.java b/app/src/main/java/com/casic/xz/meterage/model/OutfieldDetectionListModel.java index 1397228..4dff94d 100644 --- a/app/src/main/java/com/casic/xz/meterage/model/OutfieldDetectionListModel.java +++ b/app/src/main/java/com/casic/xz/meterage/model/OutfieldDetectionListModel.java @@ -53,29 +53,26 @@ } public static class RowsModel { - private String addressAreaName; - private String addressCityName; - private String addressCountryName; - private String addressProvinceName; private String applyTime; private String approvalStatus; private String approvalStatusName; private String createTime; + private String customerAddress; private String customerId; private String customerName; + private String customerPhone; private String decisionItem; - private String director; + private String deliverer; + private String delivererTel; private String directorId; private String directorName; private String executiveAddress; private String executiveEnvironment; private String executiveItem; - private String fullAddress; private String hazardSourceAndPreventionMethod; private String id; - private String isDel; + private int isDel; private String orderId; - private String phone; private String preCost; private String preEndTime; private String preStartTime; @@ -88,38 +85,6 @@ private String taskSourceName; private String updateTime; - public String getAddressAreaName() { - return addressAreaName; - } - - public void setAddressAreaName(String addressAreaName) { - this.addressAreaName = addressAreaName; - } - - public String getAddressCityName() { - return addressCityName; - } - - public void setAddressCityName(String addressCityName) { - this.addressCityName = addressCityName; - } - - public String getAddressCountryName() { - return addressCountryName; - } - - public void setAddressCountryName(String addressCountryName) { - this.addressCountryName = addressCountryName; - } - - public String getAddressProvinceName() { - return addressProvinceName; - } - - public void setAddressProvinceName(String addressProvinceName) { - this.addressProvinceName = addressProvinceName; - } - public String getApplyTime() { return applyTime; } @@ -152,6 +117,14 @@ this.createTime = createTime; } + public String getCustomerAddress() { + return customerAddress; + } + + public void setCustomerAddress(String customerAddress) { + this.customerAddress = customerAddress; + } + public String getCustomerId() { return customerId; } @@ -168,6 +141,14 @@ this.customerName = customerName; } + public String getCustomerPhone() { + return customerPhone; + } + + public void setCustomerPhone(String customerPhone) { + this.customerPhone = customerPhone; + } + public String getDecisionItem() { return decisionItem; } @@ -176,12 +157,20 @@ this.decisionItem = decisionItem; } - public String getDirector() { - return director; + public String getDeliverer() { + return deliverer; } - public void setDirector(String director) { - this.director = director; + public void setDeliverer(String deliverer) { + this.deliverer = deliverer; + } + + public String getDelivererTel() { + return delivererTel; + } + + public void setDelivererTel(String delivererTel) { + this.delivererTel = delivererTel; } public String getDirectorId() { @@ -224,14 +213,6 @@ this.executiveItem = executiveItem; } - public String getFullAddress() { - return fullAddress; - } - - public void setFullAddress(String fullAddress) { - this.fullAddress = fullAddress; - } - public String getHazardSourceAndPreventionMethod() { return hazardSourceAndPreventionMethod; } @@ -248,11 +229,11 @@ this.id = id; } - public String getIsDel() { + public int getIsDel() { return isDel; } - public void setIsDel(String isDel) { + public void setIsDel(int isDel) { this.isDel = isDel; } @@ -264,14 +245,6 @@ this.orderId = orderId; } - public String getPhone() { - return phone; - } - - public void setPhone(String phone) { - this.phone = phone; - } - public String getPreCost() { return preCost; } diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt index c46802f..4182c3a 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt @@ -7,6 +7,7 @@ import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.base.ApplicationBaseActivity import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.casic.xz.meterage.fragment.outfield.ApprovalLogFragment import com.casic.xz.meterage.fragment.outfield.BasicInformationFragment import com.casic.xz.meterage.fragment.outfield.TaskDeviceFragment import com.casic.xz.meterage.fragment.outfield.TaskExecutorFragment @@ -19,9 +20,7 @@ private val kTag = "OutfieldDetectionDetailActivity" - //TODO 审批流程 接口未定 -// private val pageTitles = arrayOf("基础信息", "任务执行人", "携带设备", "审批流程") - private val pageTitles = arrayOf("基础信息", "任务执行人", "携带设备") + private val pageTitles = arrayOf("基础信息", "任务执行人", "携带设备", "审批流程") private var fragmentPages: ArrayList = ArrayList() private lateinit var args: ArrayList private lateinit var outfieldDetectionViewModel: DetectionViewModel @@ -35,16 +34,19 @@ override fun initData() { args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! - if (args[1].isBlank()) { - approvalView.visibility = View.GONE - } else { - approvalView.visibility = View.VISIBLE - when (args[1]) { - "1" -> approvalView.text = "同意" - "2" -> approvalView.text = "驳回" - "3" -> approvalView.text = "拒绝" - } - } + + //TODO 是否需要在APP操作审批，待定 + approvalView.visibility = View.GONE +// if (args[1].isBlank()) { +// approvalView.visibility = View.GONE +// } else { +// approvalView.visibility = View.VISIBLE +// when (args[1]) { +// "1" -> approvalView.text = "同意" +// "2" -> approvalView.text = "驳回" +// "3" -> approvalView.text = "拒绝" +// } +// } outfieldDetectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] outfieldDetectionViewModel.getOutfieldDetectionDetail(args[0]) @@ -55,7 +57,7 @@ fragmentPages.add(BasicInformationFragment(data)) fragmentPages.add(TaskExecutorFragment(data.meterStaffList)) fragmentPages.add(TaskDeviceFragment(data.equipmentInfoList)) -// fragmentPages.add(ApprovalLogFragment()) + fragmentPages.add(ApprovalLogFragment(data.processId)) approvalViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, pageTitles diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt index 45e3780..f496089 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -3,9 +3,11 @@ import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.ApprovalProcessAdapter +import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_certificate_approval_process.* +import kotlinx.android.synthetic.main.include_empty_view.* class ApprovalProcessFragment(private val processId: String) : KotlinBaseFragment() { @@ -16,9 +18,14 @@ certificateViewModel.getApprovalProcess(processId) certificateViewModel.processResult.observe(this) { if (it.code == 200) { - logRecyclerView.adapter = ApprovalProcessAdapter( - requireContext(), it.data, it.data.last().first() - ) + if (it.data.isEmpty()) { + emptyView.showEmptyPage("该证书暂无相关审批记录") + } else { + emptyView.hide() + logRecyclerView.adapter = ApprovalProcessAdapter( + requireContext(), it.data, it.data.last().first() + ) + } } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt index bc3f6d1..0d2cd2b 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt @@ -1,12 +1,33 @@ package com.casic.xz.meterage.fragment.outfield +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.ApprovalProcessAdapter +import com.casic.xz.meterage.extensions.showEmptyPage +import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_od_approval_log.* +import kotlinx.android.synthetic.main.include_empty_view.* -class ApprovalLogFragment : KotlinBaseFragment() { +class ApprovalLogFragment(private val processId: String) : KotlinBaseFragment() { + + private lateinit var certificateViewModel: CertificateViewModel override fun initData() { - + certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] + certificateViewModel.getApprovalProcess(processId) + certificateViewModel.processResult.observe(this) { + if (it.code == 200) { + if (it.data.isEmpty()) { + emptyView.showEmptyPage("该外场检测申请暂无相关审批记录") + } else { + emptyView.hide() + logRecyclerView.adapter = ApprovalProcessAdapter( + requireContext(), it.data, it.data.last().first() + ) + } + } + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt index c979c21..f1e3601 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt @@ -138,7 +138,7 @@ R.id.hazardSourceView, item.hazardSourceAndPreventionMethod ) .setText(R.id.remarkView, remark) - .setText(R.id.fullAddressView, "详细地址：${item.fullAddress}") + .setText(R.id.fullAddressView, "详细地址：${item.customerAddress}") .setText( R.id.executiveEnvironmentView, "现场环境：${item.executiveEnvironment}" @@ -148,8 +148,8 @@ "申请时间：${item.applyTime.formatToYearMonthDay()}" ) .setText(R.id.overTimeView, "${deltaT / 24}天前") - .setText(R.id.directorView, item.director) - .setText(R.id.phoneView, item.phone) + .setText(R.id.directorView, item.directorName) + .setText(R.id.phoneView, item.customerPhone) } } outfieldRecyclerView.addItemDecoration( diff --git a/app/src/main/java/com/casic/xz/meterage/model/OutfieldDetectionListModel.java b/app/src/main/java/com/casic/xz/meterage/model/OutfieldDetectionListModel.java index 1397228..4dff94d 100644 --- a/app/src/main/java/com/casic/xz/meterage/model/OutfieldDetectionListModel.java +++ b/app/src/main/java/com/casic/xz/meterage/model/OutfieldDetectionListModel.java @@ -53,29 +53,26 @@ } public static class RowsModel { - private String addressAreaName; - private String addressCityName; - private String addressCountryName; - private String addressProvinceName; private String applyTime; private String approvalStatus; private String approvalStatusName; private String createTime; + private String customerAddress; private String customerId; private String customerName; + private String customerPhone; private String decisionItem; - private String director; + private String deliverer; + private String delivererTel; private String directorId; private String directorName; private String executiveAddress; private String executiveEnvironment; private String executiveItem; - private String fullAddress; private String hazardSourceAndPreventionMethod; private String id; - private String isDel; + private int isDel; private String orderId; - private String phone; private String preCost; private String preEndTime; private String preStartTime; @@ -88,38 +85,6 @@ private String taskSourceName; private String updateTime; - public String getAddressAreaName() { - return addressAreaName; - } - - public void setAddressAreaName(String addressAreaName) { - this.addressAreaName = addressAreaName; - } - - public String getAddressCityName() { - return addressCityName; - } - - public void setAddressCityName(String addressCityName) { - this.addressCityName = addressCityName; - } - - public String getAddressCountryName() { - return addressCountryName; - } - - public void setAddressCountryName(String addressCountryName) { - this.addressCountryName = addressCountryName; - } - - public String getAddressProvinceName() { - return addressProvinceName; - } - - public void setAddressProvinceName(String addressProvinceName) { - this.addressProvinceName = addressProvinceName; - } - public String getApplyTime() { return applyTime; } @@ -152,6 +117,14 @@ this.createTime = createTime; } + public String getCustomerAddress() { + return customerAddress; + } + + public void setCustomerAddress(String customerAddress) { + this.customerAddress = customerAddress; + } + public String getCustomerId() { return customerId; } @@ -168,6 +141,14 @@ this.customerName = customerName; } + public String getCustomerPhone() { + return customerPhone; + } + + public void setCustomerPhone(String customerPhone) { + this.customerPhone = customerPhone; + } + public String getDecisionItem() { return decisionItem; } @@ -176,12 +157,20 @@ this.decisionItem = decisionItem; } - public String getDirector() { - return director; + public String getDeliverer() { + return deliverer; } - public void setDirector(String director) { - this.director = director; + public void setDeliverer(String deliverer) { + this.deliverer = deliverer; + } + + public String getDelivererTel() { + return delivererTel; + } + + public void setDelivererTel(String delivererTel) { + this.delivererTel = delivererTel; } public String getDirectorId() { @@ -224,14 +213,6 @@ this.executiveItem = executiveItem; } - public String getFullAddress() { - return fullAddress; - } - - public void setFullAddress(String fullAddress) { - this.fullAddress = fullAddress; - } - public String getHazardSourceAndPreventionMethod() { return hazardSourceAndPreventionMethod; } @@ -248,11 +229,11 @@ this.id = id; } - public String getIsDel() { + public int getIsDel() { return isDel; } - public void setIsDel(String isDel) { + public void setIsDel(int isDel) { this.isDel = isDel; } @@ -264,14 +245,6 @@ this.orderId = orderId; } - public String getPhone() { - return phone; - } - - public void setPhone(String phone) { - this.phone = phone; - } - public String getPreCost() { return preCost; } diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt index c46802f..4182c3a 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt @@ -7,6 +7,7 @@ import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.base.ApplicationBaseActivity import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.casic.xz.meterage.fragment.outfield.ApprovalLogFragment import com.casic.xz.meterage.fragment.outfield.BasicInformationFragment import com.casic.xz.meterage.fragment.outfield.TaskDeviceFragment import com.casic.xz.meterage.fragment.outfield.TaskExecutorFragment @@ -19,9 +20,7 @@ private val kTag = "OutfieldDetectionDetailActivity" - //TODO 审批流程 接口未定 -// private val pageTitles = arrayOf("基础信息", "任务执行人", "携带设备", "审批流程") - private val pageTitles = arrayOf("基础信息", "任务执行人", "携带设备") + private val pageTitles = arrayOf("基础信息", "任务执行人", "携带设备", "审批流程") private var fragmentPages: ArrayList = ArrayList() private lateinit var args: ArrayList private lateinit var outfieldDetectionViewModel: DetectionViewModel @@ -35,16 +34,19 @@ override fun initData() { args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! - if (args[1].isBlank()) { - approvalView.visibility = View.GONE - } else { - approvalView.visibility = View.VISIBLE - when (args[1]) { - "1" -> approvalView.text = "同意" - "2" -> approvalView.text = "驳回" - "3" -> approvalView.text = "拒绝" - } - } + + //TODO 是否需要在APP操作审批，待定 + approvalView.visibility = View.GONE +// if (args[1].isBlank()) { +// approvalView.visibility = View.GONE +// } else { +// approvalView.visibility = View.VISIBLE +// when (args[1]) { +// "1" -> approvalView.text = "同意" +// "2" -> approvalView.text = "驳回" +// "3" -> approvalView.text = "拒绝" +// } +// } outfieldDetectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] outfieldDetectionViewModel.getOutfieldDetectionDetail(args[0]) @@ -55,7 +57,7 @@ fragmentPages.add(BasicInformationFragment(data)) fragmentPages.add(TaskExecutorFragment(data.meterStaffList)) fragmentPages.add(TaskDeviceFragment(data.equipmentInfoList)) -// fragmentPages.add(ApprovalLogFragment()) + fragmentPages.add(ApprovalLogFragment(data.processId)) approvalViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, pageTitles diff --git a/app/src/main/res/layout/fragment_certificate_approval_process.xml b/app/src/main/res/layout/fragment_certificate_approval_process.xml index f5c09cf..b8cbdf5 100644 --- a/app/src/main/res/layout/fragment_certificate_approval_process.xml +++ b/app/src/main/res/layout/fragment_certificate_approval_process.xml @@ -3,7 +3,10 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/white"> + android:background="@color/white" + android:orientation="vertical"> + + = ArrayList() private lateinit var args: ArrayList private lateinit var outfieldDetectionViewModel: DetectionViewModel @@ -35,16 +34,19 @@ override fun initData() { args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! - if (args[1].isBlank()) { - approvalView.visibility = View.GONE - } else { - approvalView.visibility = View.VISIBLE - when (args[1]) { - "1" -> approvalView.text = "同意" - "2" -> approvalView.text = "驳回" - "3" -> approvalView.text = "拒绝" - } - } + + //TODO 是否需要在APP操作审批，待定 + approvalView.visibility = View.GONE +// if (args[1].isBlank()) { +// approvalView.visibility = View.GONE +// } else { +// approvalView.visibility = View.VISIBLE +// when (args[1]) { +// "1" -> approvalView.text = "同意" +// "2" -> approvalView.text = "驳回" +// "3" -> approvalView.text = "拒绝" +// } +// } outfieldDetectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] outfieldDetectionViewModel.getOutfieldDetectionDetail(args[0]) @@ -55,7 +57,7 @@ fragmentPages.add(BasicInformationFragment(data)) fragmentPages.add(TaskExecutorFragment(data.meterStaffList)) fragmentPages.add(TaskDeviceFragment(data.equipmentInfoList)) -// fragmentPages.add(ApprovalLogFragment()) + fragmentPages.add(ApprovalLogFragment(data.processId)) approvalViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, pageTitles diff --git a/app/src/main/res/layout/fragment_certificate_approval_process.xml b/app/src/main/res/layout/fragment_certificate_approval_process.xml index f5c09cf..b8cbdf5 100644 --- a/app/src/main/res/layout/fragment_certificate_approval_process.xml +++ b/app/src/main/res/layout/fragment_certificate_approval_process.xml @@ -3,7 +3,10 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/white"> + android:background="@color/white" + android:orientation="vertical"> + + - + android:layout_height="match_parent" + android:background="@color/white" + android:orientation="vertical"> - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt index 45e3780..f496089 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -3,9 +3,11 @@ import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.ApprovalProcessAdapter +import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_certificate_approval_process.* +import kotlinx.android.synthetic.main.include_empty_view.* class ApprovalProcessFragment(private val processId: String) : KotlinBaseFragment() { @@ -16,9 +18,14 @@ certificateViewModel.getApprovalProcess(processId) certificateViewModel.processResult.observe(this) { if (it.code == 200) { - logRecyclerView.adapter = ApprovalProcessAdapter( - requireContext(), it.data, it.data.last().first() - ) + if (it.data.isEmpty()) { + emptyView.showEmptyPage("该证书暂无相关审批记录") + } else { + emptyView.hide() + logRecyclerView.adapter = ApprovalProcessAdapter( + requireContext(), it.data, it.data.last().first() + ) + } } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt index bc3f6d1..0d2cd2b 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt @@ -1,12 +1,33 @@ package com.casic.xz.meterage.fragment.outfield +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.ApprovalProcessAdapter +import com.casic.xz.meterage.extensions.showEmptyPage +import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_od_approval_log.* +import kotlinx.android.synthetic.main.include_empty_view.* -class ApprovalLogFragment : KotlinBaseFragment() { +class ApprovalLogFragment(private val processId: String) : KotlinBaseFragment() { + + private lateinit var certificateViewModel: CertificateViewModel override fun initData() { - + certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] + certificateViewModel.getApprovalProcess(processId) + certificateViewModel.processResult.observe(this) { + if (it.code == 200) { + if (it.data.isEmpty()) { + emptyView.showEmptyPage("该外场检测申请暂无相关审批记录") + } else { + emptyView.hide() + logRecyclerView.adapter = ApprovalProcessAdapter( + requireContext(), it.data, it.data.last().first() + ) + } + } + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt index c979c21..f1e3601 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt @@ -138,7 +138,7 @@ R.id.hazardSourceView, item.hazardSourceAndPreventionMethod ) .setText(R.id.remarkView, remark) - .setText(R.id.fullAddressView, "详细地址：${item.fullAddress}") + .setText(R.id.fullAddressView, "详细地址：${item.customerAddress}") .setText( R.id.executiveEnvironmentView, "现场环境：${item.executiveEnvironment}" @@ -148,8 +148,8 @@ "申请时间：${item.applyTime.formatToYearMonthDay()}" ) .setText(R.id.overTimeView, "${deltaT / 24}天前") - .setText(R.id.directorView, item.director) - .setText(R.id.phoneView, item.phone) + .setText(R.id.directorView, item.directorName) + .setText(R.id.phoneView, item.customerPhone) } } outfieldRecyclerView.addItemDecoration( diff --git a/app/src/main/java/com/casic/xz/meterage/model/OutfieldDetectionListModel.java b/app/src/main/java/com/casic/xz/meterage/model/OutfieldDetectionListModel.java index 1397228..4dff94d 100644 --- a/app/src/main/java/com/casic/xz/meterage/model/OutfieldDetectionListModel.java +++ b/app/src/main/java/com/casic/xz/meterage/model/OutfieldDetectionListModel.java @@ -53,29 +53,26 @@ } public static class RowsModel { - private String addressAreaName; - private String addressCityName; - private String addressCountryName; - private String addressProvinceName; private String applyTime; private String approvalStatus; private String approvalStatusName; private String createTime; + private String customerAddress; private String customerId; private String customerName; + private String customerPhone; private String decisionItem; - private String director; + private String deliverer; + private String delivererTel; private String directorId; private String directorName; private String executiveAddress; private String executiveEnvironment; private String executiveItem; - private String fullAddress; private String hazardSourceAndPreventionMethod; private String id; - private String isDel; + private int isDel; private String orderId; - private String phone; private String preCost; private String preEndTime; private String preStartTime; @@ -88,38 +85,6 @@ private String taskSourceName; private String updateTime; - public String getAddressAreaName() { - return addressAreaName; - } - - public void setAddressAreaName(String addressAreaName) { - this.addressAreaName = addressAreaName; - } - - public String getAddressCityName() { - return addressCityName; - } - - public void setAddressCityName(String addressCityName) { - this.addressCityName = addressCityName; - } - - public String getAddressCountryName() { - return addressCountryName; - } - - public void setAddressCountryName(String addressCountryName) { - this.addressCountryName = addressCountryName; - } - - public String getAddressProvinceName() { - return addressProvinceName; - } - - public void setAddressProvinceName(String addressProvinceName) { - this.addressProvinceName = addressProvinceName; - } - public String getApplyTime() { return applyTime; } @@ -152,6 +117,14 @@ this.createTime = createTime; } + public String getCustomerAddress() { + return customerAddress; + } + + public void setCustomerAddress(String customerAddress) { + this.customerAddress = customerAddress; + } + public String getCustomerId() { return customerId; } @@ -168,6 +141,14 @@ this.customerName = customerName; } + public String getCustomerPhone() { + return customerPhone; + } + + public void setCustomerPhone(String customerPhone) { + this.customerPhone = customerPhone; + } + public String getDecisionItem() { return decisionItem; } @@ -176,12 +157,20 @@ this.decisionItem = decisionItem; } - public String getDirector() { - return director; + public String getDeliverer() { + return deliverer; } - public void setDirector(String director) { - this.director = director; + public void setDeliverer(String deliverer) { + this.deliverer = deliverer; + } + + public String getDelivererTel() { + return delivererTel; + } + + public void setDelivererTel(String delivererTel) { + this.delivererTel = delivererTel; } public String getDirectorId() { @@ -224,14 +213,6 @@ this.executiveItem = executiveItem; } - public String getFullAddress() { - return fullAddress; - } - - public void setFullAddress(String fullAddress) { - this.fullAddress = fullAddress; - } - public String getHazardSourceAndPreventionMethod() { return hazardSourceAndPreventionMethod; } @@ -248,11 +229,11 @@ this.id = id; } - public String getIsDel() { + public int getIsDel() { return isDel; } - public void setIsDel(String isDel) { + public void setIsDel(int isDel) { this.isDel = isDel; } @@ -264,14 +245,6 @@ this.orderId = orderId; } - public String getPhone() { - return phone; - } - - public void setPhone(String phone) { - this.phone = phone; - } - public String getPreCost() { return preCost; } diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt index c46802f..4182c3a 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt @@ -7,6 +7,7 @@ import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.base.ApplicationBaseActivity import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.casic.xz.meterage.fragment.outfield.ApprovalLogFragment import com.casic.xz.meterage.fragment.outfield.BasicInformationFragment import com.casic.xz.meterage.fragment.outfield.TaskDeviceFragment import com.casic.xz.meterage.fragment.outfield.TaskExecutorFragment @@ -19,9 +20,7 @@ private val kTag = "OutfieldDetectionDetailActivity" - //TODO 审批流程 接口未定 -// private val pageTitles = arrayOf("基础信息", "任务执行人", "携带设备", "审批流程") - private val pageTitles = arrayOf("基础信息", "任务执行人", "携带设备") + private val pageTitles = arrayOf("基础信息", "任务执行人", "携带设备", "审批流程") private var fragmentPages: ArrayList = ArrayList() private lateinit var args: ArrayList private lateinit var outfieldDetectionViewModel: DetectionViewModel @@ -35,16 +34,19 @@ override fun initData() { args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! - if (args[1].isBlank()) { - approvalView.visibility = View.GONE - } else { - approvalView.visibility = View.VISIBLE - when (args[1]) { - "1" -> approvalView.text = "同意" - "2" -> approvalView.text = "驳回" - "3" -> approvalView.text = "拒绝" - } - } + + //TODO 是否需要在APP操作审批，待定 + approvalView.visibility = View.GONE +// if (args[1].isBlank()) { +// approvalView.visibility = View.GONE +// } else { +// approvalView.visibility = View.VISIBLE +// when (args[1]) { +// "1" -> approvalView.text = "同意" +// "2" -> approvalView.text = "驳回" +// "3" -> approvalView.text = "拒绝" +// } +// } outfieldDetectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] outfieldDetectionViewModel.getOutfieldDetectionDetail(args[0]) @@ -55,7 +57,7 @@ fragmentPages.add(BasicInformationFragment(data)) fragmentPages.add(TaskExecutorFragment(data.meterStaffList)) fragmentPages.add(TaskDeviceFragment(data.equipmentInfoList)) -// fragmentPages.add(ApprovalLogFragment()) + fragmentPages.add(ApprovalLogFragment(data.processId)) approvalViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, pageTitles diff --git a/app/src/main/res/layout/fragment_certificate_approval_process.xml b/app/src/main/res/layout/fragment_certificate_approval_process.xml index f5c09cf..b8cbdf5 100644 --- a/app/src/main/res/layout/fragment_certificate_approval_process.xml +++ b/app/src/main/res/layout/fragment_certificate_approval_process.xml @@ -3,7 +3,10 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/white"> + android:background="@color/white" + android:orientation="vertical"> + + - + android:layout_height="match_parent" + android:background="@color/white" + android:orientation="vertical"> - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_outfield_detection_rv_l.xml b/app/src/main/res/layout/item_outfield_detection_rv_l.xml index 153c514..67c0026 100644 --- a/app/src/main/res/layout/item_outfield_detection_rv_l.xml +++ b/app/src/main/res/layout/item_outfield_detection_rv_l.xml @@ -25,7 +25,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/dp_5" - android:text="现场测试、校准或检定项目" + android:singleLine="true" + android:text="现场测试、校准或检定项目现场测试、校准或检定项目" android:textColor="@color/black" android:textSize="@dimen/sp_14" />