diff --git a/app/build.gradle b/app/build.gradle index 5ba44f0..298f687 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -53,7 +53,8 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "XZJL_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" +// outputFileName = "XZJL_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "XZJL_" + getBuildDate() + "_Beta.apk" } } } diff --git a/app/build.gradle b/app/build.gradle index 5ba44f0..298f687 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -53,7 +53,8 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "XZJL_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" +// outputFileName = "XZJL_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "XZJL_" + getBuildDate() + "_Beta.apk" } } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4b914b5..ebea092 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -67,6 +67,7 @@ + diff --git a/app/build.gradle b/app/build.gradle index 5ba44f0..298f687 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -53,7 +53,8 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "XZJL_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" +// outputFileName = "XZJL_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "XZJL_" + getBuildDate() + "_Beta.apk" } } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4b914b5..ebea092 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -67,6 +67,7 @@ + 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 new file mode 100644 index 0000000..a75e566 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.certificate + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class ApprovalProcessFragment :KotlinBaseFragment(){ + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_certificate_approval_process + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 5ba44f0..298f687 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -53,7 +53,8 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "XZJL_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" +// outputFileName = "XZJL_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "XZJL_" + getBuildDate() + "_Beta.apk" } } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4b914b5..ebea092 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -67,6 +67,7 @@ + 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 new file mode 100644 index 0000000..a75e566 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.certificate + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class ApprovalProcessFragment :KotlinBaseFragment(){ + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_certificate_approval_process + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt new file mode 100644 index 0000000..5882c3d --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt @@ -0,0 +1,77 @@ +package com.casic.xz.meterage.fragment.certificate + +import android.graphics.Color +import android.graphics.Paint +import android.util.Log +import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.watchAttachFile +import com.casic.xz.meterage.model.CertificateDetailModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.pengxh.kt.lite.extensions.toJson +import kotlinx.android.synthetic.main.fragment_certificate_basic_information.* + +class BasicInformationFragment(private val data: CertificateDetailModel.DataModel) : + KotlinBaseFragment() { + + override fun initData() { + val businessOriginal = data.businessOriginalRecord + + reportCodeView.text = data.certificateReportCode + originalCodeView.text = businessOriginal.originalRecordCode + checkCategoryView.text = businessOriginal.measureCategoryName + + Log.d( + "Casic", + "BasicInformationFragment => initData: ${businessOriginal.fileList.toJson()}" + ) +// basisFileView.text = businessOriginal.fileList + + val sampleInfo = businessOriginal.customerSampleInfo + sampleCodeView.text = sampleInfo.sampleNo + sampleNameView.text = sampleInfo.sampleName + manufacturingCodeView.text = sampleInfo.manufacturingNo + modelView.text = sampleInfo.sampleModel + entrustCodeView.text = sampleInfo.customerNo + entrustNameView.text = sampleInfo.customerName + entrustContactView.text = sampleInfo.phone + entrustEmailView.text = sampleInfo.postalCode + entrustAddressView.text = sampleInfo.customerAddress + senderView.text = sampleInfo.deliverer + senderContactView.text = sampleInfo.delivererTel + checkTypeView.text = sampleInfo.measureContent + remarkView.text = sampleInfo.remark + + estimateServedTimeView.text = businessOriginal.businessOrder.planDeliverTime + estimateCompleteTimeView.text = businessOriginal.businessOrder.requireOverTime + + if (data.certificateReportFile.isNullOrBlank()) { + reportFileView.text = "暂无附件" + } else { + val reportFileName = data.certificateReportFile + + reportFileView.text = reportFileName + val textPaint = reportFileView.paint + textPaint.flags = Paint.UNDERLINE_TEXT_FLAG + textPaint.isAntiAlias = true + reportFileView.setTextColor(Color.BLUE) + + reportFileView.setOnClickListener { + reportFileName.watchAttachFile(requireContext()) + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_certificate_basic_information + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 5ba44f0..298f687 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -53,7 +53,8 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "XZJL_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" +// outputFileName = "XZJL_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "XZJL_" + getBuildDate() + "_Beta.apk" } } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4b914b5..ebea092 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -67,6 +67,7 @@ + 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 new file mode 100644 index 0000000..a75e566 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.certificate + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class ApprovalProcessFragment :KotlinBaseFragment(){ + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_certificate_approval_process + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt new file mode 100644 index 0000000..5882c3d --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt @@ -0,0 +1,77 @@ +package com.casic.xz.meterage.fragment.certificate + +import android.graphics.Color +import android.graphics.Paint +import android.util.Log +import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.watchAttachFile +import com.casic.xz.meterage.model.CertificateDetailModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.pengxh.kt.lite.extensions.toJson +import kotlinx.android.synthetic.main.fragment_certificate_basic_information.* + +class BasicInformationFragment(private val data: CertificateDetailModel.DataModel) : + KotlinBaseFragment() { + + override fun initData() { + val businessOriginal = data.businessOriginalRecord + + reportCodeView.text = data.certificateReportCode + originalCodeView.text = businessOriginal.originalRecordCode + checkCategoryView.text = businessOriginal.measureCategoryName + + Log.d( + "Casic", + "BasicInformationFragment => initData: ${businessOriginal.fileList.toJson()}" + ) +// basisFileView.text = businessOriginal.fileList + + val sampleInfo = businessOriginal.customerSampleInfo + sampleCodeView.text = sampleInfo.sampleNo + sampleNameView.text = sampleInfo.sampleName + manufacturingCodeView.text = sampleInfo.manufacturingNo + modelView.text = sampleInfo.sampleModel + entrustCodeView.text = sampleInfo.customerNo + entrustNameView.text = sampleInfo.customerName + entrustContactView.text = sampleInfo.phone + entrustEmailView.text = sampleInfo.postalCode + entrustAddressView.text = sampleInfo.customerAddress + senderView.text = sampleInfo.deliverer + senderContactView.text = sampleInfo.delivererTel + checkTypeView.text = sampleInfo.measureContent + remarkView.text = sampleInfo.remark + + estimateServedTimeView.text = businessOriginal.businessOrder.planDeliverTime + estimateCompleteTimeView.text = businessOriginal.businessOrder.requireOverTime + + if (data.certificateReportFile.isNullOrBlank()) { + reportFileView.text = "暂无附件" + } else { + val reportFileName = data.certificateReportFile + + reportFileView.text = reportFileName + val textPaint = reportFileView.paint + textPaint.flags = Paint.UNDERLINE_TEXT_FLAG + textPaint.isAntiAlias = true + reportFileView.setTextColor(Color.BLUE) + + reportFileView.setOnClickListener { + reportFileName.watchAttachFile(requireContext()) + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_certificate_basic_information + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt index 2f3c95c..b1df400 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt @@ -4,19 +4,24 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.addAll +import com.casic.xz.meterage.extensions.diffCurrentTime +import com.casic.xz.meterage.extensions.formatToDate import com.casic.xz.meterage.extensions.showEmptyPage -import com.casic.xz.meterage.model.CertificateModel +import com.casic.xz.meterage.model.CertificateListModel +import com.casic.xz.meterage.view.home.CertificateReportDetailActivity import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler import kotlinx.android.synthetic.main.fragment_certificate_report.* import kotlinx.android.synthetic.main.include_empty_view.* /** - * 计量法规 + * 证书报告 * * formId:ywglzsbg * */ @@ -24,8 +29,8 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var certificateViewModel: CertificateViewModel - private lateinit var certificateAdapter: NormalRecyclerAdapter - private var dataBeans: MutableList = ArrayList() + private lateinit var certificateAdapter: NormalRecyclerAdapter + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false @@ -119,40 +124,37 @@ } else { emptyView!!.hide() certificateAdapter = object : - NormalRecyclerAdapter( + NormalRecyclerAdapter( R.layout.item_certificate_rv_l, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, - item: CertificateModel.DataModel.RowsModel + item: CertificateListModel.DataModel.RowsModel ) { + val deltaT = item.createTime.diffCurrentTime() + val diffTime = if (deltaT < 24) { + "${deltaT}小时前" + } else { + item.createTime.formatToDate() + } + viewHolder.setText(R.id.reportNameView, item.certificateReportName) -// .setText(R.id.fileStateView, item.effectiveStatusName) -// .setText(R.id.remarkView, "备注：$remark") -// .setText(R.id.fileCodeView, "文件号：${item.fileNo}") -// .setText(R.id.releaseDateView, "实施时间：${item.publishTime}") -// -// if (!item.effectiveStatus.equals("1")) { -// viewHolder.setBackgroundColor( -// R.id.fileStateView, -// R.color.gray.convertColor(requireContext()) -// ) -// } + .setText(R.id.createTimeView, diffTime) + .setText(R.id.categoryView, "校验类别：${item.measureCategoryName}") + .setText(R.id.technicianView, "检定员：${item.measurePersonName}") + + viewHolder.setOnClickListener(R.id.showDetailButton) { + requireContext().navigatePageTo( + addAll(item.approvalStatus, item.id) + ) + } } } certificateRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) certificateRecyclerView.adapter = certificateAdapter - certificateAdapter.setOnItemClickedListener(object : - NormalRecyclerAdapter.OnItemClickedListener { - override fun onItemClicked( - position: Int, t: CertificateModel.DataModel.RowsModel - ) { -// requireContext().navigatePageTo(t.toJson()) - } - }) } } } diff --git a/app/build.gradle b/app/build.gradle index 5ba44f0..298f687 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -53,7 +53,8 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "XZJL_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" +// outputFileName = "XZJL_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "XZJL_" + getBuildDate() + "_Beta.apk" } } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4b914b5..ebea092 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -67,6 +67,7 @@ + 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 new file mode 100644 index 0000000..a75e566 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.certificate + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class ApprovalProcessFragment :KotlinBaseFragment(){ + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_certificate_approval_process + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt new file mode 100644 index 0000000..5882c3d --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt @@ -0,0 +1,77 @@ +package com.casic.xz.meterage.fragment.certificate + +import android.graphics.Color +import android.graphics.Paint +import android.util.Log +import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.watchAttachFile +import com.casic.xz.meterage.model.CertificateDetailModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.pengxh.kt.lite.extensions.toJson +import kotlinx.android.synthetic.main.fragment_certificate_basic_information.* + +class BasicInformationFragment(private val data: CertificateDetailModel.DataModel) : + KotlinBaseFragment() { + + override fun initData() { + val businessOriginal = data.businessOriginalRecord + + reportCodeView.text = data.certificateReportCode + originalCodeView.text = businessOriginal.originalRecordCode + checkCategoryView.text = businessOriginal.measureCategoryName + + Log.d( + "Casic", + "BasicInformationFragment => initData: ${businessOriginal.fileList.toJson()}" + ) +// basisFileView.text = businessOriginal.fileList + + val sampleInfo = businessOriginal.customerSampleInfo + sampleCodeView.text = sampleInfo.sampleNo + sampleNameView.text = sampleInfo.sampleName + manufacturingCodeView.text = sampleInfo.manufacturingNo + modelView.text = sampleInfo.sampleModel + entrustCodeView.text = sampleInfo.customerNo + entrustNameView.text = sampleInfo.customerName + entrustContactView.text = sampleInfo.phone + entrustEmailView.text = sampleInfo.postalCode + entrustAddressView.text = sampleInfo.customerAddress + senderView.text = sampleInfo.deliverer + senderContactView.text = sampleInfo.delivererTel + checkTypeView.text = sampleInfo.measureContent + remarkView.text = sampleInfo.remark + + estimateServedTimeView.text = businessOriginal.businessOrder.planDeliverTime + estimateCompleteTimeView.text = businessOriginal.businessOrder.requireOverTime + + if (data.certificateReportFile.isNullOrBlank()) { + reportFileView.text = "暂无附件" + } else { + val reportFileName = data.certificateReportFile + + reportFileView.text = reportFileName + val textPaint = reportFileView.paint + textPaint.flags = Paint.UNDERLINE_TEXT_FLAG + textPaint.isAntiAlias = true + reportFileView.setTextColor(Color.BLUE) + + reportFileView.setOnClickListener { + reportFileName.watchAttachFile(requireContext()) + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_certificate_basic_information + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt index 2f3c95c..b1df400 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt @@ -4,19 +4,24 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.addAll +import com.casic.xz.meterage.extensions.diffCurrentTime +import com.casic.xz.meterage.extensions.formatToDate import com.casic.xz.meterage.extensions.showEmptyPage -import com.casic.xz.meterage.model.CertificateModel +import com.casic.xz.meterage.model.CertificateListModel +import com.casic.xz.meterage.view.home.CertificateReportDetailActivity import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler import kotlinx.android.synthetic.main.fragment_certificate_report.* import kotlinx.android.synthetic.main.include_empty_view.* /** - * 计量法规 + * 证书报告 * * formId:ywglzsbg * */ @@ -24,8 +29,8 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var certificateViewModel: CertificateViewModel - private lateinit var certificateAdapter: NormalRecyclerAdapter - private var dataBeans: MutableList = ArrayList() + private lateinit var certificateAdapter: NormalRecyclerAdapter + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false @@ -119,40 +124,37 @@ } else { emptyView!!.hide() certificateAdapter = object : - NormalRecyclerAdapter( + NormalRecyclerAdapter( R.layout.item_certificate_rv_l, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, - item: CertificateModel.DataModel.RowsModel + item: CertificateListModel.DataModel.RowsModel ) { + val deltaT = item.createTime.diffCurrentTime() + val diffTime = if (deltaT < 24) { + "${deltaT}小时前" + } else { + item.createTime.formatToDate() + } + viewHolder.setText(R.id.reportNameView, item.certificateReportName) -// .setText(R.id.fileStateView, item.effectiveStatusName) -// .setText(R.id.remarkView, "备注：$remark") -// .setText(R.id.fileCodeView, "文件号：${item.fileNo}") -// .setText(R.id.releaseDateView, "实施时间：${item.publishTime}") -// -// if (!item.effectiveStatus.equals("1")) { -// viewHolder.setBackgroundColor( -// R.id.fileStateView, -// R.color.gray.convertColor(requireContext()) -// ) -// } + .setText(R.id.createTimeView, diffTime) + .setText(R.id.categoryView, "校验类别：${item.measureCategoryName}") + .setText(R.id.technicianView, "检定员：${item.measurePersonName}") + + viewHolder.setOnClickListener(R.id.showDetailButton) { + requireContext().navigatePageTo( + addAll(item.approvalStatus, item.id) + ) + } } } certificateRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) certificateRecyclerView.adapter = certificateAdapter - certificateAdapter.setOnItemClickedListener(object : - NormalRecyclerAdapter.OnItemClickedListener { - override fun onItemClicked( - position: Int, t: CertificateModel.DataModel.RowsModel - ) { -// requireContext().navigatePageTo(t.toJson()) - } - }) } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt new file mode 100644 index 0000000..2d5ac61 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.certificate + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class ExceptionReportFragment :KotlinBaseFragment(){ + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_certificate_exception_report + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 5ba44f0..298f687 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -53,7 +53,8 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "XZJL_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" +// outputFileName = "XZJL_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "XZJL_" + getBuildDate() + "_Beta.apk" } } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4b914b5..ebea092 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -67,6 +67,7 @@ + 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 new file mode 100644 index 0000000..a75e566 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.certificate + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class ApprovalProcessFragment :KotlinBaseFragment(){ + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_certificate_approval_process + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt new file mode 100644 index 0000000..5882c3d --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt @@ -0,0 +1,77 @@ +package com.casic.xz.meterage.fragment.certificate + +import android.graphics.Color +import android.graphics.Paint +import android.util.Log +import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.watchAttachFile +import com.casic.xz.meterage.model.CertificateDetailModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.pengxh.kt.lite.extensions.toJson +import kotlinx.android.synthetic.main.fragment_certificate_basic_information.* + +class BasicInformationFragment(private val data: CertificateDetailModel.DataModel) : + KotlinBaseFragment() { + + override fun initData() { + val businessOriginal = data.businessOriginalRecord + + reportCodeView.text = data.certificateReportCode + originalCodeView.text = businessOriginal.originalRecordCode + checkCategoryView.text = businessOriginal.measureCategoryName + + Log.d( + "Casic", + "BasicInformationFragment => initData: ${businessOriginal.fileList.toJson()}" + ) +// basisFileView.text = businessOriginal.fileList + + val sampleInfo = businessOriginal.customerSampleInfo + sampleCodeView.text = sampleInfo.sampleNo + sampleNameView.text = sampleInfo.sampleName + manufacturingCodeView.text = sampleInfo.manufacturingNo + modelView.text = sampleInfo.sampleModel + entrustCodeView.text = sampleInfo.customerNo + entrustNameView.text = sampleInfo.customerName + entrustContactView.text = sampleInfo.phone + entrustEmailView.text = sampleInfo.postalCode + entrustAddressView.text = sampleInfo.customerAddress + senderView.text = sampleInfo.deliverer + senderContactView.text = sampleInfo.delivererTel + checkTypeView.text = sampleInfo.measureContent + remarkView.text = sampleInfo.remark + + estimateServedTimeView.text = businessOriginal.businessOrder.planDeliverTime + estimateCompleteTimeView.text = businessOriginal.businessOrder.requireOverTime + + if (data.certificateReportFile.isNullOrBlank()) { + reportFileView.text = "暂无附件" + } else { + val reportFileName = data.certificateReportFile + + reportFileView.text = reportFileName + val textPaint = reportFileView.paint + textPaint.flags = Paint.UNDERLINE_TEXT_FLAG + textPaint.isAntiAlias = true + reportFileView.setTextColor(Color.BLUE) + + reportFileView.setOnClickListener { + reportFileName.watchAttachFile(requireContext()) + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_certificate_basic_information + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt index 2f3c95c..b1df400 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt @@ -4,19 +4,24 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.addAll +import com.casic.xz.meterage.extensions.diffCurrentTime +import com.casic.xz.meterage.extensions.formatToDate import com.casic.xz.meterage.extensions.showEmptyPage -import com.casic.xz.meterage.model.CertificateModel +import com.casic.xz.meterage.model.CertificateListModel +import com.casic.xz.meterage.view.home.CertificateReportDetailActivity import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler import kotlinx.android.synthetic.main.fragment_certificate_report.* import kotlinx.android.synthetic.main.include_empty_view.* /** - * 计量法规 + * 证书报告 * * formId:ywglzsbg * */ @@ -24,8 +29,8 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var certificateViewModel: CertificateViewModel - private lateinit var certificateAdapter: NormalRecyclerAdapter - private var dataBeans: MutableList = ArrayList() + private lateinit var certificateAdapter: NormalRecyclerAdapter + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false @@ -119,40 +124,37 @@ } else { emptyView!!.hide() certificateAdapter = object : - NormalRecyclerAdapter( + NormalRecyclerAdapter( R.layout.item_certificate_rv_l, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, - item: CertificateModel.DataModel.RowsModel + item: CertificateListModel.DataModel.RowsModel ) { + val deltaT = item.createTime.diffCurrentTime() + val diffTime = if (deltaT < 24) { + "${deltaT}小时前" + } else { + item.createTime.formatToDate() + } + viewHolder.setText(R.id.reportNameView, item.certificateReportName) -// .setText(R.id.fileStateView, item.effectiveStatusName) -// .setText(R.id.remarkView, "备注：$remark") -// .setText(R.id.fileCodeView, "文件号：${item.fileNo}") -// .setText(R.id.releaseDateView, "实施时间：${item.publishTime}") -// -// if (!item.effectiveStatus.equals("1")) { -// viewHolder.setBackgroundColor( -// R.id.fileStateView, -// R.color.gray.convertColor(requireContext()) -// ) -// } + .setText(R.id.createTimeView, diffTime) + .setText(R.id.categoryView, "校验类别：${item.measureCategoryName}") + .setText(R.id.technicianView, "检定员：${item.measurePersonName}") + + viewHolder.setOnClickListener(R.id.showDetailButton) { + requireContext().navigatePageTo( + addAll(item.approvalStatus, item.id) + ) + } } } certificateRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) certificateRecyclerView.adapter = certificateAdapter - certificateAdapter.setOnItemClickedListener(object : - NormalRecyclerAdapter.OnItemClickedListener { - override fun onItemClicked( - position: Int, t: CertificateModel.DataModel.RowsModel - ) { -// requireContext().navigatePageTo(t.toJson()) - } - }) } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt new file mode 100644 index 0000000..2d5ac61 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.certificate + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class ExceptionReportFragment :KotlinBaseFragment(){ + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_certificate_exception_report + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/model/CertificateDetailModel.java b/app/src/main/java/com/casic/xz/meterage/model/CertificateDetailModel.java new file mode 100644 index 0000000..42efccd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/CertificateDetailModel.java @@ -0,0 +1,2080 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class CertificateDetailModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private String approvalSignId; + private String approvalStatus; + private String approvalStatusName; + private BusinessOriginalRecordModel businessOriginalRecord; + private String calibrationMajor; + private String calibrationMajorName; + private String certificateReportCategory; + private String certificateReportCode; + private String certificateReportFile; + private String certificateReportName; + private String createTime; + private String createUser; + private String expirationDate; + private String id; + private String isDel; + private String issuanceDate; + private String measureDeptId; + private String measurePersonId; + private String measureResult; + private String orderId; + private String originalRecordId; + private String printNum; + private String printStatus; + private String processId; + private String remark; + private String sampleId; + private String signId; + private String templateId; + private String updateTime; + + public String getApprovalSignId() { + return approvalSignId; + } + + public void setApprovalSignId(String approvalSignId) { + this.approvalSignId = approvalSignId; + } + + public String getApprovalStatus() { + return approvalStatus; + } + + public void setApprovalStatus(String approvalStatus) { + this.approvalStatus = approvalStatus; + } + + public String getApprovalStatusName() { + return approvalStatusName; + } + + public void setApprovalStatusName(String approvalStatusName) { + this.approvalStatusName = approvalStatusName; + } + + public BusinessOriginalRecordModel getBusinessOriginalRecord() { + return businessOriginalRecord; + } + + public void setBusinessOriginalRecord(BusinessOriginalRecordModel businessOriginalRecord) { + this.businessOriginalRecord = businessOriginalRecord; + } + + public String getCalibrationMajor() { + return calibrationMajor; + } + + public void setCalibrationMajor(String calibrationMajor) { + this.calibrationMajor = calibrationMajor; + } + + public String getCalibrationMajorName() { + return calibrationMajorName; + } + + public void setCalibrationMajorName(String calibrationMajorName) { + this.calibrationMajorName = calibrationMajorName; + } + + public String getCertificateReportCategory() { + return certificateReportCategory; + } + + public void setCertificateReportCategory(String certificateReportCategory) { + this.certificateReportCategory = certificateReportCategory; + } + + public String getCertificateReportCode() { + return certificateReportCode; + } + + public void setCertificateReportCode(String certificateReportCode) { + this.certificateReportCode = certificateReportCode; + } + + public String getCertificateReportFile() { + return certificateReportFile; + } + + public void setCertificateReportFile(String certificateReportFile) { + this.certificateReportFile = certificateReportFile; + } + + public String getCertificateReportName() { + return certificateReportName; + } + + public void setCertificateReportName(String certificateReportName) { + this.certificateReportName = certificateReportName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getExpirationDate() { + return expirationDate; + } + + public void setExpirationDate(String expirationDate) { + this.expirationDate = expirationDate; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String isIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIssuanceDate() { + return issuanceDate; + } + + public void setIssuanceDate(String issuanceDate) { + this.issuanceDate = issuanceDate; + } + + public String getMeasureDeptId() { + return measureDeptId; + } + + public void setMeasureDeptId(String measureDeptId) { + this.measureDeptId = measureDeptId; + } + + public String getMeasurePersonId() { + return measurePersonId; + } + + public void setMeasurePersonId(String measurePersonId) { + this.measurePersonId = measurePersonId; + } + + public String getMeasureResult() { + return measureResult; + } + + public void setMeasureResult(String measureResult) { + this.measureResult = measureResult; + } + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public String getOriginalRecordId() { + return originalRecordId; + } + + public void setOriginalRecordId(String originalRecordId) { + this.originalRecordId = originalRecordId; + } + + public String getPrintNum() { + return printNum; + } + + public void setPrintNum(String printNum) { + this.printNum = printNum; + } + + public String getPrintStatus() { + return printStatus; + } + + public void setPrintStatus(String printStatus) { + this.printStatus = printStatus; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSampleId() { + return sampleId; + } + + public void setSampleId(String sampleId) { + this.sampleId = sampleId; + } + + public String getSignId() { + return signId; + } + + public void setSignId(String signId) { + this.signId = signId; + } + + public String getTemplateId() { + return templateId; + } + + public void setTemplateId(String templateId) { + this.templateId = templateId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public static class BusinessOriginalRecordModel { + private BusinessEnvRecordModel businessEnvironmentRecord; + private BusinessOrderModel businessOrder; + private String calibrationPlace; + private String calibrationTime; + private String createTime; + private String createUser; + private BusinessOrderModel.CustomerSampleModel customerSampleInfo; + private String environmentId; + private List equipmentInfoList; + private List fileList; + private String id; + private String isDel; + private String measureCategory; + private String measureCategoryName; + private String orderId; + private String originalRecordCode; + private String originalRecordFile; + private String originalRecordName; + private String remark; + private String sampleId; + private String templateId; + private String templateName; + private String updateTime; + + public BusinessEnvRecordModel getBusinessEnvironmentRecord() { + return businessEnvironmentRecord; + } + + public void setBusinessEnvironmentRecord(BusinessEnvRecordModel businessEnvironmentRecord) { + this.businessEnvironmentRecord = businessEnvironmentRecord; + } + + public BusinessOrderModel getBusinessOrder() { + return businessOrder; + } + + public void setBusinessOrder(BusinessOrderModel businessOrder) { + this.businessOrder = businessOrder; + } + + public String getCalibrationPlace() { + return calibrationPlace; + } + + public void setCalibrationPlace(String calibrationPlace) { + this.calibrationPlace = calibrationPlace; + } + + public String getCalibrationTime() { + return calibrationTime; + } + + public void setCalibrationTime(String calibrationTime) { + this.calibrationTime = calibrationTime; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public BusinessOrderModel.CustomerSampleModel getCustomerSampleInfo() { + return customerSampleInfo; + } + + public void setCustomerSampleInfo(BusinessOrderModel.CustomerSampleModel customerSampleInfo) { + this.customerSampleInfo = customerSampleInfo; + } + + public String getEnvironmentId() { + return environmentId; + } + + public void setEnvironmentId(String environmentId) { + this.environmentId = environmentId; + } + + public List getEquipmentInfoList() { + return equipmentInfoList; + } + + public void setEquipmentInfoList(List equipmentInfoList) { + this.equipmentInfoList = equipmentInfoList; + } + + public List getFileList() { + return fileList; + } + + public void setFileList(List fileList) { + this.fileList = fileList; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String isIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getMeasureCategory() { + return measureCategory; + } + + public void setMeasureCategory(String measureCategory) { + this.measureCategory = measureCategory; + } + + public String getMeasureCategoryName() { + return measureCategoryName; + } + + public void setMeasureCategoryName(String measureCategoryName) { + this.measureCategoryName = measureCategoryName; + } + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public String getOriginalRecordCode() { + return originalRecordCode; + } + + public void setOriginalRecordCode(String originalRecordCode) { + this.originalRecordCode = originalRecordCode; + } + + public String getOriginalRecordFile() { + return originalRecordFile; + } + + public void setOriginalRecordFile(String originalRecordFile) { + this.originalRecordFile = originalRecordFile; + } + + public String getOriginalRecordName() { + return originalRecordName; + } + + public void setOriginalRecordName(String originalRecordName) { + this.originalRecordName = originalRecordName; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSampleId() { + return sampleId; + } + + public void setSampleId(String sampleId) { + this.sampleId = sampleId; + } + + public String getTemplateId() { + return templateId; + } + + public void setTemplateId(String templateId) { + this.templateId = templateId; + } + + public String getTemplateName() { + return templateName; + } + + public void setTemplateName(String templateName) { + this.templateName = templateName; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public static class BusinessEnvRecordModel { + private String createTime; + private String createUser; + private String environmentCode; + private String humidity; + private String id; + private String isDel; + private String outputVoltage; + private String recordTime; + private String recorder; + private String remark; + private String roomNumber; + private String temperature; + private String updateTime; + private String zeroGroundVoltage; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEnvironmentCode() { + return environmentCode; + } + + public void setEnvironmentCode(String environmentCode) { + this.environmentCode = environmentCode; + } + + public String getHumidity() { + return humidity; + } + + public void setHumidity(String humidity) { + this.humidity = humidity; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String isIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getOutputVoltage() { + return outputVoltage; + } + + public void setOutputVoltage(String outputVoltage) { + this.outputVoltage = outputVoltage; + } + + public String getRecordTime() { + return recordTime; + } + + public void setRecordTime(String recordTime) { + this.recordTime = recordTime; + } + + public String getRecorder() { + return recorder; + } + + public void setRecorder(String recorder) { + this.recorder = recorder; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getRoomNumber() { + return roomNumber; + } + + public void setRoomNumber(String roomNumber) { + this.roomNumber = roomNumber; + } + + public String getTemperature() { + return temperature; + } + + public void setTemperature(String temperature) { + this.temperature = temperature; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getZeroGroundVoltage() { + return zeroGroundVoltage; + } + + public void setZeroGroundVoltage(String zeroGroundVoltage) { + this.zeroGroundVoltage = zeroGroundVoltage; + } + } + + public static class BusinessOrderModel { + private String certifications; + private String createTime; + private String createUser; + private String customerAddress; + private String customerId; + private String customerName; + private String customerNo; + private String customerPhone; + private List customerSampleInfoList; + private String deliverTime; + private String deliverer; + private String delivererId; + private String delivererTel; + private String id; + private String isDel; + private String isUrgent; + private String minioFileName; + private String orderCode; + private String orderTime; + private String planDeliverTime; + private String remark; + private String requireOverTime; + private String status; + private String updateTime; + private String updateUser; + + public String getCertifications() { + return certifications; + } + + public void setCertifications(String certifications) { + this.certifications = certifications; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCustomerAddress() { + return customerAddress; + } + + public void setCustomerAddress(String customerAddress) { + this.customerAddress = customerAddress; + } + + public String getCustomerId() { + return customerId; + } + + public void setCustomerId(String customerId) { + this.customerId = customerId; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public String getCustomerPhone() { + return customerPhone; + } + + public void setCustomerPhone(String customerPhone) { + this.customerPhone = customerPhone; + } + + public List getCustomerSampleInfoList() { + return customerSampleInfoList; + } + + public void setCustomerSampleInfoList(List customerSampleInfoList) { + this.customerSampleInfoList = customerSampleInfoList; + } + + public String getDeliverTime() { + return deliverTime; + } + + public void setDeliverTime(String deliverTime) { + this.deliverTime = deliverTime; + } + + public String getDeliverer() { + return deliverer; + } + + public void setDeliverer(String deliverer) { + this.deliverer = deliverer; + } + + public String getDelivererId() { + return delivererId; + } + + public void setDelivererId(String delivererId) { + this.delivererId = delivererId; + } + + public String getDelivererTel() { + return delivererTel; + } + + public void setDelivererTel(String delivererTel) { + this.delivererTel = delivererTel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIsUrgent() { + return isUrgent; + } + + public void setIsUrgent(String isUrgent) { + this.isUrgent = isUrgent; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getOrderCode() { + return orderCode; + } + + public void setOrderCode(String orderCode) { + this.orderCode = orderCode; + } + + public String getOrderTime() { + return orderTime; + } + + public void setOrderTime(String orderTime) { + this.orderTime = orderTime; + } + + public String getPlanDeliverTime() { + return planDeliverTime; + } + + public void setPlanDeliverTime(String planDeliverTime) { + this.planDeliverTime = planDeliverTime; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getRequireOverTime() { + return requireOverTime; + } + + public void setRequireOverTime(String requireOverTime) { + this.requireOverTime = requireOverTime; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUpdateUser() { + return updateUser; + } + + public void setUpdateUser(String updateUser) { + this.updateUser = updateUser; + } + + public static class CustomerSampleModel { + private String abc; + private String appendix; + private String appendixDescn; + private String createTime; + private String createUser; + private String customerAddress; + private String customerId; + private String customerName; + private String customerNo; + private String deliverer; + private String delivererTel; + private String id; + private String isDel; + private String isExistSample; + private String labelBind; + private String manufacturer; + private String manufacturerCountry; + private String manufacturingDate; + private String manufacturingNo; + private String measureCategory; + private String measureCategoryName; + private String measureContent; + private String measureLastTime; + private String measurePeriod; + private String measureType; + private String measureTypeName; + private String minioFileName; + private String orderId; + private String phone; + private String postalCode; + private String powerVoltage; + private String remark; + private String sampleBelong; + private String sampleBelongName; + private String sampleModel; + private String sampleName; + private String sampleNo; + private String specialRequire; + private String updateTime; + private String updateUser; + private String validDeadline; + + public String getAbc() { + return abc; + } + + public void setAbc(String abc) { + this.abc = abc; + } + + public String getAppendix() { + return appendix; + } + + public void setAppendix(String appendix) { + this.appendix = appendix; + } + + public String getAppendixDescn() { + return appendixDescn; + } + + public void setAppendixDescn(String appendixDescn) { + this.appendixDescn = appendixDescn; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCustomerAddress() { + return customerAddress; + } + + public void setCustomerAddress(String customerAddress) { + this.customerAddress = customerAddress; + } + + public String getCustomerId() { + return customerId; + } + + public void setCustomerId(String customerId) { + this.customerId = customerId; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public String getDeliverer() { + return deliverer; + } + + public void setDeliverer(String deliverer) { + this.deliverer = deliverer; + } + + public String getDelivererTel() { + return delivererTel; + } + + public void setDelivererTel(String delivererTel) { + this.delivererTel = delivererTel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIsExistSample() { + return isExistSample; + } + + public void setIsExistSample(String isExistSample) { + this.isExistSample = isExistSample; + } + + public String getLabelBind() { + return labelBind; + } + + public void setLabelBind(String labelBind) { + this.labelBind = labelBind; + } + + public String getManufacturer() { + return manufacturer; + } + + public void setManufacturer(String manufacturer) { + this.manufacturer = manufacturer; + } + + public String getManufacturerCountry() { + return manufacturerCountry; + } + + public void setManufacturerCountry(String manufacturerCountry) { + this.manufacturerCountry = manufacturerCountry; + } + + public String getManufacturingDate() { + return manufacturingDate; + } + + public void setManufacturingDate(String manufacturingDate) { + this.manufacturingDate = manufacturingDate; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getMeasureCategory() { + return measureCategory; + } + + public void setMeasureCategory(String measureCategory) { + this.measureCategory = measureCategory; + } + + public String getMeasureCategoryName() { + return measureCategoryName; + } + + public void setMeasureCategoryName(String measureCategoryName) { + this.measureCategoryName = measureCategoryName; + } + + public String getMeasureContent() { + return measureContent; + } + + public void setMeasureContent(String measureContent) { + this.measureContent = measureContent; + } + + public String getMeasureLastTime() { + return measureLastTime; + } + + public void setMeasureLastTime(String measureLastTime) { + this.measureLastTime = measureLastTime; + } + + public String getMeasurePeriod() { + return measurePeriod; + } + + public void setMeasurePeriod(String measurePeriod) { + this.measurePeriod = measurePeriod; + } + + public String getMeasureType() { + return measureType; + } + + public void setMeasureType(String measureType) { + this.measureType = measureType; + } + + public String getMeasureTypeName() { + return measureTypeName; + } + + public void setMeasureTypeName(String measureTypeName) { + this.measureTypeName = measureTypeName; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getPostalCode() { + return postalCode; + } + + public void setPostalCode(String postalCode) { + this.postalCode = postalCode; + } + + public String getPowerVoltage() { + return powerVoltage; + } + + public void setPowerVoltage(String powerVoltage) { + this.powerVoltage = powerVoltage; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSampleBelong() { + return sampleBelong; + } + + public void setSampleBelong(String sampleBelong) { + this.sampleBelong = sampleBelong; + } + + public String getSampleBelongName() { + return sampleBelongName; + } + + public void setSampleBelongName(String sampleBelongName) { + this.sampleBelongName = sampleBelongName; + } + + public String getSampleModel() { + return sampleModel; + } + + public void setSampleModel(String sampleModel) { + this.sampleModel = sampleModel; + } + + public String getSampleName() { + return sampleName; + } + + public void setSampleName(String sampleName) { + this.sampleName = sampleName; + } + + public String getSampleNo() { + return sampleNo; + } + + public void setSampleNo(String sampleNo) { + this.sampleNo = sampleNo; + } + + public String getSpecialRequire() { + return specialRequire; + } + + public void setSpecialRequire(String specialRequire) { + this.specialRequire = specialRequire; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUpdateUser() { + return updateUser; + } + + public void setUpdateUser(String updateUser) { + this.updateUser = updateUser; + } + + public String getValidDeadline() { + return validDeadline; + } + + public void setValidDeadline(String validDeadline) { + this.validDeadline = validDeadline; + } + } + } + + public static class EquipmentModel { + private String abc; + private String abcName; + private String applyRelationId; + private String assetNo; + private String assetSource; + private String assetType; + private String assetTypeName; + private String attribute; + private String capitalSource; + private String capitalSourceName; + private String cardEstablishmentDate; + private String createTime; + private String createUser; + private String depreciationMethod; + private String depreciationMethodName; + private String depreciationPeriod; + private String enableDate; + private String equipmentCategory; + private String equipmentCategoryName; + private String equipmentName; + private String equipmentNo; + private String equipmentSpecifications; + private String equipmentType; + private String equipmentTypeName; + private String fileList; + private String id; + private String installIncidentalExpenses; + private String installPlace; + private String intactState; + private String isCalibrationTestEquipment; + private String isDel; + private String isFixedAssets; + private String isMeasureAccount; + private String isStandardSupportEquipment; + private String labelBind; + private String majorCategory; + private String majorCategoryName; + private String managerLevel; + private String managerLevelName; + private String managerState; + private String managerStateName; + private String manufacturer; + private String manufacturerCountry; + private String manufacturingDate; + private String manufacturingNo; + private String mesureCycle; + private String mesureDate; + private String mesureDept; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String mesureType; + private String mesureTypeName; + private String modelNo; + private String originValue; + private String overallDimension; + private String presentOriginValue; + private String purpose; + private String remark; + private String singlePrice; + private String supportStandardEquipmentName; + private String supportStandardEquipmentNo; + private String technicalLevel; + private String uncertainty; + private String updateTime; + private String useDept; + private String useDeptName; + private String usePerson; + private String usePersonName; + private String validDate; + private String version; + private String weight; + + public String getAbc() { + return abc; + } + + public void setAbc(String abc) { + this.abc = abc; + } + + public String getAbcName() { + return abcName; + } + + public void setAbcName(String abcName) { + this.abcName = abcName; + } + + public String getApplyRelationId() { + return applyRelationId; + } + + public void setApplyRelationId(String applyRelationId) { + this.applyRelationId = applyRelationId; + } + + public String getAssetNo() { + return assetNo; + } + + public void setAssetNo(String assetNo) { + this.assetNo = assetNo; + } + + public String getAssetSource() { + return assetSource; + } + + public void setAssetSource(String assetSource) { + this.assetSource = assetSource; + } + + public String getAssetType() { + return assetType; + } + + public void setAssetType(String assetType) { + this.assetType = assetType; + } + + public String getAssetTypeName() { + return assetTypeName; + } + + public void setAssetTypeName(String assetTypeName) { + this.assetTypeName = assetTypeName; + } + + public String getAttribute() { + return attribute; + } + + public void setAttribute(String attribute) { + this.attribute = attribute; + } + + public String getCapitalSource() { + return capitalSource; + } + + public void setCapitalSource(String capitalSource) { + this.capitalSource = capitalSource; + } + + public String getCapitalSourceName() { + return capitalSourceName; + } + + public void setCapitalSourceName(String capitalSourceName) { + this.capitalSourceName = capitalSourceName; + } + + public String getCardEstablishmentDate() { + return cardEstablishmentDate; + } + + public void setCardEstablishmentDate(String cardEstablishmentDate) { + this.cardEstablishmentDate = cardEstablishmentDate; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getDepreciationMethod() { + return depreciationMethod; + } + + public void setDepreciationMethod(String depreciationMethod) { + this.depreciationMethod = depreciationMethod; + } + + public String getDepreciationMethodName() { + return depreciationMethodName; + } + + public void setDepreciationMethodName(String depreciationMethodName) { + this.depreciationMethodName = depreciationMethodName; + } + + public String getDepreciationPeriod() { + return depreciationPeriod; + } + + public void setDepreciationPeriod(String depreciationPeriod) { + this.depreciationPeriod = depreciationPeriod; + } + + public String getEnableDate() { + return enableDate; + } + + public void setEnableDate(String enableDate) { + this.enableDate = enableDate; + } + + public String getEquipmentCategory() { + return equipmentCategory; + } + + public void setEquipmentCategory(String equipmentCategory) { + this.equipmentCategory = equipmentCategory; + } + + public String getEquipmentCategoryName() { + return equipmentCategoryName; + } + + public void setEquipmentCategoryName(String equipmentCategoryName) { + this.equipmentCategoryName = equipmentCategoryName; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getEquipmentSpecifications() { + return equipmentSpecifications; + } + + public void setEquipmentSpecifications(String equipmentSpecifications) { + this.equipmentSpecifications = equipmentSpecifications; + } + + public String getEquipmentType() { + return equipmentType; + } + + public void setEquipmentType(String equipmentType) { + this.equipmentType = equipmentType; + } + + public String getEquipmentTypeName() { + return equipmentTypeName; + } + + public void setEquipmentTypeName(String equipmentTypeName) { + this.equipmentTypeName = equipmentTypeName; + } + + public String getFileList() { + return fileList; + } + + public void setFileList(String fileList) { + this.fileList = fileList; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInstallIncidentalExpenses() { + return installIncidentalExpenses; + } + + public void setInstallIncidentalExpenses(String installIncidentalExpenses) { + this.installIncidentalExpenses = installIncidentalExpenses; + } + + public String getInstallPlace() { + return installPlace; + } + + public void setInstallPlace(String installPlace) { + this.installPlace = installPlace; + } + + public String getIntactState() { + return intactState; + } + + public void setIntactState(String intactState) { + this.intactState = intactState; + } + + public String getIsCalibrationTestEquipment() { + return isCalibrationTestEquipment; + } + + public void setIsCalibrationTestEquipment(String isCalibrationTestEquipment) { + this.isCalibrationTestEquipment = isCalibrationTestEquipment; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIsFixedAssets() { + return isFixedAssets; + } + + public void setIsFixedAssets(String isFixedAssets) { + this.isFixedAssets = isFixedAssets; + } + + public String getIsMeasureAccount() { + return isMeasureAccount; + } + + public void setIsMeasureAccount(String isMeasureAccount) { + this.isMeasureAccount = isMeasureAccount; + } + + public String getIsStandardSupportEquipment() { + return isStandardSupportEquipment; + } + + public void setIsStandardSupportEquipment(String isStandardSupportEquipment) { + this.isStandardSupportEquipment = isStandardSupportEquipment; + } + + public String getLabelBind() { + return labelBind; + } + + public void setLabelBind(String labelBind) { + this.labelBind = labelBind; + } + + public String getMajorCategory() { + return majorCategory; + } + + public void setMajorCategory(String majorCategory) { + this.majorCategory = majorCategory; + } + + public String getMajorCategoryName() { + return majorCategoryName; + } + + public void setMajorCategoryName(String majorCategoryName) { + this.majorCategoryName = majorCategoryName; + } + + public String getManagerLevel() { + return managerLevel; + } + + public void setManagerLevel(String managerLevel) { + this.managerLevel = managerLevel; + } + + public String getManagerLevelName() { + return managerLevelName; + } + + public void setManagerLevelName(String managerLevelName) { + this.managerLevelName = managerLevelName; + } + + public String getManagerState() { + return managerState; + } + + public void setManagerState(String managerState) { + this.managerState = managerState; + } + + public String getManagerStateName() { + return managerStateName; + } + + public void setManagerStateName(String managerStateName) { + this.managerStateName = managerStateName; + } + + public String getManufacturer() { + return manufacturer; + } + + public void setManufacturer(String manufacturer) { + this.manufacturer = manufacturer; + } + + public String getManufacturerCountry() { + return manufacturerCountry; + } + + public void setManufacturerCountry(String manufacturerCountry) { + this.manufacturerCountry = manufacturerCountry; + } + + public String getManufacturingDate() { + return manufacturingDate; + } + + public void setManufacturingDate(String manufacturingDate) { + this.manufacturingDate = manufacturingDate; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getMesureCycle() { + return mesureCycle; + } + + public void setMesureCycle(String mesureCycle) { + this.mesureCycle = mesureCycle; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureDept() { + return mesureDept; + } + + public void setMesureDept(String mesureDept) { + this.mesureDept = mesureDept; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getMesureType() { + return mesureType; + } + + public void setMesureType(String mesureType) { + this.mesureType = mesureType; + } + + public String getMesureTypeName() { + return mesureTypeName; + } + + public void setMesureTypeName(String mesureTypeName) { + this.mesureTypeName = mesureTypeName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getOriginValue() { + return originValue; + } + + public void setOriginValue(String originValue) { + this.originValue = originValue; + } + + public String getOverallDimension() { + return overallDimension; + } + + public void setOverallDimension(String overallDimension) { + this.overallDimension = overallDimension; + } + + public String getPresentOriginValue() { + return presentOriginValue; + } + + public void setPresentOriginValue(String presentOriginValue) { + this.presentOriginValue = presentOriginValue; + } + + public String getPurpose() { + return purpose; + } + + public void setPurpose(String purpose) { + this.purpose = purpose; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSinglePrice() { + return singlePrice; + } + + public void setSinglePrice(String singlePrice) { + this.singlePrice = singlePrice; + } + + public String getSupportStandardEquipmentName() { + return supportStandardEquipmentName; + } + + public void setSupportStandardEquipmentName(String supportStandardEquipmentName) { + this.supportStandardEquipmentName = supportStandardEquipmentName; + } + + public String getSupportStandardEquipmentNo() { + return supportStandardEquipmentNo; + } + + public void setSupportStandardEquipmentNo(String supportStandardEquipmentNo) { + this.supportStandardEquipmentNo = supportStandardEquipmentNo; + } + + public String getTechnicalLevel() { + return technicalLevel; + } + + public void setTechnicalLevel(String technicalLevel) { + this.technicalLevel = technicalLevel; + } + + public String getUncertainty() { + return uncertainty; + } + + public void setUncertainty(String uncertainty) { + this.uncertainty = uncertainty; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDept() { + return useDept; + } + + public void setUseDept(String useDept) { + this.useDept = useDept; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getUsePerson() { + return usePerson; + } + + public void setUsePerson(String usePerson) { + this.usePerson = usePerson; + } + + public String getUsePersonName() { + return usePersonName; + } + + public void setUsePersonName(String usePersonName) { + this.usePersonName = usePersonName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + + public String getVersion() { + return version; + } + + public void setVersion(String version) { + this.version = version; + } + + public String getWeight() { + return weight; + } + + public void setWeight(String weight) { + this.weight = weight; + } + } + + public static class FileModel { + private String approvalStatus; + private String approvalStatusName; + private String createTime; + private String createUser; + private String createUserId; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String fileType; + private String fileTypeName; + private String id; + private String isDel; + private String minioFileName; + private String processId; + private String publishTime; + private String publisher; + private String remark; + private String updateTime; + + public String getApprovalStatus() { + return approvalStatus; + } + + public void setApprovalStatus(String approvalStatus) { + this.approvalStatus = approvalStatus; + } + + public String getApprovalStatusName() { + return approvalStatusName; + } + + public void setApprovalStatusName(String approvalStatusName) { + this.approvalStatusName = approvalStatusName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCreateUserId() { + return createUserId; + } + + public void setCreateUserId(String createUserId) { + this.createUserId = createUserId; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getFileType() { + return fileType; + } + + public void setFileType(String fileType) { + this.fileType = fileType; + } + + public String getFileTypeName() { + return fileTypeName; + } + + public void setFileTypeName(String fileTypeName) { + this.fileTypeName = fileTypeName; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getPublishTime() { + return publishTime; + } + + public void setPublishTime(String publishTime) { + this.publishTime = publishTime; + } + + public String getPublisher() { + return publisher; + } + + public void setPublisher(String publisher) { + this.publisher = publisher; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + } + } + } +} diff --git a/app/build.gradle b/app/build.gradle index 5ba44f0..298f687 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -53,7 +53,8 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "XZJL_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" +// outputFileName = "XZJL_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "XZJL_" + getBuildDate() + "_Beta.apk" } } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4b914b5..ebea092 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -67,6 +67,7 @@ + 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 new file mode 100644 index 0000000..a75e566 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.certificate + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class ApprovalProcessFragment :KotlinBaseFragment(){ + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_certificate_approval_process + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt new file mode 100644 index 0000000..5882c3d --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt @@ -0,0 +1,77 @@ +package com.casic.xz.meterage.fragment.certificate + +import android.graphics.Color +import android.graphics.Paint +import android.util.Log +import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.watchAttachFile +import com.casic.xz.meterage.model.CertificateDetailModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.pengxh.kt.lite.extensions.toJson +import kotlinx.android.synthetic.main.fragment_certificate_basic_information.* + +class BasicInformationFragment(private val data: CertificateDetailModel.DataModel) : + KotlinBaseFragment() { + + override fun initData() { + val businessOriginal = data.businessOriginalRecord + + reportCodeView.text = data.certificateReportCode + originalCodeView.text = businessOriginal.originalRecordCode + checkCategoryView.text = businessOriginal.measureCategoryName + + Log.d( + "Casic", + "BasicInformationFragment => initData: ${businessOriginal.fileList.toJson()}" + ) +// basisFileView.text = businessOriginal.fileList + + val sampleInfo = businessOriginal.customerSampleInfo + sampleCodeView.text = sampleInfo.sampleNo + sampleNameView.text = sampleInfo.sampleName + manufacturingCodeView.text = sampleInfo.manufacturingNo + modelView.text = sampleInfo.sampleModel + entrustCodeView.text = sampleInfo.customerNo + entrustNameView.text = sampleInfo.customerName + entrustContactView.text = sampleInfo.phone + entrustEmailView.text = sampleInfo.postalCode + entrustAddressView.text = sampleInfo.customerAddress + senderView.text = sampleInfo.deliverer + senderContactView.text = sampleInfo.delivererTel + checkTypeView.text = sampleInfo.measureContent + remarkView.text = sampleInfo.remark + + estimateServedTimeView.text = businessOriginal.businessOrder.planDeliverTime + estimateCompleteTimeView.text = businessOriginal.businessOrder.requireOverTime + + if (data.certificateReportFile.isNullOrBlank()) { + reportFileView.text = "暂无附件" + } else { + val reportFileName = data.certificateReportFile + + reportFileView.text = reportFileName + val textPaint = reportFileView.paint + textPaint.flags = Paint.UNDERLINE_TEXT_FLAG + textPaint.isAntiAlias = true + reportFileView.setTextColor(Color.BLUE) + + reportFileView.setOnClickListener { + reportFileName.watchAttachFile(requireContext()) + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_certificate_basic_information + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt index 2f3c95c..b1df400 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt @@ -4,19 +4,24 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.addAll +import com.casic.xz.meterage.extensions.diffCurrentTime +import com.casic.xz.meterage.extensions.formatToDate import com.casic.xz.meterage.extensions.showEmptyPage -import com.casic.xz.meterage.model.CertificateModel +import com.casic.xz.meterage.model.CertificateListModel +import com.casic.xz.meterage.view.home.CertificateReportDetailActivity import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler import kotlinx.android.synthetic.main.fragment_certificate_report.* import kotlinx.android.synthetic.main.include_empty_view.* /** - * 计量法规 + * 证书报告 * * formId:ywglzsbg * */ @@ -24,8 +29,8 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var certificateViewModel: CertificateViewModel - private lateinit var certificateAdapter: NormalRecyclerAdapter - private var dataBeans: MutableList = ArrayList() + private lateinit var certificateAdapter: NormalRecyclerAdapter + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false @@ -119,40 +124,37 @@ } else { emptyView!!.hide() certificateAdapter = object : - NormalRecyclerAdapter( + NormalRecyclerAdapter( R.layout.item_certificate_rv_l, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, - item: CertificateModel.DataModel.RowsModel + item: CertificateListModel.DataModel.RowsModel ) { + val deltaT = item.createTime.diffCurrentTime() + val diffTime = if (deltaT < 24) { + "${deltaT}小时前" + } else { + item.createTime.formatToDate() + } + viewHolder.setText(R.id.reportNameView, item.certificateReportName) -// .setText(R.id.fileStateView, item.effectiveStatusName) -// .setText(R.id.remarkView, "备注：$remark") -// .setText(R.id.fileCodeView, "文件号：${item.fileNo}") -// .setText(R.id.releaseDateView, "实施时间：${item.publishTime}") -// -// if (!item.effectiveStatus.equals("1")) { -// viewHolder.setBackgroundColor( -// R.id.fileStateView, -// R.color.gray.convertColor(requireContext()) -// ) -// } + .setText(R.id.createTimeView, diffTime) + .setText(R.id.categoryView, "校验类别：${item.measureCategoryName}") + .setText(R.id.technicianView, "检定员：${item.measurePersonName}") + + viewHolder.setOnClickListener(R.id.showDetailButton) { + requireContext().navigatePageTo( + addAll(item.approvalStatus, item.id) + ) + } } } certificateRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) certificateRecyclerView.adapter = certificateAdapter - certificateAdapter.setOnItemClickedListener(object : - NormalRecyclerAdapter.OnItemClickedListener { - override fun onItemClicked( - position: Int, t: CertificateModel.DataModel.RowsModel - ) { -// requireContext().navigatePageTo(t.toJson()) - } - }) } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt new file mode 100644 index 0000000..2d5ac61 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.certificate + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class ExceptionReportFragment :KotlinBaseFragment(){ + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_certificate_exception_report + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/model/CertificateDetailModel.java b/app/src/main/java/com/casic/xz/meterage/model/CertificateDetailModel.java new file mode 100644 index 0000000..42efccd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/CertificateDetailModel.java @@ -0,0 +1,2080 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class CertificateDetailModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private String approvalSignId; + private String approvalStatus; + private String approvalStatusName; + private BusinessOriginalRecordModel businessOriginalRecord; + private String calibrationMajor; + private String calibrationMajorName; + private String certificateReportCategory; + private String certificateReportCode; + private String certificateReportFile; + private String certificateReportName; + private String createTime; + private String createUser; + private String expirationDate; + private String id; + private String isDel; + private String issuanceDate; + private String measureDeptId; + private String measurePersonId; + private String measureResult; + private String orderId; + private String originalRecordId; + private String printNum; + private String printStatus; + private String processId; + private String remark; + private String sampleId; + private String signId; + private String templateId; + private String updateTime; + + public String getApprovalSignId() { + return approvalSignId; + } + + public void setApprovalSignId(String approvalSignId) { + this.approvalSignId = approvalSignId; + } + + public String getApprovalStatus() { + return approvalStatus; + } + + public void setApprovalStatus(String approvalStatus) { + this.approvalStatus = approvalStatus; + } + + public String getApprovalStatusName() { + return approvalStatusName; + } + + public void setApprovalStatusName(String approvalStatusName) { + this.approvalStatusName = approvalStatusName; + } + + public BusinessOriginalRecordModel getBusinessOriginalRecord() { + return businessOriginalRecord; + } + + public void setBusinessOriginalRecord(BusinessOriginalRecordModel businessOriginalRecord) { + this.businessOriginalRecord = businessOriginalRecord; + } + + public String getCalibrationMajor() { + return calibrationMajor; + } + + public void setCalibrationMajor(String calibrationMajor) { + this.calibrationMajor = calibrationMajor; + } + + public String getCalibrationMajorName() { + return calibrationMajorName; + } + + public void setCalibrationMajorName(String calibrationMajorName) { + this.calibrationMajorName = calibrationMajorName; + } + + public String getCertificateReportCategory() { + return certificateReportCategory; + } + + public void setCertificateReportCategory(String certificateReportCategory) { + this.certificateReportCategory = certificateReportCategory; + } + + public String getCertificateReportCode() { + return certificateReportCode; + } + + public void setCertificateReportCode(String certificateReportCode) { + this.certificateReportCode = certificateReportCode; + } + + public String getCertificateReportFile() { + return certificateReportFile; + } + + public void setCertificateReportFile(String certificateReportFile) { + this.certificateReportFile = certificateReportFile; + } + + public String getCertificateReportName() { + return certificateReportName; + } + + public void setCertificateReportName(String certificateReportName) { + this.certificateReportName = certificateReportName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getExpirationDate() { + return expirationDate; + } + + public void setExpirationDate(String expirationDate) { + this.expirationDate = expirationDate; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String isIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIssuanceDate() { + return issuanceDate; + } + + public void setIssuanceDate(String issuanceDate) { + this.issuanceDate = issuanceDate; + } + + public String getMeasureDeptId() { + return measureDeptId; + } + + public void setMeasureDeptId(String measureDeptId) { + this.measureDeptId = measureDeptId; + } + + public String getMeasurePersonId() { + return measurePersonId; + } + + public void setMeasurePersonId(String measurePersonId) { + this.measurePersonId = measurePersonId; + } + + public String getMeasureResult() { + return measureResult; + } + + public void setMeasureResult(String measureResult) { + this.measureResult = measureResult; + } + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public String getOriginalRecordId() { + return originalRecordId; + } + + public void setOriginalRecordId(String originalRecordId) { + this.originalRecordId = originalRecordId; + } + + public String getPrintNum() { + return printNum; + } + + public void setPrintNum(String printNum) { + this.printNum = printNum; + } + + public String getPrintStatus() { + return printStatus; + } + + public void setPrintStatus(String printStatus) { + this.printStatus = printStatus; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSampleId() { + return sampleId; + } + + public void setSampleId(String sampleId) { + this.sampleId = sampleId; + } + + public String getSignId() { + return signId; + } + + public void setSignId(String signId) { + this.signId = signId; + } + + public String getTemplateId() { + return templateId; + } + + public void setTemplateId(String templateId) { + this.templateId = templateId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public static class BusinessOriginalRecordModel { + private BusinessEnvRecordModel businessEnvironmentRecord; + private BusinessOrderModel businessOrder; + private String calibrationPlace; + private String calibrationTime; + private String createTime; + private String createUser; + private BusinessOrderModel.CustomerSampleModel customerSampleInfo; + private String environmentId; + private List equipmentInfoList; + private List fileList; + private String id; + private String isDel; + private String measureCategory; + private String measureCategoryName; + private String orderId; + private String originalRecordCode; + private String originalRecordFile; + private String originalRecordName; + private String remark; + private String sampleId; + private String templateId; + private String templateName; + private String updateTime; + + public BusinessEnvRecordModel getBusinessEnvironmentRecord() { + return businessEnvironmentRecord; + } + + public void setBusinessEnvironmentRecord(BusinessEnvRecordModel businessEnvironmentRecord) { + this.businessEnvironmentRecord = businessEnvironmentRecord; + } + + public BusinessOrderModel getBusinessOrder() { + return businessOrder; + } + + public void setBusinessOrder(BusinessOrderModel businessOrder) { + this.businessOrder = businessOrder; + } + + public String getCalibrationPlace() { + return calibrationPlace; + } + + public void setCalibrationPlace(String calibrationPlace) { + this.calibrationPlace = calibrationPlace; + } + + public String getCalibrationTime() { + return calibrationTime; + } + + public void setCalibrationTime(String calibrationTime) { + this.calibrationTime = calibrationTime; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public BusinessOrderModel.CustomerSampleModel getCustomerSampleInfo() { + return customerSampleInfo; + } + + public void setCustomerSampleInfo(BusinessOrderModel.CustomerSampleModel customerSampleInfo) { + this.customerSampleInfo = customerSampleInfo; + } + + public String getEnvironmentId() { + return environmentId; + } + + public void setEnvironmentId(String environmentId) { + this.environmentId = environmentId; + } + + public List getEquipmentInfoList() { + return equipmentInfoList; + } + + public void setEquipmentInfoList(List equipmentInfoList) { + this.equipmentInfoList = equipmentInfoList; + } + + public List getFileList() { + return fileList; + } + + public void setFileList(List fileList) { + this.fileList = fileList; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String isIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getMeasureCategory() { + return measureCategory; + } + + public void setMeasureCategory(String measureCategory) { + this.measureCategory = measureCategory; + } + + public String getMeasureCategoryName() { + return measureCategoryName; + } + + public void setMeasureCategoryName(String measureCategoryName) { + this.measureCategoryName = measureCategoryName; + } + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public String getOriginalRecordCode() { + return originalRecordCode; + } + + public void setOriginalRecordCode(String originalRecordCode) { + this.originalRecordCode = originalRecordCode; + } + + public String getOriginalRecordFile() { + return originalRecordFile; + } + + public void setOriginalRecordFile(String originalRecordFile) { + this.originalRecordFile = originalRecordFile; + } + + public String getOriginalRecordName() { + return originalRecordName; + } + + public void setOriginalRecordName(String originalRecordName) { + this.originalRecordName = originalRecordName; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSampleId() { + return sampleId; + } + + public void setSampleId(String sampleId) { + this.sampleId = sampleId; + } + + public String getTemplateId() { + return templateId; + } + + public void setTemplateId(String templateId) { + this.templateId = templateId; + } + + public String getTemplateName() { + return templateName; + } + + public void setTemplateName(String templateName) { + this.templateName = templateName; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public static class BusinessEnvRecordModel { + private String createTime; + private String createUser; + private String environmentCode; + private String humidity; + private String id; + private String isDel; + private String outputVoltage; + private String recordTime; + private String recorder; + private String remark; + private String roomNumber; + private String temperature; + private String updateTime; + private String zeroGroundVoltage; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEnvironmentCode() { + return environmentCode; + } + + public void setEnvironmentCode(String environmentCode) { + this.environmentCode = environmentCode; + } + + public String getHumidity() { + return humidity; + } + + public void setHumidity(String humidity) { + this.humidity = humidity; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String isIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getOutputVoltage() { + return outputVoltage; + } + + public void setOutputVoltage(String outputVoltage) { + this.outputVoltage = outputVoltage; + } + + public String getRecordTime() { + return recordTime; + } + + public void setRecordTime(String recordTime) { + this.recordTime = recordTime; + } + + public String getRecorder() { + return recorder; + } + + public void setRecorder(String recorder) { + this.recorder = recorder; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getRoomNumber() { + return roomNumber; + } + + public void setRoomNumber(String roomNumber) { + this.roomNumber = roomNumber; + } + + public String getTemperature() { + return temperature; + } + + public void setTemperature(String temperature) { + this.temperature = temperature; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getZeroGroundVoltage() { + return zeroGroundVoltage; + } + + public void setZeroGroundVoltage(String zeroGroundVoltage) { + this.zeroGroundVoltage = zeroGroundVoltage; + } + } + + public static class BusinessOrderModel { + private String certifications; + private String createTime; + private String createUser; + private String customerAddress; + private String customerId; + private String customerName; + private String customerNo; + private String customerPhone; + private List customerSampleInfoList; + private String deliverTime; + private String deliverer; + private String delivererId; + private String delivererTel; + private String id; + private String isDel; + private String isUrgent; + private String minioFileName; + private String orderCode; + private String orderTime; + private String planDeliverTime; + private String remark; + private String requireOverTime; + private String status; + private String updateTime; + private String updateUser; + + public String getCertifications() { + return certifications; + } + + public void setCertifications(String certifications) { + this.certifications = certifications; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCustomerAddress() { + return customerAddress; + } + + public void setCustomerAddress(String customerAddress) { + this.customerAddress = customerAddress; + } + + public String getCustomerId() { + return customerId; + } + + public void setCustomerId(String customerId) { + this.customerId = customerId; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public String getCustomerPhone() { + return customerPhone; + } + + public void setCustomerPhone(String customerPhone) { + this.customerPhone = customerPhone; + } + + public List getCustomerSampleInfoList() { + return customerSampleInfoList; + } + + public void setCustomerSampleInfoList(List customerSampleInfoList) { + this.customerSampleInfoList = customerSampleInfoList; + } + + public String getDeliverTime() { + return deliverTime; + } + + public void setDeliverTime(String deliverTime) { + this.deliverTime = deliverTime; + } + + public String getDeliverer() { + return deliverer; + } + + public void setDeliverer(String deliverer) { + this.deliverer = deliverer; + } + + public String getDelivererId() { + return delivererId; + } + + public void setDelivererId(String delivererId) { + this.delivererId = delivererId; + } + + public String getDelivererTel() { + return delivererTel; + } + + public void setDelivererTel(String delivererTel) { + this.delivererTel = delivererTel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIsUrgent() { + return isUrgent; + } + + public void setIsUrgent(String isUrgent) { + this.isUrgent = isUrgent; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getOrderCode() { + return orderCode; + } + + public void setOrderCode(String orderCode) { + this.orderCode = orderCode; + } + + public String getOrderTime() { + return orderTime; + } + + public void setOrderTime(String orderTime) { + this.orderTime = orderTime; + } + + public String getPlanDeliverTime() { + return planDeliverTime; + } + + public void setPlanDeliverTime(String planDeliverTime) { + this.planDeliverTime = planDeliverTime; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getRequireOverTime() { + return requireOverTime; + } + + public void setRequireOverTime(String requireOverTime) { + this.requireOverTime = requireOverTime; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUpdateUser() { + return updateUser; + } + + public void setUpdateUser(String updateUser) { + this.updateUser = updateUser; + } + + public static class CustomerSampleModel { + private String abc; + private String appendix; + private String appendixDescn; + private String createTime; + private String createUser; + private String customerAddress; + private String customerId; + private String customerName; + private String customerNo; + private String deliverer; + private String delivererTel; + private String id; + private String isDel; + private String isExistSample; + private String labelBind; + private String manufacturer; + private String manufacturerCountry; + private String manufacturingDate; + private String manufacturingNo; + private String measureCategory; + private String measureCategoryName; + private String measureContent; + private String measureLastTime; + private String measurePeriod; + private String measureType; + private String measureTypeName; + private String minioFileName; + private String orderId; + private String phone; + private String postalCode; + private String powerVoltage; + private String remark; + private String sampleBelong; + private String sampleBelongName; + private String sampleModel; + private String sampleName; + private String sampleNo; + private String specialRequire; + private String updateTime; + private String updateUser; + private String validDeadline; + + public String getAbc() { + return abc; + } + + public void setAbc(String abc) { + this.abc = abc; + } + + public String getAppendix() { + return appendix; + } + + public void setAppendix(String appendix) { + this.appendix = appendix; + } + + public String getAppendixDescn() { + return appendixDescn; + } + + public void setAppendixDescn(String appendixDescn) { + this.appendixDescn = appendixDescn; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCustomerAddress() { + return customerAddress; + } + + public void setCustomerAddress(String customerAddress) { + this.customerAddress = customerAddress; + } + + public String getCustomerId() { + return customerId; + } + + public void setCustomerId(String customerId) { + this.customerId = customerId; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public String getDeliverer() { + return deliverer; + } + + public void setDeliverer(String deliverer) { + this.deliverer = deliverer; + } + + public String getDelivererTel() { + return delivererTel; + } + + public void setDelivererTel(String delivererTel) { + this.delivererTel = delivererTel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIsExistSample() { + return isExistSample; + } + + public void setIsExistSample(String isExistSample) { + this.isExistSample = isExistSample; + } + + public String getLabelBind() { + return labelBind; + } + + public void setLabelBind(String labelBind) { + this.labelBind = labelBind; + } + + public String getManufacturer() { + return manufacturer; + } + + public void setManufacturer(String manufacturer) { + this.manufacturer = manufacturer; + } + + public String getManufacturerCountry() { + return manufacturerCountry; + } + + public void setManufacturerCountry(String manufacturerCountry) { + this.manufacturerCountry = manufacturerCountry; + } + + public String getManufacturingDate() { + return manufacturingDate; + } + + public void setManufacturingDate(String manufacturingDate) { + this.manufacturingDate = manufacturingDate; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getMeasureCategory() { + return measureCategory; + } + + public void setMeasureCategory(String measureCategory) { + this.measureCategory = measureCategory; + } + + public String getMeasureCategoryName() { + return measureCategoryName; + } + + public void setMeasureCategoryName(String measureCategoryName) { + this.measureCategoryName = measureCategoryName; + } + + public String getMeasureContent() { + return measureContent; + } + + public void setMeasureContent(String measureContent) { + this.measureContent = measureContent; + } + + public String getMeasureLastTime() { + return measureLastTime; + } + + public void setMeasureLastTime(String measureLastTime) { + this.measureLastTime = measureLastTime; + } + + public String getMeasurePeriod() { + return measurePeriod; + } + + public void setMeasurePeriod(String measurePeriod) { + this.measurePeriod = measurePeriod; + } + + public String getMeasureType() { + return measureType; + } + + public void setMeasureType(String measureType) { + this.measureType = measureType; + } + + public String getMeasureTypeName() { + return measureTypeName; + } + + public void setMeasureTypeName(String measureTypeName) { + this.measureTypeName = measureTypeName; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getPostalCode() { + return postalCode; + } + + public void setPostalCode(String postalCode) { + this.postalCode = postalCode; + } + + public String getPowerVoltage() { + return powerVoltage; + } + + public void setPowerVoltage(String powerVoltage) { + this.powerVoltage = powerVoltage; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSampleBelong() { + return sampleBelong; + } + + public void setSampleBelong(String sampleBelong) { + this.sampleBelong = sampleBelong; + } + + public String getSampleBelongName() { + return sampleBelongName; + } + + public void setSampleBelongName(String sampleBelongName) { + this.sampleBelongName = sampleBelongName; + } + + public String getSampleModel() { + return sampleModel; + } + + public void setSampleModel(String sampleModel) { + this.sampleModel = sampleModel; + } + + public String getSampleName() { + return sampleName; + } + + public void setSampleName(String sampleName) { + this.sampleName = sampleName; + } + + public String getSampleNo() { + return sampleNo; + } + + public void setSampleNo(String sampleNo) { + this.sampleNo = sampleNo; + } + + public String getSpecialRequire() { + return specialRequire; + } + + public void setSpecialRequire(String specialRequire) { + this.specialRequire = specialRequire; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUpdateUser() { + return updateUser; + } + + public void setUpdateUser(String updateUser) { + this.updateUser = updateUser; + } + + public String getValidDeadline() { + return validDeadline; + } + + public void setValidDeadline(String validDeadline) { + this.validDeadline = validDeadline; + } + } + } + + public static class EquipmentModel { + private String abc; + private String abcName; + private String applyRelationId; + private String assetNo; + private String assetSource; + private String assetType; + private String assetTypeName; + private String attribute; + private String capitalSource; + private String capitalSourceName; + private String cardEstablishmentDate; + private String createTime; + private String createUser; + private String depreciationMethod; + private String depreciationMethodName; + private String depreciationPeriod; + private String enableDate; + private String equipmentCategory; + private String equipmentCategoryName; + private String equipmentName; + private String equipmentNo; + private String equipmentSpecifications; + private String equipmentType; + private String equipmentTypeName; + private String fileList; + private String id; + private String installIncidentalExpenses; + private String installPlace; + private String intactState; + private String isCalibrationTestEquipment; + private String isDel; + private String isFixedAssets; + private String isMeasureAccount; + private String isStandardSupportEquipment; + private String labelBind; + private String majorCategory; + private String majorCategoryName; + private String managerLevel; + private String managerLevelName; + private String managerState; + private String managerStateName; + private String manufacturer; + private String manufacturerCountry; + private String manufacturingDate; + private String manufacturingNo; + private String mesureCycle; + private String mesureDate; + private String mesureDept; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String mesureType; + private String mesureTypeName; + private String modelNo; + private String originValue; + private String overallDimension; + private String presentOriginValue; + private String purpose; + private String remark; + private String singlePrice; + private String supportStandardEquipmentName; + private String supportStandardEquipmentNo; + private String technicalLevel; + private String uncertainty; + private String updateTime; + private String useDept; + private String useDeptName; + private String usePerson; + private String usePersonName; + private String validDate; + private String version; + private String weight; + + public String getAbc() { + return abc; + } + + public void setAbc(String abc) { + this.abc = abc; + } + + public String getAbcName() { + return abcName; + } + + public void setAbcName(String abcName) { + this.abcName = abcName; + } + + public String getApplyRelationId() { + return applyRelationId; + } + + public void setApplyRelationId(String applyRelationId) { + this.applyRelationId = applyRelationId; + } + + public String getAssetNo() { + return assetNo; + } + + public void setAssetNo(String assetNo) { + this.assetNo = assetNo; + } + + public String getAssetSource() { + return assetSource; + } + + public void setAssetSource(String assetSource) { + this.assetSource = assetSource; + } + + public String getAssetType() { + return assetType; + } + + public void setAssetType(String assetType) { + this.assetType = assetType; + } + + public String getAssetTypeName() { + return assetTypeName; + } + + public void setAssetTypeName(String assetTypeName) { + this.assetTypeName = assetTypeName; + } + + public String getAttribute() { + return attribute; + } + + public void setAttribute(String attribute) { + this.attribute = attribute; + } + + public String getCapitalSource() { + return capitalSource; + } + + public void setCapitalSource(String capitalSource) { + this.capitalSource = capitalSource; + } + + public String getCapitalSourceName() { + return capitalSourceName; + } + + public void setCapitalSourceName(String capitalSourceName) { + this.capitalSourceName = capitalSourceName; + } + + public String getCardEstablishmentDate() { + return cardEstablishmentDate; + } + + public void setCardEstablishmentDate(String cardEstablishmentDate) { + this.cardEstablishmentDate = cardEstablishmentDate; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getDepreciationMethod() { + return depreciationMethod; + } + + public void setDepreciationMethod(String depreciationMethod) { + this.depreciationMethod = depreciationMethod; + } + + public String getDepreciationMethodName() { + return depreciationMethodName; + } + + public void setDepreciationMethodName(String depreciationMethodName) { + this.depreciationMethodName = depreciationMethodName; + } + + public String getDepreciationPeriod() { + return depreciationPeriod; + } + + public void setDepreciationPeriod(String depreciationPeriod) { + this.depreciationPeriod = depreciationPeriod; + } + + public String getEnableDate() { + return enableDate; + } + + public void setEnableDate(String enableDate) { + this.enableDate = enableDate; + } + + public String getEquipmentCategory() { + return equipmentCategory; + } + + public void setEquipmentCategory(String equipmentCategory) { + this.equipmentCategory = equipmentCategory; + } + + public String getEquipmentCategoryName() { + return equipmentCategoryName; + } + + public void setEquipmentCategoryName(String equipmentCategoryName) { + this.equipmentCategoryName = equipmentCategoryName; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getEquipmentSpecifications() { + return equipmentSpecifications; + } + + public void setEquipmentSpecifications(String equipmentSpecifications) { + this.equipmentSpecifications = equipmentSpecifications; + } + + public String getEquipmentType() { + return equipmentType; + } + + public void setEquipmentType(String equipmentType) { + this.equipmentType = equipmentType; + } + + public String getEquipmentTypeName() { + return equipmentTypeName; + } + + public void setEquipmentTypeName(String equipmentTypeName) { + this.equipmentTypeName = equipmentTypeName; + } + + public String getFileList() { + return fileList; + } + + public void setFileList(String fileList) { + this.fileList = fileList; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInstallIncidentalExpenses() { + return installIncidentalExpenses; + } + + public void setInstallIncidentalExpenses(String installIncidentalExpenses) { + this.installIncidentalExpenses = installIncidentalExpenses; + } + + public String getInstallPlace() { + return installPlace; + } + + public void setInstallPlace(String installPlace) { + this.installPlace = installPlace; + } + + public String getIntactState() { + return intactState; + } + + public void setIntactState(String intactState) { + this.intactState = intactState; + } + + public String getIsCalibrationTestEquipment() { + return isCalibrationTestEquipment; + } + + public void setIsCalibrationTestEquipment(String isCalibrationTestEquipment) { + this.isCalibrationTestEquipment = isCalibrationTestEquipment; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIsFixedAssets() { + return isFixedAssets; + } + + public void setIsFixedAssets(String isFixedAssets) { + this.isFixedAssets = isFixedAssets; + } + + public String getIsMeasureAccount() { + return isMeasureAccount; + } + + public void setIsMeasureAccount(String isMeasureAccount) { + this.isMeasureAccount = isMeasureAccount; + } + + public String getIsStandardSupportEquipment() { + return isStandardSupportEquipment; + } + + public void setIsStandardSupportEquipment(String isStandardSupportEquipment) { + this.isStandardSupportEquipment = isStandardSupportEquipment; + } + + public String getLabelBind() { + return labelBind; + } + + public void setLabelBind(String labelBind) { + this.labelBind = labelBind; + } + + public String getMajorCategory() { + return majorCategory; + } + + public void setMajorCategory(String majorCategory) { + this.majorCategory = majorCategory; + } + + public String getMajorCategoryName() { + return majorCategoryName; + } + + public void setMajorCategoryName(String majorCategoryName) { + this.majorCategoryName = majorCategoryName; + } + + public String getManagerLevel() { + return managerLevel; + } + + public void setManagerLevel(String managerLevel) { + this.managerLevel = managerLevel; + } + + public String getManagerLevelName() { + return managerLevelName; + } + + public void setManagerLevelName(String managerLevelName) { + this.managerLevelName = managerLevelName; + } + + public String getManagerState() { + return managerState; + } + + public void setManagerState(String managerState) { + this.managerState = managerState; + } + + public String getManagerStateName() { + return managerStateName; + } + + public void setManagerStateName(String managerStateName) { + this.managerStateName = managerStateName; + } + + public String getManufacturer() { + return manufacturer; + } + + public void setManufacturer(String manufacturer) { + this.manufacturer = manufacturer; + } + + public String getManufacturerCountry() { + return manufacturerCountry; + } + + public void setManufacturerCountry(String manufacturerCountry) { + this.manufacturerCountry = manufacturerCountry; + } + + public String getManufacturingDate() { + return manufacturingDate; + } + + public void setManufacturingDate(String manufacturingDate) { + this.manufacturingDate = manufacturingDate; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getMesureCycle() { + return mesureCycle; + } + + public void setMesureCycle(String mesureCycle) { + this.mesureCycle = mesureCycle; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureDept() { + return mesureDept; + } + + public void setMesureDept(String mesureDept) { + this.mesureDept = mesureDept; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getMesureType() { + return mesureType; + } + + public void setMesureType(String mesureType) { + this.mesureType = mesureType; + } + + public String getMesureTypeName() { + return mesureTypeName; + } + + public void setMesureTypeName(String mesureTypeName) { + this.mesureTypeName = mesureTypeName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getOriginValue() { + return originValue; + } + + public void setOriginValue(String originValue) { + this.originValue = originValue; + } + + public String getOverallDimension() { + return overallDimension; + } + + public void setOverallDimension(String overallDimension) { + this.overallDimension = overallDimension; + } + + public String getPresentOriginValue() { + return presentOriginValue; + } + + public void setPresentOriginValue(String presentOriginValue) { + this.presentOriginValue = presentOriginValue; + } + + public String getPurpose() { + return purpose; + } + + public void setPurpose(String purpose) { + this.purpose = purpose; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSinglePrice() { + return singlePrice; + } + + public void setSinglePrice(String singlePrice) { + this.singlePrice = singlePrice; + } + + public String getSupportStandardEquipmentName() { + return supportStandardEquipmentName; + } + + public void setSupportStandardEquipmentName(String supportStandardEquipmentName) { + this.supportStandardEquipmentName = supportStandardEquipmentName; + } + + public String getSupportStandardEquipmentNo() { + return supportStandardEquipmentNo; + } + + public void setSupportStandardEquipmentNo(String supportStandardEquipmentNo) { + this.supportStandardEquipmentNo = supportStandardEquipmentNo; + } + + public String getTechnicalLevel() { + return technicalLevel; + } + + public void setTechnicalLevel(String technicalLevel) { + this.technicalLevel = technicalLevel; + } + + public String getUncertainty() { + return uncertainty; + } + + public void setUncertainty(String uncertainty) { + this.uncertainty = uncertainty; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDept() { + return useDept; + } + + public void setUseDept(String useDept) { + this.useDept = useDept; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getUsePerson() { + return usePerson; + } + + public void setUsePerson(String usePerson) { + this.usePerson = usePerson; + } + + public String getUsePersonName() { + return usePersonName; + } + + public void setUsePersonName(String usePersonName) { + this.usePersonName = usePersonName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + + public String getVersion() { + return version; + } + + public void setVersion(String version) { + this.version = version; + } + + public String getWeight() { + return weight; + } + + public void setWeight(String weight) { + this.weight = weight; + } + } + + public static class FileModel { + private String approvalStatus; + private String approvalStatusName; + private String createTime; + private String createUser; + private String createUserId; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String fileType; + private String fileTypeName; + private String id; + private String isDel; + private String minioFileName; + private String processId; + private String publishTime; + private String publisher; + private String remark; + private String updateTime; + + public String getApprovalStatus() { + return approvalStatus; + } + + public void setApprovalStatus(String approvalStatus) { + this.approvalStatus = approvalStatus; + } + + public String getApprovalStatusName() { + return approvalStatusName; + } + + public void setApprovalStatusName(String approvalStatusName) { + this.approvalStatusName = approvalStatusName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCreateUserId() { + return createUserId; + } + + public void setCreateUserId(String createUserId) { + this.createUserId = createUserId; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getFileType() { + return fileType; + } + + public void setFileType(String fileType) { + this.fileType = fileType; + } + + public String getFileTypeName() { + return fileTypeName; + } + + public void setFileTypeName(String fileTypeName) { + this.fileTypeName = fileTypeName; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getPublishTime() { + return publishTime; + } + + public void setPublishTime(String publishTime) { + this.publishTime = publishTime; + } + + public String getPublisher() { + return publisher; + } + + public void setPublisher(String publisher) { + this.publisher = publisher; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/CertificateListModel.java b/app/src/main/java/com/casic/xz/meterage/model/CertificateListModel.java new file mode 100644 index 0000000..0eed915 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/CertificateListModel.java @@ -0,0 +1,229 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class CertificateListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String approvalStatus; + private String approvalStatusName; + private String calibrationMajor; + private String certificateReportCode; + private String certificateReportName; + private String createTime; + private String decisionItem; + private String id; + private String manufacturingNo; + private String measureCategory; + private String measureCategoryName; + private String measurePersonId; + private String measurePersonName; + private String orderCode; + private String processId; + private String sampleModel; + private String sampleName; + private String sampleNo; + private String taskId; + + public String getApprovalStatus() { + return approvalStatus; + } + + public void setApprovalStatus(String approvalStatus) { + this.approvalStatus = approvalStatus; + } + + public String getApprovalStatusName() { + return approvalStatusName; + } + + public void setApprovalStatusName(String approvalStatusName) { + this.approvalStatusName = approvalStatusName; + } + + public String getCalibrationMajor() { + return calibrationMajor; + } + + public void setCalibrationMajor(String calibrationMajor) { + this.calibrationMajor = calibrationMajor; + } + + public String getCertificateReportCode() { + return certificateReportCode; + } + + public void setCertificateReportCode(String certificateReportCode) { + this.certificateReportCode = certificateReportCode; + } + + public String getCertificateReportName() { + return certificateReportName; + } + + public void setCertificateReportName(String certificateReportName) { + this.certificateReportName = certificateReportName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getDecisionItem() { + return decisionItem; + } + + public void setDecisionItem(String decisionItem) { + this.decisionItem = decisionItem; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getMeasureCategory() { + return measureCategory; + } + + public void setMeasureCategory(String measureCategory) { + this.measureCategory = measureCategory; + } + + public String getMeasureCategoryName() { + return measureCategoryName; + } + + public void setMeasureCategoryName(String measureCategoryName) { + this.measureCategoryName = measureCategoryName; + } + + public String getMeasurePersonId() { + return measurePersonId; + } + + public void setMeasurePersonId(String measurePersonId) { + this.measurePersonId = measurePersonId; + } + + public String getMeasurePersonName() { + return measurePersonName; + } + + public void setMeasurePersonName(String measurePersonName) { + this.measurePersonName = measurePersonName; + } + + public String getOrderCode() { + return orderCode; + } + + public void setOrderCode(String orderCode) { + this.orderCode = orderCode; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getSampleModel() { + return sampleModel; + } + + public void setSampleModel(String sampleModel) { + this.sampleModel = sampleModel; + } + + public String getSampleName() { + return sampleName; + } + + public void setSampleName(String sampleName) { + this.sampleName = sampleName; + } + + public String getSampleNo() { + return sampleNo; + } + + public void setSampleNo(String sampleNo) { + this.sampleNo = sampleNo; + } + + public String getTaskId() { + return taskId; + } + + public void setTaskId(String taskId) { + this.taskId = taskId; + } + } + } +} diff --git a/app/build.gradle b/app/build.gradle index 5ba44f0..298f687 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -53,7 +53,8 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "XZJL_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" +// outputFileName = "XZJL_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "XZJL_" + getBuildDate() + "_Beta.apk" } } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4b914b5..ebea092 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -67,6 +67,7 @@ + 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 new file mode 100644 index 0000000..a75e566 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.certificate + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class ApprovalProcessFragment :KotlinBaseFragment(){ + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_certificate_approval_process + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt new file mode 100644 index 0000000..5882c3d --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt @@ -0,0 +1,77 @@ +package com.casic.xz.meterage.fragment.certificate + +import android.graphics.Color +import android.graphics.Paint +import android.util.Log +import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.watchAttachFile +import com.casic.xz.meterage.model.CertificateDetailModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.pengxh.kt.lite.extensions.toJson +import kotlinx.android.synthetic.main.fragment_certificate_basic_information.* + +class BasicInformationFragment(private val data: CertificateDetailModel.DataModel) : + KotlinBaseFragment() { + + override fun initData() { + val businessOriginal = data.businessOriginalRecord + + reportCodeView.text = data.certificateReportCode + originalCodeView.text = businessOriginal.originalRecordCode + checkCategoryView.text = businessOriginal.measureCategoryName + + Log.d( + "Casic", + "BasicInformationFragment => initData: ${businessOriginal.fileList.toJson()}" + ) +// basisFileView.text = businessOriginal.fileList + + val sampleInfo = businessOriginal.customerSampleInfo + sampleCodeView.text = sampleInfo.sampleNo + sampleNameView.text = sampleInfo.sampleName + manufacturingCodeView.text = sampleInfo.manufacturingNo + modelView.text = sampleInfo.sampleModel + entrustCodeView.text = sampleInfo.customerNo + entrustNameView.text = sampleInfo.customerName + entrustContactView.text = sampleInfo.phone + entrustEmailView.text = sampleInfo.postalCode + entrustAddressView.text = sampleInfo.customerAddress + senderView.text = sampleInfo.deliverer + senderContactView.text = sampleInfo.delivererTel + checkTypeView.text = sampleInfo.measureContent + remarkView.text = sampleInfo.remark + + estimateServedTimeView.text = businessOriginal.businessOrder.planDeliverTime + estimateCompleteTimeView.text = businessOriginal.businessOrder.requireOverTime + + if (data.certificateReportFile.isNullOrBlank()) { + reportFileView.text = "暂无附件" + } else { + val reportFileName = data.certificateReportFile + + reportFileView.text = reportFileName + val textPaint = reportFileView.paint + textPaint.flags = Paint.UNDERLINE_TEXT_FLAG + textPaint.isAntiAlias = true + reportFileView.setTextColor(Color.BLUE) + + reportFileView.setOnClickListener { + reportFileName.watchAttachFile(requireContext()) + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_certificate_basic_information + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt index 2f3c95c..b1df400 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt @@ -4,19 +4,24 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.addAll +import com.casic.xz.meterage.extensions.diffCurrentTime +import com.casic.xz.meterage.extensions.formatToDate import com.casic.xz.meterage.extensions.showEmptyPage -import com.casic.xz.meterage.model.CertificateModel +import com.casic.xz.meterage.model.CertificateListModel +import com.casic.xz.meterage.view.home.CertificateReportDetailActivity import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler import kotlinx.android.synthetic.main.fragment_certificate_report.* import kotlinx.android.synthetic.main.include_empty_view.* /** - * 计量法规 + * 证书报告 * * formId:ywglzsbg * */ @@ -24,8 +29,8 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var certificateViewModel: CertificateViewModel - private lateinit var certificateAdapter: NormalRecyclerAdapter - private var dataBeans: MutableList = ArrayList() + private lateinit var certificateAdapter: NormalRecyclerAdapter + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false @@ -119,40 +124,37 @@ } else { emptyView!!.hide() certificateAdapter = object : - NormalRecyclerAdapter( + NormalRecyclerAdapter( R.layout.item_certificate_rv_l, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, - item: CertificateModel.DataModel.RowsModel + item: CertificateListModel.DataModel.RowsModel ) { + val deltaT = item.createTime.diffCurrentTime() + val diffTime = if (deltaT < 24) { + "${deltaT}小时前" + } else { + item.createTime.formatToDate() + } + viewHolder.setText(R.id.reportNameView, item.certificateReportName) -// .setText(R.id.fileStateView, item.effectiveStatusName) -// .setText(R.id.remarkView, "备注：$remark") -// .setText(R.id.fileCodeView, "文件号：${item.fileNo}") -// .setText(R.id.releaseDateView, "实施时间：${item.publishTime}") -// -// if (!item.effectiveStatus.equals("1")) { -// viewHolder.setBackgroundColor( -// R.id.fileStateView, -// R.color.gray.convertColor(requireContext()) -// ) -// } + .setText(R.id.createTimeView, diffTime) + .setText(R.id.categoryView, "校验类别：${item.measureCategoryName}") + .setText(R.id.technicianView, "检定员：${item.measurePersonName}") + + viewHolder.setOnClickListener(R.id.showDetailButton) { + requireContext().navigatePageTo( + addAll(item.approvalStatus, item.id) + ) + } } } certificateRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) certificateRecyclerView.adapter = certificateAdapter - certificateAdapter.setOnItemClickedListener(object : - NormalRecyclerAdapter.OnItemClickedListener { - override fun onItemClicked( - position: Int, t: CertificateModel.DataModel.RowsModel - ) { -// requireContext().navigatePageTo(t.toJson()) - } - }) } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt new file mode 100644 index 0000000..2d5ac61 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.certificate + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class ExceptionReportFragment :KotlinBaseFragment(){ + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_certificate_exception_report + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/model/CertificateDetailModel.java b/app/src/main/java/com/casic/xz/meterage/model/CertificateDetailModel.java new file mode 100644 index 0000000..42efccd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/CertificateDetailModel.java @@ -0,0 +1,2080 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class CertificateDetailModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private String approvalSignId; + private String approvalStatus; + private String approvalStatusName; + private BusinessOriginalRecordModel businessOriginalRecord; + private String calibrationMajor; + private String calibrationMajorName; + private String certificateReportCategory; + private String certificateReportCode; + private String certificateReportFile; + private String certificateReportName; + private String createTime; + private String createUser; + private String expirationDate; + private String id; + private String isDel; + private String issuanceDate; + private String measureDeptId; + private String measurePersonId; + private String measureResult; + private String orderId; + private String originalRecordId; + private String printNum; + private String printStatus; + private String processId; + private String remark; + private String sampleId; + private String signId; + private String templateId; + private String updateTime; + + public String getApprovalSignId() { + return approvalSignId; + } + + public void setApprovalSignId(String approvalSignId) { + this.approvalSignId = approvalSignId; + } + + public String getApprovalStatus() { + return approvalStatus; + } + + public void setApprovalStatus(String approvalStatus) { + this.approvalStatus = approvalStatus; + } + + public String getApprovalStatusName() { + return approvalStatusName; + } + + public void setApprovalStatusName(String approvalStatusName) { + this.approvalStatusName = approvalStatusName; + } + + public BusinessOriginalRecordModel getBusinessOriginalRecord() { + return businessOriginalRecord; + } + + public void setBusinessOriginalRecord(BusinessOriginalRecordModel businessOriginalRecord) { + this.businessOriginalRecord = businessOriginalRecord; + } + + public String getCalibrationMajor() { + return calibrationMajor; + } + + public void setCalibrationMajor(String calibrationMajor) { + this.calibrationMajor = calibrationMajor; + } + + public String getCalibrationMajorName() { + return calibrationMajorName; + } + + public void setCalibrationMajorName(String calibrationMajorName) { + this.calibrationMajorName = calibrationMajorName; + } + + public String getCertificateReportCategory() { + return certificateReportCategory; + } + + public void setCertificateReportCategory(String certificateReportCategory) { + this.certificateReportCategory = certificateReportCategory; + } + + public String getCertificateReportCode() { + return certificateReportCode; + } + + public void setCertificateReportCode(String certificateReportCode) { + this.certificateReportCode = certificateReportCode; + } + + public String getCertificateReportFile() { + return certificateReportFile; + } + + public void setCertificateReportFile(String certificateReportFile) { + this.certificateReportFile = certificateReportFile; + } + + public String getCertificateReportName() { + return certificateReportName; + } + + public void setCertificateReportName(String certificateReportName) { + this.certificateReportName = certificateReportName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getExpirationDate() { + return expirationDate; + } + + public void setExpirationDate(String expirationDate) { + this.expirationDate = expirationDate; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String isIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIssuanceDate() { + return issuanceDate; + } + + public void setIssuanceDate(String issuanceDate) { + this.issuanceDate = issuanceDate; + } + + public String getMeasureDeptId() { + return measureDeptId; + } + + public void setMeasureDeptId(String measureDeptId) { + this.measureDeptId = measureDeptId; + } + + public String getMeasurePersonId() { + return measurePersonId; + } + + public void setMeasurePersonId(String measurePersonId) { + this.measurePersonId = measurePersonId; + } + + public String getMeasureResult() { + return measureResult; + } + + public void setMeasureResult(String measureResult) { + this.measureResult = measureResult; + } + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public String getOriginalRecordId() { + return originalRecordId; + } + + public void setOriginalRecordId(String originalRecordId) { + this.originalRecordId = originalRecordId; + } + + public String getPrintNum() { + return printNum; + } + + public void setPrintNum(String printNum) { + this.printNum = printNum; + } + + public String getPrintStatus() { + return printStatus; + } + + public void setPrintStatus(String printStatus) { + this.printStatus = printStatus; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSampleId() { + return sampleId; + } + + public void setSampleId(String sampleId) { + this.sampleId = sampleId; + } + + public String getSignId() { + return signId; + } + + public void setSignId(String signId) { + this.signId = signId; + } + + public String getTemplateId() { + return templateId; + } + + public void setTemplateId(String templateId) { + this.templateId = templateId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public static class BusinessOriginalRecordModel { + private BusinessEnvRecordModel businessEnvironmentRecord; + private BusinessOrderModel businessOrder; + private String calibrationPlace; + private String calibrationTime; + private String createTime; + private String createUser; + private BusinessOrderModel.CustomerSampleModel customerSampleInfo; + private String environmentId; + private List equipmentInfoList; + private List fileList; + private String id; + private String isDel; + private String measureCategory; + private String measureCategoryName; + private String orderId; + private String originalRecordCode; + private String originalRecordFile; + private String originalRecordName; + private String remark; + private String sampleId; + private String templateId; + private String templateName; + private String updateTime; + + public BusinessEnvRecordModel getBusinessEnvironmentRecord() { + return businessEnvironmentRecord; + } + + public void setBusinessEnvironmentRecord(BusinessEnvRecordModel businessEnvironmentRecord) { + this.businessEnvironmentRecord = businessEnvironmentRecord; + } + + public BusinessOrderModel getBusinessOrder() { + return businessOrder; + } + + public void setBusinessOrder(BusinessOrderModel businessOrder) { + this.businessOrder = businessOrder; + } + + public String getCalibrationPlace() { + return calibrationPlace; + } + + public void setCalibrationPlace(String calibrationPlace) { + this.calibrationPlace = calibrationPlace; + } + + public String getCalibrationTime() { + return calibrationTime; + } + + public void setCalibrationTime(String calibrationTime) { + this.calibrationTime = calibrationTime; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public BusinessOrderModel.CustomerSampleModel getCustomerSampleInfo() { + return customerSampleInfo; + } + + public void setCustomerSampleInfo(BusinessOrderModel.CustomerSampleModel customerSampleInfo) { + this.customerSampleInfo = customerSampleInfo; + } + + public String getEnvironmentId() { + return environmentId; + } + + public void setEnvironmentId(String environmentId) { + this.environmentId = environmentId; + } + + public List getEquipmentInfoList() { + return equipmentInfoList; + } + + public void setEquipmentInfoList(List equipmentInfoList) { + this.equipmentInfoList = equipmentInfoList; + } + + public List getFileList() { + return fileList; + } + + public void setFileList(List fileList) { + this.fileList = fileList; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String isIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getMeasureCategory() { + return measureCategory; + } + + public void setMeasureCategory(String measureCategory) { + this.measureCategory = measureCategory; + } + + public String getMeasureCategoryName() { + return measureCategoryName; + } + + public void setMeasureCategoryName(String measureCategoryName) { + this.measureCategoryName = measureCategoryName; + } + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public String getOriginalRecordCode() { + return originalRecordCode; + } + + public void setOriginalRecordCode(String originalRecordCode) { + this.originalRecordCode = originalRecordCode; + } + + public String getOriginalRecordFile() { + return originalRecordFile; + } + + public void setOriginalRecordFile(String originalRecordFile) { + this.originalRecordFile = originalRecordFile; + } + + public String getOriginalRecordName() { + return originalRecordName; + } + + public void setOriginalRecordName(String originalRecordName) { + this.originalRecordName = originalRecordName; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSampleId() { + return sampleId; + } + + public void setSampleId(String sampleId) { + this.sampleId = sampleId; + } + + public String getTemplateId() { + return templateId; + } + + public void setTemplateId(String templateId) { + this.templateId = templateId; + } + + public String getTemplateName() { + return templateName; + } + + public void setTemplateName(String templateName) { + this.templateName = templateName; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public static class BusinessEnvRecordModel { + private String createTime; + private String createUser; + private String environmentCode; + private String humidity; + private String id; + private String isDel; + private String outputVoltage; + private String recordTime; + private String recorder; + private String remark; + private String roomNumber; + private String temperature; + private String updateTime; + private String zeroGroundVoltage; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEnvironmentCode() { + return environmentCode; + } + + public void setEnvironmentCode(String environmentCode) { + this.environmentCode = environmentCode; + } + + public String getHumidity() { + return humidity; + } + + public void setHumidity(String humidity) { + this.humidity = humidity; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String isIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getOutputVoltage() { + return outputVoltage; + } + + public void setOutputVoltage(String outputVoltage) { + this.outputVoltage = outputVoltage; + } + + public String getRecordTime() { + return recordTime; + } + + public void setRecordTime(String recordTime) { + this.recordTime = recordTime; + } + + public String getRecorder() { + return recorder; + } + + public void setRecorder(String recorder) { + this.recorder = recorder; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getRoomNumber() { + return roomNumber; + } + + public void setRoomNumber(String roomNumber) { + this.roomNumber = roomNumber; + } + + public String getTemperature() { + return temperature; + } + + public void setTemperature(String temperature) { + this.temperature = temperature; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getZeroGroundVoltage() { + return zeroGroundVoltage; + } + + public void setZeroGroundVoltage(String zeroGroundVoltage) { + this.zeroGroundVoltage = zeroGroundVoltage; + } + } + + public static class BusinessOrderModel { + private String certifications; + private String createTime; + private String createUser; + private String customerAddress; + private String customerId; + private String customerName; + private String customerNo; + private String customerPhone; + private List customerSampleInfoList; + private String deliverTime; + private String deliverer; + private String delivererId; + private String delivererTel; + private String id; + private String isDel; + private String isUrgent; + private String minioFileName; + private String orderCode; + private String orderTime; + private String planDeliverTime; + private String remark; + private String requireOverTime; + private String status; + private String updateTime; + private String updateUser; + + public String getCertifications() { + return certifications; + } + + public void setCertifications(String certifications) { + this.certifications = certifications; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCustomerAddress() { + return customerAddress; + } + + public void setCustomerAddress(String customerAddress) { + this.customerAddress = customerAddress; + } + + public String getCustomerId() { + return customerId; + } + + public void setCustomerId(String customerId) { + this.customerId = customerId; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public String getCustomerPhone() { + return customerPhone; + } + + public void setCustomerPhone(String customerPhone) { + this.customerPhone = customerPhone; + } + + public List getCustomerSampleInfoList() { + return customerSampleInfoList; + } + + public void setCustomerSampleInfoList(List customerSampleInfoList) { + this.customerSampleInfoList = customerSampleInfoList; + } + + public String getDeliverTime() { + return deliverTime; + } + + public void setDeliverTime(String deliverTime) { + this.deliverTime = deliverTime; + } + + public String getDeliverer() { + return deliverer; + } + + public void setDeliverer(String deliverer) { + this.deliverer = deliverer; + } + + public String getDelivererId() { + return delivererId; + } + + public void setDelivererId(String delivererId) { + this.delivererId = delivererId; + } + + public String getDelivererTel() { + return delivererTel; + } + + public void setDelivererTel(String delivererTel) { + this.delivererTel = delivererTel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIsUrgent() { + return isUrgent; + } + + public void setIsUrgent(String isUrgent) { + this.isUrgent = isUrgent; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getOrderCode() { + return orderCode; + } + + public void setOrderCode(String orderCode) { + this.orderCode = orderCode; + } + + public String getOrderTime() { + return orderTime; + } + + public void setOrderTime(String orderTime) { + this.orderTime = orderTime; + } + + public String getPlanDeliverTime() { + return planDeliverTime; + } + + public void setPlanDeliverTime(String planDeliverTime) { + this.planDeliverTime = planDeliverTime; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getRequireOverTime() { + return requireOverTime; + } + + public void setRequireOverTime(String requireOverTime) { + this.requireOverTime = requireOverTime; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUpdateUser() { + return updateUser; + } + + public void setUpdateUser(String updateUser) { + this.updateUser = updateUser; + } + + public static class CustomerSampleModel { + private String abc; + private String appendix; + private String appendixDescn; + private String createTime; + private String createUser; + private String customerAddress; + private String customerId; + private String customerName; + private String customerNo; + private String deliverer; + private String delivererTel; + private String id; + private String isDel; + private String isExistSample; + private String labelBind; + private String manufacturer; + private String manufacturerCountry; + private String manufacturingDate; + private String manufacturingNo; + private String measureCategory; + private String measureCategoryName; + private String measureContent; + private String measureLastTime; + private String measurePeriod; + private String measureType; + private String measureTypeName; + private String minioFileName; + private String orderId; + private String phone; + private String postalCode; + private String powerVoltage; + private String remark; + private String sampleBelong; + private String sampleBelongName; + private String sampleModel; + private String sampleName; + private String sampleNo; + private String specialRequire; + private String updateTime; + private String updateUser; + private String validDeadline; + + public String getAbc() { + return abc; + } + + public void setAbc(String abc) { + this.abc = abc; + } + + public String getAppendix() { + return appendix; + } + + public void setAppendix(String appendix) { + this.appendix = appendix; + } + + public String getAppendixDescn() { + return appendixDescn; + } + + public void setAppendixDescn(String appendixDescn) { + this.appendixDescn = appendixDescn; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCustomerAddress() { + return customerAddress; + } + + public void setCustomerAddress(String customerAddress) { + this.customerAddress = customerAddress; + } + + public String getCustomerId() { + return customerId; + } + + public void setCustomerId(String customerId) { + this.customerId = customerId; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public String getDeliverer() { + return deliverer; + } + + public void setDeliverer(String deliverer) { + this.deliverer = deliverer; + } + + public String getDelivererTel() { + return delivererTel; + } + + public void setDelivererTel(String delivererTel) { + this.delivererTel = delivererTel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIsExistSample() { + return isExistSample; + } + + public void setIsExistSample(String isExistSample) { + this.isExistSample = isExistSample; + } + + public String getLabelBind() { + return labelBind; + } + + public void setLabelBind(String labelBind) { + this.labelBind = labelBind; + } + + public String getManufacturer() { + return manufacturer; + } + + public void setManufacturer(String manufacturer) { + this.manufacturer = manufacturer; + } + + public String getManufacturerCountry() { + return manufacturerCountry; + } + + public void setManufacturerCountry(String manufacturerCountry) { + this.manufacturerCountry = manufacturerCountry; + } + + public String getManufacturingDate() { + return manufacturingDate; + } + + public void setManufacturingDate(String manufacturingDate) { + this.manufacturingDate = manufacturingDate; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getMeasureCategory() { + return measureCategory; + } + + public void setMeasureCategory(String measureCategory) { + this.measureCategory = measureCategory; + } + + public String getMeasureCategoryName() { + return measureCategoryName; + } + + public void setMeasureCategoryName(String measureCategoryName) { + this.measureCategoryName = measureCategoryName; + } + + public String getMeasureContent() { + return measureContent; + } + + public void setMeasureContent(String measureContent) { + this.measureContent = measureContent; + } + + public String getMeasureLastTime() { + return measureLastTime; + } + + public void setMeasureLastTime(String measureLastTime) { + this.measureLastTime = measureLastTime; + } + + public String getMeasurePeriod() { + return measurePeriod; + } + + public void setMeasurePeriod(String measurePeriod) { + this.measurePeriod = measurePeriod; + } + + public String getMeasureType() { + return measureType; + } + + public void setMeasureType(String measureType) { + this.measureType = measureType; + } + + public String getMeasureTypeName() { + return measureTypeName; + } + + public void setMeasureTypeName(String measureTypeName) { + this.measureTypeName = measureTypeName; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getPostalCode() { + return postalCode; + } + + public void setPostalCode(String postalCode) { + this.postalCode = postalCode; + } + + public String getPowerVoltage() { + return powerVoltage; + } + + public void setPowerVoltage(String powerVoltage) { + this.powerVoltage = powerVoltage; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSampleBelong() { + return sampleBelong; + } + + public void setSampleBelong(String sampleBelong) { + this.sampleBelong = sampleBelong; + } + + public String getSampleBelongName() { + return sampleBelongName; + } + + public void setSampleBelongName(String sampleBelongName) { + this.sampleBelongName = sampleBelongName; + } + + public String getSampleModel() { + return sampleModel; + } + + public void setSampleModel(String sampleModel) { + this.sampleModel = sampleModel; + } + + public String getSampleName() { + return sampleName; + } + + public void setSampleName(String sampleName) { + this.sampleName = sampleName; + } + + public String getSampleNo() { + return sampleNo; + } + + public void setSampleNo(String sampleNo) { + this.sampleNo = sampleNo; + } + + public String getSpecialRequire() { + return specialRequire; + } + + public void setSpecialRequire(String specialRequire) { + this.specialRequire = specialRequire; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUpdateUser() { + return updateUser; + } + + public void setUpdateUser(String updateUser) { + this.updateUser = updateUser; + } + + public String getValidDeadline() { + return validDeadline; + } + + public void setValidDeadline(String validDeadline) { + this.validDeadline = validDeadline; + } + } + } + + public static class EquipmentModel { + private String abc; + private String abcName; + private String applyRelationId; + private String assetNo; + private String assetSource; + private String assetType; + private String assetTypeName; + private String attribute; + private String capitalSource; + private String capitalSourceName; + private String cardEstablishmentDate; + private String createTime; + private String createUser; + private String depreciationMethod; + private String depreciationMethodName; + private String depreciationPeriod; + private String enableDate; + private String equipmentCategory; + private String equipmentCategoryName; + private String equipmentName; + private String equipmentNo; + private String equipmentSpecifications; + private String equipmentType; + private String equipmentTypeName; + private String fileList; + private String id; + private String installIncidentalExpenses; + private String installPlace; + private String intactState; + private String isCalibrationTestEquipment; + private String isDel; + private String isFixedAssets; + private String isMeasureAccount; + private String isStandardSupportEquipment; + private String labelBind; + private String majorCategory; + private String majorCategoryName; + private String managerLevel; + private String managerLevelName; + private String managerState; + private String managerStateName; + private String manufacturer; + private String manufacturerCountry; + private String manufacturingDate; + private String manufacturingNo; + private String mesureCycle; + private String mesureDate; + private String mesureDept; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String mesureType; + private String mesureTypeName; + private String modelNo; + private String originValue; + private String overallDimension; + private String presentOriginValue; + private String purpose; + private String remark; + private String singlePrice; + private String supportStandardEquipmentName; + private String supportStandardEquipmentNo; + private String technicalLevel; + private String uncertainty; + private String updateTime; + private String useDept; + private String useDeptName; + private String usePerson; + private String usePersonName; + private String validDate; + private String version; + private String weight; + + public String getAbc() { + return abc; + } + + public void setAbc(String abc) { + this.abc = abc; + } + + public String getAbcName() { + return abcName; + } + + public void setAbcName(String abcName) { + this.abcName = abcName; + } + + public String getApplyRelationId() { + return applyRelationId; + } + + public void setApplyRelationId(String applyRelationId) { + this.applyRelationId = applyRelationId; + } + + public String getAssetNo() { + return assetNo; + } + + public void setAssetNo(String assetNo) { + this.assetNo = assetNo; + } + + public String getAssetSource() { + return assetSource; + } + + public void setAssetSource(String assetSource) { + this.assetSource = assetSource; + } + + public String getAssetType() { + return assetType; + } + + public void setAssetType(String assetType) { + this.assetType = assetType; + } + + public String getAssetTypeName() { + return assetTypeName; + } + + public void setAssetTypeName(String assetTypeName) { + this.assetTypeName = assetTypeName; + } + + public String getAttribute() { + return attribute; + } + + public void setAttribute(String attribute) { + this.attribute = attribute; + } + + public String getCapitalSource() { + return capitalSource; + } + + public void setCapitalSource(String capitalSource) { + this.capitalSource = capitalSource; + } + + public String getCapitalSourceName() { + return capitalSourceName; + } + + public void setCapitalSourceName(String capitalSourceName) { + this.capitalSourceName = capitalSourceName; + } + + public String getCardEstablishmentDate() { + return cardEstablishmentDate; + } + + public void setCardEstablishmentDate(String cardEstablishmentDate) { + this.cardEstablishmentDate = cardEstablishmentDate; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getDepreciationMethod() { + return depreciationMethod; + } + + public void setDepreciationMethod(String depreciationMethod) { + this.depreciationMethod = depreciationMethod; + } + + public String getDepreciationMethodName() { + return depreciationMethodName; + } + + public void setDepreciationMethodName(String depreciationMethodName) { + this.depreciationMethodName = depreciationMethodName; + } + + public String getDepreciationPeriod() { + return depreciationPeriod; + } + + public void setDepreciationPeriod(String depreciationPeriod) { + this.depreciationPeriod = depreciationPeriod; + } + + public String getEnableDate() { + return enableDate; + } + + public void setEnableDate(String enableDate) { + this.enableDate = enableDate; + } + + public String getEquipmentCategory() { + return equipmentCategory; + } + + public void setEquipmentCategory(String equipmentCategory) { + this.equipmentCategory = equipmentCategory; + } + + public String getEquipmentCategoryName() { + return equipmentCategoryName; + } + + public void setEquipmentCategoryName(String equipmentCategoryName) { + this.equipmentCategoryName = equipmentCategoryName; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getEquipmentSpecifications() { + return equipmentSpecifications; + } + + public void setEquipmentSpecifications(String equipmentSpecifications) { + this.equipmentSpecifications = equipmentSpecifications; + } + + public String getEquipmentType() { + return equipmentType; + } + + public void setEquipmentType(String equipmentType) { + this.equipmentType = equipmentType; + } + + public String getEquipmentTypeName() { + return equipmentTypeName; + } + + public void setEquipmentTypeName(String equipmentTypeName) { + this.equipmentTypeName = equipmentTypeName; + } + + public String getFileList() { + return fileList; + } + + public void setFileList(String fileList) { + this.fileList = fileList; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInstallIncidentalExpenses() { + return installIncidentalExpenses; + } + + public void setInstallIncidentalExpenses(String installIncidentalExpenses) { + this.installIncidentalExpenses = installIncidentalExpenses; + } + + public String getInstallPlace() { + return installPlace; + } + + public void setInstallPlace(String installPlace) { + this.installPlace = installPlace; + } + + public String getIntactState() { + return intactState; + } + + public void setIntactState(String intactState) { + this.intactState = intactState; + } + + public String getIsCalibrationTestEquipment() { + return isCalibrationTestEquipment; + } + + public void setIsCalibrationTestEquipment(String isCalibrationTestEquipment) { + this.isCalibrationTestEquipment = isCalibrationTestEquipment; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIsFixedAssets() { + return isFixedAssets; + } + + public void setIsFixedAssets(String isFixedAssets) { + this.isFixedAssets = isFixedAssets; + } + + public String getIsMeasureAccount() { + return isMeasureAccount; + } + + public void setIsMeasureAccount(String isMeasureAccount) { + this.isMeasureAccount = isMeasureAccount; + } + + public String getIsStandardSupportEquipment() { + return isStandardSupportEquipment; + } + + public void setIsStandardSupportEquipment(String isStandardSupportEquipment) { + this.isStandardSupportEquipment = isStandardSupportEquipment; + } + + public String getLabelBind() { + return labelBind; + } + + public void setLabelBind(String labelBind) { + this.labelBind = labelBind; + } + + public String getMajorCategory() { + return majorCategory; + } + + public void setMajorCategory(String majorCategory) { + this.majorCategory = majorCategory; + } + + public String getMajorCategoryName() { + return majorCategoryName; + } + + public void setMajorCategoryName(String majorCategoryName) { + this.majorCategoryName = majorCategoryName; + } + + public String getManagerLevel() { + return managerLevel; + } + + public void setManagerLevel(String managerLevel) { + this.managerLevel = managerLevel; + } + + public String getManagerLevelName() { + return managerLevelName; + } + + public void setManagerLevelName(String managerLevelName) { + this.managerLevelName = managerLevelName; + } + + public String getManagerState() { + return managerState; + } + + public void setManagerState(String managerState) { + this.managerState = managerState; + } + + public String getManagerStateName() { + return managerStateName; + } + + public void setManagerStateName(String managerStateName) { + this.managerStateName = managerStateName; + } + + public String getManufacturer() { + return manufacturer; + } + + public void setManufacturer(String manufacturer) { + this.manufacturer = manufacturer; + } + + public String getManufacturerCountry() { + return manufacturerCountry; + } + + public void setManufacturerCountry(String manufacturerCountry) { + this.manufacturerCountry = manufacturerCountry; + } + + public String getManufacturingDate() { + return manufacturingDate; + } + + public void setManufacturingDate(String manufacturingDate) { + this.manufacturingDate = manufacturingDate; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getMesureCycle() { + return mesureCycle; + } + + public void setMesureCycle(String mesureCycle) { + this.mesureCycle = mesureCycle; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureDept() { + return mesureDept; + } + + public void setMesureDept(String mesureDept) { + this.mesureDept = mesureDept; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getMesureType() { + return mesureType; + } + + public void setMesureType(String mesureType) { + this.mesureType = mesureType; + } + + public String getMesureTypeName() { + return mesureTypeName; + } + + public void setMesureTypeName(String mesureTypeName) { + this.mesureTypeName = mesureTypeName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getOriginValue() { + return originValue; + } + + public void setOriginValue(String originValue) { + this.originValue = originValue; + } + + public String getOverallDimension() { + return overallDimension; + } + + public void setOverallDimension(String overallDimension) { + this.overallDimension = overallDimension; + } + + public String getPresentOriginValue() { + return presentOriginValue; + } + + public void setPresentOriginValue(String presentOriginValue) { + this.presentOriginValue = presentOriginValue; + } + + public String getPurpose() { + return purpose; + } + + public void setPurpose(String purpose) { + this.purpose = purpose; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSinglePrice() { + return singlePrice; + } + + public void setSinglePrice(String singlePrice) { + this.singlePrice = singlePrice; + } + + public String getSupportStandardEquipmentName() { + return supportStandardEquipmentName; + } + + public void setSupportStandardEquipmentName(String supportStandardEquipmentName) { + this.supportStandardEquipmentName = supportStandardEquipmentName; + } + + public String getSupportStandardEquipmentNo() { + return supportStandardEquipmentNo; + } + + public void setSupportStandardEquipmentNo(String supportStandardEquipmentNo) { + this.supportStandardEquipmentNo = supportStandardEquipmentNo; + } + + public String getTechnicalLevel() { + return technicalLevel; + } + + public void setTechnicalLevel(String technicalLevel) { + this.technicalLevel = technicalLevel; + } + + public String getUncertainty() { + return uncertainty; + } + + public void setUncertainty(String uncertainty) { + this.uncertainty = uncertainty; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDept() { + return useDept; + } + + public void setUseDept(String useDept) { + this.useDept = useDept; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getUsePerson() { + return usePerson; + } + + public void setUsePerson(String usePerson) { + this.usePerson = usePerson; + } + + public String getUsePersonName() { + return usePersonName; + } + + public void setUsePersonName(String usePersonName) { + this.usePersonName = usePersonName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + + public String getVersion() { + return version; + } + + public void setVersion(String version) { + this.version = version; + } + + public String getWeight() { + return weight; + } + + public void setWeight(String weight) { + this.weight = weight; + } + } + + public static class FileModel { + private String approvalStatus; + private String approvalStatusName; + private String createTime; + private String createUser; + private String createUserId; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String fileType; + private String fileTypeName; + private String id; + private String isDel; + private String minioFileName; + private String processId; + private String publishTime; + private String publisher; + private String remark; + private String updateTime; + + public String getApprovalStatus() { + return approvalStatus; + } + + public void setApprovalStatus(String approvalStatus) { + this.approvalStatus = approvalStatus; + } + + public String getApprovalStatusName() { + return approvalStatusName; + } + + public void setApprovalStatusName(String approvalStatusName) { + this.approvalStatusName = approvalStatusName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCreateUserId() { + return createUserId; + } + + public void setCreateUserId(String createUserId) { + this.createUserId = createUserId; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getFileType() { + return fileType; + } + + public void setFileType(String fileType) { + this.fileType = fileType; + } + + public String getFileTypeName() { + return fileTypeName; + } + + public void setFileTypeName(String fileTypeName) { + this.fileTypeName = fileTypeName; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getPublishTime() { + return publishTime; + } + + public void setPublishTime(String publishTime) { + this.publishTime = publishTime; + } + + public String getPublisher() { + return publisher; + } + + public void setPublisher(String publisher) { + this.publisher = publisher; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/CertificateListModel.java b/app/src/main/java/com/casic/xz/meterage/model/CertificateListModel.java new file mode 100644 index 0000000..0eed915 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/CertificateListModel.java @@ -0,0 +1,229 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class CertificateListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String approvalStatus; + private String approvalStatusName; + private String calibrationMajor; + private String certificateReportCode; + private String certificateReportName; + private String createTime; + private String decisionItem; + private String id; + private String manufacturingNo; + private String measureCategory; + private String measureCategoryName; + private String measurePersonId; + private String measurePersonName; + private String orderCode; + private String processId; + private String sampleModel; + private String sampleName; + private String sampleNo; + private String taskId; + + public String getApprovalStatus() { + return approvalStatus; + } + + public void setApprovalStatus(String approvalStatus) { + this.approvalStatus = approvalStatus; + } + + public String getApprovalStatusName() { + return approvalStatusName; + } + + public void setApprovalStatusName(String approvalStatusName) { + this.approvalStatusName = approvalStatusName; + } + + public String getCalibrationMajor() { + return calibrationMajor; + } + + public void setCalibrationMajor(String calibrationMajor) { + this.calibrationMajor = calibrationMajor; + } + + public String getCertificateReportCode() { + return certificateReportCode; + } + + public void setCertificateReportCode(String certificateReportCode) { + this.certificateReportCode = certificateReportCode; + } + + public String getCertificateReportName() { + return certificateReportName; + } + + public void setCertificateReportName(String certificateReportName) { + this.certificateReportName = certificateReportName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getDecisionItem() { + return decisionItem; + } + + public void setDecisionItem(String decisionItem) { + this.decisionItem = decisionItem; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getMeasureCategory() { + return measureCategory; + } + + public void setMeasureCategory(String measureCategory) { + this.measureCategory = measureCategory; + } + + public String getMeasureCategoryName() { + return measureCategoryName; + } + + public void setMeasureCategoryName(String measureCategoryName) { + this.measureCategoryName = measureCategoryName; + } + + public String getMeasurePersonId() { + return measurePersonId; + } + + public void setMeasurePersonId(String measurePersonId) { + this.measurePersonId = measurePersonId; + } + + public String getMeasurePersonName() { + return measurePersonName; + } + + public void setMeasurePersonName(String measurePersonName) { + this.measurePersonName = measurePersonName; + } + + public String getOrderCode() { + return orderCode; + } + + public void setOrderCode(String orderCode) { + this.orderCode = orderCode; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getSampleModel() { + return sampleModel; + } + + public void setSampleModel(String sampleModel) { + this.sampleModel = sampleModel; + } + + public String getSampleName() { + return sampleName; + } + + public void setSampleName(String sampleName) { + this.sampleName = sampleName; + } + + public String getSampleNo() { + return sampleNo; + } + + public void setSampleNo(String sampleNo) { + this.sampleNo = sampleNo; + } + + public String getTaskId() { + return taskId; + } + + public void setTaskId(String taskId) { + this.taskId = taskId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/CertificateModel.java b/app/src/main/java/com/casic/xz/meterage/model/CertificateModel.java deleted file mode 100644 index ec0d25b..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/CertificateModel.java +++ /dev/null @@ -1,202 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class CertificateModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String approvalStatus; - private String approvalStatusName; - private String calibrationMajor; - private String certificateReportCode; - private String certificateReportName; - private String createTime; - private String decisionItem; - private String id; - private String manufacturingNo; - private String measurePersonId; - private String orderCode; - private String processId; - private String sampleModel; - private String sampleName; - private String sampleNo; - private String taskId; - - public String getApprovalStatus() { - return approvalStatus; - } - - public void setApprovalStatus(String approvalStatus) { - this.approvalStatus = approvalStatus; - } - - public String getApprovalStatusName() { - return approvalStatusName; - } - - public void setApprovalStatusName(String approvalStatusName) { - this.approvalStatusName = approvalStatusName; - } - - public String getCalibrationMajor() { - return calibrationMajor; - } - - public void setCalibrationMajor(String calibrationMajor) { - this.calibrationMajor = calibrationMajor; - } - - public String getCertificateReportCode() { - return certificateReportCode; - } - - public void setCertificateReportCode(String certificateReportCode) { - this.certificateReportCode = certificateReportCode; - } - - public String getCertificateReportName() { - return certificateReportName; - } - - public void setCertificateReportName(String certificateReportName) { - this.certificateReportName = certificateReportName; - } - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getDecisionItem() { - return decisionItem; - } - - public void setDecisionItem(String decisionItem) { - this.decisionItem = decisionItem; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getManufacturingNo() { - return manufacturingNo; - } - - public void setManufacturingNo(String manufacturingNo) { - this.manufacturingNo = manufacturingNo; - } - - public String getMeasurePersonId() { - return measurePersonId; - } - - public void setMeasurePersonId(String measurePersonId) { - this.measurePersonId = measurePersonId; - } - - public String getOrderCode() { - return orderCode; - } - - public void setOrderCode(String orderCode) { - this.orderCode = orderCode; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public String getSampleModel() { - return sampleModel; - } - - public void setSampleModel(String sampleModel) { - this.sampleModel = sampleModel; - } - - public String getSampleName() { - return sampleName; - } - - public void setSampleName(String sampleName) { - this.sampleName = sampleName; - } - - public String getSampleNo() { - return sampleNo; - } - - public void setSampleNo(String sampleNo) { - this.sampleNo = sampleNo; - } - - public String getTaskId() { - return taskId; - } - - public void setTaskId(String taskId) { - this.taskId = taskId; - } - } - } -} diff --git a/app/build.gradle b/app/build.gradle index 5ba44f0..298f687 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -53,7 +53,8 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "XZJL_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" +// outputFileName = "XZJL_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "XZJL_" + getBuildDate() + "_Beta.apk" } } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4b914b5..ebea092 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -67,6 +67,7 @@ + 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 new file mode 100644 index 0000000..a75e566 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.certificate + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class ApprovalProcessFragment :KotlinBaseFragment(){ + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_certificate_approval_process + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt new file mode 100644 index 0000000..5882c3d --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt @@ -0,0 +1,77 @@ +package com.casic.xz.meterage.fragment.certificate + +import android.graphics.Color +import android.graphics.Paint +import android.util.Log +import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.watchAttachFile +import com.casic.xz.meterage.model.CertificateDetailModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.pengxh.kt.lite.extensions.toJson +import kotlinx.android.synthetic.main.fragment_certificate_basic_information.* + +class BasicInformationFragment(private val data: CertificateDetailModel.DataModel) : + KotlinBaseFragment() { + + override fun initData() { + val businessOriginal = data.businessOriginalRecord + + reportCodeView.text = data.certificateReportCode + originalCodeView.text = businessOriginal.originalRecordCode + checkCategoryView.text = businessOriginal.measureCategoryName + + Log.d( + "Casic", + "BasicInformationFragment => initData: ${businessOriginal.fileList.toJson()}" + ) +// basisFileView.text = businessOriginal.fileList + + val sampleInfo = businessOriginal.customerSampleInfo + sampleCodeView.text = sampleInfo.sampleNo + sampleNameView.text = sampleInfo.sampleName + manufacturingCodeView.text = sampleInfo.manufacturingNo + modelView.text = sampleInfo.sampleModel + entrustCodeView.text = sampleInfo.customerNo + entrustNameView.text = sampleInfo.customerName + entrustContactView.text = sampleInfo.phone + entrustEmailView.text = sampleInfo.postalCode + entrustAddressView.text = sampleInfo.customerAddress + senderView.text = sampleInfo.deliverer + senderContactView.text = sampleInfo.delivererTel + checkTypeView.text = sampleInfo.measureContent + remarkView.text = sampleInfo.remark + + estimateServedTimeView.text = businessOriginal.businessOrder.planDeliverTime + estimateCompleteTimeView.text = businessOriginal.businessOrder.requireOverTime + + if (data.certificateReportFile.isNullOrBlank()) { + reportFileView.text = "暂无附件" + } else { + val reportFileName = data.certificateReportFile + + reportFileView.text = reportFileName + val textPaint = reportFileView.paint + textPaint.flags = Paint.UNDERLINE_TEXT_FLAG + textPaint.isAntiAlias = true + reportFileView.setTextColor(Color.BLUE) + + reportFileView.setOnClickListener { + reportFileName.watchAttachFile(requireContext()) + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_certificate_basic_information + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt index 2f3c95c..b1df400 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt @@ -4,19 +4,24 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.addAll +import com.casic.xz.meterage.extensions.diffCurrentTime +import com.casic.xz.meterage.extensions.formatToDate import com.casic.xz.meterage.extensions.showEmptyPage -import com.casic.xz.meterage.model.CertificateModel +import com.casic.xz.meterage.model.CertificateListModel +import com.casic.xz.meterage.view.home.CertificateReportDetailActivity import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler import kotlinx.android.synthetic.main.fragment_certificate_report.* import kotlinx.android.synthetic.main.include_empty_view.* /** - * 计量法规 + * 证书报告 * * formId:ywglzsbg * */ @@ -24,8 +29,8 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var certificateViewModel: CertificateViewModel - private lateinit var certificateAdapter: NormalRecyclerAdapter - private var dataBeans: MutableList = ArrayList() + private lateinit var certificateAdapter: NormalRecyclerAdapter + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false @@ -119,40 +124,37 @@ } else { emptyView!!.hide() certificateAdapter = object : - NormalRecyclerAdapter( + NormalRecyclerAdapter( R.layout.item_certificate_rv_l, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, - item: CertificateModel.DataModel.RowsModel + item: CertificateListModel.DataModel.RowsModel ) { + val deltaT = item.createTime.diffCurrentTime() + val diffTime = if (deltaT < 24) { + "${deltaT}小时前" + } else { + item.createTime.formatToDate() + } + viewHolder.setText(R.id.reportNameView, item.certificateReportName) -// .setText(R.id.fileStateView, item.effectiveStatusName) -// .setText(R.id.remarkView, "备注：$remark") -// .setText(R.id.fileCodeView, "文件号：${item.fileNo}") -// .setText(R.id.releaseDateView, "实施时间：${item.publishTime}") -// -// if (!item.effectiveStatus.equals("1")) { -// viewHolder.setBackgroundColor( -// R.id.fileStateView, -// R.color.gray.convertColor(requireContext()) -// ) -// } + .setText(R.id.createTimeView, diffTime) + .setText(R.id.categoryView, "校验类别：${item.measureCategoryName}") + .setText(R.id.technicianView, "检定员：${item.measurePersonName}") + + viewHolder.setOnClickListener(R.id.showDetailButton) { + requireContext().navigatePageTo( + addAll(item.approvalStatus, item.id) + ) + } } } certificateRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) certificateRecyclerView.adapter = certificateAdapter - certificateAdapter.setOnItemClickedListener(object : - NormalRecyclerAdapter.OnItemClickedListener { - override fun onItemClicked( - position: Int, t: CertificateModel.DataModel.RowsModel - ) { -// requireContext().navigatePageTo(t.toJson()) - } - }) } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt new file mode 100644 index 0000000..2d5ac61 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.certificate + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class ExceptionReportFragment :KotlinBaseFragment(){ + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_certificate_exception_report + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/model/CertificateDetailModel.java b/app/src/main/java/com/casic/xz/meterage/model/CertificateDetailModel.java new file mode 100644 index 0000000..42efccd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/CertificateDetailModel.java @@ -0,0 +1,2080 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class CertificateDetailModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private String approvalSignId; + private String approvalStatus; + private String approvalStatusName; + private BusinessOriginalRecordModel businessOriginalRecord; + private String calibrationMajor; + private String calibrationMajorName; + private String certificateReportCategory; + private String certificateReportCode; + private String certificateReportFile; + private String certificateReportName; + private String createTime; + private String createUser; + private String expirationDate; + private String id; + private String isDel; + private String issuanceDate; + private String measureDeptId; + private String measurePersonId; + private String measureResult; + private String orderId; + private String originalRecordId; + private String printNum; + private String printStatus; + private String processId; + private String remark; + private String sampleId; + private String signId; + private String templateId; + private String updateTime; + + public String getApprovalSignId() { + return approvalSignId; + } + + public void setApprovalSignId(String approvalSignId) { + this.approvalSignId = approvalSignId; + } + + public String getApprovalStatus() { + return approvalStatus; + } + + public void setApprovalStatus(String approvalStatus) { + this.approvalStatus = approvalStatus; + } + + public String getApprovalStatusName() { + return approvalStatusName; + } + + public void setApprovalStatusName(String approvalStatusName) { + this.approvalStatusName = approvalStatusName; + } + + public BusinessOriginalRecordModel getBusinessOriginalRecord() { + return businessOriginalRecord; + } + + public void setBusinessOriginalRecord(BusinessOriginalRecordModel businessOriginalRecord) { + this.businessOriginalRecord = businessOriginalRecord; + } + + public String getCalibrationMajor() { + return calibrationMajor; + } + + public void setCalibrationMajor(String calibrationMajor) { + this.calibrationMajor = calibrationMajor; + } + + public String getCalibrationMajorName() { + return calibrationMajorName; + } + + public void setCalibrationMajorName(String calibrationMajorName) { + this.calibrationMajorName = calibrationMajorName; + } + + public String getCertificateReportCategory() { + return certificateReportCategory; + } + + public void setCertificateReportCategory(String certificateReportCategory) { + this.certificateReportCategory = certificateReportCategory; + } + + public String getCertificateReportCode() { + return certificateReportCode; + } + + public void setCertificateReportCode(String certificateReportCode) { + this.certificateReportCode = certificateReportCode; + } + + public String getCertificateReportFile() { + return certificateReportFile; + } + + public void setCertificateReportFile(String certificateReportFile) { + this.certificateReportFile = certificateReportFile; + } + + public String getCertificateReportName() { + return certificateReportName; + } + + public void setCertificateReportName(String certificateReportName) { + this.certificateReportName = certificateReportName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getExpirationDate() { + return expirationDate; + } + + public void setExpirationDate(String expirationDate) { + this.expirationDate = expirationDate; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String isIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIssuanceDate() { + return issuanceDate; + } + + public void setIssuanceDate(String issuanceDate) { + this.issuanceDate = issuanceDate; + } + + public String getMeasureDeptId() { + return measureDeptId; + } + + public void setMeasureDeptId(String measureDeptId) { + this.measureDeptId = measureDeptId; + } + + public String getMeasurePersonId() { + return measurePersonId; + } + + public void setMeasurePersonId(String measurePersonId) { + this.measurePersonId = measurePersonId; + } + + public String getMeasureResult() { + return measureResult; + } + + public void setMeasureResult(String measureResult) { + this.measureResult = measureResult; + } + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public String getOriginalRecordId() { + return originalRecordId; + } + + public void setOriginalRecordId(String originalRecordId) { + this.originalRecordId = originalRecordId; + } + + public String getPrintNum() { + return printNum; + } + + public void setPrintNum(String printNum) { + this.printNum = printNum; + } + + public String getPrintStatus() { + return printStatus; + } + + public void setPrintStatus(String printStatus) { + this.printStatus = printStatus; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSampleId() { + return sampleId; + } + + public void setSampleId(String sampleId) { + this.sampleId = sampleId; + } + + public String getSignId() { + return signId; + } + + public void setSignId(String signId) { + this.signId = signId; + } + + public String getTemplateId() { + return templateId; + } + + public void setTemplateId(String templateId) { + this.templateId = templateId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public static class BusinessOriginalRecordModel { + private BusinessEnvRecordModel businessEnvironmentRecord; + private BusinessOrderModel businessOrder; + private String calibrationPlace; + private String calibrationTime; + private String createTime; + private String createUser; + private BusinessOrderModel.CustomerSampleModel customerSampleInfo; + private String environmentId; + private List equipmentInfoList; + private List fileList; + private String id; + private String isDel; + private String measureCategory; + private String measureCategoryName; + private String orderId; + private String originalRecordCode; + private String originalRecordFile; + private String originalRecordName; + private String remark; + private String sampleId; + private String templateId; + private String templateName; + private String updateTime; + + public BusinessEnvRecordModel getBusinessEnvironmentRecord() { + return businessEnvironmentRecord; + } + + public void setBusinessEnvironmentRecord(BusinessEnvRecordModel businessEnvironmentRecord) { + this.businessEnvironmentRecord = businessEnvironmentRecord; + } + + public BusinessOrderModel getBusinessOrder() { + return businessOrder; + } + + public void setBusinessOrder(BusinessOrderModel businessOrder) { + this.businessOrder = businessOrder; + } + + public String getCalibrationPlace() { + return calibrationPlace; + } + + public void setCalibrationPlace(String calibrationPlace) { + this.calibrationPlace = calibrationPlace; + } + + public String getCalibrationTime() { + return calibrationTime; + } + + public void setCalibrationTime(String calibrationTime) { + this.calibrationTime = calibrationTime; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public BusinessOrderModel.CustomerSampleModel getCustomerSampleInfo() { + return customerSampleInfo; + } + + public void setCustomerSampleInfo(BusinessOrderModel.CustomerSampleModel customerSampleInfo) { + this.customerSampleInfo = customerSampleInfo; + } + + public String getEnvironmentId() { + return environmentId; + } + + public void setEnvironmentId(String environmentId) { + this.environmentId = environmentId; + } + + public List getEquipmentInfoList() { + return equipmentInfoList; + } + + public void setEquipmentInfoList(List equipmentInfoList) { + this.equipmentInfoList = equipmentInfoList; + } + + public List getFileList() { + return fileList; + } + + public void setFileList(List fileList) { + this.fileList = fileList; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String isIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getMeasureCategory() { + return measureCategory; + } + + public void setMeasureCategory(String measureCategory) { + this.measureCategory = measureCategory; + } + + public String getMeasureCategoryName() { + return measureCategoryName; + } + + public void setMeasureCategoryName(String measureCategoryName) { + this.measureCategoryName = measureCategoryName; + } + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public String getOriginalRecordCode() { + return originalRecordCode; + } + + public void setOriginalRecordCode(String originalRecordCode) { + this.originalRecordCode = originalRecordCode; + } + + public String getOriginalRecordFile() { + return originalRecordFile; + } + + public void setOriginalRecordFile(String originalRecordFile) { + this.originalRecordFile = originalRecordFile; + } + + public String getOriginalRecordName() { + return originalRecordName; + } + + public void setOriginalRecordName(String originalRecordName) { + this.originalRecordName = originalRecordName; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSampleId() { + return sampleId; + } + + public void setSampleId(String sampleId) { + this.sampleId = sampleId; + } + + public String getTemplateId() { + return templateId; + } + + public void setTemplateId(String templateId) { + this.templateId = templateId; + } + + public String getTemplateName() { + return templateName; + } + + public void setTemplateName(String templateName) { + this.templateName = templateName; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public static class BusinessEnvRecordModel { + private String createTime; + private String createUser; + private String environmentCode; + private String humidity; + private String id; + private String isDel; + private String outputVoltage; + private String recordTime; + private String recorder; + private String remark; + private String roomNumber; + private String temperature; + private String updateTime; + private String zeroGroundVoltage; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEnvironmentCode() { + return environmentCode; + } + + public void setEnvironmentCode(String environmentCode) { + this.environmentCode = environmentCode; + } + + public String getHumidity() { + return humidity; + } + + public void setHumidity(String humidity) { + this.humidity = humidity; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String isIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getOutputVoltage() { + return outputVoltage; + } + + public void setOutputVoltage(String outputVoltage) { + this.outputVoltage = outputVoltage; + } + + public String getRecordTime() { + return recordTime; + } + + public void setRecordTime(String recordTime) { + this.recordTime = recordTime; + } + + public String getRecorder() { + return recorder; + } + + public void setRecorder(String recorder) { + this.recorder = recorder; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getRoomNumber() { + return roomNumber; + } + + public void setRoomNumber(String roomNumber) { + this.roomNumber = roomNumber; + } + + public String getTemperature() { + return temperature; + } + + public void setTemperature(String temperature) { + this.temperature = temperature; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getZeroGroundVoltage() { + return zeroGroundVoltage; + } + + public void setZeroGroundVoltage(String zeroGroundVoltage) { + this.zeroGroundVoltage = zeroGroundVoltage; + } + } + + public static class BusinessOrderModel { + private String certifications; + private String createTime; + private String createUser; + private String customerAddress; + private String customerId; + private String customerName; + private String customerNo; + private String customerPhone; + private List customerSampleInfoList; + private String deliverTime; + private String deliverer; + private String delivererId; + private String delivererTel; + private String id; + private String isDel; + private String isUrgent; + private String minioFileName; + private String orderCode; + private String orderTime; + private String planDeliverTime; + private String remark; + private String requireOverTime; + private String status; + private String updateTime; + private String updateUser; + + public String getCertifications() { + return certifications; + } + + public void setCertifications(String certifications) { + this.certifications = certifications; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCustomerAddress() { + return customerAddress; + } + + public void setCustomerAddress(String customerAddress) { + this.customerAddress = customerAddress; + } + + public String getCustomerId() { + return customerId; + } + + public void setCustomerId(String customerId) { + this.customerId = customerId; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public String getCustomerPhone() { + return customerPhone; + } + + public void setCustomerPhone(String customerPhone) { + this.customerPhone = customerPhone; + } + + public List getCustomerSampleInfoList() { + return customerSampleInfoList; + } + + public void setCustomerSampleInfoList(List customerSampleInfoList) { + this.customerSampleInfoList = customerSampleInfoList; + } + + public String getDeliverTime() { + return deliverTime; + } + + public void setDeliverTime(String deliverTime) { + this.deliverTime = deliverTime; + } + + public String getDeliverer() { + return deliverer; + } + + public void setDeliverer(String deliverer) { + this.deliverer = deliverer; + } + + public String getDelivererId() { + return delivererId; + } + + public void setDelivererId(String delivererId) { + this.delivererId = delivererId; + } + + public String getDelivererTel() { + return delivererTel; + } + + public void setDelivererTel(String delivererTel) { + this.delivererTel = delivererTel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIsUrgent() { + return isUrgent; + } + + public void setIsUrgent(String isUrgent) { + this.isUrgent = isUrgent; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getOrderCode() { + return orderCode; + } + + public void setOrderCode(String orderCode) { + this.orderCode = orderCode; + } + + public String getOrderTime() { + return orderTime; + } + + public void setOrderTime(String orderTime) { + this.orderTime = orderTime; + } + + public String getPlanDeliverTime() { + return planDeliverTime; + } + + public void setPlanDeliverTime(String planDeliverTime) { + this.planDeliverTime = planDeliverTime; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getRequireOverTime() { + return requireOverTime; + } + + public void setRequireOverTime(String requireOverTime) { + this.requireOverTime = requireOverTime; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUpdateUser() { + return updateUser; + } + + public void setUpdateUser(String updateUser) { + this.updateUser = updateUser; + } + + public static class CustomerSampleModel { + private String abc; + private String appendix; + private String appendixDescn; + private String createTime; + private String createUser; + private String customerAddress; + private String customerId; + private String customerName; + private String customerNo; + private String deliverer; + private String delivererTel; + private String id; + private String isDel; + private String isExistSample; + private String labelBind; + private String manufacturer; + private String manufacturerCountry; + private String manufacturingDate; + private String manufacturingNo; + private String measureCategory; + private String measureCategoryName; + private String measureContent; + private String measureLastTime; + private String measurePeriod; + private String measureType; + private String measureTypeName; + private String minioFileName; + private String orderId; + private String phone; + private String postalCode; + private String powerVoltage; + private String remark; + private String sampleBelong; + private String sampleBelongName; + private String sampleModel; + private String sampleName; + private String sampleNo; + private String specialRequire; + private String updateTime; + private String updateUser; + private String validDeadline; + + public String getAbc() { + return abc; + } + + public void setAbc(String abc) { + this.abc = abc; + } + + public String getAppendix() { + return appendix; + } + + public void setAppendix(String appendix) { + this.appendix = appendix; + } + + public String getAppendixDescn() { + return appendixDescn; + } + + public void setAppendixDescn(String appendixDescn) { + this.appendixDescn = appendixDescn; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCustomerAddress() { + return customerAddress; + } + + public void setCustomerAddress(String customerAddress) { + this.customerAddress = customerAddress; + } + + public String getCustomerId() { + return customerId; + } + + public void setCustomerId(String customerId) { + this.customerId = customerId; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public String getDeliverer() { + return deliverer; + } + + public void setDeliverer(String deliverer) { + this.deliverer = deliverer; + } + + public String getDelivererTel() { + return delivererTel; + } + + public void setDelivererTel(String delivererTel) { + this.delivererTel = delivererTel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIsExistSample() { + return isExistSample; + } + + public void setIsExistSample(String isExistSample) { + this.isExistSample = isExistSample; + } + + public String getLabelBind() { + return labelBind; + } + + public void setLabelBind(String labelBind) { + this.labelBind = labelBind; + } + + public String getManufacturer() { + return manufacturer; + } + + public void setManufacturer(String manufacturer) { + this.manufacturer = manufacturer; + } + + public String getManufacturerCountry() { + return manufacturerCountry; + } + + public void setManufacturerCountry(String manufacturerCountry) { + this.manufacturerCountry = manufacturerCountry; + } + + public String getManufacturingDate() { + return manufacturingDate; + } + + public void setManufacturingDate(String manufacturingDate) { + this.manufacturingDate = manufacturingDate; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getMeasureCategory() { + return measureCategory; + } + + public void setMeasureCategory(String measureCategory) { + this.measureCategory = measureCategory; + } + + public String getMeasureCategoryName() { + return measureCategoryName; + } + + public void setMeasureCategoryName(String measureCategoryName) { + this.measureCategoryName = measureCategoryName; + } + + public String getMeasureContent() { + return measureContent; + } + + public void setMeasureContent(String measureContent) { + this.measureContent = measureContent; + } + + public String getMeasureLastTime() { + return measureLastTime; + } + + public void setMeasureLastTime(String measureLastTime) { + this.measureLastTime = measureLastTime; + } + + public String getMeasurePeriod() { + return measurePeriod; + } + + public void setMeasurePeriod(String measurePeriod) { + this.measurePeriod = measurePeriod; + } + + public String getMeasureType() { + return measureType; + } + + public void setMeasureType(String measureType) { + this.measureType = measureType; + } + + public String getMeasureTypeName() { + return measureTypeName; + } + + public void setMeasureTypeName(String measureTypeName) { + this.measureTypeName = measureTypeName; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getPostalCode() { + return postalCode; + } + + public void setPostalCode(String postalCode) { + this.postalCode = postalCode; + } + + public String getPowerVoltage() { + return powerVoltage; + } + + public void setPowerVoltage(String powerVoltage) { + this.powerVoltage = powerVoltage; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSampleBelong() { + return sampleBelong; + } + + public void setSampleBelong(String sampleBelong) { + this.sampleBelong = sampleBelong; + } + + public String getSampleBelongName() { + return sampleBelongName; + } + + public void setSampleBelongName(String sampleBelongName) { + this.sampleBelongName = sampleBelongName; + } + + public String getSampleModel() { + return sampleModel; + } + + public void setSampleModel(String sampleModel) { + this.sampleModel = sampleModel; + } + + public String getSampleName() { + return sampleName; + } + + public void setSampleName(String sampleName) { + this.sampleName = sampleName; + } + + public String getSampleNo() { + return sampleNo; + } + + public void setSampleNo(String sampleNo) { + this.sampleNo = sampleNo; + } + + public String getSpecialRequire() { + return specialRequire; + } + + public void setSpecialRequire(String specialRequire) { + this.specialRequire = specialRequire; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUpdateUser() { + return updateUser; + } + + public void setUpdateUser(String updateUser) { + this.updateUser = updateUser; + } + + public String getValidDeadline() { + return validDeadline; + } + + public void setValidDeadline(String validDeadline) { + this.validDeadline = validDeadline; + } + } + } + + public static class EquipmentModel { + private String abc; + private String abcName; + private String applyRelationId; + private String assetNo; + private String assetSource; + private String assetType; + private String assetTypeName; + private String attribute; + private String capitalSource; + private String capitalSourceName; + private String cardEstablishmentDate; + private String createTime; + private String createUser; + private String depreciationMethod; + private String depreciationMethodName; + private String depreciationPeriod; + private String enableDate; + private String equipmentCategory; + private String equipmentCategoryName; + private String equipmentName; + private String equipmentNo; + private String equipmentSpecifications; + private String equipmentType; + private String equipmentTypeName; + private String fileList; + private String id; + private String installIncidentalExpenses; + private String installPlace; + private String intactState; + private String isCalibrationTestEquipment; + private String isDel; + private String isFixedAssets; + private String isMeasureAccount; + private String isStandardSupportEquipment; + private String labelBind; + private String majorCategory; + private String majorCategoryName; + private String managerLevel; + private String managerLevelName; + private String managerState; + private String managerStateName; + private String manufacturer; + private String manufacturerCountry; + private String manufacturingDate; + private String manufacturingNo; + private String mesureCycle; + private String mesureDate; + private String mesureDept; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String mesureType; + private String mesureTypeName; + private String modelNo; + private String originValue; + private String overallDimension; + private String presentOriginValue; + private String purpose; + private String remark; + private String singlePrice; + private String supportStandardEquipmentName; + private String supportStandardEquipmentNo; + private String technicalLevel; + private String uncertainty; + private String updateTime; + private String useDept; + private String useDeptName; + private String usePerson; + private String usePersonName; + private String validDate; + private String version; + private String weight; + + public String getAbc() { + return abc; + } + + public void setAbc(String abc) { + this.abc = abc; + } + + public String getAbcName() { + return abcName; + } + + public void setAbcName(String abcName) { + this.abcName = abcName; + } + + public String getApplyRelationId() { + return applyRelationId; + } + + public void setApplyRelationId(String applyRelationId) { + this.applyRelationId = applyRelationId; + } + + public String getAssetNo() { + return assetNo; + } + + public void setAssetNo(String assetNo) { + this.assetNo = assetNo; + } + + public String getAssetSource() { + return assetSource; + } + + public void setAssetSource(String assetSource) { + this.assetSource = assetSource; + } + + public String getAssetType() { + return assetType; + } + + public void setAssetType(String assetType) { + this.assetType = assetType; + } + + public String getAssetTypeName() { + return assetTypeName; + } + + public void setAssetTypeName(String assetTypeName) { + this.assetTypeName = assetTypeName; + } + + public String getAttribute() { + return attribute; + } + + public void setAttribute(String attribute) { + this.attribute = attribute; + } + + public String getCapitalSource() { + return capitalSource; + } + + public void setCapitalSource(String capitalSource) { + this.capitalSource = capitalSource; + } + + public String getCapitalSourceName() { + return capitalSourceName; + } + + public void setCapitalSourceName(String capitalSourceName) { + this.capitalSourceName = capitalSourceName; + } + + public String getCardEstablishmentDate() { + return cardEstablishmentDate; + } + + public void setCardEstablishmentDate(String cardEstablishmentDate) { + this.cardEstablishmentDate = cardEstablishmentDate; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getDepreciationMethod() { + return depreciationMethod; + } + + public void setDepreciationMethod(String depreciationMethod) { + this.depreciationMethod = depreciationMethod; + } + + public String getDepreciationMethodName() { + return depreciationMethodName; + } + + public void setDepreciationMethodName(String depreciationMethodName) { + this.depreciationMethodName = depreciationMethodName; + } + + public String getDepreciationPeriod() { + return depreciationPeriod; + } + + public void setDepreciationPeriod(String depreciationPeriod) { + this.depreciationPeriod = depreciationPeriod; + } + + public String getEnableDate() { + return enableDate; + } + + public void setEnableDate(String enableDate) { + this.enableDate = enableDate; + } + + public String getEquipmentCategory() { + return equipmentCategory; + } + + public void setEquipmentCategory(String equipmentCategory) { + this.equipmentCategory = equipmentCategory; + } + + public String getEquipmentCategoryName() { + return equipmentCategoryName; + } + + public void setEquipmentCategoryName(String equipmentCategoryName) { + this.equipmentCategoryName = equipmentCategoryName; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getEquipmentSpecifications() { + return equipmentSpecifications; + } + + public void setEquipmentSpecifications(String equipmentSpecifications) { + this.equipmentSpecifications = equipmentSpecifications; + } + + public String getEquipmentType() { + return equipmentType; + } + + public void setEquipmentType(String equipmentType) { + this.equipmentType = equipmentType; + } + + public String getEquipmentTypeName() { + return equipmentTypeName; + } + + public void setEquipmentTypeName(String equipmentTypeName) { + this.equipmentTypeName = equipmentTypeName; + } + + public String getFileList() { + return fileList; + } + + public void setFileList(String fileList) { + this.fileList = fileList; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInstallIncidentalExpenses() { + return installIncidentalExpenses; + } + + public void setInstallIncidentalExpenses(String installIncidentalExpenses) { + this.installIncidentalExpenses = installIncidentalExpenses; + } + + public String getInstallPlace() { + return installPlace; + } + + public void setInstallPlace(String installPlace) { + this.installPlace = installPlace; + } + + public String getIntactState() { + return intactState; + } + + public void setIntactState(String intactState) { + this.intactState = intactState; + } + + public String getIsCalibrationTestEquipment() { + return isCalibrationTestEquipment; + } + + public void setIsCalibrationTestEquipment(String isCalibrationTestEquipment) { + this.isCalibrationTestEquipment = isCalibrationTestEquipment; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIsFixedAssets() { + return isFixedAssets; + } + + public void setIsFixedAssets(String isFixedAssets) { + this.isFixedAssets = isFixedAssets; + } + + public String getIsMeasureAccount() { + return isMeasureAccount; + } + + public void setIsMeasureAccount(String isMeasureAccount) { + this.isMeasureAccount = isMeasureAccount; + } + + public String getIsStandardSupportEquipment() { + return isStandardSupportEquipment; + } + + public void setIsStandardSupportEquipment(String isStandardSupportEquipment) { + this.isStandardSupportEquipment = isStandardSupportEquipment; + } + + public String getLabelBind() { + return labelBind; + } + + public void setLabelBind(String labelBind) { + this.labelBind = labelBind; + } + + public String getMajorCategory() { + return majorCategory; + } + + public void setMajorCategory(String majorCategory) { + this.majorCategory = majorCategory; + } + + public String getMajorCategoryName() { + return majorCategoryName; + } + + public void setMajorCategoryName(String majorCategoryName) { + this.majorCategoryName = majorCategoryName; + } + + public String getManagerLevel() { + return managerLevel; + } + + public void setManagerLevel(String managerLevel) { + this.managerLevel = managerLevel; + } + + public String getManagerLevelName() { + return managerLevelName; + } + + public void setManagerLevelName(String managerLevelName) { + this.managerLevelName = managerLevelName; + } + + public String getManagerState() { + return managerState; + } + + public void setManagerState(String managerState) { + this.managerState = managerState; + } + + public String getManagerStateName() { + return managerStateName; + } + + public void setManagerStateName(String managerStateName) { + this.managerStateName = managerStateName; + } + + public String getManufacturer() { + return manufacturer; + } + + public void setManufacturer(String manufacturer) { + this.manufacturer = manufacturer; + } + + public String getManufacturerCountry() { + return manufacturerCountry; + } + + public void setManufacturerCountry(String manufacturerCountry) { + this.manufacturerCountry = manufacturerCountry; + } + + public String getManufacturingDate() { + return manufacturingDate; + } + + public void setManufacturingDate(String manufacturingDate) { + this.manufacturingDate = manufacturingDate; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getMesureCycle() { + return mesureCycle; + } + + public void setMesureCycle(String mesureCycle) { + this.mesureCycle = mesureCycle; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureDept() { + return mesureDept; + } + + public void setMesureDept(String mesureDept) { + this.mesureDept = mesureDept; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getMesureType() { + return mesureType; + } + + public void setMesureType(String mesureType) { + this.mesureType = mesureType; + } + + public String getMesureTypeName() { + return mesureTypeName; + } + + public void setMesureTypeName(String mesureTypeName) { + this.mesureTypeName = mesureTypeName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getOriginValue() { + return originValue; + } + + public void setOriginValue(String originValue) { + this.originValue = originValue; + } + + public String getOverallDimension() { + return overallDimension; + } + + public void setOverallDimension(String overallDimension) { + this.overallDimension = overallDimension; + } + + public String getPresentOriginValue() { + return presentOriginValue; + } + + public void setPresentOriginValue(String presentOriginValue) { + this.presentOriginValue = presentOriginValue; + } + + public String getPurpose() { + return purpose; + } + + public void setPurpose(String purpose) { + this.purpose = purpose; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSinglePrice() { + return singlePrice; + } + + public void setSinglePrice(String singlePrice) { + this.singlePrice = singlePrice; + } + + public String getSupportStandardEquipmentName() { + return supportStandardEquipmentName; + } + + public void setSupportStandardEquipmentName(String supportStandardEquipmentName) { + this.supportStandardEquipmentName = supportStandardEquipmentName; + } + + public String getSupportStandardEquipmentNo() { + return supportStandardEquipmentNo; + } + + public void setSupportStandardEquipmentNo(String supportStandardEquipmentNo) { + this.supportStandardEquipmentNo = supportStandardEquipmentNo; + } + + public String getTechnicalLevel() { + return technicalLevel; + } + + public void setTechnicalLevel(String technicalLevel) { + this.technicalLevel = technicalLevel; + } + + public String getUncertainty() { + return uncertainty; + } + + public void setUncertainty(String uncertainty) { + this.uncertainty = uncertainty; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDept() { + return useDept; + } + + public void setUseDept(String useDept) { + this.useDept = useDept; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getUsePerson() { + return usePerson; + } + + public void setUsePerson(String usePerson) { + this.usePerson = usePerson; + } + + public String getUsePersonName() { + return usePersonName; + } + + public void setUsePersonName(String usePersonName) { + this.usePersonName = usePersonName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + + public String getVersion() { + return version; + } + + public void setVersion(String version) { + this.version = version; + } + + public String getWeight() { + return weight; + } + + public void setWeight(String weight) { + this.weight = weight; + } + } + + public static class FileModel { + private String approvalStatus; + private String approvalStatusName; + private String createTime; + private String createUser; + private String createUserId; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String fileType; + private String fileTypeName; + private String id; + private String isDel; + private String minioFileName; + private String processId; + private String publishTime; + private String publisher; + private String remark; + private String updateTime; + + public String getApprovalStatus() { + return approvalStatus; + } + + public void setApprovalStatus(String approvalStatus) { + this.approvalStatus = approvalStatus; + } + + public String getApprovalStatusName() { + return approvalStatusName; + } + + public void setApprovalStatusName(String approvalStatusName) { + this.approvalStatusName = approvalStatusName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCreateUserId() { + return createUserId; + } + + public void setCreateUserId(String createUserId) { + this.createUserId = createUserId; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getFileType() { + return fileType; + } + + public void setFileType(String fileType) { + this.fileType = fileType; + } + + public String getFileTypeName() { + return fileTypeName; + } + + public void setFileTypeName(String fileTypeName) { + this.fileTypeName = fileTypeName; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getPublishTime() { + return publishTime; + } + + public void setPublishTime(String publishTime) { + this.publishTime = publishTime; + } + + public String getPublisher() { + return publisher; + } + + public void setPublisher(String publisher) { + this.publisher = publisher; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/CertificateListModel.java b/app/src/main/java/com/casic/xz/meterage/model/CertificateListModel.java new file mode 100644 index 0000000..0eed915 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/CertificateListModel.java @@ -0,0 +1,229 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class CertificateListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String approvalStatus; + private String approvalStatusName; + private String calibrationMajor; + private String certificateReportCode; + private String certificateReportName; + private String createTime; + private String decisionItem; + private String id; + private String manufacturingNo; + private String measureCategory; + private String measureCategoryName; + private String measurePersonId; + private String measurePersonName; + private String orderCode; + private String processId; + private String sampleModel; + private String sampleName; + private String sampleNo; + private String taskId; + + public String getApprovalStatus() { + return approvalStatus; + } + + public void setApprovalStatus(String approvalStatus) { + this.approvalStatus = approvalStatus; + } + + public String getApprovalStatusName() { + return approvalStatusName; + } + + public void setApprovalStatusName(String approvalStatusName) { + this.approvalStatusName = approvalStatusName; + } + + public String getCalibrationMajor() { + return calibrationMajor; + } + + public void setCalibrationMajor(String calibrationMajor) { + this.calibrationMajor = calibrationMajor; + } + + public String getCertificateReportCode() { + return certificateReportCode; + } + + public void setCertificateReportCode(String certificateReportCode) { + this.certificateReportCode = certificateReportCode; + } + + public String getCertificateReportName() { + return certificateReportName; + } + + public void setCertificateReportName(String certificateReportName) { + this.certificateReportName = certificateReportName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getDecisionItem() { + return decisionItem; + } + + public void setDecisionItem(String decisionItem) { + this.decisionItem = decisionItem; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getMeasureCategory() { + return measureCategory; + } + + public void setMeasureCategory(String measureCategory) { + this.measureCategory = measureCategory; + } + + public String getMeasureCategoryName() { + return measureCategoryName; + } + + public void setMeasureCategoryName(String measureCategoryName) { + this.measureCategoryName = measureCategoryName; + } + + public String getMeasurePersonId() { + return measurePersonId; + } + + public void setMeasurePersonId(String measurePersonId) { + this.measurePersonId = measurePersonId; + } + + public String getMeasurePersonName() { + return measurePersonName; + } + + public void setMeasurePersonName(String measurePersonName) { + this.measurePersonName = measurePersonName; + } + + public String getOrderCode() { + return orderCode; + } + + public void setOrderCode(String orderCode) { + this.orderCode = orderCode; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getSampleModel() { + return sampleModel; + } + + public void setSampleModel(String sampleModel) { + this.sampleModel = sampleModel; + } + + public String getSampleName() { + return sampleName; + } + + public void setSampleName(String sampleName) { + this.sampleName = sampleName; + } + + public String getSampleNo() { + return sampleNo; + } + + public void setSampleNo(String sampleNo) { + this.sampleNo = sampleNo; + } + + public String getTaskId() { + return taskId; + } + + public void setTaskId(String taskId) { + this.taskId = taskId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/CertificateModel.java b/app/src/main/java/com/casic/xz/meterage/model/CertificateModel.java deleted file mode 100644 index ec0d25b..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/CertificateModel.java +++ /dev/null @@ -1,202 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class CertificateModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String approvalStatus; - private String approvalStatusName; - private String calibrationMajor; - private String certificateReportCode; - private String certificateReportName; - private String createTime; - private String decisionItem; - private String id; - private String manufacturingNo; - private String measurePersonId; - private String orderCode; - private String processId; - private String sampleModel; - private String sampleName; - private String sampleNo; - private String taskId; - - public String getApprovalStatus() { - return approvalStatus; - } - - public void setApprovalStatus(String approvalStatus) { - this.approvalStatus = approvalStatus; - } - - public String getApprovalStatusName() { - return approvalStatusName; - } - - public void setApprovalStatusName(String approvalStatusName) { - this.approvalStatusName = approvalStatusName; - } - - public String getCalibrationMajor() { - return calibrationMajor; - } - - public void setCalibrationMajor(String calibrationMajor) { - this.calibrationMajor = calibrationMajor; - } - - public String getCertificateReportCode() { - return certificateReportCode; - } - - public void setCertificateReportCode(String certificateReportCode) { - this.certificateReportCode = certificateReportCode; - } - - public String getCertificateReportName() { - return certificateReportName; - } - - public void setCertificateReportName(String certificateReportName) { - this.certificateReportName = certificateReportName; - } - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getDecisionItem() { - return decisionItem; - } - - public void setDecisionItem(String decisionItem) { - this.decisionItem = decisionItem; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getManufacturingNo() { - return manufacturingNo; - } - - public void setManufacturingNo(String manufacturingNo) { - this.manufacturingNo = manufacturingNo; - } - - public String getMeasurePersonId() { - return measurePersonId; - } - - public void setMeasurePersonId(String measurePersonId) { - this.measurePersonId = measurePersonId; - } - - public String getOrderCode() { - return orderCode; - } - - public void setOrderCode(String orderCode) { - this.orderCode = orderCode; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public String getSampleModel() { - return sampleModel; - } - - public void setSampleModel(String sampleModel) { - this.sampleModel = sampleModel; - } - - public String getSampleName() { - return sampleName; - } - - public void setSampleName(String sampleName) { - this.sampleName = sampleName; - } - - public String getSampleNo() { - return sampleNo; - } - - public void setSampleNo(String sampleNo) { - this.sampleNo = sampleNo; - } - - public String getTaskId() { - return taskId; - } - - public void setTaskId(String taskId) { - this.taskId = taskId; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index b0dec00..a4f3c46 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -345,4 +345,22 @@ @QueryMap limit: Map, @QueryMap offset: Map ): String + + /** + * 获取委托书详情 + */ + @POST("/business/certificateReport/detail") + suspend fun getCertificateReportDetail( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 提交证书 + */ + @POST("/business/certificateReport/submit") + suspend fun submit( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String } \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 5ba44f0..298f687 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -53,7 +53,8 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "XZJL_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" +// outputFileName = "XZJL_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "XZJL_" + getBuildDate() + "_Beta.apk" } } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4b914b5..ebea092 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -67,6 +67,7 @@ + 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 new file mode 100644 index 0000000..a75e566 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.certificate + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class ApprovalProcessFragment :KotlinBaseFragment(){ + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_certificate_approval_process + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt new file mode 100644 index 0000000..5882c3d --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt @@ -0,0 +1,77 @@ +package com.casic.xz.meterage.fragment.certificate + +import android.graphics.Color +import android.graphics.Paint +import android.util.Log +import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.watchAttachFile +import com.casic.xz.meterage.model.CertificateDetailModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.pengxh.kt.lite.extensions.toJson +import kotlinx.android.synthetic.main.fragment_certificate_basic_information.* + +class BasicInformationFragment(private val data: CertificateDetailModel.DataModel) : + KotlinBaseFragment() { + + override fun initData() { + val businessOriginal = data.businessOriginalRecord + + reportCodeView.text = data.certificateReportCode + originalCodeView.text = businessOriginal.originalRecordCode + checkCategoryView.text = businessOriginal.measureCategoryName + + Log.d( + "Casic", + "BasicInformationFragment => initData: ${businessOriginal.fileList.toJson()}" + ) +// basisFileView.text = businessOriginal.fileList + + val sampleInfo = businessOriginal.customerSampleInfo + sampleCodeView.text = sampleInfo.sampleNo + sampleNameView.text = sampleInfo.sampleName + manufacturingCodeView.text = sampleInfo.manufacturingNo + modelView.text = sampleInfo.sampleModel + entrustCodeView.text = sampleInfo.customerNo + entrustNameView.text = sampleInfo.customerName + entrustContactView.text = sampleInfo.phone + entrustEmailView.text = sampleInfo.postalCode + entrustAddressView.text = sampleInfo.customerAddress + senderView.text = sampleInfo.deliverer + senderContactView.text = sampleInfo.delivererTel + checkTypeView.text = sampleInfo.measureContent + remarkView.text = sampleInfo.remark + + estimateServedTimeView.text = businessOriginal.businessOrder.planDeliverTime + estimateCompleteTimeView.text = businessOriginal.businessOrder.requireOverTime + + if (data.certificateReportFile.isNullOrBlank()) { + reportFileView.text = "暂无附件" + } else { + val reportFileName = data.certificateReportFile + + reportFileView.text = reportFileName + val textPaint = reportFileView.paint + textPaint.flags = Paint.UNDERLINE_TEXT_FLAG + textPaint.isAntiAlias = true + reportFileView.setTextColor(Color.BLUE) + + reportFileView.setOnClickListener { + reportFileName.watchAttachFile(requireContext()) + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_certificate_basic_information + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt index 2f3c95c..b1df400 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt @@ -4,19 +4,24 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.addAll +import com.casic.xz.meterage.extensions.diffCurrentTime +import com.casic.xz.meterage.extensions.formatToDate import com.casic.xz.meterage.extensions.showEmptyPage -import com.casic.xz.meterage.model.CertificateModel +import com.casic.xz.meterage.model.CertificateListModel +import com.casic.xz.meterage.view.home.CertificateReportDetailActivity import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler import kotlinx.android.synthetic.main.fragment_certificate_report.* import kotlinx.android.synthetic.main.include_empty_view.* /** - * 计量法规 + * 证书报告 * * formId:ywglzsbg * */ @@ -24,8 +29,8 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var certificateViewModel: CertificateViewModel - private lateinit var certificateAdapter: NormalRecyclerAdapter - private var dataBeans: MutableList = ArrayList() + private lateinit var certificateAdapter: NormalRecyclerAdapter + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false @@ -119,40 +124,37 @@ } else { emptyView!!.hide() certificateAdapter = object : - NormalRecyclerAdapter( + NormalRecyclerAdapter( R.layout.item_certificate_rv_l, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, - item: CertificateModel.DataModel.RowsModel + item: CertificateListModel.DataModel.RowsModel ) { + val deltaT = item.createTime.diffCurrentTime() + val diffTime = if (deltaT < 24) { + "${deltaT}小时前" + } else { + item.createTime.formatToDate() + } + viewHolder.setText(R.id.reportNameView, item.certificateReportName) -// .setText(R.id.fileStateView, item.effectiveStatusName) -// .setText(R.id.remarkView, "备注：$remark") -// .setText(R.id.fileCodeView, "文件号：${item.fileNo}") -// .setText(R.id.releaseDateView, "实施时间：${item.publishTime}") -// -// if (!item.effectiveStatus.equals("1")) { -// viewHolder.setBackgroundColor( -// R.id.fileStateView, -// R.color.gray.convertColor(requireContext()) -// ) -// } + .setText(R.id.createTimeView, diffTime) + .setText(R.id.categoryView, "校验类别：${item.measureCategoryName}") + .setText(R.id.technicianView, "检定员：${item.measurePersonName}") + + viewHolder.setOnClickListener(R.id.showDetailButton) { + requireContext().navigatePageTo( + addAll(item.approvalStatus, item.id) + ) + } } } certificateRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) certificateRecyclerView.adapter = certificateAdapter - certificateAdapter.setOnItemClickedListener(object : - NormalRecyclerAdapter.OnItemClickedListener { - override fun onItemClicked( - position: Int, t: CertificateModel.DataModel.RowsModel - ) { -// requireContext().navigatePageTo(t.toJson()) - } - }) } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt new file mode 100644 index 0000000..2d5ac61 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.certificate + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class ExceptionReportFragment :KotlinBaseFragment(){ + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_certificate_exception_report + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/model/CertificateDetailModel.java b/app/src/main/java/com/casic/xz/meterage/model/CertificateDetailModel.java new file mode 100644 index 0000000..42efccd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/CertificateDetailModel.java @@ -0,0 +1,2080 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class CertificateDetailModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private String approvalSignId; + private String approvalStatus; + private String approvalStatusName; + private BusinessOriginalRecordModel businessOriginalRecord; + private String calibrationMajor; + private String calibrationMajorName; + private String certificateReportCategory; + private String certificateReportCode; + private String certificateReportFile; + private String certificateReportName; + private String createTime; + private String createUser; + private String expirationDate; + private String id; + private String isDel; + private String issuanceDate; + private String measureDeptId; + private String measurePersonId; + private String measureResult; + private String orderId; + private String originalRecordId; + private String printNum; + private String printStatus; + private String processId; + private String remark; + private String sampleId; + private String signId; + private String templateId; + private String updateTime; + + public String getApprovalSignId() { + return approvalSignId; + } + + public void setApprovalSignId(String approvalSignId) { + this.approvalSignId = approvalSignId; + } + + public String getApprovalStatus() { + return approvalStatus; + } + + public void setApprovalStatus(String approvalStatus) { + this.approvalStatus = approvalStatus; + } + + public String getApprovalStatusName() { + return approvalStatusName; + } + + public void setApprovalStatusName(String approvalStatusName) { + this.approvalStatusName = approvalStatusName; + } + + public BusinessOriginalRecordModel getBusinessOriginalRecord() { + return businessOriginalRecord; + } + + public void setBusinessOriginalRecord(BusinessOriginalRecordModel businessOriginalRecord) { + this.businessOriginalRecord = businessOriginalRecord; + } + + public String getCalibrationMajor() { + return calibrationMajor; + } + + public void setCalibrationMajor(String calibrationMajor) { + this.calibrationMajor = calibrationMajor; + } + + public String getCalibrationMajorName() { + return calibrationMajorName; + } + + public void setCalibrationMajorName(String calibrationMajorName) { + this.calibrationMajorName = calibrationMajorName; + } + + public String getCertificateReportCategory() { + return certificateReportCategory; + } + + public void setCertificateReportCategory(String certificateReportCategory) { + this.certificateReportCategory = certificateReportCategory; + } + + public String getCertificateReportCode() { + return certificateReportCode; + } + + public void setCertificateReportCode(String certificateReportCode) { + this.certificateReportCode = certificateReportCode; + } + + public String getCertificateReportFile() { + return certificateReportFile; + } + + public void setCertificateReportFile(String certificateReportFile) { + this.certificateReportFile = certificateReportFile; + } + + public String getCertificateReportName() { + return certificateReportName; + } + + public void setCertificateReportName(String certificateReportName) { + this.certificateReportName = certificateReportName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getExpirationDate() { + return expirationDate; + } + + public void setExpirationDate(String expirationDate) { + this.expirationDate = expirationDate; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String isIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIssuanceDate() { + return issuanceDate; + } + + public void setIssuanceDate(String issuanceDate) { + this.issuanceDate = issuanceDate; + } + + public String getMeasureDeptId() { + return measureDeptId; + } + + public void setMeasureDeptId(String measureDeptId) { + this.measureDeptId = measureDeptId; + } + + public String getMeasurePersonId() { + return measurePersonId; + } + + public void setMeasurePersonId(String measurePersonId) { + this.measurePersonId = measurePersonId; + } + + public String getMeasureResult() { + return measureResult; + } + + public void setMeasureResult(String measureResult) { + this.measureResult = measureResult; + } + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public String getOriginalRecordId() { + return originalRecordId; + } + + public void setOriginalRecordId(String originalRecordId) { + this.originalRecordId = originalRecordId; + } + + public String getPrintNum() { + return printNum; + } + + public void setPrintNum(String printNum) { + this.printNum = printNum; + } + + public String getPrintStatus() { + return printStatus; + } + + public void setPrintStatus(String printStatus) { + this.printStatus = printStatus; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSampleId() { + return sampleId; + } + + public void setSampleId(String sampleId) { + this.sampleId = sampleId; + } + + public String getSignId() { + return signId; + } + + public void setSignId(String signId) { + this.signId = signId; + } + + public String getTemplateId() { + return templateId; + } + + public void setTemplateId(String templateId) { + this.templateId = templateId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public static class BusinessOriginalRecordModel { + private BusinessEnvRecordModel businessEnvironmentRecord; + private BusinessOrderModel businessOrder; + private String calibrationPlace; + private String calibrationTime; + private String createTime; + private String createUser; + private BusinessOrderModel.CustomerSampleModel customerSampleInfo; + private String environmentId; + private List equipmentInfoList; + private List fileList; + private String id; + private String isDel; + private String measureCategory; + private String measureCategoryName; + private String orderId; + private String originalRecordCode; + private String originalRecordFile; + private String originalRecordName; + private String remark; + private String sampleId; + private String templateId; + private String templateName; + private String updateTime; + + public BusinessEnvRecordModel getBusinessEnvironmentRecord() { + return businessEnvironmentRecord; + } + + public void setBusinessEnvironmentRecord(BusinessEnvRecordModel businessEnvironmentRecord) { + this.businessEnvironmentRecord = businessEnvironmentRecord; + } + + public BusinessOrderModel getBusinessOrder() { + return businessOrder; + } + + public void setBusinessOrder(BusinessOrderModel businessOrder) { + this.businessOrder = businessOrder; + } + + public String getCalibrationPlace() { + return calibrationPlace; + } + + public void setCalibrationPlace(String calibrationPlace) { + this.calibrationPlace = calibrationPlace; + } + + public String getCalibrationTime() { + return calibrationTime; + } + + public void setCalibrationTime(String calibrationTime) { + this.calibrationTime = calibrationTime; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public BusinessOrderModel.CustomerSampleModel getCustomerSampleInfo() { + return customerSampleInfo; + } + + public void setCustomerSampleInfo(BusinessOrderModel.CustomerSampleModel customerSampleInfo) { + this.customerSampleInfo = customerSampleInfo; + } + + public String getEnvironmentId() { + return environmentId; + } + + public void setEnvironmentId(String environmentId) { + this.environmentId = environmentId; + } + + public List getEquipmentInfoList() { + return equipmentInfoList; + } + + public void setEquipmentInfoList(List equipmentInfoList) { + this.equipmentInfoList = equipmentInfoList; + } + + public List getFileList() { + return fileList; + } + + public void setFileList(List fileList) { + this.fileList = fileList; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String isIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getMeasureCategory() { + return measureCategory; + } + + public void setMeasureCategory(String measureCategory) { + this.measureCategory = measureCategory; + } + + public String getMeasureCategoryName() { + return measureCategoryName; + } + + public void setMeasureCategoryName(String measureCategoryName) { + this.measureCategoryName = measureCategoryName; + } + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public String getOriginalRecordCode() { + return originalRecordCode; + } + + public void setOriginalRecordCode(String originalRecordCode) { + this.originalRecordCode = originalRecordCode; + } + + public String getOriginalRecordFile() { + return originalRecordFile; + } + + public void setOriginalRecordFile(String originalRecordFile) { + this.originalRecordFile = originalRecordFile; + } + + public String getOriginalRecordName() { + return originalRecordName; + } + + public void setOriginalRecordName(String originalRecordName) { + this.originalRecordName = originalRecordName; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSampleId() { + return sampleId; + } + + public void setSampleId(String sampleId) { + this.sampleId = sampleId; + } + + public String getTemplateId() { + return templateId; + } + + public void setTemplateId(String templateId) { + this.templateId = templateId; + } + + public String getTemplateName() { + return templateName; + } + + public void setTemplateName(String templateName) { + this.templateName = templateName; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public static class BusinessEnvRecordModel { + private String createTime; + private String createUser; + private String environmentCode; + private String humidity; + private String id; + private String isDel; + private String outputVoltage; + private String recordTime; + private String recorder; + private String remark; + private String roomNumber; + private String temperature; + private String updateTime; + private String zeroGroundVoltage; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEnvironmentCode() { + return environmentCode; + } + + public void setEnvironmentCode(String environmentCode) { + this.environmentCode = environmentCode; + } + + public String getHumidity() { + return humidity; + } + + public void setHumidity(String humidity) { + this.humidity = humidity; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String isIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getOutputVoltage() { + return outputVoltage; + } + + public void setOutputVoltage(String outputVoltage) { + this.outputVoltage = outputVoltage; + } + + public String getRecordTime() { + return recordTime; + } + + public void setRecordTime(String recordTime) { + this.recordTime = recordTime; + } + + public String getRecorder() { + return recorder; + } + + public void setRecorder(String recorder) { + this.recorder = recorder; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getRoomNumber() { + return roomNumber; + } + + public void setRoomNumber(String roomNumber) { + this.roomNumber = roomNumber; + } + + public String getTemperature() { + return temperature; + } + + public void setTemperature(String temperature) { + this.temperature = temperature; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getZeroGroundVoltage() { + return zeroGroundVoltage; + } + + public void setZeroGroundVoltage(String zeroGroundVoltage) { + this.zeroGroundVoltage = zeroGroundVoltage; + } + } + + public static class BusinessOrderModel { + private String certifications; + private String createTime; + private String createUser; + private String customerAddress; + private String customerId; + private String customerName; + private String customerNo; + private String customerPhone; + private List customerSampleInfoList; + private String deliverTime; + private String deliverer; + private String delivererId; + private String delivererTel; + private String id; + private String isDel; + private String isUrgent; + private String minioFileName; + private String orderCode; + private String orderTime; + private String planDeliverTime; + private String remark; + private String requireOverTime; + private String status; + private String updateTime; + private String updateUser; + + public String getCertifications() { + return certifications; + } + + public void setCertifications(String certifications) { + this.certifications = certifications; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCustomerAddress() { + return customerAddress; + } + + public void setCustomerAddress(String customerAddress) { + this.customerAddress = customerAddress; + } + + public String getCustomerId() { + return customerId; + } + + public void setCustomerId(String customerId) { + this.customerId = customerId; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public String getCustomerPhone() { + return customerPhone; + } + + public void setCustomerPhone(String customerPhone) { + this.customerPhone = customerPhone; + } + + public List getCustomerSampleInfoList() { + return customerSampleInfoList; + } + + public void setCustomerSampleInfoList(List customerSampleInfoList) { + this.customerSampleInfoList = customerSampleInfoList; + } + + public String getDeliverTime() { + return deliverTime; + } + + public void setDeliverTime(String deliverTime) { + this.deliverTime = deliverTime; + } + + public String getDeliverer() { + return deliverer; + } + + public void setDeliverer(String deliverer) { + this.deliverer = deliverer; + } + + public String getDelivererId() { + return delivererId; + } + + public void setDelivererId(String delivererId) { + this.delivererId = delivererId; + } + + public String getDelivererTel() { + return delivererTel; + } + + public void setDelivererTel(String delivererTel) { + this.delivererTel = delivererTel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIsUrgent() { + return isUrgent; + } + + public void setIsUrgent(String isUrgent) { + this.isUrgent = isUrgent; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getOrderCode() { + return orderCode; + } + + public void setOrderCode(String orderCode) { + this.orderCode = orderCode; + } + + public String getOrderTime() { + return orderTime; + } + + public void setOrderTime(String orderTime) { + this.orderTime = orderTime; + } + + public String getPlanDeliverTime() { + return planDeliverTime; + } + + public void setPlanDeliverTime(String planDeliverTime) { + this.planDeliverTime = planDeliverTime; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getRequireOverTime() { + return requireOverTime; + } + + public void setRequireOverTime(String requireOverTime) { + this.requireOverTime = requireOverTime; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUpdateUser() { + return updateUser; + } + + public void setUpdateUser(String updateUser) { + this.updateUser = updateUser; + } + + public static class CustomerSampleModel { + private String abc; + private String appendix; + private String appendixDescn; + private String createTime; + private String createUser; + private String customerAddress; + private String customerId; + private String customerName; + private String customerNo; + private String deliverer; + private String delivererTel; + private String id; + private String isDel; + private String isExistSample; + private String labelBind; + private String manufacturer; + private String manufacturerCountry; + private String manufacturingDate; + private String manufacturingNo; + private String measureCategory; + private String measureCategoryName; + private String measureContent; + private String measureLastTime; + private String measurePeriod; + private String measureType; + private String measureTypeName; + private String minioFileName; + private String orderId; + private String phone; + private String postalCode; + private String powerVoltage; + private String remark; + private String sampleBelong; + private String sampleBelongName; + private String sampleModel; + private String sampleName; + private String sampleNo; + private String specialRequire; + private String updateTime; + private String updateUser; + private String validDeadline; + + public String getAbc() { + return abc; + } + + public void setAbc(String abc) { + this.abc = abc; + } + + public String getAppendix() { + return appendix; + } + + public void setAppendix(String appendix) { + this.appendix = appendix; + } + + public String getAppendixDescn() { + return appendixDescn; + } + + public void setAppendixDescn(String appendixDescn) { + this.appendixDescn = appendixDescn; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCustomerAddress() { + return customerAddress; + } + + public void setCustomerAddress(String customerAddress) { + this.customerAddress = customerAddress; + } + + public String getCustomerId() { + return customerId; + } + + public void setCustomerId(String customerId) { + this.customerId = customerId; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public String getDeliverer() { + return deliverer; + } + + public void setDeliverer(String deliverer) { + this.deliverer = deliverer; + } + + public String getDelivererTel() { + return delivererTel; + } + + public void setDelivererTel(String delivererTel) { + this.delivererTel = delivererTel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIsExistSample() { + return isExistSample; + } + + public void setIsExistSample(String isExistSample) { + this.isExistSample = isExistSample; + } + + public String getLabelBind() { + return labelBind; + } + + public void setLabelBind(String labelBind) { + this.labelBind = labelBind; + } + + public String getManufacturer() { + return manufacturer; + } + + public void setManufacturer(String manufacturer) { + this.manufacturer = manufacturer; + } + + public String getManufacturerCountry() { + return manufacturerCountry; + } + + public void setManufacturerCountry(String manufacturerCountry) { + this.manufacturerCountry = manufacturerCountry; + } + + public String getManufacturingDate() { + return manufacturingDate; + } + + public void setManufacturingDate(String manufacturingDate) { + this.manufacturingDate = manufacturingDate; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getMeasureCategory() { + return measureCategory; + } + + public void setMeasureCategory(String measureCategory) { + this.measureCategory = measureCategory; + } + + public String getMeasureCategoryName() { + return measureCategoryName; + } + + public void setMeasureCategoryName(String measureCategoryName) { + this.measureCategoryName = measureCategoryName; + } + + public String getMeasureContent() { + return measureContent; + } + + public void setMeasureContent(String measureContent) { + this.measureContent = measureContent; + } + + public String getMeasureLastTime() { + return measureLastTime; + } + + public void setMeasureLastTime(String measureLastTime) { + this.measureLastTime = measureLastTime; + } + + public String getMeasurePeriod() { + return measurePeriod; + } + + public void setMeasurePeriod(String measurePeriod) { + this.measurePeriod = measurePeriod; + } + + public String getMeasureType() { + return measureType; + } + + public void setMeasureType(String measureType) { + this.measureType = measureType; + } + + public String getMeasureTypeName() { + return measureTypeName; + } + + public void setMeasureTypeName(String measureTypeName) { + this.measureTypeName = measureTypeName; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getPostalCode() { + return postalCode; + } + + public void setPostalCode(String postalCode) { + this.postalCode = postalCode; + } + + public String getPowerVoltage() { + return powerVoltage; + } + + public void setPowerVoltage(String powerVoltage) { + this.powerVoltage = powerVoltage; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSampleBelong() { + return sampleBelong; + } + + public void setSampleBelong(String sampleBelong) { + this.sampleBelong = sampleBelong; + } + + public String getSampleBelongName() { + return sampleBelongName; + } + + public void setSampleBelongName(String sampleBelongName) { + this.sampleBelongName = sampleBelongName; + } + + public String getSampleModel() { + return sampleModel; + } + + public void setSampleModel(String sampleModel) { + this.sampleModel = sampleModel; + } + + public String getSampleName() { + return sampleName; + } + + public void setSampleName(String sampleName) { + this.sampleName = sampleName; + } + + public String getSampleNo() { + return sampleNo; + } + + public void setSampleNo(String sampleNo) { + this.sampleNo = sampleNo; + } + + public String getSpecialRequire() { + return specialRequire; + } + + public void setSpecialRequire(String specialRequire) { + this.specialRequire = specialRequire; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUpdateUser() { + return updateUser; + } + + public void setUpdateUser(String updateUser) { + this.updateUser = updateUser; + } + + public String getValidDeadline() { + return validDeadline; + } + + public void setValidDeadline(String validDeadline) { + this.validDeadline = validDeadline; + } + } + } + + public static class EquipmentModel { + private String abc; + private String abcName; + private String applyRelationId; + private String assetNo; + private String assetSource; + private String assetType; + private String assetTypeName; + private String attribute; + private String capitalSource; + private String capitalSourceName; + private String cardEstablishmentDate; + private String createTime; + private String createUser; + private String depreciationMethod; + private String depreciationMethodName; + private String depreciationPeriod; + private String enableDate; + private String equipmentCategory; + private String equipmentCategoryName; + private String equipmentName; + private String equipmentNo; + private String equipmentSpecifications; + private String equipmentType; + private String equipmentTypeName; + private String fileList; + private String id; + private String installIncidentalExpenses; + private String installPlace; + private String intactState; + private String isCalibrationTestEquipment; + private String isDel; + private String isFixedAssets; + private String isMeasureAccount; + private String isStandardSupportEquipment; + private String labelBind; + private String majorCategory; + private String majorCategoryName; + private String managerLevel; + private String managerLevelName; + private String managerState; + private String managerStateName; + private String manufacturer; + private String manufacturerCountry; + private String manufacturingDate; + private String manufacturingNo; + private String mesureCycle; + private String mesureDate; + private String mesureDept; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String mesureType; + private String mesureTypeName; + private String modelNo; + private String originValue; + private String overallDimension; + private String presentOriginValue; + private String purpose; + private String remark; + private String singlePrice; + private String supportStandardEquipmentName; + private String supportStandardEquipmentNo; + private String technicalLevel; + private String uncertainty; + private String updateTime; + private String useDept; + private String useDeptName; + private String usePerson; + private String usePersonName; + private String validDate; + private String version; + private String weight; + + public String getAbc() { + return abc; + } + + public void setAbc(String abc) { + this.abc = abc; + } + + public String getAbcName() { + return abcName; + } + + public void setAbcName(String abcName) { + this.abcName = abcName; + } + + public String getApplyRelationId() { + return applyRelationId; + } + + public void setApplyRelationId(String applyRelationId) { + this.applyRelationId = applyRelationId; + } + + public String getAssetNo() { + return assetNo; + } + + public void setAssetNo(String assetNo) { + this.assetNo = assetNo; + } + + public String getAssetSource() { + return assetSource; + } + + public void setAssetSource(String assetSource) { + this.assetSource = assetSource; + } + + public String getAssetType() { + return assetType; + } + + public void setAssetType(String assetType) { + this.assetType = assetType; + } + + public String getAssetTypeName() { + return assetTypeName; + } + + public void setAssetTypeName(String assetTypeName) { + this.assetTypeName = assetTypeName; + } + + public String getAttribute() { + return attribute; + } + + public void setAttribute(String attribute) { + this.attribute = attribute; + } + + public String getCapitalSource() { + return capitalSource; + } + + public void setCapitalSource(String capitalSource) { + this.capitalSource = capitalSource; + } + + public String getCapitalSourceName() { + return capitalSourceName; + } + + public void setCapitalSourceName(String capitalSourceName) { + this.capitalSourceName = capitalSourceName; + } + + public String getCardEstablishmentDate() { + return cardEstablishmentDate; + } + + public void setCardEstablishmentDate(String cardEstablishmentDate) { + this.cardEstablishmentDate = cardEstablishmentDate; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getDepreciationMethod() { + return depreciationMethod; + } + + public void setDepreciationMethod(String depreciationMethod) { + this.depreciationMethod = depreciationMethod; + } + + public String getDepreciationMethodName() { + return depreciationMethodName; + } + + public void setDepreciationMethodName(String depreciationMethodName) { + this.depreciationMethodName = depreciationMethodName; + } + + public String getDepreciationPeriod() { + return depreciationPeriod; + } + + public void setDepreciationPeriod(String depreciationPeriod) { + this.depreciationPeriod = depreciationPeriod; + } + + public String getEnableDate() { + return enableDate; + } + + public void setEnableDate(String enableDate) { + this.enableDate = enableDate; + } + + public String getEquipmentCategory() { + return equipmentCategory; + } + + public void setEquipmentCategory(String equipmentCategory) { + this.equipmentCategory = equipmentCategory; + } + + public String getEquipmentCategoryName() { + return equipmentCategoryName; + } + + public void setEquipmentCategoryName(String equipmentCategoryName) { + this.equipmentCategoryName = equipmentCategoryName; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getEquipmentSpecifications() { + return equipmentSpecifications; + } + + public void setEquipmentSpecifications(String equipmentSpecifications) { + this.equipmentSpecifications = equipmentSpecifications; + } + + public String getEquipmentType() { + return equipmentType; + } + + public void setEquipmentType(String equipmentType) { + this.equipmentType = equipmentType; + } + + public String getEquipmentTypeName() { + return equipmentTypeName; + } + + public void setEquipmentTypeName(String equipmentTypeName) { + this.equipmentTypeName = equipmentTypeName; + } + + public String getFileList() { + return fileList; + } + + public void setFileList(String fileList) { + this.fileList = fileList; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInstallIncidentalExpenses() { + return installIncidentalExpenses; + } + + public void setInstallIncidentalExpenses(String installIncidentalExpenses) { + this.installIncidentalExpenses = installIncidentalExpenses; + } + + public String getInstallPlace() { + return installPlace; + } + + public void setInstallPlace(String installPlace) { + this.installPlace = installPlace; + } + + public String getIntactState() { + return intactState; + } + + public void setIntactState(String intactState) { + this.intactState = intactState; + } + + public String getIsCalibrationTestEquipment() { + return isCalibrationTestEquipment; + } + + public void setIsCalibrationTestEquipment(String isCalibrationTestEquipment) { + this.isCalibrationTestEquipment = isCalibrationTestEquipment; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIsFixedAssets() { + return isFixedAssets; + } + + public void setIsFixedAssets(String isFixedAssets) { + this.isFixedAssets = isFixedAssets; + } + + public String getIsMeasureAccount() { + return isMeasureAccount; + } + + public void setIsMeasureAccount(String isMeasureAccount) { + this.isMeasureAccount = isMeasureAccount; + } + + public String getIsStandardSupportEquipment() { + return isStandardSupportEquipment; + } + + public void setIsStandardSupportEquipment(String isStandardSupportEquipment) { + this.isStandardSupportEquipment = isStandardSupportEquipment; + } + + public String getLabelBind() { + return labelBind; + } + + public void setLabelBind(String labelBind) { + this.labelBind = labelBind; + } + + public String getMajorCategory() { + return majorCategory; + } + + public void setMajorCategory(String majorCategory) { + this.majorCategory = majorCategory; + } + + public String getMajorCategoryName() { + return majorCategoryName; + } + + public void setMajorCategoryName(String majorCategoryName) { + this.majorCategoryName = majorCategoryName; + } + + public String getManagerLevel() { + return managerLevel; + } + + public void setManagerLevel(String managerLevel) { + this.managerLevel = managerLevel; + } + + public String getManagerLevelName() { + return managerLevelName; + } + + public void setManagerLevelName(String managerLevelName) { + this.managerLevelName = managerLevelName; + } + + public String getManagerState() { + return managerState; + } + + public void setManagerState(String managerState) { + this.managerState = managerState; + } + + public String getManagerStateName() { + return managerStateName; + } + + public void setManagerStateName(String managerStateName) { + this.managerStateName = managerStateName; + } + + public String getManufacturer() { + return manufacturer; + } + + public void setManufacturer(String manufacturer) { + this.manufacturer = manufacturer; + } + + public String getManufacturerCountry() { + return manufacturerCountry; + } + + public void setManufacturerCountry(String manufacturerCountry) { + this.manufacturerCountry = manufacturerCountry; + } + + public String getManufacturingDate() { + return manufacturingDate; + } + + public void setManufacturingDate(String manufacturingDate) { + this.manufacturingDate = manufacturingDate; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getMesureCycle() { + return mesureCycle; + } + + public void setMesureCycle(String mesureCycle) { + this.mesureCycle = mesureCycle; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureDept() { + return mesureDept; + } + + public void setMesureDept(String mesureDept) { + this.mesureDept = mesureDept; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getMesureType() { + return mesureType; + } + + public void setMesureType(String mesureType) { + this.mesureType = mesureType; + } + + public String getMesureTypeName() { + return mesureTypeName; + } + + public void setMesureTypeName(String mesureTypeName) { + this.mesureTypeName = mesureTypeName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getOriginValue() { + return originValue; + } + + public void setOriginValue(String originValue) { + this.originValue = originValue; + } + + public String getOverallDimension() { + return overallDimension; + } + + public void setOverallDimension(String overallDimension) { + this.overallDimension = overallDimension; + } + + public String getPresentOriginValue() { + return presentOriginValue; + } + + public void setPresentOriginValue(String presentOriginValue) { + this.presentOriginValue = presentOriginValue; + } + + public String getPurpose() { + return purpose; + } + + public void setPurpose(String purpose) { + this.purpose = purpose; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSinglePrice() { + return singlePrice; + } + + public void setSinglePrice(String singlePrice) { + this.singlePrice = singlePrice; + } + + public String getSupportStandardEquipmentName() { + return supportStandardEquipmentName; + } + + public void setSupportStandardEquipmentName(String supportStandardEquipmentName) { + this.supportStandardEquipmentName = supportStandardEquipmentName; + } + + public String getSupportStandardEquipmentNo() { + return supportStandardEquipmentNo; + } + + public void setSupportStandardEquipmentNo(String supportStandardEquipmentNo) { + this.supportStandardEquipmentNo = supportStandardEquipmentNo; + } + + public String getTechnicalLevel() { + return technicalLevel; + } + + public void setTechnicalLevel(String technicalLevel) { + this.technicalLevel = technicalLevel; + } + + public String getUncertainty() { + return uncertainty; + } + + public void setUncertainty(String uncertainty) { + this.uncertainty = uncertainty; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDept() { + return useDept; + } + + public void setUseDept(String useDept) { + this.useDept = useDept; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getUsePerson() { + return usePerson; + } + + public void setUsePerson(String usePerson) { + this.usePerson = usePerson; + } + + public String getUsePersonName() { + return usePersonName; + } + + public void setUsePersonName(String usePersonName) { + this.usePersonName = usePersonName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + + public String getVersion() { + return version; + } + + public void setVersion(String version) { + this.version = version; + } + + public String getWeight() { + return weight; + } + + public void setWeight(String weight) { + this.weight = weight; + } + } + + public static class FileModel { + private String approvalStatus; + private String approvalStatusName; + private String createTime; + private String createUser; + private String createUserId; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String fileType; + private String fileTypeName; + private String id; + private String isDel; + private String minioFileName; + private String processId; + private String publishTime; + private String publisher; + private String remark; + private String updateTime; + + public String getApprovalStatus() { + return approvalStatus; + } + + public void setApprovalStatus(String approvalStatus) { + this.approvalStatus = approvalStatus; + } + + public String getApprovalStatusName() { + return approvalStatusName; + } + + public void setApprovalStatusName(String approvalStatusName) { + this.approvalStatusName = approvalStatusName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCreateUserId() { + return createUserId; + } + + public void setCreateUserId(String createUserId) { + this.createUserId = createUserId; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getFileType() { + return fileType; + } + + public void setFileType(String fileType) { + this.fileType = fileType; + } + + public String getFileTypeName() { + return fileTypeName; + } + + public void setFileTypeName(String fileTypeName) { + this.fileTypeName = fileTypeName; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getPublishTime() { + return publishTime; + } + + public void setPublishTime(String publishTime) { + this.publishTime = publishTime; + } + + public String getPublisher() { + return publisher; + } + + public void setPublisher(String publisher) { + this.publisher = publisher; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/CertificateListModel.java b/app/src/main/java/com/casic/xz/meterage/model/CertificateListModel.java new file mode 100644 index 0000000..0eed915 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/CertificateListModel.java @@ -0,0 +1,229 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class CertificateListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String approvalStatus; + private String approvalStatusName; + private String calibrationMajor; + private String certificateReportCode; + private String certificateReportName; + private String createTime; + private String decisionItem; + private String id; + private String manufacturingNo; + private String measureCategory; + private String measureCategoryName; + private String measurePersonId; + private String measurePersonName; + private String orderCode; + private String processId; + private String sampleModel; + private String sampleName; + private String sampleNo; + private String taskId; + + public String getApprovalStatus() { + return approvalStatus; + } + + public void setApprovalStatus(String approvalStatus) { + this.approvalStatus = approvalStatus; + } + + public String getApprovalStatusName() { + return approvalStatusName; + } + + public void setApprovalStatusName(String approvalStatusName) { + this.approvalStatusName = approvalStatusName; + } + + public String getCalibrationMajor() { + return calibrationMajor; + } + + public void setCalibrationMajor(String calibrationMajor) { + this.calibrationMajor = calibrationMajor; + } + + public String getCertificateReportCode() { + return certificateReportCode; + } + + public void setCertificateReportCode(String certificateReportCode) { + this.certificateReportCode = certificateReportCode; + } + + public String getCertificateReportName() { + return certificateReportName; + } + + public void setCertificateReportName(String certificateReportName) { + this.certificateReportName = certificateReportName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getDecisionItem() { + return decisionItem; + } + + public void setDecisionItem(String decisionItem) { + this.decisionItem = decisionItem; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getMeasureCategory() { + return measureCategory; + } + + public void setMeasureCategory(String measureCategory) { + this.measureCategory = measureCategory; + } + + public String getMeasureCategoryName() { + return measureCategoryName; + } + + public void setMeasureCategoryName(String measureCategoryName) { + this.measureCategoryName = measureCategoryName; + } + + public String getMeasurePersonId() { + return measurePersonId; + } + + public void setMeasurePersonId(String measurePersonId) { + this.measurePersonId = measurePersonId; + } + + public String getMeasurePersonName() { + return measurePersonName; + } + + public void setMeasurePersonName(String measurePersonName) { + this.measurePersonName = measurePersonName; + } + + public String getOrderCode() { + return orderCode; + } + + public void setOrderCode(String orderCode) { + this.orderCode = orderCode; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getSampleModel() { + return sampleModel; + } + + public void setSampleModel(String sampleModel) { + this.sampleModel = sampleModel; + } + + public String getSampleName() { + return sampleName; + } + + public void setSampleName(String sampleName) { + this.sampleName = sampleName; + } + + public String getSampleNo() { + return sampleNo; + } + + public void setSampleNo(String sampleNo) { + this.sampleNo = sampleNo; + } + + public String getTaskId() { + return taskId; + } + + public void setTaskId(String taskId) { + this.taskId = taskId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/CertificateModel.java b/app/src/main/java/com/casic/xz/meterage/model/CertificateModel.java deleted file mode 100644 index ec0d25b..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/CertificateModel.java +++ /dev/null @@ -1,202 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class CertificateModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String approvalStatus; - private String approvalStatusName; - private String calibrationMajor; - private String certificateReportCode; - private String certificateReportName; - private String createTime; - private String decisionItem; - private String id; - private String manufacturingNo; - private String measurePersonId; - private String orderCode; - private String processId; - private String sampleModel; - private String sampleName; - private String sampleNo; - private String taskId; - - public String getApprovalStatus() { - return approvalStatus; - } - - public void setApprovalStatus(String approvalStatus) { - this.approvalStatus = approvalStatus; - } - - public String getApprovalStatusName() { - return approvalStatusName; - } - - public void setApprovalStatusName(String approvalStatusName) { - this.approvalStatusName = approvalStatusName; - } - - public String getCalibrationMajor() { - return calibrationMajor; - } - - public void setCalibrationMajor(String calibrationMajor) { - this.calibrationMajor = calibrationMajor; - } - - public String getCertificateReportCode() { - return certificateReportCode; - } - - public void setCertificateReportCode(String certificateReportCode) { - this.certificateReportCode = certificateReportCode; - } - - public String getCertificateReportName() { - return certificateReportName; - } - - public void setCertificateReportName(String certificateReportName) { - this.certificateReportName = certificateReportName; - } - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getDecisionItem() { - return decisionItem; - } - - public void setDecisionItem(String decisionItem) { - this.decisionItem = decisionItem; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getManufacturingNo() { - return manufacturingNo; - } - - public void setManufacturingNo(String manufacturingNo) { - this.manufacturingNo = manufacturingNo; - } - - public String getMeasurePersonId() { - return measurePersonId; - } - - public void setMeasurePersonId(String measurePersonId) { - this.measurePersonId = measurePersonId; - } - - public String getOrderCode() { - return orderCode; - } - - public void setOrderCode(String orderCode) { - this.orderCode = orderCode; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public String getSampleModel() { - return sampleModel; - } - - public void setSampleModel(String sampleModel) { - this.sampleModel = sampleModel; - } - - public String getSampleName() { - return sampleName; - } - - public void setSampleName(String sampleName) { - this.sampleName = sampleName; - } - - public String getSampleNo() { - return sampleNo; - } - - public void setSampleNo(String sampleNo) { - this.sampleNo = sampleNo; - } - - public String getTaskId() { - return taskId; - } - - public void setTaskId(String taskId) { - this.taskId = taskId; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index b0dec00..a4f3c46 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -345,4 +345,22 @@ @QueryMap limit: Map, @QueryMap offset: Map ): String + + /** + * 获取委托书详情 + */ + @POST("/business/certificateReport/detail") + suspend fun getCertificateReportDetail( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 提交证书 + */ + @POST("/business/certificateReport/submit") + suspend fun submit( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String } \ 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 cef55ec..8bf4070 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 @@ -800,4 +800,29 @@ AuthenticationHelper.token!!, requestBody, limitMap, offsetMap ) } + + /** + * 获取证书报告详情 + */ + suspend fun getCertificateReportDetail(id: String): String { + val param = JsonObject() + param.addProperty("id", id) + val requestBody = param.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getCertificateReportDetail(AuthenticationHelper.token!!, requestBody) + } + + /** + * 提交证书报告 + */ + suspend fun submit(id: String): String { + val param = JsonObject() + param.addProperty("formId", "ywglzsbg") + param.addProperty("id", id) + val requestBody = param.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.submit(AuthenticationHelper.token!!, requestBody) + } } \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 5ba44f0..298f687 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -53,7 +53,8 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "XZJL_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" +// outputFileName = "XZJL_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "XZJL_" + getBuildDate() + "_Beta.apk" } } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4b914b5..ebea092 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -67,6 +67,7 @@ + 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 new file mode 100644 index 0000000..a75e566 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.certificate + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class ApprovalProcessFragment :KotlinBaseFragment(){ + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_certificate_approval_process + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt new file mode 100644 index 0000000..5882c3d --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt @@ -0,0 +1,77 @@ +package com.casic.xz.meterage.fragment.certificate + +import android.graphics.Color +import android.graphics.Paint +import android.util.Log +import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.watchAttachFile +import com.casic.xz.meterage.model.CertificateDetailModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.pengxh.kt.lite.extensions.toJson +import kotlinx.android.synthetic.main.fragment_certificate_basic_information.* + +class BasicInformationFragment(private val data: CertificateDetailModel.DataModel) : + KotlinBaseFragment() { + + override fun initData() { + val businessOriginal = data.businessOriginalRecord + + reportCodeView.text = data.certificateReportCode + originalCodeView.text = businessOriginal.originalRecordCode + checkCategoryView.text = businessOriginal.measureCategoryName + + Log.d( + "Casic", + "BasicInformationFragment => initData: ${businessOriginal.fileList.toJson()}" + ) +// basisFileView.text = businessOriginal.fileList + + val sampleInfo = businessOriginal.customerSampleInfo + sampleCodeView.text = sampleInfo.sampleNo + sampleNameView.text = sampleInfo.sampleName + manufacturingCodeView.text = sampleInfo.manufacturingNo + modelView.text = sampleInfo.sampleModel + entrustCodeView.text = sampleInfo.customerNo + entrustNameView.text = sampleInfo.customerName + entrustContactView.text = sampleInfo.phone + entrustEmailView.text = sampleInfo.postalCode + entrustAddressView.text = sampleInfo.customerAddress + senderView.text = sampleInfo.deliverer + senderContactView.text = sampleInfo.delivererTel + checkTypeView.text = sampleInfo.measureContent + remarkView.text = sampleInfo.remark + + estimateServedTimeView.text = businessOriginal.businessOrder.planDeliverTime + estimateCompleteTimeView.text = businessOriginal.businessOrder.requireOverTime + + if (data.certificateReportFile.isNullOrBlank()) { + reportFileView.text = "暂无附件" + } else { + val reportFileName = data.certificateReportFile + + reportFileView.text = reportFileName + val textPaint = reportFileView.paint + textPaint.flags = Paint.UNDERLINE_TEXT_FLAG + textPaint.isAntiAlias = true + reportFileView.setTextColor(Color.BLUE) + + reportFileView.setOnClickListener { + reportFileName.watchAttachFile(requireContext()) + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_certificate_basic_information + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt index 2f3c95c..b1df400 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt @@ -4,19 +4,24 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.addAll +import com.casic.xz.meterage.extensions.diffCurrentTime +import com.casic.xz.meterage.extensions.formatToDate import com.casic.xz.meterage.extensions.showEmptyPage -import com.casic.xz.meterage.model.CertificateModel +import com.casic.xz.meterage.model.CertificateListModel +import com.casic.xz.meterage.view.home.CertificateReportDetailActivity import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler import kotlinx.android.synthetic.main.fragment_certificate_report.* import kotlinx.android.synthetic.main.include_empty_view.* /** - * 计量法规 + * 证书报告 * * formId:ywglzsbg * */ @@ -24,8 +29,8 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var certificateViewModel: CertificateViewModel - private lateinit var certificateAdapter: NormalRecyclerAdapter - private var dataBeans: MutableList = ArrayList() + private lateinit var certificateAdapter: NormalRecyclerAdapter + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false @@ -119,40 +124,37 @@ } else { emptyView!!.hide() certificateAdapter = object : - NormalRecyclerAdapter( + NormalRecyclerAdapter( R.layout.item_certificate_rv_l, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, - item: CertificateModel.DataModel.RowsModel + item: CertificateListModel.DataModel.RowsModel ) { + val deltaT = item.createTime.diffCurrentTime() + val diffTime = if (deltaT < 24) { + "${deltaT}小时前" + } else { + item.createTime.formatToDate() + } + viewHolder.setText(R.id.reportNameView, item.certificateReportName) -// .setText(R.id.fileStateView, item.effectiveStatusName) -// .setText(R.id.remarkView, "备注：$remark") -// .setText(R.id.fileCodeView, "文件号：${item.fileNo}") -// .setText(R.id.releaseDateView, "实施时间：${item.publishTime}") -// -// if (!item.effectiveStatus.equals("1")) { -// viewHolder.setBackgroundColor( -// R.id.fileStateView, -// R.color.gray.convertColor(requireContext()) -// ) -// } + .setText(R.id.createTimeView, diffTime) + .setText(R.id.categoryView, "校验类别：${item.measureCategoryName}") + .setText(R.id.technicianView, "检定员：${item.measurePersonName}") + + viewHolder.setOnClickListener(R.id.showDetailButton) { + requireContext().navigatePageTo( + addAll(item.approvalStatus, item.id) + ) + } } } certificateRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) certificateRecyclerView.adapter = certificateAdapter - certificateAdapter.setOnItemClickedListener(object : - NormalRecyclerAdapter.OnItemClickedListener { - override fun onItemClicked( - position: Int, t: CertificateModel.DataModel.RowsModel - ) { -// requireContext().navigatePageTo(t.toJson()) - } - }) } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt new file mode 100644 index 0000000..2d5ac61 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.certificate + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class ExceptionReportFragment :KotlinBaseFragment(){ + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_certificate_exception_report + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/model/CertificateDetailModel.java b/app/src/main/java/com/casic/xz/meterage/model/CertificateDetailModel.java new file mode 100644 index 0000000..42efccd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/CertificateDetailModel.java @@ -0,0 +1,2080 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class CertificateDetailModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private String approvalSignId; + private String approvalStatus; + private String approvalStatusName; + private BusinessOriginalRecordModel businessOriginalRecord; + private String calibrationMajor; + private String calibrationMajorName; + private String certificateReportCategory; + private String certificateReportCode; + private String certificateReportFile; + private String certificateReportName; + private String createTime; + private String createUser; + private String expirationDate; + private String id; + private String isDel; + private String issuanceDate; + private String measureDeptId; + private String measurePersonId; + private String measureResult; + private String orderId; + private String originalRecordId; + private String printNum; + private String printStatus; + private String processId; + private String remark; + private String sampleId; + private String signId; + private String templateId; + private String updateTime; + + public String getApprovalSignId() { + return approvalSignId; + } + + public void setApprovalSignId(String approvalSignId) { + this.approvalSignId = approvalSignId; + } + + public String getApprovalStatus() { + return approvalStatus; + } + + public void setApprovalStatus(String approvalStatus) { + this.approvalStatus = approvalStatus; + } + + public String getApprovalStatusName() { + return approvalStatusName; + } + + public void setApprovalStatusName(String approvalStatusName) { + this.approvalStatusName = approvalStatusName; + } + + public BusinessOriginalRecordModel getBusinessOriginalRecord() { + return businessOriginalRecord; + } + + public void setBusinessOriginalRecord(BusinessOriginalRecordModel businessOriginalRecord) { + this.businessOriginalRecord = businessOriginalRecord; + } + + public String getCalibrationMajor() { + return calibrationMajor; + } + + public void setCalibrationMajor(String calibrationMajor) { + this.calibrationMajor = calibrationMajor; + } + + public String getCalibrationMajorName() { + return calibrationMajorName; + } + + public void setCalibrationMajorName(String calibrationMajorName) { + this.calibrationMajorName = calibrationMajorName; + } + + public String getCertificateReportCategory() { + return certificateReportCategory; + } + + public void setCertificateReportCategory(String certificateReportCategory) { + this.certificateReportCategory = certificateReportCategory; + } + + public String getCertificateReportCode() { + return certificateReportCode; + } + + public void setCertificateReportCode(String certificateReportCode) { + this.certificateReportCode = certificateReportCode; + } + + public String getCertificateReportFile() { + return certificateReportFile; + } + + public void setCertificateReportFile(String certificateReportFile) { + this.certificateReportFile = certificateReportFile; + } + + public String getCertificateReportName() { + return certificateReportName; + } + + public void setCertificateReportName(String certificateReportName) { + this.certificateReportName = certificateReportName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getExpirationDate() { + return expirationDate; + } + + public void setExpirationDate(String expirationDate) { + this.expirationDate = expirationDate; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String isIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIssuanceDate() { + return issuanceDate; + } + + public void setIssuanceDate(String issuanceDate) { + this.issuanceDate = issuanceDate; + } + + public String getMeasureDeptId() { + return measureDeptId; + } + + public void setMeasureDeptId(String measureDeptId) { + this.measureDeptId = measureDeptId; + } + + public String getMeasurePersonId() { + return measurePersonId; + } + + public void setMeasurePersonId(String measurePersonId) { + this.measurePersonId = measurePersonId; + } + + public String getMeasureResult() { + return measureResult; + } + + public void setMeasureResult(String measureResult) { + this.measureResult = measureResult; + } + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public String getOriginalRecordId() { + return originalRecordId; + } + + public void setOriginalRecordId(String originalRecordId) { + this.originalRecordId = originalRecordId; + } + + public String getPrintNum() { + return printNum; + } + + public void setPrintNum(String printNum) { + this.printNum = printNum; + } + + public String getPrintStatus() { + return printStatus; + } + + public void setPrintStatus(String printStatus) { + this.printStatus = printStatus; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSampleId() { + return sampleId; + } + + public void setSampleId(String sampleId) { + this.sampleId = sampleId; + } + + public String getSignId() { + return signId; + } + + public void setSignId(String signId) { + this.signId = signId; + } + + public String getTemplateId() { + return templateId; + } + + public void setTemplateId(String templateId) { + this.templateId = templateId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public static class BusinessOriginalRecordModel { + private BusinessEnvRecordModel businessEnvironmentRecord; + private BusinessOrderModel businessOrder; + private String calibrationPlace; + private String calibrationTime; + private String createTime; + private String createUser; + private BusinessOrderModel.CustomerSampleModel customerSampleInfo; + private String environmentId; + private List equipmentInfoList; + private List fileList; + private String id; + private String isDel; + private String measureCategory; + private String measureCategoryName; + private String orderId; + private String originalRecordCode; + private String originalRecordFile; + private String originalRecordName; + private String remark; + private String sampleId; + private String templateId; + private String templateName; + private String updateTime; + + public BusinessEnvRecordModel getBusinessEnvironmentRecord() { + return businessEnvironmentRecord; + } + + public void setBusinessEnvironmentRecord(BusinessEnvRecordModel businessEnvironmentRecord) { + this.businessEnvironmentRecord = businessEnvironmentRecord; + } + + public BusinessOrderModel getBusinessOrder() { + return businessOrder; + } + + public void setBusinessOrder(BusinessOrderModel businessOrder) { + this.businessOrder = businessOrder; + } + + public String getCalibrationPlace() { + return calibrationPlace; + } + + public void setCalibrationPlace(String calibrationPlace) { + this.calibrationPlace = calibrationPlace; + } + + public String getCalibrationTime() { + return calibrationTime; + } + + public void setCalibrationTime(String calibrationTime) { + this.calibrationTime = calibrationTime; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public BusinessOrderModel.CustomerSampleModel getCustomerSampleInfo() { + return customerSampleInfo; + } + + public void setCustomerSampleInfo(BusinessOrderModel.CustomerSampleModel customerSampleInfo) { + this.customerSampleInfo = customerSampleInfo; + } + + public String getEnvironmentId() { + return environmentId; + } + + public void setEnvironmentId(String environmentId) { + this.environmentId = environmentId; + } + + public List getEquipmentInfoList() { + return equipmentInfoList; + } + + public void setEquipmentInfoList(List equipmentInfoList) { + this.equipmentInfoList = equipmentInfoList; + } + + public List getFileList() { + return fileList; + } + + public void setFileList(List fileList) { + this.fileList = fileList; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String isIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getMeasureCategory() { + return measureCategory; + } + + public void setMeasureCategory(String measureCategory) { + this.measureCategory = measureCategory; + } + + public String getMeasureCategoryName() { + return measureCategoryName; + } + + public void setMeasureCategoryName(String measureCategoryName) { + this.measureCategoryName = measureCategoryName; + } + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public String getOriginalRecordCode() { + return originalRecordCode; + } + + public void setOriginalRecordCode(String originalRecordCode) { + this.originalRecordCode = originalRecordCode; + } + + public String getOriginalRecordFile() { + return originalRecordFile; + } + + public void setOriginalRecordFile(String originalRecordFile) { + this.originalRecordFile = originalRecordFile; + } + + public String getOriginalRecordName() { + return originalRecordName; + } + + public void setOriginalRecordName(String originalRecordName) { + this.originalRecordName = originalRecordName; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSampleId() { + return sampleId; + } + + public void setSampleId(String sampleId) { + this.sampleId = sampleId; + } + + public String getTemplateId() { + return templateId; + } + + public void setTemplateId(String templateId) { + this.templateId = templateId; + } + + public String getTemplateName() { + return templateName; + } + + public void setTemplateName(String templateName) { + this.templateName = templateName; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public static class BusinessEnvRecordModel { + private String createTime; + private String createUser; + private String environmentCode; + private String humidity; + private String id; + private String isDel; + private String outputVoltage; + private String recordTime; + private String recorder; + private String remark; + private String roomNumber; + private String temperature; + private String updateTime; + private String zeroGroundVoltage; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEnvironmentCode() { + return environmentCode; + } + + public void setEnvironmentCode(String environmentCode) { + this.environmentCode = environmentCode; + } + + public String getHumidity() { + return humidity; + } + + public void setHumidity(String humidity) { + this.humidity = humidity; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String isIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getOutputVoltage() { + return outputVoltage; + } + + public void setOutputVoltage(String outputVoltage) { + this.outputVoltage = outputVoltage; + } + + public String getRecordTime() { + return recordTime; + } + + public void setRecordTime(String recordTime) { + this.recordTime = recordTime; + } + + public String getRecorder() { + return recorder; + } + + public void setRecorder(String recorder) { + this.recorder = recorder; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getRoomNumber() { + return roomNumber; + } + + public void setRoomNumber(String roomNumber) { + this.roomNumber = roomNumber; + } + + public String getTemperature() { + return temperature; + } + + public void setTemperature(String temperature) { + this.temperature = temperature; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getZeroGroundVoltage() { + return zeroGroundVoltage; + } + + public void setZeroGroundVoltage(String zeroGroundVoltage) { + this.zeroGroundVoltage = zeroGroundVoltage; + } + } + + public static class BusinessOrderModel { + private String certifications; + private String createTime; + private String createUser; + private String customerAddress; + private String customerId; + private String customerName; + private String customerNo; + private String customerPhone; + private List customerSampleInfoList; + private String deliverTime; + private String deliverer; + private String delivererId; + private String delivererTel; + private String id; + private String isDel; + private String isUrgent; + private String minioFileName; + private String orderCode; + private String orderTime; + private String planDeliverTime; + private String remark; + private String requireOverTime; + private String status; + private String updateTime; + private String updateUser; + + public String getCertifications() { + return certifications; + } + + public void setCertifications(String certifications) { + this.certifications = certifications; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCustomerAddress() { + return customerAddress; + } + + public void setCustomerAddress(String customerAddress) { + this.customerAddress = customerAddress; + } + + public String getCustomerId() { + return customerId; + } + + public void setCustomerId(String customerId) { + this.customerId = customerId; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public String getCustomerPhone() { + return customerPhone; + } + + public void setCustomerPhone(String customerPhone) { + this.customerPhone = customerPhone; + } + + public List getCustomerSampleInfoList() { + return customerSampleInfoList; + } + + public void setCustomerSampleInfoList(List customerSampleInfoList) { + this.customerSampleInfoList = customerSampleInfoList; + } + + public String getDeliverTime() { + return deliverTime; + } + + public void setDeliverTime(String deliverTime) { + this.deliverTime = deliverTime; + } + + public String getDeliverer() { + return deliverer; + } + + public void setDeliverer(String deliverer) { + this.deliverer = deliverer; + } + + public String getDelivererId() { + return delivererId; + } + + public void setDelivererId(String delivererId) { + this.delivererId = delivererId; + } + + public String getDelivererTel() { + return delivererTel; + } + + public void setDelivererTel(String delivererTel) { + this.delivererTel = delivererTel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIsUrgent() { + return isUrgent; + } + + public void setIsUrgent(String isUrgent) { + this.isUrgent = isUrgent; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getOrderCode() { + return orderCode; + } + + public void setOrderCode(String orderCode) { + this.orderCode = orderCode; + } + + public String getOrderTime() { + return orderTime; + } + + public void setOrderTime(String orderTime) { + this.orderTime = orderTime; + } + + public String getPlanDeliverTime() { + return planDeliverTime; + } + + public void setPlanDeliverTime(String planDeliverTime) { + this.planDeliverTime = planDeliverTime; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getRequireOverTime() { + return requireOverTime; + } + + public void setRequireOverTime(String requireOverTime) { + this.requireOverTime = requireOverTime; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUpdateUser() { + return updateUser; + } + + public void setUpdateUser(String updateUser) { + this.updateUser = updateUser; + } + + public static class CustomerSampleModel { + private String abc; + private String appendix; + private String appendixDescn; + private String createTime; + private String createUser; + private String customerAddress; + private String customerId; + private String customerName; + private String customerNo; + private String deliverer; + private String delivererTel; + private String id; + private String isDel; + private String isExistSample; + private String labelBind; + private String manufacturer; + private String manufacturerCountry; + private String manufacturingDate; + private String manufacturingNo; + private String measureCategory; + private String measureCategoryName; + private String measureContent; + private String measureLastTime; + private String measurePeriod; + private String measureType; + private String measureTypeName; + private String minioFileName; + private String orderId; + private String phone; + private String postalCode; + private String powerVoltage; + private String remark; + private String sampleBelong; + private String sampleBelongName; + private String sampleModel; + private String sampleName; + private String sampleNo; + private String specialRequire; + private String updateTime; + private String updateUser; + private String validDeadline; + + public String getAbc() { + return abc; + } + + public void setAbc(String abc) { + this.abc = abc; + } + + public String getAppendix() { + return appendix; + } + + public void setAppendix(String appendix) { + this.appendix = appendix; + } + + public String getAppendixDescn() { + return appendixDescn; + } + + public void setAppendixDescn(String appendixDescn) { + this.appendixDescn = appendixDescn; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCustomerAddress() { + return customerAddress; + } + + public void setCustomerAddress(String customerAddress) { + this.customerAddress = customerAddress; + } + + public String getCustomerId() { + return customerId; + } + + public void setCustomerId(String customerId) { + this.customerId = customerId; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public String getDeliverer() { + return deliverer; + } + + public void setDeliverer(String deliverer) { + this.deliverer = deliverer; + } + + public String getDelivererTel() { + return delivererTel; + } + + public void setDelivererTel(String delivererTel) { + this.delivererTel = delivererTel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIsExistSample() { + return isExistSample; + } + + public void setIsExistSample(String isExistSample) { + this.isExistSample = isExistSample; + } + + public String getLabelBind() { + return labelBind; + } + + public void setLabelBind(String labelBind) { + this.labelBind = labelBind; + } + + public String getManufacturer() { + return manufacturer; + } + + public void setManufacturer(String manufacturer) { + this.manufacturer = manufacturer; + } + + public String getManufacturerCountry() { + return manufacturerCountry; + } + + public void setManufacturerCountry(String manufacturerCountry) { + this.manufacturerCountry = manufacturerCountry; + } + + public String getManufacturingDate() { + return manufacturingDate; + } + + public void setManufacturingDate(String manufacturingDate) { + this.manufacturingDate = manufacturingDate; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getMeasureCategory() { + return measureCategory; + } + + public void setMeasureCategory(String measureCategory) { + this.measureCategory = measureCategory; + } + + public String getMeasureCategoryName() { + return measureCategoryName; + } + + public void setMeasureCategoryName(String measureCategoryName) { + this.measureCategoryName = measureCategoryName; + } + + public String getMeasureContent() { + return measureContent; + } + + public void setMeasureContent(String measureContent) { + this.measureContent = measureContent; + } + + public String getMeasureLastTime() { + return measureLastTime; + } + + public void setMeasureLastTime(String measureLastTime) { + this.measureLastTime = measureLastTime; + } + + public String getMeasurePeriod() { + return measurePeriod; + } + + public void setMeasurePeriod(String measurePeriod) { + this.measurePeriod = measurePeriod; + } + + public String getMeasureType() { + return measureType; + } + + public void setMeasureType(String measureType) { + this.measureType = measureType; + } + + public String getMeasureTypeName() { + return measureTypeName; + } + + public void setMeasureTypeName(String measureTypeName) { + this.measureTypeName = measureTypeName; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getPostalCode() { + return postalCode; + } + + public void setPostalCode(String postalCode) { + this.postalCode = postalCode; + } + + public String getPowerVoltage() { + return powerVoltage; + } + + public void setPowerVoltage(String powerVoltage) { + this.powerVoltage = powerVoltage; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSampleBelong() { + return sampleBelong; + } + + public void setSampleBelong(String sampleBelong) { + this.sampleBelong = sampleBelong; + } + + public String getSampleBelongName() { + return sampleBelongName; + } + + public void setSampleBelongName(String sampleBelongName) { + this.sampleBelongName = sampleBelongName; + } + + public String getSampleModel() { + return sampleModel; + } + + public void setSampleModel(String sampleModel) { + this.sampleModel = sampleModel; + } + + public String getSampleName() { + return sampleName; + } + + public void setSampleName(String sampleName) { + this.sampleName = sampleName; + } + + public String getSampleNo() { + return sampleNo; + } + + public void setSampleNo(String sampleNo) { + this.sampleNo = sampleNo; + } + + public String getSpecialRequire() { + return specialRequire; + } + + public void setSpecialRequire(String specialRequire) { + this.specialRequire = specialRequire; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUpdateUser() { + return updateUser; + } + + public void setUpdateUser(String updateUser) { + this.updateUser = updateUser; + } + + public String getValidDeadline() { + return validDeadline; + } + + public void setValidDeadline(String validDeadline) { + this.validDeadline = validDeadline; + } + } + } + + public static class EquipmentModel { + private String abc; + private String abcName; + private String applyRelationId; + private String assetNo; + private String assetSource; + private String assetType; + private String assetTypeName; + private String attribute; + private String capitalSource; + private String capitalSourceName; + private String cardEstablishmentDate; + private String createTime; + private String createUser; + private String depreciationMethod; + private String depreciationMethodName; + private String depreciationPeriod; + private String enableDate; + private String equipmentCategory; + private String equipmentCategoryName; + private String equipmentName; + private String equipmentNo; + private String equipmentSpecifications; + private String equipmentType; + private String equipmentTypeName; + private String fileList; + private String id; + private String installIncidentalExpenses; + private String installPlace; + private String intactState; + private String isCalibrationTestEquipment; + private String isDel; + private String isFixedAssets; + private String isMeasureAccount; + private String isStandardSupportEquipment; + private String labelBind; + private String majorCategory; + private String majorCategoryName; + private String managerLevel; + private String managerLevelName; + private String managerState; + private String managerStateName; + private String manufacturer; + private String manufacturerCountry; + private String manufacturingDate; + private String manufacturingNo; + private String mesureCycle; + private String mesureDate; + private String mesureDept; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String mesureType; + private String mesureTypeName; + private String modelNo; + private String originValue; + private String overallDimension; + private String presentOriginValue; + private String purpose; + private String remark; + private String singlePrice; + private String supportStandardEquipmentName; + private String supportStandardEquipmentNo; + private String technicalLevel; + private String uncertainty; + private String updateTime; + private String useDept; + private String useDeptName; + private String usePerson; + private String usePersonName; + private String validDate; + private String version; + private String weight; + + public String getAbc() { + return abc; + } + + public void setAbc(String abc) { + this.abc = abc; + } + + public String getAbcName() { + return abcName; + } + + public void setAbcName(String abcName) { + this.abcName = abcName; + } + + public String getApplyRelationId() { + return applyRelationId; + } + + public void setApplyRelationId(String applyRelationId) { + this.applyRelationId = applyRelationId; + } + + public String getAssetNo() { + return assetNo; + } + + public void setAssetNo(String assetNo) { + this.assetNo = assetNo; + } + + public String getAssetSource() { + return assetSource; + } + + public void setAssetSource(String assetSource) { + this.assetSource = assetSource; + } + + public String getAssetType() { + return assetType; + } + + public void setAssetType(String assetType) { + this.assetType = assetType; + } + + public String getAssetTypeName() { + return assetTypeName; + } + + public void setAssetTypeName(String assetTypeName) { + this.assetTypeName = assetTypeName; + } + + public String getAttribute() { + return attribute; + } + + public void setAttribute(String attribute) { + this.attribute = attribute; + } + + public String getCapitalSource() { + return capitalSource; + } + + public void setCapitalSource(String capitalSource) { + this.capitalSource = capitalSource; + } + + public String getCapitalSourceName() { + return capitalSourceName; + } + + public void setCapitalSourceName(String capitalSourceName) { + this.capitalSourceName = capitalSourceName; + } + + public String getCardEstablishmentDate() { + return cardEstablishmentDate; + } + + public void setCardEstablishmentDate(String cardEstablishmentDate) { + this.cardEstablishmentDate = cardEstablishmentDate; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getDepreciationMethod() { + return depreciationMethod; + } + + public void setDepreciationMethod(String depreciationMethod) { + this.depreciationMethod = depreciationMethod; + } + + public String getDepreciationMethodName() { + return depreciationMethodName; + } + + public void setDepreciationMethodName(String depreciationMethodName) { + this.depreciationMethodName = depreciationMethodName; + } + + public String getDepreciationPeriod() { + return depreciationPeriod; + } + + public void setDepreciationPeriod(String depreciationPeriod) { + this.depreciationPeriod = depreciationPeriod; + } + + public String getEnableDate() { + return enableDate; + } + + public void setEnableDate(String enableDate) { + this.enableDate = enableDate; + } + + public String getEquipmentCategory() { + return equipmentCategory; + } + + public void setEquipmentCategory(String equipmentCategory) { + this.equipmentCategory = equipmentCategory; + } + + public String getEquipmentCategoryName() { + return equipmentCategoryName; + } + + public void setEquipmentCategoryName(String equipmentCategoryName) { + this.equipmentCategoryName = equipmentCategoryName; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getEquipmentSpecifications() { + return equipmentSpecifications; + } + + public void setEquipmentSpecifications(String equipmentSpecifications) { + this.equipmentSpecifications = equipmentSpecifications; + } + + public String getEquipmentType() { + return equipmentType; + } + + public void setEquipmentType(String equipmentType) { + this.equipmentType = equipmentType; + } + + public String getEquipmentTypeName() { + return equipmentTypeName; + } + + public void setEquipmentTypeName(String equipmentTypeName) { + this.equipmentTypeName = equipmentTypeName; + } + + public String getFileList() { + return fileList; + } + + public void setFileList(String fileList) { + this.fileList = fileList; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInstallIncidentalExpenses() { + return installIncidentalExpenses; + } + + public void setInstallIncidentalExpenses(String installIncidentalExpenses) { + this.installIncidentalExpenses = installIncidentalExpenses; + } + + public String getInstallPlace() { + return installPlace; + } + + public void setInstallPlace(String installPlace) { + this.installPlace = installPlace; + } + + public String getIntactState() { + return intactState; + } + + public void setIntactState(String intactState) { + this.intactState = intactState; + } + + public String getIsCalibrationTestEquipment() { + return isCalibrationTestEquipment; + } + + public void setIsCalibrationTestEquipment(String isCalibrationTestEquipment) { + this.isCalibrationTestEquipment = isCalibrationTestEquipment; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIsFixedAssets() { + return isFixedAssets; + } + + public void setIsFixedAssets(String isFixedAssets) { + this.isFixedAssets = isFixedAssets; + } + + public String getIsMeasureAccount() { + return isMeasureAccount; + } + + public void setIsMeasureAccount(String isMeasureAccount) { + this.isMeasureAccount = isMeasureAccount; + } + + public String getIsStandardSupportEquipment() { + return isStandardSupportEquipment; + } + + public void setIsStandardSupportEquipment(String isStandardSupportEquipment) { + this.isStandardSupportEquipment = isStandardSupportEquipment; + } + + public String getLabelBind() { + return labelBind; + } + + public void setLabelBind(String labelBind) { + this.labelBind = labelBind; + } + + public String getMajorCategory() { + return majorCategory; + } + + public void setMajorCategory(String majorCategory) { + this.majorCategory = majorCategory; + } + + public String getMajorCategoryName() { + return majorCategoryName; + } + + public void setMajorCategoryName(String majorCategoryName) { + this.majorCategoryName = majorCategoryName; + } + + public String getManagerLevel() { + return managerLevel; + } + + public void setManagerLevel(String managerLevel) { + this.managerLevel = managerLevel; + } + + public String getManagerLevelName() { + return managerLevelName; + } + + public void setManagerLevelName(String managerLevelName) { + this.managerLevelName = managerLevelName; + } + + public String getManagerState() { + return managerState; + } + + public void setManagerState(String managerState) { + this.managerState = managerState; + } + + public String getManagerStateName() { + return managerStateName; + } + + public void setManagerStateName(String managerStateName) { + this.managerStateName = managerStateName; + } + + public String getManufacturer() { + return manufacturer; + } + + public void setManufacturer(String manufacturer) { + this.manufacturer = manufacturer; + } + + public String getManufacturerCountry() { + return manufacturerCountry; + } + + public void setManufacturerCountry(String manufacturerCountry) { + this.manufacturerCountry = manufacturerCountry; + } + + public String getManufacturingDate() { + return manufacturingDate; + } + + public void setManufacturingDate(String manufacturingDate) { + this.manufacturingDate = manufacturingDate; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getMesureCycle() { + return mesureCycle; + } + + public void setMesureCycle(String mesureCycle) { + this.mesureCycle = mesureCycle; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureDept() { + return mesureDept; + } + + public void setMesureDept(String mesureDept) { + this.mesureDept = mesureDept; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getMesureType() { + return mesureType; + } + + public void setMesureType(String mesureType) { + this.mesureType = mesureType; + } + + public String getMesureTypeName() { + return mesureTypeName; + } + + public void setMesureTypeName(String mesureTypeName) { + this.mesureTypeName = mesureTypeName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getOriginValue() { + return originValue; + } + + public void setOriginValue(String originValue) { + this.originValue = originValue; + } + + public String getOverallDimension() { + return overallDimension; + } + + public void setOverallDimension(String overallDimension) { + this.overallDimension = overallDimension; + } + + public String getPresentOriginValue() { + return presentOriginValue; + } + + public void setPresentOriginValue(String presentOriginValue) { + this.presentOriginValue = presentOriginValue; + } + + public String getPurpose() { + return purpose; + } + + public void setPurpose(String purpose) { + this.purpose = purpose; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSinglePrice() { + return singlePrice; + } + + public void setSinglePrice(String singlePrice) { + this.singlePrice = singlePrice; + } + + public String getSupportStandardEquipmentName() { + return supportStandardEquipmentName; + } + + public void setSupportStandardEquipmentName(String supportStandardEquipmentName) { + this.supportStandardEquipmentName = supportStandardEquipmentName; + } + + public String getSupportStandardEquipmentNo() { + return supportStandardEquipmentNo; + } + + public void setSupportStandardEquipmentNo(String supportStandardEquipmentNo) { + this.supportStandardEquipmentNo = supportStandardEquipmentNo; + } + + public String getTechnicalLevel() { + return technicalLevel; + } + + public void setTechnicalLevel(String technicalLevel) { + this.technicalLevel = technicalLevel; + } + + public String getUncertainty() { + return uncertainty; + } + + public void setUncertainty(String uncertainty) { + this.uncertainty = uncertainty; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDept() { + return useDept; + } + + public void setUseDept(String useDept) { + this.useDept = useDept; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getUsePerson() { + return usePerson; + } + + public void setUsePerson(String usePerson) { + this.usePerson = usePerson; + } + + public String getUsePersonName() { + return usePersonName; + } + + public void setUsePersonName(String usePersonName) { + this.usePersonName = usePersonName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + + public String getVersion() { + return version; + } + + public void setVersion(String version) { + this.version = version; + } + + public String getWeight() { + return weight; + } + + public void setWeight(String weight) { + this.weight = weight; + } + } + + public static class FileModel { + private String approvalStatus; + private String approvalStatusName; + private String createTime; + private String createUser; + private String createUserId; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String fileType; + private String fileTypeName; + private String id; + private String isDel; + private String minioFileName; + private String processId; + private String publishTime; + private String publisher; + private String remark; + private String updateTime; + + public String getApprovalStatus() { + return approvalStatus; + } + + public void setApprovalStatus(String approvalStatus) { + this.approvalStatus = approvalStatus; + } + + public String getApprovalStatusName() { + return approvalStatusName; + } + + public void setApprovalStatusName(String approvalStatusName) { + this.approvalStatusName = approvalStatusName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCreateUserId() { + return createUserId; + } + + public void setCreateUserId(String createUserId) { + this.createUserId = createUserId; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getFileType() { + return fileType; + } + + public void setFileType(String fileType) { + this.fileType = fileType; + } + + public String getFileTypeName() { + return fileTypeName; + } + + public void setFileTypeName(String fileTypeName) { + this.fileTypeName = fileTypeName; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getPublishTime() { + return publishTime; + } + + public void setPublishTime(String publishTime) { + this.publishTime = publishTime; + } + + public String getPublisher() { + return publisher; + } + + public void setPublisher(String publisher) { + this.publisher = publisher; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/CertificateListModel.java b/app/src/main/java/com/casic/xz/meterage/model/CertificateListModel.java new file mode 100644 index 0000000..0eed915 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/CertificateListModel.java @@ -0,0 +1,229 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class CertificateListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String approvalStatus; + private String approvalStatusName; + private String calibrationMajor; + private String certificateReportCode; + private String certificateReportName; + private String createTime; + private String decisionItem; + private String id; + private String manufacturingNo; + private String measureCategory; + private String measureCategoryName; + private String measurePersonId; + private String measurePersonName; + private String orderCode; + private String processId; + private String sampleModel; + private String sampleName; + private String sampleNo; + private String taskId; + + public String getApprovalStatus() { + return approvalStatus; + } + + public void setApprovalStatus(String approvalStatus) { + this.approvalStatus = approvalStatus; + } + + public String getApprovalStatusName() { + return approvalStatusName; + } + + public void setApprovalStatusName(String approvalStatusName) { + this.approvalStatusName = approvalStatusName; + } + + public String getCalibrationMajor() { + return calibrationMajor; + } + + public void setCalibrationMajor(String calibrationMajor) { + this.calibrationMajor = calibrationMajor; + } + + public String getCertificateReportCode() { + return certificateReportCode; + } + + public void setCertificateReportCode(String certificateReportCode) { + this.certificateReportCode = certificateReportCode; + } + + public String getCertificateReportName() { + return certificateReportName; + } + + public void setCertificateReportName(String certificateReportName) { + this.certificateReportName = certificateReportName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getDecisionItem() { + return decisionItem; + } + + public void setDecisionItem(String decisionItem) { + this.decisionItem = decisionItem; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getMeasureCategory() { + return measureCategory; + } + + public void setMeasureCategory(String measureCategory) { + this.measureCategory = measureCategory; + } + + public String getMeasureCategoryName() { + return measureCategoryName; + } + + public void setMeasureCategoryName(String measureCategoryName) { + this.measureCategoryName = measureCategoryName; + } + + public String getMeasurePersonId() { + return measurePersonId; + } + + public void setMeasurePersonId(String measurePersonId) { + this.measurePersonId = measurePersonId; + } + + public String getMeasurePersonName() { + return measurePersonName; + } + + public void setMeasurePersonName(String measurePersonName) { + this.measurePersonName = measurePersonName; + } + + public String getOrderCode() { + return orderCode; + } + + public void setOrderCode(String orderCode) { + this.orderCode = orderCode; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getSampleModel() { + return sampleModel; + } + + public void setSampleModel(String sampleModel) { + this.sampleModel = sampleModel; + } + + public String getSampleName() { + return sampleName; + } + + public void setSampleName(String sampleName) { + this.sampleName = sampleName; + } + + public String getSampleNo() { + return sampleNo; + } + + public void setSampleNo(String sampleNo) { + this.sampleNo = sampleNo; + } + + public String getTaskId() { + return taskId; + } + + public void setTaskId(String taskId) { + this.taskId = taskId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/CertificateModel.java b/app/src/main/java/com/casic/xz/meterage/model/CertificateModel.java deleted file mode 100644 index ec0d25b..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/CertificateModel.java +++ /dev/null @@ -1,202 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class CertificateModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String approvalStatus; - private String approvalStatusName; - private String calibrationMajor; - private String certificateReportCode; - private String certificateReportName; - private String createTime; - private String decisionItem; - private String id; - private String manufacturingNo; - private String measurePersonId; - private String orderCode; - private String processId; - private String sampleModel; - private String sampleName; - private String sampleNo; - private String taskId; - - public String getApprovalStatus() { - return approvalStatus; - } - - public void setApprovalStatus(String approvalStatus) { - this.approvalStatus = approvalStatus; - } - - public String getApprovalStatusName() { - return approvalStatusName; - } - - public void setApprovalStatusName(String approvalStatusName) { - this.approvalStatusName = approvalStatusName; - } - - public String getCalibrationMajor() { - return calibrationMajor; - } - - public void setCalibrationMajor(String calibrationMajor) { - this.calibrationMajor = calibrationMajor; - } - - public String getCertificateReportCode() { - return certificateReportCode; - } - - public void setCertificateReportCode(String certificateReportCode) { - this.certificateReportCode = certificateReportCode; - } - - public String getCertificateReportName() { - return certificateReportName; - } - - public void setCertificateReportName(String certificateReportName) { - this.certificateReportName = certificateReportName; - } - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getDecisionItem() { - return decisionItem; - } - - public void setDecisionItem(String decisionItem) { - this.decisionItem = decisionItem; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getManufacturingNo() { - return manufacturingNo; - } - - public void setManufacturingNo(String manufacturingNo) { - this.manufacturingNo = manufacturingNo; - } - - public String getMeasurePersonId() { - return measurePersonId; - } - - public void setMeasurePersonId(String measurePersonId) { - this.measurePersonId = measurePersonId; - } - - public String getOrderCode() { - return orderCode; - } - - public void setOrderCode(String orderCode) { - this.orderCode = orderCode; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public String getSampleModel() { - return sampleModel; - } - - public void setSampleModel(String sampleModel) { - this.sampleModel = sampleModel; - } - - public String getSampleName() { - return sampleName; - } - - public void setSampleName(String sampleName) { - this.sampleName = sampleName; - } - - public String getSampleNo() { - return sampleNo; - } - - public void setSampleNo(String sampleNo) { - this.sampleNo = sampleNo; - } - - public String getTaskId() { - return taskId; - } - - public void setTaskId(String taskId) { - this.taskId = taskId; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index b0dec00..a4f3c46 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -345,4 +345,22 @@ @QueryMap limit: Map, @QueryMap offset: Map ): String + + /** + * 获取委托书详情 + */ + @POST("/business/certificateReport/detail") + suspend fun getCertificateReportDetail( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 提交证书 + */ + @POST("/business/certificateReport/submit") + suspend fun submit( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String } \ 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 cef55ec..8bf4070 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 @@ -800,4 +800,29 @@ AuthenticationHelper.token!!, requestBody, limitMap, offsetMap ) } + + /** + * 获取证书报告详情 + */ + suspend fun getCertificateReportDetail(id: String): String { + val param = JsonObject() + param.addProperty("id", id) + val requestBody = param.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getCertificateReportDetail(AuthenticationHelper.token!!, requestBody) + } + + /** + * 提交证书报告 + */ + suspend fun submit(id: String): String { + val param = JsonObject() + param.addProperty("formId", "ywglzsbg") + param.addProperty("id", id) + val requestBody = param.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.submit(AuthenticationHelper.token!!, requestBody) + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportActivity.kt index 2baefd2..fa4e129 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportActivity.kt @@ -19,15 +19,21 @@ "已通过", "未通过", "已取消", - "非草稿", - "未通过", "可打印" ) private var fragmentPages: ArrayList = ArrayList() init { - pageTitles.indices.forEach { - fragmentPages.add(CertificateReportFragment((it + 1).toString())) + pageTitles.forEach { + when (it) { + "草稿箱" -> fragmentPages.add(CertificateReportFragment("1")) + "待审批" -> fragmentPages.add(CertificateReportFragment("2")) + "审批中" -> fragmentPages.add(CertificateReportFragment("3")) + "已通过" -> fragmentPages.add(CertificateReportFragment("4")) + "未通过" -> fragmentPages.add(CertificateReportFragment("5")) + "已取消" -> fragmentPages.add(CertificateReportFragment("6")) + "可打印" -> fragmentPages.add(CertificateReportFragment("9")) + } } } diff --git a/app/build.gradle b/app/build.gradle index 5ba44f0..298f687 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -53,7 +53,8 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "XZJL_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" +// outputFileName = "XZJL_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "XZJL_" + getBuildDate() + "_Beta.apk" } } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4b914b5..ebea092 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -67,6 +67,7 @@ + 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 new file mode 100644 index 0000000..a75e566 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.certificate + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class ApprovalProcessFragment :KotlinBaseFragment(){ + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_certificate_approval_process + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt new file mode 100644 index 0000000..5882c3d --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt @@ -0,0 +1,77 @@ +package com.casic.xz.meterage.fragment.certificate + +import android.graphics.Color +import android.graphics.Paint +import android.util.Log +import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.watchAttachFile +import com.casic.xz.meterage.model.CertificateDetailModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.pengxh.kt.lite.extensions.toJson +import kotlinx.android.synthetic.main.fragment_certificate_basic_information.* + +class BasicInformationFragment(private val data: CertificateDetailModel.DataModel) : + KotlinBaseFragment() { + + override fun initData() { + val businessOriginal = data.businessOriginalRecord + + reportCodeView.text = data.certificateReportCode + originalCodeView.text = businessOriginal.originalRecordCode + checkCategoryView.text = businessOriginal.measureCategoryName + + Log.d( + "Casic", + "BasicInformationFragment => initData: ${businessOriginal.fileList.toJson()}" + ) +// basisFileView.text = businessOriginal.fileList + + val sampleInfo = businessOriginal.customerSampleInfo + sampleCodeView.text = sampleInfo.sampleNo + sampleNameView.text = sampleInfo.sampleName + manufacturingCodeView.text = sampleInfo.manufacturingNo + modelView.text = sampleInfo.sampleModel + entrustCodeView.text = sampleInfo.customerNo + entrustNameView.text = sampleInfo.customerName + entrustContactView.text = sampleInfo.phone + entrustEmailView.text = sampleInfo.postalCode + entrustAddressView.text = sampleInfo.customerAddress + senderView.text = sampleInfo.deliverer + senderContactView.text = sampleInfo.delivererTel + checkTypeView.text = sampleInfo.measureContent + remarkView.text = sampleInfo.remark + + estimateServedTimeView.text = businessOriginal.businessOrder.planDeliverTime + estimateCompleteTimeView.text = businessOriginal.businessOrder.requireOverTime + + if (data.certificateReportFile.isNullOrBlank()) { + reportFileView.text = "暂无附件" + } else { + val reportFileName = data.certificateReportFile + + reportFileView.text = reportFileName + val textPaint = reportFileView.paint + textPaint.flags = Paint.UNDERLINE_TEXT_FLAG + textPaint.isAntiAlias = true + reportFileView.setTextColor(Color.BLUE) + + reportFileView.setOnClickListener { + reportFileName.watchAttachFile(requireContext()) + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_certificate_basic_information + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt index 2f3c95c..b1df400 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt @@ -4,19 +4,24 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.addAll +import com.casic.xz.meterage.extensions.diffCurrentTime +import com.casic.xz.meterage.extensions.formatToDate import com.casic.xz.meterage.extensions.showEmptyPage -import com.casic.xz.meterage.model.CertificateModel +import com.casic.xz.meterage.model.CertificateListModel +import com.casic.xz.meterage.view.home.CertificateReportDetailActivity import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler import kotlinx.android.synthetic.main.fragment_certificate_report.* import kotlinx.android.synthetic.main.include_empty_view.* /** - * 计量法规 + * 证书报告 * * formId:ywglzsbg * */ @@ -24,8 +29,8 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var certificateViewModel: CertificateViewModel - private lateinit var certificateAdapter: NormalRecyclerAdapter - private var dataBeans: MutableList = ArrayList() + private lateinit var certificateAdapter: NormalRecyclerAdapter + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false @@ -119,40 +124,37 @@ } else { emptyView!!.hide() certificateAdapter = object : - NormalRecyclerAdapter( + NormalRecyclerAdapter( R.layout.item_certificate_rv_l, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, - item: CertificateModel.DataModel.RowsModel + item: CertificateListModel.DataModel.RowsModel ) { + val deltaT = item.createTime.diffCurrentTime() + val diffTime = if (deltaT < 24) { + "${deltaT}小时前" + } else { + item.createTime.formatToDate() + } + viewHolder.setText(R.id.reportNameView, item.certificateReportName) -// .setText(R.id.fileStateView, item.effectiveStatusName) -// .setText(R.id.remarkView, "备注：$remark") -// .setText(R.id.fileCodeView, "文件号：${item.fileNo}") -// .setText(R.id.releaseDateView, "实施时间：${item.publishTime}") -// -// if (!item.effectiveStatus.equals("1")) { -// viewHolder.setBackgroundColor( -// R.id.fileStateView, -// R.color.gray.convertColor(requireContext()) -// ) -// } + .setText(R.id.createTimeView, diffTime) + .setText(R.id.categoryView, "校验类别：${item.measureCategoryName}") + .setText(R.id.technicianView, "检定员：${item.measurePersonName}") + + viewHolder.setOnClickListener(R.id.showDetailButton) { + requireContext().navigatePageTo( + addAll(item.approvalStatus, item.id) + ) + } } } certificateRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) certificateRecyclerView.adapter = certificateAdapter - certificateAdapter.setOnItemClickedListener(object : - NormalRecyclerAdapter.OnItemClickedListener { - override fun onItemClicked( - position: Int, t: CertificateModel.DataModel.RowsModel - ) { -// requireContext().navigatePageTo(t.toJson()) - } - }) } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt new file mode 100644 index 0000000..2d5ac61 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.certificate + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class ExceptionReportFragment :KotlinBaseFragment(){ + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_certificate_exception_report + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/model/CertificateDetailModel.java b/app/src/main/java/com/casic/xz/meterage/model/CertificateDetailModel.java new file mode 100644 index 0000000..42efccd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/CertificateDetailModel.java @@ -0,0 +1,2080 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class CertificateDetailModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private String approvalSignId; + private String approvalStatus; + private String approvalStatusName; + private BusinessOriginalRecordModel businessOriginalRecord; + private String calibrationMajor; + private String calibrationMajorName; + private String certificateReportCategory; + private String certificateReportCode; + private String certificateReportFile; + private String certificateReportName; + private String createTime; + private String createUser; + private String expirationDate; + private String id; + private String isDel; + private String issuanceDate; + private String measureDeptId; + private String measurePersonId; + private String measureResult; + private String orderId; + private String originalRecordId; + private String printNum; + private String printStatus; + private String processId; + private String remark; + private String sampleId; + private String signId; + private String templateId; + private String updateTime; + + public String getApprovalSignId() { + return approvalSignId; + } + + public void setApprovalSignId(String approvalSignId) { + this.approvalSignId = approvalSignId; + } + + public String getApprovalStatus() { + return approvalStatus; + } + + public void setApprovalStatus(String approvalStatus) { + this.approvalStatus = approvalStatus; + } + + public String getApprovalStatusName() { + return approvalStatusName; + } + + public void setApprovalStatusName(String approvalStatusName) { + this.approvalStatusName = approvalStatusName; + } + + public BusinessOriginalRecordModel getBusinessOriginalRecord() { + return businessOriginalRecord; + } + + public void setBusinessOriginalRecord(BusinessOriginalRecordModel businessOriginalRecord) { + this.businessOriginalRecord = businessOriginalRecord; + } + + public String getCalibrationMajor() { + return calibrationMajor; + } + + public void setCalibrationMajor(String calibrationMajor) { + this.calibrationMajor = calibrationMajor; + } + + public String getCalibrationMajorName() { + return calibrationMajorName; + } + + public void setCalibrationMajorName(String calibrationMajorName) { + this.calibrationMajorName = calibrationMajorName; + } + + public String getCertificateReportCategory() { + return certificateReportCategory; + } + + public void setCertificateReportCategory(String certificateReportCategory) { + this.certificateReportCategory = certificateReportCategory; + } + + public String getCertificateReportCode() { + return certificateReportCode; + } + + public void setCertificateReportCode(String certificateReportCode) { + this.certificateReportCode = certificateReportCode; + } + + public String getCertificateReportFile() { + return certificateReportFile; + } + + public void setCertificateReportFile(String certificateReportFile) { + this.certificateReportFile = certificateReportFile; + } + + public String getCertificateReportName() { + return certificateReportName; + } + + public void setCertificateReportName(String certificateReportName) { + this.certificateReportName = certificateReportName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getExpirationDate() { + return expirationDate; + } + + public void setExpirationDate(String expirationDate) { + this.expirationDate = expirationDate; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String isIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIssuanceDate() { + return issuanceDate; + } + + public void setIssuanceDate(String issuanceDate) { + this.issuanceDate = issuanceDate; + } + + public String getMeasureDeptId() { + return measureDeptId; + } + + public void setMeasureDeptId(String measureDeptId) { + this.measureDeptId = measureDeptId; + } + + public String getMeasurePersonId() { + return measurePersonId; + } + + public void setMeasurePersonId(String measurePersonId) { + this.measurePersonId = measurePersonId; + } + + public String getMeasureResult() { + return measureResult; + } + + public void setMeasureResult(String measureResult) { + this.measureResult = measureResult; + } + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public String getOriginalRecordId() { + return originalRecordId; + } + + public void setOriginalRecordId(String originalRecordId) { + this.originalRecordId = originalRecordId; + } + + public String getPrintNum() { + return printNum; + } + + public void setPrintNum(String printNum) { + this.printNum = printNum; + } + + public String getPrintStatus() { + return printStatus; + } + + public void setPrintStatus(String printStatus) { + this.printStatus = printStatus; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSampleId() { + return sampleId; + } + + public void setSampleId(String sampleId) { + this.sampleId = sampleId; + } + + public String getSignId() { + return signId; + } + + public void setSignId(String signId) { + this.signId = signId; + } + + public String getTemplateId() { + return templateId; + } + + public void setTemplateId(String templateId) { + this.templateId = templateId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public static class BusinessOriginalRecordModel { + private BusinessEnvRecordModel businessEnvironmentRecord; + private BusinessOrderModel businessOrder; + private String calibrationPlace; + private String calibrationTime; + private String createTime; + private String createUser; + private BusinessOrderModel.CustomerSampleModel customerSampleInfo; + private String environmentId; + private List equipmentInfoList; + private List fileList; + private String id; + private String isDel; + private String measureCategory; + private String measureCategoryName; + private String orderId; + private String originalRecordCode; + private String originalRecordFile; + private String originalRecordName; + private String remark; + private String sampleId; + private String templateId; + private String templateName; + private String updateTime; + + public BusinessEnvRecordModel getBusinessEnvironmentRecord() { + return businessEnvironmentRecord; + } + + public void setBusinessEnvironmentRecord(BusinessEnvRecordModel businessEnvironmentRecord) { + this.businessEnvironmentRecord = businessEnvironmentRecord; + } + + public BusinessOrderModel getBusinessOrder() { + return businessOrder; + } + + public void setBusinessOrder(BusinessOrderModel businessOrder) { + this.businessOrder = businessOrder; + } + + public String getCalibrationPlace() { + return calibrationPlace; + } + + public void setCalibrationPlace(String calibrationPlace) { + this.calibrationPlace = calibrationPlace; + } + + public String getCalibrationTime() { + return calibrationTime; + } + + public void setCalibrationTime(String calibrationTime) { + this.calibrationTime = calibrationTime; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public BusinessOrderModel.CustomerSampleModel getCustomerSampleInfo() { + return customerSampleInfo; + } + + public void setCustomerSampleInfo(BusinessOrderModel.CustomerSampleModel customerSampleInfo) { + this.customerSampleInfo = customerSampleInfo; + } + + public String getEnvironmentId() { + return environmentId; + } + + public void setEnvironmentId(String environmentId) { + this.environmentId = environmentId; + } + + public List getEquipmentInfoList() { + return equipmentInfoList; + } + + public void setEquipmentInfoList(List equipmentInfoList) { + this.equipmentInfoList = equipmentInfoList; + } + + public List getFileList() { + return fileList; + } + + public void setFileList(List fileList) { + this.fileList = fileList; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String isIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getMeasureCategory() { + return measureCategory; + } + + public void setMeasureCategory(String measureCategory) { + this.measureCategory = measureCategory; + } + + public String getMeasureCategoryName() { + return measureCategoryName; + } + + public void setMeasureCategoryName(String measureCategoryName) { + this.measureCategoryName = measureCategoryName; + } + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public String getOriginalRecordCode() { + return originalRecordCode; + } + + public void setOriginalRecordCode(String originalRecordCode) { + this.originalRecordCode = originalRecordCode; + } + + public String getOriginalRecordFile() { + return originalRecordFile; + } + + public void setOriginalRecordFile(String originalRecordFile) { + this.originalRecordFile = originalRecordFile; + } + + public String getOriginalRecordName() { + return originalRecordName; + } + + public void setOriginalRecordName(String originalRecordName) { + this.originalRecordName = originalRecordName; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSampleId() { + return sampleId; + } + + public void setSampleId(String sampleId) { + this.sampleId = sampleId; + } + + public String getTemplateId() { + return templateId; + } + + public void setTemplateId(String templateId) { + this.templateId = templateId; + } + + public String getTemplateName() { + return templateName; + } + + public void setTemplateName(String templateName) { + this.templateName = templateName; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public static class BusinessEnvRecordModel { + private String createTime; + private String createUser; + private String environmentCode; + private String humidity; + private String id; + private String isDel; + private String outputVoltage; + private String recordTime; + private String recorder; + private String remark; + private String roomNumber; + private String temperature; + private String updateTime; + private String zeroGroundVoltage; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEnvironmentCode() { + return environmentCode; + } + + public void setEnvironmentCode(String environmentCode) { + this.environmentCode = environmentCode; + } + + public String getHumidity() { + return humidity; + } + + public void setHumidity(String humidity) { + this.humidity = humidity; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String isIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getOutputVoltage() { + return outputVoltage; + } + + public void setOutputVoltage(String outputVoltage) { + this.outputVoltage = outputVoltage; + } + + public String getRecordTime() { + return recordTime; + } + + public void setRecordTime(String recordTime) { + this.recordTime = recordTime; + } + + public String getRecorder() { + return recorder; + } + + public void setRecorder(String recorder) { + this.recorder = recorder; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getRoomNumber() { + return roomNumber; + } + + public void setRoomNumber(String roomNumber) { + this.roomNumber = roomNumber; + } + + public String getTemperature() { + return temperature; + } + + public void setTemperature(String temperature) { + this.temperature = temperature; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getZeroGroundVoltage() { + return zeroGroundVoltage; + } + + public void setZeroGroundVoltage(String zeroGroundVoltage) { + this.zeroGroundVoltage = zeroGroundVoltage; + } + } + + public static class BusinessOrderModel { + private String certifications; + private String createTime; + private String createUser; + private String customerAddress; + private String customerId; + private String customerName; + private String customerNo; + private String customerPhone; + private List customerSampleInfoList; + private String deliverTime; + private String deliverer; + private String delivererId; + private String delivererTel; + private String id; + private String isDel; + private String isUrgent; + private String minioFileName; + private String orderCode; + private String orderTime; + private String planDeliverTime; + private String remark; + private String requireOverTime; + private String status; + private String updateTime; + private String updateUser; + + public String getCertifications() { + return certifications; + } + + public void setCertifications(String certifications) { + this.certifications = certifications; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCustomerAddress() { + return customerAddress; + } + + public void setCustomerAddress(String customerAddress) { + this.customerAddress = customerAddress; + } + + public String getCustomerId() { + return customerId; + } + + public void setCustomerId(String customerId) { + this.customerId = customerId; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public String getCustomerPhone() { + return customerPhone; + } + + public void setCustomerPhone(String customerPhone) { + this.customerPhone = customerPhone; + } + + public List getCustomerSampleInfoList() { + return customerSampleInfoList; + } + + public void setCustomerSampleInfoList(List customerSampleInfoList) { + this.customerSampleInfoList = customerSampleInfoList; + } + + public String getDeliverTime() { + return deliverTime; + } + + public void setDeliverTime(String deliverTime) { + this.deliverTime = deliverTime; + } + + public String getDeliverer() { + return deliverer; + } + + public void setDeliverer(String deliverer) { + this.deliverer = deliverer; + } + + public String getDelivererId() { + return delivererId; + } + + public void setDelivererId(String delivererId) { + this.delivererId = delivererId; + } + + public String getDelivererTel() { + return delivererTel; + } + + public void setDelivererTel(String delivererTel) { + this.delivererTel = delivererTel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIsUrgent() { + return isUrgent; + } + + public void setIsUrgent(String isUrgent) { + this.isUrgent = isUrgent; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getOrderCode() { + return orderCode; + } + + public void setOrderCode(String orderCode) { + this.orderCode = orderCode; + } + + public String getOrderTime() { + return orderTime; + } + + public void setOrderTime(String orderTime) { + this.orderTime = orderTime; + } + + public String getPlanDeliverTime() { + return planDeliverTime; + } + + public void setPlanDeliverTime(String planDeliverTime) { + this.planDeliverTime = planDeliverTime; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getRequireOverTime() { + return requireOverTime; + } + + public void setRequireOverTime(String requireOverTime) { + this.requireOverTime = requireOverTime; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUpdateUser() { + return updateUser; + } + + public void setUpdateUser(String updateUser) { + this.updateUser = updateUser; + } + + public static class CustomerSampleModel { + private String abc; + private String appendix; + private String appendixDescn; + private String createTime; + private String createUser; + private String customerAddress; + private String customerId; + private String customerName; + private String customerNo; + private String deliverer; + private String delivererTel; + private String id; + private String isDel; + private String isExistSample; + private String labelBind; + private String manufacturer; + private String manufacturerCountry; + private String manufacturingDate; + private String manufacturingNo; + private String measureCategory; + private String measureCategoryName; + private String measureContent; + private String measureLastTime; + private String measurePeriod; + private String measureType; + private String measureTypeName; + private String minioFileName; + private String orderId; + private String phone; + private String postalCode; + private String powerVoltage; + private String remark; + private String sampleBelong; + private String sampleBelongName; + private String sampleModel; + private String sampleName; + private String sampleNo; + private String specialRequire; + private String updateTime; + private String updateUser; + private String validDeadline; + + public String getAbc() { + return abc; + } + + public void setAbc(String abc) { + this.abc = abc; + } + + public String getAppendix() { + return appendix; + } + + public void setAppendix(String appendix) { + this.appendix = appendix; + } + + public String getAppendixDescn() { + return appendixDescn; + } + + public void setAppendixDescn(String appendixDescn) { + this.appendixDescn = appendixDescn; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCustomerAddress() { + return customerAddress; + } + + public void setCustomerAddress(String customerAddress) { + this.customerAddress = customerAddress; + } + + public String getCustomerId() { + return customerId; + } + + public void setCustomerId(String customerId) { + this.customerId = customerId; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public String getDeliverer() { + return deliverer; + } + + public void setDeliverer(String deliverer) { + this.deliverer = deliverer; + } + + public String getDelivererTel() { + return delivererTel; + } + + public void setDelivererTel(String delivererTel) { + this.delivererTel = delivererTel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIsExistSample() { + return isExistSample; + } + + public void setIsExistSample(String isExistSample) { + this.isExistSample = isExistSample; + } + + public String getLabelBind() { + return labelBind; + } + + public void setLabelBind(String labelBind) { + this.labelBind = labelBind; + } + + public String getManufacturer() { + return manufacturer; + } + + public void setManufacturer(String manufacturer) { + this.manufacturer = manufacturer; + } + + public String getManufacturerCountry() { + return manufacturerCountry; + } + + public void setManufacturerCountry(String manufacturerCountry) { + this.manufacturerCountry = manufacturerCountry; + } + + public String getManufacturingDate() { + return manufacturingDate; + } + + public void setManufacturingDate(String manufacturingDate) { + this.manufacturingDate = manufacturingDate; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getMeasureCategory() { + return measureCategory; + } + + public void setMeasureCategory(String measureCategory) { + this.measureCategory = measureCategory; + } + + public String getMeasureCategoryName() { + return measureCategoryName; + } + + public void setMeasureCategoryName(String measureCategoryName) { + this.measureCategoryName = measureCategoryName; + } + + public String getMeasureContent() { + return measureContent; + } + + public void setMeasureContent(String measureContent) { + this.measureContent = measureContent; + } + + public String getMeasureLastTime() { + return measureLastTime; + } + + public void setMeasureLastTime(String measureLastTime) { + this.measureLastTime = measureLastTime; + } + + public String getMeasurePeriod() { + return measurePeriod; + } + + public void setMeasurePeriod(String measurePeriod) { + this.measurePeriod = measurePeriod; + } + + public String getMeasureType() { + return measureType; + } + + public void setMeasureType(String measureType) { + this.measureType = measureType; + } + + public String getMeasureTypeName() { + return measureTypeName; + } + + public void setMeasureTypeName(String measureTypeName) { + this.measureTypeName = measureTypeName; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getPostalCode() { + return postalCode; + } + + public void setPostalCode(String postalCode) { + this.postalCode = postalCode; + } + + public String getPowerVoltage() { + return powerVoltage; + } + + public void setPowerVoltage(String powerVoltage) { + this.powerVoltage = powerVoltage; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSampleBelong() { + return sampleBelong; + } + + public void setSampleBelong(String sampleBelong) { + this.sampleBelong = sampleBelong; + } + + public String getSampleBelongName() { + return sampleBelongName; + } + + public void setSampleBelongName(String sampleBelongName) { + this.sampleBelongName = sampleBelongName; + } + + public String getSampleModel() { + return sampleModel; + } + + public void setSampleModel(String sampleModel) { + this.sampleModel = sampleModel; + } + + public String getSampleName() { + return sampleName; + } + + public void setSampleName(String sampleName) { + this.sampleName = sampleName; + } + + public String getSampleNo() { + return sampleNo; + } + + public void setSampleNo(String sampleNo) { + this.sampleNo = sampleNo; + } + + public String getSpecialRequire() { + return specialRequire; + } + + public void setSpecialRequire(String specialRequire) { + this.specialRequire = specialRequire; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUpdateUser() { + return updateUser; + } + + public void setUpdateUser(String updateUser) { + this.updateUser = updateUser; + } + + public String getValidDeadline() { + return validDeadline; + } + + public void setValidDeadline(String validDeadline) { + this.validDeadline = validDeadline; + } + } + } + + public static class EquipmentModel { + private String abc; + private String abcName; + private String applyRelationId; + private String assetNo; + private String assetSource; + private String assetType; + private String assetTypeName; + private String attribute; + private String capitalSource; + private String capitalSourceName; + private String cardEstablishmentDate; + private String createTime; + private String createUser; + private String depreciationMethod; + private String depreciationMethodName; + private String depreciationPeriod; + private String enableDate; + private String equipmentCategory; + private String equipmentCategoryName; + private String equipmentName; + private String equipmentNo; + private String equipmentSpecifications; + private String equipmentType; + private String equipmentTypeName; + private String fileList; + private String id; + private String installIncidentalExpenses; + private String installPlace; + private String intactState; + private String isCalibrationTestEquipment; + private String isDel; + private String isFixedAssets; + private String isMeasureAccount; + private String isStandardSupportEquipment; + private String labelBind; + private String majorCategory; + private String majorCategoryName; + private String managerLevel; + private String managerLevelName; + private String managerState; + private String managerStateName; + private String manufacturer; + private String manufacturerCountry; + private String manufacturingDate; + private String manufacturingNo; + private String mesureCycle; + private String mesureDate; + private String mesureDept; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String mesureType; + private String mesureTypeName; + private String modelNo; + private String originValue; + private String overallDimension; + private String presentOriginValue; + private String purpose; + private String remark; + private String singlePrice; + private String supportStandardEquipmentName; + private String supportStandardEquipmentNo; + private String technicalLevel; + private String uncertainty; + private String updateTime; + private String useDept; + private String useDeptName; + private String usePerson; + private String usePersonName; + private String validDate; + private String version; + private String weight; + + public String getAbc() { + return abc; + } + + public void setAbc(String abc) { + this.abc = abc; + } + + public String getAbcName() { + return abcName; + } + + public void setAbcName(String abcName) { + this.abcName = abcName; + } + + public String getApplyRelationId() { + return applyRelationId; + } + + public void setApplyRelationId(String applyRelationId) { + this.applyRelationId = applyRelationId; + } + + public String getAssetNo() { + return assetNo; + } + + public void setAssetNo(String assetNo) { + this.assetNo = assetNo; + } + + public String getAssetSource() { + return assetSource; + } + + public void setAssetSource(String assetSource) { + this.assetSource = assetSource; + } + + public String getAssetType() { + return assetType; + } + + public void setAssetType(String assetType) { + this.assetType = assetType; + } + + public String getAssetTypeName() { + return assetTypeName; + } + + public void setAssetTypeName(String assetTypeName) { + this.assetTypeName = assetTypeName; + } + + public String getAttribute() { + return attribute; + } + + public void setAttribute(String attribute) { + this.attribute = attribute; + } + + public String getCapitalSource() { + return capitalSource; + } + + public void setCapitalSource(String capitalSource) { + this.capitalSource = capitalSource; + } + + public String getCapitalSourceName() { + return capitalSourceName; + } + + public void setCapitalSourceName(String capitalSourceName) { + this.capitalSourceName = capitalSourceName; + } + + public String getCardEstablishmentDate() { + return cardEstablishmentDate; + } + + public void setCardEstablishmentDate(String cardEstablishmentDate) { + this.cardEstablishmentDate = cardEstablishmentDate; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getDepreciationMethod() { + return depreciationMethod; + } + + public void setDepreciationMethod(String depreciationMethod) { + this.depreciationMethod = depreciationMethod; + } + + public String getDepreciationMethodName() { + return depreciationMethodName; + } + + public void setDepreciationMethodName(String depreciationMethodName) { + this.depreciationMethodName = depreciationMethodName; + } + + public String getDepreciationPeriod() { + return depreciationPeriod; + } + + public void setDepreciationPeriod(String depreciationPeriod) { + this.depreciationPeriod = depreciationPeriod; + } + + public String getEnableDate() { + return enableDate; + } + + public void setEnableDate(String enableDate) { + this.enableDate = enableDate; + } + + public String getEquipmentCategory() { + return equipmentCategory; + } + + public void setEquipmentCategory(String equipmentCategory) { + this.equipmentCategory = equipmentCategory; + } + + public String getEquipmentCategoryName() { + return equipmentCategoryName; + } + + public void setEquipmentCategoryName(String equipmentCategoryName) { + this.equipmentCategoryName = equipmentCategoryName; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getEquipmentSpecifications() { + return equipmentSpecifications; + } + + public void setEquipmentSpecifications(String equipmentSpecifications) { + this.equipmentSpecifications = equipmentSpecifications; + } + + public String getEquipmentType() { + return equipmentType; + } + + public void setEquipmentType(String equipmentType) { + this.equipmentType = equipmentType; + } + + public String getEquipmentTypeName() { + return equipmentTypeName; + } + + public void setEquipmentTypeName(String equipmentTypeName) { + this.equipmentTypeName = equipmentTypeName; + } + + public String getFileList() { + return fileList; + } + + public void setFileList(String fileList) { + this.fileList = fileList; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInstallIncidentalExpenses() { + return installIncidentalExpenses; + } + + public void setInstallIncidentalExpenses(String installIncidentalExpenses) { + this.installIncidentalExpenses = installIncidentalExpenses; + } + + public String getInstallPlace() { + return installPlace; + } + + public void setInstallPlace(String installPlace) { + this.installPlace = installPlace; + } + + public String getIntactState() { + return intactState; + } + + public void setIntactState(String intactState) { + this.intactState = intactState; + } + + public String getIsCalibrationTestEquipment() { + return isCalibrationTestEquipment; + } + + public void setIsCalibrationTestEquipment(String isCalibrationTestEquipment) { + this.isCalibrationTestEquipment = isCalibrationTestEquipment; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIsFixedAssets() { + return isFixedAssets; + } + + public void setIsFixedAssets(String isFixedAssets) { + this.isFixedAssets = isFixedAssets; + } + + public String getIsMeasureAccount() { + return isMeasureAccount; + } + + public void setIsMeasureAccount(String isMeasureAccount) { + this.isMeasureAccount = isMeasureAccount; + } + + public String getIsStandardSupportEquipment() { + return isStandardSupportEquipment; + } + + public void setIsStandardSupportEquipment(String isStandardSupportEquipment) { + this.isStandardSupportEquipment = isStandardSupportEquipment; + } + + public String getLabelBind() { + return labelBind; + } + + public void setLabelBind(String labelBind) { + this.labelBind = labelBind; + } + + public String getMajorCategory() { + return majorCategory; + } + + public void setMajorCategory(String majorCategory) { + this.majorCategory = majorCategory; + } + + public String getMajorCategoryName() { + return majorCategoryName; + } + + public void setMajorCategoryName(String majorCategoryName) { + this.majorCategoryName = majorCategoryName; + } + + public String getManagerLevel() { + return managerLevel; + } + + public void setManagerLevel(String managerLevel) { + this.managerLevel = managerLevel; + } + + public String getManagerLevelName() { + return managerLevelName; + } + + public void setManagerLevelName(String managerLevelName) { + this.managerLevelName = managerLevelName; + } + + public String getManagerState() { + return managerState; + } + + public void setManagerState(String managerState) { + this.managerState = managerState; + } + + public String getManagerStateName() { + return managerStateName; + } + + public void setManagerStateName(String managerStateName) { + this.managerStateName = managerStateName; + } + + public String getManufacturer() { + return manufacturer; + } + + public void setManufacturer(String manufacturer) { + this.manufacturer = manufacturer; + } + + public String getManufacturerCountry() { + return manufacturerCountry; + } + + public void setManufacturerCountry(String manufacturerCountry) { + this.manufacturerCountry = manufacturerCountry; + } + + public String getManufacturingDate() { + return manufacturingDate; + } + + public void setManufacturingDate(String manufacturingDate) { + this.manufacturingDate = manufacturingDate; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getMesureCycle() { + return mesureCycle; + } + + public void setMesureCycle(String mesureCycle) { + this.mesureCycle = mesureCycle; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureDept() { + return mesureDept; + } + + public void setMesureDept(String mesureDept) { + this.mesureDept = mesureDept; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getMesureType() { + return mesureType; + } + + public void setMesureType(String mesureType) { + this.mesureType = mesureType; + } + + public String getMesureTypeName() { + return mesureTypeName; + } + + public void setMesureTypeName(String mesureTypeName) { + this.mesureTypeName = mesureTypeName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getOriginValue() { + return originValue; + } + + public void setOriginValue(String originValue) { + this.originValue = originValue; + } + + public String getOverallDimension() { + return overallDimension; + } + + public void setOverallDimension(String overallDimension) { + this.overallDimension = overallDimension; + } + + public String getPresentOriginValue() { + return presentOriginValue; + } + + public void setPresentOriginValue(String presentOriginValue) { + this.presentOriginValue = presentOriginValue; + } + + public String getPurpose() { + return purpose; + } + + public void setPurpose(String purpose) { + this.purpose = purpose; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSinglePrice() { + return singlePrice; + } + + public void setSinglePrice(String singlePrice) { + this.singlePrice = singlePrice; + } + + public String getSupportStandardEquipmentName() { + return supportStandardEquipmentName; + } + + public void setSupportStandardEquipmentName(String supportStandardEquipmentName) { + this.supportStandardEquipmentName = supportStandardEquipmentName; + } + + public String getSupportStandardEquipmentNo() { + return supportStandardEquipmentNo; + } + + public void setSupportStandardEquipmentNo(String supportStandardEquipmentNo) { + this.supportStandardEquipmentNo = supportStandardEquipmentNo; + } + + public String getTechnicalLevel() { + return technicalLevel; + } + + public void setTechnicalLevel(String technicalLevel) { + this.technicalLevel = technicalLevel; + } + + public String getUncertainty() { + return uncertainty; + } + + public void setUncertainty(String uncertainty) { + this.uncertainty = uncertainty; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDept() { + return useDept; + } + + public void setUseDept(String useDept) { + this.useDept = useDept; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getUsePerson() { + return usePerson; + } + + public void setUsePerson(String usePerson) { + this.usePerson = usePerson; + } + + public String getUsePersonName() { + return usePersonName; + } + + public void setUsePersonName(String usePersonName) { + this.usePersonName = usePersonName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + + public String getVersion() { + return version; + } + + public void setVersion(String version) { + this.version = version; + } + + public String getWeight() { + return weight; + } + + public void setWeight(String weight) { + this.weight = weight; + } + } + + public static class FileModel { + private String approvalStatus; + private String approvalStatusName; + private String createTime; + private String createUser; + private String createUserId; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String fileType; + private String fileTypeName; + private String id; + private String isDel; + private String minioFileName; + private String processId; + private String publishTime; + private String publisher; + private String remark; + private String updateTime; + + public String getApprovalStatus() { + return approvalStatus; + } + + public void setApprovalStatus(String approvalStatus) { + this.approvalStatus = approvalStatus; + } + + public String getApprovalStatusName() { + return approvalStatusName; + } + + public void setApprovalStatusName(String approvalStatusName) { + this.approvalStatusName = approvalStatusName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCreateUserId() { + return createUserId; + } + + public void setCreateUserId(String createUserId) { + this.createUserId = createUserId; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getFileType() { + return fileType; + } + + public void setFileType(String fileType) { + this.fileType = fileType; + } + + public String getFileTypeName() { + return fileTypeName; + } + + public void setFileTypeName(String fileTypeName) { + this.fileTypeName = fileTypeName; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getPublishTime() { + return publishTime; + } + + public void setPublishTime(String publishTime) { + this.publishTime = publishTime; + } + + public String getPublisher() { + return publisher; + } + + public void setPublisher(String publisher) { + this.publisher = publisher; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/CertificateListModel.java b/app/src/main/java/com/casic/xz/meterage/model/CertificateListModel.java new file mode 100644 index 0000000..0eed915 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/CertificateListModel.java @@ -0,0 +1,229 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class CertificateListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String approvalStatus; + private String approvalStatusName; + private String calibrationMajor; + private String certificateReportCode; + private String certificateReportName; + private String createTime; + private String decisionItem; + private String id; + private String manufacturingNo; + private String measureCategory; + private String measureCategoryName; + private String measurePersonId; + private String measurePersonName; + private String orderCode; + private String processId; + private String sampleModel; + private String sampleName; + private String sampleNo; + private String taskId; + + public String getApprovalStatus() { + return approvalStatus; + } + + public void setApprovalStatus(String approvalStatus) { + this.approvalStatus = approvalStatus; + } + + public String getApprovalStatusName() { + return approvalStatusName; + } + + public void setApprovalStatusName(String approvalStatusName) { + this.approvalStatusName = approvalStatusName; + } + + public String getCalibrationMajor() { + return calibrationMajor; + } + + public void setCalibrationMajor(String calibrationMajor) { + this.calibrationMajor = calibrationMajor; + } + + public String getCertificateReportCode() { + return certificateReportCode; + } + + public void setCertificateReportCode(String certificateReportCode) { + this.certificateReportCode = certificateReportCode; + } + + public String getCertificateReportName() { + return certificateReportName; + } + + public void setCertificateReportName(String certificateReportName) { + this.certificateReportName = certificateReportName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getDecisionItem() { + return decisionItem; + } + + public void setDecisionItem(String decisionItem) { + this.decisionItem = decisionItem; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getMeasureCategory() { + return measureCategory; + } + + public void setMeasureCategory(String measureCategory) { + this.measureCategory = measureCategory; + } + + public String getMeasureCategoryName() { + return measureCategoryName; + } + + public void setMeasureCategoryName(String measureCategoryName) { + this.measureCategoryName = measureCategoryName; + } + + public String getMeasurePersonId() { + return measurePersonId; + } + + public void setMeasurePersonId(String measurePersonId) { + this.measurePersonId = measurePersonId; + } + + public String getMeasurePersonName() { + return measurePersonName; + } + + public void setMeasurePersonName(String measurePersonName) { + this.measurePersonName = measurePersonName; + } + + public String getOrderCode() { + return orderCode; + } + + public void setOrderCode(String orderCode) { + this.orderCode = orderCode; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getSampleModel() { + return sampleModel; + } + + public void setSampleModel(String sampleModel) { + this.sampleModel = sampleModel; + } + + public String getSampleName() { + return sampleName; + } + + public void setSampleName(String sampleName) { + this.sampleName = sampleName; + } + + public String getSampleNo() { + return sampleNo; + } + + public void setSampleNo(String sampleNo) { + this.sampleNo = sampleNo; + } + + public String getTaskId() { + return taskId; + } + + public void setTaskId(String taskId) { + this.taskId = taskId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/CertificateModel.java b/app/src/main/java/com/casic/xz/meterage/model/CertificateModel.java deleted file mode 100644 index ec0d25b..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/CertificateModel.java +++ /dev/null @@ -1,202 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class CertificateModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String approvalStatus; - private String approvalStatusName; - private String calibrationMajor; - private String certificateReportCode; - private String certificateReportName; - private String createTime; - private String decisionItem; - private String id; - private String manufacturingNo; - private String measurePersonId; - private String orderCode; - private String processId; - private String sampleModel; - private String sampleName; - private String sampleNo; - private String taskId; - - public String getApprovalStatus() { - return approvalStatus; - } - - public void setApprovalStatus(String approvalStatus) { - this.approvalStatus = approvalStatus; - } - - public String getApprovalStatusName() { - return approvalStatusName; - } - - public void setApprovalStatusName(String approvalStatusName) { - this.approvalStatusName = approvalStatusName; - } - - public String getCalibrationMajor() { - return calibrationMajor; - } - - public void setCalibrationMajor(String calibrationMajor) { - this.calibrationMajor = calibrationMajor; - } - - public String getCertificateReportCode() { - return certificateReportCode; - } - - public void setCertificateReportCode(String certificateReportCode) { - this.certificateReportCode = certificateReportCode; - } - - public String getCertificateReportName() { - return certificateReportName; - } - - public void setCertificateReportName(String certificateReportName) { - this.certificateReportName = certificateReportName; - } - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getDecisionItem() { - return decisionItem; - } - - public void setDecisionItem(String decisionItem) { - this.decisionItem = decisionItem; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getManufacturingNo() { - return manufacturingNo; - } - - public void setManufacturingNo(String manufacturingNo) { - this.manufacturingNo = manufacturingNo; - } - - public String getMeasurePersonId() { - return measurePersonId; - } - - public void setMeasurePersonId(String measurePersonId) { - this.measurePersonId = measurePersonId; - } - - public String getOrderCode() { - return orderCode; - } - - public void setOrderCode(String orderCode) { - this.orderCode = orderCode; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public String getSampleModel() { - return sampleModel; - } - - public void setSampleModel(String sampleModel) { - this.sampleModel = sampleModel; - } - - public String getSampleName() { - return sampleName; - } - - public void setSampleName(String sampleName) { - this.sampleName = sampleName; - } - - public String getSampleNo() { - return sampleNo; - } - - public void setSampleNo(String sampleNo) { - this.sampleNo = sampleNo; - } - - public String getTaskId() { - return taskId; - } - - public void setTaskId(String taskId) { - this.taskId = taskId; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index b0dec00..a4f3c46 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -345,4 +345,22 @@ @QueryMap limit: Map, @QueryMap offset: Map ): String + + /** + * 获取委托书详情 + */ + @POST("/business/certificateReport/detail") + suspend fun getCertificateReportDetail( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 提交证书 + */ + @POST("/business/certificateReport/submit") + suspend fun submit( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String } \ 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 cef55ec..8bf4070 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 @@ -800,4 +800,29 @@ AuthenticationHelper.token!!, requestBody, limitMap, offsetMap ) } + + /** + * 获取证书报告详情 + */ + suspend fun getCertificateReportDetail(id: String): String { + val param = JsonObject() + param.addProperty("id", id) + val requestBody = param.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getCertificateReportDetail(AuthenticationHelper.token!!, requestBody) + } + + /** + * 提交证书报告 + */ + suspend fun submit(id: String): String { + val param = JsonObject() + param.addProperty("formId", "ywglzsbg") + param.addProperty("id", id) + val requestBody = param.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.submit(AuthenticationHelper.token!!, requestBody) + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportActivity.kt index 2baefd2..fa4e129 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportActivity.kt @@ -19,15 +19,21 @@ "已通过", "未通过", "已取消", - "非草稿", - "未通过", "可打印" ) private var fragmentPages: ArrayList = ArrayList() init { - pageTitles.indices.forEach { - fragmentPages.add(CertificateReportFragment((it + 1).toString())) + pageTitles.forEach { + when (it) { + "草稿箱" -> fragmentPages.add(CertificateReportFragment("1")) + "待审批" -> fragmentPages.add(CertificateReportFragment("2")) + "审批中" -> fragmentPages.add(CertificateReportFragment("3")) + "已通过" -> fragmentPages.add(CertificateReportFragment("4")) + "未通过" -> fragmentPages.add(CertificateReportFragment("5")) + "已取消" -> fragmentPages.add(CertificateReportFragment("6")) + "可打印" -> fragmentPages.add(CertificateReportFragment("9")) + } } } diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt new file mode 100644 index 0000000..e30c7c3 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt @@ -0,0 +1,106 @@ +package com.casic.xz.meterage.view.home + +import android.view.View +import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.SubViewPagerAdapter +import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.casic.xz.meterage.fragment.certificate.ApprovalProcessFragment +import com.casic.xz.meterage.fragment.certificate.BasicInformationFragment +import com.casic.xz.meterage.fragment.certificate.ExceptionReportFragment +import com.casic.xz.meterage.model.CertificateDetailModel +import com.casic.xz.meterage.utils.LoadingDialogHub +import com.casic.xz.meterage.vm.CertificateViewModel +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.vm.LoadState +import kotlinx.android.synthetic.main.activity_certificate_detail.* + +//"草稿箱" -> "1" +//"待审批" -> "2" +//"审批中" -> "3" +//"已通过" -> "4" +//"未通过" -> "5" +//"已取消" -> "6" +//"可打印" -> "9" + +class CertificateReportDetailActivity : KotlinBaseActivity() { + + private var fragmentPages: ArrayList = ArrayList() + private lateinit var certificateViewModel: CertificateViewModel + private lateinit var detailModel: CertificateDetailModel.DataModel + + override fun initData() { + val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! + + when (args[0]) { + "1" -> { + approvalView.text = "提交" + } + "2" -> { + approvalView.text = "审批" + } + "9" -> { + approvalView.text = "打印" + } + else -> { + approvalView.visibility = View.GONE + } + } + + certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] + certificateViewModel.getCertificateReportDetail(args[1]) + certificateViewModel.certificateDetail.observe(this) { + if (it.code == 200) { + + detailModel = it.data + + fragmentPages.add(BasicInformationFragment(detailModel)) + fragmentPages.add(ApprovalProcessFragment()) + fragmentPages.add(ExceptionReportFragment()) + + val pageTitles = arrayOf("基础信息", "审批流程", "异常报告") + + approvalViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, pageTitles + ) + //绑定 + topTabLayout.setupWithViewPager(approvalViewPager) + } + } + + certificateViewModel.submitResult.observe(this) { + if (it.code == 200) { + "提交成功".show(this) + finish() + } + } + } + + override fun initEvent() { + leftBackView.setOnClickListener { finish() } + + approvalView.setOnClickListener { + certificateViewModel.submit(detailModel.id) + } + } + + override fun initLayoutView(): Int = R.layout.activity_certificate_detail + + override fun observeRequestState() { + certificateViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + } +} \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 5ba44f0..298f687 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -53,7 +53,8 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "XZJL_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" +// outputFileName = "XZJL_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "XZJL_" + getBuildDate() + "_Beta.apk" } } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4b914b5..ebea092 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -67,6 +67,7 @@ + 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 new file mode 100644 index 0000000..a75e566 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.certificate + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class ApprovalProcessFragment :KotlinBaseFragment(){ + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_certificate_approval_process + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt new file mode 100644 index 0000000..5882c3d --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt @@ -0,0 +1,77 @@ +package com.casic.xz.meterage.fragment.certificate + +import android.graphics.Color +import android.graphics.Paint +import android.util.Log +import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.watchAttachFile +import com.casic.xz.meterage.model.CertificateDetailModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.pengxh.kt.lite.extensions.toJson +import kotlinx.android.synthetic.main.fragment_certificate_basic_information.* + +class BasicInformationFragment(private val data: CertificateDetailModel.DataModel) : + KotlinBaseFragment() { + + override fun initData() { + val businessOriginal = data.businessOriginalRecord + + reportCodeView.text = data.certificateReportCode + originalCodeView.text = businessOriginal.originalRecordCode + checkCategoryView.text = businessOriginal.measureCategoryName + + Log.d( + "Casic", + "BasicInformationFragment => initData: ${businessOriginal.fileList.toJson()}" + ) +// basisFileView.text = businessOriginal.fileList + + val sampleInfo = businessOriginal.customerSampleInfo + sampleCodeView.text = sampleInfo.sampleNo + sampleNameView.text = sampleInfo.sampleName + manufacturingCodeView.text = sampleInfo.manufacturingNo + modelView.text = sampleInfo.sampleModel + entrustCodeView.text = sampleInfo.customerNo + entrustNameView.text = sampleInfo.customerName + entrustContactView.text = sampleInfo.phone + entrustEmailView.text = sampleInfo.postalCode + entrustAddressView.text = sampleInfo.customerAddress + senderView.text = sampleInfo.deliverer + senderContactView.text = sampleInfo.delivererTel + checkTypeView.text = sampleInfo.measureContent + remarkView.text = sampleInfo.remark + + estimateServedTimeView.text = businessOriginal.businessOrder.planDeliverTime + estimateCompleteTimeView.text = businessOriginal.businessOrder.requireOverTime + + if (data.certificateReportFile.isNullOrBlank()) { + reportFileView.text = "暂无附件" + } else { + val reportFileName = data.certificateReportFile + + reportFileView.text = reportFileName + val textPaint = reportFileView.paint + textPaint.flags = Paint.UNDERLINE_TEXT_FLAG + textPaint.isAntiAlias = true + reportFileView.setTextColor(Color.BLUE) + + reportFileView.setOnClickListener { + reportFileName.watchAttachFile(requireContext()) + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_certificate_basic_information + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt index 2f3c95c..b1df400 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt @@ -4,19 +4,24 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.addAll +import com.casic.xz.meterage.extensions.diffCurrentTime +import com.casic.xz.meterage.extensions.formatToDate import com.casic.xz.meterage.extensions.showEmptyPage -import com.casic.xz.meterage.model.CertificateModel +import com.casic.xz.meterage.model.CertificateListModel +import com.casic.xz.meterage.view.home.CertificateReportDetailActivity import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler import kotlinx.android.synthetic.main.fragment_certificate_report.* import kotlinx.android.synthetic.main.include_empty_view.* /** - * 计量法规 + * 证书报告 * * formId:ywglzsbg * */ @@ -24,8 +29,8 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var certificateViewModel: CertificateViewModel - private lateinit var certificateAdapter: NormalRecyclerAdapter - private var dataBeans: MutableList = ArrayList() + private lateinit var certificateAdapter: NormalRecyclerAdapter + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false @@ -119,40 +124,37 @@ } else { emptyView!!.hide() certificateAdapter = object : - NormalRecyclerAdapter( + NormalRecyclerAdapter( R.layout.item_certificate_rv_l, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, - item: CertificateModel.DataModel.RowsModel + item: CertificateListModel.DataModel.RowsModel ) { + val deltaT = item.createTime.diffCurrentTime() + val diffTime = if (deltaT < 24) { + "${deltaT}小时前" + } else { + item.createTime.formatToDate() + } + viewHolder.setText(R.id.reportNameView, item.certificateReportName) -// .setText(R.id.fileStateView, item.effectiveStatusName) -// .setText(R.id.remarkView, "备注：$remark") -// .setText(R.id.fileCodeView, "文件号：${item.fileNo}") -// .setText(R.id.releaseDateView, "实施时间：${item.publishTime}") -// -// if (!item.effectiveStatus.equals("1")) { -// viewHolder.setBackgroundColor( -// R.id.fileStateView, -// R.color.gray.convertColor(requireContext()) -// ) -// } + .setText(R.id.createTimeView, diffTime) + .setText(R.id.categoryView, "校验类别：${item.measureCategoryName}") + .setText(R.id.technicianView, "检定员：${item.measurePersonName}") + + viewHolder.setOnClickListener(R.id.showDetailButton) { + requireContext().navigatePageTo( + addAll(item.approvalStatus, item.id) + ) + } } } certificateRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) certificateRecyclerView.adapter = certificateAdapter - certificateAdapter.setOnItemClickedListener(object : - NormalRecyclerAdapter.OnItemClickedListener { - override fun onItemClicked( - position: Int, t: CertificateModel.DataModel.RowsModel - ) { -// requireContext().navigatePageTo(t.toJson()) - } - }) } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt new file mode 100644 index 0000000..2d5ac61 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.certificate + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class ExceptionReportFragment :KotlinBaseFragment(){ + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_certificate_exception_report + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/model/CertificateDetailModel.java b/app/src/main/java/com/casic/xz/meterage/model/CertificateDetailModel.java new file mode 100644 index 0000000..42efccd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/CertificateDetailModel.java @@ -0,0 +1,2080 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class CertificateDetailModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private String approvalSignId; + private String approvalStatus; + private String approvalStatusName; + private BusinessOriginalRecordModel businessOriginalRecord; + private String calibrationMajor; + private String calibrationMajorName; + private String certificateReportCategory; + private String certificateReportCode; + private String certificateReportFile; + private String certificateReportName; + private String createTime; + private String createUser; + private String expirationDate; + private String id; + private String isDel; + private String issuanceDate; + private String measureDeptId; + private String measurePersonId; + private String measureResult; + private String orderId; + private String originalRecordId; + private String printNum; + private String printStatus; + private String processId; + private String remark; + private String sampleId; + private String signId; + private String templateId; + private String updateTime; + + public String getApprovalSignId() { + return approvalSignId; + } + + public void setApprovalSignId(String approvalSignId) { + this.approvalSignId = approvalSignId; + } + + public String getApprovalStatus() { + return approvalStatus; + } + + public void setApprovalStatus(String approvalStatus) { + this.approvalStatus = approvalStatus; + } + + public String getApprovalStatusName() { + return approvalStatusName; + } + + public void setApprovalStatusName(String approvalStatusName) { + this.approvalStatusName = approvalStatusName; + } + + public BusinessOriginalRecordModel getBusinessOriginalRecord() { + return businessOriginalRecord; + } + + public void setBusinessOriginalRecord(BusinessOriginalRecordModel businessOriginalRecord) { + this.businessOriginalRecord = businessOriginalRecord; + } + + public String getCalibrationMajor() { + return calibrationMajor; + } + + public void setCalibrationMajor(String calibrationMajor) { + this.calibrationMajor = calibrationMajor; + } + + public String getCalibrationMajorName() { + return calibrationMajorName; + } + + public void setCalibrationMajorName(String calibrationMajorName) { + this.calibrationMajorName = calibrationMajorName; + } + + public String getCertificateReportCategory() { + return certificateReportCategory; + } + + public void setCertificateReportCategory(String certificateReportCategory) { + this.certificateReportCategory = certificateReportCategory; + } + + public String getCertificateReportCode() { + return certificateReportCode; + } + + public void setCertificateReportCode(String certificateReportCode) { + this.certificateReportCode = certificateReportCode; + } + + public String getCertificateReportFile() { + return certificateReportFile; + } + + public void setCertificateReportFile(String certificateReportFile) { + this.certificateReportFile = certificateReportFile; + } + + public String getCertificateReportName() { + return certificateReportName; + } + + public void setCertificateReportName(String certificateReportName) { + this.certificateReportName = certificateReportName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getExpirationDate() { + return expirationDate; + } + + public void setExpirationDate(String expirationDate) { + this.expirationDate = expirationDate; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String isIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIssuanceDate() { + return issuanceDate; + } + + public void setIssuanceDate(String issuanceDate) { + this.issuanceDate = issuanceDate; + } + + public String getMeasureDeptId() { + return measureDeptId; + } + + public void setMeasureDeptId(String measureDeptId) { + this.measureDeptId = measureDeptId; + } + + public String getMeasurePersonId() { + return measurePersonId; + } + + public void setMeasurePersonId(String measurePersonId) { + this.measurePersonId = measurePersonId; + } + + public String getMeasureResult() { + return measureResult; + } + + public void setMeasureResult(String measureResult) { + this.measureResult = measureResult; + } + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public String getOriginalRecordId() { + return originalRecordId; + } + + public void setOriginalRecordId(String originalRecordId) { + this.originalRecordId = originalRecordId; + } + + public String getPrintNum() { + return printNum; + } + + public void setPrintNum(String printNum) { + this.printNum = printNum; + } + + public String getPrintStatus() { + return printStatus; + } + + public void setPrintStatus(String printStatus) { + this.printStatus = printStatus; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSampleId() { + return sampleId; + } + + public void setSampleId(String sampleId) { + this.sampleId = sampleId; + } + + public String getSignId() { + return signId; + } + + public void setSignId(String signId) { + this.signId = signId; + } + + public String getTemplateId() { + return templateId; + } + + public void setTemplateId(String templateId) { + this.templateId = templateId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public static class BusinessOriginalRecordModel { + private BusinessEnvRecordModel businessEnvironmentRecord; + private BusinessOrderModel businessOrder; + private String calibrationPlace; + private String calibrationTime; + private String createTime; + private String createUser; + private BusinessOrderModel.CustomerSampleModel customerSampleInfo; + private String environmentId; + private List equipmentInfoList; + private List fileList; + private String id; + private String isDel; + private String measureCategory; + private String measureCategoryName; + private String orderId; + private String originalRecordCode; + private String originalRecordFile; + private String originalRecordName; + private String remark; + private String sampleId; + private String templateId; + private String templateName; + private String updateTime; + + public BusinessEnvRecordModel getBusinessEnvironmentRecord() { + return businessEnvironmentRecord; + } + + public void setBusinessEnvironmentRecord(BusinessEnvRecordModel businessEnvironmentRecord) { + this.businessEnvironmentRecord = businessEnvironmentRecord; + } + + public BusinessOrderModel getBusinessOrder() { + return businessOrder; + } + + public void setBusinessOrder(BusinessOrderModel businessOrder) { + this.businessOrder = businessOrder; + } + + public String getCalibrationPlace() { + return calibrationPlace; + } + + public void setCalibrationPlace(String calibrationPlace) { + this.calibrationPlace = calibrationPlace; + } + + public String getCalibrationTime() { + return calibrationTime; + } + + public void setCalibrationTime(String calibrationTime) { + this.calibrationTime = calibrationTime; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public BusinessOrderModel.CustomerSampleModel getCustomerSampleInfo() { + return customerSampleInfo; + } + + public void setCustomerSampleInfo(BusinessOrderModel.CustomerSampleModel customerSampleInfo) { + this.customerSampleInfo = customerSampleInfo; + } + + public String getEnvironmentId() { + return environmentId; + } + + public void setEnvironmentId(String environmentId) { + this.environmentId = environmentId; + } + + public List getEquipmentInfoList() { + return equipmentInfoList; + } + + public void setEquipmentInfoList(List equipmentInfoList) { + this.equipmentInfoList = equipmentInfoList; + } + + public List getFileList() { + return fileList; + } + + public void setFileList(List fileList) { + this.fileList = fileList; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String isIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getMeasureCategory() { + return measureCategory; + } + + public void setMeasureCategory(String measureCategory) { + this.measureCategory = measureCategory; + } + + public String getMeasureCategoryName() { + return measureCategoryName; + } + + public void setMeasureCategoryName(String measureCategoryName) { + this.measureCategoryName = measureCategoryName; + } + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public String getOriginalRecordCode() { + return originalRecordCode; + } + + public void setOriginalRecordCode(String originalRecordCode) { + this.originalRecordCode = originalRecordCode; + } + + public String getOriginalRecordFile() { + return originalRecordFile; + } + + public void setOriginalRecordFile(String originalRecordFile) { + this.originalRecordFile = originalRecordFile; + } + + public String getOriginalRecordName() { + return originalRecordName; + } + + public void setOriginalRecordName(String originalRecordName) { + this.originalRecordName = originalRecordName; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSampleId() { + return sampleId; + } + + public void setSampleId(String sampleId) { + this.sampleId = sampleId; + } + + public String getTemplateId() { + return templateId; + } + + public void setTemplateId(String templateId) { + this.templateId = templateId; + } + + public String getTemplateName() { + return templateName; + } + + public void setTemplateName(String templateName) { + this.templateName = templateName; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public static class BusinessEnvRecordModel { + private String createTime; + private String createUser; + private String environmentCode; + private String humidity; + private String id; + private String isDel; + private String outputVoltage; + private String recordTime; + private String recorder; + private String remark; + private String roomNumber; + private String temperature; + private String updateTime; + private String zeroGroundVoltage; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEnvironmentCode() { + return environmentCode; + } + + public void setEnvironmentCode(String environmentCode) { + this.environmentCode = environmentCode; + } + + public String getHumidity() { + return humidity; + } + + public void setHumidity(String humidity) { + this.humidity = humidity; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String isIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getOutputVoltage() { + return outputVoltage; + } + + public void setOutputVoltage(String outputVoltage) { + this.outputVoltage = outputVoltage; + } + + public String getRecordTime() { + return recordTime; + } + + public void setRecordTime(String recordTime) { + this.recordTime = recordTime; + } + + public String getRecorder() { + return recorder; + } + + public void setRecorder(String recorder) { + this.recorder = recorder; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getRoomNumber() { + return roomNumber; + } + + public void setRoomNumber(String roomNumber) { + this.roomNumber = roomNumber; + } + + public String getTemperature() { + return temperature; + } + + public void setTemperature(String temperature) { + this.temperature = temperature; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getZeroGroundVoltage() { + return zeroGroundVoltage; + } + + public void setZeroGroundVoltage(String zeroGroundVoltage) { + this.zeroGroundVoltage = zeroGroundVoltage; + } + } + + public static class BusinessOrderModel { + private String certifications; + private String createTime; + private String createUser; + private String customerAddress; + private String customerId; + private String customerName; + private String customerNo; + private String customerPhone; + private List customerSampleInfoList; + private String deliverTime; + private String deliverer; + private String delivererId; + private String delivererTel; + private String id; + private String isDel; + private String isUrgent; + private String minioFileName; + private String orderCode; + private String orderTime; + private String planDeliverTime; + private String remark; + private String requireOverTime; + private String status; + private String updateTime; + private String updateUser; + + public String getCertifications() { + return certifications; + } + + public void setCertifications(String certifications) { + this.certifications = certifications; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCustomerAddress() { + return customerAddress; + } + + public void setCustomerAddress(String customerAddress) { + this.customerAddress = customerAddress; + } + + public String getCustomerId() { + return customerId; + } + + public void setCustomerId(String customerId) { + this.customerId = customerId; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public String getCustomerPhone() { + return customerPhone; + } + + public void setCustomerPhone(String customerPhone) { + this.customerPhone = customerPhone; + } + + public List getCustomerSampleInfoList() { + return customerSampleInfoList; + } + + public void setCustomerSampleInfoList(List customerSampleInfoList) { + this.customerSampleInfoList = customerSampleInfoList; + } + + public String getDeliverTime() { + return deliverTime; + } + + public void setDeliverTime(String deliverTime) { + this.deliverTime = deliverTime; + } + + public String getDeliverer() { + return deliverer; + } + + public void setDeliverer(String deliverer) { + this.deliverer = deliverer; + } + + public String getDelivererId() { + return delivererId; + } + + public void setDelivererId(String delivererId) { + this.delivererId = delivererId; + } + + public String getDelivererTel() { + return delivererTel; + } + + public void setDelivererTel(String delivererTel) { + this.delivererTel = delivererTel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIsUrgent() { + return isUrgent; + } + + public void setIsUrgent(String isUrgent) { + this.isUrgent = isUrgent; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getOrderCode() { + return orderCode; + } + + public void setOrderCode(String orderCode) { + this.orderCode = orderCode; + } + + public String getOrderTime() { + return orderTime; + } + + public void setOrderTime(String orderTime) { + this.orderTime = orderTime; + } + + public String getPlanDeliverTime() { + return planDeliverTime; + } + + public void setPlanDeliverTime(String planDeliverTime) { + this.planDeliverTime = planDeliverTime; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getRequireOverTime() { + return requireOverTime; + } + + public void setRequireOverTime(String requireOverTime) { + this.requireOverTime = requireOverTime; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUpdateUser() { + return updateUser; + } + + public void setUpdateUser(String updateUser) { + this.updateUser = updateUser; + } + + public static class CustomerSampleModel { + private String abc; + private String appendix; + private String appendixDescn; + private String createTime; + private String createUser; + private String customerAddress; + private String customerId; + private String customerName; + private String customerNo; + private String deliverer; + private String delivererTel; + private String id; + private String isDel; + private String isExistSample; + private String labelBind; + private String manufacturer; + private String manufacturerCountry; + private String manufacturingDate; + private String manufacturingNo; + private String measureCategory; + private String measureCategoryName; + private String measureContent; + private String measureLastTime; + private String measurePeriod; + private String measureType; + private String measureTypeName; + private String minioFileName; + private String orderId; + private String phone; + private String postalCode; + private String powerVoltage; + private String remark; + private String sampleBelong; + private String sampleBelongName; + private String sampleModel; + private String sampleName; + private String sampleNo; + private String specialRequire; + private String updateTime; + private String updateUser; + private String validDeadline; + + public String getAbc() { + return abc; + } + + public void setAbc(String abc) { + this.abc = abc; + } + + public String getAppendix() { + return appendix; + } + + public void setAppendix(String appendix) { + this.appendix = appendix; + } + + public String getAppendixDescn() { + return appendixDescn; + } + + public void setAppendixDescn(String appendixDescn) { + this.appendixDescn = appendixDescn; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCustomerAddress() { + return customerAddress; + } + + public void setCustomerAddress(String customerAddress) { + this.customerAddress = customerAddress; + } + + public String getCustomerId() { + return customerId; + } + + public void setCustomerId(String customerId) { + this.customerId = customerId; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public String getDeliverer() { + return deliverer; + } + + public void setDeliverer(String deliverer) { + this.deliverer = deliverer; + } + + public String getDelivererTel() { + return delivererTel; + } + + public void setDelivererTel(String delivererTel) { + this.delivererTel = delivererTel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIsExistSample() { + return isExistSample; + } + + public void setIsExistSample(String isExistSample) { + this.isExistSample = isExistSample; + } + + public String getLabelBind() { + return labelBind; + } + + public void setLabelBind(String labelBind) { + this.labelBind = labelBind; + } + + public String getManufacturer() { + return manufacturer; + } + + public void setManufacturer(String manufacturer) { + this.manufacturer = manufacturer; + } + + public String getManufacturerCountry() { + return manufacturerCountry; + } + + public void setManufacturerCountry(String manufacturerCountry) { + this.manufacturerCountry = manufacturerCountry; + } + + public String getManufacturingDate() { + return manufacturingDate; + } + + public void setManufacturingDate(String manufacturingDate) { + this.manufacturingDate = manufacturingDate; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getMeasureCategory() { + return measureCategory; + } + + public void setMeasureCategory(String measureCategory) { + this.measureCategory = measureCategory; + } + + public String getMeasureCategoryName() { + return measureCategoryName; + } + + public void setMeasureCategoryName(String measureCategoryName) { + this.measureCategoryName = measureCategoryName; + } + + public String getMeasureContent() { + return measureContent; + } + + public void setMeasureContent(String measureContent) { + this.measureContent = measureContent; + } + + public String getMeasureLastTime() { + return measureLastTime; + } + + public void setMeasureLastTime(String measureLastTime) { + this.measureLastTime = measureLastTime; + } + + public String getMeasurePeriod() { + return measurePeriod; + } + + public void setMeasurePeriod(String measurePeriod) { + this.measurePeriod = measurePeriod; + } + + public String getMeasureType() { + return measureType; + } + + public void setMeasureType(String measureType) { + this.measureType = measureType; + } + + public String getMeasureTypeName() { + return measureTypeName; + } + + public void setMeasureTypeName(String measureTypeName) { + this.measureTypeName = measureTypeName; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getPostalCode() { + return postalCode; + } + + public void setPostalCode(String postalCode) { + this.postalCode = postalCode; + } + + public String getPowerVoltage() { + return powerVoltage; + } + + public void setPowerVoltage(String powerVoltage) { + this.powerVoltage = powerVoltage; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSampleBelong() { + return sampleBelong; + } + + public void setSampleBelong(String sampleBelong) { + this.sampleBelong = sampleBelong; + } + + public String getSampleBelongName() { + return sampleBelongName; + } + + public void setSampleBelongName(String sampleBelongName) { + this.sampleBelongName = sampleBelongName; + } + + public String getSampleModel() { + return sampleModel; + } + + public void setSampleModel(String sampleModel) { + this.sampleModel = sampleModel; + } + + public String getSampleName() { + return sampleName; + } + + public void setSampleName(String sampleName) { + this.sampleName = sampleName; + } + + public String getSampleNo() { + return sampleNo; + } + + public void setSampleNo(String sampleNo) { + this.sampleNo = sampleNo; + } + + public String getSpecialRequire() { + return specialRequire; + } + + public void setSpecialRequire(String specialRequire) { + this.specialRequire = specialRequire; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUpdateUser() { + return updateUser; + } + + public void setUpdateUser(String updateUser) { + this.updateUser = updateUser; + } + + public String getValidDeadline() { + return validDeadline; + } + + public void setValidDeadline(String validDeadline) { + this.validDeadline = validDeadline; + } + } + } + + public static class EquipmentModel { + private String abc; + private String abcName; + private String applyRelationId; + private String assetNo; + private String assetSource; + private String assetType; + private String assetTypeName; + private String attribute; + private String capitalSource; + private String capitalSourceName; + private String cardEstablishmentDate; + private String createTime; + private String createUser; + private String depreciationMethod; + private String depreciationMethodName; + private String depreciationPeriod; + private String enableDate; + private String equipmentCategory; + private String equipmentCategoryName; + private String equipmentName; + private String equipmentNo; + private String equipmentSpecifications; + private String equipmentType; + private String equipmentTypeName; + private String fileList; + private String id; + private String installIncidentalExpenses; + private String installPlace; + private String intactState; + private String isCalibrationTestEquipment; + private String isDel; + private String isFixedAssets; + private String isMeasureAccount; + private String isStandardSupportEquipment; + private String labelBind; + private String majorCategory; + private String majorCategoryName; + private String managerLevel; + private String managerLevelName; + private String managerState; + private String managerStateName; + private String manufacturer; + private String manufacturerCountry; + private String manufacturingDate; + private String manufacturingNo; + private String mesureCycle; + private String mesureDate; + private String mesureDept; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String mesureType; + private String mesureTypeName; + private String modelNo; + private String originValue; + private String overallDimension; + private String presentOriginValue; + private String purpose; + private String remark; + private String singlePrice; + private String supportStandardEquipmentName; + private String supportStandardEquipmentNo; + private String technicalLevel; + private String uncertainty; + private String updateTime; + private String useDept; + private String useDeptName; + private String usePerson; + private String usePersonName; + private String validDate; + private String version; + private String weight; + + public String getAbc() { + return abc; + } + + public void setAbc(String abc) { + this.abc = abc; + } + + public String getAbcName() { + return abcName; + } + + public void setAbcName(String abcName) { + this.abcName = abcName; + } + + public String getApplyRelationId() { + return applyRelationId; + } + + public void setApplyRelationId(String applyRelationId) { + this.applyRelationId = applyRelationId; + } + + public String getAssetNo() { + return assetNo; + } + + public void setAssetNo(String assetNo) { + this.assetNo = assetNo; + } + + public String getAssetSource() { + return assetSource; + } + + public void setAssetSource(String assetSource) { + this.assetSource = assetSource; + } + + public String getAssetType() { + return assetType; + } + + public void setAssetType(String assetType) { + this.assetType = assetType; + } + + public String getAssetTypeName() { + return assetTypeName; + } + + public void setAssetTypeName(String assetTypeName) { + this.assetTypeName = assetTypeName; + } + + public String getAttribute() { + return attribute; + } + + public void setAttribute(String attribute) { + this.attribute = attribute; + } + + public String getCapitalSource() { + return capitalSource; + } + + public void setCapitalSource(String capitalSource) { + this.capitalSource = capitalSource; + } + + public String getCapitalSourceName() { + return capitalSourceName; + } + + public void setCapitalSourceName(String capitalSourceName) { + this.capitalSourceName = capitalSourceName; + } + + public String getCardEstablishmentDate() { + return cardEstablishmentDate; + } + + public void setCardEstablishmentDate(String cardEstablishmentDate) { + this.cardEstablishmentDate = cardEstablishmentDate; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getDepreciationMethod() { + return depreciationMethod; + } + + public void setDepreciationMethod(String depreciationMethod) { + this.depreciationMethod = depreciationMethod; + } + + public String getDepreciationMethodName() { + return depreciationMethodName; + } + + public void setDepreciationMethodName(String depreciationMethodName) { + this.depreciationMethodName = depreciationMethodName; + } + + public String getDepreciationPeriod() { + return depreciationPeriod; + } + + public void setDepreciationPeriod(String depreciationPeriod) { + this.depreciationPeriod = depreciationPeriod; + } + + public String getEnableDate() { + return enableDate; + } + + public void setEnableDate(String enableDate) { + this.enableDate = enableDate; + } + + public String getEquipmentCategory() { + return equipmentCategory; + } + + public void setEquipmentCategory(String equipmentCategory) { + this.equipmentCategory = equipmentCategory; + } + + public String getEquipmentCategoryName() { + return equipmentCategoryName; + } + + public void setEquipmentCategoryName(String equipmentCategoryName) { + this.equipmentCategoryName = equipmentCategoryName; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getEquipmentSpecifications() { + return equipmentSpecifications; + } + + public void setEquipmentSpecifications(String equipmentSpecifications) { + this.equipmentSpecifications = equipmentSpecifications; + } + + public String getEquipmentType() { + return equipmentType; + } + + public void setEquipmentType(String equipmentType) { + this.equipmentType = equipmentType; + } + + public String getEquipmentTypeName() { + return equipmentTypeName; + } + + public void setEquipmentTypeName(String equipmentTypeName) { + this.equipmentTypeName = equipmentTypeName; + } + + public String getFileList() { + return fileList; + } + + public void setFileList(String fileList) { + this.fileList = fileList; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInstallIncidentalExpenses() { + return installIncidentalExpenses; + } + + public void setInstallIncidentalExpenses(String installIncidentalExpenses) { + this.installIncidentalExpenses = installIncidentalExpenses; + } + + public String getInstallPlace() { + return installPlace; + } + + public void setInstallPlace(String installPlace) { + this.installPlace = installPlace; + } + + public String getIntactState() { + return intactState; + } + + public void setIntactState(String intactState) { + this.intactState = intactState; + } + + public String getIsCalibrationTestEquipment() { + return isCalibrationTestEquipment; + } + + public void setIsCalibrationTestEquipment(String isCalibrationTestEquipment) { + this.isCalibrationTestEquipment = isCalibrationTestEquipment; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIsFixedAssets() { + return isFixedAssets; + } + + public void setIsFixedAssets(String isFixedAssets) { + this.isFixedAssets = isFixedAssets; + } + + public String getIsMeasureAccount() { + return isMeasureAccount; + } + + public void setIsMeasureAccount(String isMeasureAccount) { + this.isMeasureAccount = isMeasureAccount; + } + + public String getIsStandardSupportEquipment() { + return isStandardSupportEquipment; + } + + public void setIsStandardSupportEquipment(String isStandardSupportEquipment) { + this.isStandardSupportEquipment = isStandardSupportEquipment; + } + + public String getLabelBind() { + return labelBind; + } + + public void setLabelBind(String labelBind) { + this.labelBind = labelBind; + } + + public String getMajorCategory() { + return majorCategory; + } + + public void setMajorCategory(String majorCategory) { + this.majorCategory = majorCategory; + } + + public String getMajorCategoryName() { + return majorCategoryName; + } + + public void setMajorCategoryName(String majorCategoryName) { + this.majorCategoryName = majorCategoryName; + } + + public String getManagerLevel() { + return managerLevel; + } + + public void setManagerLevel(String managerLevel) { + this.managerLevel = managerLevel; + } + + public String getManagerLevelName() { + return managerLevelName; + } + + public void setManagerLevelName(String managerLevelName) { + this.managerLevelName = managerLevelName; + } + + public String getManagerState() { + return managerState; + } + + public void setManagerState(String managerState) { + this.managerState = managerState; + } + + public String getManagerStateName() { + return managerStateName; + } + + public void setManagerStateName(String managerStateName) { + this.managerStateName = managerStateName; + } + + public String getManufacturer() { + return manufacturer; + } + + public void setManufacturer(String manufacturer) { + this.manufacturer = manufacturer; + } + + public String getManufacturerCountry() { + return manufacturerCountry; + } + + public void setManufacturerCountry(String manufacturerCountry) { + this.manufacturerCountry = manufacturerCountry; + } + + public String getManufacturingDate() { + return manufacturingDate; + } + + public void setManufacturingDate(String manufacturingDate) { + this.manufacturingDate = manufacturingDate; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getMesureCycle() { + return mesureCycle; + } + + public void setMesureCycle(String mesureCycle) { + this.mesureCycle = mesureCycle; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureDept() { + return mesureDept; + } + + public void setMesureDept(String mesureDept) { + this.mesureDept = mesureDept; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getMesureType() { + return mesureType; + } + + public void setMesureType(String mesureType) { + this.mesureType = mesureType; + } + + public String getMesureTypeName() { + return mesureTypeName; + } + + public void setMesureTypeName(String mesureTypeName) { + this.mesureTypeName = mesureTypeName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getOriginValue() { + return originValue; + } + + public void setOriginValue(String originValue) { + this.originValue = originValue; + } + + public String getOverallDimension() { + return overallDimension; + } + + public void setOverallDimension(String overallDimension) { + this.overallDimension = overallDimension; + } + + public String getPresentOriginValue() { + return presentOriginValue; + } + + public void setPresentOriginValue(String presentOriginValue) { + this.presentOriginValue = presentOriginValue; + } + + public String getPurpose() { + return purpose; + } + + public void setPurpose(String purpose) { + this.purpose = purpose; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSinglePrice() { + return singlePrice; + } + + public void setSinglePrice(String singlePrice) { + this.singlePrice = singlePrice; + } + + public String getSupportStandardEquipmentName() { + return supportStandardEquipmentName; + } + + public void setSupportStandardEquipmentName(String supportStandardEquipmentName) { + this.supportStandardEquipmentName = supportStandardEquipmentName; + } + + public String getSupportStandardEquipmentNo() { + return supportStandardEquipmentNo; + } + + public void setSupportStandardEquipmentNo(String supportStandardEquipmentNo) { + this.supportStandardEquipmentNo = supportStandardEquipmentNo; + } + + public String getTechnicalLevel() { + return technicalLevel; + } + + public void setTechnicalLevel(String technicalLevel) { + this.technicalLevel = technicalLevel; + } + + public String getUncertainty() { + return uncertainty; + } + + public void setUncertainty(String uncertainty) { + this.uncertainty = uncertainty; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDept() { + return useDept; + } + + public void setUseDept(String useDept) { + this.useDept = useDept; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getUsePerson() { + return usePerson; + } + + public void setUsePerson(String usePerson) { + this.usePerson = usePerson; + } + + public String getUsePersonName() { + return usePersonName; + } + + public void setUsePersonName(String usePersonName) { + this.usePersonName = usePersonName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + + public String getVersion() { + return version; + } + + public void setVersion(String version) { + this.version = version; + } + + public String getWeight() { + return weight; + } + + public void setWeight(String weight) { + this.weight = weight; + } + } + + public static class FileModel { + private String approvalStatus; + private String approvalStatusName; + private String createTime; + private String createUser; + private String createUserId; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String fileType; + private String fileTypeName; + private String id; + private String isDel; + private String minioFileName; + private String processId; + private String publishTime; + private String publisher; + private String remark; + private String updateTime; + + public String getApprovalStatus() { + return approvalStatus; + } + + public void setApprovalStatus(String approvalStatus) { + this.approvalStatus = approvalStatus; + } + + public String getApprovalStatusName() { + return approvalStatusName; + } + + public void setApprovalStatusName(String approvalStatusName) { + this.approvalStatusName = approvalStatusName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCreateUserId() { + return createUserId; + } + + public void setCreateUserId(String createUserId) { + this.createUserId = createUserId; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getFileType() { + return fileType; + } + + public void setFileType(String fileType) { + this.fileType = fileType; + } + + public String getFileTypeName() { + return fileTypeName; + } + + public void setFileTypeName(String fileTypeName) { + this.fileTypeName = fileTypeName; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getPublishTime() { + return publishTime; + } + + public void setPublishTime(String publishTime) { + this.publishTime = publishTime; + } + + public String getPublisher() { + return publisher; + } + + public void setPublisher(String publisher) { + this.publisher = publisher; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/CertificateListModel.java b/app/src/main/java/com/casic/xz/meterage/model/CertificateListModel.java new file mode 100644 index 0000000..0eed915 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/CertificateListModel.java @@ -0,0 +1,229 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class CertificateListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String approvalStatus; + private String approvalStatusName; + private String calibrationMajor; + private String certificateReportCode; + private String certificateReportName; + private String createTime; + private String decisionItem; + private String id; + private String manufacturingNo; + private String measureCategory; + private String measureCategoryName; + private String measurePersonId; + private String measurePersonName; + private String orderCode; + private String processId; + private String sampleModel; + private String sampleName; + private String sampleNo; + private String taskId; + + public String getApprovalStatus() { + return approvalStatus; + } + + public void setApprovalStatus(String approvalStatus) { + this.approvalStatus = approvalStatus; + } + + public String getApprovalStatusName() { + return approvalStatusName; + } + + public void setApprovalStatusName(String approvalStatusName) { + this.approvalStatusName = approvalStatusName; + } + + public String getCalibrationMajor() { + return calibrationMajor; + } + + public void setCalibrationMajor(String calibrationMajor) { + this.calibrationMajor = calibrationMajor; + } + + public String getCertificateReportCode() { + return certificateReportCode; + } + + public void setCertificateReportCode(String certificateReportCode) { + this.certificateReportCode = certificateReportCode; + } + + public String getCertificateReportName() { + return certificateReportName; + } + + public void setCertificateReportName(String certificateReportName) { + this.certificateReportName = certificateReportName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getDecisionItem() { + return decisionItem; + } + + public void setDecisionItem(String decisionItem) { + this.decisionItem = decisionItem; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getMeasureCategory() { + return measureCategory; + } + + public void setMeasureCategory(String measureCategory) { + this.measureCategory = measureCategory; + } + + public String getMeasureCategoryName() { + return measureCategoryName; + } + + public void setMeasureCategoryName(String measureCategoryName) { + this.measureCategoryName = measureCategoryName; + } + + public String getMeasurePersonId() { + return measurePersonId; + } + + public void setMeasurePersonId(String measurePersonId) { + this.measurePersonId = measurePersonId; + } + + public String getMeasurePersonName() { + return measurePersonName; + } + + public void setMeasurePersonName(String measurePersonName) { + this.measurePersonName = measurePersonName; + } + + public String getOrderCode() { + return orderCode; + } + + public void setOrderCode(String orderCode) { + this.orderCode = orderCode; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getSampleModel() { + return sampleModel; + } + + public void setSampleModel(String sampleModel) { + this.sampleModel = sampleModel; + } + + public String getSampleName() { + return sampleName; + } + + public void setSampleName(String sampleName) { + this.sampleName = sampleName; + } + + public String getSampleNo() { + return sampleNo; + } + + public void setSampleNo(String sampleNo) { + this.sampleNo = sampleNo; + } + + public String getTaskId() { + return taskId; + } + + public void setTaskId(String taskId) { + this.taskId = taskId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/CertificateModel.java b/app/src/main/java/com/casic/xz/meterage/model/CertificateModel.java deleted file mode 100644 index ec0d25b..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/CertificateModel.java +++ /dev/null @@ -1,202 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class CertificateModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String approvalStatus; - private String approvalStatusName; - private String calibrationMajor; - private String certificateReportCode; - private String certificateReportName; - private String createTime; - private String decisionItem; - private String id; - private String manufacturingNo; - private String measurePersonId; - private String orderCode; - private String processId; - private String sampleModel; - private String sampleName; - private String sampleNo; - private String taskId; - - public String getApprovalStatus() { - return approvalStatus; - } - - public void setApprovalStatus(String approvalStatus) { - this.approvalStatus = approvalStatus; - } - - public String getApprovalStatusName() { - return approvalStatusName; - } - - public void setApprovalStatusName(String approvalStatusName) { - this.approvalStatusName = approvalStatusName; - } - - public String getCalibrationMajor() { - return calibrationMajor; - } - - public void setCalibrationMajor(String calibrationMajor) { - this.calibrationMajor = calibrationMajor; - } - - public String getCertificateReportCode() { - return certificateReportCode; - } - - public void setCertificateReportCode(String certificateReportCode) { - this.certificateReportCode = certificateReportCode; - } - - public String getCertificateReportName() { - return certificateReportName; - } - - public void setCertificateReportName(String certificateReportName) { - this.certificateReportName = certificateReportName; - } - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getDecisionItem() { - return decisionItem; - } - - public void setDecisionItem(String decisionItem) { - this.decisionItem = decisionItem; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getManufacturingNo() { - return manufacturingNo; - } - - public void setManufacturingNo(String manufacturingNo) { - this.manufacturingNo = manufacturingNo; - } - - public String getMeasurePersonId() { - return measurePersonId; - } - - public void setMeasurePersonId(String measurePersonId) { - this.measurePersonId = measurePersonId; - } - - public String getOrderCode() { - return orderCode; - } - - public void setOrderCode(String orderCode) { - this.orderCode = orderCode; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public String getSampleModel() { - return sampleModel; - } - - public void setSampleModel(String sampleModel) { - this.sampleModel = sampleModel; - } - - public String getSampleName() { - return sampleName; - } - - public void setSampleName(String sampleName) { - this.sampleName = sampleName; - } - - public String getSampleNo() { - return sampleNo; - } - - public void setSampleNo(String sampleNo) { - this.sampleNo = sampleNo; - } - - public String getTaskId() { - return taskId; - } - - public void setTaskId(String taskId) { - this.taskId = taskId; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index b0dec00..a4f3c46 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -345,4 +345,22 @@ @QueryMap limit: Map, @QueryMap offset: Map ): String + + /** + * 获取委托书详情 + */ + @POST("/business/certificateReport/detail") + suspend fun getCertificateReportDetail( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 提交证书 + */ + @POST("/business/certificateReport/submit") + suspend fun submit( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String } \ 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 cef55ec..8bf4070 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 @@ -800,4 +800,29 @@ AuthenticationHelper.token!!, requestBody, limitMap, offsetMap ) } + + /** + * 获取证书报告详情 + */ + suspend fun getCertificateReportDetail(id: String): String { + val param = JsonObject() + param.addProperty("id", id) + val requestBody = param.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getCertificateReportDetail(AuthenticationHelper.token!!, requestBody) + } + + /** + * 提交证书报告 + */ + suspend fun submit(id: String): String { + val param = JsonObject() + param.addProperty("formId", "ywglzsbg") + param.addProperty("id", id) + val requestBody = param.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.submit(AuthenticationHelper.token!!, requestBody) + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportActivity.kt index 2baefd2..fa4e129 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportActivity.kt @@ -19,15 +19,21 @@ "已通过", "未通过", "已取消", - "非草稿", - "未通过", "可打印" ) private var fragmentPages: ArrayList = ArrayList() init { - pageTitles.indices.forEach { - fragmentPages.add(CertificateReportFragment((it + 1).toString())) + pageTitles.forEach { + when (it) { + "草稿箱" -> fragmentPages.add(CertificateReportFragment("1")) + "待审批" -> fragmentPages.add(CertificateReportFragment("2")) + "审批中" -> fragmentPages.add(CertificateReportFragment("3")) + "已通过" -> fragmentPages.add(CertificateReportFragment("4")) + "未通过" -> fragmentPages.add(CertificateReportFragment("5")) + "已取消" -> fragmentPages.add(CertificateReportFragment("6")) + "可打印" -> fragmentPages.add(CertificateReportFragment("9")) + } } } diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt new file mode 100644 index 0000000..e30c7c3 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt @@ -0,0 +1,106 @@ +package com.casic.xz.meterage.view.home + +import android.view.View +import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.SubViewPagerAdapter +import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.casic.xz.meterage.fragment.certificate.ApprovalProcessFragment +import com.casic.xz.meterage.fragment.certificate.BasicInformationFragment +import com.casic.xz.meterage.fragment.certificate.ExceptionReportFragment +import com.casic.xz.meterage.model.CertificateDetailModel +import com.casic.xz.meterage.utils.LoadingDialogHub +import com.casic.xz.meterage.vm.CertificateViewModel +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.vm.LoadState +import kotlinx.android.synthetic.main.activity_certificate_detail.* + +//"草稿箱" -> "1" +//"待审批" -> "2" +//"审批中" -> "3" +//"已通过" -> "4" +//"未通过" -> "5" +//"已取消" -> "6" +//"可打印" -> "9" + +class CertificateReportDetailActivity : KotlinBaseActivity() { + + private var fragmentPages: ArrayList = ArrayList() + private lateinit var certificateViewModel: CertificateViewModel + private lateinit var detailModel: CertificateDetailModel.DataModel + + override fun initData() { + val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! + + when (args[0]) { + "1" -> { + approvalView.text = "提交" + } + "2" -> { + approvalView.text = "审批" + } + "9" -> { + approvalView.text = "打印" + } + else -> { + approvalView.visibility = View.GONE + } + } + + certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] + certificateViewModel.getCertificateReportDetail(args[1]) + certificateViewModel.certificateDetail.observe(this) { + if (it.code == 200) { + + detailModel = it.data + + fragmentPages.add(BasicInformationFragment(detailModel)) + fragmentPages.add(ApprovalProcessFragment()) + fragmentPages.add(ExceptionReportFragment()) + + val pageTitles = arrayOf("基础信息", "审批流程", "异常报告") + + approvalViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, pageTitles + ) + //绑定 + topTabLayout.setupWithViewPager(approvalViewPager) + } + } + + certificateViewModel.submitResult.observe(this) { + if (it.code == 200) { + "提交成功".show(this) + finish() + } + } + } + + override fun initEvent() { + leftBackView.setOnClickListener { finish() } + + approvalView.setOnClickListener { + certificateViewModel.submit(detailModel.id) + } + } + + override fun initLayoutView(): Int = R.layout.activity_certificate_detail + + override fun observeRequestState() { + certificateViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt index 080c380..77fe8a5 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt @@ -129,6 +129,5 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() initLayoutImmersionBar(rootView) - titleView.text = "委托需求" } } \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 5ba44f0..298f687 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -53,7 +53,8 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "XZJL_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" +// outputFileName = "XZJL_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "XZJL_" + getBuildDate() + "_Beta.apk" } } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4b914b5..ebea092 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -67,6 +67,7 @@ + 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 new file mode 100644 index 0000000..a75e566 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.certificate + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class ApprovalProcessFragment :KotlinBaseFragment(){ + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_certificate_approval_process + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt new file mode 100644 index 0000000..5882c3d --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt @@ -0,0 +1,77 @@ +package com.casic.xz.meterage.fragment.certificate + +import android.graphics.Color +import android.graphics.Paint +import android.util.Log +import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.watchAttachFile +import com.casic.xz.meterage.model.CertificateDetailModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.pengxh.kt.lite.extensions.toJson +import kotlinx.android.synthetic.main.fragment_certificate_basic_information.* + +class BasicInformationFragment(private val data: CertificateDetailModel.DataModel) : + KotlinBaseFragment() { + + override fun initData() { + val businessOriginal = data.businessOriginalRecord + + reportCodeView.text = data.certificateReportCode + originalCodeView.text = businessOriginal.originalRecordCode + checkCategoryView.text = businessOriginal.measureCategoryName + + Log.d( + "Casic", + "BasicInformationFragment => initData: ${businessOriginal.fileList.toJson()}" + ) +// basisFileView.text = businessOriginal.fileList + + val sampleInfo = businessOriginal.customerSampleInfo + sampleCodeView.text = sampleInfo.sampleNo + sampleNameView.text = sampleInfo.sampleName + manufacturingCodeView.text = sampleInfo.manufacturingNo + modelView.text = sampleInfo.sampleModel + entrustCodeView.text = sampleInfo.customerNo + entrustNameView.text = sampleInfo.customerName + entrustContactView.text = sampleInfo.phone + entrustEmailView.text = sampleInfo.postalCode + entrustAddressView.text = sampleInfo.customerAddress + senderView.text = sampleInfo.deliverer + senderContactView.text = sampleInfo.delivererTel + checkTypeView.text = sampleInfo.measureContent + remarkView.text = sampleInfo.remark + + estimateServedTimeView.text = businessOriginal.businessOrder.planDeliverTime + estimateCompleteTimeView.text = businessOriginal.businessOrder.requireOverTime + + if (data.certificateReportFile.isNullOrBlank()) { + reportFileView.text = "暂无附件" + } else { + val reportFileName = data.certificateReportFile + + reportFileView.text = reportFileName + val textPaint = reportFileView.paint + textPaint.flags = Paint.UNDERLINE_TEXT_FLAG + textPaint.isAntiAlias = true + reportFileView.setTextColor(Color.BLUE) + + reportFileView.setOnClickListener { + reportFileName.watchAttachFile(requireContext()) + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_certificate_basic_information + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt index 2f3c95c..b1df400 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt @@ -4,19 +4,24 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.addAll +import com.casic.xz.meterage.extensions.diffCurrentTime +import com.casic.xz.meterage.extensions.formatToDate import com.casic.xz.meterage.extensions.showEmptyPage -import com.casic.xz.meterage.model.CertificateModel +import com.casic.xz.meterage.model.CertificateListModel +import com.casic.xz.meterage.view.home.CertificateReportDetailActivity import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler import kotlinx.android.synthetic.main.fragment_certificate_report.* import kotlinx.android.synthetic.main.include_empty_view.* /** - * 计量法规 + * 证书报告 * * formId:ywglzsbg * */ @@ -24,8 +29,8 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var certificateViewModel: CertificateViewModel - private lateinit var certificateAdapter: NormalRecyclerAdapter - private var dataBeans: MutableList = ArrayList() + private lateinit var certificateAdapter: NormalRecyclerAdapter + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false @@ -119,40 +124,37 @@ } else { emptyView!!.hide() certificateAdapter = object : - NormalRecyclerAdapter( + NormalRecyclerAdapter( R.layout.item_certificate_rv_l, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, - item: CertificateModel.DataModel.RowsModel + item: CertificateListModel.DataModel.RowsModel ) { + val deltaT = item.createTime.diffCurrentTime() + val diffTime = if (deltaT < 24) { + "${deltaT}小时前" + } else { + item.createTime.formatToDate() + } + viewHolder.setText(R.id.reportNameView, item.certificateReportName) -// .setText(R.id.fileStateView, item.effectiveStatusName) -// .setText(R.id.remarkView, "备注：$remark") -// .setText(R.id.fileCodeView, "文件号：${item.fileNo}") -// .setText(R.id.releaseDateView, "实施时间：${item.publishTime}") -// -// if (!item.effectiveStatus.equals("1")) { -// viewHolder.setBackgroundColor( -// R.id.fileStateView, -// R.color.gray.convertColor(requireContext()) -// ) -// } + .setText(R.id.createTimeView, diffTime) + .setText(R.id.categoryView, "校验类别：${item.measureCategoryName}") + .setText(R.id.technicianView, "检定员：${item.measurePersonName}") + + viewHolder.setOnClickListener(R.id.showDetailButton) { + requireContext().navigatePageTo( + addAll(item.approvalStatus, item.id) + ) + } } } certificateRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) certificateRecyclerView.adapter = certificateAdapter - certificateAdapter.setOnItemClickedListener(object : - NormalRecyclerAdapter.OnItemClickedListener { - override fun onItemClicked( - position: Int, t: CertificateModel.DataModel.RowsModel - ) { -// requireContext().navigatePageTo(t.toJson()) - } - }) } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt new file mode 100644 index 0000000..2d5ac61 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.certificate + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class ExceptionReportFragment :KotlinBaseFragment(){ + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_certificate_exception_report + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/model/CertificateDetailModel.java b/app/src/main/java/com/casic/xz/meterage/model/CertificateDetailModel.java new file mode 100644 index 0000000..42efccd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/CertificateDetailModel.java @@ -0,0 +1,2080 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class CertificateDetailModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private String approvalSignId; + private String approvalStatus; + private String approvalStatusName; + private BusinessOriginalRecordModel businessOriginalRecord; + private String calibrationMajor; + private String calibrationMajorName; + private String certificateReportCategory; + private String certificateReportCode; + private String certificateReportFile; + private String certificateReportName; + private String createTime; + private String createUser; + private String expirationDate; + private String id; + private String isDel; + private String issuanceDate; + private String measureDeptId; + private String measurePersonId; + private String measureResult; + private String orderId; + private String originalRecordId; + private String printNum; + private String printStatus; + private String processId; + private String remark; + private String sampleId; + private String signId; + private String templateId; + private String updateTime; + + public String getApprovalSignId() { + return approvalSignId; + } + + public void setApprovalSignId(String approvalSignId) { + this.approvalSignId = approvalSignId; + } + + public String getApprovalStatus() { + return approvalStatus; + } + + public void setApprovalStatus(String approvalStatus) { + this.approvalStatus = approvalStatus; + } + + public String getApprovalStatusName() { + return approvalStatusName; + } + + public void setApprovalStatusName(String approvalStatusName) { + this.approvalStatusName = approvalStatusName; + } + + public BusinessOriginalRecordModel getBusinessOriginalRecord() { + return businessOriginalRecord; + } + + public void setBusinessOriginalRecord(BusinessOriginalRecordModel businessOriginalRecord) { + this.businessOriginalRecord = businessOriginalRecord; + } + + public String getCalibrationMajor() { + return calibrationMajor; + } + + public void setCalibrationMajor(String calibrationMajor) { + this.calibrationMajor = calibrationMajor; + } + + public String getCalibrationMajorName() { + return calibrationMajorName; + } + + public void setCalibrationMajorName(String calibrationMajorName) { + this.calibrationMajorName = calibrationMajorName; + } + + public String getCertificateReportCategory() { + return certificateReportCategory; + } + + public void setCertificateReportCategory(String certificateReportCategory) { + this.certificateReportCategory = certificateReportCategory; + } + + public String getCertificateReportCode() { + return certificateReportCode; + } + + public void setCertificateReportCode(String certificateReportCode) { + this.certificateReportCode = certificateReportCode; + } + + public String getCertificateReportFile() { + return certificateReportFile; + } + + public void setCertificateReportFile(String certificateReportFile) { + this.certificateReportFile = certificateReportFile; + } + + public String getCertificateReportName() { + return certificateReportName; + } + + public void setCertificateReportName(String certificateReportName) { + this.certificateReportName = certificateReportName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getExpirationDate() { + return expirationDate; + } + + public void setExpirationDate(String expirationDate) { + this.expirationDate = expirationDate; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String isIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIssuanceDate() { + return issuanceDate; + } + + public void setIssuanceDate(String issuanceDate) { + this.issuanceDate = issuanceDate; + } + + public String getMeasureDeptId() { + return measureDeptId; + } + + public void setMeasureDeptId(String measureDeptId) { + this.measureDeptId = measureDeptId; + } + + public String getMeasurePersonId() { + return measurePersonId; + } + + public void setMeasurePersonId(String measurePersonId) { + this.measurePersonId = measurePersonId; + } + + public String getMeasureResult() { + return measureResult; + } + + public void setMeasureResult(String measureResult) { + this.measureResult = measureResult; + } + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public String getOriginalRecordId() { + return originalRecordId; + } + + public void setOriginalRecordId(String originalRecordId) { + this.originalRecordId = originalRecordId; + } + + public String getPrintNum() { + return printNum; + } + + public void setPrintNum(String printNum) { + this.printNum = printNum; + } + + public String getPrintStatus() { + return printStatus; + } + + public void setPrintStatus(String printStatus) { + this.printStatus = printStatus; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSampleId() { + return sampleId; + } + + public void setSampleId(String sampleId) { + this.sampleId = sampleId; + } + + public String getSignId() { + return signId; + } + + public void setSignId(String signId) { + this.signId = signId; + } + + public String getTemplateId() { + return templateId; + } + + public void setTemplateId(String templateId) { + this.templateId = templateId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public static class BusinessOriginalRecordModel { + private BusinessEnvRecordModel businessEnvironmentRecord; + private BusinessOrderModel businessOrder; + private String calibrationPlace; + private String calibrationTime; + private String createTime; + private String createUser; + private BusinessOrderModel.CustomerSampleModel customerSampleInfo; + private String environmentId; + private List equipmentInfoList; + private List fileList; + private String id; + private String isDel; + private String measureCategory; + private String measureCategoryName; + private String orderId; + private String originalRecordCode; + private String originalRecordFile; + private String originalRecordName; + private String remark; + private String sampleId; + private String templateId; + private String templateName; + private String updateTime; + + public BusinessEnvRecordModel getBusinessEnvironmentRecord() { + return businessEnvironmentRecord; + } + + public void setBusinessEnvironmentRecord(BusinessEnvRecordModel businessEnvironmentRecord) { + this.businessEnvironmentRecord = businessEnvironmentRecord; + } + + public BusinessOrderModel getBusinessOrder() { + return businessOrder; + } + + public void setBusinessOrder(BusinessOrderModel businessOrder) { + this.businessOrder = businessOrder; + } + + public String getCalibrationPlace() { + return calibrationPlace; + } + + public void setCalibrationPlace(String calibrationPlace) { + this.calibrationPlace = calibrationPlace; + } + + public String getCalibrationTime() { + return calibrationTime; + } + + public void setCalibrationTime(String calibrationTime) { + this.calibrationTime = calibrationTime; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public BusinessOrderModel.CustomerSampleModel getCustomerSampleInfo() { + return customerSampleInfo; + } + + public void setCustomerSampleInfo(BusinessOrderModel.CustomerSampleModel customerSampleInfo) { + this.customerSampleInfo = customerSampleInfo; + } + + public String getEnvironmentId() { + return environmentId; + } + + public void setEnvironmentId(String environmentId) { + this.environmentId = environmentId; + } + + public List getEquipmentInfoList() { + return equipmentInfoList; + } + + public void setEquipmentInfoList(List equipmentInfoList) { + this.equipmentInfoList = equipmentInfoList; + } + + public List getFileList() { + return fileList; + } + + public void setFileList(List fileList) { + this.fileList = fileList; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String isIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getMeasureCategory() { + return measureCategory; + } + + public void setMeasureCategory(String measureCategory) { + this.measureCategory = measureCategory; + } + + public String getMeasureCategoryName() { + return measureCategoryName; + } + + public void setMeasureCategoryName(String measureCategoryName) { + this.measureCategoryName = measureCategoryName; + } + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public String getOriginalRecordCode() { + return originalRecordCode; + } + + public void setOriginalRecordCode(String originalRecordCode) { + this.originalRecordCode = originalRecordCode; + } + + public String getOriginalRecordFile() { + return originalRecordFile; + } + + public void setOriginalRecordFile(String originalRecordFile) { + this.originalRecordFile = originalRecordFile; + } + + public String getOriginalRecordName() { + return originalRecordName; + } + + public void setOriginalRecordName(String originalRecordName) { + this.originalRecordName = originalRecordName; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSampleId() { + return sampleId; + } + + public void setSampleId(String sampleId) { + this.sampleId = sampleId; + } + + public String getTemplateId() { + return templateId; + } + + public void setTemplateId(String templateId) { + this.templateId = templateId; + } + + public String getTemplateName() { + return templateName; + } + + public void setTemplateName(String templateName) { + this.templateName = templateName; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public static class BusinessEnvRecordModel { + private String createTime; + private String createUser; + private String environmentCode; + private String humidity; + private String id; + private String isDel; + private String outputVoltage; + private String recordTime; + private String recorder; + private String remark; + private String roomNumber; + private String temperature; + private String updateTime; + private String zeroGroundVoltage; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEnvironmentCode() { + return environmentCode; + } + + public void setEnvironmentCode(String environmentCode) { + this.environmentCode = environmentCode; + } + + public String getHumidity() { + return humidity; + } + + public void setHumidity(String humidity) { + this.humidity = humidity; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String isIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getOutputVoltage() { + return outputVoltage; + } + + public void setOutputVoltage(String outputVoltage) { + this.outputVoltage = outputVoltage; + } + + public String getRecordTime() { + return recordTime; + } + + public void setRecordTime(String recordTime) { + this.recordTime = recordTime; + } + + public String getRecorder() { + return recorder; + } + + public void setRecorder(String recorder) { + this.recorder = recorder; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getRoomNumber() { + return roomNumber; + } + + public void setRoomNumber(String roomNumber) { + this.roomNumber = roomNumber; + } + + public String getTemperature() { + return temperature; + } + + public void setTemperature(String temperature) { + this.temperature = temperature; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getZeroGroundVoltage() { + return zeroGroundVoltage; + } + + public void setZeroGroundVoltage(String zeroGroundVoltage) { + this.zeroGroundVoltage = zeroGroundVoltage; + } + } + + public static class BusinessOrderModel { + private String certifications; + private String createTime; + private String createUser; + private String customerAddress; + private String customerId; + private String customerName; + private String customerNo; + private String customerPhone; + private List customerSampleInfoList; + private String deliverTime; + private String deliverer; + private String delivererId; + private String delivererTel; + private String id; + private String isDel; + private String isUrgent; + private String minioFileName; + private String orderCode; + private String orderTime; + private String planDeliverTime; + private String remark; + private String requireOverTime; + private String status; + private String updateTime; + private String updateUser; + + public String getCertifications() { + return certifications; + } + + public void setCertifications(String certifications) { + this.certifications = certifications; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCustomerAddress() { + return customerAddress; + } + + public void setCustomerAddress(String customerAddress) { + this.customerAddress = customerAddress; + } + + public String getCustomerId() { + return customerId; + } + + public void setCustomerId(String customerId) { + this.customerId = customerId; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public String getCustomerPhone() { + return customerPhone; + } + + public void setCustomerPhone(String customerPhone) { + this.customerPhone = customerPhone; + } + + public List getCustomerSampleInfoList() { + return customerSampleInfoList; + } + + public void setCustomerSampleInfoList(List customerSampleInfoList) { + this.customerSampleInfoList = customerSampleInfoList; + } + + public String getDeliverTime() { + return deliverTime; + } + + public void setDeliverTime(String deliverTime) { + this.deliverTime = deliverTime; + } + + public String getDeliverer() { + return deliverer; + } + + public void setDeliverer(String deliverer) { + this.deliverer = deliverer; + } + + public String getDelivererId() { + return delivererId; + } + + public void setDelivererId(String delivererId) { + this.delivererId = delivererId; + } + + public String getDelivererTel() { + return delivererTel; + } + + public void setDelivererTel(String delivererTel) { + this.delivererTel = delivererTel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIsUrgent() { + return isUrgent; + } + + public void setIsUrgent(String isUrgent) { + this.isUrgent = isUrgent; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getOrderCode() { + return orderCode; + } + + public void setOrderCode(String orderCode) { + this.orderCode = orderCode; + } + + public String getOrderTime() { + return orderTime; + } + + public void setOrderTime(String orderTime) { + this.orderTime = orderTime; + } + + public String getPlanDeliverTime() { + return planDeliverTime; + } + + public void setPlanDeliverTime(String planDeliverTime) { + this.planDeliverTime = planDeliverTime; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getRequireOverTime() { + return requireOverTime; + } + + public void setRequireOverTime(String requireOverTime) { + this.requireOverTime = requireOverTime; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUpdateUser() { + return updateUser; + } + + public void setUpdateUser(String updateUser) { + this.updateUser = updateUser; + } + + public static class CustomerSampleModel { + private String abc; + private String appendix; + private String appendixDescn; + private String createTime; + private String createUser; + private String customerAddress; + private String customerId; + private String customerName; + private String customerNo; + private String deliverer; + private String delivererTel; + private String id; + private String isDel; + private String isExistSample; + private String labelBind; + private String manufacturer; + private String manufacturerCountry; + private String manufacturingDate; + private String manufacturingNo; + private String measureCategory; + private String measureCategoryName; + private String measureContent; + private String measureLastTime; + private String measurePeriod; + private String measureType; + private String measureTypeName; + private String minioFileName; + private String orderId; + private String phone; + private String postalCode; + private String powerVoltage; + private String remark; + private String sampleBelong; + private String sampleBelongName; + private String sampleModel; + private String sampleName; + private String sampleNo; + private String specialRequire; + private String updateTime; + private String updateUser; + private String validDeadline; + + public String getAbc() { + return abc; + } + + public void setAbc(String abc) { + this.abc = abc; + } + + public String getAppendix() { + return appendix; + } + + public void setAppendix(String appendix) { + this.appendix = appendix; + } + + public String getAppendixDescn() { + return appendixDescn; + } + + public void setAppendixDescn(String appendixDescn) { + this.appendixDescn = appendixDescn; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCustomerAddress() { + return customerAddress; + } + + public void setCustomerAddress(String customerAddress) { + this.customerAddress = customerAddress; + } + + public String getCustomerId() { + return customerId; + } + + public void setCustomerId(String customerId) { + this.customerId = customerId; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public String getDeliverer() { + return deliverer; + } + + public void setDeliverer(String deliverer) { + this.deliverer = deliverer; + } + + public String getDelivererTel() { + return delivererTel; + } + + public void setDelivererTel(String delivererTel) { + this.delivererTel = delivererTel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIsExistSample() { + return isExistSample; + } + + public void setIsExistSample(String isExistSample) { + this.isExistSample = isExistSample; + } + + public String getLabelBind() { + return labelBind; + } + + public void setLabelBind(String labelBind) { + this.labelBind = labelBind; + } + + public String getManufacturer() { + return manufacturer; + } + + public void setManufacturer(String manufacturer) { + this.manufacturer = manufacturer; + } + + public String getManufacturerCountry() { + return manufacturerCountry; + } + + public void setManufacturerCountry(String manufacturerCountry) { + this.manufacturerCountry = manufacturerCountry; + } + + public String getManufacturingDate() { + return manufacturingDate; + } + + public void setManufacturingDate(String manufacturingDate) { + this.manufacturingDate = manufacturingDate; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getMeasureCategory() { + return measureCategory; + } + + public void setMeasureCategory(String measureCategory) { + this.measureCategory = measureCategory; + } + + public String getMeasureCategoryName() { + return measureCategoryName; + } + + public void setMeasureCategoryName(String measureCategoryName) { + this.measureCategoryName = measureCategoryName; + } + + public String getMeasureContent() { + return measureContent; + } + + public void setMeasureContent(String measureContent) { + this.measureContent = measureContent; + } + + public String getMeasureLastTime() { + return measureLastTime; + } + + public void setMeasureLastTime(String measureLastTime) { + this.measureLastTime = measureLastTime; + } + + public String getMeasurePeriod() { + return measurePeriod; + } + + public void setMeasurePeriod(String measurePeriod) { + this.measurePeriod = measurePeriod; + } + + public String getMeasureType() { + return measureType; + } + + public void setMeasureType(String measureType) { + this.measureType = measureType; + } + + public String getMeasureTypeName() { + return measureTypeName; + } + + public void setMeasureTypeName(String measureTypeName) { + this.measureTypeName = measureTypeName; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getPostalCode() { + return postalCode; + } + + public void setPostalCode(String postalCode) { + this.postalCode = postalCode; + } + + public String getPowerVoltage() { + return powerVoltage; + } + + public void setPowerVoltage(String powerVoltage) { + this.powerVoltage = powerVoltage; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSampleBelong() { + return sampleBelong; + } + + public void setSampleBelong(String sampleBelong) { + this.sampleBelong = sampleBelong; + } + + public String getSampleBelongName() { + return sampleBelongName; + } + + public void setSampleBelongName(String sampleBelongName) { + this.sampleBelongName = sampleBelongName; + } + + public String getSampleModel() { + return sampleModel; + } + + public void setSampleModel(String sampleModel) { + this.sampleModel = sampleModel; + } + + public String getSampleName() { + return sampleName; + } + + public void setSampleName(String sampleName) { + this.sampleName = sampleName; + } + + public String getSampleNo() { + return sampleNo; + } + + public void setSampleNo(String sampleNo) { + this.sampleNo = sampleNo; + } + + public String getSpecialRequire() { + return specialRequire; + } + + public void setSpecialRequire(String specialRequire) { + this.specialRequire = specialRequire; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUpdateUser() { + return updateUser; + } + + public void setUpdateUser(String updateUser) { + this.updateUser = updateUser; + } + + public String getValidDeadline() { + return validDeadline; + } + + public void setValidDeadline(String validDeadline) { + this.validDeadline = validDeadline; + } + } + } + + public static class EquipmentModel { + private String abc; + private String abcName; + private String applyRelationId; + private String assetNo; + private String assetSource; + private String assetType; + private String assetTypeName; + private String attribute; + private String capitalSource; + private String capitalSourceName; + private String cardEstablishmentDate; + private String createTime; + private String createUser; + private String depreciationMethod; + private String depreciationMethodName; + private String depreciationPeriod; + private String enableDate; + private String equipmentCategory; + private String equipmentCategoryName; + private String equipmentName; + private String equipmentNo; + private String equipmentSpecifications; + private String equipmentType; + private String equipmentTypeName; + private String fileList; + private String id; + private String installIncidentalExpenses; + private String installPlace; + private String intactState; + private String isCalibrationTestEquipment; + private String isDel; + private String isFixedAssets; + private String isMeasureAccount; + private String isStandardSupportEquipment; + private String labelBind; + private String majorCategory; + private String majorCategoryName; + private String managerLevel; + private String managerLevelName; + private String managerState; + private String managerStateName; + private String manufacturer; + private String manufacturerCountry; + private String manufacturingDate; + private String manufacturingNo; + private String mesureCycle; + private String mesureDate; + private String mesureDept; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String mesureType; + private String mesureTypeName; + private String modelNo; + private String originValue; + private String overallDimension; + private String presentOriginValue; + private String purpose; + private String remark; + private String singlePrice; + private String supportStandardEquipmentName; + private String supportStandardEquipmentNo; + private String technicalLevel; + private String uncertainty; + private String updateTime; + private String useDept; + private String useDeptName; + private String usePerson; + private String usePersonName; + private String validDate; + private String version; + private String weight; + + public String getAbc() { + return abc; + } + + public void setAbc(String abc) { + this.abc = abc; + } + + public String getAbcName() { + return abcName; + } + + public void setAbcName(String abcName) { + this.abcName = abcName; + } + + public String getApplyRelationId() { + return applyRelationId; + } + + public void setApplyRelationId(String applyRelationId) { + this.applyRelationId = applyRelationId; + } + + public String getAssetNo() { + return assetNo; + } + + public void setAssetNo(String assetNo) { + this.assetNo = assetNo; + } + + public String getAssetSource() { + return assetSource; + } + + public void setAssetSource(String assetSource) { + this.assetSource = assetSource; + } + + public String getAssetType() { + return assetType; + } + + public void setAssetType(String assetType) { + this.assetType = assetType; + } + + public String getAssetTypeName() { + return assetTypeName; + } + + public void setAssetTypeName(String assetTypeName) { + this.assetTypeName = assetTypeName; + } + + public String getAttribute() { + return attribute; + } + + public void setAttribute(String attribute) { + this.attribute = attribute; + } + + public String getCapitalSource() { + return capitalSource; + } + + public void setCapitalSource(String capitalSource) { + this.capitalSource = capitalSource; + } + + public String getCapitalSourceName() { + return capitalSourceName; + } + + public void setCapitalSourceName(String capitalSourceName) { + this.capitalSourceName = capitalSourceName; + } + + public String getCardEstablishmentDate() { + return cardEstablishmentDate; + } + + public void setCardEstablishmentDate(String cardEstablishmentDate) { + this.cardEstablishmentDate = cardEstablishmentDate; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getDepreciationMethod() { + return depreciationMethod; + } + + public void setDepreciationMethod(String depreciationMethod) { + this.depreciationMethod = depreciationMethod; + } + + public String getDepreciationMethodName() { + return depreciationMethodName; + } + + public void setDepreciationMethodName(String depreciationMethodName) { + this.depreciationMethodName = depreciationMethodName; + } + + public String getDepreciationPeriod() { + return depreciationPeriod; + } + + public void setDepreciationPeriod(String depreciationPeriod) { + this.depreciationPeriod = depreciationPeriod; + } + + public String getEnableDate() { + return enableDate; + } + + public void setEnableDate(String enableDate) { + this.enableDate = enableDate; + } + + public String getEquipmentCategory() { + return equipmentCategory; + } + + public void setEquipmentCategory(String equipmentCategory) { + this.equipmentCategory = equipmentCategory; + } + + public String getEquipmentCategoryName() { + return equipmentCategoryName; + } + + public void setEquipmentCategoryName(String equipmentCategoryName) { + this.equipmentCategoryName = equipmentCategoryName; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getEquipmentSpecifications() { + return equipmentSpecifications; + } + + public void setEquipmentSpecifications(String equipmentSpecifications) { + this.equipmentSpecifications = equipmentSpecifications; + } + + public String getEquipmentType() { + return equipmentType; + } + + public void setEquipmentType(String equipmentType) { + this.equipmentType = equipmentType; + } + + public String getEquipmentTypeName() { + return equipmentTypeName; + } + + public void setEquipmentTypeName(String equipmentTypeName) { + this.equipmentTypeName = equipmentTypeName; + } + + public String getFileList() { + return fileList; + } + + public void setFileList(String fileList) { + this.fileList = fileList; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInstallIncidentalExpenses() { + return installIncidentalExpenses; + } + + public void setInstallIncidentalExpenses(String installIncidentalExpenses) { + this.installIncidentalExpenses = installIncidentalExpenses; + } + + public String getInstallPlace() { + return installPlace; + } + + public void setInstallPlace(String installPlace) { + this.installPlace = installPlace; + } + + public String getIntactState() { + return intactState; + } + + public void setIntactState(String intactState) { + this.intactState = intactState; + } + + public String getIsCalibrationTestEquipment() { + return isCalibrationTestEquipment; + } + + public void setIsCalibrationTestEquipment(String isCalibrationTestEquipment) { + this.isCalibrationTestEquipment = isCalibrationTestEquipment; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIsFixedAssets() { + return isFixedAssets; + } + + public void setIsFixedAssets(String isFixedAssets) { + this.isFixedAssets = isFixedAssets; + } + + public String getIsMeasureAccount() { + return isMeasureAccount; + } + + public void setIsMeasureAccount(String isMeasureAccount) { + this.isMeasureAccount = isMeasureAccount; + } + + public String getIsStandardSupportEquipment() { + return isStandardSupportEquipment; + } + + public void setIsStandardSupportEquipment(String isStandardSupportEquipment) { + this.isStandardSupportEquipment = isStandardSupportEquipment; + } + + public String getLabelBind() { + return labelBind; + } + + public void setLabelBind(String labelBind) { + this.labelBind = labelBind; + } + + public String getMajorCategory() { + return majorCategory; + } + + public void setMajorCategory(String majorCategory) { + this.majorCategory = majorCategory; + } + + public String getMajorCategoryName() { + return majorCategoryName; + } + + public void setMajorCategoryName(String majorCategoryName) { + this.majorCategoryName = majorCategoryName; + } + + public String getManagerLevel() { + return managerLevel; + } + + public void setManagerLevel(String managerLevel) { + this.managerLevel = managerLevel; + } + + public String getManagerLevelName() { + return managerLevelName; + } + + public void setManagerLevelName(String managerLevelName) { + this.managerLevelName = managerLevelName; + } + + public String getManagerState() { + return managerState; + } + + public void setManagerState(String managerState) { + this.managerState = managerState; + } + + public String getManagerStateName() { + return managerStateName; + } + + public void setManagerStateName(String managerStateName) { + this.managerStateName = managerStateName; + } + + public String getManufacturer() { + return manufacturer; + } + + public void setManufacturer(String manufacturer) { + this.manufacturer = manufacturer; + } + + public String getManufacturerCountry() { + return manufacturerCountry; + } + + public void setManufacturerCountry(String manufacturerCountry) { + this.manufacturerCountry = manufacturerCountry; + } + + public String getManufacturingDate() { + return manufacturingDate; + } + + public void setManufacturingDate(String manufacturingDate) { + this.manufacturingDate = manufacturingDate; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getMesureCycle() { + return mesureCycle; + } + + public void setMesureCycle(String mesureCycle) { + this.mesureCycle = mesureCycle; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureDept() { + return mesureDept; + } + + public void setMesureDept(String mesureDept) { + this.mesureDept = mesureDept; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getMesureType() { + return mesureType; + } + + public void setMesureType(String mesureType) { + this.mesureType = mesureType; + } + + public String getMesureTypeName() { + return mesureTypeName; + } + + public void setMesureTypeName(String mesureTypeName) { + this.mesureTypeName = mesureTypeName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getOriginValue() { + return originValue; + } + + public void setOriginValue(String originValue) { + this.originValue = originValue; + } + + public String getOverallDimension() { + return overallDimension; + } + + public void setOverallDimension(String overallDimension) { + this.overallDimension = overallDimension; + } + + public String getPresentOriginValue() { + return presentOriginValue; + } + + public void setPresentOriginValue(String presentOriginValue) { + this.presentOriginValue = presentOriginValue; + } + + public String getPurpose() { + return purpose; + } + + public void setPurpose(String purpose) { + this.purpose = purpose; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSinglePrice() { + return singlePrice; + } + + public void setSinglePrice(String singlePrice) { + this.singlePrice = singlePrice; + } + + public String getSupportStandardEquipmentName() { + return supportStandardEquipmentName; + } + + public void setSupportStandardEquipmentName(String supportStandardEquipmentName) { + this.supportStandardEquipmentName = supportStandardEquipmentName; + } + + public String getSupportStandardEquipmentNo() { + return supportStandardEquipmentNo; + } + + public void setSupportStandardEquipmentNo(String supportStandardEquipmentNo) { + this.supportStandardEquipmentNo = supportStandardEquipmentNo; + } + + public String getTechnicalLevel() { + return technicalLevel; + } + + public void setTechnicalLevel(String technicalLevel) { + this.technicalLevel = technicalLevel; + } + + public String getUncertainty() { + return uncertainty; + } + + public void setUncertainty(String uncertainty) { + this.uncertainty = uncertainty; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDept() { + return useDept; + } + + public void setUseDept(String useDept) { + this.useDept = useDept; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getUsePerson() { + return usePerson; + } + + public void setUsePerson(String usePerson) { + this.usePerson = usePerson; + } + + public String getUsePersonName() { + return usePersonName; + } + + public void setUsePersonName(String usePersonName) { + this.usePersonName = usePersonName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + + public String getVersion() { + return version; + } + + public void setVersion(String version) { + this.version = version; + } + + public String getWeight() { + return weight; + } + + public void setWeight(String weight) { + this.weight = weight; + } + } + + public static class FileModel { + private String approvalStatus; + private String approvalStatusName; + private String createTime; + private String createUser; + private String createUserId; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String fileType; + private String fileTypeName; + private String id; + private String isDel; + private String minioFileName; + private String processId; + private String publishTime; + private String publisher; + private String remark; + private String updateTime; + + public String getApprovalStatus() { + return approvalStatus; + } + + public void setApprovalStatus(String approvalStatus) { + this.approvalStatus = approvalStatus; + } + + public String getApprovalStatusName() { + return approvalStatusName; + } + + public void setApprovalStatusName(String approvalStatusName) { + this.approvalStatusName = approvalStatusName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCreateUserId() { + return createUserId; + } + + public void setCreateUserId(String createUserId) { + this.createUserId = createUserId; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getFileType() { + return fileType; + } + + public void setFileType(String fileType) { + this.fileType = fileType; + } + + public String getFileTypeName() { + return fileTypeName; + } + + public void setFileTypeName(String fileTypeName) { + this.fileTypeName = fileTypeName; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getPublishTime() { + return publishTime; + } + + public void setPublishTime(String publishTime) { + this.publishTime = publishTime; + } + + public String getPublisher() { + return publisher; + } + + public void setPublisher(String publisher) { + this.publisher = publisher; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/CertificateListModel.java b/app/src/main/java/com/casic/xz/meterage/model/CertificateListModel.java new file mode 100644 index 0000000..0eed915 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/CertificateListModel.java @@ -0,0 +1,229 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class CertificateListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String approvalStatus; + private String approvalStatusName; + private String calibrationMajor; + private String certificateReportCode; + private String certificateReportName; + private String createTime; + private String decisionItem; + private String id; + private String manufacturingNo; + private String measureCategory; + private String measureCategoryName; + private String measurePersonId; + private String measurePersonName; + private String orderCode; + private String processId; + private String sampleModel; + private String sampleName; + private String sampleNo; + private String taskId; + + public String getApprovalStatus() { + return approvalStatus; + } + + public void setApprovalStatus(String approvalStatus) { + this.approvalStatus = approvalStatus; + } + + public String getApprovalStatusName() { + return approvalStatusName; + } + + public void setApprovalStatusName(String approvalStatusName) { + this.approvalStatusName = approvalStatusName; + } + + public String getCalibrationMajor() { + return calibrationMajor; + } + + public void setCalibrationMajor(String calibrationMajor) { + this.calibrationMajor = calibrationMajor; + } + + public String getCertificateReportCode() { + return certificateReportCode; + } + + public void setCertificateReportCode(String certificateReportCode) { + this.certificateReportCode = certificateReportCode; + } + + public String getCertificateReportName() { + return certificateReportName; + } + + public void setCertificateReportName(String certificateReportName) { + this.certificateReportName = certificateReportName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getDecisionItem() { + return decisionItem; + } + + public void setDecisionItem(String decisionItem) { + this.decisionItem = decisionItem; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getMeasureCategory() { + return measureCategory; + } + + public void setMeasureCategory(String measureCategory) { + this.measureCategory = measureCategory; + } + + public String getMeasureCategoryName() { + return measureCategoryName; + } + + public void setMeasureCategoryName(String measureCategoryName) { + this.measureCategoryName = measureCategoryName; + } + + public String getMeasurePersonId() { + return measurePersonId; + } + + public void setMeasurePersonId(String measurePersonId) { + this.measurePersonId = measurePersonId; + } + + public String getMeasurePersonName() { + return measurePersonName; + } + + public void setMeasurePersonName(String measurePersonName) { + this.measurePersonName = measurePersonName; + } + + public String getOrderCode() { + return orderCode; + } + + public void setOrderCode(String orderCode) { + this.orderCode = orderCode; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getSampleModel() { + return sampleModel; + } + + public void setSampleModel(String sampleModel) { + this.sampleModel = sampleModel; + } + + public String getSampleName() { + return sampleName; + } + + public void setSampleName(String sampleName) { + this.sampleName = sampleName; + } + + public String getSampleNo() { + return sampleNo; + } + + public void setSampleNo(String sampleNo) { + this.sampleNo = sampleNo; + } + + public String getTaskId() { + return taskId; + } + + public void setTaskId(String taskId) { + this.taskId = taskId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/CertificateModel.java b/app/src/main/java/com/casic/xz/meterage/model/CertificateModel.java deleted file mode 100644 index ec0d25b..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/CertificateModel.java +++ /dev/null @@ -1,202 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class CertificateModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String approvalStatus; - private String approvalStatusName; - private String calibrationMajor; - private String certificateReportCode; - private String certificateReportName; - private String createTime; - private String decisionItem; - private String id; - private String manufacturingNo; - private String measurePersonId; - private String orderCode; - private String processId; - private String sampleModel; - private String sampleName; - private String sampleNo; - private String taskId; - - public String getApprovalStatus() { - return approvalStatus; - } - - public void setApprovalStatus(String approvalStatus) { - this.approvalStatus = approvalStatus; - } - - public String getApprovalStatusName() { - return approvalStatusName; - } - - public void setApprovalStatusName(String approvalStatusName) { - this.approvalStatusName = approvalStatusName; - } - - public String getCalibrationMajor() { - return calibrationMajor; - } - - public void setCalibrationMajor(String calibrationMajor) { - this.calibrationMajor = calibrationMajor; - } - - public String getCertificateReportCode() { - return certificateReportCode; - } - - public void setCertificateReportCode(String certificateReportCode) { - this.certificateReportCode = certificateReportCode; - } - - public String getCertificateReportName() { - return certificateReportName; - } - - public void setCertificateReportName(String certificateReportName) { - this.certificateReportName = certificateReportName; - } - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getDecisionItem() { - return decisionItem; - } - - public void setDecisionItem(String decisionItem) { - this.decisionItem = decisionItem; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getManufacturingNo() { - return manufacturingNo; - } - - public void setManufacturingNo(String manufacturingNo) { - this.manufacturingNo = manufacturingNo; - } - - public String getMeasurePersonId() { - return measurePersonId; - } - - public void setMeasurePersonId(String measurePersonId) { - this.measurePersonId = measurePersonId; - } - - public String getOrderCode() { - return orderCode; - } - - public void setOrderCode(String orderCode) { - this.orderCode = orderCode; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public String getSampleModel() { - return sampleModel; - } - - public void setSampleModel(String sampleModel) { - this.sampleModel = sampleModel; - } - - public String getSampleName() { - return sampleName; - } - - public void setSampleName(String sampleName) { - this.sampleName = sampleName; - } - - public String getSampleNo() { - return sampleNo; - } - - public void setSampleNo(String sampleNo) { - this.sampleNo = sampleNo; - } - - public String getTaskId() { - return taskId; - } - - public void setTaskId(String taskId) { - this.taskId = taskId; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index b0dec00..a4f3c46 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -345,4 +345,22 @@ @QueryMap limit: Map, @QueryMap offset: Map ): String + + /** + * 获取委托书详情 + */ + @POST("/business/certificateReport/detail") + suspend fun getCertificateReportDetail( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 提交证书 + */ + @POST("/business/certificateReport/submit") + suspend fun submit( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String } \ 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 cef55ec..8bf4070 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 @@ -800,4 +800,29 @@ AuthenticationHelper.token!!, requestBody, limitMap, offsetMap ) } + + /** + * 获取证书报告详情 + */ + suspend fun getCertificateReportDetail(id: String): String { + val param = JsonObject() + param.addProperty("id", id) + val requestBody = param.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getCertificateReportDetail(AuthenticationHelper.token!!, requestBody) + } + + /** + * 提交证书报告 + */ + suspend fun submit(id: String): String { + val param = JsonObject() + param.addProperty("formId", "ywglzsbg") + param.addProperty("id", id) + val requestBody = param.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.submit(AuthenticationHelper.token!!, requestBody) + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportActivity.kt index 2baefd2..fa4e129 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportActivity.kt @@ -19,15 +19,21 @@ "已通过", "未通过", "已取消", - "非草稿", - "未通过", "可打印" ) private var fragmentPages: ArrayList = ArrayList() init { - pageTitles.indices.forEach { - fragmentPages.add(CertificateReportFragment((it + 1).toString())) + pageTitles.forEach { + when (it) { + "草稿箱" -> fragmentPages.add(CertificateReportFragment("1")) + "待审批" -> fragmentPages.add(CertificateReportFragment("2")) + "审批中" -> fragmentPages.add(CertificateReportFragment("3")) + "已通过" -> fragmentPages.add(CertificateReportFragment("4")) + "未通过" -> fragmentPages.add(CertificateReportFragment("5")) + "已取消" -> fragmentPages.add(CertificateReportFragment("6")) + "可打印" -> fragmentPages.add(CertificateReportFragment("9")) + } } } diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt new file mode 100644 index 0000000..e30c7c3 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt @@ -0,0 +1,106 @@ +package com.casic.xz.meterage.view.home + +import android.view.View +import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.SubViewPagerAdapter +import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.casic.xz.meterage.fragment.certificate.ApprovalProcessFragment +import com.casic.xz.meterage.fragment.certificate.BasicInformationFragment +import com.casic.xz.meterage.fragment.certificate.ExceptionReportFragment +import com.casic.xz.meterage.model.CertificateDetailModel +import com.casic.xz.meterage.utils.LoadingDialogHub +import com.casic.xz.meterage.vm.CertificateViewModel +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.vm.LoadState +import kotlinx.android.synthetic.main.activity_certificate_detail.* + +//"草稿箱" -> "1" +//"待审批" -> "2" +//"审批中" -> "3" +//"已通过" -> "4" +//"未通过" -> "5" +//"已取消" -> "6" +//"可打印" -> "9" + +class CertificateReportDetailActivity : KotlinBaseActivity() { + + private var fragmentPages: ArrayList = ArrayList() + private lateinit var certificateViewModel: CertificateViewModel + private lateinit var detailModel: CertificateDetailModel.DataModel + + override fun initData() { + val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! + + when (args[0]) { + "1" -> { + approvalView.text = "提交" + } + "2" -> { + approvalView.text = "审批" + } + "9" -> { + approvalView.text = "打印" + } + else -> { + approvalView.visibility = View.GONE + } + } + + certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] + certificateViewModel.getCertificateReportDetail(args[1]) + certificateViewModel.certificateDetail.observe(this) { + if (it.code == 200) { + + detailModel = it.data + + fragmentPages.add(BasicInformationFragment(detailModel)) + fragmentPages.add(ApprovalProcessFragment()) + fragmentPages.add(ExceptionReportFragment()) + + val pageTitles = arrayOf("基础信息", "审批流程", "异常报告") + + approvalViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, pageTitles + ) + //绑定 + topTabLayout.setupWithViewPager(approvalViewPager) + } + } + + certificateViewModel.submitResult.observe(this) { + if (it.code == 200) { + "提交成功".show(this) + finish() + } + } + } + + override fun initEvent() { + leftBackView.setOnClickListener { finish() } + + approvalView.setOnClickListener { + certificateViewModel.submit(detailModel.id) + } + } + + override fun initLayoutView(): Int = R.layout.activity_certificate_detail + + override fun observeRequestState() { + certificateViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt index 080c380..77fe8a5 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt @@ -129,6 +129,5 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() initLayoutImmersionBar(rootView) - titleView.text = "委托需求" } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt index 735e530..e088887 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt @@ -4,7 +4,9 @@ import com.casic.xz.meterage.base.BaseApplication import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage -import com.casic.xz.meterage.model.CertificateModel +import com.casic.xz.meterage.model.ActionResultModel +import com.casic.xz.meterage.model.CertificateDetailModel +import com.casic.xz.meterage.model.CertificateListModel import com.casic.xz.meterage.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -19,7 +21,9 @@ class CertificateViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val certificateList = MutableLiveData() + val certificateList = MutableLiveData() + val certificateDetail = MutableLiveData() + val submitResult = MutableLiveData() fun getCertificateReportList( approvalStatus: String, @@ -47,8 +51,46 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - certificateList.value = gson.fromJson( - response, object : TypeToken() {}.type + certificateList.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + + fun getCertificateReportDetail(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.getCertificateReportDetail(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + certificateDetail.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + + fun submit(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.submit(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + submitResult.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { loadState.value = LoadState.Fail diff --git a/app/build.gradle b/app/build.gradle index 5ba44f0..298f687 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -53,7 +53,8 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "XZJL_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" +// outputFileName = "XZJL_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "XZJL_" + getBuildDate() + "_Beta.apk" } } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4b914b5..ebea092 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -67,6 +67,7 @@ + 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 new file mode 100644 index 0000000..a75e566 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.certificate + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class ApprovalProcessFragment :KotlinBaseFragment(){ + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_certificate_approval_process + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt new file mode 100644 index 0000000..5882c3d --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt @@ -0,0 +1,77 @@ +package com.casic.xz.meterage.fragment.certificate + +import android.graphics.Color +import android.graphics.Paint +import android.util.Log +import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.watchAttachFile +import com.casic.xz.meterage.model.CertificateDetailModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.pengxh.kt.lite.extensions.toJson +import kotlinx.android.synthetic.main.fragment_certificate_basic_information.* + +class BasicInformationFragment(private val data: CertificateDetailModel.DataModel) : + KotlinBaseFragment() { + + override fun initData() { + val businessOriginal = data.businessOriginalRecord + + reportCodeView.text = data.certificateReportCode + originalCodeView.text = businessOriginal.originalRecordCode + checkCategoryView.text = businessOriginal.measureCategoryName + + Log.d( + "Casic", + "BasicInformationFragment => initData: ${businessOriginal.fileList.toJson()}" + ) +// basisFileView.text = businessOriginal.fileList + + val sampleInfo = businessOriginal.customerSampleInfo + sampleCodeView.text = sampleInfo.sampleNo + sampleNameView.text = sampleInfo.sampleName + manufacturingCodeView.text = sampleInfo.manufacturingNo + modelView.text = sampleInfo.sampleModel + entrustCodeView.text = sampleInfo.customerNo + entrustNameView.text = sampleInfo.customerName + entrustContactView.text = sampleInfo.phone + entrustEmailView.text = sampleInfo.postalCode + entrustAddressView.text = sampleInfo.customerAddress + senderView.text = sampleInfo.deliverer + senderContactView.text = sampleInfo.delivererTel + checkTypeView.text = sampleInfo.measureContent + remarkView.text = sampleInfo.remark + + estimateServedTimeView.text = businessOriginal.businessOrder.planDeliverTime + estimateCompleteTimeView.text = businessOriginal.businessOrder.requireOverTime + + if (data.certificateReportFile.isNullOrBlank()) { + reportFileView.text = "暂无附件" + } else { + val reportFileName = data.certificateReportFile + + reportFileView.text = reportFileName + val textPaint = reportFileView.paint + textPaint.flags = Paint.UNDERLINE_TEXT_FLAG + textPaint.isAntiAlias = true + reportFileView.setTextColor(Color.BLUE) + + reportFileView.setOnClickListener { + reportFileName.watchAttachFile(requireContext()) + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_certificate_basic_information + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt index 2f3c95c..b1df400 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt @@ -4,19 +4,24 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.addAll +import com.casic.xz.meterage.extensions.diffCurrentTime +import com.casic.xz.meterage.extensions.formatToDate import com.casic.xz.meterage.extensions.showEmptyPage -import com.casic.xz.meterage.model.CertificateModel +import com.casic.xz.meterage.model.CertificateListModel +import com.casic.xz.meterage.view.home.CertificateReportDetailActivity import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler import kotlinx.android.synthetic.main.fragment_certificate_report.* import kotlinx.android.synthetic.main.include_empty_view.* /** - * 计量法规 + * 证书报告 * * formId:ywglzsbg * */ @@ -24,8 +29,8 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var certificateViewModel: CertificateViewModel - private lateinit var certificateAdapter: NormalRecyclerAdapter - private var dataBeans: MutableList = ArrayList() + private lateinit var certificateAdapter: NormalRecyclerAdapter + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false @@ -119,40 +124,37 @@ } else { emptyView!!.hide() certificateAdapter = object : - NormalRecyclerAdapter( + NormalRecyclerAdapter( R.layout.item_certificate_rv_l, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, - item: CertificateModel.DataModel.RowsModel + item: CertificateListModel.DataModel.RowsModel ) { + val deltaT = item.createTime.diffCurrentTime() + val diffTime = if (deltaT < 24) { + "${deltaT}小时前" + } else { + item.createTime.formatToDate() + } + viewHolder.setText(R.id.reportNameView, item.certificateReportName) -// .setText(R.id.fileStateView, item.effectiveStatusName) -// .setText(R.id.remarkView, "备注：$remark") -// .setText(R.id.fileCodeView, "文件号：${item.fileNo}") -// .setText(R.id.releaseDateView, "实施时间：${item.publishTime}") -// -// if (!item.effectiveStatus.equals("1")) { -// viewHolder.setBackgroundColor( -// R.id.fileStateView, -// R.color.gray.convertColor(requireContext()) -// ) -// } + .setText(R.id.createTimeView, diffTime) + .setText(R.id.categoryView, "校验类别：${item.measureCategoryName}") + .setText(R.id.technicianView, "检定员：${item.measurePersonName}") + + viewHolder.setOnClickListener(R.id.showDetailButton) { + requireContext().navigatePageTo( + addAll(item.approvalStatus, item.id) + ) + } } } certificateRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) certificateRecyclerView.adapter = certificateAdapter - certificateAdapter.setOnItemClickedListener(object : - NormalRecyclerAdapter.OnItemClickedListener { - override fun onItemClicked( - position: Int, t: CertificateModel.DataModel.RowsModel - ) { -// requireContext().navigatePageTo(t.toJson()) - } - }) } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt new file mode 100644 index 0000000..2d5ac61 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.certificate + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class ExceptionReportFragment :KotlinBaseFragment(){ + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_certificate_exception_report + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/model/CertificateDetailModel.java b/app/src/main/java/com/casic/xz/meterage/model/CertificateDetailModel.java new file mode 100644 index 0000000..42efccd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/CertificateDetailModel.java @@ -0,0 +1,2080 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class CertificateDetailModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private String approvalSignId; + private String approvalStatus; + private String approvalStatusName; + private BusinessOriginalRecordModel businessOriginalRecord; + private String calibrationMajor; + private String calibrationMajorName; + private String certificateReportCategory; + private String certificateReportCode; + private String certificateReportFile; + private String certificateReportName; + private String createTime; + private String createUser; + private String expirationDate; + private String id; + private String isDel; + private String issuanceDate; + private String measureDeptId; + private String measurePersonId; + private String measureResult; + private String orderId; + private String originalRecordId; + private String printNum; + private String printStatus; + private String processId; + private String remark; + private String sampleId; + private String signId; + private String templateId; + private String updateTime; + + public String getApprovalSignId() { + return approvalSignId; + } + + public void setApprovalSignId(String approvalSignId) { + this.approvalSignId = approvalSignId; + } + + public String getApprovalStatus() { + return approvalStatus; + } + + public void setApprovalStatus(String approvalStatus) { + this.approvalStatus = approvalStatus; + } + + public String getApprovalStatusName() { + return approvalStatusName; + } + + public void setApprovalStatusName(String approvalStatusName) { + this.approvalStatusName = approvalStatusName; + } + + public BusinessOriginalRecordModel getBusinessOriginalRecord() { + return businessOriginalRecord; + } + + public void setBusinessOriginalRecord(BusinessOriginalRecordModel businessOriginalRecord) { + this.businessOriginalRecord = businessOriginalRecord; + } + + public String getCalibrationMajor() { + return calibrationMajor; + } + + public void setCalibrationMajor(String calibrationMajor) { + this.calibrationMajor = calibrationMajor; + } + + public String getCalibrationMajorName() { + return calibrationMajorName; + } + + public void setCalibrationMajorName(String calibrationMajorName) { + this.calibrationMajorName = calibrationMajorName; + } + + public String getCertificateReportCategory() { + return certificateReportCategory; + } + + public void setCertificateReportCategory(String certificateReportCategory) { + this.certificateReportCategory = certificateReportCategory; + } + + public String getCertificateReportCode() { + return certificateReportCode; + } + + public void setCertificateReportCode(String certificateReportCode) { + this.certificateReportCode = certificateReportCode; + } + + public String getCertificateReportFile() { + return certificateReportFile; + } + + public void setCertificateReportFile(String certificateReportFile) { + this.certificateReportFile = certificateReportFile; + } + + public String getCertificateReportName() { + return certificateReportName; + } + + public void setCertificateReportName(String certificateReportName) { + this.certificateReportName = certificateReportName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getExpirationDate() { + return expirationDate; + } + + public void setExpirationDate(String expirationDate) { + this.expirationDate = expirationDate; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String isIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIssuanceDate() { + return issuanceDate; + } + + public void setIssuanceDate(String issuanceDate) { + this.issuanceDate = issuanceDate; + } + + public String getMeasureDeptId() { + return measureDeptId; + } + + public void setMeasureDeptId(String measureDeptId) { + this.measureDeptId = measureDeptId; + } + + public String getMeasurePersonId() { + return measurePersonId; + } + + public void setMeasurePersonId(String measurePersonId) { + this.measurePersonId = measurePersonId; + } + + public String getMeasureResult() { + return measureResult; + } + + public void setMeasureResult(String measureResult) { + this.measureResult = measureResult; + } + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public String getOriginalRecordId() { + return originalRecordId; + } + + public void setOriginalRecordId(String originalRecordId) { + this.originalRecordId = originalRecordId; + } + + public String getPrintNum() { + return printNum; + } + + public void setPrintNum(String printNum) { + this.printNum = printNum; + } + + public String getPrintStatus() { + return printStatus; + } + + public void setPrintStatus(String printStatus) { + this.printStatus = printStatus; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSampleId() { + return sampleId; + } + + public void setSampleId(String sampleId) { + this.sampleId = sampleId; + } + + public String getSignId() { + return signId; + } + + public void setSignId(String signId) { + this.signId = signId; + } + + public String getTemplateId() { + return templateId; + } + + public void setTemplateId(String templateId) { + this.templateId = templateId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public static class BusinessOriginalRecordModel { + private BusinessEnvRecordModel businessEnvironmentRecord; + private BusinessOrderModel businessOrder; + private String calibrationPlace; + private String calibrationTime; + private String createTime; + private String createUser; + private BusinessOrderModel.CustomerSampleModel customerSampleInfo; + private String environmentId; + private List equipmentInfoList; + private List fileList; + private String id; + private String isDel; + private String measureCategory; + private String measureCategoryName; + private String orderId; + private String originalRecordCode; + private String originalRecordFile; + private String originalRecordName; + private String remark; + private String sampleId; + private String templateId; + private String templateName; + private String updateTime; + + public BusinessEnvRecordModel getBusinessEnvironmentRecord() { + return businessEnvironmentRecord; + } + + public void setBusinessEnvironmentRecord(BusinessEnvRecordModel businessEnvironmentRecord) { + this.businessEnvironmentRecord = businessEnvironmentRecord; + } + + public BusinessOrderModel getBusinessOrder() { + return businessOrder; + } + + public void setBusinessOrder(BusinessOrderModel businessOrder) { + this.businessOrder = businessOrder; + } + + public String getCalibrationPlace() { + return calibrationPlace; + } + + public void setCalibrationPlace(String calibrationPlace) { + this.calibrationPlace = calibrationPlace; + } + + public String getCalibrationTime() { + return calibrationTime; + } + + public void setCalibrationTime(String calibrationTime) { + this.calibrationTime = calibrationTime; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public BusinessOrderModel.CustomerSampleModel getCustomerSampleInfo() { + return customerSampleInfo; + } + + public void setCustomerSampleInfo(BusinessOrderModel.CustomerSampleModel customerSampleInfo) { + this.customerSampleInfo = customerSampleInfo; + } + + public String getEnvironmentId() { + return environmentId; + } + + public void setEnvironmentId(String environmentId) { + this.environmentId = environmentId; + } + + public List getEquipmentInfoList() { + return equipmentInfoList; + } + + public void setEquipmentInfoList(List equipmentInfoList) { + this.equipmentInfoList = equipmentInfoList; + } + + public List getFileList() { + return fileList; + } + + public void setFileList(List fileList) { + this.fileList = fileList; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String isIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getMeasureCategory() { + return measureCategory; + } + + public void setMeasureCategory(String measureCategory) { + this.measureCategory = measureCategory; + } + + public String getMeasureCategoryName() { + return measureCategoryName; + } + + public void setMeasureCategoryName(String measureCategoryName) { + this.measureCategoryName = measureCategoryName; + } + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public String getOriginalRecordCode() { + return originalRecordCode; + } + + public void setOriginalRecordCode(String originalRecordCode) { + this.originalRecordCode = originalRecordCode; + } + + public String getOriginalRecordFile() { + return originalRecordFile; + } + + public void setOriginalRecordFile(String originalRecordFile) { + this.originalRecordFile = originalRecordFile; + } + + public String getOriginalRecordName() { + return originalRecordName; + } + + public void setOriginalRecordName(String originalRecordName) { + this.originalRecordName = originalRecordName; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSampleId() { + return sampleId; + } + + public void setSampleId(String sampleId) { + this.sampleId = sampleId; + } + + public String getTemplateId() { + return templateId; + } + + public void setTemplateId(String templateId) { + this.templateId = templateId; + } + + public String getTemplateName() { + return templateName; + } + + public void setTemplateName(String templateName) { + this.templateName = templateName; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public static class BusinessEnvRecordModel { + private String createTime; + private String createUser; + private String environmentCode; + private String humidity; + private String id; + private String isDel; + private String outputVoltage; + private String recordTime; + private String recorder; + private String remark; + private String roomNumber; + private String temperature; + private String updateTime; + private String zeroGroundVoltage; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEnvironmentCode() { + return environmentCode; + } + + public void setEnvironmentCode(String environmentCode) { + this.environmentCode = environmentCode; + } + + public String getHumidity() { + return humidity; + } + + public void setHumidity(String humidity) { + this.humidity = humidity; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String isIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getOutputVoltage() { + return outputVoltage; + } + + public void setOutputVoltage(String outputVoltage) { + this.outputVoltage = outputVoltage; + } + + public String getRecordTime() { + return recordTime; + } + + public void setRecordTime(String recordTime) { + this.recordTime = recordTime; + } + + public String getRecorder() { + return recorder; + } + + public void setRecorder(String recorder) { + this.recorder = recorder; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getRoomNumber() { + return roomNumber; + } + + public void setRoomNumber(String roomNumber) { + this.roomNumber = roomNumber; + } + + public String getTemperature() { + return temperature; + } + + public void setTemperature(String temperature) { + this.temperature = temperature; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getZeroGroundVoltage() { + return zeroGroundVoltage; + } + + public void setZeroGroundVoltage(String zeroGroundVoltage) { + this.zeroGroundVoltage = zeroGroundVoltage; + } + } + + public static class BusinessOrderModel { + private String certifications; + private String createTime; + private String createUser; + private String customerAddress; + private String customerId; + private String customerName; + private String customerNo; + private String customerPhone; + private List customerSampleInfoList; + private String deliverTime; + private String deliverer; + private String delivererId; + private String delivererTel; + private String id; + private String isDel; + private String isUrgent; + private String minioFileName; + private String orderCode; + private String orderTime; + private String planDeliverTime; + private String remark; + private String requireOverTime; + private String status; + private String updateTime; + private String updateUser; + + public String getCertifications() { + return certifications; + } + + public void setCertifications(String certifications) { + this.certifications = certifications; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCustomerAddress() { + return customerAddress; + } + + public void setCustomerAddress(String customerAddress) { + this.customerAddress = customerAddress; + } + + public String getCustomerId() { + return customerId; + } + + public void setCustomerId(String customerId) { + this.customerId = customerId; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public String getCustomerPhone() { + return customerPhone; + } + + public void setCustomerPhone(String customerPhone) { + this.customerPhone = customerPhone; + } + + public List getCustomerSampleInfoList() { + return customerSampleInfoList; + } + + public void setCustomerSampleInfoList(List customerSampleInfoList) { + this.customerSampleInfoList = customerSampleInfoList; + } + + public String getDeliverTime() { + return deliverTime; + } + + public void setDeliverTime(String deliverTime) { + this.deliverTime = deliverTime; + } + + public String getDeliverer() { + return deliverer; + } + + public void setDeliverer(String deliverer) { + this.deliverer = deliverer; + } + + public String getDelivererId() { + return delivererId; + } + + public void setDelivererId(String delivererId) { + this.delivererId = delivererId; + } + + public String getDelivererTel() { + return delivererTel; + } + + public void setDelivererTel(String delivererTel) { + this.delivererTel = delivererTel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIsUrgent() { + return isUrgent; + } + + public void setIsUrgent(String isUrgent) { + this.isUrgent = isUrgent; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getOrderCode() { + return orderCode; + } + + public void setOrderCode(String orderCode) { + this.orderCode = orderCode; + } + + public String getOrderTime() { + return orderTime; + } + + public void setOrderTime(String orderTime) { + this.orderTime = orderTime; + } + + public String getPlanDeliverTime() { + return planDeliverTime; + } + + public void setPlanDeliverTime(String planDeliverTime) { + this.planDeliverTime = planDeliverTime; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getRequireOverTime() { + return requireOverTime; + } + + public void setRequireOverTime(String requireOverTime) { + this.requireOverTime = requireOverTime; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUpdateUser() { + return updateUser; + } + + public void setUpdateUser(String updateUser) { + this.updateUser = updateUser; + } + + public static class CustomerSampleModel { + private String abc; + private String appendix; + private String appendixDescn; + private String createTime; + private String createUser; + private String customerAddress; + private String customerId; + private String customerName; + private String customerNo; + private String deliverer; + private String delivererTel; + private String id; + private String isDel; + private String isExistSample; + private String labelBind; + private String manufacturer; + private String manufacturerCountry; + private String manufacturingDate; + private String manufacturingNo; + private String measureCategory; + private String measureCategoryName; + private String measureContent; + private String measureLastTime; + private String measurePeriod; + private String measureType; + private String measureTypeName; + private String minioFileName; + private String orderId; + private String phone; + private String postalCode; + private String powerVoltage; + private String remark; + private String sampleBelong; + private String sampleBelongName; + private String sampleModel; + private String sampleName; + private String sampleNo; + private String specialRequire; + private String updateTime; + private String updateUser; + private String validDeadline; + + public String getAbc() { + return abc; + } + + public void setAbc(String abc) { + this.abc = abc; + } + + public String getAppendix() { + return appendix; + } + + public void setAppendix(String appendix) { + this.appendix = appendix; + } + + public String getAppendixDescn() { + return appendixDescn; + } + + public void setAppendixDescn(String appendixDescn) { + this.appendixDescn = appendixDescn; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCustomerAddress() { + return customerAddress; + } + + public void setCustomerAddress(String customerAddress) { + this.customerAddress = customerAddress; + } + + public String getCustomerId() { + return customerId; + } + + public void setCustomerId(String customerId) { + this.customerId = customerId; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public String getDeliverer() { + return deliverer; + } + + public void setDeliverer(String deliverer) { + this.deliverer = deliverer; + } + + public String getDelivererTel() { + return delivererTel; + } + + public void setDelivererTel(String delivererTel) { + this.delivererTel = delivererTel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIsExistSample() { + return isExistSample; + } + + public void setIsExistSample(String isExistSample) { + this.isExistSample = isExistSample; + } + + public String getLabelBind() { + return labelBind; + } + + public void setLabelBind(String labelBind) { + this.labelBind = labelBind; + } + + public String getManufacturer() { + return manufacturer; + } + + public void setManufacturer(String manufacturer) { + this.manufacturer = manufacturer; + } + + public String getManufacturerCountry() { + return manufacturerCountry; + } + + public void setManufacturerCountry(String manufacturerCountry) { + this.manufacturerCountry = manufacturerCountry; + } + + public String getManufacturingDate() { + return manufacturingDate; + } + + public void setManufacturingDate(String manufacturingDate) { + this.manufacturingDate = manufacturingDate; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getMeasureCategory() { + return measureCategory; + } + + public void setMeasureCategory(String measureCategory) { + this.measureCategory = measureCategory; + } + + public String getMeasureCategoryName() { + return measureCategoryName; + } + + public void setMeasureCategoryName(String measureCategoryName) { + this.measureCategoryName = measureCategoryName; + } + + public String getMeasureContent() { + return measureContent; + } + + public void setMeasureContent(String measureContent) { + this.measureContent = measureContent; + } + + public String getMeasureLastTime() { + return measureLastTime; + } + + public void setMeasureLastTime(String measureLastTime) { + this.measureLastTime = measureLastTime; + } + + public String getMeasurePeriod() { + return measurePeriod; + } + + public void setMeasurePeriod(String measurePeriod) { + this.measurePeriod = measurePeriod; + } + + public String getMeasureType() { + return measureType; + } + + public void setMeasureType(String measureType) { + this.measureType = measureType; + } + + public String getMeasureTypeName() { + return measureTypeName; + } + + public void setMeasureTypeName(String measureTypeName) { + this.measureTypeName = measureTypeName; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getPostalCode() { + return postalCode; + } + + public void setPostalCode(String postalCode) { + this.postalCode = postalCode; + } + + public String getPowerVoltage() { + return powerVoltage; + } + + public void setPowerVoltage(String powerVoltage) { + this.powerVoltage = powerVoltage; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSampleBelong() { + return sampleBelong; + } + + public void setSampleBelong(String sampleBelong) { + this.sampleBelong = sampleBelong; + } + + public String getSampleBelongName() { + return sampleBelongName; + } + + public void setSampleBelongName(String sampleBelongName) { + this.sampleBelongName = sampleBelongName; + } + + public String getSampleModel() { + return sampleModel; + } + + public void setSampleModel(String sampleModel) { + this.sampleModel = sampleModel; + } + + public String getSampleName() { + return sampleName; + } + + public void setSampleName(String sampleName) { + this.sampleName = sampleName; + } + + public String getSampleNo() { + return sampleNo; + } + + public void setSampleNo(String sampleNo) { + this.sampleNo = sampleNo; + } + + public String getSpecialRequire() { + return specialRequire; + } + + public void setSpecialRequire(String specialRequire) { + this.specialRequire = specialRequire; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUpdateUser() { + return updateUser; + } + + public void setUpdateUser(String updateUser) { + this.updateUser = updateUser; + } + + public String getValidDeadline() { + return validDeadline; + } + + public void setValidDeadline(String validDeadline) { + this.validDeadline = validDeadline; + } + } + } + + public static class EquipmentModel { + private String abc; + private String abcName; + private String applyRelationId; + private String assetNo; + private String assetSource; + private String assetType; + private String assetTypeName; + private String attribute; + private String capitalSource; + private String capitalSourceName; + private String cardEstablishmentDate; + private String createTime; + private String createUser; + private String depreciationMethod; + private String depreciationMethodName; + private String depreciationPeriod; + private String enableDate; + private String equipmentCategory; + private String equipmentCategoryName; + private String equipmentName; + private String equipmentNo; + private String equipmentSpecifications; + private String equipmentType; + private String equipmentTypeName; + private String fileList; + private String id; + private String installIncidentalExpenses; + private String installPlace; + private String intactState; + private String isCalibrationTestEquipment; + private String isDel; + private String isFixedAssets; + private String isMeasureAccount; + private String isStandardSupportEquipment; + private String labelBind; + private String majorCategory; + private String majorCategoryName; + private String managerLevel; + private String managerLevelName; + private String managerState; + private String managerStateName; + private String manufacturer; + private String manufacturerCountry; + private String manufacturingDate; + private String manufacturingNo; + private String mesureCycle; + private String mesureDate; + private String mesureDept; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String mesureType; + private String mesureTypeName; + private String modelNo; + private String originValue; + private String overallDimension; + private String presentOriginValue; + private String purpose; + private String remark; + private String singlePrice; + private String supportStandardEquipmentName; + private String supportStandardEquipmentNo; + private String technicalLevel; + private String uncertainty; + private String updateTime; + private String useDept; + private String useDeptName; + private String usePerson; + private String usePersonName; + private String validDate; + private String version; + private String weight; + + public String getAbc() { + return abc; + } + + public void setAbc(String abc) { + this.abc = abc; + } + + public String getAbcName() { + return abcName; + } + + public void setAbcName(String abcName) { + this.abcName = abcName; + } + + public String getApplyRelationId() { + return applyRelationId; + } + + public void setApplyRelationId(String applyRelationId) { + this.applyRelationId = applyRelationId; + } + + public String getAssetNo() { + return assetNo; + } + + public void setAssetNo(String assetNo) { + this.assetNo = assetNo; + } + + public String getAssetSource() { + return assetSource; + } + + public void setAssetSource(String assetSource) { + this.assetSource = assetSource; + } + + public String getAssetType() { + return assetType; + } + + public void setAssetType(String assetType) { + this.assetType = assetType; + } + + public String getAssetTypeName() { + return assetTypeName; + } + + public void setAssetTypeName(String assetTypeName) { + this.assetTypeName = assetTypeName; + } + + public String getAttribute() { + return attribute; + } + + public void setAttribute(String attribute) { + this.attribute = attribute; + } + + public String getCapitalSource() { + return capitalSource; + } + + public void setCapitalSource(String capitalSource) { + this.capitalSource = capitalSource; + } + + public String getCapitalSourceName() { + return capitalSourceName; + } + + public void setCapitalSourceName(String capitalSourceName) { + this.capitalSourceName = capitalSourceName; + } + + public String getCardEstablishmentDate() { + return cardEstablishmentDate; + } + + public void setCardEstablishmentDate(String cardEstablishmentDate) { + this.cardEstablishmentDate = cardEstablishmentDate; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getDepreciationMethod() { + return depreciationMethod; + } + + public void setDepreciationMethod(String depreciationMethod) { + this.depreciationMethod = depreciationMethod; + } + + public String getDepreciationMethodName() { + return depreciationMethodName; + } + + public void setDepreciationMethodName(String depreciationMethodName) { + this.depreciationMethodName = depreciationMethodName; + } + + public String getDepreciationPeriod() { + return depreciationPeriod; + } + + public void setDepreciationPeriod(String depreciationPeriod) { + this.depreciationPeriod = depreciationPeriod; + } + + public String getEnableDate() { + return enableDate; + } + + public void setEnableDate(String enableDate) { + this.enableDate = enableDate; + } + + public String getEquipmentCategory() { + return equipmentCategory; + } + + public void setEquipmentCategory(String equipmentCategory) { + this.equipmentCategory = equipmentCategory; + } + + public String getEquipmentCategoryName() { + return equipmentCategoryName; + } + + public void setEquipmentCategoryName(String equipmentCategoryName) { + this.equipmentCategoryName = equipmentCategoryName; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getEquipmentSpecifications() { + return equipmentSpecifications; + } + + public void setEquipmentSpecifications(String equipmentSpecifications) { + this.equipmentSpecifications = equipmentSpecifications; + } + + public String getEquipmentType() { + return equipmentType; + } + + public void setEquipmentType(String equipmentType) { + this.equipmentType = equipmentType; + } + + public String getEquipmentTypeName() { + return equipmentTypeName; + } + + public void setEquipmentTypeName(String equipmentTypeName) { + this.equipmentTypeName = equipmentTypeName; + } + + public String getFileList() { + return fileList; + } + + public void setFileList(String fileList) { + this.fileList = fileList; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInstallIncidentalExpenses() { + return installIncidentalExpenses; + } + + public void setInstallIncidentalExpenses(String installIncidentalExpenses) { + this.installIncidentalExpenses = installIncidentalExpenses; + } + + public String getInstallPlace() { + return installPlace; + } + + public void setInstallPlace(String installPlace) { + this.installPlace = installPlace; + } + + public String getIntactState() { + return intactState; + } + + public void setIntactState(String intactState) { + this.intactState = intactState; + } + + public String getIsCalibrationTestEquipment() { + return isCalibrationTestEquipment; + } + + public void setIsCalibrationTestEquipment(String isCalibrationTestEquipment) { + this.isCalibrationTestEquipment = isCalibrationTestEquipment; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIsFixedAssets() { + return isFixedAssets; + } + + public void setIsFixedAssets(String isFixedAssets) { + this.isFixedAssets = isFixedAssets; + } + + public String getIsMeasureAccount() { + return isMeasureAccount; + } + + public void setIsMeasureAccount(String isMeasureAccount) { + this.isMeasureAccount = isMeasureAccount; + } + + public String getIsStandardSupportEquipment() { + return isStandardSupportEquipment; + } + + public void setIsStandardSupportEquipment(String isStandardSupportEquipment) { + this.isStandardSupportEquipment = isStandardSupportEquipment; + } + + public String getLabelBind() { + return labelBind; + } + + public void setLabelBind(String labelBind) { + this.labelBind = labelBind; + } + + public String getMajorCategory() { + return majorCategory; + } + + public void setMajorCategory(String majorCategory) { + this.majorCategory = majorCategory; + } + + public String getMajorCategoryName() { + return majorCategoryName; + } + + public void setMajorCategoryName(String majorCategoryName) { + this.majorCategoryName = majorCategoryName; + } + + public String getManagerLevel() { + return managerLevel; + } + + public void setManagerLevel(String managerLevel) { + this.managerLevel = managerLevel; + } + + public String getManagerLevelName() { + return managerLevelName; + } + + public void setManagerLevelName(String managerLevelName) { + this.managerLevelName = managerLevelName; + } + + public String getManagerState() { + return managerState; + } + + public void setManagerState(String managerState) { + this.managerState = managerState; + } + + public String getManagerStateName() { + return managerStateName; + } + + public void setManagerStateName(String managerStateName) { + this.managerStateName = managerStateName; + } + + public String getManufacturer() { + return manufacturer; + } + + public void setManufacturer(String manufacturer) { + this.manufacturer = manufacturer; + } + + public String getManufacturerCountry() { + return manufacturerCountry; + } + + public void setManufacturerCountry(String manufacturerCountry) { + this.manufacturerCountry = manufacturerCountry; + } + + public String getManufacturingDate() { + return manufacturingDate; + } + + public void setManufacturingDate(String manufacturingDate) { + this.manufacturingDate = manufacturingDate; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getMesureCycle() { + return mesureCycle; + } + + public void setMesureCycle(String mesureCycle) { + this.mesureCycle = mesureCycle; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureDept() { + return mesureDept; + } + + public void setMesureDept(String mesureDept) { + this.mesureDept = mesureDept; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getMesureType() { + return mesureType; + } + + public void setMesureType(String mesureType) { + this.mesureType = mesureType; + } + + public String getMesureTypeName() { + return mesureTypeName; + } + + public void setMesureTypeName(String mesureTypeName) { + this.mesureTypeName = mesureTypeName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getOriginValue() { + return originValue; + } + + public void setOriginValue(String originValue) { + this.originValue = originValue; + } + + public String getOverallDimension() { + return overallDimension; + } + + public void setOverallDimension(String overallDimension) { + this.overallDimension = overallDimension; + } + + public String getPresentOriginValue() { + return presentOriginValue; + } + + public void setPresentOriginValue(String presentOriginValue) { + this.presentOriginValue = presentOriginValue; + } + + public String getPurpose() { + return purpose; + } + + public void setPurpose(String purpose) { + this.purpose = purpose; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSinglePrice() { + return singlePrice; + } + + public void setSinglePrice(String singlePrice) { + this.singlePrice = singlePrice; + } + + public String getSupportStandardEquipmentName() { + return supportStandardEquipmentName; + } + + public void setSupportStandardEquipmentName(String supportStandardEquipmentName) { + this.supportStandardEquipmentName = supportStandardEquipmentName; + } + + public String getSupportStandardEquipmentNo() { + return supportStandardEquipmentNo; + } + + public void setSupportStandardEquipmentNo(String supportStandardEquipmentNo) { + this.supportStandardEquipmentNo = supportStandardEquipmentNo; + } + + public String getTechnicalLevel() { + return technicalLevel; + } + + public void setTechnicalLevel(String technicalLevel) { + this.technicalLevel = technicalLevel; + } + + public String getUncertainty() { + return uncertainty; + } + + public void setUncertainty(String uncertainty) { + this.uncertainty = uncertainty; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDept() { + return useDept; + } + + public void setUseDept(String useDept) { + this.useDept = useDept; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getUsePerson() { + return usePerson; + } + + public void setUsePerson(String usePerson) { + this.usePerson = usePerson; + } + + public String getUsePersonName() { + return usePersonName; + } + + public void setUsePersonName(String usePersonName) { + this.usePersonName = usePersonName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + + public String getVersion() { + return version; + } + + public void setVersion(String version) { + this.version = version; + } + + public String getWeight() { + return weight; + } + + public void setWeight(String weight) { + this.weight = weight; + } + } + + public static class FileModel { + private String approvalStatus; + private String approvalStatusName; + private String createTime; + private String createUser; + private String createUserId; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String fileType; + private String fileTypeName; + private String id; + private String isDel; + private String minioFileName; + private String processId; + private String publishTime; + private String publisher; + private String remark; + private String updateTime; + + public String getApprovalStatus() { + return approvalStatus; + } + + public void setApprovalStatus(String approvalStatus) { + this.approvalStatus = approvalStatus; + } + + public String getApprovalStatusName() { + return approvalStatusName; + } + + public void setApprovalStatusName(String approvalStatusName) { + this.approvalStatusName = approvalStatusName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCreateUserId() { + return createUserId; + } + + public void setCreateUserId(String createUserId) { + this.createUserId = createUserId; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getFileType() { + return fileType; + } + + public void setFileType(String fileType) { + this.fileType = fileType; + } + + public String getFileTypeName() { + return fileTypeName; + } + + public void setFileTypeName(String fileTypeName) { + this.fileTypeName = fileTypeName; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getPublishTime() { + return publishTime; + } + + public void setPublishTime(String publishTime) { + this.publishTime = publishTime; + } + + public String getPublisher() { + return publisher; + } + + public void setPublisher(String publisher) { + this.publisher = publisher; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/CertificateListModel.java b/app/src/main/java/com/casic/xz/meterage/model/CertificateListModel.java new file mode 100644 index 0000000..0eed915 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/CertificateListModel.java @@ -0,0 +1,229 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class CertificateListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String approvalStatus; + private String approvalStatusName; + private String calibrationMajor; + private String certificateReportCode; + private String certificateReportName; + private String createTime; + private String decisionItem; + private String id; + private String manufacturingNo; + private String measureCategory; + private String measureCategoryName; + private String measurePersonId; + private String measurePersonName; + private String orderCode; + private String processId; + private String sampleModel; + private String sampleName; + private String sampleNo; + private String taskId; + + public String getApprovalStatus() { + return approvalStatus; + } + + public void setApprovalStatus(String approvalStatus) { + this.approvalStatus = approvalStatus; + } + + public String getApprovalStatusName() { + return approvalStatusName; + } + + public void setApprovalStatusName(String approvalStatusName) { + this.approvalStatusName = approvalStatusName; + } + + public String getCalibrationMajor() { + return calibrationMajor; + } + + public void setCalibrationMajor(String calibrationMajor) { + this.calibrationMajor = calibrationMajor; + } + + public String getCertificateReportCode() { + return certificateReportCode; + } + + public void setCertificateReportCode(String certificateReportCode) { + this.certificateReportCode = certificateReportCode; + } + + public String getCertificateReportName() { + return certificateReportName; + } + + public void setCertificateReportName(String certificateReportName) { + this.certificateReportName = certificateReportName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getDecisionItem() { + return decisionItem; + } + + public void setDecisionItem(String decisionItem) { + this.decisionItem = decisionItem; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getMeasureCategory() { + return measureCategory; + } + + public void setMeasureCategory(String measureCategory) { + this.measureCategory = measureCategory; + } + + public String getMeasureCategoryName() { + return measureCategoryName; + } + + public void setMeasureCategoryName(String measureCategoryName) { + this.measureCategoryName = measureCategoryName; + } + + public String getMeasurePersonId() { + return measurePersonId; + } + + public void setMeasurePersonId(String measurePersonId) { + this.measurePersonId = measurePersonId; + } + + public String getMeasurePersonName() { + return measurePersonName; + } + + public void setMeasurePersonName(String measurePersonName) { + this.measurePersonName = measurePersonName; + } + + public String getOrderCode() { + return orderCode; + } + + public void setOrderCode(String orderCode) { + this.orderCode = orderCode; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getSampleModel() { + return sampleModel; + } + + public void setSampleModel(String sampleModel) { + this.sampleModel = sampleModel; + } + + public String getSampleName() { + return sampleName; + } + + public void setSampleName(String sampleName) { + this.sampleName = sampleName; + } + + public String getSampleNo() { + return sampleNo; + } + + public void setSampleNo(String sampleNo) { + this.sampleNo = sampleNo; + } + + public String getTaskId() { + return taskId; + } + + public void setTaskId(String taskId) { + this.taskId = taskId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/CertificateModel.java b/app/src/main/java/com/casic/xz/meterage/model/CertificateModel.java deleted file mode 100644 index ec0d25b..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/CertificateModel.java +++ /dev/null @@ -1,202 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class CertificateModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String approvalStatus; - private String approvalStatusName; - private String calibrationMajor; - private String certificateReportCode; - private String certificateReportName; - private String createTime; - private String decisionItem; - private String id; - private String manufacturingNo; - private String measurePersonId; - private String orderCode; - private String processId; - private String sampleModel; - private String sampleName; - private String sampleNo; - private String taskId; - - public String getApprovalStatus() { - return approvalStatus; - } - - public void setApprovalStatus(String approvalStatus) { - this.approvalStatus = approvalStatus; - } - - public String getApprovalStatusName() { - return approvalStatusName; - } - - public void setApprovalStatusName(String approvalStatusName) { - this.approvalStatusName = approvalStatusName; - } - - public String getCalibrationMajor() { - return calibrationMajor; - } - - public void setCalibrationMajor(String calibrationMajor) { - this.calibrationMajor = calibrationMajor; - } - - public String getCertificateReportCode() { - return certificateReportCode; - } - - public void setCertificateReportCode(String certificateReportCode) { - this.certificateReportCode = certificateReportCode; - } - - public String getCertificateReportName() { - return certificateReportName; - } - - public void setCertificateReportName(String certificateReportName) { - this.certificateReportName = certificateReportName; - } - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getDecisionItem() { - return decisionItem; - } - - public void setDecisionItem(String decisionItem) { - this.decisionItem = decisionItem; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getManufacturingNo() { - return manufacturingNo; - } - - public void setManufacturingNo(String manufacturingNo) { - this.manufacturingNo = manufacturingNo; - } - - public String getMeasurePersonId() { - return measurePersonId; - } - - public void setMeasurePersonId(String measurePersonId) { - this.measurePersonId = measurePersonId; - } - - public String getOrderCode() { - return orderCode; - } - - public void setOrderCode(String orderCode) { - this.orderCode = orderCode; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public String getSampleModel() { - return sampleModel; - } - - public void setSampleModel(String sampleModel) { - this.sampleModel = sampleModel; - } - - public String getSampleName() { - return sampleName; - } - - public void setSampleName(String sampleName) { - this.sampleName = sampleName; - } - - public String getSampleNo() { - return sampleNo; - } - - public void setSampleNo(String sampleNo) { - this.sampleNo = sampleNo; - } - - public String getTaskId() { - return taskId; - } - - public void setTaskId(String taskId) { - this.taskId = taskId; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index b0dec00..a4f3c46 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -345,4 +345,22 @@ @QueryMap limit: Map, @QueryMap offset: Map ): String + + /** + * 获取委托书详情 + */ + @POST("/business/certificateReport/detail") + suspend fun getCertificateReportDetail( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 提交证书 + */ + @POST("/business/certificateReport/submit") + suspend fun submit( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String } \ 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 cef55ec..8bf4070 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 @@ -800,4 +800,29 @@ AuthenticationHelper.token!!, requestBody, limitMap, offsetMap ) } + + /** + * 获取证书报告详情 + */ + suspend fun getCertificateReportDetail(id: String): String { + val param = JsonObject() + param.addProperty("id", id) + val requestBody = param.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getCertificateReportDetail(AuthenticationHelper.token!!, requestBody) + } + + /** + * 提交证书报告 + */ + suspend fun submit(id: String): String { + val param = JsonObject() + param.addProperty("formId", "ywglzsbg") + param.addProperty("id", id) + val requestBody = param.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.submit(AuthenticationHelper.token!!, requestBody) + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportActivity.kt index 2baefd2..fa4e129 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportActivity.kt @@ -19,15 +19,21 @@ "已通过", "未通过", "已取消", - "非草稿", - "未通过", "可打印" ) private var fragmentPages: ArrayList = ArrayList() init { - pageTitles.indices.forEach { - fragmentPages.add(CertificateReportFragment((it + 1).toString())) + pageTitles.forEach { + when (it) { + "草稿箱" -> fragmentPages.add(CertificateReportFragment("1")) + "待审批" -> fragmentPages.add(CertificateReportFragment("2")) + "审批中" -> fragmentPages.add(CertificateReportFragment("3")) + "已通过" -> fragmentPages.add(CertificateReportFragment("4")) + "未通过" -> fragmentPages.add(CertificateReportFragment("5")) + "已取消" -> fragmentPages.add(CertificateReportFragment("6")) + "可打印" -> fragmentPages.add(CertificateReportFragment("9")) + } } } diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt new file mode 100644 index 0000000..e30c7c3 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt @@ -0,0 +1,106 @@ +package com.casic.xz.meterage.view.home + +import android.view.View +import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.SubViewPagerAdapter +import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.casic.xz.meterage.fragment.certificate.ApprovalProcessFragment +import com.casic.xz.meterage.fragment.certificate.BasicInformationFragment +import com.casic.xz.meterage.fragment.certificate.ExceptionReportFragment +import com.casic.xz.meterage.model.CertificateDetailModel +import com.casic.xz.meterage.utils.LoadingDialogHub +import com.casic.xz.meterage.vm.CertificateViewModel +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.vm.LoadState +import kotlinx.android.synthetic.main.activity_certificate_detail.* + +//"草稿箱" -> "1" +//"待审批" -> "2" +//"审批中" -> "3" +//"已通过" -> "4" +//"未通过" -> "5" +//"已取消" -> "6" +//"可打印" -> "9" + +class CertificateReportDetailActivity : KotlinBaseActivity() { + + private var fragmentPages: ArrayList = ArrayList() + private lateinit var certificateViewModel: CertificateViewModel + private lateinit var detailModel: CertificateDetailModel.DataModel + + override fun initData() { + val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! + + when (args[0]) { + "1" -> { + approvalView.text = "提交" + } + "2" -> { + approvalView.text = "审批" + } + "9" -> { + approvalView.text = "打印" + } + else -> { + approvalView.visibility = View.GONE + } + } + + certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] + certificateViewModel.getCertificateReportDetail(args[1]) + certificateViewModel.certificateDetail.observe(this) { + if (it.code == 200) { + + detailModel = it.data + + fragmentPages.add(BasicInformationFragment(detailModel)) + fragmentPages.add(ApprovalProcessFragment()) + fragmentPages.add(ExceptionReportFragment()) + + val pageTitles = arrayOf("基础信息", "审批流程", "异常报告") + + approvalViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, pageTitles + ) + //绑定 + topTabLayout.setupWithViewPager(approvalViewPager) + } + } + + certificateViewModel.submitResult.observe(this) { + if (it.code == 200) { + "提交成功".show(this) + finish() + } + } + } + + override fun initEvent() { + leftBackView.setOnClickListener { finish() } + + approvalView.setOnClickListener { + certificateViewModel.submit(detailModel.id) + } + } + + override fun initLayoutView(): Int = R.layout.activity_certificate_detail + + override fun observeRequestState() { + certificateViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt index 080c380..77fe8a5 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt @@ -129,6 +129,5 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() initLayoutImmersionBar(rootView) - titleView.text = "委托需求" } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt index 735e530..e088887 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt @@ -4,7 +4,9 @@ import com.casic.xz.meterage.base.BaseApplication import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage -import com.casic.xz.meterage.model.CertificateModel +import com.casic.xz.meterage.model.ActionResultModel +import com.casic.xz.meterage.model.CertificateDetailModel +import com.casic.xz.meterage.model.CertificateListModel import com.casic.xz.meterage.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -19,7 +21,9 @@ class CertificateViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val certificateList = MutableLiveData() + val certificateList = MutableLiveData() + val certificateDetail = MutableLiveData() + val submitResult = MutableLiveData() fun getCertificateReportList( approvalStatus: String, @@ -47,8 +51,46 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - certificateList.value = gson.fromJson( - response, object : TypeToken() {}.type + certificateList.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + + fun getCertificateReportDetail(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.getCertificateReportDetail(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + certificateDetail.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + + fun submit(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.submit(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + submitResult.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { loadState.value = LoadState.Fail diff --git a/app/src/main/res/layout/activity_capability_detail.xml b/app/src/main/res/layout/activity_capability_detail.xml index 585960a..375d861 100644 --- a/app/src/main/res/layout/activity_capability_detail.xml +++ b/app/src/main/res/layout/activity_capability_detail.xml @@ -21,7 +21,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:padding="@dimen/dp_10"> + android:paddingHorizontal="@dimen/dp_10"> diff --git a/app/build.gradle b/app/build.gradle index 5ba44f0..298f687 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -53,7 +53,8 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "XZJL_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" +// outputFileName = "XZJL_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "XZJL_" + getBuildDate() + "_Beta.apk" } } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4b914b5..ebea092 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -67,6 +67,7 @@ + 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 new file mode 100644 index 0000000..a75e566 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.certificate + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class ApprovalProcessFragment :KotlinBaseFragment(){ + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_certificate_approval_process + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt new file mode 100644 index 0000000..5882c3d --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt @@ -0,0 +1,77 @@ +package com.casic.xz.meterage.fragment.certificate + +import android.graphics.Color +import android.graphics.Paint +import android.util.Log +import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.watchAttachFile +import com.casic.xz.meterage.model.CertificateDetailModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.pengxh.kt.lite.extensions.toJson +import kotlinx.android.synthetic.main.fragment_certificate_basic_information.* + +class BasicInformationFragment(private val data: CertificateDetailModel.DataModel) : + KotlinBaseFragment() { + + override fun initData() { + val businessOriginal = data.businessOriginalRecord + + reportCodeView.text = data.certificateReportCode + originalCodeView.text = businessOriginal.originalRecordCode + checkCategoryView.text = businessOriginal.measureCategoryName + + Log.d( + "Casic", + "BasicInformationFragment => initData: ${businessOriginal.fileList.toJson()}" + ) +// basisFileView.text = businessOriginal.fileList + + val sampleInfo = businessOriginal.customerSampleInfo + sampleCodeView.text = sampleInfo.sampleNo + sampleNameView.text = sampleInfo.sampleName + manufacturingCodeView.text = sampleInfo.manufacturingNo + modelView.text = sampleInfo.sampleModel + entrustCodeView.text = sampleInfo.customerNo + entrustNameView.text = sampleInfo.customerName + entrustContactView.text = sampleInfo.phone + entrustEmailView.text = sampleInfo.postalCode + entrustAddressView.text = sampleInfo.customerAddress + senderView.text = sampleInfo.deliverer + senderContactView.text = sampleInfo.delivererTel + checkTypeView.text = sampleInfo.measureContent + remarkView.text = sampleInfo.remark + + estimateServedTimeView.text = businessOriginal.businessOrder.planDeliverTime + estimateCompleteTimeView.text = businessOriginal.businessOrder.requireOverTime + + if (data.certificateReportFile.isNullOrBlank()) { + reportFileView.text = "暂无附件" + } else { + val reportFileName = data.certificateReportFile + + reportFileView.text = reportFileName + val textPaint = reportFileView.paint + textPaint.flags = Paint.UNDERLINE_TEXT_FLAG + textPaint.isAntiAlias = true + reportFileView.setTextColor(Color.BLUE) + + reportFileView.setOnClickListener { + reportFileName.watchAttachFile(requireContext()) + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_certificate_basic_information + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt index 2f3c95c..b1df400 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt @@ -4,19 +4,24 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.addAll +import com.casic.xz.meterage.extensions.diffCurrentTime +import com.casic.xz.meterage.extensions.formatToDate import com.casic.xz.meterage.extensions.showEmptyPage -import com.casic.xz.meterage.model.CertificateModel +import com.casic.xz.meterage.model.CertificateListModel +import com.casic.xz.meterage.view.home.CertificateReportDetailActivity import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler import kotlinx.android.synthetic.main.fragment_certificate_report.* import kotlinx.android.synthetic.main.include_empty_view.* /** - * 计量法规 + * 证书报告 * * formId:ywglzsbg * */ @@ -24,8 +29,8 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var certificateViewModel: CertificateViewModel - private lateinit var certificateAdapter: NormalRecyclerAdapter - private var dataBeans: MutableList = ArrayList() + private lateinit var certificateAdapter: NormalRecyclerAdapter + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false @@ -119,40 +124,37 @@ } else { emptyView!!.hide() certificateAdapter = object : - NormalRecyclerAdapter( + NormalRecyclerAdapter( R.layout.item_certificate_rv_l, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, - item: CertificateModel.DataModel.RowsModel + item: CertificateListModel.DataModel.RowsModel ) { + val deltaT = item.createTime.diffCurrentTime() + val diffTime = if (deltaT < 24) { + "${deltaT}小时前" + } else { + item.createTime.formatToDate() + } + viewHolder.setText(R.id.reportNameView, item.certificateReportName) -// .setText(R.id.fileStateView, item.effectiveStatusName) -// .setText(R.id.remarkView, "备注：$remark") -// .setText(R.id.fileCodeView, "文件号：${item.fileNo}") -// .setText(R.id.releaseDateView, "实施时间：${item.publishTime}") -// -// if (!item.effectiveStatus.equals("1")) { -// viewHolder.setBackgroundColor( -// R.id.fileStateView, -// R.color.gray.convertColor(requireContext()) -// ) -// } + .setText(R.id.createTimeView, diffTime) + .setText(R.id.categoryView, "校验类别：${item.measureCategoryName}") + .setText(R.id.technicianView, "检定员：${item.measurePersonName}") + + viewHolder.setOnClickListener(R.id.showDetailButton) { + requireContext().navigatePageTo( + addAll(item.approvalStatus, item.id) + ) + } } } certificateRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) certificateRecyclerView.adapter = certificateAdapter - certificateAdapter.setOnItemClickedListener(object : - NormalRecyclerAdapter.OnItemClickedListener { - override fun onItemClicked( - position: Int, t: CertificateModel.DataModel.RowsModel - ) { -// requireContext().navigatePageTo(t.toJson()) - } - }) } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt new file mode 100644 index 0000000..2d5ac61 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.certificate + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class ExceptionReportFragment :KotlinBaseFragment(){ + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_certificate_exception_report + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/model/CertificateDetailModel.java b/app/src/main/java/com/casic/xz/meterage/model/CertificateDetailModel.java new file mode 100644 index 0000000..42efccd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/CertificateDetailModel.java @@ -0,0 +1,2080 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class CertificateDetailModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private String approvalSignId; + private String approvalStatus; + private String approvalStatusName; + private BusinessOriginalRecordModel businessOriginalRecord; + private String calibrationMajor; + private String calibrationMajorName; + private String certificateReportCategory; + private String certificateReportCode; + private String certificateReportFile; + private String certificateReportName; + private String createTime; + private String createUser; + private String expirationDate; + private String id; + private String isDel; + private String issuanceDate; + private String measureDeptId; + private String measurePersonId; + private String measureResult; + private String orderId; + private String originalRecordId; + private String printNum; + private String printStatus; + private String processId; + private String remark; + private String sampleId; + private String signId; + private String templateId; + private String updateTime; + + public String getApprovalSignId() { + return approvalSignId; + } + + public void setApprovalSignId(String approvalSignId) { + this.approvalSignId = approvalSignId; + } + + public String getApprovalStatus() { + return approvalStatus; + } + + public void setApprovalStatus(String approvalStatus) { + this.approvalStatus = approvalStatus; + } + + public String getApprovalStatusName() { + return approvalStatusName; + } + + public void setApprovalStatusName(String approvalStatusName) { + this.approvalStatusName = approvalStatusName; + } + + public BusinessOriginalRecordModel getBusinessOriginalRecord() { + return businessOriginalRecord; + } + + public void setBusinessOriginalRecord(BusinessOriginalRecordModel businessOriginalRecord) { + this.businessOriginalRecord = businessOriginalRecord; + } + + public String getCalibrationMajor() { + return calibrationMajor; + } + + public void setCalibrationMajor(String calibrationMajor) { + this.calibrationMajor = calibrationMajor; + } + + public String getCalibrationMajorName() { + return calibrationMajorName; + } + + public void setCalibrationMajorName(String calibrationMajorName) { + this.calibrationMajorName = calibrationMajorName; + } + + public String getCertificateReportCategory() { + return certificateReportCategory; + } + + public void setCertificateReportCategory(String certificateReportCategory) { + this.certificateReportCategory = certificateReportCategory; + } + + public String getCertificateReportCode() { + return certificateReportCode; + } + + public void setCertificateReportCode(String certificateReportCode) { + this.certificateReportCode = certificateReportCode; + } + + public String getCertificateReportFile() { + return certificateReportFile; + } + + public void setCertificateReportFile(String certificateReportFile) { + this.certificateReportFile = certificateReportFile; + } + + public String getCertificateReportName() { + return certificateReportName; + } + + public void setCertificateReportName(String certificateReportName) { + this.certificateReportName = certificateReportName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getExpirationDate() { + return expirationDate; + } + + public void setExpirationDate(String expirationDate) { + this.expirationDate = expirationDate; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String isIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIssuanceDate() { + return issuanceDate; + } + + public void setIssuanceDate(String issuanceDate) { + this.issuanceDate = issuanceDate; + } + + public String getMeasureDeptId() { + return measureDeptId; + } + + public void setMeasureDeptId(String measureDeptId) { + this.measureDeptId = measureDeptId; + } + + public String getMeasurePersonId() { + return measurePersonId; + } + + public void setMeasurePersonId(String measurePersonId) { + this.measurePersonId = measurePersonId; + } + + public String getMeasureResult() { + return measureResult; + } + + public void setMeasureResult(String measureResult) { + this.measureResult = measureResult; + } + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public String getOriginalRecordId() { + return originalRecordId; + } + + public void setOriginalRecordId(String originalRecordId) { + this.originalRecordId = originalRecordId; + } + + public String getPrintNum() { + return printNum; + } + + public void setPrintNum(String printNum) { + this.printNum = printNum; + } + + public String getPrintStatus() { + return printStatus; + } + + public void setPrintStatus(String printStatus) { + this.printStatus = printStatus; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSampleId() { + return sampleId; + } + + public void setSampleId(String sampleId) { + this.sampleId = sampleId; + } + + public String getSignId() { + return signId; + } + + public void setSignId(String signId) { + this.signId = signId; + } + + public String getTemplateId() { + return templateId; + } + + public void setTemplateId(String templateId) { + this.templateId = templateId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public static class BusinessOriginalRecordModel { + private BusinessEnvRecordModel businessEnvironmentRecord; + private BusinessOrderModel businessOrder; + private String calibrationPlace; + private String calibrationTime; + private String createTime; + private String createUser; + private BusinessOrderModel.CustomerSampleModel customerSampleInfo; + private String environmentId; + private List equipmentInfoList; + private List fileList; + private String id; + private String isDel; + private String measureCategory; + private String measureCategoryName; + private String orderId; + private String originalRecordCode; + private String originalRecordFile; + private String originalRecordName; + private String remark; + private String sampleId; + private String templateId; + private String templateName; + private String updateTime; + + public BusinessEnvRecordModel getBusinessEnvironmentRecord() { + return businessEnvironmentRecord; + } + + public void setBusinessEnvironmentRecord(BusinessEnvRecordModel businessEnvironmentRecord) { + this.businessEnvironmentRecord = businessEnvironmentRecord; + } + + public BusinessOrderModel getBusinessOrder() { + return businessOrder; + } + + public void setBusinessOrder(BusinessOrderModel businessOrder) { + this.businessOrder = businessOrder; + } + + public String getCalibrationPlace() { + return calibrationPlace; + } + + public void setCalibrationPlace(String calibrationPlace) { + this.calibrationPlace = calibrationPlace; + } + + public String getCalibrationTime() { + return calibrationTime; + } + + public void setCalibrationTime(String calibrationTime) { + this.calibrationTime = calibrationTime; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public BusinessOrderModel.CustomerSampleModel getCustomerSampleInfo() { + return customerSampleInfo; + } + + public void setCustomerSampleInfo(BusinessOrderModel.CustomerSampleModel customerSampleInfo) { + this.customerSampleInfo = customerSampleInfo; + } + + public String getEnvironmentId() { + return environmentId; + } + + public void setEnvironmentId(String environmentId) { + this.environmentId = environmentId; + } + + public List getEquipmentInfoList() { + return equipmentInfoList; + } + + public void setEquipmentInfoList(List equipmentInfoList) { + this.equipmentInfoList = equipmentInfoList; + } + + public List getFileList() { + return fileList; + } + + public void setFileList(List fileList) { + this.fileList = fileList; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String isIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getMeasureCategory() { + return measureCategory; + } + + public void setMeasureCategory(String measureCategory) { + this.measureCategory = measureCategory; + } + + public String getMeasureCategoryName() { + return measureCategoryName; + } + + public void setMeasureCategoryName(String measureCategoryName) { + this.measureCategoryName = measureCategoryName; + } + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public String getOriginalRecordCode() { + return originalRecordCode; + } + + public void setOriginalRecordCode(String originalRecordCode) { + this.originalRecordCode = originalRecordCode; + } + + public String getOriginalRecordFile() { + return originalRecordFile; + } + + public void setOriginalRecordFile(String originalRecordFile) { + this.originalRecordFile = originalRecordFile; + } + + public String getOriginalRecordName() { + return originalRecordName; + } + + public void setOriginalRecordName(String originalRecordName) { + this.originalRecordName = originalRecordName; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSampleId() { + return sampleId; + } + + public void setSampleId(String sampleId) { + this.sampleId = sampleId; + } + + public String getTemplateId() { + return templateId; + } + + public void setTemplateId(String templateId) { + this.templateId = templateId; + } + + public String getTemplateName() { + return templateName; + } + + public void setTemplateName(String templateName) { + this.templateName = templateName; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public static class BusinessEnvRecordModel { + private String createTime; + private String createUser; + private String environmentCode; + private String humidity; + private String id; + private String isDel; + private String outputVoltage; + private String recordTime; + private String recorder; + private String remark; + private String roomNumber; + private String temperature; + private String updateTime; + private String zeroGroundVoltage; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEnvironmentCode() { + return environmentCode; + } + + public void setEnvironmentCode(String environmentCode) { + this.environmentCode = environmentCode; + } + + public String getHumidity() { + return humidity; + } + + public void setHumidity(String humidity) { + this.humidity = humidity; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String isIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getOutputVoltage() { + return outputVoltage; + } + + public void setOutputVoltage(String outputVoltage) { + this.outputVoltage = outputVoltage; + } + + public String getRecordTime() { + return recordTime; + } + + public void setRecordTime(String recordTime) { + this.recordTime = recordTime; + } + + public String getRecorder() { + return recorder; + } + + public void setRecorder(String recorder) { + this.recorder = recorder; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getRoomNumber() { + return roomNumber; + } + + public void setRoomNumber(String roomNumber) { + this.roomNumber = roomNumber; + } + + public String getTemperature() { + return temperature; + } + + public void setTemperature(String temperature) { + this.temperature = temperature; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getZeroGroundVoltage() { + return zeroGroundVoltage; + } + + public void setZeroGroundVoltage(String zeroGroundVoltage) { + this.zeroGroundVoltage = zeroGroundVoltage; + } + } + + public static class BusinessOrderModel { + private String certifications; + private String createTime; + private String createUser; + private String customerAddress; + private String customerId; + private String customerName; + private String customerNo; + private String customerPhone; + private List customerSampleInfoList; + private String deliverTime; + private String deliverer; + private String delivererId; + private String delivererTel; + private String id; + private String isDel; + private String isUrgent; + private String minioFileName; + private String orderCode; + private String orderTime; + private String planDeliverTime; + private String remark; + private String requireOverTime; + private String status; + private String updateTime; + private String updateUser; + + public String getCertifications() { + return certifications; + } + + public void setCertifications(String certifications) { + this.certifications = certifications; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCustomerAddress() { + return customerAddress; + } + + public void setCustomerAddress(String customerAddress) { + this.customerAddress = customerAddress; + } + + public String getCustomerId() { + return customerId; + } + + public void setCustomerId(String customerId) { + this.customerId = customerId; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public String getCustomerPhone() { + return customerPhone; + } + + public void setCustomerPhone(String customerPhone) { + this.customerPhone = customerPhone; + } + + public List getCustomerSampleInfoList() { + return customerSampleInfoList; + } + + public void setCustomerSampleInfoList(List customerSampleInfoList) { + this.customerSampleInfoList = customerSampleInfoList; + } + + public String getDeliverTime() { + return deliverTime; + } + + public void setDeliverTime(String deliverTime) { + this.deliverTime = deliverTime; + } + + public String getDeliverer() { + return deliverer; + } + + public void setDeliverer(String deliverer) { + this.deliverer = deliverer; + } + + public String getDelivererId() { + return delivererId; + } + + public void setDelivererId(String delivererId) { + this.delivererId = delivererId; + } + + public String getDelivererTel() { + return delivererTel; + } + + public void setDelivererTel(String delivererTel) { + this.delivererTel = delivererTel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIsUrgent() { + return isUrgent; + } + + public void setIsUrgent(String isUrgent) { + this.isUrgent = isUrgent; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getOrderCode() { + return orderCode; + } + + public void setOrderCode(String orderCode) { + this.orderCode = orderCode; + } + + public String getOrderTime() { + return orderTime; + } + + public void setOrderTime(String orderTime) { + this.orderTime = orderTime; + } + + public String getPlanDeliverTime() { + return planDeliverTime; + } + + public void setPlanDeliverTime(String planDeliverTime) { + this.planDeliverTime = planDeliverTime; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getRequireOverTime() { + return requireOverTime; + } + + public void setRequireOverTime(String requireOverTime) { + this.requireOverTime = requireOverTime; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUpdateUser() { + return updateUser; + } + + public void setUpdateUser(String updateUser) { + this.updateUser = updateUser; + } + + public static class CustomerSampleModel { + private String abc; + private String appendix; + private String appendixDescn; + private String createTime; + private String createUser; + private String customerAddress; + private String customerId; + private String customerName; + private String customerNo; + private String deliverer; + private String delivererTel; + private String id; + private String isDel; + private String isExistSample; + private String labelBind; + private String manufacturer; + private String manufacturerCountry; + private String manufacturingDate; + private String manufacturingNo; + private String measureCategory; + private String measureCategoryName; + private String measureContent; + private String measureLastTime; + private String measurePeriod; + private String measureType; + private String measureTypeName; + private String minioFileName; + private String orderId; + private String phone; + private String postalCode; + private String powerVoltage; + private String remark; + private String sampleBelong; + private String sampleBelongName; + private String sampleModel; + private String sampleName; + private String sampleNo; + private String specialRequire; + private String updateTime; + private String updateUser; + private String validDeadline; + + public String getAbc() { + return abc; + } + + public void setAbc(String abc) { + this.abc = abc; + } + + public String getAppendix() { + return appendix; + } + + public void setAppendix(String appendix) { + this.appendix = appendix; + } + + public String getAppendixDescn() { + return appendixDescn; + } + + public void setAppendixDescn(String appendixDescn) { + this.appendixDescn = appendixDescn; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCustomerAddress() { + return customerAddress; + } + + public void setCustomerAddress(String customerAddress) { + this.customerAddress = customerAddress; + } + + public String getCustomerId() { + return customerId; + } + + public void setCustomerId(String customerId) { + this.customerId = customerId; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public String getDeliverer() { + return deliverer; + } + + public void setDeliverer(String deliverer) { + this.deliverer = deliverer; + } + + public String getDelivererTel() { + return delivererTel; + } + + public void setDelivererTel(String delivererTel) { + this.delivererTel = delivererTel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIsExistSample() { + return isExistSample; + } + + public void setIsExistSample(String isExistSample) { + this.isExistSample = isExistSample; + } + + public String getLabelBind() { + return labelBind; + } + + public void setLabelBind(String labelBind) { + this.labelBind = labelBind; + } + + public String getManufacturer() { + return manufacturer; + } + + public void setManufacturer(String manufacturer) { + this.manufacturer = manufacturer; + } + + public String getManufacturerCountry() { + return manufacturerCountry; + } + + public void setManufacturerCountry(String manufacturerCountry) { + this.manufacturerCountry = manufacturerCountry; + } + + public String getManufacturingDate() { + return manufacturingDate; + } + + public void setManufacturingDate(String manufacturingDate) { + this.manufacturingDate = manufacturingDate; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getMeasureCategory() { + return measureCategory; + } + + public void setMeasureCategory(String measureCategory) { + this.measureCategory = measureCategory; + } + + public String getMeasureCategoryName() { + return measureCategoryName; + } + + public void setMeasureCategoryName(String measureCategoryName) { + this.measureCategoryName = measureCategoryName; + } + + public String getMeasureContent() { + return measureContent; + } + + public void setMeasureContent(String measureContent) { + this.measureContent = measureContent; + } + + public String getMeasureLastTime() { + return measureLastTime; + } + + public void setMeasureLastTime(String measureLastTime) { + this.measureLastTime = measureLastTime; + } + + public String getMeasurePeriod() { + return measurePeriod; + } + + public void setMeasurePeriod(String measurePeriod) { + this.measurePeriod = measurePeriod; + } + + public String getMeasureType() { + return measureType; + } + + public void setMeasureType(String measureType) { + this.measureType = measureType; + } + + public String getMeasureTypeName() { + return measureTypeName; + } + + public void setMeasureTypeName(String measureTypeName) { + this.measureTypeName = measureTypeName; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getPostalCode() { + return postalCode; + } + + public void setPostalCode(String postalCode) { + this.postalCode = postalCode; + } + + public String getPowerVoltage() { + return powerVoltage; + } + + public void setPowerVoltage(String powerVoltage) { + this.powerVoltage = powerVoltage; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSampleBelong() { + return sampleBelong; + } + + public void setSampleBelong(String sampleBelong) { + this.sampleBelong = sampleBelong; + } + + public String getSampleBelongName() { + return sampleBelongName; + } + + public void setSampleBelongName(String sampleBelongName) { + this.sampleBelongName = sampleBelongName; + } + + public String getSampleModel() { + return sampleModel; + } + + public void setSampleModel(String sampleModel) { + this.sampleModel = sampleModel; + } + + public String getSampleName() { + return sampleName; + } + + public void setSampleName(String sampleName) { + this.sampleName = sampleName; + } + + public String getSampleNo() { + return sampleNo; + } + + public void setSampleNo(String sampleNo) { + this.sampleNo = sampleNo; + } + + public String getSpecialRequire() { + return specialRequire; + } + + public void setSpecialRequire(String specialRequire) { + this.specialRequire = specialRequire; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUpdateUser() { + return updateUser; + } + + public void setUpdateUser(String updateUser) { + this.updateUser = updateUser; + } + + public String getValidDeadline() { + return validDeadline; + } + + public void setValidDeadline(String validDeadline) { + this.validDeadline = validDeadline; + } + } + } + + public static class EquipmentModel { + private String abc; + private String abcName; + private String applyRelationId; + private String assetNo; + private String assetSource; + private String assetType; + private String assetTypeName; + private String attribute; + private String capitalSource; + private String capitalSourceName; + private String cardEstablishmentDate; + private String createTime; + private String createUser; + private String depreciationMethod; + private String depreciationMethodName; + private String depreciationPeriod; + private String enableDate; + private String equipmentCategory; + private String equipmentCategoryName; + private String equipmentName; + private String equipmentNo; + private String equipmentSpecifications; + private String equipmentType; + private String equipmentTypeName; + private String fileList; + private String id; + private String installIncidentalExpenses; + private String installPlace; + private String intactState; + private String isCalibrationTestEquipment; + private String isDel; + private String isFixedAssets; + private String isMeasureAccount; + private String isStandardSupportEquipment; + private String labelBind; + private String majorCategory; + private String majorCategoryName; + private String managerLevel; + private String managerLevelName; + private String managerState; + private String managerStateName; + private String manufacturer; + private String manufacturerCountry; + private String manufacturingDate; + private String manufacturingNo; + private String mesureCycle; + private String mesureDate; + private String mesureDept; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String mesureType; + private String mesureTypeName; + private String modelNo; + private String originValue; + private String overallDimension; + private String presentOriginValue; + private String purpose; + private String remark; + private String singlePrice; + private String supportStandardEquipmentName; + private String supportStandardEquipmentNo; + private String technicalLevel; + private String uncertainty; + private String updateTime; + private String useDept; + private String useDeptName; + private String usePerson; + private String usePersonName; + private String validDate; + private String version; + private String weight; + + public String getAbc() { + return abc; + } + + public void setAbc(String abc) { + this.abc = abc; + } + + public String getAbcName() { + return abcName; + } + + public void setAbcName(String abcName) { + this.abcName = abcName; + } + + public String getApplyRelationId() { + return applyRelationId; + } + + public void setApplyRelationId(String applyRelationId) { + this.applyRelationId = applyRelationId; + } + + public String getAssetNo() { + return assetNo; + } + + public void setAssetNo(String assetNo) { + this.assetNo = assetNo; + } + + public String getAssetSource() { + return assetSource; + } + + public void setAssetSource(String assetSource) { + this.assetSource = assetSource; + } + + public String getAssetType() { + return assetType; + } + + public void setAssetType(String assetType) { + this.assetType = assetType; + } + + public String getAssetTypeName() { + return assetTypeName; + } + + public void setAssetTypeName(String assetTypeName) { + this.assetTypeName = assetTypeName; + } + + public String getAttribute() { + return attribute; + } + + public void setAttribute(String attribute) { + this.attribute = attribute; + } + + public String getCapitalSource() { + return capitalSource; + } + + public void setCapitalSource(String capitalSource) { + this.capitalSource = capitalSource; + } + + public String getCapitalSourceName() { + return capitalSourceName; + } + + public void setCapitalSourceName(String capitalSourceName) { + this.capitalSourceName = capitalSourceName; + } + + public String getCardEstablishmentDate() { + return cardEstablishmentDate; + } + + public void setCardEstablishmentDate(String cardEstablishmentDate) { + this.cardEstablishmentDate = cardEstablishmentDate; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getDepreciationMethod() { + return depreciationMethod; + } + + public void setDepreciationMethod(String depreciationMethod) { + this.depreciationMethod = depreciationMethod; + } + + public String getDepreciationMethodName() { + return depreciationMethodName; + } + + public void setDepreciationMethodName(String depreciationMethodName) { + this.depreciationMethodName = depreciationMethodName; + } + + public String getDepreciationPeriod() { + return depreciationPeriod; + } + + public void setDepreciationPeriod(String depreciationPeriod) { + this.depreciationPeriod = depreciationPeriod; + } + + public String getEnableDate() { + return enableDate; + } + + public void setEnableDate(String enableDate) { + this.enableDate = enableDate; + } + + public String getEquipmentCategory() { + return equipmentCategory; + } + + public void setEquipmentCategory(String equipmentCategory) { + this.equipmentCategory = equipmentCategory; + } + + public String getEquipmentCategoryName() { + return equipmentCategoryName; + } + + public void setEquipmentCategoryName(String equipmentCategoryName) { + this.equipmentCategoryName = equipmentCategoryName; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getEquipmentSpecifications() { + return equipmentSpecifications; + } + + public void setEquipmentSpecifications(String equipmentSpecifications) { + this.equipmentSpecifications = equipmentSpecifications; + } + + public String getEquipmentType() { + return equipmentType; + } + + public void setEquipmentType(String equipmentType) { + this.equipmentType = equipmentType; + } + + public String getEquipmentTypeName() { + return equipmentTypeName; + } + + public void setEquipmentTypeName(String equipmentTypeName) { + this.equipmentTypeName = equipmentTypeName; + } + + public String getFileList() { + return fileList; + } + + public void setFileList(String fileList) { + this.fileList = fileList; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInstallIncidentalExpenses() { + return installIncidentalExpenses; + } + + public void setInstallIncidentalExpenses(String installIncidentalExpenses) { + this.installIncidentalExpenses = installIncidentalExpenses; + } + + public String getInstallPlace() { + return installPlace; + } + + public void setInstallPlace(String installPlace) { + this.installPlace = installPlace; + } + + public String getIntactState() { + return intactState; + } + + public void setIntactState(String intactState) { + this.intactState = intactState; + } + + public String getIsCalibrationTestEquipment() { + return isCalibrationTestEquipment; + } + + public void setIsCalibrationTestEquipment(String isCalibrationTestEquipment) { + this.isCalibrationTestEquipment = isCalibrationTestEquipment; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIsFixedAssets() { + return isFixedAssets; + } + + public void setIsFixedAssets(String isFixedAssets) { + this.isFixedAssets = isFixedAssets; + } + + public String getIsMeasureAccount() { + return isMeasureAccount; + } + + public void setIsMeasureAccount(String isMeasureAccount) { + this.isMeasureAccount = isMeasureAccount; + } + + public String getIsStandardSupportEquipment() { + return isStandardSupportEquipment; + } + + public void setIsStandardSupportEquipment(String isStandardSupportEquipment) { + this.isStandardSupportEquipment = isStandardSupportEquipment; + } + + public String getLabelBind() { + return labelBind; + } + + public void setLabelBind(String labelBind) { + this.labelBind = labelBind; + } + + public String getMajorCategory() { + return majorCategory; + } + + public void setMajorCategory(String majorCategory) { + this.majorCategory = majorCategory; + } + + public String getMajorCategoryName() { + return majorCategoryName; + } + + public void setMajorCategoryName(String majorCategoryName) { + this.majorCategoryName = majorCategoryName; + } + + public String getManagerLevel() { + return managerLevel; + } + + public void setManagerLevel(String managerLevel) { + this.managerLevel = managerLevel; + } + + public String getManagerLevelName() { + return managerLevelName; + } + + public void setManagerLevelName(String managerLevelName) { + this.managerLevelName = managerLevelName; + } + + public String getManagerState() { + return managerState; + } + + public void setManagerState(String managerState) { + this.managerState = managerState; + } + + public String getManagerStateName() { + return managerStateName; + } + + public void setManagerStateName(String managerStateName) { + this.managerStateName = managerStateName; + } + + public String getManufacturer() { + return manufacturer; + } + + public void setManufacturer(String manufacturer) { + this.manufacturer = manufacturer; + } + + public String getManufacturerCountry() { + return manufacturerCountry; + } + + public void setManufacturerCountry(String manufacturerCountry) { + this.manufacturerCountry = manufacturerCountry; + } + + public String getManufacturingDate() { + return manufacturingDate; + } + + public void setManufacturingDate(String manufacturingDate) { + this.manufacturingDate = manufacturingDate; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getMesureCycle() { + return mesureCycle; + } + + public void setMesureCycle(String mesureCycle) { + this.mesureCycle = mesureCycle; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureDept() { + return mesureDept; + } + + public void setMesureDept(String mesureDept) { + this.mesureDept = mesureDept; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getMesureType() { + return mesureType; + } + + public void setMesureType(String mesureType) { + this.mesureType = mesureType; + } + + public String getMesureTypeName() { + return mesureTypeName; + } + + public void setMesureTypeName(String mesureTypeName) { + this.mesureTypeName = mesureTypeName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getOriginValue() { + return originValue; + } + + public void setOriginValue(String originValue) { + this.originValue = originValue; + } + + public String getOverallDimension() { + return overallDimension; + } + + public void setOverallDimension(String overallDimension) { + this.overallDimension = overallDimension; + } + + public String getPresentOriginValue() { + return presentOriginValue; + } + + public void setPresentOriginValue(String presentOriginValue) { + this.presentOriginValue = presentOriginValue; + } + + public String getPurpose() { + return purpose; + } + + public void setPurpose(String purpose) { + this.purpose = purpose; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSinglePrice() { + return singlePrice; + } + + public void setSinglePrice(String singlePrice) { + this.singlePrice = singlePrice; + } + + public String getSupportStandardEquipmentName() { + return supportStandardEquipmentName; + } + + public void setSupportStandardEquipmentName(String supportStandardEquipmentName) { + this.supportStandardEquipmentName = supportStandardEquipmentName; + } + + public String getSupportStandardEquipmentNo() { + return supportStandardEquipmentNo; + } + + public void setSupportStandardEquipmentNo(String supportStandardEquipmentNo) { + this.supportStandardEquipmentNo = supportStandardEquipmentNo; + } + + public String getTechnicalLevel() { + return technicalLevel; + } + + public void setTechnicalLevel(String technicalLevel) { + this.technicalLevel = technicalLevel; + } + + public String getUncertainty() { + return uncertainty; + } + + public void setUncertainty(String uncertainty) { + this.uncertainty = uncertainty; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDept() { + return useDept; + } + + public void setUseDept(String useDept) { + this.useDept = useDept; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getUsePerson() { + return usePerson; + } + + public void setUsePerson(String usePerson) { + this.usePerson = usePerson; + } + + public String getUsePersonName() { + return usePersonName; + } + + public void setUsePersonName(String usePersonName) { + this.usePersonName = usePersonName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + + public String getVersion() { + return version; + } + + public void setVersion(String version) { + this.version = version; + } + + public String getWeight() { + return weight; + } + + public void setWeight(String weight) { + this.weight = weight; + } + } + + public static class FileModel { + private String approvalStatus; + private String approvalStatusName; + private String createTime; + private String createUser; + private String createUserId; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String fileType; + private String fileTypeName; + private String id; + private String isDel; + private String minioFileName; + private String processId; + private String publishTime; + private String publisher; + private String remark; + private String updateTime; + + public String getApprovalStatus() { + return approvalStatus; + } + + public void setApprovalStatus(String approvalStatus) { + this.approvalStatus = approvalStatus; + } + + public String getApprovalStatusName() { + return approvalStatusName; + } + + public void setApprovalStatusName(String approvalStatusName) { + this.approvalStatusName = approvalStatusName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCreateUserId() { + return createUserId; + } + + public void setCreateUserId(String createUserId) { + this.createUserId = createUserId; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getFileType() { + return fileType; + } + + public void setFileType(String fileType) { + this.fileType = fileType; + } + + public String getFileTypeName() { + return fileTypeName; + } + + public void setFileTypeName(String fileTypeName) { + this.fileTypeName = fileTypeName; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getPublishTime() { + return publishTime; + } + + public void setPublishTime(String publishTime) { + this.publishTime = publishTime; + } + + public String getPublisher() { + return publisher; + } + + public void setPublisher(String publisher) { + this.publisher = publisher; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/CertificateListModel.java b/app/src/main/java/com/casic/xz/meterage/model/CertificateListModel.java new file mode 100644 index 0000000..0eed915 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/CertificateListModel.java @@ -0,0 +1,229 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class CertificateListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String approvalStatus; + private String approvalStatusName; + private String calibrationMajor; + private String certificateReportCode; + private String certificateReportName; + private String createTime; + private String decisionItem; + private String id; + private String manufacturingNo; + private String measureCategory; + private String measureCategoryName; + private String measurePersonId; + private String measurePersonName; + private String orderCode; + private String processId; + private String sampleModel; + private String sampleName; + private String sampleNo; + private String taskId; + + public String getApprovalStatus() { + return approvalStatus; + } + + public void setApprovalStatus(String approvalStatus) { + this.approvalStatus = approvalStatus; + } + + public String getApprovalStatusName() { + return approvalStatusName; + } + + public void setApprovalStatusName(String approvalStatusName) { + this.approvalStatusName = approvalStatusName; + } + + public String getCalibrationMajor() { + return calibrationMajor; + } + + public void setCalibrationMajor(String calibrationMajor) { + this.calibrationMajor = calibrationMajor; + } + + public String getCertificateReportCode() { + return certificateReportCode; + } + + public void setCertificateReportCode(String certificateReportCode) { + this.certificateReportCode = certificateReportCode; + } + + public String getCertificateReportName() { + return certificateReportName; + } + + public void setCertificateReportName(String certificateReportName) { + this.certificateReportName = certificateReportName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getDecisionItem() { + return decisionItem; + } + + public void setDecisionItem(String decisionItem) { + this.decisionItem = decisionItem; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getMeasureCategory() { + return measureCategory; + } + + public void setMeasureCategory(String measureCategory) { + this.measureCategory = measureCategory; + } + + public String getMeasureCategoryName() { + return measureCategoryName; + } + + public void setMeasureCategoryName(String measureCategoryName) { + this.measureCategoryName = measureCategoryName; + } + + public String getMeasurePersonId() { + return measurePersonId; + } + + public void setMeasurePersonId(String measurePersonId) { + this.measurePersonId = measurePersonId; + } + + public String getMeasurePersonName() { + return measurePersonName; + } + + public void setMeasurePersonName(String measurePersonName) { + this.measurePersonName = measurePersonName; + } + + public String getOrderCode() { + return orderCode; + } + + public void setOrderCode(String orderCode) { + this.orderCode = orderCode; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getSampleModel() { + return sampleModel; + } + + public void setSampleModel(String sampleModel) { + this.sampleModel = sampleModel; + } + + public String getSampleName() { + return sampleName; + } + + public void setSampleName(String sampleName) { + this.sampleName = sampleName; + } + + public String getSampleNo() { + return sampleNo; + } + + public void setSampleNo(String sampleNo) { + this.sampleNo = sampleNo; + } + + public String getTaskId() { + return taskId; + } + + public void setTaskId(String taskId) { + this.taskId = taskId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/CertificateModel.java b/app/src/main/java/com/casic/xz/meterage/model/CertificateModel.java deleted file mode 100644 index ec0d25b..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/CertificateModel.java +++ /dev/null @@ -1,202 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class CertificateModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String approvalStatus; - private String approvalStatusName; - private String calibrationMajor; - private String certificateReportCode; - private String certificateReportName; - private String createTime; - private String decisionItem; - private String id; - private String manufacturingNo; - private String measurePersonId; - private String orderCode; - private String processId; - private String sampleModel; - private String sampleName; - private String sampleNo; - private String taskId; - - public String getApprovalStatus() { - return approvalStatus; - } - - public void setApprovalStatus(String approvalStatus) { - this.approvalStatus = approvalStatus; - } - - public String getApprovalStatusName() { - return approvalStatusName; - } - - public void setApprovalStatusName(String approvalStatusName) { - this.approvalStatusName = approvalStatusName; - } - - public String getCalibrationMajor() { - return calibrationMajor; - } - - public void setCalibrationMajor(String calibrationMajor) { - this.calibrationMajor = calibrationMajor; - } - - public String getCertificateReportCode() { - return certificateReportCode; - } - - public void setCertificateReportCode(String certificateReportCode) { - this.certificateReportCode = certificateReportCode; - } - - public String getCertificateReportName() { - return certificateReportName; - } - - public void setCertificateReportName(String certificateReportName) { - this.certificateReportName = certificateReportName; - } - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getDecisionItem() { - return decisionItem; - } - - public void setDecisionItem(String decisionItem) { - this.decisionItem = decisionItem; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getManufacturingNo() { - return manufacturingNo; - } - - public void setManufacturingNo(String manufacturingNo) { - this.manufacturingNo = manufacturingNo; - } - - public String getMeasurePersonId() { - return measurePersonId; - } - - public void setMeasurePersonId(String measurePersonId) { - this.measurePersonId = measurePersonId; - } - - public String getOrderCode() { - return orderCode; - } - - public void setOrderCode(String orderCode) { - this.orderCode = orderCode; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public String getSampleModel() { - return sampleModel; - } - - public void setSampleModel(String sampleModel) { - this.sampleModel = sampleModel; - } - - public String getSampleName() { - return sampleName; - } - - public void setSampleName(String sampleName) { - this.sampleName = sampleName; - } - - public String getSampleNo() { - return sampleNo; - } - - public void setSampleNo(String sampleNo) { - this.sampleNo = sampleNo; - } - - public String getTaskId() { - return taskId; - } - - public void setTaskId(String taskId) { - this.taskId = taskId; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index b0dec00..a4f3c46 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -345,4 +345,22 @@ @QueryMap limit: Map, @QueryMap offset: Map ): String + + /** + * 获取委托书详情 + */ + @POST("/business/certificateReport/detail") + suspend fun getCertificateReportDetail( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 提交证书 + */ + @POST("/business/certificateReport/submit") + suspend fun submit( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String } \ 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 cef55ec..8bf4070 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 @@ -800,4 +800,29 @@ AuthenticationHelper.token!!, requestBody, limitMap, offsetMap ) } + + /** + * 获取证书报告详情 + */ + suspend fun getCertificateReportDetail(id: String): String { + val param = JsonObject() + param.addProperty("id", id) + val requestBody = param.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getCertificateReportDetail(AuthenticationHelper.token!!, requestBody) + } + + /** + * 提交证书报告 + */ + suspend fun submit(id: String): String { + val param = JsonObject() + param.addProperty("formId", "ywglzsbg") + param.addProperty("id", id) + val requestBody = param.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.submit(AuthenticationHelper.token!!, requestBody) + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportActivity.kt index 2baefd2..fa4e129 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportActivity.kt @@ -19,15 +19,21 @@ "已通过", "未通过", "已取消", - "非草稿", - "未通过", "可打印" ) private var fragmentPages: ArrayList = ArrayList() init { - pageTitles.indices.forEach { - fragmentPages.add(CertificateReportFragment((it + 1).toString())) + pageTitles.forEach { + when (it) { + "草稿箱" -> fragmentPages.add(CertificateReportFragment("1")) + "待审批" -> fragmentPages.add(CertificateReportFragment("2")) + "审批中" -> fragmentPages.add(CertificateReportFragment("3")) + "已通过" -> fragmentPages.add(CertificateReportFragment("4")) + "未通过" -> fragmentPages.add(CertificateReportFragment("5")) + "已取消" -> fragmentPages.add(CertificateReportFragment("6")) + "可打印" -> fragmentPages.add(CertificateReportFragment("9")) + } } } diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt new file mode 100644 index 0000000..e30c7c3 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt @@ -0,0 +1,106 @@ +package com.casic.xz.meterage.view.home + +import android.view.View +import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.SubViewPagerAdapter +import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.casic.xz.meterage.fragment.certificate.ApprovalProcessFragment +import com.casic.xz.meterage.fragment.certificate.BasicInformationFragment +import com.casic.xz.meterage.fragment.certificate.ExceptionReportFragment +import com.casic.xz.meterage.model.CertificateDetailModel +import com.casic.xz.meterage.utils.LoadingDialogHub +import com.casic.xz.meterage.vm.CertificateViewModel +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.vm.LoadState +import kotlinx.android.synthetic.main.activity_certificate_detail.* + +//"草稿箱" -> "1" +//"待审批" -> "2" +//"审批中" -> "3" +//"已通过" -> "4" +//"未通过" -> "5" +//"已取消" -> "6" +//"可打印" -> "9" + +class CertificateReportDetailActivity : KotlinBaseActivity() { + + private var fragmentPages: ArrayList = ArrayList() + private lateinit var certificateViewModel: CertificateViewModel + private lateinit var detailModel: CertificateDetailModel.DataModel + + override fun initData() { + val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! + + when (args[0]) { + "1" -> { + approvalView.text = "提交" + } + "2" -> { + approvalView.text = "审批" + } + "9" -> { + approvalView.text = "打印" + } + else -> { + approvalView.visibility = View.GONE + } + } + + certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] + certificateViewModel.getCertificateReportDetail(args[1]) + certificateViewModel.certificateDetail.observe(this) { + if (it.code == 200) { + + detailModel = it.data + + fragmentPages.add(BasicInformationFragment(detailModel)) + fragmentPages.add(ApprovalProcessFragment()) + fragmentPages.add(ExceptionReportFragment()) + + val pageTitles = arrayOf("基础信息", "审批流程", "异常报告") + + approvalViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, pageTitles + ) + //绑定 + topTabLayout.setupWithViewPager(approvalViewPager) + } + } + + certificateViewModel.submitResult.observe(this) { + if (it.code == 200) { + "提交成功".show(this) + finish() + } + } + } + + override fun initEvent() { + leftBackView.setOnClickListener { finish() } + + approvalView.setOnClickListener { + certificateViewModel.submit(detailModel.id) + } + } + + override fun initLayoutView(): Int = R.layout.activity_certificate_detail + + override fun observeRequestState() { + certificateViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt index 080c380..77fe8a5 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt @@ -129,6 +129,5 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() initLayoutImmersionBar(rootView) - titleView.text = "委托需求" } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt index 735e530..e088887 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt @@ -4,7 +4,9 @@ import com.casic.xz.meterage.base.BaseApplication import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage -import com.casic.xz.meterage.model.CertificateModel +import com.casic.xz.meterage.model.ActionResultModel +import com.casic.xz.meterage.model.CertificateDetailModel +import com.casic.xz.meterage.model.CertificateListModel import com.casic.xz.meterage.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -19,7 +21,9 @@ class CertificateViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val certificateList = MutableLiveData() + val certificateList = MutableLiveData() + val certificateDetail = MutableLiveData() + val submitResult = MutableLiveData() fun getCertificateReportList( approvalStatus: String, @@ -47,8 +51,46 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - certificateList.value = gson.fromJson( - response, object : TypeToken() {}.type + certificateList.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + + fun getCertificateReportDetail(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.getCertificateReportDetail(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + certificateDetail.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + + fun submit(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.submit(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + submitResult.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { loadState.value = LoadState.Fail diff --git a/app/src/main/res/layout/activity_capability_detail.xml b/app/src/main/res/layout/activity_capability_detail.xml index 585960a..375d861 100644 --- a/app/src/main/res/layout/activity_capability_detail.xml +++ b/app/src/main/res/layout/activity_capability_detail.xml @@ -21,7 +21,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:padding="@dimen/dp_10"> + android:paddingHorizontal="@dimen/dp_10"> diff --git a/app/src/main/res/layout/activity_certificate_detail.xml b/app/src/main/res/layout/activity_certificate_detail.xml new file mode 100644 index 0000000..5bb3649 --- /dev/null +++ b/app/src/main/res/layout/activity_certificate_detail.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 5ba44f0..298f687 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -53,7 +53,8 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "XZJL_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" +// outputFileName = "XZJL_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "XZJL_" + getBuildDate() + "_Beta.apk" } } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4b914b5..ebea092 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -67,6 +67,7 @@ + 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 new file mode 100644 index 0000000..a75e566 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.certificate + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class ApprovalProcessFragment :KotlinBaseFragment(){ + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_certificate_approval_process + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt new file mode 100644 index 0000000..5882c3d --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt @@ -0,0 +1,77 @@ +package com.casic.xz.meterage.fragment.certificate + +import android.graphics.Color +import android.graphics.Paint +import android.util.Log +import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.watchAttachFile +import com.casic.xz.meterage.model.CertificateDetailModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.pengxh.kt.lite.extensions.toJson +import kotlinx.android.synthetic.main.fragment_certificate_basic_information.* + +class BasicInformationFragment(private val data: CertificateDetailModel.DataModel) : + KotlinBaseFragment() { + + override fun initData() { + val businessOriginal = data.businessOriginalRecord + + reportCodeView.text = data.certificateReportCode + originalCodeView.text = businessOriginal.originalRecordCode + checkCategoryView.text = businessOriginal.measureCategoryName + + Log.d( + "Casic", + "BasicInformationFragment => initData: ${businessOriginal.fileList.toJson()}" + ) +// basisFileView.text = businessOriginal.fileList + + val sampleInfo = businessOriginal.customerSampleInfo + sampleCodeView.text = sampleInfo.sampleNo + sampleNameView.text = sampleInfo.sampleName + manufacturingCodeView.text = sampleInfo.manufacturingNo + modelView.text = sampleInfo.sampleModel + entrustCodeView.text = sampleInfo.customerNo + entrustNameView.text = sampleInfo.customerName + entrustContactView.text = sampleInfo.phone + entrustEmailView.text = sampleInfo.postalCode + entrustAddressView.text = sampleInfo.customerAddress + senderView.text = sampleInfo.deliverer + senderContactView.text = sampleInfo.delivererTel + checkTypeView.text = sampleInfo.measureContent + remarkView.text = sampleInfo.remark + + estimateServedTimeView.text = businessOriginal.businessOrder.planDeliverTime + estimateCompleteTimeView.text = businessOriginal.businessOrder.requireOverTime + + if (data.certificateReportFile.isNullOrBlank()) { + reportFileView.text = "暂无附件" + } else { + val reportFileName = data.certificateReportFile + + reportFileView.text = reportFileName + val textPaint = reportFileView.paint + textPaint.flags = Paint.UNDERLINE_TEXT_FLAG + textPaint.isAntiAlias = true + reportFileView.setTextColor(Color.BLUE) + + reportFileView.setOnClickListener { + reportFileName.watchAttachFile(requireContext()) + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_certificate_basic_information + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt index 2f3c95c..b1df400 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt @@ -4,19 +4,24 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.addAll +import com.casic.xz.meterage.extensions.diffCurrentTime +import com.casic.xz.meterage.extensions.formatToDate import com.casic.xz.meterage.extensions.showEmptyPage -import com.casic.xz.meterage.model.CertificateModel +import com.casic.xz.meterage.model.CertificateListModel +import com.casic.xz.meterage.view.home.CertificateReportDetailActivity import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler import kotlinx.android.synthetic.main.fragment_certificate_report.* import kotlinx.android.synthetic.main.include_empty_view.* /** - * 计量法规 + * 证书报告 * * formId:ywglzsbg * */ @@ -24,8 +29,8 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var certificateViewModel: CertificateViewModel - private lateinit var certificateAdapter: NormalRecyclerAdapter - private var dataBeans: MutableList = ArrayList() + private lateinit var certificateAdapter: NormalRecyclerAdapter + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false @@ -119,40 +124,37 @@ } else { emptyView!!.hide() certificateAdapter = object : - NormalRecyclerAdapter( + NormalRecyclerAdapter( R.layout.item_certificate_rv_l, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, - item: CertificateModel.DataModel.RowsModel + item: CertificateListModel.DataModel.RowsModel ) { + val deltaT = item.createTime.diffCurrentTime() + val diffTime = if (deltaT < 24) { + "${deltaT}小时前" + } else { + item.createTime.formatToDate() + } + viewHolder.setText(R.id.reportNameView, item.certificateReportName) -// .setText(R.id.fileStateView, item.effectiveStatusName) -// .setText(R.id.remarkView, "备注：$remark") -// .setText(R.id.fileCodeView, "文件号：${item.fileNo}") -// .setText(R.id.releaseDateView, "实施时间：${item.publishTime}") -// -// if (!item.effectiveStatus.equals("1")) { -// viewHolder.setBackgroundColor( -// R.id.fileStateView, -// R.color.gray.convertColor(requireContext()) -// ) -// } + .setText(R.id.createTimeView, diffTime) + .setText(R.id.categoryView, "校验类别：${item.measureCategoryName}") + .setText(R.id.technicianView, "检定员：${item.measurePersonName}") + + viewHolder.setOnClickListener(R.id.showDetailButton) { + requireContext().navigatePageTo( + addAll(item.approvalStatus, item.id) + ) + } } } certificateRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) certificateRecyclerView.adapter = certificateAdapter - certificateAdapter.setOnItemClickedListener(object : - NormalRecyclerAdapter.OnItemClickedListener { - override fun onItemClicked( - position: Int, t: CertificateModel.DataModel.RowsModel - ) { -// requireContext().navigatePageTo(t.toJson()) - } - }) } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt new file mode 100644 index 0000000..2d5ac61 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.certificate + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class ExceptionReportFragment :KotlinBaseFragment(){ + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_certificate_exception_report + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/model/CertificateDetailModel.java b/app/src/main/java/com/casic/xz/meterage/model/CertificateDetailModel.java new file mode 100644 index 0000000..42efccd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/CertificateDetailModel.java @@ -0,0 +1,2080 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class CertificateDetailModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private String approvalSignId; + private String approvalStatus; + private String approvalStatusName; + private BusinessOriginalRecordModel businessOriginalRecord; + private String calibrationMajor; + private String calibrationMajorName; + private String certificateReportCategory; + private String certificateReportCode; + private String certificateReportFile; + private String certificateReportName; + private String createTime; + private String createUser; + private String expirationDate; + private String id; + private String isDel; + private String issuanceDate; + private String measureDeptId; + private String measurePersonId; + private String measureResult; + private String orderId; + private String originalRecordId; + private String printNum; + private String printStatus; + private String processId; + private String remark; + private String sampleId; + private String signId; + private String templateId; + private String updateTime; + + public String getApprovalSignId() { + return approvalSignId; + } + + public void setApprovalSignId(String approvalSignId) { + this.approvalSignId = approvalSignId; + } + + public String getApprovalStatus() { + return approvalStatus; + } + + public void setApprovalStatus(String approvalStatus) { + this.approvalStatus = approvalStatus; + } + + public String getApprovalStatusName() { + return approvalStatusName; + } + + public void setApprovalStatusName(String approvalStatusName) { + this.approvalStatusName = approvalStatusName; + } + + public BusinessOriginalRecordModel getBusinessOriginalRecord() { + return businessOriginalRecord; + } + + public void setBusinessOriginalRecord(BusinessOriginalRecordModel businessOriginalRecord) { + this.businessOriginalRecord = businessOriginalRecord; + } + + public String getCalibrationMajor() { + return calibrationMajor; + } + + public void setCalibrationMajor(String calibrationMajor) { + this.calibrationMajor = calibrationMajor; + } + + public String getCalibrationMajorName() { + return calibrationMajorName; + } + + public void setCalibrationMajorName(String calibrationMajorName) { + this.calibrationMajorName = calibrationMajorName; + } + + public String getCertificateReportCategory() { + return certificateReportCategory; + } + + public void setCertificateReportCategory(String certificateReportCategory) { + this.certificateReportCategory = certificateReportCategory; + } + + public String getCertificateReportCode() { + return certificateReportCode; + } + + public void setCertificateReportCode(String certificateReportCode) { + this.certificateReportCode = certificateReportCode; + } + + public String getCertificateReportFile() { + return certificateReportFile; + } + + public void setCertificateReportFile(String certificateReportFile) { + this.certificateReportFile = certificateReportFile; + } + + public String getCertificateReportName() { + return certificateReportName; + } + + public void setCertificateReportName(String certificateReportName) { + this.certificateReportName = certificateReportName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getExpirationDate() { + return expirationDate; + } + + public void setExpirationDate(String expirationDate) { + this.expirationDate = expirationDate; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String isIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIssuanceDate() { + return issuanceDate; + } + + public void setIssuanceDate(String issuanceDate) { + this.issuanceDate = issuanceDate; + } + + public String getMeasureDeptId() { + return measureDeptId; + } + + public void setMeasureDeptId(String measureDeptId) { + this.measureDeptId = measureDeptId; + } + + public String getMeasurePersonId() { + return measurePersonId; + } + + public void setMeasurePersonId(String measurePersonId) { + this.measurePersonId = measurePersonId; + } + + public String getMeasureResult() { + return measureResult; + } + + public void setMeasureResult(String measureResult) { + this.measureResult = measureResult; + } + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public String getOriginalRecordId() { + return originalRecordId; + } + + public void setOriginalRecordId(String originalRecordId) { + this.originalRecordId = originalRecordId; + } + + public String getPrintNum() { + return printNum; + } + + public void setPrintNum(String printNum) { + this.printNum = printNum; + } + + public String getPrintStatus() { + return printStatus; + } + + public void setPrintStatus(String printStatus) { + this.printStatus = printStatus; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSampleId() { + return sampleId; + } + + public void setSampleId(String sampleId) { + this.sampleId = sampleId; + } + + public String getSignId() { + return signId; + } + + public void setSignId(String signId) { + this.signId = signId; + } + + public String getTemplateId() { + return templateId; + } + + public void setTemplateId(String templateId) { + this.templateId = templateId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public static class BusinessOriginalRecordModel { + private BusinessEnvRecordModel businessEnvironmentRecord; + private BusinessOrderModel businessOrder; + private String calibrationPlace; + private String calibrationTime; + private String createTime; + private String createUser; + private BusinessOrderModel.CustomerSampleModel customerSampleInfo; + private String environmentId; + private List equipmentInfoList; + private List fileList; + private String id; + private String isDel; + private String measureCategory; + private String measureCategoryName; + private String orderId; + private String originalRecordCode; + private String originalRecordFile; + private String originalRecordName; + private String remark; + private String sampleId; + private String templateId; + private String templateName; + private String updateTime; + + public BusinessEnvRecordModel getBusinessEnvironmentRecord() { + return businessEnvironmentRecord; + } + + public void setBusinessEnvironmentRecord(BusinessEnvRecordModel businessEnvironmentRecord) { + this.businessEnvironmentRecord = businessEnvironmentRecord; + } + + public BusinessOrderModel getBusinessOrder() { + return businessOrder; + } + + public void setBusinessOrder(BusinessOrderModel businessOrder) { + this.businessOrder = businessOrder; + } + + public String getCalibrationPlace() { + return calibrationPlace; + } + + public void setCalibrationPlace(String calibrationPlace) { + this.calibrationPlace = calibrationPlace; + } + + public String getCalibrationTime() { + return calibrationTime; + } + + public void setCalibrationTime(String calibrationTime) { + this.calibrationTime = calibrationTime; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public BusinessOrderModel.CustomerSampleModel getCustomerSampleInfo() { + return customerSampleInfo; + } + + public void setCustomerSampleInfo(BusinessOrderModel.CustomerSampleModel customerSampleInfo) { + this.customerSampleInfo = customerSampleInfo; + } + + public String getEnvironmentId() { + return environmentId; + } + + public void setEnvironmentId(String environmentId) { + this.environmentId = environmentId; + } + + public List getEquipmentInfoList() { + return equipmentInfoList; + } + + public void setEquipmentInfoList(List equipmentInfoList) { + this.equipmentInfoList = equipmentInfoList; + } + + public List getFileList() { + return fileList; + } + + public void setFileList(List fileList) { + this.fileList = fileList; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String isIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getMeasureCategory() { + return measureCategory; + } + + public void setMeasureCategory(String measureCategory) { + this.measureCategory = measureCategory; + } + + public String getMeasureCategoryName() { + return measureCategoryName; + } + + public void setMeasureCategoryName(String measureCategoryName) { + this.measureCategoryName = measureCategoryName; + } + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public String getOriginalRecordCode() { + return originalRecordCode; + } + + public void setOriginalRecordCode(String originalRecordCode) { + this.originalRecordCode = originalRecordCode; + } + + public String getOriginalRecordFile() { + return originalRecordFile; + } + + public void setOriginalRecordFile(String originalRecordFile) { + this.originalRecordFile = originalRecordFile; + } + + public String getOriginalRecordName() { + return originalRecordName; + } + + public void setOriginalRecordName(String originalRecordName) { + this.originalRecordName = originalRecordName; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSampleId() { + return sampleId; + } + + public void setSampleId(String sampleId) { + this.sampleId = sampleId; + } + + public String getTemplateId() { + return templateId; + } + + public void setTemplateId(String templateId) { + this.templateId = templateId; + } + + public String getTemplateName() { + return templateName; + } + + public void setTemplateName(String templateName) { + this.templateName = templateName; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public static class BusinessEnvRecordModel { + private String createTime; + private String createUser; + private String environmentCode; + private String humidity; + private String id; + private String isDel; + private String outputVoltage; + private String recordTime; + private String recorder; + private String remark; + private String roomNumber; + private String temperature; + private String updateTime; + private String zeroGroundVoltage; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEnvironmentCode() { + return environmentCode; + } + + public void setEnvironmentCode(String environmentCode) { + this.environmentCode = environmentCode; + } + + public String getHumidity() { + return humidity; + } + + public void setHumidity(String humidity) { + this.humidity = humidity; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String isIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getOutputVoltage() { + return outputVoltage; + } + + public void setOutputVoltage(String outputVoltage) { + this.outputVoltage = outputVoltage; + } + + public String getRecordTime() { + return recordTime; + } + + public void setRecordTime(String recordTime) { + this.recordTime = recordTime; + } + + public String getRecorder() { + return recorder; + } + + public void setRecorder(String recorder) { + this.recorder = recorder; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getRoomNumber() { + return roomNumber; + } + + public void setRoomNumber(String roomNumber) { + this.roomNumber = roomNumber; + } + + public String getTemperature() { + return temperature; + } + + public void setTemperature(String temperature) { + this.temperature = temperature; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getZeroGroundVoltage() { + return zeroGroundVoltage; + } + + public void setZeroGroundVoltage(String zeroGroundVoltage) { + this.zeroGroundVoltage = zeroGroundVoltage; + } + } + + public static class BusinessOrderModel { + private String certifications; + private String createTime; + private String createUser; + private String customerAddress; + private String customerId; + private String customerName; + private String customerNo; + private String customerPhone; + private List customerSampleInfoList; + private String deliverTime; + private String deliverer; + private String delivererId; + private String delivererTel; + private String id; + private String isDel; + private String isUrgent; + private String minioFileName; + private String orderCode; + private String orderTime; + private String planDeliverTime; + private String remark; + private String requireOverTime; + private String status; + private String updateTime; + private String updateUser; + + public String getCertifications() { + return certifications; + } + + public void setCertifications(String certifications) { + this.certifications = certifications; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCustomerAddress() { + return customerAddress; + } + + public void setCustomerAddress(String customerAddress) { + this.customerAddress = customerAddress; + } + + public String getCustomerId() { + return customerId; + } + + public void setCustomerId(String customerId) { + this.customerId = customerId; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public String getCustomerPhone() { + return customerPhone; + } + + public void setCustomerPhone(String customerPhone) { + this.customerPhone = customerPhone; + } + + public List getCustomerSampleInfoList() { + return customerSampleInfoList; + } + + public void setCustomerSampleInfoList(List customerSampleInfoList) { + this.customerSampleInfoList = customerSampleInfoList; + } + + public String getDeliverTime() { + return deliverTime; + } + + public void setDeliverTime(String deliverTime) { + this.deliverTime = deliverTime; + } + + public String getDeliverer() { + return deliverer; + } + + public void setDeliverer(String deliverer) { + this.deliverer = deliverer; + } + + public String getDelivererId() { + return delivererId; + } + + public void setDelivererId(String delivererId) { + this.delivererId = delivererId; + } + + public String getDelivererTel() { + return delivererTel; + } + + public void setDelivererTel(String delivererTel) { + this.delivererTel = delivererTel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIsUrgent() { + return isUrgent; + } + + public void setIsUrgent(String isUrgent) { + this.isUrgent = isUrgent; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getOrderCode() { + return orderCode; + } + + public void setOrderCode(String orderCode) { + this.orderCode = orderCode; + } + + public String getOrderTime() { + return orderTime; + } + + public void setOrderTime(String orderTime) { + this.orderTime = orderTime; + } + + public String getPlanDeliverTime() { + return planDeliverTime; + } + + public void setPlanDeliverTime(String planDeliverTime) { + this.planDeliverTime = planDeliverTime; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getRequireOverTime() { + return requireOverTime; + } + + public void setRequireOverTime(String requireOverTime) { + this.requireOverTime = requireOverTime; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUpdateUser() { + return updateUser; + } + + public void setUpdateUser(String updateUser) { + this.updateUser = updateUser; + } + + public static class CustomerSampleModel { + private String abc; + private String appendix; + private String appendixDescn; + private String createTime; + private String createUser; + private String customerAddress; + private String customerId; + private String customerName; + private String customerNo; + private String deliverer; + private String delivererTel; + private String id; + private String isDel; + private String isExistSample; + private String labelBind; + private String manufacturer; + private String manufacturerCountry; + private String manufacturingDate; + private String manufacturingNo; + private String measureCategory; + private String measureCategoryName; + private String measureContent; + private String measureLastTime; + private String measurePeriod; + private String measureType; + private String measureTypeName; + private String minioFileName; + private String orderId; + private String phone; + private String postalCode; + private String powerVoltage; + private String remark; + private String sampleBelong; + private String sampleBelongName; + private String sampleModel; + private String sampleName; + private String sampleNo; + private String specialRequire; + private String updateTime; + private String updateUser; + private String validDeadline; + + public String getAbc() { + return abc; + } + + public void setAbc(String abc) { + this.abc = abc; + } + + public String getAppendix() { + return appendix; + } + + public void setAppendix(String appendix) { + this.appendix = appendix; + } + + public String getAppendixDescn() { + return appendixDescn; + } + + public void setAppendixDescn(String appendixDescn) { + this.appendixDescn = appendixDescn; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCustomerAddress() { + return customerAddress; + } + + public void setCustomerAddress(String customerAddress) { + this.customerAddress = customerAddress; + } + + public String getCustomerId() { + return customerId; + } + + public void setCustomerId(String customerId) { + this.customerId = customerId; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public String getDeliverer() { + return deliverer; + } + + public void setDeliverer(String deliverer) { + this.deliverer = deliverer; + } + + public String getDelivererTel() { + return delivererTel; + } + + public void setDelivererTel(String delivererTel) { + this.delivererTel = delivererTel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIsExistSample() { + return isExistSample; + } + + public void setIsExistSample(String isExistSample) { + this.isExistSample = isExistSample; + } + + public String getLabelBind() { + return labelBind; + } + + public void setLabelBind(String labelBind) { + this.labelBind = labelBind; + } + + public String getManufacturer() { + return manufacturer; + } + + public void setManufacturer(String manufacturer) { + this.manufacturer = manufacturer; + } + + public String getManufacturerCountry() { + return manufacturerCountry; + } + + public void setManufacturerCountry(String manufacturerCountry) { + this.manufacturerCountry = manufacturerCountry; + } + + public String getManufacturingDate() { + return manufacturingDate; + } + + public void setManufacturingDate(String manufacturingDate) { + this.manufacturingDate = manufacturingDate; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getMeasureCategory() { + return measureCategory; + } + + public void setMeasureCategory(String measureCategory) { + this.measureCategory = measureCategory; + } + + public String getMeasureCategoryName() { + return measureCategoryName; + } + + public void setMeasureCategoryName(String measureCategoryName) { + this.measureCategoryName = measureCategoryName; + } + + public String getMeasureContent() { + return measureContent; + } + + public void setMeasureContent(String measureContent) { + this.measureContent = measureContent; + } + + public String getMeasureLastTime() { + return measureLastTime; + } + + public void setMeasureLastTime(String measureLastTime) { + this.measureLastTime = measureLastTime; + } + + public String getMeasurePeriod() { + return measurePeriod; + } + + public void setMeasurePeriod(String measurePeriod) { + this.measurePeriod = measurePeriod; + } + + public String getMeasureType() { + return measureType; + } + + public void setMeasureType(String measureType) { + this.measureType = measureType; + } + + public String getMeasureTypeName() { + return measureTypeName; + } + + public void setMeasureTypeName(String measureTypeName) { + this.measureTypeName = measureTypeName; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getPostalCode() { + return postalCode; + } + + public void setPostalCode(String postalCode) { + this.postalCode = postalCode; + } + + public String getPowerVoltage() { + return powerVoltage; + } + + public void setPowerVoltage(String powerVoltage) { + this.powerVoltage = powerVoltage; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSampleBelong() { + return sampleBelong; + } + + public void setSampleBelong(String sampleBelong) { + this.sampleBelong = sampleBelong; + } + + public String getSampleBelongName() { + return sampleBelongName; + } + + public void setSampleBelongName(String sampleBelongName) { + this.sampleBelongName = sampleBelongName; + } + + public String getSampleModel() { + return sampleModel; + } + + public void setSampleModel(String sampleModel) { + this.sampleModel = sampleModel; + } + + public String getSampleName() { + return sampleName; + } + + public void setSampleName(String sampleName) { + this.sampleName = sampleName; + } + + public String getSampleNo() { + return sampleNo; + } + + public void setSampleNo(String sampleNo) { + this.sampleNo = sampleNo; + } + + public String getSpecialRequire() { + return specialRequire; + } + + public void setSpecialRequire(String specialRequire) { + this.specialRequire = specialRequire; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUpdateUser() { + return updateUser; + } + + public void setUpdateUser(String updateUser) { + this.updateUser = updateUser; + } + + public String getValidDeadline() { + return validDeadline; + } + + public void setValidDeadline(String validDeadline) { + this.validDeadline = validDeadline; + } + } + } + + public static class EquipmentModel { + private String abc; + private String abcName; + private String applyRelationId; + private String assetNo; + private String assetSource; + private String assetType; + private String assetTypeName; + private String attribute; + private String capitalSource; + private String capitalSourceName; + private String cardEstablishmentDate; + private String createTime; + private String createUser; + private String depreciationMethod; + private String depreciationMethodName; + private String depreciationPeriod; + private String enableDate; + private String equipmentCategory; + private String equipmentCategoryName; + private String equipmentName; + private String equipmentNo; + private String equipmentSpecifications; + private String equipmentType; + private String equipmentTypeName; + private String fileList; + private String id; + private String installIncidentalExpenses; + private String installPlace; + private String intactState; + private String isCalibrationTestEquipment; + private String isDel; + private String isFixedAssets; + private String isMeasureAccount; + private String isStandardSupportEquipment; + private String labelBind; + private String majorCategory; + private String majorCategoryName; + private String managerLevel; + private String managerLevelName; + private String managerState; + private String managerStateName; + private String manufacturer; + private String manufacturerCountry; + private String manufacturingDate; + private String manufacturingNo; + private String mesureCycle; + private String mesureDate; + private String mesureDept; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String mesureType; + private String mesureTypeName; + private String modelNo; + private String originValue; + private String overallDimension; + private String presentOriginValue; + private String purpose; + private String remark; + private String singlePrice; + private String supportStandardEquipmentName; + private String supportStandardEquipmentNo; + private String technicalLevel; + private String uncertainty; + private String updateTime; + private String useDept; + private String useDeptName; + private String usePerson; + private String usePersonName; + private String validDate; + private String version; + private String weight; + + public String getAbc() { + return abc; + } + + public void setAbc(String abc) { + this.abc = abc; + } + + public String getAbcName() { + return abcName; + } + + public void setAbcName(String abcName) { + this.abcName = abcName; + } + + public String getApplyRelationId() { + return applyRelationId; + } + + public void setApplyRelationId(String applyRelationId) { + this.applyRelationId = applyRelationId; + } + + public String getAssetNo() { + return assetNo; + } + + public void setAssetNo(String assetNo) { + this.assetNo = assetNo; + } + + public String getAssetSource() { + return assetSource; + } + + public void setAssetSource(String assetSource) { + this.assetSource = assetSource; + } + + public String getAssetType() { + return assetType; + } + + public void setAssetType(String assetType) { + this.assetType = assetType; + } + + public String getAssetTypeName() { + return assetTypeName; + } + + public void setAssetTypeName(String assetTypeName) { + this.assetTypeName = assetTypeName; + } + + public String getAttribute() { + return attribute; + } + + public void setAttribute(String attribute) { + this.attribute = attribute; + } + + public String getCapitalSource() { + return capitalSource; + } + + public void setCapitalSource(String capitalSource) { + this.capitalSource = capitalSource; + } + + public String getCapitalSourceName() { + return capitalSourceName; + } + + public void setCapitalSourceName(String capitalSourceName) { + this.capitalSourceName = capitalSourceName; + } + + public String getCardEstablishmentDate() { + return cardEstablishmentDate; + } + + public void setCardEstablishmentDate(String cardEstablishmentDate) { + this.cardEstablishmentDate = cardEstablishmentDate; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getDepreciationMethod() { + return depreciationMethod; + } + + public void setDepreciationMethod(String depreciationMethod) { + this.depreciationMethod = depreciationMethod; + } + + public String getDepreciationMethodName() { + return depreciationMethodName; + } + + public void setDepreciationMethodName(String depreciationMethodName) { + this.depreciationMethodName = depreciationMethodName; + } + + public String getDepreciationPeriod() { + return depreciationPeriod; + } + + public void setDepreciationPeriod(String depreciationPeriod) { + this.depreciationPeriod = depreciationPeriod; + } + + public String getEnableDate() { + return enableDate; + } + + public void setEnableDate(String enableDate) { + this.enableDate = enableDate; + } + + public String getEquipmentCategory() { + return equipmentCategory; + } + + public void setEquipmentCategory(String equipmentCategory) { + this.equipmentCategory = equipmentCategory; + } + + public String getEquipmentCategoryName() { + return equipmentCategoryName; + } + + public void setEquipmentCategoryName(String equipmentCategoryName) { + this.equipmentCategoryName = equipmentCategoryName; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getEquipmentSpecifications() { + return equipmentSpecifications; + } + + public void setEquipmentSpecifications(String equipmentSpecifications) { + this.equipmentSpecifications = equipmentSpecifications; + } + + public String getEquipmentType() { + return equipmentType; + } + + public void setEquipmentType(String equipmentType) { + this.equipmentType = equipmentType; + } + + public String getEquipmentTypeName() { + return equipmentTypeName; + } + + public void setEquipmentTypeName(String equipmentTypeName) { + this.equipmentTypeName = equipmentTypeName; + } + + public String getFileList() { + return fileList; + } + + public void setFileList(String fileList) { + this.fileList = fileList; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInstallIncidentalExpenses() { + return installIncidentalExpenses; + } + + public void setInstallIncidentalExpenses(String installIncidentalExpenses) { + this.installIncidentalExpenses = installIncidentalExpenses; + } + + public String getInstallPlace() { + return installPlace; + } + + public void setInstallPlace(String installPlace) { + this.installPlace = installPlace; + } + + public String getIntactState() { + return intactState; + } + + public void setIntactState(String intactState) { + this.intactState = intactState; + } + + public String getIsCalibrationTestEquipment() { + return isCalibrationTestEquipment; + } + + public void setIsCalibrationTestEquipment(String isCalibrationTestEquipment) { + this.isCalibrationTestEquipment = isCalibrationTestEquipment; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIsFixedAssets() { + return isFixedAssets; + } + + public void setIsFixedAssets(String isFixedAssets) { + this.isFixedAssets = isFixedAssets; + } + + public String getIsMeasureAccount() { + return isMeasureAccount; + } + + public void setIsMeasureAccount(String isMeasureAccount) { + this.isMeasureAccount = isMeasureAccount; + } + + public String getIsStandardSupportEquipment() { + return isStandardSupportEquipment; + } + + public void setIsStandardSupportEquipment(String isStandardSupportEquipment) { + this.isStandardSupportEquipment = isStandardSupportEquipment; + } + + public String getLabelBind() { + return labelBind; + } + + public void setLabelBind(String labelBind) { + this.labelBind = labelBind; + } + + public String getMajorCategory() { + return majorCategory; + } + + public void setMajorCategory(String majorCategory) { + this.majorCategory = majorCategory; + } + + public String getMajorCategoryName() { + return majorCategoryName; + } + + public void setMajorCategoryName(String majorCategoryName) { + this.majorCategoryName = majorCategoryName; + } + + public String getManagerLevel() { + return managerLevel; + } + + public void setManagerLevel(String managerLevel) { + this.managerLevel = managerLevel; + } + + public String getManagerLevelName() { + return managerLevelName; + } + + public void setManagerLevelName(String managerLevelName) { + this.managerLevelName = managerLevelName; + } + + public String getManagerState() { + return managerState; + } + + public void setManagerState(String managerState) { + this.managerState = managerState; + } + + public String getManagerStateName() { + return managerStateName; + } + + public void setManagerStateName(String managerStateName) { + this.managerStateName = managerStateName; + } + + public String getManufacturer() { + return manufacturer; + } + + public void setManufacturer(String manufacturer) { + this.manufacturer = manufacturer; + } + + public String getManufacturerCountry() { + return manufacturerCountry; + } + + public void setManufacturerCountry(String manufacturerCountry) { + this.manufacturerCountry = manufacturerCountry; + } + + public String getManufacturingDate() { + return manufacturingDate; + } + + public void setManufacturingDate(String manufacturingDate) { + this.manufacturingDate = manufacturingDate; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getMesureCycle() { + return mesureCycle; + } + + public void setMesureCycle(String mesureCycle) { + this.mesureCycle = mesureCycle; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureDept() { + return mesureDept; + } + + public void setMesureDept(String mesureDept) { + this.mesureDept = mesureDept; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getMesureType() { + return mesureType; + } + + public void setMesureType(String mesureType) { + this.mesureType = mesureType; + } + + public String getMesureTypeName() { + return mesureTypeName; + } + + public void setMesureTypeName(String mesureTypeName) { + this.mesureTypeName = mesureTypeName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getOriginValue() { + return originValue; + } + + public void setOriginValue(String originValue) { + this.originValue = originValue; + } + + public String getOverallDimension() { + return overallDimension; + } + + public void setOverallDimension(String overallDimension) { + this.overallDimension = overallDimension; + } + + public String getPresentOriginValue() { + return presentOriginValue; + } + + public void setPresentOriginValue(String presentOriginValue) { + this.presentOriginValue = presentOriginValue; + } + + public String getPurpose() { + return purpose; + } + + public void setPurpose(String purpose) { + this.purpose = purpose; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSinglePrice() { + return singlePrice; + } + + public void setSinglePrice(String singlePrice) { + this.singlePrice = singlePrice; + } + + public String getSupportStandardEquipmentName() { + return supportStandardEquipmentName; + } + + public void setSupportStandardEquipmentName(String supportStandardEquipmentName) { + this.supportStandardEquipmentName = supportStandardEquipmentName; + } + + public String getSupportStandardEquipmentNo() { + return supportStandardEquipmentNo; + } + + public void setSupportStandardEquipmentNo(String supportStandardEquipmentNo) { + this.supportStandardEquipmentNo = supportStandardEquipmentNo; + } + + public String getTechnicalLevel() { + return technicalLevel; + } + + public void setTechnicalLevel(String technicalLevel) { + this.technicalLevel = technicalLevel; + } + + public String getUncertainty() { + return uncertainty; + } + + public void setUncertainty(String uncertainty) { + this.uncertainty = uncertainty; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDept() { + return useDept; + } + + public void setUseDept(String useDept) { + this.useDept = useDept; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getUsePerson() { + return usePerson; + } + + public void setUsePerson(String usePerson) { + this.usePerson = usePerson; + } + + public String getUsePersonName() { + return usePersonName; + } + + public void setUsePersonName(String usePersonName) { + this.usePersonName = usePersonName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + + public String getVersion() { + return version; + } + + public void setVersion(String version) { + this.version = version; + } + + public String getWeight() { + return weight; + } + + public void setWeight(String weight) { + this.weight = weight; + } + } + + public static class FileModel { + private String approvalStatus; + private String approvalStatusName; + private String createTime; + private String createUser; + private String createUserId; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String fileType; + private String fileTypeName; + private String id; + private String isDel; + private String minioFileName; + private String processId; + private String publishTime; + private String publisher; + private String remark; + private String updateTime; + + public String getApprovalStatus() { + return approvalStatus; + } + + public void setApprovalStatus(String approvalStatus) { + this.approvalStatus = approvalStatus; + } + + public String getApprovalStatusName() { + return approvalStatusName; + } + + public void setApprovalStatusName(String approvalStatusName) { + this.approvalStatusName = approvalStatusName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCreateUserId() { + return createUserId; + } + + public void setCreateUserId(String createUserId) { + this.createUserId = createUserId; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getFileType() { + return fileType; + } + + public void setFileType(String fileType) { + this.fileType = fileType; + } + + public String getFileTypeName() { + return fileTypeName; + } + + public void setFileTypeName(String fileTypeName) { + this.fileTypeName = fileTypeName; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getPublishTime() { + return publishTime; + } + + public void setPublishTime(String publishTime) { + this.publishTime = publishTime; + } + + public String getPublisher() { + return publisher; + } + + public void setPublisher(String publisher) { + this.publisher = publisher; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/CertificateListModel.java b/app/src/main/java/com/casic/xz/meterage/model/CertificateListModel.java new file mode 100644 index 0000000..0eed915 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/CertificateListModel.java @@ -0,0 +1,229 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class CertificateListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String approvalStatus; + private String approvalStatusName; + private String calibrationMajor; + private String certificateReportCode; + private String certificateReportName; + private String createTime; + private String decisionItem; + private String id; + private String manufacturingNo; + private String measureCategory; + private String measureCategoryName; + private String measurePersonId; + private String measurePersonName; + private String orderCode; + private String processId; + private String sampleModel; + private String sampleName; + private String sampleNo; + private String taskId; + + public String getApprovalStatus() { + return approvalStatus; + } + + public void setApprovalStatus(String approvalStatus) { + this.approvalStatus = approvalStatus; + } + + public String getApprovalStatusName() { + return approvalStatusName; + } + + public void setApprovalStatusName(String approvalStatusName) { + this.approvalStatusName = approvalStatusName; + } + + public String getCalibrationMajor() { + return calibrationMajor; + } + + public void setCalibrationMajor(String calibrationMajor) { + this.calibrationMajor = calibrationMajor; + } + + public String getCertificateReportCode() { + return certificateReportCode; + } + + public void setCertificateReportCode(String certificateReportCode) { + this.certificateReportCode = certificateReportCode; + } + + public String getCertificateReportName() { + return certificateReportName; + } + + public void setCertificateReportName(String certificateReportName) { + this.certificateReportName = certificateReportName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getDecisionItem() { + return decisionItem; + } + + public void setDecisionItem(String decisionItem) { + this.decisionItem = decisionItem; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getMeasureCategory() { + return measureCategory; + } + + public void setMeasureCategory(String measureCategory) { + this.measureCategory = measureCategory; + } + + public String getMeasureCategoryName() { + return measureCategoryName; + } + + public void setMeasureCategoryName(String measureCategoryName) { + this.measureCategoryName = measureCategoryName; + } + + public String getMeasurePersonId() { + return measurePersonId; + } + + public void setMeasurePersonId(String measurePersonId) { + this.measurePersonId = measurePersonId; + } + + public String getMeasurePersonName() { + return measurePersonName; + } + + public void setMeasurePersonName(String measurePersonName) { + this.measurePersonName = measurePersonName; + } + + public String getOrderCode() { + return orderCode; + } + + public void setOrderCode(String orderCode) { + this.orderCode = orderCode; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getSampleModel() { + return sampleModel; + } + + public void setSampleModel(String sampleModel) { + this.sampleModel = sampleModel; + } + + public String getSampleName() { + return sampleName; + } + + public void setSampleName(String sampleName) { + this.sampleName = sampleName; + } + + public String getSampleNo() { + return sampleNo; + } + + public void setSampleNo(String sampleNo) { + this.sampleNo = sampleNo; + } + + public String getTaskId() { + return taskId; + } + + public void setTaskId(String taskId) { + this.taskId = taskId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/CertificateModel.java b/app/src/main/java/com/casic/xz/meterage/model/CertificateModel.java deleted file mode 100644 index ec0d25b..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/CertificateModel.java +++ /dev/null @@ -1,202 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class CertificateModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String approvalStatus; - private String approvalStatusName; - private String calibrationMajor; - private String certificateReportCode; - private String certificateReportName; - private String createTime; - private String decisionItem; - private String id; - private String manufacturingNo; - private String measurePersonId; - private String orderCode; - private String processId; - private String sampleModel; - private String sampleName; - private String sampleNo; - private String taskId; - - public String getApprovalStatus() { - return approvalStatus; - } - - public void setApprovalStatus(String approvalStatus) { - this.approvalStatus = approvalStatus; - } - - public String getApprovalStatusName() { - return approvalStatusName; - } - - public void setApprovalStatusName(String approvalStatusName) { - this.approvalStatusName = approvalStatusName; - } - - public String getCalibrationMajor() { - return calibrationMajor; - } - - public void setCalibrationMajor(String calibrationMajor) { - this.calibrationMajor = calibrationMajor; - } - - public String getCertificateReportCode() { - return certificateReportCode; - } - - public void setCertificateReportCode(String certificateReportCode) { - this.certificateReportCode = certificateReportCode; - } - - public String getCertificateReportName() { - return certificateReportName; - } - - public void setCertificateReportName(String certificateReportName) { - this.certificateReportName = certificateReportName; - } - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getDecisionItem() { - return decisionItem; - } - - public void setDecisionItem(String decisionItem) { - this.decisionItem = decisionItem; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getManufacturingNo() { - return manufacturingNo; - } - - public void setManufacturingNo(String manufacturingNo) { - this.manufacturingNo = manufacturingNo; - } - - public String getMeasurePersonId() { - return measurePersonId; - } - - public void setMeasurePersonId(String measurePersonId) { - this.measurePersonId = measurePersonId; - } - - public String getOrderCode() { - return orderCode; - } - - public void setOrderCode(String orderCode) { - this.orderCode = orderCode; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public String getSampleModel() { - return sampleModel; - } - - public void setSampleModel(String sampleModel) { - this.sampleModel = sampleModel; - } - - public String getSampleName() { - return sampleName; - } - - public void setSampleName(String sampleName) { - this.sampleName = sampleName; - } - - public String getSampleNo() { - return sampleNo; - } - - public void setSampleNo(String sampleNo) { - this.sampleNo = sampleNo; - } - - public String getTaskId() { - return taskId; - } - - public void setTaskId(String taskId) { - this.taskId = taskId; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index b0dec00..a4f3c46 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -345,4 +345,22 @@ @QueryMap limit: Map, @QueryMap offset: Map ): String + + /** + * 获取委托书详情 + */ + @POST("/business/certificateReport/detail") + suspend fun getCertificateReportDetail( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 提交证书 + */ + @POST("/business/certificateReport/submit") + suspend fun submit( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String } \ 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 cef55ec..8bf4070 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 @@ -800,4 +800,29 @@ AuthenticationHelper.token!!, requestBody, limitMap, offsetMap ) } + + /** + * 获取证书报告详情 + */ + suspend fun getCertificateReportDetail(id: String): String { + val param = JsonObject() + param.addProperty("id", id) + val requestBody = param.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getCertificateReportDetail(AuthenticationHelper.token!!, requestBody) + } + + /** + * 提交证书报告 + */ + suspend fun submit(id: String): String { + val param = JsonObject() + param.addProperty("formId", "ywglzsbg") + param.addProperty("id", id) + val requestBody = param.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.submit(AuthenticationHelper.token!!, requestBody) + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportActivity.kt index 2baefd2..fa4e129 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportActivity.kt @@ -19,15 +19,21 @@ "已通过", "未通过", "已取消", - "非草稿", - "未通过", "可打印" ) private var fragmentPages: ArrayList = ArrayList() init { - pageTitles.indices.forEach { - fragmentPages.add(CertificateReportFragment((it + 1).toString())) + pageTitles.forEach { + when (it) { + "草稿箱" -> fragmentPages.add(CertificateReportFragment("1")) + "待审批" -> fragmentPages.add(CertificateReportFragment("2")) + "审批中" -> fragmentPages.add(CertificateReportFragment("3")) + "已通过" -> fragmentPages.add(CertificateReportFragment("4")) + "未通过" -> fragmentPages.add(CertificateReportFragment("5")) + "已取消" -> fragmentPages.add(CertificateReportFragment("6")) + "可打印" -> fragmentPages.add(CertificateReportFragment("9")) + } } } diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt new file mode 100644 index 0000000..e30c7c3 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt @@ -0,0 +1,106 @@ +package com.casic.xz.meterage.view.home + +import android.view.View +import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.SubViewPagerAdapter +import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.casic.xz.meterage.fragment.certificate.ApprovalProcessFragment +import com.casic.xz.meterage.fragment.certificate.BasicInformationFragment +import com.casic.xz.meterage.fragment.certificate.ExceptionReportFragment +import com.casic.xz.meterage.model.CertificateDetailModel +import com.casic.xz.meterage.utils.LoadingDialogHub +import com.casic.xz.meterage.vm.CertificateViewModel +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.vm.LoadState +import kotlinx.android.synthetic.main.activity_certificate_detail.* + +//"草稿箱" -> "1" +//"待审批" -> "2" +//"审批中" -> "3" +//"已通过" -> "4" +//"未通过" -> "5" +//"已取消" -> "6" +//"可打印" -> "9" + +class CertificateReportDetailActivity : KotlinBaseActivity() { + + private var fragmentPages: ArrayList = ArrayList() + private lateinit var certificateViewModel: CertificateViewModel + private lateinit var detailModel: CertificateDetailModel.DataModel + + override fun initData() { + val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! + + when (args[0]) { + "1" -> { + approvalView.text = "提交" + } + "2" -> { + approvalView.text = "审批" + } + "9" -> { + approvalView.text = "打印" + } + else -> { + approvalView.visibility = View.GONE + } + } + + certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] + certificateViewModel.getCertificateReportDetail(args[1]) + certificateViewModel.certificateDetail.observe(this) { + if (it.code == 200) { + + detailModel = it.data + + fragmentPages.add(BasicInformationFragment(detailModel)) + fragmentPages.add(ApprovalProcessFragment()) + fragmentPages.add(ExceptionReportFragment()) + + val pageTitles = arrayOf("基础信息", "审批流程", "异常报告") + + approvalViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, pageTitles + ) + //绑定 + topTabLayout.setupWithViewPager(approvalViewPager) + } + } + + certificateViewModel.submitResult.observe(this) { + if (it.code == 200) { + "提交成功".show(this) + finish() + } + } + } + + override fun initEvent() { + leftBackView.setOnClickListener { finish() } + + approvalView.setOnClickListener { + certificateViewModel.submit(detailModel.id) + } + } + + override fun initLayoutView(): Int = R.layout.activity_certificate_detail + + override fun observeRequestState() { + certificateViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt index 080c380..77fe8a5 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt @@ -129,6 +129,5 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() initLayoutImmersionBar(rootView) - titleView.text = "委托需求" } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt index 735e530..e088887 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt @@ -4,7 +4,9 @@ import com.casic.xz.meterage.base.BaseApplication import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage -import com.casic.xz.meterage.model.CertificateModel +import com.casic.xz.meterage.model.ActionResultModel +import com.casic.xz.meterage.model.CertificateDetailModel +import com.casic.xz.meterage.model.CertificateListModel import com.casic.xz.meterage.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -19,7 +21,9 @@ class CertificateViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val certificateList = MutableLiveData() + val certificateList = MutableLiveData() + val certificateDetail = MutableLiveData() + val submitResult = MutableLiveData() fun getCertificateReportList( approvalStatus: String, @@ -47,8 +51,46 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - certificateList.value = gson.fromJson( - response, object : TypeToken() {}.type + certificateList.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + + fun getCertificateReportDetail(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.getCertificateReportDetail(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + certificateDetail.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + + fun submit(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.submit(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + submitResult.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { loadState.value = LoadState.Fail diff --git a/app/src/main/res/layout/activity_capability_detail.xml b/app/src/main/res/layout/activity_capability_detail.xml index 585960a..375d861 100644 --- a/app/src/main/res/layout/activity_capability_detail.xml +++ b/app/src/main/res/layout/activity_capability_detail.xml @@ -21,7 +21,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:padding="@dimen/dp_10"> + android:paddingHorizontal="@dimen/dp_10"> diff --git a/app/src/main/res/layout/activity_certificate_detail.xml b/app/src/main/res/layout/activity_certificate_detail.xml new file mode 100644 index 0000000..5bb3649 --- /dev/null +++ b/app/src/main/res/layout/activity_certificate_detail.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_standard_file_detail.xml b/app/src/main/res/layout/activity_standard_file_detail.xml index 7776230..02efb08 100644 --- a/app/src/main/res/layout/activity_standard_file_detail.xml +++ b/app/src/main/res/layout/activity_standard_file_detail.xml @@ -21,7 +21,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:padding="@dimen/dp_10"> + android:paddingHorizontal="@dimen/dp_10"> diff --git a/app/build.gradle b/app/build.gradle index 5ba44f0..298f687 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -53,7 +53,8 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "XZJL_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" +// outputFileName = "XZJL_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "XZJL_" + getBuildDate() + "_Beta.apk" } } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4b914b5..ebea092 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -67,6 +67,7 @@ + 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 new file mode 100644 index 0000000..a75e566 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.certificate + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class ApprovalProcessFragment :KotlinBaseFragment(){ + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_certificate_approval_process + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt new file mode 100644 index 0000000..5882c3d --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt @@ -0,0 +1,77 @@ +package com.casic.xz.meterage.fragment.certificate + +import android.graphics.Color +import android.graphics.Paint +import android.util.Log +import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.watchAttachFile +import com.casic.xz.meterage.model.CertificateDetailModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.pengxh.kt.lite.extensions.toJson +import kotlinx.android.synthetic.main.fragment_certificate_basic_information.* + +class BasicInformationFragment(private val data: CertificateDetailModel.DataModel) : + KotlinBaseFragment() { + + override fun initData() { + val businessOriginal = data.businessOriginalRecord + + reportCodeView.text = data.certificateReportCode + originalCodeView.text = businessOriginal.originalRecordCode + checkCategoryView.text = businessOriginal.measureCategoryName + + Log.d( + "Casic", + "BasicInformationFragment => initData: ${businessOriginal.fileList.toJson()}" + ) +// basisFileView.text = businessOriginal.fileList + + val sampleInfo = businessOriginal.customerSampleInfo + sampleCodeView.text = sampleInfo.sampleNo + sampleNameView.text = sampleInfo.sampleName + manufacturingCodeView.text = sampleInfo.manufacturingNo + modelView.text = sampleInfo.sampleModel + entrustCodeView.text = sampleInfo.customerNo + entrustNameView.text = sampleInfo.customerName + entrustContactView.text = sampleInfo.phone + entrustEmailView.text = sampleInfo.postalCode + entrustAddressView.text = sampleInfo.customerAddress + senderView.text = sampleInfo.deliverer + senderContactView.text = sampleInfo.delivererTel + checkTypeView.text = sampleInfo.measureContent + remarkView.text = sampleInfo.remark + + estimateServedTimeView.text = businessOriginal.businessOrder.planDeliverTime + estimateCompleteTimeView.text = businessOriginal.businessOrder.requireOverTime + + if (data.certificateReportFile.isNullOrBlank()) { + reportFileView.text = "暂无附件" + } else { + val reportFileName = data.certificateReportFile + + reportFileView.text = reportFileName + val textPaint = reportFileView.paint + textPaint.flags = Paint.UNDERLINE_TEXT_FLAG + textPaint.isAntiAlias = true + reportFileView.setTextColor(Color.BLUE) + + reportFileView.setOnClickListener { + reportFileName.watchAttachFile(requireContext()) + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_certificate_basic_information + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt index 2f3c95c..b1df400 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt @@ -4,19 +4,24 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.addAll +import com.casic.xz.meterage.extensions.diffCurrentTime +import com.casic.xz.meterage.extensions.formatToDate import com.casic.xz.meterage.extensions.showEmptyPage -import com.casic.xz.meterage.model.CertificateModel +import com.casic.xz.meterage.model.CertificateListModel +import com.casic.xz.meterage.view.home.CertificateReportDetailActivity import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler import kotlinx.android.synthetic.main.fragment_certificate_report.* import kotlinx.android.synthetic.main.include_empty_view.* /** - * 计量法规 + * 证书报告 * * formId:ywglzsbg * */ @@ -24,8 +29,8 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var certificateViewModel: CertificateViewModel - private lateinit var certificateAdapter: NormalRecyclerAdapter - private var dataBeans: MutableList = ArrayList() + private lateinit var certificateAdapter: NormalRecyclerAdapter + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false @@ -119,40 +124,37 @@ } else { emptyView!!.hide() certificateAdapter = object : - NormalRecyclerAdapter( + NormalRecyclerAdapter( R.layout.item_certificate_rv_l, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, - item: CertificateModel.DataModel.RowsModel + item: CertificateListModel.DataModel.RowsModel ) { + val deltaT = item.createTime.diffCurrentTime() + val diffTime = if (deltaT < 24) { + "${deltaT}小时前" + } else { + item.createTime.formatToDate() + } + viewHolder.setText(R.id.reportNameView, item.certificateReportName) -// .setText(R.id.fileStateView, item.effectiveStatusName) -// .setText(R.id.remarkView, "备注：$remark") -// .setText(R.id.fileCodeView, "文件号：${item.fileNo}") -// .setText(R.id.releaseDateView, "实施时间：${item.publishTime}") -// -// if (!item.effectiveStatus.equals("1")) { -// viewHolder.setBackgroundColor( -// R.id.fileStateView, -// R.color.gray.convertColor(requireContext()) -// ) -// } + .setText(R.id.createTimeView, diffTime) + .setText(R.id.categoryView, "校验类别：${item.measureCategoryName}") + .setText(R.id.technicianView, "检定员：${item.measurePersonName}") + + viewHolder.setOnClickListener(R.id.showDetailButton) { + requireContext().navigatePageTo( + addAll(item.approvalStatus, item.id) + ) + } } } certificateRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) certificateRecyclerView.adapter = certificateAdapter - certificateAdapter.setOnItemClickedListener(object : - NormalRecyclerAdapter.OnItemClickedListener { - override fun onItemClicked( - position: Int, t: CertificateModel.DataModel.RowsModel - ) { -// requireContext().navigatePageTo(t.toJson()) - } - }) } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt new file mode 100644 index 0000000..2d5ac61 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.certificate + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class ExceptionReportFragment :KotlinBaseFragment(){ + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_certificate_exception_report + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/model/CertificateDetailModel.java b/app/src/main/java/com/casic/xz/meterage/model/CertificateDetailModel.java new file mode 100644 index 0000000..42efccd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/CertificateDetailModel.java @@ -0,0 +1,2080 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class CertificateDetailModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private String approvalSignId; + private String approvalStatus; + private String approvalStatusName; + private BusinessOriginalRecordModel businessOriginalRecord; + private String calibrationMajor; + private String calibrationMajorName; + private String certificateReportCategory; + private String certificateReportCode; + private String certificateReportFile; + private String certificateReportName; + private String createTime; + private String createUser; + private String expirationDate; + private String id; + private String isDel; + private String issuanceDate; + private String measureDeptId; + private String measurePersonId; + private String measureResult; + private String orderId; + private String originalRecordId; + private String printNum; + private String printStatus; + private String processId; + private String remark; + private String sampleId; + private String signId; + private String templateId; + private String updateTime; + + public String getApprovalSignId() { + return approvalSignId; + } + + public void setApprovalSignId(String approvalSignId) { + this.approvalSignId = approvalSignId; + } + + public String getApprovalStatus() { + return approvalStatus; + } + + public void setApprovalStatus(String approvalStatus) { + this.approvalStatus = approvalStatus; + } + + public String getApprovalStatusName() { + return approvalStatusName; + } + + public void setApprovalStatusName(String approvalStatusName) { + this.approvalStatusName = approvalStatusName; + } + + public BusinessOriginalRecordModel getBusinessOriginalRecord() { + return businessOriginalRecord; + } + + public void setBusinessOriginalRecord(BusinessOriginalRecordModel businessOriginalRecord) { + this.businessOriginalRecord = businessOriginalRecord; + } + + public String getCalibrationMajor() { + return calibrationMajor; + } + + public void setCalibrationMajor(String calibrationMajor) { + this.calibrationMajor = calibrationMajor; + } + + public String getCalibrationMajorName() { + return calibrationMajorName; + } + + public void setCalibrationMajorName(String calibrationMajorName) { + this.calibrationMajorName = calibrationMajorName; + } + + public String getCertificateReportCategory() { + return certificateReportCategory; + } + + public void setCertificateReportCategory(String certificateReportCategory) { + this.certificateReportCategory = certificateReportCategory; + } + + public String getCertificateReportCode() { + return certificateReportCode; + } + + public void setCertificateReportCode(String certificateReportCode) { + this.certificateReportCode = certificateReportCode; + } + + public String getCertificateReportFile() { + return certificateReportFile; + } + + public void setCertificateReportFile(String certificateReportFile) { + this.certificateReportFile = certificateReportFile; + } + + public String getCertificateReportName() { + return certificateReportName; + } + + public void setCertificateReportName(String certificateReportName) { + this.certificateReportName = certificateReportName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getExpirationDate() { + return expirationDate; + } + + public void setExpirationDate(String expirationDate) { + this.expirationDate = expirationDate; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String isIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIssuanceDate() { + return issuanceDate; + } + + public void setIssuanceDate(String issuanceDate) { + this.issuanceDate = issuanceDate; + } + + public String getMeasureDeptId() { + return measureDeptId; + } + + public void setMeasureDeptId(String measureDeptId) { + this.measureDeptId = measureDeptId; + } + + public String getMeasurePersonId() { + return measurePersonId; + } + + public void setMeasurePersonId(String measurePersonId) { + this.measurePersonId = measurePersonId; + } + + public String getMeasureResult() { + return measureResult; + } + + public void setMeasureResult(String measureResult) { + this.measureResult = measureResult; + } + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public String getOriginalRecordId() { + return originalRecordId; + } + + public void setOriginalRecordId(String originalRecordId) { + this.originalRecordId = originalRecordId; + } + + public String getPrintNum() { + return printNum; + } + + public void setPrintNum(String printNum) { + this.printNum = printNum; + } + + public String getPrintStatus() { + return printStatus; + } + + public void setPrintStatus(String printStatus) { + this.printStatus = printStatus; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSampleId() { + return sampleId; + } + + public void setSampleId(String sampleId) { + this.sampleId = sampleId; + } + + public String getSignId() { + return signId; + } + + public void setSignId(String signId) { + this.signId = signId; + } + + public String getTemplateId() { + return templateId; + } + + public void setTemplateId(String templateId) { + this.templateId = templateId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public static class BusinessOriginalRecordModel { + private BusinessEnvRecordModel businessEnvironmentRecord; + private BusinessOrderModel businessOrder; + private String calibrationPlace; + private String calibrationTime; + private String createTime; + private String createUser; + private BusinessOrderModel.CustomerSampleModel customerSampleInfo; + private String environmentId; + private List equipmentInfoList; + private List fileList; + private String id; + private String isDel; + private String measureCategory; + private String measureCategoryName; + private String orderId; + private String originalRecordCode; + private String originalRecordFile; + private String originalRecordName; + private String remark; + private String sampleId; + private String templateId; + private String templateName; + private String updateTime; + + public BusinessEnvRecordModel getBusinessEnvironmentRecord() { + return businessEnvironmentRecord; + } + + public void setBusinessEnvironmentRecord(BusinessEnvRecordModel businessEnvironmentRecord) { + this.businessEnvironmentRecord = businessEnvironmentRecord; + } + + public BusinessOrderModel getBusinessOrder() { + return businessOrder; + } + + public void setBusinessOrder(BusinessOrderModel businessOrder) { + this.businessOrder = businessOrder; + } + + public String getCalibrationPlace() { + return calibrationPlace; + } + + public void setCalibrationPlace(String calibrationPlace) { + this.calibrationPlace = calibrationPlace; + } + + public String getCalibrationTime() { + return calibrationTime; + } + + public void setCalibrationTime(String calibrationTime) { + this.calibrationTime = calibrationTime; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public BusinessOrderModel.CustomerSampleModel getCustomerSampleInfo() { + return customerSampleInfo; + } + + public void setCustomerSampleInfo(BusinessOrderModel.CustomerSampleModel customerSampleInfo) { + this.customerSampleInfo = customerSampleInfo; + } + + public String getEnvironmentId() { + return environmentId; + } + + public void setEnvironmentId(String environmentId) { + this.environmentId = environmentId; + } + + public List getEquipmentInfoList() { + return equipmentInfoList; + } + + public void setEquipmentInfoList(List equipmentInfoList) { + this.equipmentInfoList = equipmentInfoList; + } + + public List getFileList() { + return fileList; + } + + public void setFileList(List fileList) { + this.fileList = fileList; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String isIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getMeasureCategory() { + return measureCategory; + } + + public void setMeasureCategory(String measureCategory) { + this.measureCategory = measureCategory; + } + + public String getMeasureCategoryName() { + return measureCategoryName; + } + + public void setMeasureCategoryName(String measureCategoryName) { + this.measureCategoryName = measureCategoryName; + } + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public String getOriginalRecordCode() { + return originalRecordCode; + } + + public void setOriginalRecordCode(String originalRecordCode) { + this.originalRecordCode = originalRecordCode; + } + + public String getOriginalRecordFile() { + return originalRecordFile; + } + + public void setOriginalRecordFile(String originalRecordFile) { + this.originalRecordFile = originalRecordFile; + } + + public String getOriginalRecordName() { + return originalRecordName; + } + + public void setOriginalRecordName(String originalRecordName) { + this.originalRecordName = originalRecordName; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSampleId() { + return sampleId; + } + + public void setSampleId(String sampleId) { + this.sampleId = sampleId; + } + + public String getTemplateId() { + return templateId; + } + + public void setTemplateId(String templateId) { + this.templateId = templateId; + } + + public String getTemplateName() { + return templateName; + } + + public void setTemplateName(String templateName) { + this.templateName = templateName; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public static class BusinessEnvRecordModel { + private String createTime; + private String createUser; + private String environmentCode; + private String humidity; + private String id; + private String isDel; + private String outputVoltage; + private String recordTime; + private String recorder; + private String remark; + private String roomNumber; + private String temperature; + private String updateTime; + private String zeroGroundVoltage; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEnvironmentCode() { + return environmentCode; + } + + public void setEnvironmentCode(String environmentCode) { + this.environmentCode = environmentCode; + } + + public String getHumidity() { + return humidity; + } + + public void setHumidity(String humidity) { + this.humidity = humidity; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String isIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getOutputVoltage() { + return outputVoltage; + } + + public void setOutputVoltage(String outputVoltage) { + this.outputVoltage = outputVoltage; + } + + public String getRecordTime() { + return recordTime; + } + + public void setRecordTime(String recordTime) { + this.recordTime = recordTime; + } + + public String getRecorder() { + return recorder; + } + + public void setRecorder(String recorder) { + this.recorder = recorder; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getRoomNumber() { + return roomNumber; + } + + public void setRoomNumber(String roomNumber) { + this.roomNumber = roomNumber; + } + + public String getTemperature() { + return temperature; + } + + public void setTemperature(String temperature) { + this.temperature = temperature; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getZeroGroundVoltage() { + return zeroGroundVoltage; + } + + public void setZeroGroundVoltage(String zeroGroundVoltage) { + this.zeroGroundVoltage = zeroGroundVoltage; + } + } + + public static class BusinessOrderModel { + private String certifications; + private String createTime; + private String createUser; + private String customerAddress; + private String customerId; + private String customerName; + private String customerNo; + private String customerPhone; + private List customerSampleInfoList; + private String deliverTime; + private String deliverer; + private String delivererId; + private String delivererTel; + private String id; + private String isDel; + private String isUrgent; + private String minioFileName; + private String orderCode; + private String orderTime; + private String planDeliverTime; + private String remark; + private String requireOverTime; + private String status; + private String updateTime; + private String updateUser; + + public String getCertifications() { + return certifications; + } + + public void setCertifications(String certifications) { + this.certifications = certifications; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCustomerAddress() { + return customerAddress; + } + + public void setCustomerAddress(String customerAddress) { + this.customerAddress = customerAddress; + } + + public String getCustomerId() { + return customerId; + } + + public void setCustomerId(String customerId) { + this.customerId = customerId; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public String getCustomerPhone() { + return customerPhone; + } + + public void setCustomerPhone(String customerPhone) { + this.customerPhone = customerPhone; + } + + public List getCustomerSampleInfoList() { + return customerSampleInfoList; + } + + public void setCustomerSampleInfoList(List customerSampleInfoList) { + this.customerSampleInfoList = customerSampleInfoList; + } + + public String getDeliverTime() { + return deliverTime; + } + + public void setDeliverTime(String deliverTime) { + this.deliverTime = deliverTime; + } + + public String getDeliverer() { + return deliverer; + } + + public void setDeliverer(String deliverer) { + this.deliverer = deliverer; + } + + public String getDelivererId() { + return delivererId; + } + + public void setDelivererId(String delivererId) { + this.delivererId = delivererId; + } + + public String getDelivererTel() { + return delivererTel; + } + + public void setDelivererTel(String delivererTel) { + this.delivererTel = delivererTel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIsUrgent() { + return isUrgent; + } + + public void setIsUrgent(String isUrgent) { + this.isUrgent = isUrgent; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getOrderCode() { + return orderCode; + } + + public void setOrderCode(String orderCode) { + this.orderCode = orderCode; + } + + public String getOrderTime() { + return orderTime; + } + + public void setOrderTime(String orderTime) { + this.orderTime = orderTime; + } + + public String getPlanDeliverTime() { + return planDeliverTime; + } + + public void setPlanDeliverTime(String planDeliverTime) { + this.planDeliverTime = planDeliverTime; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getRequireOverTime() { + return requireOverTime; + } + + public void setRequireOverTime(String requireOverTime) { + this.requireOverTime = requireOverTime; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUpdateUser() { + return updateUser; + } + + public void setUpdateUser(String updateUser) { + this.updateUser = updateUser; + } + + public static class CustomerSampleModel { + private String abc; + private String appendix; + private String appendixDescn; + private String createTime; + private String createUser; + private String customerAddress; + private String customerId; + private String customerName; + private String customerNo; + private String deliverer; + private String delivererTel; + private String id; + private String isDel; + private String isExistSample; + private String labelBind; + private String manufacturer; + private String manufacturerCountry; + private String manufacturingDate; + private String manufacturingNo; + private String measureCategory; + private String measureCategoryName; + private String measureContent; + private String measureLastTime; + private String measurePeriod; + private String measureType; + private String measureTypeName; + private String minioFileName; + private String orderId; + private String phone; + private String postalCode; + private String powerVoltage; + private String remark; + private String sampleBelong; + private String sampleBelongName; + private String sampleModel; + private String sampleName; + private String sampleNo; + private String specialRequire; + private String updateTime; + private String updateUser; + private String validDeadline; + + public String getAbc() { + return abc; + } + + public void setAbc(String abc) { + this.abc = abc; + } + + public String getAppendix() { + return appendix; + } + + public void setAppendix(String appendix) { + this.appendix = appendix; + } + + public String getAppendixDescn() { + return appendixDescn; + } + + public void setAppendixDescn(String appendixDescn) { + this.appendixDescn = appendixDescn; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCustomerAddress() { + return customerAddress; + } + + public void setCustomerAddress(String customerAddress) { + this.customerAddress = customerAddress; + } + + public String getCustomerId() { + return customerId; + } + + public void setCustomerId(String customerId) { + this.customerId = customerId; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public String getDeliverer() { + return deliverer; + } + + public void setDeliverer(String deliverer) { + this.deliverer = deliverer; + } + + public String getDelivererTel() { + return delivererTel; + } + + public void setDelivererTel(String delivererTel) { + this.delivererTel = delivererTel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIsExistSample() { + return isExistSample; + } + + public void setIsExistSample(String isExistSample) { + this.isExistSample = isExistSample; + } + + public String getLabelBind() { + return labelBind; + } + + public void setLabelBind(String labelBind) { + this.labelBind = labelBind; + } + + public String getManufacturer() { + return manufacturer; + } + + public void setManufacturer(String manufacturer) { + this.manufacturer = manufacturer; + } + + public String getManufacturerCountry() { + return manufacturerCountry; + } + + public void setManufacturerCountry(String manufacturerCountry) { + this.manufacturerCountry = manufacturerCountry; + } + + public String getManufacturingDate() { + return manufacturingDate; + } + + public void setManufacturingDate(String manufacturingDate) { + this.manufacturingDate = manufacturingDate; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getMeasureCategory() { + return measureCategory; + } + + public void setMeasureCategory(String measureCategory) { + this.measureCategory = measureCategory; + } + + public String getMeasureCategoryName() { + return measureCategoryName; + } + + public void setMeasureCategoryName(String measureCategoryName) { + this.measureCategoryName = measureCategoryName; + } + + public String getMeasureContent() { + return measureContent; + } + + public void setMeasureContent(String measureContent) { + this.measureContent = measureContent; + } + + public String getMeasureLastTime() { + return measureLastTime; + } + + public void setMeasureLastTime(String measureLastTime) { + this.measureLastTime = measureLastTime; + } + + public String getMeasurePeriod() { + return measurePeriod; + } + + public void setMeasurePeriod(String measurePeriod) { + this.measurePeriod = measurePeriod; + } + + public String getMeasureType() { + return measureType; + } + + public void setMeasureType(String measureType) { + this.measureType = measureType; + } + + public String getMeasureTypeName() { + return measureTypeName; + } + + public void setMeasureTypeName(String measureTypeName) { + this.measureTypeName = measureTypeName; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getPostalCode() { + return postalCode; + } + + public void setPostalCode(String postalCode) { + this.postalCode = postalCode; + } + + public String getPowerVoltage() { + return powerVoltage; + } + + public void setPowerVoltage(String powerVoltage) { + this.powerVoltage = powerVoltage; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSampleBelong() { + return sampleBelong; + } + + public void setSampleBelong(String sampleBelong) { + this.sampleBelong = sampleBelong; + } + + public String getSampleBelongName() { + return sampleBelongName; + } + + public void setSampleBelongName(String sampleBelongName) { + this.sampleBelongName = sampleBelongName; + } + + public String getSampleModel() { + return sampleModel; + } + + public void setSampleModel(String sampleModel) { + this.sampleModel = sampleModel; + } + + public String getSampleName() { + return sampleName; + } + + public void setSampleName(String sampleName) { + this.sampleName = sampleName; + } + + public String getSampleNo() { + return sampleNo; + } + + public void setSampleNo(String sampleNo) { + this.sampleNo = sampleNo; + } + + public String getSpecialRequire() { + return specialRequire; + } + + public void setSpecialRequire(String specialRequire) { + this.specialRequire = specialRequire; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUpdateUser() { + return updateUser; + } + + public void setUpdateUser(String updateUser) { + this.updateUser = updateUser; + } + + public String getValidDeadline() { + return validDeadline; + } + + public void setValidDeadline(String validDeadline) { + this.validDeadline = validDeadline; + } + } + } + + public static class EquipmentModel { + private String abc; + private String abcName; + private String applyRelationId; + private String assetNo; + private String assetSource; + private String assetType; + private String assetTypeName; + private String attribute; + private String capitalSource; + private String capitalSourceName; + private String cardEstablishmentDate; + private String createTime; + private String createUser; + private String depreciationMethod; + private String depreciationMethodName; + private String depreciationPeriod; + private String enableDate; + private String equipmentCategory; + private String equipmentCategoryName; + private String equipmentName; + private String equipmentNo; + private String equipmentSpecifications; + private String equipmentType; + private String equipmentTypeName; + private String fileList; + private String id; + private String installIncidentalExpenses; + private String installPlace; + private String intactState; + private String isCalibrationTestEquipment; + private String isDel; + private String isFixedAssets; + private String isMeasureAccount; + private String isStandardSupportEquipment; + private String labelBind; + private String majorCategory; + private String majorCategoryName; + private String managerLevel; + private String managerLevelName; + private String managerState; + private String managerStateName; + private String manufacturer; + private String manufacturerCountry; + private String manufacturingDate; + private String manufacturingNo; + private String mesureCycle; + private String mesureDate; + private String mesureDept; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String mesureType; + private String mesureTypeName; + private String modelNo; + private String originValue; + private String overallDimension; + private String presentOriginValue; + private String purpose; + private String remark; + private String singlePrice; + private String supportStandardEquipmentName; + private String supportStandardEquipmentNo; + private String technicalLevel; + private String uncertainty; + private String updateTime; + private String useDept; + private String useDeptName; + private String usePerson; + private String usePersonName; + private String validDate; + private String version; + private String weight; + + public String getAbc() { + return abc; + } + + public void setAbc(String abc) { + this.abc = abc; + } + + public String getAbcName() { + return abcName; + } + + public void setAbcName(String abcName) { + this.abcName = abcName; + } + + public String getApplyRelationId() { + return applyRelationId; + } + + public void setApplyRelationId(String applyRelationId) { + this.applyRelationId = applyRelationId; + } + + public String getAssetNo() { + return assetNo; + } + + public void setAssetNo(String assetNo) { + this.assetNo = assetNo; + } + + public String getAssetSource() { + return assetSource; + } + + public void setAssetSource(String assetSource) { + this.assetSource = assetSource; + } + + public String getAssetType() { + return assetType; + } + + public void setAssetType(String assetType) { + this.assetType = assetType; + } + + public String getAssetTypeName() { + return assetTypeName; + } + + public void setAssetTypeName(String assetTypeName) { + this.assetTypeName = assetTypeName; + } + + public String getAttribute() { + return attribute; + } + + public void setAttribute(String attribute) { + this.attribute = attribute; + } + + public String getCapitalSource() { + return capitalSource; + } + + public void setCapitalSource(String capitalSource) { + this.capitalSource = capitalSource; + } + + public String getCapitalSourceName() { + return capitalSourceName; + } + + public void setCapitalSourceName(String capitalSourceName) { + this.capitalSourceName = capitalSourceName; + } + + public String getCardEstablishmentDate() { + return cardEstablishmentDate; + } + + public void setCardEstablishmentDate(String cardEstablishmentDate) { + this.cardEstablishmentDate = cardEstablishmentDate; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getDepreciationMethod() { + return depreciationMethod; + } + + public void setDepreciationMethod(String depreciationMethod) { + this.depreciationMethod = depreciationMethod; + } + + public String getDepreciationMethodName() { + return depreciationMethodName; + } + + public void setDepreciationMethodName(String depreciationMethodName) { + this.depreciationMethodName = depreciationMethodName; + } + + public String getDepreciationPeriod() { + return depreciationPeriod; + } + + public void setDepreciationPeriod(String depreciationPeriod) { + this.depreciationPeriod = depreciationPeriod; + } + + public String getEnableDate() { + return enableDate; + } + + public void setEnableDate(String enableDate) { + this.enableDate = enableDate; + } + + public String getEquipmentCategory() { + return equipmentCategory; + } + + public void setEquipmentCategory(String equipmentCategory) { + this.equipmentCategory = equipmentCategory; + } + + public String getEquipmentCategoryName() { + return equipmentCategoryName; + } + + public void setEquipmentCategoryName(String equipmentCategoryName) { + this.equipmentCategoryName = equipmentCategoryName; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getEquipmentSpecifications() { + return equipmentSpecifications; + } + + public void setEquipmentSpecifications(String equipmentSpecifications) { + this.equipmentSpecifications = equipmentSpecifications; + } + + public String getEquipmentType() { + return equipmentType; + } + + public void setEquipmentType(String equipmentType) { + this.equipmentType = equipmentType; + } + + public String getEquipmentTypeName() { + return equipmentTypeName; + } + + public void setEquipmentTypeName(String equipmentTypeName) { + this.equipmentTypeName = equipmentTypeName; + } + + public String getFileList() { + return fileList; + } + + public void setFileList(String fileList) { + this.fileList = fileList; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInstallIncidentalExpenses() { + return installIncidentalExpenses; + } + + public void setInstallIncidentalExpenses(String installIncidentalExpenses) { + this.installIncidentalExpenses = installIncidentalExpenses; + } + + public String getInstallPlace() { + return installPlace; + } + + public void setInstallPlace(String installPlace) { + this.installPlace = installPlace; + } + + public String getIntactState() { + return intactState; + } + + public void setIntactState(String intactState) { + this.intactState = intactState; + } + + public String getIsCalibrationTestEquipment() { + return isCalibrationTestEquipment; + } + + public void setIsCalibrationTestEquipment(String isCalibrationTestEquipment) { + this.isCalibrationTestEquipment = isCalibrationTestEquipment; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIsFixedAssets() { + return isFixedAssets; + } + + public void setIsFixedAssets(String isFixedAssets) { + this.isFixedAssets = isFixedAssets; + } + + public String getIsMeasureAccount() { + return isMeasureAccount; + } + + public void setIsMeasureAccount(String isMeasureAccount) { + this.isMeasureAccount = isMeasureAccount; + } + + public String getIsStandardSupportEquipment() { + return isStandardSupportEquipment; + } + + public void setIsStandardSupportEquipment(String isStandardSupportEquipment) { + this.isStandardSupportEquipment = isStandardSupportEquipment; + } + + public String getLabelBind() { + return labelBind; + } + + public void setLabelBind(String labelBind) { + this.labelBind = labelBind; + } + + public String getMajorCategory() { + return majorCategory; + } + + public void setMajorCategory(String majorCategory) { + this.majorCategory = majorCategory; + } + + public String getMajorCategoryName() { + return majorCategoryName; + } + + public void setMajorCategoryName(String majorCategoryName) { + this.majorCategoryName = majorCategoryName; + } + + public String getManagerLevel() { + return managerLevel; + } + + public void setManagerLevel(String managerLevel) { + this.managerLevel = managerLevel; + } + + public String getManagerLevelName() { + return managerLevelName; + } + + public void setManagerLevelName(String managerLevelName) { + this.managerLevelName = managerLevelName; + } + + public String getManagerState() { + return managerState; + } + + public void setManagerState(String managerState) { + this.managerState = managerState; + } + + public String getManagerStateName() { + return managerStateName; + } + + public void setManagerStateName(String managerStateName) { + this.managerStateName = managerStateName; + } + + public String getManufacturer() { + return manufacturer; + } + + public void setManufacturer(String manufacturer) { + this.manufacturer = manufacturer; + } + + public String getManufacturerCountry() { + return manufacturerCountry; + } + + public void setManufacturerCountry(String manufacturerCountry) { + this.manufacturerCountry = manufacturerCountry; + } + + public String getManufacturingDate() { + return manufacturingDate; + } + + public void setManufacturingDate(String manufacturingDate) { + this.manufacturingDate = manufacturingDate; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getMesureCycle() { + return mesureCycle; + } + + public void setMesureCycle(String mesureCycle) { + this.mesureCycle = mesureCycle; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureDept() { + return mesureDept; + } + + public void setMesureDept(String mesureDept) { + this.mesureDept = mesureDept; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getMesureType() { + return mesureType; + } + + public void setMesureType(String mesureType) { + this.mesureType = mesureType; + } + + public String getMesureTypeName() { + return mesureTypeName; + } + + public void setMesureTypeName(String mesureTypeName) { + this.mesureTypeName = mesureTypeName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getOriginValue() { + return originValue; + } + + public void setOriginValue(String originValue) { + this.originValue = originValue; + } + + public String getOverallDimension() { + return overallDimension; + } + + public void setOverallDimension(String overallDimension) { + this.overallDimension = overallDimension; + } + + public String getPresentOriginValue() { + return presentOriginValue; + } + + public void setPresentOriginValue(String presentOriginValue) { + this.presentOriginValue = presentOriginValue; + } + + public String getPurpose() { + return purpose; + } + + public void setPurpose(String purpose) { + this.purpose = purpose; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSinglePrice() { + return singlePrice; + } + + public void setSinglePrice(String singlePrice) { + this.singlePrice = singlePrice; + } + + public String getSupportStandardEquipmentName() { + return supportStandardEquipmentName; + } + + public void setSupportStandardEquipmentName(String supportStandardEquipmentName) { + this.supportStandardEquipmentName = supportStandardEquipmentName; + } + + public String getSupportStandardEquipmentNo() { + return supportStandardEquipmentNo; + } + + public void setSupportStandardEquipmentNo(String supportStandardEquipmentNo) { + this.supportStandardEquipmentNo = supportStandardEquipmentNo; + } + + public String getTechnicalLevel() { + return technicalLevel; + } + + public void setTechnicalLevel(String technicalLevel) { + this.technicalLevel = technicalLevel; + } + + public String getUncertainty() { + return uncertainty; + } + + public void setUncertainty(String uncertainty) { + this.uncertainty = uncertainty; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDept() { + return useDept; + } + + public void setUseDept(String useDept) { + this.useDept = useDept; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getUsePerson() { + return usePerson; + } + + public void setUsePerson(String usePerson) { + this.usePerson = usePerson; + } + + public String getUsePersonName() { + return usePersonName; + } + + public void setUsePersonName(String usePersonName) { + this.usePersonName = usePersonName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + + public String getVersion() { + return version; + } + + public void setVersion(String version) { + this.version = version; + } + + public String getWeight() { + return weight; + } + + public void setWeight(String weight) { + this.weight = weight; + } + } + + public static class FileModel { + private String approvalStatus; + private String approvalStatusName; + private String createTime; + private String createUser; + private String createUserId; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String fileType; + private String fileTypeName; + private String id; + private String isDel; + private String minioFileName; + private String processId; + private String publishTime; + private String publisher; + private String remark; + private String updateTime; + + public String getApprovalStatus() { + return approvalStatus; + } + + public void setApprovalStatus(String approvalStatus) { + this.approvalStatus = approvalStatus; + } + + public String getApprovalStatusName() { + return approvalStatusName; + } + + public void setApprovalStatusName(String approvalStatusName) { + this.approvalStatusName = approvalStatusName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCreateUserId() { + return createUserId; + } + + public void setCreateUserId(String createUserId) { + this.createUserId = createUserId; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getFileType() { + return fileType; + } + + public void setFileType(String fileType) { + this.fileType = fileType; + } + + public String getFileTypeName() { + return fileTypeName; + } + + public void setFileTypeName(String fileTypeName) { + this.fileTypeName = fileTypeName; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getPublishTime() { + return publishTime; + } + + public void setPublishTime(String publishTime) { + this.publishTime = publishTime; + } + + public String getPublisher() { + return publisher; + } + + public void setPublisher(String publisher) { + this.publisher = publisher; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/CertificateListModel.java b/app/src/main/java/com/casic/xz/meterage/model/CertificateListModel.java new file mode 100644 index 0000000..0eed915 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/CertificateListModel.java @@ -0,0 +1,229 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class CertificateListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String approvalStatus; + private String approvalStatusName; + private String calibrationMajor; + private String certificateReportCode; + private String certificateReportName; + private String createTime; + private String decisionItem; + private String id; + private String manufacturingNo; + private String measureCategory; + private String measureCategoryName; + private String measurePersonId; + private String measurePersonName; + private String orderCode; + private String processId; + private String sampleModel; + private String sampleName; + private String sampleNo; + private String taskId; + + public String getApprovalStatus() { + return approvalStatus; + } + + public void setApprovalStatus(String approvalStatus) { + this.approvalStatus = approvalStatus; + } + + public String getApprovalStatusName() { + return approvalStatusName; + } + + public void setApprovalStatusName(String approvalStatusName) { + this.approvalStatusName = approvalStatusName; + } + + public String getCalibrationMajor() { + return calibrationMajor; + } + + public void setCalibrationMajor(String calibrationMajor) { + this.calibrationMajor = calibrationMajor; + } + + public String getCertificateReportCode() { + return certificateReportCode; + } + + public void setCertificateReportCode(String certificateReportCode) { + this.certificateReportCode = certificateReportCode; + } + + public String getCertificateReportName() { + return certificateReportName; + } + + public void setCertificateReportName(String certificateReportName) { + this.certificateReportName = certificateReportName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getDecisionItem() { + return decisionItem; + } + + public void setDecisionItem(String decisionItem) { + this.decisionItem = decisionItem; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getMeasureCategory() { + return measureCategory; + } + + public void setMeasureCategory(String measureCategory) { + this.measureCategory = measureCategory; + } + + public String getMeasureCategoryName() { + return measureCategoryName; + } + + public void setMeasureCategoryName(String measureCategoryName) { + this.measureCategoryName = measureCategoryName; + } + + public String getMeasurePersonId() { + return measurePersonId; + } + + public void setMeasurePersonId(String measurePersonId) { + this.measurePersonId = measurePersonId; + } + + public String getMeasurePersonName() { + return measurePersonName; + } + + public void setMeasurePersonName(String measurePersonName) { + this.measurePersonName = measurePersonName; + } + + public String getOrderCode() { + return orderCode; + } + + public void setOrderCode(String orderCode) { + this.orderCode = orderCode; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getSampleModel() { + return sampleModel; + } + + public void setSampleModel(String sampleModel) { + this.sampleModel = sampleModel; + } + + public String getSampleName() { + return sampleName; + } + + public void setSampleName(String sampleName) { + this.sampleName = sampleName; + } + + public String getSampleNo() { + return sampleNo; + } + + public void setSampleNo(String sampleNo) { + this.sampleNo = sampleNo; + } + + public String getTaskId() { + return taskId; + } + + public void setTaskId(String taskId) { + this.taskId = taskId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/CertificateModel.java b/app/src/main/java/com/casic/xz/meterage/model/CertificateModel.java deleted file mode 100644 index ec0d25b..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/CertificateModel.java +++ /dev/null @@ -1,202 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class CertificateModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String approvalStatus; - private String approvalStatusName; - private String calibrationMajor; - private String certificateReportCode; - private String certificateReportName; - private String createTime; - private String decisionItem; - private String id; - private String manufacturingNo; - private String measurePersonId; - private String orderCode; - private String processId; - private String sampleModel; - private String sampleName; - private String sampleNo; - private String taskId; - - public String getApprovalStatus() { - return approvalStatus; - } - - public void setApprovalStatus(String approvalStatus) { - this.approvalStatus = approvalStatus; - } - - public String getApprovalStatusName() { - return approvalStatusName; - } - - public void setApprovalStatusName(String approvalStatusName) { - this.approvalStatusName = approvalStatusName; - } - - public String getCalibrationMajor() { - return calibrationMajor; - } - - public void setCalibrationMajor(String calibrationMajor) { - this.calibrationMajor = calibrationMajor; - } - - public String getCertificateReportCode() { - return certificateReportCode; - } - - public void setCertificateReportCode(String certificateReportCode) { - this.certificateReportCode = certificateReportCode; - } - - public String getCertificateReportName() { - return certificateReportName; - } - - public void setCertificateReportName(String certificateReportName) { - this.certificateReportName = certificateReportName; - } - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getDecisionItem() { - return decisionItem; - } - - public void setDecisionItem(String decisionItem) { - this.decisionItem = decisionItem; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getManufacturingNo() { - return manufacturingNo; - } - - public void setManufacturingNo(String manufacturingNo) { - this.manufacturingNo = manufacturingNo; - } - - public String getMeasurePersonId() { - return measurePersonId; - } - - public void setMeasurePersonId(String measurePersonId) { - this.measurePersonId = measurePersonId; - } - - public String getOrderCode() { - return orderCode; - } - - public void setOrderCode(String orderCode) { - this.orderCode = orderCode; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public String getSampleModel() { - return sampleModel; - } - - public void setSampleModel(String sampleModel) { - this.sampleModel = sampleModel; - } - - public String getSampleName() { - return sampleName; - } - - public void setSampleName(String sampleName) { - this.sampleName = sampleName; - } - - public String getSampleNo() { - return sampleNo; - } - - public void setSampleNo(String sampleNo) { - this.sampleNo = sampleNo; - } - - public String getTaskId() { - return taskId; - } - - public void setTaskId(String taskId) { - this.taskId = taskId; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index b0dec00..a4f3c46 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -345,4 +345,22 @@ @QueryMap limit: Map, @QueryMap offset: Map ): String + + /** + * 获取委托书详情 + */ + @POST("/business/certificateReport/detail") + suspend fun getCertificateReportDetail( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 提交证书 + */ + @POST("/business/certificateReport/submit") + suspend fun submit( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String } \ 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 cef55ec..8bf4070 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 @@ -800,4 +800,29 @@ AuthenticationHelper.token!!, requestBody, limitMap, offsetMap ) } + + /** + * 获取证书报告详情 + */ + suspend fun getCertificateReportDetail(id: String): String { + val param = JsonObject() + param.addProperty("id", id) + val requestBody = param.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getCertificateReportDetail(AuthenticationHelper.token!!, requestBody) + } + + /** + * 提交证书报告 + */ + suspend fun submit(id: String): String { + val param = JsonObject() + param.addProperty("formId", "ywglzsbg") + param.addProperty("id", id) + val requestBody = param.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.submit(AuthenticationHelper.token!!, requestBody) + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportActivity.kt index 2baefd2..fa4e129 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportActivity.kt @@ -19,15 +19,21 @@ "已通过", "未通过", "已取消", - "非草稿", - "未通过", "可打印" ) private var fragmentPages: ArrayList = ArrayList() init { - pageTitles.indices.forEach { - fragmentPages.add(CertificateReportFragment((it + 1).toString())) + pageTitles.forEach { + when (it) { + "草稿箱" -> fragmentPages.add(CertificateReportFragment("1")) + "待审批" -> fragmentPages.add(CertificateReportFragment("2")) + "审批中" -> fragmentPages.add(CertificateReportFragment("3")) + "已通过" -> fragmentPages.add(CertificateReportFragment("4")) + "未通过" -> fragmentPages.add(CertificateReportFragment("5")) + "已取消" -> fragmentPages.add(CertificateReportFragment("6")) + "可打印" -> fragmentPages.add(CertificateReportFragment("9")) + } } } diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt new file mode 100644 index 0000000..e30c7c3 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt @@ -0,0 +1,106 @@ +package com.casic.xz.meterage.view.home + +import android.view.View +import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.SubViewPagerAdapter +import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.casic.xz.meterage.fragment.certificate.ApprovalProcessFragment +import com.casic.xz.meterage.fragment.certificate.BasicInformationFragment +import com.casic.xz.meterage.fragment.certificate.ExceptionReportFragment +import com.casic.xz.meterage.model.CertificateDetailModel +import com.casic.xz.meterage.utils.LoadingDialogHub +import com.casic.xz.meterage.vm.CertificateViewModel +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.vm.LoadState +import kotlinx.android.synthetic.main.activity_certificate_detail.* + +//"草稿箱" -> "1" +//"待审批" -> "2" +//"审批中" -> "3" +//"已通过" -> "4" +//"未通过" -> "5" +//"已取消" -> "6" +//"可打印" -> "9" + +class CertificateReportDetailActivity : KotlinBaseActivity() { + + private var fragmentPages: ArrayList = ArrayList() + private lateinit var certificateViewModel: CertificateViewModel + private lateinit var detailModel: CertificateDetailModel.DataModel + + override fun initData() { + val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! + + when (args[0]) { + "1" -> { + approvalView.text = "提交" + } + "2" -> { + approvalView.text = "审批" + } + "9" -> { + approvalView.text = "打印" + } + else -> { + approvalView.visibility = View.GONE + } + } + + certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] + certificateViewModel.getCertificateReportDetail(args[1]) + certificateViewModel.certificateDetail.observe(this) { + if (it.code == 200) { + + detailModel = it.data + + fragmentPages.add(BasicInformationFragment(detailModel)) + fragmentPages.add(ApprovalProcessFragment()) + fragmentPages.add(ExceptionReportFragment()) + + val pageTitles = arrayOf("基础信息", "审批流程", "异常报告") + + approvalViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, pageTitles + ) + //绑定 + topTabLayout.setupWithViewPager(approvalViewPager) + } + } + + certificateViewModel.submitResult.observe(this) { + if (it.code == 200) { + "提交成功".show(this) + finish() + } + } + } + + override fun initEvent() { + leftBackView.setOnClickListener { finish() } + + approvalView.setOnClickListener { + certificateViewModel.submit(detailModel.id) + } + } + + override fun initLayoutView(): Int = R.layout.activity_certificate_detail + + override fun observeRequestState() { + certificateViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt index 080c380..77fe8a5 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt @@ -129,6 +129,5 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() initLayoutImmersionBar(rootView) - titleView.text = "委托需求" } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt index 735e530..e088887 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt @@ -4,7 +4,9 @@ import com.casic.xz.meterage.base.BaseApplication import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage -import com.casic.xz.meterage.model.CertificateModel +import com.casic.xz.meterage.model.ActionResultModel +import com.casic.xz.meterage.model.CertificateDetailModel +import com.casic.xz.meterage.model.CertificateListModel import com.casic.xz.meterage.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -19,7 +21,9 @@ class CertificateViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val certificateList = MutableLiveData() + val certificateList = MutableLiveData() + val certificateDetail = MutableLiveData() + val submitResult = MutableLiveData() fun getCertificateReportList( approvalStatus: String, @@ -47,8 +51,46 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - certificateList.value = gson.fromJson( - response, object : TypeToken() {}.type + certificateList.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + + fun getCertificateReportDetail(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.getCertificateReportDetail(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + certificateDetail.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + + fun submit(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.submit(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + submitResult.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { loadState.value = LoadState.Fail diff --git a/app/src/main/res/layout/activity_capability_detail.xml b/app/src/main/res/layout/activity_capability_detail.xml index 585960a..375d861 100644 --- a/app/src/main/res/layout/activity_capability_detail.xml +++ b/app/src/main/res/layout/activity_capability_detail.xml @@ -21,7 +21,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:padding="@dimen/dp_10"> + android:paddingHorizontal="@dimen/dp_10"> diff --git a/app/src/main/res/layout/activity_certificate_detail.xml b/app/src/main/res/layout/activity_certificate_detail.xml new file mode 100644 index 0000000..5bb3649 --- /dev/null +++ b/app/src/main/res/layout/activity_certificate_detail.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_standard_file_detail.xml b/app/src/main/res/layout/activity_standard_file_detail.xml index 7776230..02efb08 100644 --- a/app/src/main/res/layout/activity_standard_file_detail.xml +++ b/app/src/main/res/layout/activity_standard_file_detail.xml @@ -21,7 +21,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:padding="@dimen/dp_10"> + android:paddingHorizontal="@dimen/dp_10"> diff --git a/app/src/main/res/layout/fragment_certificate_approval_process.xml b/app/src/main/res/layout/fragment_certificate_approval_process.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/fragment_certificate_approval_process.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 5ba44f0..298f687 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -53,7 +53,8 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "XZJL_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" +// outputFileName = "XZJL_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "XZJL_" + getBuildDate() + "_Beta.apk" } } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4b914b5..ebea092 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -67,6 +67,7 @@ + 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 new file mode 100644 index 0000000..a75e566 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.certificate + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class ApprovalProcessFragment :KotlinBaseFragment(){ + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_certificate_approval_process + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt new file mode 100644 index 0000000..5882c3d --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt @@ -0,0 +1,77 @@ +package com.casic.xz.meterage.fragment.certificate + +import android.graphics.Color +import android.graphics.Paint +import android.util.Log +import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.watchAttachFile +import com.casic.xz.meterage.model.CertificateDetailModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.pengxh.kt.lite.extensions.toJson +import kotlinx.android.synthetic.main.fragment_certificate_basic_information.* + +class BasicInformationFragment(private val data: CertificateDetailModel.DataModel) : + KotlinBaseFragment() { + + override fun initData() { + val businessOriginal = data.businessOriginalRecord + + reportCodeView.text = data.certificateReportCode + originalCodeView.text = businessOriginal.originalRecordCode + checkCategoryView.text = businessOriginal.measureCategoryName + + Log.d( + "Casic", + "BasicInformationFragment => initData: ${businessOriginal.fileList.toJson()}" + ) +// basisFileView.text = businessOriginal.fileList + + val sampleInfo = businessOriginal.customerSampleInfo + sampleCodeView.text = sampleInfo.sampleNo + sampleNameView.text = sampleInfo.sampleName + manufacturingCodeView.text = sampleInfo.manufacturingNo + modelView.text = sampleInfo.sampleModel + entrustCodeView.text = sampleInfo.customerNo + entrustNameView.text = sampleInfo.customerName + entrustContactView.text = sampleInfo.phone + entrustEmailView.text = sampleInfo.postalCode + entrustAddressView.text = sampleInfo.customerAddress + senderView.text = sampleInfo.deliverer + senderContactView.text = sampleInfo.delivererTel + checkTypeView.text = sampleInfo.measureContent + remarkView.text = sampleInfo.remark + + estimateServedTimeView.text = businessOriginal.businessOrder.planDeliverTime + estimateCompleteTimeView.text = businessOriginal.businessOrder.requireOverTime + + if (data.certificateReportFile.isNullOrBlank()) { + reportFileView.text = "暂无附件" + } else { + val reportFileName = data.certificateReportFile + + reportFileView.text = reportFileName + val textPaint = reportFileView.paint + textPaint.flags = Paint.UNDERLINE_TEXT_FLAG + textPaint.isAntiAlias = true + reportFileView.setTextColor(Color.BLUE) + + reportFileView.setOnClickListener { + reportFileName.watchAttachFile(requireContext()) + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_certificate_basic_information + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt index 2f3c95c..b1df400 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt @@ -4,19 +4,24 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.addAll +import com.casic.xz.meterage.extensions.diffCurrentTime +import com.casic.xz.meterage.extensions.formatToDate import com.casic.xz.meterage.extensions.showEmptyPage -import com.casic.xz.meterage.model.CertificateModel +import com.casic.xz.meterage.model.CertificateListModel +import com.casic.xz.meterage.view.home.CertificateReportDetailActivity import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler import kotlinx.android.synthetic.main.fragment_certificate_report.* import kotlinx.android.synthetic.main.include_empty_view.* /** - * 计量法规 + * 证书报告 * * formId:ywglzsbg * */ @@ -24,8 +29,8 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var certificateViewModel: CertificateViewModel - private lateinit var certificateAdapter: NormalRecyclerAdapter - private var dataBeans: MutableList = ArrayList() + private lateinit var certificateAdapter: NormalRecyclerAdapter + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false @@ -119,40 +124,37 @@ } else { emptyView!!.hide() certificateAdapter = object : - NormalRecyclerAdapter( + NormalRecyclerAdapter( R.layout.item_certificate_rv_l, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, - item: CertificateModel.DataModel.RowsModel + item: CertificateListModel.DataModel.RowsModel ) { + val deltaT = item.createTime.diffCurrentTime() + val diffTime = if (deltaT < 24) { + "${deltaT}小时前" + } else { + item.createTime.formatToDate() + } + viewHolder.setText(R.id.reportNameView, item.certificateReportName) -// .setText(R.id.fileStateView, item.effectiveStatusName) -// .setText(R.id.remarkView, "备注：$remark") -// .setText(R.id.fileCodeView, "文件号：${item.fileNo}") -// .setText(R.id.releaseDateView, "实施时间：${item.publishTime}") -// -// if (!item.effectiveStatus.equals("1")) { -// viewHolder.setBackgroundColor( -// R.id.fileStateView, -// R.color.gray.convertColor(requireContext()) -// ) -// } + .setText(R.id.createTimeView, diffTime) + .setText(R.id.categoryView, "校验类别：${item.measureCategoryName}") + .setText(R.id.technicianView, "检定员：${item.measurePersonName}") + + viewHolder.setOnClickListener(R.id.showDetailButton) { + requireContext().navigatePageTo( + addAll(item.approvalStatus, item.id) + ) + } } } certificateRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) certificateRecyclerView.adapter = certificateAdapter - certificateAdapter.setOnItemClickedListener(object : - NormalRecyclerAdapter.OnItemClickedListener { - override fun onItemClicked( - position: Int, t: CertificateModel.DataModel.RowsModel - ) { -// requireContext().navigatePageTo(t.toJson()) - } - }) } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt new file mode 100644 index 0000000..2d5ac61 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.certificate + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class ExceptionReportFragment :KotlinBaseFragment(){ + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_certificate_exception_report + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/model/CertificateDetailModel.java b/app/src/main/java/com/casic/xz/meterage/model/CertificateDetailModel.java new file mode 100644 index 0000000..42efccd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/CertificateDetailModel.java @@ -0,0 +1,2080 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class CertificateDetailModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private String approvalSignId; + private String approvalStatus; + private String approvalStatusName; + private BusinessOriginalRecordModel businessOriginalRecord; + private String calibrationMajor; + private String calibrationMajorName; + private String certificateReportCategory; + private String certificateReportCode; + private String certificateReportFile; + private String certificateReportName; + private String createTime; + private String createUser; + private String expirationDate; + private String id; + private String isDel; + private String issuanceDate; + private String measureDeptId; + private String measurePersonId; + private String measureResult; + private String orderId; + private String originalRecordId; + private String printNum; + private String printStatus; + private String processId; + private String remark; + private String sampleId; + private String signId; + private String templateId; + private String updateTime; + + public String getApprovalSignId() { + return approvalSignId; + } + + public void setApprovalSignId(String approvalSignId) { + this.approvalSignId = approvalSignId; + } + + public String getApprovalStatus() { + return approvalStatus; + } + + public void setApprovalStatus(String approvalStatus) { + this.approvalStatus = approvalStatus; + } + + public String getApprovalStatusName() { + return approvalStatusName; + } + + public void setApprovalStatusName(String approvalStatusName) { + this.approvalStatusName = approvalStatusName; + } + + public BusinessOriginalRecordModel getBusinessOriginalRecord() { + return businessOriginalRecord; + } + + public void setBusinessOriginalRecord(BusinessOriginalRecordModel businessOriginalRecord) { + this.businessOriginalRecord = businessOriginalRecord; + } + + public String getCalibrationMajor() { + return calibrationMajor; + } + + public void setCalibrationMajor(String calibrationMajor) { + this.calibrationMajor = calibrationMajor; + } + + public String getCalibrationMajorName() { + return calibrationMajorName; + } + + public void setCalibrationMajorName(String calibrationMajorName) { + this.calibrationMajorName = calibrationMajorName; + } + + public String getCertificateReportCategory() { + return certificateReportCategory; + } + + public void setCertificateReportCategory(String certificateReportCategory) { + this.certificateReportCategory = certificateReportCategory; + } + + public String getCertificateReportCode() { + return certificateReportCode; + } + + public void setCertificateReportCode(String certificateReportCode) { + this.certificateReportCode = certificateReportCode; + } + + public String getCertificateReportFile() { + return certificateReportFile; + } + + public void setCertificateReportFile(String certificateReportFile) { + this.certificateReportFile = certificateReportFile; + } + + public String getCertificateReportName() { + return certificateReportName; + } + + public void setCertificateReportName(String certificateReportName) { + this.certificateReportName = certificateReportName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getExpirationDate() { + return expirationDate; + } + + public void setExpirationDate(String expirationDate) { + this.expirationDate = expirationDate; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String isIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIssuanceDate() { + return issuanceDate; + } + + public void setIssuanceDate(String issuanceDate) { + this.issuanceDate = issuanceDate; + } + + public String getMeasureDeptId() { + return measureDeptId; + } + + public void setMeasureDeptId(String measureDeptId) { + this.measureDeptId = measureDeptId; + } + + public String getMeasurePersonId() { + return measurePersonId; + } + + public void setMeasurePersonId(String measurePersonId) { + this.measurePersonId = measurePersonId; + } + + public String getMeasureResult() { + return measureResult; + } + + public void setMeasureResult(String measureResult) { + this.measureResult = measureResult; + } + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public String getOriginalRecordId() { + return originalRecordId; + } + + public void setOriginalRecordId(String originalRecordId) { + this.originalRecordId = originalRecordId; + } + + public String getPrintNum() { + return printNum; + } + + public void setPrintNum(String printNum) { + this.printNum = printNum; + } + + public String getPrintStatus() { + return printStatus; + } + + public void setPrintStatus(String printStatus) { + this.printStatus = printStatus; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSampleId() { + return sampleId; + } + + public void setSampleId(String sampleId) { + this.sampleId = sampleId; + } + + public String getSignId() { + return signId; + } + + public void setSignId(String signId) { + this.signId = signId; + } + + public String getTemplateId() { + return templateId; + } + + public void setTemplateId(String templateId) { + this.templateId = templateId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public static class BusinessOriginalRecordModel { + private BusinessEnvRecordModel businessEnvironmentRecord; + private BusinessOrderModel businessOrder; + private String calibrationPlace; + private String calibrationTime; + private String createTime; + private String createUser; + private BusinessOrderModel.CustomerSampleModel customerSampleInfo; + private String environmentId; + private List equipmentInfoList; + private List fileList; + private String id; + private String isDel; + private String measureCategory; + private String measureCategoryName; + private String orderId; + private String originalRecordCode; + private String originalRecordFile; + private String originalRecordName; + private String remark; + private String sampleId; + private String templateId; + private String templateName; + private String updateTime; + + public BusinessEnvRecordModel getBusinessEnvironmentRecord() { + return businessEnvironmentRecord; + } + + public void setBusinessEnvironmentRecord(BusinessEnvRecordModel businessEnvironmentRecord) { + this.businessEnvironmentRecord = businessEnvironmentRecord; + } + + public BusinessOrderModel getBusinessOrder() { + return businessOrder; + } + + public void setBusinessOrder(BusinessOrderModel businessOrder) { + this.businessOrder = businessOrder; + } + + public String getCalibrationPlace() { + return calibrationPlace; + } + + public void setCalibrationPlace(String calibrationPlace) { + this.calibrationPlace = calibrationPlace; + } + + public String getCalibrationTime() { + return calibrationTime; + } + + public void setCalibrationTime(String calibrationTime) { + this.calibrationTime = calibrationTime; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public BusinessOrderModel.CustomerSampleModel getCustomerSampleInfo() { + return customerSampleInfo; + } + + public void setCustomerSampleInfo(BusinessOrderModel.CustomerSampleModel customerSampleInfo) { + this.customerSampleInfo = customerSampleInfo; + } + + public String getEnvironmentId() { + return environmentId; + } + + public void setEnvironmentId(String environmentId) { + this.environmentId = environmentId; + } + + public List getEquipmentInfoList() { + return equipmentInfoList; + } + + public void setEquipmentInfoList(List equipmentInfoList) { + this.equipmentInfoList = equipmentInfoList; + } + + public List getFileList() { + return fileList; + } + + public void setFileList(List fileList) { + this.fileList = fileList; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String isIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getMeasureCategory() { + return measureCategory; + } + + public void setMeasureCategory(String measureCategory) { + this.measureCategory = measureCategory; + } + + public String getMeasureCategoryName() { + return measureCategoryName; + } + + public void setMeasureCategoryName(String measureCategoryName) { + this.measureCategoryName = measureCategoryName; + } + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public String getOriginalRecordCode() { + return originalRecordCode; + } + + public void setOriginalRecordCode(String originalRecordCode) { + this.originalRecordCode = originalRecordCode; + } + + public String getOriginalRecordFile() { + return originalRecordFile; + } + + public void setOriginalRecordFile(String originalRecordFile) { + this.originalRecordFile = originalRecordFile; + } + + public String getOriginalRecordName() { + return originalRecordName; + } + + public void setOriginalRecordName(String originalRecordName) { + this.originalRecordName = originalRecordName; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSampleId() { + return sampleId; + } + + public void setSampleId(String sampleId) { + this.sampleId = sampleId; + } + + public String getTemplateId() { + return templateId; + } + + public void setTemplateId(String templateId) { + this.templateId = templateId; + } + + public String getTemplateName() { + return templateName; + } + + public void setTemplateName(String templateName) { + this.templateName = templateName; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public static class BusinessEnvRecordModel { + private String createTime; + private String createUser; + private String environmentCode; + private String humidity; + private String id; + private String isDel; + private String outputVoltage; + private String recordTime; + private String recorder; + private String remark; + private String roomNumber; + private String temperature; + private String updateTime; + private String zeroGroundVoltage; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEnvironmentCode() { + return environmentCode; + } + + public void setEnvironmentCode(String environmentCode) { + this.environmentCode = environmentCode; + } + + public String getHumidity() { + return humidity; + } + + public void setHumidity(String humidity) { + this.humidity = humidity; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String isIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getOutputVoltage() { + return outputVoltage; + } + + public void setOutputVoltage(String outputVoltage) { + this.outputVoltage = outputVoltage; + } + + public String getRecordTime() { + return recordTime; + } + + public void setRecordTime(String recordTime) { + this.recordTime = recordTime; + } + + public String getRecorder() { + return recorder; + } + + public void setRecorder(String recorder) { + this.recorder = recorder; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getRoomNumber() { + return roomNumber; + } + + public void setRoomNumber(String roomNumber) { + this.roomNumber = roomNumber; + } + + public String getTemperature() { + return temperature; + } + + public void setTemperature(String temperature) { + this.temperature = temperature; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getZeroGroundVoltage() { + return zeroGroundVoltage; + } + + public void setZeroGroundVoltage(String zeroGroundVoltage) { + this.zeroGroundVoltage = zeroGroundVoltage; + } + } + + public static class BusinessOrderModel { + private String certifications; + private String createTime; + private String createUser; + private String customerAddress; + private String customerId; + private String customerName; + private String customerNo; + private String customerPhone; + private List customerSampleInfoList; + private String deliverTime; + private String deliverer; + private String delivererId; + private String delivererTel; + private String id; + private String isDel; + private String isUrgent; + private String minioFileName; + private String orderCode; + private String orderTime; + private String planDeliverTime; + private String remark; + private String requireOverTime; + private String status; + private String updateTime; + private String updateUser; + + public String getCertifications() { + return certifications; + } + + public void setCertifications(String certifications) { + this.certifications = certifications; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCustomerAddress() { + return customerAddress; + } + + public void setCustomerAddress(String customerAddress) { + this.customerAddress = customerAddress; + } + + public String getCustomerId() { + return customerId; + } + + public void setCustomerId(String customerId) { + this.customerId = customerId; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public String getCustomerPhone() { + return customerPhone; + } + + public void setCustomerPhone(String customerPhone) { + this.customerPhone = customerPhone; + } + + public List getCustomerSampleInfoList() { + return customerSampleInfoList; + } + + public void setCustomerSampleInfoList(List customerSampleInfoList) { + this.customerSampleInfoList = customerSampleInfoList; + } + + public String getDeliverTime() { + return deliverTime; + } + + public void setDeliverTime(String deliverTime) { + this.deliverTime = deliverTime; + } + + public String getDeliverer() { + return deliverer; + } + + public void setDeliverer(String deliverer) { + this.deliverer = deliverer; + } + + public String getDelivererId() { + return delivererId; + } + + public void setDelivererId(String delivererId) { + this.delivererId = delivererId; + } + + public String getDelivererTel() { + return delivererTel; + } + + public void setDelivererTel(String delivererTel) { + this.delivererTel = delivererTel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIsUrgent() { + return isUrgent; + } + + public void setIsUrgent(String isUrgent) { + this.isUrgent = isUrgent; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getOrderCode() { + return orderCode; + } + + public void setOrderCode(String orderCode) { + this.orderCode = orderCode; + } + + public String getOrderTime() { + return orderTime; + } + + public void setOrderTime(String orderTime) { + this.orderTime = orderTime; + } + + public String getPlanDeliverTime() { + return planDeliverTime; + } + + public void setPlanDeliverTime(String planDeliverTime) { + this.planDeliverTime = planDeliverTime; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getRequireOverTime() { + return requireOverTime; + } + + public void setRequireOverTime(String requireOverTime) { + this.requireOverTime = requireOverTime; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUpdateUser() { + return updateUser; + } + + public void setUpdateUser(String updateUser) { + this.updateUser = updateUser; + } + + public static class CustomerSampleModel { + private String abc; + private String appendix; + private String appendixDescn; + private String createTime; + private String createUser; + private String customerAddress; + private String customerId; + private String customerName; + private String customerNo; + private String deliverer; + private String delivererTel; + private String id; + private String isDel; + private String isExistSample; + private String labelBind; + private String manufacturer; + private String manufacturerCountry; + private String manufacturingDate; + private String manufacturingNo; + private String measureCategory; + private String measureCategoryName; + private String measureContent; + private String measureLastTime; + private String measurePeriod; + private String measureType; + private String measureTypeName; + private String minioFileName; + private String orderId; + private String phone; + private String postalCode; + private String powerVoltage; + private String remark; + private String sampleBelong; + private String sampleBelongName; + private String sampleModel; + private String sampleName; + private String sampleNo; + private String specialRequire; + private String updateTime; + private String updateUser; + private String validDeadline; + + public String getAbc() { + return abc; + } + + public void setAbc(String abc) { + this.abc = abc; + } + + public String getAppendix() { + return appendix; + } + + public void setAppendix(String appendix) { + this.appendix = appendix; + } + + public String getAppendixDescn() { + return appendixDescn; + } + + public void setAppendixDescn(String appendixDescn) { + this.appendixDescn = appendixDescn; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCustomerAddress() { + return customerAddress; + } + + public void setCustomerAddress(String customerAddress) { + this.customerAddress = customerAddress; + } + + public String getCustomerId() { + return customerId; + } + + public void setCustomerId(String customerId) { + this.customerId = customerId; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public String getDeliverer() { + return deliverer; + } + + public void setDeliverer(String deliverer) { + this.deliverer = deliverer; + } + + public String getDelivererTel() { + return delivererTel; + } + + public void setDelivererTel(String delivererTel) { + this.delivererTel = delivererTel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIsExistSample() { + return isExistSample; + } + + public void setIsExistSample(String isExistSample) { + this.isExistSample = isExistSample; + } + + public String getLabelBind() { + return labelBind; + } + + public void setLabelBind(String labelBind) { + this.labelBind = labelBind; + } + + public String getManufacturer() { + return manufacturer; + } + + public void setManufacturer(String manufacturer) { + this.manufacturer = manufacturer; + } + + public String getManufacturerCountry() { + return manufacturerCountry; + } + + public void setManufacturerCountry(String manufacturerCountry) { + this.manufacturerCountry = manufacturerCountry; + } + + public String getManufacturingDate() { + return manufacturingDate; + } + + public void setManufacturingDate(String manufacturingDate) { + this.manufacturingDate = manufacturingDate; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getMeasureCategory() { + return measureCategory; + } + + public void setMeasureCategory(String measureCategory) { + this.measureCategory = measureCategory; + } + + public String getMeasureCategoryName() { + return measureCategoryName; + } + + public void setMeasureCategoryName(String measureCategoryName) { + this.measureCategoryName = measureCategoryName; + } + + public String getMeasureContent() { + return measureContent; + } + + public void setMeasureContent(String measureContent) { + this.measureContent = measureContent; + } + + public String getMeasureLastTime() { + return measureLastTime; + } + + public void setMeasureLastTime(String measureLastTime) { + this.measureLastTime = measureLastTime; + } + + public String getMeasurePeriod() { + return measurePeriod; + } + + public void setMeasurePeriod(String measurePeriod) { + this.measurePeriod = measurePeriod; + } + + public String getMeasureType() { + return measureType; + } + + public void setMeasureType(String measureType) { + this.measureType = measureType; + } + + public String getMeasureTypeName() { + return measureTypeName; + } + + public void setMeasureTypeName(String measureTypeName) { + this.measureTypeName = measureTypeName; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getPostalCode() { + return postalCode; + } + + public void setPostalCode(String postalCode) { + this.postalCode = postalCode; + } + + public String getPowerVoltage() { + return powerVoltage; + } + + public void setPowerVoltage(String powerVoltage) { + this.powerVoltage = powerVoltage; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSampleBelong() { + return sampleBelong; + } + + public void setSampleBelong(String sampleBelong) { + this.sampleBelong = sampleBelong; + } + + public String getSampleBelongName() { + return sampleBelongName; + } + + public void setSampleBelongName(String sampleBelongName) { + this.sampleBelongName = sampleBelongName; + } + + public String getSampleModel() { + return sampleModel; + } + + public void setSampleModel(String sampleModel) { + this.sampleModel = sampleModel; + } + + public String getSampleName() { + return sampleName; + } + + public void setSampleName(String sampleName) { + this.sampleName = sampleName; + } + + public String getSampleNo() { + return sampleNo; + } + + public void setSampleNo(String sampleNo) { + this.sampleNo = sampleNo; + } + + public String getSpecialRequire() { + return specialRequire; + } + + public void setSpecialRequire(String specialRequire) { + this.specialRequire = specialRequire; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUpdateUser() { + return updateUser; + } + + public void setUpdateUser(String updateUser) { + this.updateUser = updateUser; + } + + public String getValidDeadline() { + return validDeadline; + } + + public void setValidDeadline(String validDeadline) { + this.validDeadline = validDeadline; + } + } + } + + public static class EquipmentModel { + private String abc; + private String abcName; + private String applyRelationId; + private String assetNo; + private String assetSource; + private String assetType; + private String assetTypeName; + private String attribute; + private String capitalSource; + private String capitalSourceName; + private String cardEstablishmentDate; + private String createTime; + private String createUser; + private String depreciationMethod; + private String depreciationMethodName; + private String depreciationPeriod; + private String enableDate; + private String equipmentCategory; + private String equipmentCategoryName; + private String equipmentName; + private String equipmentNo; + private String equipmentSpecifications; + private String equipmentType; + private String equipmentTypeName; + private String fileList; + private String id; + private String installIncidentalExpenses; + private String installPlace; + private String intactState; + private String isCalibrationTestEquipment; + private String isDel; + private String isFixedAssets; + private String isMeasureAccount; + private String isStandardSupportEquipment; + private String labelBind; + private String majorCategory; + private String majorCategoryName; + private String managerLevel; + private String managerLevelName; + private String managerState; + private String managerStateName; + private String manufacturer; + private String manufacturerCountry; + private String manufacturingDate; + private String manufacturingNo; + private String mesureCycle; + private String mesureDate; + private String mesureDept; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String mesureType; + private String mesureTypeName; + private String modelNo; + private String originValue; + private String overallDimension; + private String presentOriginValue; + private String purpose; + private String remark; + private String singlePrice; + private String supportStandardEquipmentName; + private String supportStandardEquipmentNo; + private String technicalLevel; + private String uncertainty; + private String updateTime; + private String useDept; + private String useDeptName; + private String usePerson; + private String usePersonName; + private String validDate; + private String version; + private String weight; + + public String getAbc() { + return abc; + } + + public void setAbc(String abc) { + this.abc = abc; + } + + public String getAbcName() { + return abcName; + } + + public void setAbcName(String abcName) { + this.abcName = abcName; + } + + public String getApplyRelationId() { + return applyRelationId; + } + + public void setApplyRelationId(String applyRelationId) { + this.applyRelationId = applyRelationId; + } + + public String getAssetNo() { + return assetNo; + } + + public void setAssetNo(String assetNo) { + this.assetNo = assetNo; + } + + public String getAssetSource() { + return assetSource; + } + + public void setAssetSource(String assetSource) { + this.assetSource = assetSource; + } + + public String getAssetType() { + return assetType; + } + + public void setAssetType(String assetType) { + this.assetType = assetType; + } + + public String getAssetTypeName() { + return assetTypeName; + } + + public void setAssetTypeName(String assetTypeName) { + this.assetTypeName = assetTypeName; + } + + public String getAttribute() { + return attribute; + } + + public void setAttribute(String attribute) { + this.attribute = attribute; + } + + public String getCapitalSource() { + return capitalSource; + } + + public void setCapitalSource(String capitalSource) { + this.capitalSource = capitalSource; + } + + public String getCapitalSourceName() { + return capitalSourceName; + } + + public void setCapitalSourceName(String capitalSourceName) { + this.capitalSourceName = capitalSourceName; + } + + public String getCardEstablishmentDate() { + return cardEstablishmentDate; + } + + public void setCardEstablishmentDate(String cardEstablishmentDate) { + this.cardEstablishmentDate = cardEstablishmentDate; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getDepreciationMethod() { + return depreciationMethod; + } + + public void setDepreciationMethod(String depreciationMethod) { + this.depreciationMethod = depreciationMethod; + } + + public String getDepreciationMethodName() { + return depreciationMethodName; + } + + public void setDepreciationMethodName(String depreciationMethodName) { + this.depreciationMethodName = depreciationMethodName; + } + + public String getDepreciationPeriod() { + return depreciationPeriod; + } + + public void setDepreciationPeriod(String depreciationPeriod) { + this.depreciationPeriod = depreciationPeriod; + } + + public String getEnableDate() { + return enableDate; + } + + public void setEnableDate(String enableDate) { + this.enableDate = enableDate; + } + + public String getEquipmentCategory() { + return equipmentCategory; + } + + public void setEquipmentCategory(String equipmentCategory) { + this.equipmentCategory = equipmentCategory; + } + + public String getEquipmentCategoryName() { + return equipmentCategoryName; + } + + public void setEquipmentCategoryName(String equipmentCategoryName) { + this.equipmentCategoryName = equipmentCategoryName; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getEquipmentSpecifications() { + return equipmentSpecifications; + } + + public void setEquipmentSpecifications(String equipmentSpecifications) { + this.equipmentSpecifications = equipmentSpecifications; + } + + public String getEquipmentType() { + return equipmentType; + } + + public void setEquipmentType(String equipmentType) { + this.equipmentType = equipmentType; + } + + public String getEquipmentTypeName() { + return equipmentTypeName; + } + + public void setEquipmentTypeName(String equipmentTypeName) { + this.equipmentTypeName = equipmentTypeName; + } + + public String getFileList() { + return fileList; + } + + public void setFileList(String fileList) { + this.fileList = fileList; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInstallIncidentalExpenses() { + return installIncidentalExpenses; + } + + public void setInstallIncidentalExpenses(String installIncidentalExpenses) { + this.installIncidentalExpenses = installIncidentalExpenses; + } + + public String getInstallPlace() { + return installPlace; + } + + public void setInstallPlace(String installPlace) { + this.installPlace = installPlace; + } + + public String getIntactState() { + return intactState; + } + + public void setIntactState(String intactState) { + this.intactState = intactState; + } + + public String getIsCalibrationTestEquipment() { + return isCalibrationTestEquipment; + } + + public void setIsCalibrationTestEquipment(String isCalibrationTestEquipment) { + this.isCalibrationTestEquipment = isCalibrationTestEquipment; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIsFixedAssets() { + return isFixedAssets; + } + + public void setIsFixedAssets(String isFixedAssets) { + this.isFixedAssets = isFixedAssets; + } + + public String getIsMeasureAccount() { + return isMeasureAccount; + } + + public void setIsMeasureAccount(String isMeasureAccount) { + this.isMeasureAccount = isMeasureAccount; + } + + public String getIsStandardSupportEquipment() { + return isStandardSupportEquipment; + } + + public void setIsStandardSupportEquipment(String isStandardSupportEquipment) { + this.isStandardSupportEquipment = isStandardSupportEquipment; + } + + public String getLabelBind() { + return labelBind; + } + + public void setLabelBind(String labelBind) { + this.labelBind = labelBind; + } + + public String getMajorCategory() { + return majorCategory; + } + + public void setMajorCategory(String majorCategory) { + this.majorCategory = majorCategory; + } + + public String getMajorCategoryName() { + return majorCategoryName; + } + + public void setMajorCategoryName(String majorCategoryName) { + this.majorCategoryName = majorCategoryName; + } + + public String getManagerLevel() { + return managerLevel; + } + + public void setManagerLevel(String managerLevel) { + this.managerLevel = managerLevel; + } + + public String getManagerLevelName() { + return managerLevelName; + } + + public void setManagerLevelName(String managerLevelName) { + this.managerLevelName = managerLevelName; + } + + public String getManagerState() { + return managerState; + } + + public void setManagerState(String managerState) { + this.managerState = managerState; + } + + public String getManagerStateName() { + return managerStateName; + } + + public void setManagerStateName(String managerStateName) { + this.managerStateName = managerStateName; + } + + public String getManufacturer() { + return manufacturer; + } + + public void setManufacturer(String manufacturer) { + this.manufacturer = manufacturer; + } + + public String getManufacturerCountry() { + return manufacturerCountry; + } + + public void setManufacturerCountry(String manufacturerCountry) { + this.manufacturerCountry = manufacturerCountry; + } + + public String getManufacturingDate() { + return manufacturingDate; + } + + public void setManufacturingDate(String manufacturingDate) { + this.manufacturingDate = manufacturingDate; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getMesureCycle() { + return mesureCycle; + } + + public void setMesureCycle(String mesureCycle) { + this.mesureCycle = mesureCycle; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureDept() { + return mesureDept; + } + + public void setMesureDept(String mesureDept) { + this.mesureDept = mesureDept; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getMesureType() { + return mesureType; + } + + public void setMesureType(String mesureType) { + this.mesureType = mesureType; + } + + public String getMesureTypeName() { + return mesureTypeName; + } + + public void setMesureTypeName(String mesureTypeName) { + this.mesureTypeName = mesureTypeName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getOriginValue() { + return originValue; + } + + public void setOriginValue(String originValue) { + this.originValue = originValue; + } + + public String getOverallDimension() { + return overallDimension; + } + + public void setOverallDimension(String overallDimension) { + this.overallDimension = overallDimension; + } + + public String getPresentOriginValue() { + return presentOriginValue; + } + + public void setPresentOriginValue(String presentOriginValue) { + this.presentOriginValue = presentOriginValue; + } + + public String getPurpose() { + return purpose; + } + + public void setPurpose(String purpose) { + this.purpose = purpose; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSinglePrice() { + return singlePrice; + } + + public void setSinglePrice(String singlePrice) { + this.singlePrice = singlePrice; + } + + public String getSupportStandardEquipmentName() { + return supportStandardEquipmentName; + } + + public void setSupportStandardEquipmentName(String supportStandardEquipmentName) { + this.supportStandardEquipmentName = supportStandardEquipmentName; + } + + public String getSupportStandardEquipmentNo() { + return supportStandardEquipmentNo; + } + + public void setSupportStandardEquipmentNo(String supportStandardEquipmentNo) { + this.supportStandardEquipmentNo = supportStandardEquipmentNo; + } + + public String getTechnicalLevel() { + return technicalLevel; + } + + public void setTechnicalLevel(String technicalLevel) { + this.technicalLevel = technicalLevel; + } + + public String getUncertainty() { + return uncertainty; + } + + public void setUncertainty(String uncertainty) { + this.uncertainty = uncertainty; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDept() { + return useDept; + } + + public void setUseDept(String useDept) { + this.useDept = useDept; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getUsePerson() { + return usePerson; + } + + public void setUsePerson(String usePerson) { + this.usePerson = usePerson; + } + + public String getUsePersonName() { + return usePersonName; + } + + public void setUsePersonName(String usePersonName) { + this.usePersonName = usePersonName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + + public String getVersion() { + return version; + } + + public void setVersion(String version) { + this.version = version; + } + + public String getWeight() { + return weight; + } + + public void setWeight(String weight) { + this.weight = weight; + } + } + + public static class FileModel { + private String approvalStatus; + private String approvalStatusName; + private String createTime; + private String createUser; + private String createUserId; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String fileType; + private String fileTypeName; + private String id; + private String isDel; + private String minioFileName; + private String processId; + private String publishTime; + private String publisher; + private String remark; + private String updateTime; + + public String getApprovalStatus() { + return approvalStatus; + } + + public void setApprovalStatus(String approvalStatus) { + this.approvalStatus = approvalStatus; + } + + public String getApprovalStatusName() { + return approvalStatusName; + } + + public void setApprovalStatusName(String approvalStatusName) { + this.approvalStatusName = approvalStatusName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCreateUserId() { + return createUserId; + } + + public void setCreateUserId(String createUserId) { + this.createUserId = createUserId; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getFileType() { + return fileType; + } + + public void setFileType(String fileType) { + this.fileType = fileType; + } + + public String getFileTypeName() { + return fileTypeName; + } + + public void setFileTypeName(String fileTypeName) { + this.fileTypeName = fileTypeName; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getPublishTime() { + return publishTime; + } + + public void setPublishTime(String publishTime) { + this.publishTime = publishTime; + } + + public String getPublisher() { + return publisher; + } + + public void setPublisher(String publisher) { + this.publisher = publisher; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/CertificateListModel.java b/app/src/main/java/com/casic/xz/meterage/model/CertificateListModel.java new file mode 100644 index 0000000..0eed915 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/CertificateListModel.java @@ -0,0 +1,229 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class CertificateListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String approvalStatus; + private String approvalStatusName; + private String calibrationMajor; + private String certificateReportCode; + private String certificateReportName; + private String createTime; + private String decisionItem; + private String id; + private String manufacturingNo; + private String measureCategory; + private String measureCategoryName; + private String measurePersonId; + private String measurePersonName; + private String orderCode; + private String processId; + private String sampleModel; + private String sampleName; + private String sampleNo; + private String taskId; + + public String getApprovalStatus() { + return approvalStatus; + } + + public void setApprovalStatus(String approvalStatus) { + this.approvalStatus = approvalStatus; + } + + public String getApprovalStatusName() { + return approvalStatusName; + } + + public void setApprovalStatusName(String approvalStatusName) { + this.approvalStatusName = approvalStatusName; + } + + public String getCalibrationMajor() { + return calibrationMajor; + } + + public void setCalibrationMajor(String calibrationMajor) { + this.calibrationMajor = calibrationMajor; + } + + public String getCertificateReportCode() { + return certificateReportCode; + } + + public void setCertificateReportCode(String certificateReportCode) { + this.certificateReportCode = certificateReportCode; + } + + public String getCertificateReportName() { + return certificateReportName; + } + + public void setCertificateReportName(String certificateReportName) { + this.certificateReportName = certificateReportName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getDecisionItem() { + return decisionItem; + } + + public void setDecisionItem(String decisionItem) { + this.decisionItem = decisionItem; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getMeasureCategory() { + return measureCategory; + } + + public void setMeasureCategory(String measureCategory) { + this.measureCategory = measureCategory; + } + + public String getMeasureCategoryName() { + return measureCategoryName; + } + + public void setMeasureCategoryName(String measureCategoryName) { + this.measureCategoryName = measureCategoryName; + } + + public String getMeasurePersonId() { + return measurePersonId; + } + + public void setMeasurePersonId(String measurePersonId) { + this.measurePersonId = measurePersonId; + } + + public String getMeasurePersonName() { + return measurePersonName; + } + + public void setMeasurePersonName(String measurePersonName) { + this.measurePersonName = measurePersonName; + } + + public String getOrderCode() { + return orderCode; + } + + public void setOrderCode(String orderCode) { + this.orderCode = orderCode; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getSampleModel() { + return sampleModel; + } + + public void setSampleModel(String sampleModel) { + this.sampleModel = sampleModel; + } + + public String getSampleName() { + return sampleName; + } + + public void setSampleName(String sampleName) { + this.sampleName = sampleName; + } + + public String getSampleNo() { + return sampleNo; + } + + public void setSampleNo(String sampleNo) { + this.sampleNo = sampleNo; + } + + public String getTaskId() { + return taskId; + } + + public void setTaskId(String taskId) { + this.taskId = taskId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/CertificateModel.java b/app/src/main/java/com/casic/xz/meterage/model/CertificateModel.java deleted file mode 100644 index ec0d25b..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/CertificateModel.java +++ /dev/null @@ -1,202 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class CertificateModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String approvalStatus; - private String approvalStatusName; - private String calibrationMajor; - private String certificateReportCode; - private String certificateReportName; - private String createTime; - private String decisionItem; - private String id; - private String manufacturingNo; - private String measurePersonId; - private String orderCode; - private String processId; - private String sampleModel; - private String sampleName; - private String sampleNo; - private String taskId; - - public String getApprovalStatus() { - return approvalStatus; - } - - public void setApprovalStatus(String approvalStatus) { - this.approvalStatus = approvalStatus; - } - - public String getApprovalStatusName() { - return approvalStatusName; - } - - public void setApprovalStatusName(String approvalStatusName) { - this.approvalStatusName = approvalStatusName; - } - - public String getCalibrationMajor() { - return calibrationMajor; - } - - public void setCalibrationMajor(String calibrationMajor) { - this.calibrationMajor = calibrationMajor; - } - - public String getCertificateReportCode() { - return certificateReportCode; - } - - public void setCertificateReportCode(String certificateReportCode) { - this.certificateReportCode = certificateReportCode; - } - - public String getCertificateReportName() { - return certificateReportName; - } - - public void setCertificateReportName(String certificateReportName) { - this.certificateReportName = certificateReportName; - } - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getDecisionItem() { - return decisionItem; - } - - public void setDecisionItem(String decisionItem) { - this.decisionItem = decisionItem; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getManufacturingNo() { - return manufacturingNo; - } - - public void setManufacturingNo(String manufacturingNo) { - this.manufacturingNo = manufacturingNo; - } - - public String getMeasurePersonId() { - return measurePersonId; - } - - public void setMeasurePersonId(String measurePersonId) { - this.measurePersonId = measurePersonId; - } - - public String getOrderCode() { - return orderCode; - } - - public void setOrderCode(String orderCode) { - this.orderCode = orderCode; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public String getSampleModel() { - return sampleModel; - } - - public void setSampleModel(String sampleModel) { - this.sampleModel = sampleModel; - } - - public String getSampleName() { - return sampleName; - } - - public void setSampleName(String sampleName) { - this.sampleName = sampleName; - } - - public String getSampleNo() { - return sampleNo; - } - - public void setSampleNo(String sampleNo) { - this.sampleNo = sampleNo; - } - - public String getTaskId() { - return taskId; - } - - public void setTaskId(String taskId) { - this.taskId = taskId; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index b0dec00..a4f3c46 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -345,4 +345,22 @@ @QueryMap limit: Map, @QueryMap offset: Map ): String + + /** + * 获取委托书详情 + */ + @POST("/business/certificateReport/detail") + suspend fun getCertificateReportDetail( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 提交证书 + */ + @POST("/business/certificateReport/submit") + suspend fun submit( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String } \ 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 cef55ec..8bf4070 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 @@ -800,4 +800,29 @@ AuthenticationHelper.token!!, requestBody, limitMap, offsetMap ) } + + /** + * 获取证书报告详情 + */ + suspend fun getCertificateReportDetail(id: String): String { + val param = JsonObject() + param.addProperty("id", id) + val requestBody = param.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getCertificateReportDetail(AuthenticationHelper.token!!, requestBody) + } + + /** + * 提交证书报告 + */ + suspend fun submit(id: String): String { + val param = JsonObject() + param.addProperty("formId", "ywglzsbg") + param.addProperty("id", id) + val requestBody = param.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.submit(AuthenticationHelper.token!!, requestBody) + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportActivity.kt index 2baefd2..fa4e129 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportActivity.kt @@ -19,15 +19,21 @@ "已通过", "未通过", "已取消", - "非草稿", - "未通过", "可打印" ) private var fragmentPages: ArrayList = ArrayList() init { - pageTitles.indices.forEach { - fragmentPages.add(CertificateReportFragment((it + 1).toString())) + pageTitles.forEach { + when (it) { + "草稿箱" -> fragmentPages.add(CertificateReportFragment("1")) + "待审批" -> fragmentPages.add(CertificateReportFragment("2")) + "审批中" -> fragmentPages.add(CertificateReportFragment("3")) + "已通过" -> fragmentPages.add(CertificateReportFragment("4")) + "未通过" -> fragmentPages.add(CertificateReportFragment("5")) + "已取消" -> fragmentPages.add(CertificateReportFragment("6")) + "可打印" -> fragmentPages.add(CertificateReportFragment("9")) + } } } diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt new file mode 100644 index 0000000..e30c7c3 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt @@ -0,0 +1,106 @@ +package com.casic.xz.meterage.view.home + +import android.view.View +import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.SubViewPagerAdapter +import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.casic.xz.meterage.fragment.certificate.ApprovalProcessFragment +import com.casic.xz.meterage.fragment.certificate.BasicInformationFragment +import com.casic.xz.meterage.fragment.certificate.ExceptionReportFragment +import com.casic.xz.meterage.model.CertificateDetailModel +import com.casic.xz.meterage.utils.LoadingDialogHub +import com.casic.xz.meterage.vm.CertificateViewModel +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.vm.LoadState +import kotlinx.android.synthetic.main.activity_certificate_detail.* + +//"草稿箱" -> "1" +//"待审批" -> "2" +//"审批中" -> "3" +//"已通过" -> "4" +//"未通过" -> "5" +//"已取消" -> "6" +//"可打印" -> "9" + +class CertificateReportDetailActivity : KotlinBaseActivity() { + + private var fragmentPages: ArrayList = ArrayList() + private lateinit var certificateViewModel: CertificateViewModel + private lateinit var detailModel: CertificateDetailModel.DataModel + + override fun initData() { + val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! + + when (args[0]) { + "1" -> { + approvalView.text = "提交" + } + "2" -> { + approvalView.text = "审批" + } + "9" -> { + approvalView.text = "打印" + } + else -> { + approvalView.visibility = View.GONE + } + } + + certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] + certificateViewModel.getCertificateReportDetail(args[1]) + certificateViewModel.certificateDetail.observe(this) { + if (it.code == 200) { + + detailModel = it.data + + fragmentPages.add(BasicInformationFragment(detailModel)) + fragmentPages.add(ApprovalProcessFragment()) + fragmentPages.add(ExceptionReportFragment()) + + val pageTitles = arrayOf("基础信息", "审批流程", "异常报告") + + approvalViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, pageTitles + ) + //绑定 + topTabLayout.setupWithViewPager(approvalViewPager) + } + } + + certificateViewModel.submitResult.observe(this) { + if (it.code == 200) { + "提交成功".show(this) + finish() + } + } + } + + override fun initEvent() { + leftBackView.setOnClickListener { finish() } + + approvalView.setOnClickListener { + certificateViewModel.submit(detailModel.id) + } + } + + override fun initLayoutView(): Int = R.layout.activity_certificate_detail + + override fun observeRequestState() { + certificateViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt index 080c380..77fe8a5 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt @@ -129,6 +129,5 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() initLayoutImmersionBar(rootView) - titleView.text = "委托需求" } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt index 735e530..e088887 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt @@ -4,7 +4,9 @@ import com.casic.xz.meterage.base.BaseApplication import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage -import com.casic.xz.meterage.model.CertificateModel +import com.casic.xz.meterage.model.ActionResultModel +import com.casic.xz.meterage.model.CertificateDetailModel +import com.casic.xz.meterage.model.CertificateListModel import com.casic.xz.meterage.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -19,7 +21,9 @@ class CertificateViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val certificateList = MutableLiveData() + val certificateList = MutableLiveData() + val certificateDetail = MutableLiveData() + val submitResult = MutableLiveData() fun getCertificateReportList( approvalStatus: String, @@ -47,8 +51,46 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - certificateList.value = gson.fromJson( - response, object : TypeToken() {}.type + certificateList.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + + fun getCertificateReportDetail(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.getCertificateReportDetail(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + certificateDetail.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + + fun submit(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.submit(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + submitResult.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { loadState.value = LoadState.Fail diff --git a/app/src/main/res/layout/activity_capability_detail.xml b/app/src/main/res/layout/activity_capability_detail.xml index 585960a..375d861 100644 --- a/app/src/main/res/layout/activity_capability_detail.xml +++ b/app/src/main/res/layout/activity_capability_detail.xml @@ -21,7 +21,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:padding="@dimen/dp_10"> + android:paddingHorizontal="@dimen/dp_10"> diff --git a/app/src/main/res/layout/activity_certificate_detail.xml b/app/src/main/res/layout/activity_certificate_detail.xml new file mode 100644 index 0000000..5bb3649 --- /dev/null +++ b/app/src/main/res/layout/activity_certificate_detail.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_standard_file_detail.xml b/app/src/main/res/layout/activity_standard_file_detail.xml index 7776230..02efb08 100644 --- a/app/src/main/res/layout/activity_standard_file_detail.xml +++ b/app/src/main/res/layout/activity_standard_file_detail.xml @@ -21,7 +21,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:padding="@dimen/dp_10"> + android:paddingHorizontal="@dimen/dp_10"> diff --git a/app/src/main/res/layout/fragment_certificate_approval_process.xml b/app/src/main/res/layout/fragment_certificate_approval_process.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/fragment_certificate_approval_process.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_certificate_basic_information.xml b/app/src/main/res/layout/fragment_certificate_basic_information.xml new file mode 100644 index 0000000..91882c7 --- /dev/null +++ b/app/src/main/res/layout/fragment_certificate_basic_information.xml @@ -0,0 +1,296 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 5ba44f0..298f687 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -53,7 +53,8 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "XZJL_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" +// outputFileName = "XZJL_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "XZJL_" + getBuildDate() + "_Beta.apk" } } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4b914b5..ebea092 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -67,6 +67,7 @@ + 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 new file mode 100644 index 0000000..a75e566 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.certificate + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class ApprovalProcessFragment :KotlinBaseFragment(){ + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_certificate_approval_process + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt new file mode 100644 index 0000000..5882c3d --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt @@ -0,0 +1,77 @@ +package com.casic.xz.meterage.fragment.certificate + +import android.graphics.Color +import android.graphics.Paint +import android.util.Log +import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.watchAttachFile +import com.casic.xz.meterage.model.CertificateDetailModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.pengxh.kt.lite.extensions.toJson +import kotlinx.android.synthetic.main.fragment_certificate_basic_information.* + +class BasicInformationFragment(private val data: CertificateDetailModel.DataModel) : + KotlinBaseFragment() { + + override fun initData() { + val businessOriginal = data.businessOriginalRecord + + reportCodeView.text = data.certificateReportCode + originalCodeView.text = businessOriginal.originalRecordCode + checkCategoryView.text = businessOriginal.measureCategoryName + + Log.d( + "Casic", + "BasicInformationFragment => initData: ${businessOriginal.fileList.toJson()}" + ) +// basisFileView.text = businessOriginal.fileList + + val sampleInfo = businessOriginal.customerSampleInfo + sampleCodeView.text = sampleInfo.sampleNo + sampleNameView.text = sampleInfo.sampleName + manufacturingCodeView.text = sampleInfo.manufacturingNo + modelView.text = sampleInfo.sampleModel + entrustCodeView.text = sampleInfo.customerNo + entrustNameView.text = sampleInfo.customerName + entrustContactView.text = sampleInfo.phone + entrustEmailView.text = sampleInfo.postalCode + entrustAddressView.text = sampleInfo.customerAddress + senderView.text = sampleInfo.deliverer + senderContactView.text = sampleInfo.delivererTel + checkTypeView.text = sampleInfo.measureContent + remarkView.text = sampleInfo.remark + + estimateServedTimeView.text = businessOriginal.businessOrder.planDeliverTime + estimateCompleteTimeView.text = businessOriginal.businessOrder.requireOverTime + + if (data.certificateReportFile.isNullOrBlank()) { + reportFileView.text = "暂无附件" + } else { + val reportFileName = data.certificateReportFile + + reportFileView.text = reportFileName + val textPaint = reportFileView.paint + textPaint.flags = Paint.UNDERLINE_TEXT_FLAG + textPaint.isAntiAlias = true + reportFileView.setTextColor(Color.BLUE) + + reportFileView.setOnClickListener { + reportFileName.watchAttachFile(requireContext()) + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_certificate_basic_information + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt index 2f3c95c..b1df400 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt @@ -4,19 +4,24 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.addAll +import com.casic.xz.meterage.extensions.diffCurrentTime +import com.casic.xz.meterage.extensions.formatToDate import com.casic.xz.meterage.extensions.showEmptyPage -import com.casic.xz.meterage.model.CertificateModel +import com.casic.xz.meterage.model.CertificateListModel +import com.casic.xz.meterage.view.home.CertificateReportDetailActivity import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler import kotlinx.android.synthetic.main.fragment_certificate_report.* import kotlinx.android.synthetic.main.include_empty_view.* /** - * 计量法规 + * 证书报告 * * formId:ywglzsbg * */ @@ -24,8 +29,8 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var certificateViewModel: CertificateViewModel - private lateinit var certificateAdapter: NormalRecyclerAdapter - private var dataBeans: MutableList = ArrayList() + private lateinit var certificateAdapter: NormalRecyclerAdapter + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false @@ -119,40 +124,37 @@ } else { emptyView!!.hide() certificateAdapter = object : - NormalRecyclerAdapter( + NormalRecyclerAdapter( R.layout.item_certificate_rv_l, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, - item: CertificateModel.DataModel.RowsModel + item: CertificateListModel.DataModel.RowsModel ) { + val deltaT = item.createTime.diffCurrentTime() + val diffTime = if (deltaT < 24) { + "${deltaT}小时前" + } else { + item.createTime.formatToDate() + } + viewHolder.setText(R.id.reportNameView, item.certificateReportName) -// .setText(R.id.fileStateView, item.effectiveStatusName) -// .setText(R.id.remarkView, "备注：$remark") -// .setText(R.id.fileCodeView, "文件号：${item.fileNo}") -// .setText(R.id.releaseDateView, "实施时间：${item.publishTime}") -// -// if (!item.effectiveStatus.equals("1")) { -// viewHolder.setBackgroundColor( -// R.id.fileStateView, -// R.color.gray.convertColor(requireContext()) -// ) -// } + .setText(R.id.createTimeView, diffTime) + .setText(R.id.categoryView, "校验类别：${item.measureCategoryName}") + .setText(R.id.technicianView, "检定员：${item.measurePersonName}") + + viewHolder.setOnClickListener(R.id.showDetailButton) { + requireContext().navigatePageTo( + addAll(item.approvalStatus, item.id) + ) + } } } certificateRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) certificateRecyclerView.adapter = certificateAdapter - certificateAdapter.setOnItemClickedListener(object : - NormalRecyclerAdapter.OnItemClickedListener { - override fun onItemClicked( - position: Int, t: CertificateModel.DataModel.RowsModel - ) { -// requireContext().navigatePageTo(t.toJson()) - } - }) } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt new file mode 100644 index 0000000..2d5ac61 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.certificate + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class ExceptionReportFragment :KotlinBaseFragment(){ + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_certificate_exception_report + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/model/CertificateDetailModel.java b/app/src/main/java/com/casic/xz/meterage/model/CertificateDetailModel.java new file mode 100644 index 0000000..42efccd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/CertificateDetailModel.java @@ -0,0 +1,2080 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class CertificateDetailModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private String approvalSignId; + private String approvalStatus; + private String approvalStatusName; + private BusinessOriginalRecordModel businessOriginalRecord; + private String calibrationMajor; + private String calibrationMajorName; + private String certificateReportCategory; + private String certificateReportCode; + private String certificateReportFile; + private String certificateReportName; + private String createTime; + private String createUser; + private String expirationDate; + private String id; + private String isDel; + private String issuanceDate; + private String measureDeptId; + private String measurePersonId; + private String measureResult; + private String orderId; + private String originalRecordId; + private String printNum; + private String printStatus; + private String processId; + private String remark; + private String sampleId; + private String signId; + private String templateId; + private String updateTime; + + public String getApprovalSignId() { + return approvalSignId; + } + + public void setApprovalSignId(String approvalSignId) { + this.approvalSignId = approvalSignId; + } + + public String getApprovalStatus() { + return approvalStatus; + } + + public void setApprovalStatus(String approvalStatus) { + this.approvalStatus = approvalStatus; + } + + public String getApprovalStatusName() { + return approvalStatusName; + } + + public void setApprovalStatusName(String approvalStatusName) { + this.approvalStatusName = approvalStatusName; + } + + public BusinessOriginalRecordModel getBusinessOriginalRecord() { + return businessOriginalRecord; + } + + public void setBusinessOriginalRecord(BusinessOriginalRecordModel businessOriginalRecord) { + this.businessOriginalRecord = businessOriginalRecord; + } + + public String getCalibrationMajor() { + return calibrationMajor; + } + + public void setCalibrationMajor(String calibrationMajor) { + this.calibrationMajor = calibrationMajor; + } + + public String getCalibrationMajorName() { + return calibrationMajorName; + } + + public void setCalibrationMajorName(String calibrationMajorName) { + this.calibrationMajorName = calibrationMajorName; + } + + public String getCertificateReportCategory() { + return certificateReportCategory; + } + + public void setCertificateReportCategory(String certificateReportCategory) { + this.certificateReportCategory = certificateReportCategory; + } + + public String getCertificateReportCode() { + return certificateReportCode; + } + + public void setCertificateReportCode(String certificateReportCode) { + this.certificateReportCode = certificateReportCode; + } + + public String getCertificateReportFile() { + return certificateReportFile; + } + + public void setCertificateReportFile(String certificateReportFile) { + this.certificateReportFile = certificateReportFile; + } + + public String getCertificateReportName() { + return certificateReportName; + } + + public void setCertificateReportName(String certificateReportName) { + this.certificateReportName = certificateReportName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getExpirationDate() { + return expirationDate; + } + + public void setExpirationDate(String expirationDate) { + this.expirationDate = expirationDate; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String isIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIssuanceDate() { + return issuanceDate; + } + + public void setIssuanceDate(String issuanceDate) { + this.issuanceDate = issuanceDate; + } + + public String getMeasureDeptId() { + return measureDeptId; + } + + public void setMeasureDeptId(String measureDeptId) { + this.measureDeptId = measureDeptId; + } + + public String getMeasurePersonId() { + return measurePersonId; + } + + public void setMeasurePersonId(String measurePersonId) { + this.measurePersonId = measurePersonId; + } + + public String getMeasureResult() { + return measureResult; + } + + public void setMeasureResult(String measureResult) { + this.measureResult = measureResult; + } + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public String getOriginalRecordId() { + return originalRecordId; + } + + public void setOriginalRecordId(String originalRecordId) { + this.originalRecordId = originalRecordId; + } + + public String getPrintNum() { + return printNum; + } + + public void setPrintNum(String printNum) { + this.printNum = printNum; + } + + public String getPrintStatus() { + return printStatus; + } + + public void setPrintStatus(String printStatus) { + this.printStatus = printStatus; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSampleId() { + return sampleId; + } + + public void setSampleId(String sampleId) { + this.sampleId = sampleId; + } + + public String getSignId() { + return signId; + } + + public void setSignId(String signId) { + this.signId = signId; + } + + public String getTemplateId() { + return templateId; + } + + public void setTemplateId(String templateId) { + this.templateId = templateId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public static class BusinessOriginalRecordModel { + private BusinessEnvRecordModel businessEnvironmentRecord; + private BusinessOrderModel businessOrder; + private String calibrationPlace; + private String calibrationTime; + private String createTime; + private String createUser; + private BusinessOrderModel.CustomerSampleModel customerSampleInfo; + private String environmentId; + private List equipmentInfoList; + private List fileList; + private String id; + private String isDel; + private String measureCategory; + private String measureCategoryName; + private String orderId; + private String originalRecordCode; + private String originalRecordFile; + private String originalRecordName; + private String remark; + private String sampleId; + private String templateId; + private String templateName; + private String updateTime; + + public BusinessEnvRecordModel getBusinessEnvironmentRecord() { + return businessEnvironmentRecord; + } + + public void setBusinessEnvironmentRecord(BusinessEnvRecordModel businessEnvironmentRecord) { + this.businessEnvironmentRecord = businessEnvironmentRecord; + } + + public BusinessOrderModel getBusinessOrder() { + return businessOrder; + } + + public void setBusinessOrder(BusinessOrderModel businessOrder) { + this.businessOrder = businessOrder; + } + + public String getCalibrationPlace() { + return calibrationPlace; + } + + public void setCalibrationPlace(String calibrationPlace) { + this.calibrationPlace = calibrationPlace; + } + + public String getCalibrationTime() { + return calibrationTime; + } + + public void setCalibrationTime(String calibrationTime) { + this.calibrationTime = calibrationTime; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public BusinessOrderModel.CustomerSampleModel getCustomerSampleInfo() { + return customerSampleInfo; + } + + public void setCustomerSampleInfo(BusinessOrderModel.CustomerSampleModel customerSampleInfo) { + this.customerSampleInfo = customerSampleInfo; + } + + public String getEnvironmentId() { + return environmentId; + } + + public void setEnvironmentId(String environmentId) { + this.environmentId = environmentId; + } + + public List getEquipmentInfoList() { + return equipmentInfoList; + } + + public void setEquipmentInfoList(List equipmentInfoList) { + this.equipmentInfoList = equipmentInfoList; + } + + public List getFileList() { + return fileList; + } + + public void setFileList(List fileList) { + this.fileList = fileList; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String isIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getMeasureCategory() { + return measureCategory; + } + + public void setMeasureCategory(String measureCategory) { + this.measureCategory = measureCategory; + } + + public String getMeasureCategoryName() { + return measureCategoryName; + } + + public void setMeasureCategoryName(String measureCategoryName) { + this.measureCategoryName = measureCategoryName; + } + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public String getOriginalRecordCode() { + return originalRecordCode; + } + + public void setOriginalRecordCode(String originalRecordCode) { + this.originalRecordCode = originalRecordCode; + } + + public String getOriginalRecordFile() { + return originalRecordFile; + } + + public void setOriginalRecordFile(String originalRecordFile) { + this.originalRecordFile = originalRecordFile; + } + + public String getOriginalRecordName() { + return originalRecordName; + } + + public void setOriginalRecordName(String originalRecordName) { + this.originalRecordName = originalRecordName; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSampleId() { + return sampleId; + } + + public void setSampleId(String sampleId) { + this.sampleId = sampleId; + } + + public String getTemplateId() { + return templateId; + } + + public void setTemplateId(String templateId) { + this.templateId = templateId; + } + + public String getTemplateName() { + return templateName; + } + + public void setTemplateName(String templateName) { + this.templateName = templateName; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public static class BusinessEnvRecordModel { + private String createTime; + private String createUser; + private String environmentCode; + private String humidity; + private String id; + private String isDel; + private String outputVoltage; + private String recordTime; + private String recorder; + private String remark; + private String roomNumber; + private String temperature; + private String updateTime; + private String zeroGroundVoltage; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEnvironmentCode() { + return environmentCode; + } + + public void setEnvironmentCode(String environmentCode) { + this.environmentCode = environmentCode; + } + + public String getHumidity() { + return humidity; + } + + public void setHumidity(String humidity) { + this.humidity = humidity; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String isIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getOutputVoltage() { + return outputVoltage; + } + + public void setOutputVoltage(String outputVoltage) { + this.outputVoltage = outputVoltage; + } + + public String getRecordTime() { + return recordTime; + } + + public void setRecordTime(String recordTime) { + this.recordTime = recordTime; + } + + public String getRecorder() { + return recorder; + } + + public void setRecorder(String recorder) { + this.recorder = recorder; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getRoomNumber() { + return roomNumber; + } + + public void setRoomNumber(String roomNumber) { + this.roomNumber = roomNumber; + } + + public String getTemperature() { + return temperature; + } + + public void setTemperature(String temperature) { + this.temperature = temperature; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getZeroGroundVoltage() { + return zeroGroundVoltage; + } + + public void setZeroGroundVoltage(String zeroGroundVoltage) { + this.zeroGroundVoltage = zeroGroundVoltage; + } + } + + public static class BusinessOrderModel { + private String certifications; + private String createTime; + private String createUser; + private String customerAddress; + private String customerId; + private String customerName; + private String customerNo; + private String customerPhone; + private List customerSampleInfoList; + private String deliverTime; + private String deliverer; + private String delivererId; + private String delivererTel; + private String id; + private String isDel; + private String isUrgent; + private String minioFileName; + private String orderCode; + private String orderTime; + private String planDeliverTime; + private String remark; + private String requireOverTime; + private String status; + private String updateTime; + private String updateUser; + + public String getCertifications() { + return certifications; + } + + public void setCertifications(String certifications) { + this.certifications = certifications; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCustomerAddress() { + return customerAddress; + } + + public void setCustomerAddress(String customerAddress) { + this.customerAddress = customerAddress; + } + + public String getCustomerId() { + return customerId; + } + + public void setCustomerId(String customerId) { + this.customerId = customerId; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public String getCustomerPhone() { + return customerPhone; + } + + public void setCustomerPhone(String customerPhone) { + this.customerPhone = customerPhone; + } + + public List getCustomerSampleInfoList() { + return customerSampleInfoList; + } + + public void setCustomerSampleInfoList(List customerSampleInfoList) { + this.customerSampleInfoList = customerSampleInfoList; + } + + public String getDeliverTime() { + return deliverTime; + } + + public void setDeliverTime(String deliverTime) { + this.deliverTime = deliverTime; + } + + public String getDeliverer() { + return deliverer; + } + + public void setDeliverer(String deliverer) { + this.deliverer = deliverer; + } + + public String getDelivererId() { + return delivererId; + } + + public void setDelivererId(String delivererId) { + this.delivererId = delivererId; + } + + public String getDelivererTel() { + return delivererTel; + } + + public void setDelivererTel(String delivererTel) { + this.delivererTel = delivererTel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIsUrgent() { + return isUrgent; + } + + public void setIsUrgent(String isUrgent) { + this.isUrgent = isUrgent; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getOrderCode() { + return orderCode; + } + + public void setOrderCode(String orderCode) { + this.orderCode = orderCode; + } + + public String getOrderTime() { + return orderTime; + } + + public void setOrderTime(String orderTime) { + this.orderTime = orderTime; + } + + public String getPlanDeliverTime() { + return planDeliverTime; + } + + public void setPlanDeliverTime(String planDeliverTime) { + this.planDeliverTime = planDeliverTime; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getRequireOverTime() { + return requireOverTime; + } + + public void setRequireOverTime(String requireOverTime) { + this.requireOverTime = requireOverTime; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUpdateUser() { + return updateUser; + } + + public void setUpdateUser(String updateUser) { + this.updateUser = updateUser; + } + + public static class CustomerSampleModel { + private String abc; + private String appendix; + private String appendixDescn; + private String createTime; + private String createUser; + private String customerAddress; + private String customerId; + private String customerName; + private String customerNo; + private String deliverer; + private String delivererTel; + private String id; + private String isDel; + private String isExistSample; + private String labelBind; + private String manufacturer; + private String manufacturerCountry; + private String manufacturingDate; + private String manufacturingNo; + private String measureCategory; + private String measureCategoryName; + private String measureContent; + private String measureLastTime; + private String measurePeriod; + private String measureType; + private String measureTypeName; + private String minioFileName; + private String orderId; + private String phone; + private String postalCode; + private String powerVoltage; + private String remark; + private String sampleBelong; + private String sampleBelongName; + private String sampleModel; + private String sampleName; + private String sampleNo; + private String specialRequire; + private String updateTime; + private String updateUser; + private String validDeadline; + + public String getAbc() { + return abc; + } + + public void setAbc(String abc) { + this.abc = abc; + } + + public String getAppendix() { + return appendix; + } + + public void setAppendix(String appendix) { + this.appendix = appendix; + } + + public String getAppendixDescn() { + return appendixDescn; + } + + public void setAppendixDescn(String appendixDescn) { + this.appendixDescn = appendixDescn; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCustomerAddress() { + return customerAddress; + } + + public void setCustomerAddress(String customerAddress) { + this.customerAddress = customerAddress; + } + + public String getCustomerId() { + return customerId; + } + + public void setCustomerId(String customerId) { + this.customerId = customerId; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public String getDeliverer() { + return deliverer; + } + + public void setDeliverer(String deliverer) { + this.deliverer = deliverer; + } + + public String getDelivererTel() { + return delivererTel; + } + + public void setDelivererTel(String delivererTel) { + this.delivererTel = delivererTel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIsExistSample() { + return isExistSample; + } + + public void setIsExistSample(String isExistSample) { + this.isExistSample = isExistSample; + } + + public String getLabelBind() { + return labelBind; + } + + public void setLabelBind(String labelBind) { + this.labelBind = labelBind; + } + + public String getManufacturer() { + return manufacturer; + } + + public void setManufacturer(String manufacturer) { + this.manufacturer = manufacturer; + } + + public String getManufacturerCountry() { + return manufacturerCountry; + } + + public void setManufacturerCountry(String manufacturerCountry) { + this.manufacturerCountry = manufacturerCountry; + } + + public String getManufacturingDate() { + return manufacturingDate; + } + + public void setManufacturingDate(String manufacturingDate) { + this.manufacturingDate = manufacturingDate; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getMeasureCategory() { + return measureCategory; + } + + public void setMeasureCategory(String measureCategory) { + this.measureCategory = measureCategory; + } + + public String getMeasureCategoryName() { + return measureCategoryName; + } + + public void setMeasureCategoryName(String measureCategoryName) { + this.measureCategoryName = measureCategoryName; + } + + public String getMeasureContent() { + return measureContent; + } + + public void setMeasureContent(String measureContent) { + this.measureContent = measureContent; + } + + public String getMeasureLastTime() { + return measureLastTime; + } + + public void setMeasureLastTime(String measureLastTime) { + this.measureLastTime = measureLastTime; + } + + public String getMeasurePeriod() { + return measurePeriod; + } + + public void setMeasurePeriod(String measurePeriod) { + this.measurePeriod = measurePeriod; + } + + public String getMeasureType() { + return measureType; + } + + public void setMeasureType(String measureType) { + this.measureType = measureType; + } + + public String getMeasureTypeName() { + return measureTypeName; + } + + public void setMeasureTypeName(String measureTypeName) { + this.measureTypeName = measureTypeName; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getPostalCode() { + return postalCode; + } + + public void setPostalCode(String postalCode) { + this.postalCode = postalCode; + } + + public String getPowerVoltage() { + return powerVoltage; + } + + public void setPowerVoltage(String powerVoltage) { + this.powerVoltage = powerVoltage; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSampleBelong() { + return sampleBelong; + } + + public void setSampleBelong(String sampleBelong) { + this.sampleBelong = sampleBelong; + } + + public String getSampleBelongName() { + return sampleBelongName; + } + + public void setSampleBelongName(String sampleBelongName) { + this.sampleBelongName = sampleBelongName; + } + + public String getSampleModel() { + return sampleModel; + } + + public void setSampleModel(String sampleModel) { + this.sampleModel = sampleModel; + } + + public String getSampleName() { + return sampleName; + } + + public void setSampleName(String sampleName) { + this.sampleName = sampleName; + } + + public String getSampleNo() { + return sampleNo; + } + + public void setSampleNo(String sampleNo) { + this.sampleNo = sampleNo; + } + + public String getSpecialRequire() { + return specialRequire; + } + + public void setSpecialRequire(String specialRequire) { + this.specialRequire = specialRequire; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUpdateUser() { + return updateUser; + } + + public void setUpdateUser(String updateUser) { + this.updateUser = updateUser; + } + + public String getValidDeadline() { + return validDeadline; + } + + public void setValidDeadline(String validDeadline) { + this.validDeadline = validDeadline; + } + } + } + + public static class EquipmentModel { + private String abc; + private String abcName; + private String applyRelationId; + private String assetNo; + private String assetSource; + private String assetType; + private String assetTypeName; + private String attribute; + private String capitalSource; + private String capitalSourceName; + private String cardEstablishmentDate; + private String createTime; + private String createUser; + private String depreciationMethod; + private String depreciationMethodName; + private String depreciationPeriod; + private String enableDate; + private String equipmentCategory; + private String equipmentCategoryName; + private String equipmentName; + private String equipmentNo; + private String equipmentSpecifications; + private String equipmentType; + private String equipmentTypeName; + private String fileList; + private String id; + private String installIncidentalExpenses; + private String installPlace; + private String intactState; + private String isCalibrationTestEquipment; + private String isDel; + private String isFixedAssets; + private String isMeasureAccount; + private String isStandardSupportEquipment; + private String labelBind; + private String majorCategory; + private String majorCategoryName; + private String managerLevel; + private String managerLevelName; + private String managerState; + private String managerStateName; + private String manufacturer; + private String manufacturerCountry; + private String manufacturingDate; + private String manufacturingNo; + private String mesureCycle; + private String mesureDate; + private String mesureDept; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String mesureType; + private String mesureTypeName; + private String modelNo; + private String originValue; + private String overallDimension; + private String presentOriginValue; + private String purpose; + private String remark; + private String singlePrice; + private String supportStandardEquipmentName; + private String supportStandardEquipmentNo; + private String technicalLevel; + private String uncertainty; + private String updateTime; + private String useDept; + private String useDeptName; + private String usePerson; + private String usePersonName; + private String validDate; + private String version; + private String weight; + + public String getAbc() { + return abc; + } + + public void setAbc(String abc) { + this.abc = abc; + } + + public String getAbcName() { + return abcName; + } + + public void setAbcName(String abcName) { + this.abcName = abcName; + } + + public String getApplyRelationId() { + return applyRelationId; + } + + public void setApplyRelationId(String applyRelationId) { + this.applyRelationId = applyRelationId; + } + + public String getAssetNo() { + return assetNo; + } + + public void setAssetNo(String assetNo) { + this.assetNo = assetNo; + } + + public String getAssetSource() { + return assetSource; + } + + public void setAssetSource(String assetSource) { + this.assetSource = assetSource; + } + + public String getAssetType() { + return assetType; + } + + public void setAssetType(String assetType) { + this.assetType = assetType; + } + + public String getAssetTypeName() { + return assetTypeName; + } + + public void setAssetTypeName(String assetTypeName) { + this.assetTypeName = assetTypeName; + } + + public String getAttribute() { + return attribute; + } + + public void setAttribute(String attribute) { + this.attribute = attribute; + } + + public String getCapitalSource() { + return capitalSource; + } + + public void setCapitalSource(String capitalSource) { + this.capitalSource = capitalSource; + } + + public String getCapitalSourceName() { + return capitalSourceName; + } + + public void setCapitalSourceName(String capitalSourceName) { + this.capitalSourceName = capitalSourceName; + } + + public String getCardEstablishmentDate() { + return cardEstablishmentDate; + } + + public void setCardEstablishmentDate(String cardEstablishmentDate) { + this.cardEstablishmentDate = cardEstablishmentDate; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getDepreciationMethod() { + return depreciationMethod; + } + + public void setDepreciationMethod(String depreciationMethod) { + this.depreciationMethod = depreciationMethod; + } + + public String getDepreciationMethodName() { + return depreciationMethodName; + } + + public void setDepreciationMethodName(String depreciationMethodName) { + this.depreciationMethodName = depreciationMethodName; + } + + public String getDepreciationPeriod() { + return depreciationPeriod; + } + + public void setDepreciationPeriod(String depreciationPeriod) { + this.depreciationPeriod = depreciationPeriod; + } + + public String getEnableDate() { + return enableDate; + } + + public void setEnableDate(String enableDate) { + this.enableDate = enableDate; + } + + public String getEquipmentCategory() { + return equipmentCategory; + } + + public void setEquipmentCategory(String equipmentCategory) { + this.equipmentCategory = equipmentCategory; + } + + public String getEquipmentCategoryName() { + return equipmentCategoryName; + } + + public void setEquipmentCategoryName(String equipmentCategoryName) { + this.equipmentCategoryName = equipmentCategoryName; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getEquipmentSpecifications() { + return equipmentSpecifications; + } + + public void setEquipmentSpecifications(String equipmentSpecifications) { + this.equipmentSpecifications = equipmentSpecifications; + } + + public String getEquipmentType() { + return equipmentType; + } + + public void setEquipmentType(String equipmentType) { + this.equipmentType = equipmentType; + } + + public String getEquipmentTypeName() { + return equipmentTypeName; + } + + public void setEquipmentTypeName(String equipmentTypeName) { + this.equipmentTypeName = equipmentTypeName; + } + + public String getFileList() { + return fileList; + } + + public void setFileList(String fileList) { + this.fileList = fileList; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInstallIncidentalExpenses() { + return installIncidentalExpenses; + } + + public void setInstallIncidentalExpenses(String installIncidentalExpenses) { + this.installIncidentalExpenses = installIncidentalExpenses; + } + + public String getInstallPlace() { + return installPlace; + } + + public void setInstallPlace(String installPlace) { + this.installPlace = installPlace; + } + + public String getIntactState() { + return intactState; + } + + public void setIntactState(String intactState) { + this.intactState = intactState; + } + + public String getIsCalibrationTestEquipment() { + return isCalibrationTestEquipment; + } + + public void setIsCalibrationTestEquipment(String isCalibrationTestEquipment) { + this.isCalibrationTestEquipment = isCalibrationTestEquipment; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIsFixedAssets() { + return isFixedAssets; + } + + public void setIsFixedAssets(String isFixedAssets) { + this.isFixedAssets = isFixedAssets; + } + + public String getIsMeasureAccount() { + return isMeasureAccount; + } + + public void setIsMeasureAccount(String isMeasureAccount) { + this.isMeasureAccount = isMeasureAccount; + } + + public String getIsStandardSupportEquipment() { + return isStandardSupportEquipment; + } + + public void setIsStandardSupportEquipment(String isStandardSupportEquipment) { + this.isStandardSupportEquipment = isStandardSupportEquipment; + } + + public String getLabelBind() { + return labelBind; + } + + public void setLabelBind(String labelBind) { + this.labelBind = labelBind; + } + + public String getMajorCategory() { + return majorCategory; + } + + public void setMajorCategory(String majorCategory) { + this.majorCategory = majorCategory; + } + + public String getMajorCategoryName() { + return majorCategoryName; + } + + public void setMajorCategoryName(String majorCategoryName) { + this.majorCategoryName = majorCategoryName; + } + + public String getManagerLevel() { + return managerLevel; + } + + public void setManagerLevel(String managerLevel) { + this.managerLevel = managerLevel; + } + + public String getManagerLevelName() { + return managerLevelName; + } + + public void setManagerLevelName(String managerLevelName) { + this.managerLevelName = managerLevelName; + } + + public String getManagerState() { + return managerState; + } + + public void setManagerState(String managerState) { + this.managerState = managerState; + } + + public String getManagerStateName() { + return managerStateName; + } + + public void setManagerStateName(String managerStateName) { + this.managerStateName = managerStateName; + } + + public String getManufacturer() { + return manufacturer; + } + + public void setManufacturer(String manufacturer) { + this.manufacturer = manufacturer; + } + + public String getManufacturerCountry() { + return manufacturerCountry; + } + + public void setManufacturerCountry(String manufacturerCountry) { + this.manufacturerCountry = manufacturerCountry; + } + + public String getManufacturingDate() { + return manufacturingDate; + } + + public void setManufacturingDate(String manufacturingDate) { + this.manufacturingDate = manufacturingDate; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getMesureCycle() { + return mesureCycle; + } + + public void setMesureCycle(String mesureCycle) { + this.mesureCycle = mesureCycle; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureDept() { + return mesureDept; + } + + public void setMesureDept(String mesureDept) { + this.mesureDept = mesureDept; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getMesureType() { + return mesureType; + } + + public void setMesureType(String mesureType) { + this.mesureType = mesureType; + } + + public String getMesureTypeName() { + return mesureTypeName; + } + + public void setMesureTypeName(String mesureTypeName) { + this.mesureTypeName = mesureTypeName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getOriginValue() { + return originValue; + } + + public void setOriginValue(String originValue) { + this.originValue = originValue; + } + + public String getOverallDimension() { + return overallDimension; + } + + public void setOverallDimension(String overallDimension) { + this.overallDimension = overallDimension; + } + + public String getPresentOriginValue() { + return presentOriginValue; + } + + public void setPresentOriginValue(String presentOriginValue) { + this.presentOriginValue = presentOriginValue; + } + + public String getPurpose() { + return purpose; + } + + public void setPurpose(String purpose) { + this.purpose = purpose; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSinglePrice() { + return singlePrice; + } + + public void setSinglePrice(String singlePrice) { + this.singlePrice = singlePrice; + } + + public String getSupportStandardEquipmentName() { + return supportStandardEquipmentName; + } + + public void setSupportStandardEquipmentName(String supportStandardEquipmentName) { + this.supportStandardEquipmentName = supportStandardEquipmentName; + } + + public String getSupportStandardEquipmentNo() { + return supportStandardEquipmentNo; + } + + public void setSupportStandardEquipmentNo(String supportStandardEquipmentNo) { + this.supportStandardEquipmentNo = supportStandardEquipmentNo; + } + + public String getTechnicalLevel() { + return technicalLevel; + } + + public void setTechnicalLevel(String technicalLevel) { + this.technicalLevel = technicalLevel; + } + + public String getUncertainty() { + return uncertainty; + } + + public void setUncertainty(String uncertainty) { + this.uncertainty = uncertainty; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDept() { + return useDept; + } + + public void setUseDept(String useDept) { + this.useDept = useDept; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getUsePerson() { + return usePerson; + } + + public void setUsePerson(String usePerson) { + this.usePerson = usePerson; + } + + public String getUsePersonName() { + return usePersonName; + } + + public void setUsePersonName(String usePersonName) { + this.usePersonName = usePersonName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + + public String getVersion() { + return version; + } + + public void setVersion(String version) { + this.version = version; + } + + public String getWeight() { + return weight; + } + + public void setWeight(String weight) { + this.weight = weight; + } + } + + public static class FileModel { + private String approvalStatus; + private String approvalStatusName; + private String createTime; + private String createUser; + private String createUserId; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String fileType; + private String fileTypeName; + private String id; + private String isDel; + private String minioFileName; + private String processId; + private String publishTime; + private String publisher; + private String remark; + private String updateTime; + + public String getApprovalStatus() { + return approvalStatus; + } + + public void setApprovalStatus(String approvalStatus) { + this.approvalStatus = approvalStatus; + } + + public String getApprovalStatusName() { + return approvalStatusName; + } + + public void setApprovalStatusName(String approvalStatusName) { + this.approvalStatusName = approvalStatusName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCreateUserId() { + return createUserId; + } + + public void setCreateUserId(String createUserId) { + this.createUserId = createUserId; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getFileType() { + return fileType; + } + + public void setFileType(String fileType) { + this.fileType = fileType; + } + + public String getFileTypeName() { + return fileTypeName; + } + + public void setFileTypeName(String fileTypeName) { + this.fileTypeName = fileTypeName; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getPublishTime() { + return publishTime; + } + + public void setPublishTime(String publishTime) { + this.publishTime = publishTime; + } + + public String getPublisher() { + return publisher; + } + + public void setPublisher(String publisher) { + this.publisher = publisher; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/CertificateListModel.java b/app/src/main/java/com/casic/xz/meterage/model/CertificateListModel.java new file mode 100644 index 0000000..0eed915 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/CertificateListModel.java @@ -0,0 +1,229 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class CertificateListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String approvalStatus; + private String approvalStatusName; + private String calibrationMajor; + private String certificateReportCode; + private String certificateReportName; + private String createTime; + private String decisionItem; + private String id; + private String manufacturingNo; + private String measureCategory; + private String measureCategoryName; + private String measurePersonId; + private String measurePersonName; + private String orderCode; + private String processId; + private String sampleModel; + private String sampleName; + private String sampleNo; + private String taskId; + + public String getApprovalStatus() { + return approvalStatus; + } + + public void setApprovalStatus(String approvalStatus) { + this.approvalStatus = approvalStatus; + } + + public String getApprovalStatusName() { + return approvalStatusName; + } + + public void setApprovalStatusName(String approvalStatusName) { + this.approvalStatusName = approvalStatusName; + } + + public String getCalibrationMajor() { + return calibrationMajor; + } + + public void setCalibrationMajor(String calibrationMajor) { + this.calibrationMajor = calibrationMajor; + } + + public String getCertificateReportCode() { + return certificateReportCode; + } + + public void setCertificateReportCode(String certificateReportCode) { + this.certificateReportCode = certificateReportCode; + } + + public String getCertificateReportName() { + return certificateReportName; + } + + public void setCertificateReportName(String certificateReportName) { + this.certificateReportName = certificateReportName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getDecisionItem() { + return decisionItem; + } + + public void setDecisionItem(String decisionItem) { + this.decisionItem = decisionItem; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getMeasureCategory() { + return measureCategory; + } + + public void setMeasureCategory(String measureCategory) { + this.measureCategory = measureCategory; + } + + public String getMeasureCategoryName() { + return measureCategoryName; + } + + public void setMeasureCategoryName(String measureCategoryName) { + this.measureCategoryName = measureCategoryName; + } + + public String getMeasurePersonId() { + return measurePersonId; + } + + public void setMeasurePersonId(String measurePersonId) { + this.measurePersonId = measurePersonId; + } + + public String getMeasurePersonName() { + return measurePersonName; + } + + public void setMeasurePersonName(String measurePersonName) { + this.measurePersonName = measurePersonName; + } + + public String getOrderCode() { + return orderCode; + } + + public void setOrderCode(String orderCode) { + this.orderCode = orderCode; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getSampleModel() { + return sampleModel; + } + + public void setSampleModel(String sampleModel) { + this.sampleModel = sampleModel; + } + + public String getSampleName() { + return sampleName; + } + + public void setSampleName(String sampleName) { + this.sampleName = sampleName; + } + + public String getSampleNo() { + return sampleNo; + } + + public void setSampleNo(String sampleNo) { + this.sampleNo = sampleNo; + } + + public String getTaskId() { + return taskId; + } + + public void setTaskId(String taskId) { + this.taskId = taskId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/CertificateModel.java b/app/src/main/java/com/casic/xz/meterage/model/CertificateModel.java deleted file mode 100644 index ec0d25b..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/CertificateModel.java +++ /dev/null @@ -1,202 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class CertificateModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String approvalStatus; - private String approvalStatusName; - private String calibrationMajor; - private String certificateReportCode; - private String certificateReportName; - private String createTime; - private String decisionItem; - private String id; - private String manufacturingNo; - private String measurePersonId; - private String orderCode; - private String processId; - private String sampleModel; - private String sampleName; - private String sampleNo; - private String taskId; - - public String getApprovalStatus() { - return approvalStatus; - } - - public void setApprovalStatus(String approvalStatus) { - this.approvalStatus = approvalStatus; - } - - public String getApprovalStatusName() { - return approvalStatusName; - } - - public void setApprovalStatusName(String approvalStatusName) { - this.approvalStatusName = approvalStatusName; - } - - public String getCalibrationMajor() { - return calibrationMajor; - } - - public void setCalibrationMajor(String calibrationMajor) { - this.calibrationMajor = calibrationMajor; - } - - public String getCertificateReportCode() { - return certificateReportCode; - } - - public void setCertificateReportCode(String certificateReportCode) { - this.certificateReportCode = certificateReportCode; - } - - public String getCertificateReportName() { - return certificateReportName; - } - - public void setCertificateReportName(String certificateReportName) { - this.certificateReportName = certificateReportName; - } - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getDecisionItem() { - return decisionItem; - } - - public void setDecisionItem(String decisionItem) { - this.decisionItem = decisionItem; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getManufacturingNo() { - return manufacturingNo; - } - - public void setManufacturingNo(String manufacturingNo) { - this.manufacturingNo = manufacturingNo; - } - - public String getMeasurePersonId() { - return measurePersonId; - } - - public void setMeasurePersonId(String measurePersonId) { - this.measurePersonId = measurePersonId; - } - - public String getOrderCode() { - return orderCode; - } - - public void setOrderCode(String orderCode) { - this.orderCode = orderCode; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public String getSampleModel() { - return sampleModel; - } - - public void setSampleModel(String sampleModel) { - this.sampleModel = sampleModel; - } - - public String getSampleName() { - return sampleName; - } - - public void setSampleName(String sampleName) { - this.sampleName = sampleName; - } - - public String getSampleNo() { - return sampleNo; - } - - public void setSampleNo(String sampleNo) { - this.sampleNo = sampleNo; - } - - public String getTaskId() { - return taskId; - } - - public void setTaskId(String taskId) { - this.taskId = taskId; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index b0dec00..a4f3c46 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -345,4 +345,22 @@ @QueryMap limit: Map, @QueryMap offset: Map ): String + + /** + * 获取委托书详情 + */ + @POST("/business/certificateReport/detail") + suspend fun getCertificateReportDetail( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 提交证书 + */ + @POST("/business/certificateReport/submit") + suspend fun submit( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String } \ 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 cef55ec..8bf4070 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 @@ -800,4 +800,29 @@ AuthenticationHelper.token!!, requestBody, limitMap, offsetMap ) } + + /** + * 获取证书报告详情 + */ + suspend fun getCertificateReportDetail(id: String): String { + val param = JsonObject() + param.addProperty("id", id) + val requestBody = param.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getCertificateReportDetail(AuthenticationHelper.token!!, requestBody) + } + + /** + * 提交证书报告 + */ + suspend fun submit(id: String): String { + val param = JsonObject() + param.addProperty("formId", "ywglzsbg") + param.addProperty("id", id) + val requestBody = param.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.submit(AuthenticationHelper.token!!, requestBody) + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportActivity.kt index 2baefd2..fa4e129 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportActivity.kt @@ -19,15 +19,21 @@ "已通过", "未通过", "已取消", - "非草稿", - "未通过", "可打印" ) private var fragmentPages: ArrayList = ArrayList() init { - pageTitles.indices.forEach { - fragmentPages.add(CertificateReportFragment((it + 1).toString())) + pageTitles.forEach { + when (it) { + "草稿箱" -> fragmentPages.add(CertificateReportFragment("1")) + "待审批" -> fragmentPages.add(CertificateReportFragment("2")) + "审批中" -> fragmentPages.add(CertificateReportFragment("3")) + "已通过" -> fragmentPages.add(CertificateReportFragment("4")) + "未通过" -> fragmentPages.add(CertificateReportFragment("5")) + "已取消" -> fragmentPages.add(CertificateReportFragment("6")) + "可打印" -> fragmentPages.add(CertificateReportFragment("9")) + } } } diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt new file mode 100644 index 0000000..e30c7c3 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt @@ -0,0 +1,106 @@ +package com.casic.xz.meterage.view.home + +import android.view.View +import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.SubViewPagerAdapter +import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.casic.xz.meterage.fragment.certificate.ApprovalProcessFragment +import com.casic.xz.meterage.fragment.certificate.BasicInformationFragment +import com.casic.xz.meterage.fragment.certificate.ExceptionReportFragment +import com.casic.xz.meterage.model.CertificateDetailModel +import com.casic.xz.meterage.utils.LoadingDialogHub +import com.casic.xz.meterage.vm.CertificateViewModel +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.vm.LoadState +import kotlinx.android.synthetic.main.activity_certificate_detail.* + +//"草稿箱" -> "1" +//"待审批" -> "2" +//"审批中" -> "3" +//"已通过" -> "4" +//"未通过" -> "5" +//"已取消" -> "6" +//"可打印" -> "9" + +class CertificateReportDetailActivity : KotlinBaseActivity() { + + private var fragmentPages: ArrayList = ArrayList() + private lateinit var certificateViewModel: CertificateViewModel + private lateinit var detailModel: CertificateDetailModel.DataModel + + override fun initData() { + val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! + + when (args[0]) { + "1" -> { + approvalView.text = "提交" + } + "2" -> { + approvalView.text = "审批" + } + "9" -> { + approvalView.text = "打印" + } + else -> { + approvalView.visibility = View.GONE + } + } + + certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] + certificateViewModel.getCertificateReportDetail(args[1]) + certificateViewModel.certificateDetail.observe(this) { + if (it.code == 200) { + + detailModel = it.data + + fragmentPages.add(BasicInformationFragment(detailModel)) + fragmentPages.add(ApprovalProcessFragment()) + fragmentPages.add(ExceptionReportFragment()) + + val pageTitles = arrayOf("基础信息", "审批流程", "异常报告") + + approvalViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, pageTitles + ) + //绑定 + topTabLayout.setupWithViewPager(approvalViewPager) + } + } + + certificateViewModel.submitResult.observe(this) { + if (it.code == 200) { + "提交成功".show(this) + finish() + } + } + } + + override fun initEvent() { + leftBackView.setOnClickListener { finish() } + + approvalView.setOnClickListener { + certificateViewModel.submit(detailModel.id) + } + } + + override fun initLayoutView(): Int = R.layout.activity_certificate_detail + + override fun observeRequestState() { + certificateViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt index 080c380..77fe8a5 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt @@ -129,6 +129,5 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() initLayoutImmersionBar(rootView) - titleView.text = "委托需求" } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt index 735e530..e088887 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt @@ -4,7 +4,9 @@ import com.casic.xz.meterage.base.BaseApplication import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage -import com.casic.xz.meterage.model.CertificateModel +import com.casic.xz.meterage.model.ActionResultModel +import com.casic.xz.meterage.model.CertificateDetailModel +import com.casic.xz.meterage.model.CertificateListModel import com.casic.xz.meterage.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -19,7 +21,9 @@ class CertificateViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val certificateList = MutableLiveData() + val certificateList = MutableLiveData() + val certificateDetail = MutableLiveData() + val submitResult = MutableLiveData() fun getCertificateReportList( approvalStatus: String, @@ -47,8 +51,46 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - certificateList.value = gson.fromJson( - response, object : TypeToken() {}.type + certificateList.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + + fun getCertificateReportDetail(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.getCertificateReportDetail(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + certificateDetail.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + + fun submit(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.submit(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + submitResult.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { loadState.value = LoadState.Fail diff --git a/app/src/main/res/layout/activity_capability_detail.xml b/app/src/main/res/layout/activity_capability_detail.xml index 585960a..375d861 100644 --- a/app/src/main/res/layout/activity_capability_detail.xml +++ b/app/src/main/res/layout/activity_capability_detail.xml @@ -21,7 +21,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:padding="@dimen/dp_10"> + android:paddingHorizontal="@dimen/dp_10"> diff --git a/app/src/main/res/layout/activity_certificate_detail.xml b/app/src/main/res/layout/activity_certificate_detail.xml new file mode 100644 index 0000000..5bb3649 --- /dev/null +++ b/app/src/main/res/layout/activity_certificate_detail.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_standard_file_detail.xml b/app/src/main/res/layout/activity_standard_file_detail.xml index 7776230..02efb08 100644 --- a/app/src/main/res/layout/activity_standard_file_detail.xml +++ b/app/src/main/res/layout/activity_standard_file_detail.xml @@ -21,7 +21,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:padding="@dimen/dp_10"> + android:paddingHorizontal="@dimen/dp_10"> diff --git a/app/src/main/res/layout/fragment_certificate_approval_process.xml b/app/src/main/res/layout/fragment_certificate_approval_process.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/fragment_certificate_approval_process.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_certificate_basic_information.xml b/app/src/main/res/layout/fragment_certificate_basic_information.xml new file mode 100644 index 0000000..91882c7 --- /dev/null +++ b/app/src/main/res/layout/fragment_certificate_basic_information.xml @@ -0,0 +1,296 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_certificate_exception_report.xml b/app/src/main/res/layout/fragment_certificate_exception_report.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/fragment_certificate_exception_report.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 5ba44f0..298f687 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -53,7 +53,8 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "XZJL_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" +// outputFileName = "XZJL_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "XZJL_" + getBuildDate() + "_Beta.apk" } } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4b914b5..ebea092 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -67,6 +67,7 @@ + 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 new file mode 100644 index 0000000..a75e566 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.certificate + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class ApprovalProcessFragment :KotlinBaseFragment(){ + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_certificate_approval_process + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt new file mode 100644 index 0000000..5882c3d --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt @@ -0,0 +1,77 @@ +package com.casic.xz.meterage.fragment.certificate + +import android.graphics.Color +import android.graphics.Paint +import android.util.Log +import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.watchAttachFile +import com.casic.xz.meterage.model.CertificateDetailModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.pengxh.kt.lite.extensions.toJson +import kotlinx.android.synthetic.main.fragment_certificate_basic_information.* + +class BasicInformationFragment(private val data: CertificateDetailModel.DataModel) : + KotlinBaseFragment() { + + override fun initData() { + val businessOriginal = data.businessOriginalRecord + + reportCodeView.text = data.certificateReportCode + originalCodeView.text = businessOriginal.originalRecordCode + checkCategoryView.text = businessOriginal.measureCategoryName + + Log.d( + "Casic", + "BasicInformationFragment => initData: ${businessOriginal.fileList.toJson()}" + ) +// basisFileView.text = businessOriginal.fileList + + val sampleInfo = businessOriginal.customerSampleInfo + sampleCodeView.text = sampleInfo.sampleNo + sampleNameView.text = sampleInfo.sampleName + manufacturingCodeView.text = sampleInfo.manufacturingNo + modelView.text = sampleInfo.sampleModel + entrustCodeView.text = sampleInfo.customerNo + entrustNameView.text = sampleInfo.customerName + entrustContactView.text = sampleInfo.phone + entrustEmailView.text = sampleInfo.postalCode + entrustAddressView.text = sampleInfo.customerAddress + senderView.text = sampleInfo.deliverer + senderContactView.text = sampleInfo.delivererTel + checkTypeView.text = sampleInfo.measureContent + remarkView.text = sampleInfo.remark + + estimateServedTimeView.text = businessOriginal.businessOrder.planDeliverTime + estimateCompleteTimeView.text = businessOriginal.businessOrder.requireOverTime + + if (data.certificateReportFile.isNullOrBlank()) { + reportFileView.text = "暂无附件" + } else { + val reportFileName = data.certificateReportFile + + reportFileView.text = reportFileName + val textPaint = reportFileView.paint + textPaint.flags = Paint.UNDERLINE_TEXT_FLAG + textPaint.isAntiAlias = true + reportFileView.setTextColor(Color.BLUE) + + reportFileView.setOnClickListener { + reportFileName.watchAttachFile(requireContext()) + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_certificate_basic_information + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt index 2f3c95c..b1df400 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt @@ -4,19 +4,24 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.addAll +import com.casic.xz.meterage.extensions.diffCurrentTime +import com.casic.xz.meterage.extensions.formatToDate import com.casic.xz.meterage.extensions.showEmptyPage -import com.casic.xz.meterage.model.CertificateModel +import com.casic.xz.meterage.model.CertificateListModel +import com.casic.xz.meterage.view.home.CertificateReportDetailActivity import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler import kotlinx.android.synthetic.main.fragment_certificate_report.* import kotlinx.android.synthetic.main.include_empty_view.* /** - * 计量法规 + * 证书报告 * * formId:ywglzsbg * */ @@ -24,8 +29,8 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var certificateViewModel: CertificateViewModel - private lateinit var certificateAdapter: NormalRecyclerAdapter - private var dataBeans: MutableList = ArrayList() + private lateinit var certificateAdapter: NormalRecyclerAdapter + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false @@ -119,40 +124,37 @@ } else { emptyView!!.hide() certificateAdapter = object : - NormalRecyclerAdapter( + NormalRecyclerAdapter( R.layout.item_certificate_rv_l, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, - item: CertificateModel.DataModel.RowsModel + item: CertificateListModel.DataModel.RowsModel ) { + val deltaT = item.createTime.diffCurrentTime() + val diffTime = if (deltaT < 24) { + "${deltaT}小时前" + } else { + item.createTime.formatToDate() + } + viewHolder.setText(R.id.reportNameView, item.certificateReportName) -// .setText(R.id.fileStateView, item.effectiveStatusName) -// .setText(R.id.remarkView, "备注：$remark") -// .setText(R.id.fileCodeView, "文件号：${item.fileNo}") -// .setText(R.id.releaseDateView, "实施时间：${item.publishTime}") -// -// if (!item.effectiveStatus.equals("1")) { -// viewHolder.setBackgroundColor( -// R.id.fileStateView, -// R.color.gray.convertColor(requireContext()) -// ) -// } + .setText(R.id.createTimeView, diffTime) + .setText(R.id.categoryView, "校验类别：${item.measureCategoryName}") + .setText(R.id.technicianView, "检定员：${item.measurePersonName}") + + viewHolder.setOnClickListener(R.id.showDetailButton) { + requireContext().navigatePageTo( + addAll(item.approvalStatus, item.id) + ) + } } } certificateRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) certificateRecyclerView.adapter = certificateAdapter - certificateAdapter.setOnItemClickedListener(object : - NormalRecyclerAdapter.OnItemClickedListener { - override fun onItemClicked( - position: Int, t: CertificateModel.DataModel.RowsModel - ) { -// requireContext().navigatePageTo(t.toJson()) - } - }) } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt new file mode 100644 index 0000000..2d5ac61 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.certificate + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class ExceptionReportFragment :KotlinBaseFragment(){ + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_certificate_exception_report + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/model/CertificateDetailModel.java b/app/src/main/java/com/casic/xz/meterage/model/CertificateDetailModel.java new file mode 100644 index 0000000..42efccd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/CertificateDetailModel.java @@ -0,0 +1,2080 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class CertificateDetailModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private String approvalSignId; + private String approvalStatus; + private String approvalStatusName; + private BusinessOriginalRecordModel businessOriginalRecord; + private String calibrationMajor; + private String calibrationMajorName; + private String certificateReportCategory; + private String certificateReportCode; + private String certificateReportFile; + private String certificateReportName; + private String createTime; + private String createUser; + private String expirationDate; + private String id; + private String isDel; + private String issuanceDate; + private String measureDeptId; + private String measurePersonId; + private String measureResult; + private String orderId; + private String originalRecordId; + private String printNum; + private String printStatus; + private String processId; + private String remark; + private String sampleId; + private String signId; + private String templateId; + private String updateTime; + + public String getApprovalSignId() { + return approvalSignId; + } + + public void setApprovalSignId(String approvalSignId) { + this.approvalSignId = approvalSignId; + } + + public String getApprovalStatus() { + return approvalStatus; + } + + public void setApprovalStatus(String approvalStatus) { + this.approvalStatus = approvalStatus; + } + + public String getApprovalStatusName() { + return approvalStatusName; + } + + public void setApprovalStatusName(String approvalStatusName) { + this.approvalStatusName = approvalStatusName; + } + + public BusinessOriginalRecordModel getBusinessOriginalRecord() { + return businessOriginalRecord; + } + + public void setBusinessOriginalRecord(BusinessOriginalRecordModel businessOriginalRecord) { + this.businessOriginalRecord = businessOriginalRecord; + } + + public String getCalibrationMajor() { + return calibrationMajor; + } + + public void setCalibrationMajor(String calibrationMajor) { + this.calibrationMajor = calibrationMajor; + } + + public String getCalibrationMajorName() { + return calibrationMajorName; + } + + public void setCalibrationMajorName(String calibrationMajorName) { + this.calibrationMajorName = calibrationMajorName; + } + + public String getCertificateReportCategory() { + return certificateReportCategory; + } + + public void setCertificateReportCategory(String certificateReportCategory) { + this.certificateReportCategory = certificateReportCategory; + } + + public String getCertificateReportCode() { + return certificateReportCode; + } + + public void setCertificateReportCode(String certificateReportCode) { + this.certificateReportCode = certificateReportCode; + } + + public String getCertificateReportFile() { + return certificateReportFile; + } + + public void setCertificateReportFile(String certificateReportFile) { + this.certificateReportFile = certificateReportFile; + } + + public String getCertificateReportName() { + return certificateReportName; + } + + public void setCertificateReportName(String certificateReportName) { + this.certificateReportName = certificateReportName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getExpirationDate() { + return expirationDate; + } + + public void setExpirationDate(String expirationDate) { + this.expirationDate = expirationDate; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String isIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIssuanceDate() { + return issuanceDate; + } + + public void setIssuanceDate(String issuanceDate) { + this.issuanceDate = issuanceDate; + } + + public String getMeasureDeptId() { + return measureDeptId; + } + + public void setMeasureDeptId(String measureDeptId) { + this.measureDeptId = measureDeptId; + } + + public String getMeasurePersonId() { + return measurePersonId; + } + + public void setMeasurePersonId(String measurePersonId) { + this.measurePersonId = measurePersonId; + } + + public String getMeasureResult() { + return measureResult; + } + + public void setMeasureResult(String measureResult) { + this.measureResult = measureResult; + } + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public String getOriginalRecordId() { + return originalRecordId; + } + + public void setOriginalRecordId(String originalRecordId) { + this.originalRecordId = originalRecordId; + } + + public String getPrintNum() { + return printNum; + } + + public void setPrintNum(String printNum) { + this.printNum = printNum; + } + + public String getPrintStatus() { + return printStatus; + } + + public void setPrintStatus(String printStatus) { + this.printStatus = printStatus; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSampleId() { + return sampleId; + } + + public void setSampleId(String sampleId) { + this.sampleId = sampleId; + } + + public String getSignId() { + return signId; + } + + public void setSignId(String signId) { + this.signId = signId; + } + + public String getTemplateId() { + return templateId; + } + + public void setTemplateId(String templateId) { + this.templateId = templateId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public static class BusinessOriginalRecordModel { + private BusinessEnvRecordModel businessEnvironmentRecord; + private BusinessOrderModel businessOrder; + private String calibrationPlace; + private String calibrationTime; + private String createTime; + private String createUser; + private BusinessOrderModel.CustomerSampleModel customerSampleInfo; + private String environmentId; + private List equipmentInfoList; + private List fileList; + private String id; + private String isDel; + private String measureCategory; + private String measureCategoryName; + private String orderId; + private String originalRecordCode; + private String originalRecordFile; + private String originalRecordName; + private String remark; + private String sampleId; + private String templateId; + private String templateName; + private String updateTime; + + public BusinessEnvRecordModel getBusinessEnvironmentRecord() { + return businessEnvironmentRecord; + } + + public void setBusinessEnvironmentRecord(BusinessEnvRecordModel businessEnvironmentRecord) { + this.businessEnvironmentRecord = businessEnvironmentRecord; + } + + public BusinessOrderModel getBusinessOrder() { + return businessOrder; + } + + public void setBusinessOrder(BusinessOrderModel businessOrder) { + this.businessOrder = businessOrder; + } + + public String getCalibrationPlace() { + return calibrationPlace; + } + + public void setCalibrationPlace(String calibrationPlace) { + this.calibrationPlace = calibrationPlace; + } + + public String getCalibrationTime() { + return calibrationTime; + } + + public void setCalibrationTime(String calibrationTime) { + this.calibrationTime = calibrationTime; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public BusinessOrderModel.CustomerSampleModel getCustomerSampleInfo() { + return customerSampleInfo; + } + + public void setCustomerSampleInfo(BusinessOrderModel.CustomerSampleModel customerSampleInfo) { + this.customerSampleInfo = customerSampleInfo; + } + + public String getEnvironmentId() { + return environmentId; + } + + public void setEnvironmentId(String environmentId) { + this.environmentId = environmentId; + } + + public List getEquipmentInfoList() { + return equipmentInfoList; + } + + public void setEquipmentInfoList(List equipmentInfoList) { + this.equipmentInfoList = equipmentInfoList; + } + + public List getFileList() { + return fileList; + } + + public void setFileList(List fileList) { + this.fileList = fileList; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String isIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getMeasureCategory() { + return measureCategory; + } + + public void setMeasureCategory(String measureCategory) { + this.measureCategory = measureCategory; + } + + public String getMeasureCategoryName() { + return measureCategoryName; + } + + public void setMeasureCategoryName(String measureCategoryName) { + this.measureCategoryName = measureCategoryName; + } + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public String getOriginalRecordCode() { + return originalRecordCode; + } + + public void setOriginalRecordCode(String originalRecordCode) { + this.originalRecordCode = originalRecordCode; + } + + public String getOriginalRecordFile() { + return originalRecordFile; + } + + public void setOriginalRecordFile(String originalRecordFile) { + this.originalRecordFile = originalRecordFile; + } + + public String getOriginalRecordName() { + return originalRecordName; + } + + public void setOriginalRecordName(String originalRecordName) { + this.originalRecordName = originalRecordName; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSampleId() { + return sampleId; + } + + public void setSampleId(String sampleId) { + this.sampleId = sampleId; + } + + public String getTemplateId() { + return templateId; + } + + public void setTemplateId(String templateId) { + this.templateId = templateId; + } + + public String getTemplateName() { + return templateName; + } + + public void setTemplateName(String templateName) { + this.templateName = templateName; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public static class BusinessEnvRecordModel { + private String createTime; + private String createUser; + private String environmentCode; + private String humidity; + private String id; + private String isDel; + private String outputVoltage; + private String recordTime; + private String recorder; + private String remark; + private String roomNumber; + private String temperature; + private String updateTime; + private String zeroGroundVoltage; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEnvironmentCode() { + return environmentCode; + } + + public void setEnvironmentCode(String environmentCode) { + this.environmentCode = environmentCode; + } + + public String getHumidity() { + return humidity; + } + + public void setHumidity(String humidity) { + this.humidity = humidity; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String isIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getOutputVoltage() { + return outputVoltage; + } + + public void setOutputVoltage(String outputVoltage) { + this.outputVoltage = outputVoltage; + } + + public String getRecordTime() { + return recordTime; + } + + public void setRecordTime(String recordTime) { + this.recordTime = recordTime; + } + + public String getRecorder() { + return recorder; + } + + public void setRecorder(String recorder) { + this.recorder = recorder; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getRoomNumber() { + return roomNumber; + } + + public void setRoomNumber(String roomNumber) { + this.roomNumber = roomNumber; + } + + public String getTemperature() { + return temperature; + } + + public void setTemperature(String temperature) { + this.temperature = temperature; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getZeroGroundVoltage() { + return zeroGroundVoltage; + } + + public void setZeroGroundVoltage(String zeroGroundVoltage) { + this.zeroGroundVoltage = zeroGroundVoltage; + } + } + + public static class BusinessOrderModel { + private String certifications; + private String createTime; + private String createUser; + private String customerAddress; + private String customerId; + private String customerName; + private String customerNo; + private String customerPhone; + private List customerSampleInfoList; + private String deliverTime; + private String deliverer; + private String delivererId; + private String delivererTel; + private String id; + private String isDel; + private String isUrgent; + private String minioFileName; + private String orderCode; + private String orderTime; + private String planDeliverTime; + private String remark; + private String requireOverTime; + private String status; + private String updateTime; + private String updateUser; + + public String getCertifications() { + return certifications; + } + + public void setCertifications(String certifications) { + this.certifications = certifications; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCustomerAddress() { + return customerAddress; + } + + public void setCustomerAddress(String customerAddress) { + this.customerAddress = customerAddress; + } + + public String getCustomerId() { + return customerId; + } + + public void setCustomerId(String customerId) { + this.customerId = customerId; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public String getCustomerPhone() { + return customerPhone; + } + + public void setCustomerPhone(String customerPhone) { + this.customerPhone = customerPhone; + } + + public List getCustomerSampleInfoList() { + return customerSampleInfoList; + } + + public void setCustomerSampleInfoList(List customerSampleInfoList) { + this.customerSampleInfoList = customerSampleInfoList; + } + + public String getDeliverTime() { + return deliverTime; + } + + public void setDeliverTime(String deliverTime) { + this.deliverTime = deliverTime; + } + + public String getDeliverer() { + return deliverer; + } + + public void setDeliverer(String deliverer) { + this.deliverer = deliverer; + } + + public String getDelivererId() { + return delivererId; + } + + public void setDelivererId(String delivererId) { + this.delivererId = delivererId; + } + + public String getDelivererTel() { + return delivererTel; + } + + public void setDelivererTel(String delivererTel) { + this.delivererTel = delivererTel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIsUrgent() { + return isUrgent; + } + + public void setIsUrgent(String isUrgent) { + this.isUrgent = isUrgent; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getOrderCode() { + return orderCode; + } + + public void setOrderCode(String orderCode) { + this.orderCode = orderCode; + } + + public String getOrderTime() { + return orderTime; + } + + public void setOrderTime(String orderTime) { + this.orderTime = orderTime; + } + + public String getPlanDeliverTime() { + return planDeliverTime; + } + + public void setPlanDeliverTime(String planDeliverTime) { + this.planDeliverTime = planDeliverTime; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getRequireOverTime() { + return requireOverTime; + } + + public void setRequireOverTime(String requireOverTime) { + this.requireOverTime = requireOverTime; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUpdateUser() { + return updateUser; + } + + public void setUpdateUser(String updateUser) { + this.updateUser = updateUser; + } + + public static class CustomerSampleModel { + private String abc; + private String appendix; + private String appendixDescn; + private String createTime; + private String createUser; + private String customerAddress; + private String customerId; + private String customerName; + private String customerNo; + private String deliverer; + private String delivererTel; + private String id; + private String isDel; + private String isExistSample; + private String labelBind; + private String manufacturer; + private String manufacturerCountry; + private String manufacturingDate; + private String manufacturingNo; + private String measureCategory; + private String measureCategoryName; + private String measureContent; + private String measureLastTime; + private String measurePeriod; + private String measureType; + private String measureTypeName; + private String minioFileName; + private String orderId; + private String phone; + private String postalCode; + private String powerVoltage; + private String remark; + private String sampleBelong; + private String sampleBelongName; + private String sampleModel; + private String sampleName; + private String sampleNo; + private String specialRequire; + private String updateTime; + private String updateUser; + private String validDeadline; + + public String getAbc() { + return abc; + } + + public void setAbc(String abc) { + this.abc = abc; + } + + public String getAppendix() { + return appendix; + } + + public void setAppendix(String appendix) { + this.appendix = appendix; + } + + public String getAppendixDescn() { + return appendixDescn; + } + + public void setAppendixDescn(String appendixDescn) { + this.appendixDescn = appendixDescn; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCustomerAddress() { + return customerAddress; + } + + public void setCustomerAddress(String customerAddress) { + this.customerAddress = customerAddress; + } + + public String getCustomerId() { + return customerId; + } + + public void setCustomerId(String customerId) { + this.customerId = customerId; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public String getDeliverer() { + return deliverer; + } + + public void setDeliverer(String deliverer) { + this.deliverer = deliverer; + } + + public String getDelivererTel() { + return delivererTel; + } + + public void setDelivererTel(String delivererTel) { + this.delivererTel = delivererTel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIsExistSample() { + return isExistSample; + } + + public void setIsExistSample(String isExistSample) { + this.isExistSample = isExistSample; + } + + public String getLabelBind() { + return labelBind; + } + + public void setLabelBind(String labelBind) { + this.labelBind = labelBind; + } + + public String getManufacturer() { + return manufacturer; + } + + public void setManufacturer(String manufacturer) { + this.manufacturer = manufacturer; + } + + public String getManufacturerCountry() { + return manufacturerCountry; + } + + public void setManufacturerCountry(String manufacturerCountry) { + this.manufacturerCountry = manufacturerCountry; + } + + public String getManufacturingDate() { + return manufacturingDate; + } + + public void setManufacturingDate(String manufacturingDate) { + this.manufacturingDate = manufacturingDate; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getMeasureCategory() { + return measureCategory; + } + + public void setMeasureCategory(String measureCategory) { + this.measureCategory = measureCategory; + } + + public String getMeasureCategoryName() { + return measureCategoryName; + } + + public void setMeasureCategoryName(String measureCategoryName) { + this.measureCategoryName = measureCategoryName; + } + + public String getMeasureContent() { + return measureContent; + } + + public void setMeasureContent(String measureContent) { + this.measureContent = measureContent; + } + + public String getMeasureLastTime() { + return measureLastTime; + } + + public void setMeasureLastTime(String measureLastTime) { + this.measureLastTime = measureLastTime; + } + + public String getMeasurePeriod() { + return measurePeriod; + } + + public void setMeasurePeriod(String measurePeriod) { + this.measurePeriod = measurePeriod; + } + + public String getMeasureType() { + return measureType; + } + + public void setMeasureType(String measureType) { + this.measureType = measureType; + } + + public String getMeasureTypeName() { + return measureTypeName; + } + + public void setMeasureTypeName(String measureTypeName) { + this.measureTypeName = measureTypeName; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getPostalCode() { + return postalCode; + } + + public void setPostalCode(String postalCode) { + this.postalCode = postalCode; + } + + public String getPowerVoltage() { + return powerVoltage; + } + + public void setPowerVoltage(String powerVoltage) { + this.powerVoltage = powerVoltage; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSampleBelong() { + return sampleBelong; + } + + public void setSampleBelong(String sampleBelong) { + this.sampleBelong = sampleBelong; + } + + public String getSampleBelongName() { + return sampleBelongName; + } + + public void setSampleBelongName(String sampleBelongName) { + this.sampleBelongName = sampleBelongName; + } + + public String getSampleModel() { + return sampleModel; + } + + public void setSampleModel(String sampleModel) { + this.sampleModel = sampleModel; + } + + public String getSampleName() { + return sampleName; + } + + public void setSampleName(String sampleName) { + this.sampleName = sampleName; + } + + public String getSampleNo() { + return sampleNo; + } + + public void setSampleNo(String sampleNo) { + this.sampleNo = sampleNo; + } + + public String getSpecialRequire() { + return specialRequire; + } + + public void setSpecialRequire(String specialRequire) { + this.specialRequire = specialRequire; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUpdateUser() { + return updateUser; + } + + public void setUpdateUser(String updateUser) { + this.updateUser = updateUser; + } + + public String getValidDeadline() { + return validDeadline; + } + + public void setValidDeadline(String validDeadline) { + this.validDeadline = validDeadline; + } + } + } + + public static class EquipmentModel { + private String abc; + private String abcName; + private String applyRelationId; + private String assetNo; + private String assetSource; + private String assetType; + private String assetTypeName; + private String attribute; + private String capitalSource; + private String capitalSourceName; + private String cardEstablishmentDate; + private String createTime; + private String createUser; + private String depreciationMethod; + private String depreciationMethodName; + private String depreciationPeriod; + private String enableDate; + private String equipmentCategory; + private String equipmentCategoryName; + private String equipmentName; + private String equipmentNo; + private String equipmentSpecifications; + private String equipmentType; + private String equipmentTypeName; + private String fileList; + private String id; + private String installIncidentalExpenses; + private String installPlace; + private String intactState; + private String isCalibrationTestEquipment; + private String isDel; + private String isFixedAssets; + private String isMeasureAccount; + private String isStandardSupportEquipment; + private String labelBind; + private String majorCategory; + private String majorCategoryName; + private String managerLevel; + private String managerLevelName; + private String managerState; + private String managerStateName; + private String manufacturer; + private String manufacturerCountry; + private String manufacturingDate; + private String manufacturingNo; + private String mesureCycle; + private String mesureDate; + private String mesureDept; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String mesureType; + private String mesureTypeName; + private String modelNo; + private String originValue; + private String overallDimension; + private String presentOriginValue; + private String purpose; + private String remark; + private String singlePrice; + private String supportStandardEquipmentName; + private String supportStandardEquipmentNo; + private String technicalLevel; + private String uncertainty; + private String updateTime; + private String useDept; + private String useDeptName; + private String usePerson; + private String usePersonName; + private String validDate; + private String version; + private String weight; + + public String getAbc() { + return abc; + } + + public void setAbc(String abc) { + this.abc = abc; + } + + public String getAbcName() { + return abcName; + } + + public void setAbcName(String abcName) { + this.abcName = abcName; + } + + public String getApplyRelationId() { + return applyRelationId; + } + + public void setApplyRelationId(String applyRelationId) { + this.applyRelationId = applyRelationId; + } + + public String getAssetNo() { + return assetNo; + } + + public void setAssetNo(String assetNo) { + this.assetNo = assetNo; + } + + public String getAssetSource() { + return assetSource; + } + + public void setAssetSource(String assetSource) { + this.assetSource = assetSource; + } + + public String getAssetType() { + return assetType; + } + + public void setAssetType(String assetType) { + this.assetType = assetType; + } + + public String getAssetTypeName() { + return assetTypeName; + } + + public void setAssetTypeName(String assetTypeName) { + this.assetTypeName = assetTypeName; + } + + public String getAttribute() { + return attribute; + } + + public void setAttribute(String attribute) { + this.attribute = attribute; + } + + public String getCapitalSource() { + return capitalSource; + } + + public void setCapitalSource(String capitalSource) { + this.capitalSource = capitalSource; + } + + public String getCapitalSourceName() { + return capitalSourceName; + } + + public void setCapitalSourceName(String capitalSourceName) { + this.capitalSourceName = capitalSourceName; + } + + public String getCardEstablishmentDate() { + return cardEstablishmentDate; + } + + public void setCardEstablishmentDate(String cardEstablishmentDate) { + this.cardEstablishmentDate = cardEstablishmentDate; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getDepreciationMethod() { + return depreciationMethod; + } + + public void setDepreciationMethod(String depreciationMethod) { + this.depreciationMethod = depreciationMethod; + } + + public String getDepreciationMethodName() { + return depreciationMethodName; + } + + public void setDepreciationMethodName(String depreciationMethodName) { + this.depreciationMethodName = depreciationMethodName; + } + + public String getDepreciationPeriod() { + return depreciationPeriod; + } + + public void setDepreciationPeriod(String depreciationPeriod) { + this.depreciationPeriod = depreciationPeriod; + } + + public String getEnableDate() { + return enableDate; + } + + public void setEnableDate(String enableDate) { + this.enableDate = enableDate; + } + + public String getEquipmentCategory() { + return equipmentCategory; + } + + public void setEquipmentCategory(String equipmentCategory) { + this.equipmentCategory = equipmentCategory; + } + + public String getEquipmentCategoryName() { + return equipmentCategoryName; + } + + public void setEquipmentCategoryName(String equipmentCategoryName) { + this.equipmentCategoryName = equipmentCategoryName; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getEquipmentSpecifications() { + return equipmentSpecifications; + } + + public void setEquipmentSpecifications(String equipmentSpecifications) { + this.equipmentSpecifications = equipmentSpecifications; + } + + public String getEquipmentType() { + return equipmentType; + } + + public void setEquipmentType(String equipmentType) { + this.equipmentType = equipmentType; + } + + public String getEquipmentTypeName() { + return equipmentTypeName; + } + + public void setEquipmentTypeName(String equipmentTypeName) { + this.equipmentTypeName = equipmentTypeName; + } + + public String getFileList() { + return fileList; + } + + public void setFileList(String fileList) { + this.fileList = fileList; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInstallIncidentalExpenses() { + return installIncidentalExpenses; + } + + public void setInstallIncidentalExpenses(String installIncidentalExpenses) { + this.installIncidentalExpenses = installIncidentalExpenses; + } + + public String getInstallPlace() { + return installPlace; + } + + public void setInstallPlace(String installPlace) { + this.installPlace = installPlace; + } + + public String getIntactState() { + return intactState; + } + + public void setIntactState(String intactState) { + this.intactState = intactState; + } + + public String getIsCalibrationTestEquipment() { + return isCalibrationTestEquipment; + } + + public void setIsCalibrationTestEquipment(String isCalibrationTestEquipment) { + this.isCalibrationTestEquipment = isCalibrationTestEquipment; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIsFixedAssets() { + return isFixedAssets; + } + + public void setIsFixedAssets(String isFixedAssets) { + this.isFixedAssets = isFixedAssets; + } + + public String getIsMeasureAccount() { + return isMeasureAccount; + } + + public void setIsMeasureAccount(String isMeasureAccount) { + this.isMeasureAccount = isMeasureAccount; + } + + public String getIsStandardSupportEquipment() { + return isStandardSupportEquipment; + } + + public void setIsStandardSupportEquipment(String isStandardSupportEquipment) { + this.isStandardSupportEquipment = isStandardSupportEquipment; + } + + public String getLabelBind() { + return labelBind; + } + + public void setLabelBind(String labelBind) { + this.labelBind = labelBind; + } + + public String getMajorCategory() { + return majorCategory; + } + + public void setMajorCategory(String majorCategory) { + this.majorCategory = majorCategory; + } + + public String getMajorCategoryName() { + return majorCategoryName; + } + + public void setMajorCategoryName(String majorCategoryName) { + this.majorCategoryName = majorCategoryName; + } + + public String getManagerLevel() { + return managerLevel; + } + + public void setManagerLevel(String managerLevel) { + this.managerLevel = managerLevel; + } + + public String getManagerLevelName() { + return managerLevelName; + } + + public void setManagerLevelName(String managerLevelName) { + this.managerLevelName = managerLevelName; + } + + public String getManagerState() { + return managerState; + } + + public void setManagerState(String managerState) { + this.managerState = managerState; + } + + public String getManagerStateName() { + return managerStateName; + } + + public void setManagerStateName(String managerStateName) { + this.managerStateName = managerStateName; + } + + public String getManufacturer() { + return manufacturer; + } + + public void setManufacturer(String manufacturer) { + this.manufacturer = manufacturer; + } + + public String getManufacturerCountry() { + return manufacturerCountry; + } + + public void setManufacturerCountry(String manufacturerCountry) { + this.manufacturerCountry = manufacturerCountry; + } + + public String getManufacturingDate() { + return manufacturingDate; + } + + public void setManufacturingDate(String manufacturingDate) { + this.manufacturingDate = manufacturingDate; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getMesureCycle() { + return mesureCycle; + } + + public void setMesureCycle(String mesureCycle) { + this.mesureCycle = mesureCycle; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureDept() { + return mesureDept; + } + + public void setMesureDept(String mesureDept) { + this.mesureDept = mesureDept; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getMesureType() { + return mesureType; + } + + public void setMesureType(String mesureType) { + this.mesureType = mesureType; + } + + public String getMesureTypeName() { + return mesureTypeName; + } + + public void setMesureTypeName(String mesureTypeName) { + this.mesureTypeName = mesureTypeName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getOriginValue() { + return originValue; + } + + public void setOriginValue(String originValue) { + this.originValue = originValue; + } + + public String getOverallDimension() { + return overallDimension; + } + + public void setOverallDimension(String overallDimension) { + this.overallDimension = overallDimension; + } + + public String getPresentOriginValue() { + return presentOriginValue; + } + + public void setPresentOriginValue(String presentOriginValue) { + this.presentOriginValue = presentOriginValue; + } + + public String getPurpose() { + return purpose; + } + + public void setPurpose(String purpose) { + this.purpose = purpose; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSinglePrice() { + return singlePrice; + } + + public void setSinglePrice(String singlePrice) { + this.singlePrice = singlePrice; + } + + public String getSupportStandardEquipmentName() { + return supportStandardEquipmentName; + } + + public void setSupportStandardEquipmentName(String supportStandardEquipmentName) { + this.supportStandardEquipmentName = supportStandardEquipmentName; + } + + public String getSupportStandardEquipmentNo() { + return supportStandardEquipmentNo; + } + + public void setSupportStandardEquipmentNo(String supportStandardEquipmentNo) { + this.supportStandardEquipmentNo = supportStandardEquipmentNo; + } + + public String getTechnicalLevel() { + return technicalLevel; + } + + public void setTechnicalLevel(String technicalLevel) { + this.technicalLevel = technicalLevel; + } + + public String getUncertainty() { + return uncertainty; + } + + public void setUncertainty(String uncertainty) { + this.uncertainty = uncertainty; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDept() { + return useDept; + } + + public void setUseDept(String useDept) { + this.useDept = useDept; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getUsePerson() { + return usePerson; + } + + public void setUsePerson(String usePerson) { + this.usePerson = usePerson; + } + + public String getUsePersonName() { + return usePersonName; + } + + public void setUsePersonName(String usePersonName) { + this.usePersonName = usePersonName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + + public String getVersion() { + return version; + } + + public void setVersion(String version) { + this.version = version; + } + + public String getWeight() { + return weight; + } + + public void setWeight(String weight) { + this.weight = weight; + } + } + + public static class FileModel { + private String approvalStatus; + private String approvalStatusName; + private String createTime; + private String createUser; + private String createUserId; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String fileType; + private String fileTypeName; + private String id; + private String isDel; + private String minioFileName; + private String processId; + private String publishTime; + private String publisher; + private String remark; + private String updateTime; + + public String getApprovalStatus() { + return approvalStatus; + } + + public void setApprovalStatus(String approvalStatus) { + this.approvalStatus = approvalStatus; + } + + public String getApprovalStatusName() { + return approvalStatusName; + } + + public void setApprovalStatusName(String approvalStatusName) { + this.approvalStatusName = approvalStatusName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCreateUserId() { + return createUserId; + } + + public void setCreateUserId(String createUserId) { + this.createUserId = createUserId; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getFileType() { + return fileType; + } + + public void setFileType(String fileType) { + this.fileType = fileType; + } + + public String getFileTypeName() { + return fileTypeName; + } + + public void setFileTypeName(String fileTypeName) { + this.fileTypeName = fileTypeName; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getPublishTime() { + return publishTime; + } + + public void setPublishTime(String publishTime) { + this.publishTime = publishTime; + } + + public String getPublisher() { + return publisher; + } + + public void setPublisher(String publisher) { + this.publisher = publisher; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/CertificateListModel.java b/app/src/main/java/com/casic/xz/meterage/model/CertificateListModel.java new file mode 100644 index 0000000..0eed915 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/CertificateListModel.java @@ -0,0 +1,229 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class CertificateListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String approvalStatus; + private String approvalStatusName; + private String calibrationMajor; + private String certificateReportCode; + private String certificateReportName; + private String createTime; + private String decisionItem; + private String id; + private String manufacturingNo; + private String measureCategory; + private String measureCategoryName; + private String measurePersonId; + private String measurePersonName; + private String orderCode; + private String processId; + private String sampleModel; + private String sampleName; + private String sampleNo; + private String taskId; + + public String getApprovalStatus() { + return approvalStatus; + } + + public void setApprovalStatus(String approvalStatus) { + this.approvalStatus = approvalStatus; + } + + public String getApprovalStatusName() { + return approvalStatusName; + } + + public void setApprovalStatusName(String approvalStatusName) { + this.approvalStatusName = approvalStatusName; + } + + public String getCalibrationMajor() { + return calibrationMajor; + } + + public void setCalibrationMajor(String calibrationMajor) { + this.calibrationMajor = calibrationMajor; + } + + public String getCertificateReportCode() { + return certificateReportCode; + } + + public void setCertificateReportCode(String certificateReportCode) { + this.certificateReportCode = certificateReportCode; + } + + public String getCertificateReportName() { + return certificateReportName; + } + + public void setCertificateReportName(String certificateReportName) { + this.certificateReportName = certificateReportName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getDecisionItem() { + return decisionItem; + } + + public void setDecisionItem(String decisionItem) { + this.decisionItem = decisionItem; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getMeasureCategory() { + return measureCategory; + } + + public void setMeasureCategory(String measureCategory) { + this.measureCategory = measureCategory; + } + + public String getMeasureCategoryName() { + return measureCategoryName; + } + + public void setMeasureCategoryName(String measureCategoryName) { + this.measureCategoryName = measureCategoryName; + } + + public String getMeasurePersonId() { + return measurePersonId; + } + + public void setMeasurePersonId(String measurePersonId) { + this.measurePersonId = measurePersonId; + } + + public String getMeasurePersonName() { + return measurePersonName; + } + + public void setMeasurePersonName(String measurePersonName) { + this.measurePersonName = measurePersonName; + } + + public String getOrderCode() { + return orderCode; + } + + public void setOrderCode(String orderCode) { + this.orderCode = orderCode; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getSampleModel() { + return sampleModel; + } + + public void setSampleModel(String sampleModel) { + this.sampleModel = sampleModel; + } + + public String getSampleName() { + return sampleName; + } + + public void setSampleName(String sampleName) { + this.sampleName = sampleName; + } + + public String getSampleNo() { + return sampleNo; + } + + public void setSampleNo(String sampleNo) { + this.sampleNo = sampleNo; + } + + public String getTaskId() { + return taskId; + } + + public void setTaskId(String taskId) { + this.taskId = taskId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/CertificateModel.java b/app/src/main/java/com/casic/xz/meterage/model/CertificateModel.java deleted file mode 100644 index ec0d25b..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/CertificateModel.java +++ /dev/null @@ -1,202 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class CertificateModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String approvalStatus; - private String approvalStatusName; - private String calibrationMajor; - private String certificateReportCode; - private String certificateReportName; - private String createTime; - private String decisionItem; - private String id; - private String manufacturingNo; - private String measurePersonId; - private String orderCode; - private String processId; - private String sampleModel; - private String sampleName; - private String sampleNo; - private String taskId; - - public String getApprovalStatus() { - return approvalStatus; - } - - public void setApprovalStatus(String approvalStatus) { - this.approvalStatus = approvalStatus; - } - - public String getApprovalStatusName() { - return approvalStatusName; - } - - public void setApprovalStatusName(String approvalStatusName) { - this.approvalStatusName = approvalStatusName; - } - - public String getCalibrationMajor() { - return calibrationMajor; - } - - public void setCalibrationMajor(String calibrationMajor) { - this.calibrationMajor = calibrationMajor; - } - - public String getCertificateReportCode() { - return certificateReportCode; - } - - public void setCertificateReportCode(String certificateReportCode) { - this.certificateReportCode = certificateReportCode; - } - - public String getCertificateReportName() { - return certificateReportName; - } - - public void setCertificateReportName(String certificateReportName) { - this.certificateReportName = certificateReportName; - } - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getDecisionItem() { - return decisionItem; - } - - public void setDecisionItem(String decisionItem) { - this.decisionItem = decisionItem; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getManufacturingNo() { - return manufacturingNo; - } - - public void setManufacturingNo(String manufacturingNo) { - this.manufacturingNo = manufacturingNo; - } - - public String getMeasurePersonId() { - return measurePersonId; - } - - public void setMeasurePersonId(String measurePersonId) { - this.measurePersonId = measurePersonId; - } - - public String getOrderCode() { - return orderCode; - } - - public void setOrderCode(String orderCode) { - this.orderCode = orderCode; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public String getSampleModel() { - return sampleModel; - } - - public void setSampleModel(String sampleModel) { - this.sampleModel = sampleModel; - } - - public String getSampleName() { - return sampleName; - } - - public void setSampleName(String sampleName) { - this.sampleName = sampleName; - } - - public String getSampleNo() { - return sampleNo; - } - - public void setSampleNo(String sampleNo) { - this.sampleNo = sampleNo; - } - - public String getTaskId() { - return taskId; - } - - public void setTaskId(String taskId) { - this.taskId = taskId; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index b0dec00..a4f3c46 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -345,4 +345,22 @@ @QueryMap limit: Map, @QueryMap offset: Map ): String + + /** + * 获取委托书详情 + */ + @POST("/business/certificateReport/detail") + suspend fun getCertificateReportDetail( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 提交证书 + */ + @POST("/business/certificateReport/submit") + suspend fun submit( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String } \ 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 cef55ec..8bf4070 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 @@ -800,4 +800,29 @@ AuthenticationHelper.token!!, requestBody, limitMap, offsetMap ) } + + /** + * 获取证书报告详情 + */ + suspend fun getCertificateReportDetail(id: String): String { + val param = JsonObject() + param.addProperty("id", id) + val requestBody = param.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getCertificateReportDetail(AuthenticationHelper.token!!, requestBody) + } + + /** + * 提交证书报告 + */ + suspend fun submit(id: String): String { + val param = JsonObject() + param.addProperty("formId", "ywglzsbg") + param.addProperty("id", id) + val requestBody = param.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.submit(AuthenticationHelper.token!!, requestBody) + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportActivity.kt index 2baefd2..fa4e129 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportActivity.kt @@ -19,15 +19,21 @@ "已通过", "未通过", "已取消", - "非草稿", - "未通过", "可打印" ) private var fragmentPages: ArrayList = ArrayList() init { - pageTitles.indices.forEach { - fragmentPages.add(CertificateReportFragment((it + 1).toString())) + pageTitles.forEach { + when (it) { + "草稿箱" -> fragmentPages.add(CertificateReportFragment("1")) + "待审批" -> fragmentPages.add(CertificateReportFragment("2")) + "审批中" -> fragmentPages.add(CertificateReportFragment("3")) + "已通过" -> fragmentPages.add(CertificateReportFragment("4")) + "未通过" -> fragmentPages.add(CertificateReportFragment("5")) + "已取消" -> fragmentPages.add(CertificateReportFragment("6")) + "可打印" -> fragmentPages.add(CertificateReportFragment("9")) + } } } diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt new file mode 100644 index 0000000..e30c7c3 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt @@ -0,0 +1,106 @@ +package com.casic.xz.meterage.view.home + +import android.view.View +import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.SubViewPagerAdapter +import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.casic.xz.meterage.fragment.certificate.ApprovalProcessFragment +import com.casic.xz.meterage.fragment.certificate.BasicInformationFragment +import com.casic.xz.meterage.fragment.certificate.ExceptionReportFragment +import com.casic.xz.meterage.model.CertificateDetailModel +import com.casic.xz.meterage.utils.LoadingDialogHub +import com.casic.xz.meterage.vm.CertificateViewModel +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.vm.LoadState +import kotlinx.android.synthetic.main.activity_certificate_detail.* + +//"草稿箱" -> "1" +//"待审批" -> "2" +//"审批中" -> "3" +//"已通过" -> "4" +//"未通过" -> "5" +//"已取消" -> "6" +//"可打印" -> "9" + +class CertificateReportDetailActivity : KotlinBaseActivity() { + + private var fragmentPages: ArrayList = ArrayList() + private lateinit var certificateViewModel: CertificateViewModel + private lateinit var detailModel: CertificateDetailModel.DataModel + + override fun initData() { + val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! + + when (args[0]) { + "1" -> { + approvalView.text = "提交" + } + "2" -> { + approvalView.text = "审批" + } + "9" -> { + approvalView.text = "打印" + } + else -> { + approvalView.visibility = View.GONE + } + } + + certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] + certificateViewModel.getCertificateReportDetail(args[1]) + certificateViewModel.certificateDetail.observe(this) { + if (it.code == 200) { + + detailModel = it.data + + fragmentPages.add(BasicInformationFragment(detailModel)) + fragmentPages.add(ApprovalProcessFragment()) + fragmentPages.add(ExceptionReportFragment()) + + val pageTitles = arrayOf("基础信息", "审批流程", "异常报告") + + approvalViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, pageTitles + ) + //绑定 + topTabLayout.setupWithViewPager(approvalViewPager) + } + } + + certificateViewModel.submitResult.observe(this) { + if (it.code == 200) { + "提交成功".show(this) + finish() + } + } + } + + override fun initEvent() { + leftBackView.setOnClickListener { finish() } + + approvalView.setOnClickListener { + certificateViewModel.submit(detailModel.id) + } + } + + override fun initLayoutView(): Int = R.layout.activity_certificate_detail + + override fun observeRequestState() { + certificateViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt index 080c380..77fe8a5 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt @@ -129,6 +129,5 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() initLayoutImmersionBar(rootView) - titleView.text = "委托需求" } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt index 735e530..e088887 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt @@ -4,7 +4,9 @@ import com.casic.xz.meterage.base.BaseApplication import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage -import com.casic.xz.meterage.model.CertificateModel +import com.casic.xz.meterage.model.ActionResultModel +import com.casic.xz.meterage.model.CertificateDetailModel +import com.casic.xz.meterage.model.CertificateListModel import com.casic.xz.meterage.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -19,7 +21,9 @@ class CertificateViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val certificateList = MutableLiveData() + val certificateList = MutableLiveData() + val certificateDetail = MutableLiveData() + val submitResult = MutableLiveData() fun getCertificateReportList( approvalStatus: String, @@ -47,8 +51,46 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - certificateList.value = gson.fromJson( - response, object : TypeToken() {}.type + certificateList.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + + fun getCertificateReportDetail(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.getCertificateReportDetail(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + certificateDetail.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + + fun submit(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.submit(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + submitResult.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { loadState.value = LoadState.Fail diff --git a/app/src/main/res/layout/activity_capability_detail.xml b/app/src/main/res/layout/activity_capability_detail.xml index 585960a..375d861 100644 --- a/app/src/main/res/layout/activity_capability_detail.xml +++ b/app/src/main/res/layout/activity_capability_detail.xml @@ -21,7 +21,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:padding="@dimen/dp_10"> + android:paddingHorizontal="@dimen/dp_10"> diff --git a/app/src/main/res/layout/activity_certificate_detail.xml b/app/src/main/res/layout/activity_certificate_detail.xml new file mode 100644 index 0000000..5bb3649 --- /dev/null +++ b/app/src/main/res/layout/activity_certificate_detail.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_standard_file_detail.xml b/app/src/main/res/layout/activity_standard_file_detail.xml index 7776230..02efb08 100644 --- a/app/src/main/res/layout/activity_standard_file_detail.xml +++ b/app/src/main/res/layout/activity_standard_file_detail.xml @@ -21,7 +21,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:padding="@dimen/dp_10"> + android:paddingHorizontal="@dimen/dp_10"> diff --git a/app/src/main/res/layout/fragment_certificate_approval_process.xml b/app/src/main/res/layout/fragment_certificate_approval_process.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/fragment_certificate_approval_process.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_certificate_basic_information.xml b/app/src/main/res/layout/fragment_certificate_basic_information.xml new file mode 100644 index 0000000..91882c7 --- /dev/null +++ b/app/src/main/res/layout/fragment_certificate_basic_information.xml @@ -0,0 +1,296 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_certificate_exception_report.xml b/app/src/main/res/layout/fragment_certificate_exception_report.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/fragment_certificate_exception_report.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_basic_information.xml b/app/src/main/res/layout/fragment_customer_basic_information.xml index e0debd1..dec78c7 100644 --- a/app/src/main/res/layout/fragment_customer_basic_information.xml +++ b/app/src/main/res/layout/fragment_customer_basic_information.xml @@ -12,7 +12,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:padding="@dimen/dp_10"> + android:paddingHorizontal="@dimen/dp_10"> diff --git a/app/build.gradle b/app/build.gradle index 5ba44f0..298f687 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -53,7 +53,8 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "XZJL_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" +// outputFileName = "XZJL_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "XZJL_" + getBuildDate() + "_Beta.apk" } } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4b914b5..ebea092 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -67,6 +67,7 @@ + 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 new file mode 100644 index 0000000..a75e566 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.certificate + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class ApprovalProcessFragment :KotlinBaseFragment(){ + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_certificate_approval_process + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt new file mode 100644 index 0000000..5882c3d --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt @@ -0,0 +1,77 @@ +package com.casic.xz.meterage.fragment.certificate + +import android.graphics.Color +import android.graphics.Paint +import android.util.Log +import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.watchAttachFile +import com.casic.xz.meterage.model.CertificateDetailModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.pengxh.kt.lite.extensions.toJson +import kotlinx.android.synthetic.main.fragment_certificate_basic_information.* + +class BasicInformationFragment(private val data: CertificateDetailModel.DataModel) : + KotlinBaseFragment() { + + override fun initData() { + val businessOriginal = data.businessOriginalRecord + + reportCodeView.text = data.certificateReportCode + originalCodeView.text = businessOriginal.originalRecordCode + checkCategoryView.text = businessOriginal.measureCategoryName + + Log.d( + "Casic", + "BasicInformationFragment => initData: ${businessOriginal.fileList.toJson()}" + ) +// basisFileView.text = businessOriginal.fileList + + val sampleInfo = businessOriginal.customerSampleInfo + sampleCodeView.text = sampleInfo.sampleNo + sampleNameView.text = sampleInfo.sampleName + manufacturingCodeView.text = sampleInfo.manufacturingNo + modelView.text = sampleInfo.sampleModel + entrustCodeView.text = sampleInfo.customerNo + entrustNameView.text = sampleInfo.customerName + entrustContactView.text = sampleInfo.phone + entrustEmailView.text = sampleInfo.postalCode + entrustAddressView.text = sampleInfo.customerAddress + senderView.text = sampleInfo.deliverer + senderContactView.text = sampleInfo.delivererTel + checkTypeView.text = sampleInfo.measureContent + remarkView.text = sampleInfo.remark + + estimateServedTimeView.text = businessOriginal.businessOrder.planDeliverTime + estimateCompleteTimeView.text = businessOriginal.businessOrder.requireOverTime + + if (data.certificateReportFile.isNullOrBlank()) { + reportFileView.text = "暂无附件" + } else { + val reportFileName = data.certificateReportFile + + reportFileView.text = reportFileName + val textPaint = reportFileView.paint + textPaint.flags = Paint.UNDERLINE_TEXT_FLAG + textPaint.isAntiAlias = true + reportFileView.setTextColor(Color.BLUE) + + reportFileView.setOnClickListener { + reportFileName.watchAttachFile(requireContext()) + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_certificate_basic_information + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt index 2f3c95c..b1df400 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt @@ -4,19 +4,24 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.addAll +import com.casic.xz.meterage.extensions.diffCurrentTime +import com.casic.xz.meterage.extensions.formatToDate import com.casic.xz.meterage.extensions.showEmptyPage -import com.casic.xz.meterage.model.CertificateModel +import com.casic.xz.meterage.model.CertificateListModel +import com.casic.xz.meterage.view.home.CertificateReportDetailActivity import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler import kotlinx.android.synthetic.main.fragment_certificate_report.* import kotlinx.android.synthetic.main.include_empty_view.* /** - * 计量法规 + * 证书报告 * * formId:ywglzsbg * */ @@ -24,8 +29,8 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var certificateViewModel: CertificateViewModel - private lateinit var certificateAdapter: NormalRecyclerAdapter - private var dataBeans: MutableList = ArrayList() + private lateinit var certificateAdapter: NormalRecyclerAdapter + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false @@ -119,40 +124,37 @@ } else { emptyView!!.hide() certificateAdapter = object : - NormalRecyclerAdapter( + NormalRecyclerAdapter( R.layout.item_certificate_rv_l, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, - item: CertificateModel.DataModel.RowsModel + item: CertificateListModel.DataModel.RowsModel ) { + val deltaT = item.createTime.diffCurrentTime() + val diffTime = if (deltaT < 24) { + "${deltaT}小时前" + } else { + item.createTime.formatToDate() + } + viewHolder.setText(R.id.reportNameView, item.certificateReportName) -// .setText(R.id.fileStateView, item.effectiveStatusName) -// .setText(R.id.remarkView, "备注：$remark") -// .setText(R.id.fileCodeView, "文件号：${item.fileNo}") -// .setText(R.id.releaseDateView, "实施时间：${item.publishTime}") -// -// if (!item.effectiveStatus.equals("1")) { -// viewHolder.setBackgroundColor( -// R.id.fileStateView, -// R.color.gray.convertColor(requireContext()) -// ) -// } + .setText(R.id.createTimeView, diffTime) + .setText(R.id.categoryView, "校验类别：${item.measureCategoryName}") + .setText(R.id.technicianView, "检定员：${item.measurePersonName}") + + viewHolder.setOnClickListener(R.id.showDetailButton) { + requireContext().navigatePageTo( + addAll(item.approvalStatus, item.id) + ) + } } } certificateRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) certificateRecyclerView.adapter = certificateAdapter - certificateAdapter.setOnItemClickedListener(object : - NormalRecyclerAdapter.OnItemClickedListener { - override fun onItemClicked( - position: Int, t: CertificateModel.DataModel.RowsModel - ) { -// requireContext().navigatePageTo(t.toJson()) - } - }) } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt new file mode 100644 index 0000000..2d5ac61 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.certificate + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class ExceptionReportFragment :KotlinBaseFragment(){ + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_certificate_exception_report + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/model/CertificateDetailModel.java b/app/src/main/java/com/casic/xz/meterage/model/CertificateDetailModel.java new file mode 100644 index 0000000..42efccd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/CertificateDetailModel.java @@ -0,0 +1,2080 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class CertificateDetailModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private String approvalSignId; + private String approvalStatus; + private String approvalStatusName; + private BusinessOriginalRecordModel businessOriginalRecord; + private String calibrationMajor; + private String calibrationMajorName; + private String certificateReportCategory; + private String certificateReportCode; + private String certificateReportFile; + private String certificateReportName; + private String createTime; + private String createUser; + private String expirationDate; + private String id; + private String isDel; + private String issuanceDate; + private String measureDeptId; + private String measurePersonId; + private String measureResult; + private String orderId; + private String originalRecordId; + private String printNum; + private String printStatus; + private String processId; + private String remark; + private String sampleId; + private String signId; + private String templateId; + private String updateTime; + + public String getApprovalSignId() { + return approvalSignId; + } + + public void setApprovalSignId(String approvalSignId) { + this.approvalSignId = approvalSignId; + } + + public String getApprovalStatus() { + return approvalStatus; + } + + public void setApprovalStatus(String approvalStatus) { + this.approvalStatus = approvalStatus; + } + + public String getApprovalStatusName() { + return approvalStatusName; + } + + public void setApprovalStatusName(String approvalStatusName) { + this.approvalStatusName = approvalStatusName; + } + + public BusinessOriginalRecordModel getBusinessOriginalRecord() { + return businessOriginalRecord; + } + + public void setBusinessOriginalRecord(BusinessOriginalRecordModel businessOriginalRecord) { + this.businessOriginalRecord = businessOriginalRecord; + } + + public String getCalibrationMajor() { + return calibrationMajor; + } + + public void setCalibrationMajor(String calibrationMajor) { + this.calibrationMajor = calibrationMajor; + } + + public String getCalibrationMajorName() { + return calibrationMajorName; + } + + public void setCalibrationMajorName(String calibrationMajorName) { + this.calibrationMajorName = calibrationMajorName; + } + + public String getCertificateReportCategory() { + return certificateReportCategory; + } + + public void setCertificateReportCategory(String certificateReportCategory) { + this.certificateReportCategory = certificateReportCategory; + } + + public String getCertificateReportCode() { + return certificateReportCode; + } + + public void setCertificateReportCode(String certificateReportCode) { + this.certificateReportCode = certificateReportCode; + } + + public String getCertificateReportFile() { + return certificateReportFile; + } + + public void setCertificateReportFile(String certificateReportFile) { + this.certificateReportFile = certificateReportFile; + } + + public String getCertificateReportName() { + return certificateReportName; + } + + public void setCertificateReportName(String certificateReportName) { + this.certificateReportName = certificateReportName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getExpirationDate() { + return expirationDate; + } + + public void setExpirationDate(String expirationDate) { + this.expirationDate = expirationDate; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String isIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIssuanceDate() { + return issuanceDate; + } + + public void setIssuanceDate(String issuanceDate) { + this.issuanceDate = issuanceDate; + } + + public String getMeasureDeptId() { + return measureDeptId; + } + + public void setMeasureDeptId(String measureDeptId) { + this.measureDeptId = measureDeptId; + } + + public String getMeasurePersonId() { + return measurePersonId; + } + + public void setMeasurePersonId(String measurePersonId) { + this.measurePersonId = measurePersonId; + } + + public String getMeasureResult() { + return measureResult; + } + + public void setMeasureResult(String measureResult) { + this.measureResult = measureResult; + } + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public String getOriginalRecordId() { + return originalRecordId; + } + + public void setOriginalRecordId(String originalRecordId) { + this.originalRecordId = originalRecordId; + } + + public String getPrintNum() { + return printNum; + } + + public void setPrintNum(String printNum) { + this.printNum = printNum; + } + + public String getPrintStatus() { + return printStatus; + } + + public void setPrintStatus(String printStatus) { + this.printStatus = printStatus; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSampleId() { + return sampleId; + } + + public void setSampleId(String sampleId) { + this.sampleId = sampleId; + } + + public String getSignId() { + return signId; + } + + public void setSignId(String signId) { + this.signId = signId; + } + + public String getTemplateId() { + return templateId; + } + + public void setTemplateId(String templateId) { + this.templateId = templateId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public static class BusinessOriginalRecordModel { + private BusinessEnvRecordModel businessEnvironmentRecord; + private BusinessOrderModel businessOrder; + private String calibrationPlace; + private String calibrationTime; + private String createTime; + private String createUser; + private BusinessOrderModel.CustomerSampleModel customerSampleInfo; + private String environmentId; + private List equipmentInfoList; + private List fileList; + private String id; + private String isDel; + private String measureCategory; + private String measureCategoryName; + private String orderId; + private String originalRecordCode; + private String originalRecordFile; + private String originalRecordName; + private String remark; + private String sampleId; + private String templateId; + private String templateName; + private String updateTime; + + public BusinessEnvRecordModel getBusinessEnvironmentRecord() { + return businessEnvironmentRecord; + } + + public void setBusinessEnvironmentRecord(BusinessEnvRecordModel businessEnvironmentRecord) { + this.businessEnvironmentRecord = businessEnvironmentRecord; + } + + public BusinessOrderModel getBusinessOrder() { + return businessOrder; + } + + public void setBusinessOrder(BusinessOrderModel businessOrder) { + this.businessOrder = businessOrder; + } + + public String getCalibrationPlace() { + return calibrationPlace; + } + + public void setCalibrationPlace(String calibrationPlace) { + this.calibrationPlace = calibrationPlace; + } + + public String getCalibrationTime() { + return calibrationTime; + } + + public void setCalibrationTime(String calibrationTime) { + this.calibrationTime = calibrationTime; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public BusinessOrderModel.CustomerSampleModel getCustomerSampleInfo() { + return customerSampleInfo; + } + + public void setCustomerSampleInfo(BusinessOrderModel.CustomerSampleModel customerSampleInfo) { + this.customerSampleInfo = customerSampleInfo; + } + + public String getEnvironmentId() { + return environmentId; + } + + public void setEnvironmentId(String environmentId) { + this.environmentId = environmentId; + } + + public List getEquipmentInfoList() { + return equipmentInfoList; + } + + public void setEquipmentInfoList(List equipmentInfoList) { + this.equipmentInfoList = equipmentInfoList; + } + + public List getFileList() { + return fileList; + } + + public void setFileList(List fileList) { + this.fileList = fileList; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String isIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getMeasureCategory() { + return measureCategory; + } + + public void setMeasureCategory(String measureCategory) { + this.measureCategory = measureCategory; + } + + public String getMeasureCategoryName() { + return measureCategoryName; + } + + public void setMeasureCategoryName(String measureCategoryName) { + this.measureCategoryName = measureCategoryName; + } + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public String getOriginalRecordCode() { + return originalRecordCode; + } + + public void setOriginalRecordCode(String originalRecordCode) { + this.originalRecordCode = originalRecordCode; + } + + public String getOriginalRecordFile() { + return originalRecordFile; + } + + public void setOriginalRecordFile(String originalRecordFile) { + this.originalRecordFile = originalRecordFile; + } + + public String getOriginalRecordName() { + return originalRecordName; + } + + public void setOriginalRecordName(String originalRecordName) { + this.originalRecordName = originalRecordName; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSampleId() { + return sampleId; + } + + public void setSampleId(String sampleId) { + this.sampleId = sampleId; + } + + public String getTemplateId() { + return templateId; + } + + public void setTemplateId(String templateId) { + this.templateId = templateId; + } + + public String getTemplateName() { + return templateName; + } + + public void setTemplateName(String templateName) { + this.templateName = templateName; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public static class BusinessEnvRecordModel { + private String createTime; + private String createUser; + private String environmentCode; + private String humidity; + private String id; + private String isDel; + private String outputVoltage; + private String recordTime; + private String recorder; + private String remark; + private String roomNumber; + private String temperature; + private String updateTime; + private String zeroGroundVoltage; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEnvironmentCode() { + return environmentCode; + } + + public void setEnvironmentCode(String environmentCode) { + this.environmentCode = environmentCode; + } + + public String getHumidity() { + return humidity; + } + + public void setHumidity(String humidity) { + this.humidity = humidity; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String isIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getOutputVoltage() { + return outputVoltage; + } + + public void setOutputVoltage(String outputVoltage) { + this.outputVoltage = outputVoltage; + } + + public String getRecordTime() { + return recordTime; + } + + public void setRecordTime(String recordTime) { + this.recordTime = recordTime; + } + + public String getRecorder() { + return recorder; + } + + public void setRecorder(String recorder) { + this.recorder = recorder; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getRoomNumber() { + return roomNumber; + } + + public void setRoomNumber(String roomNumber) { + this.roomNumber = roomNumber; + } + + public String getTemperature() { + return temperature; + } + + public void setTemperature(String temperature) { + this.temperature = temperature; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getZeroGroundVoltage() { + return zeroGroundVoltage; + } + + public void setZeroGroundVoltage(String zeroGroundVoltage) { + this.zeroGroundVoltage = zeroGroundVoltage; + } + } + + public static class BusinessOrderModel { + private String certifications; + private String createTime; + private String createUser; + private String customerAddress; + private String customerId; + private String customerName; + private String customerNo; + private String customerPhone; + private List customerSampleInfoList; + private String deliverTime; + private String deliverer; + private String delivererId; + private String delivererTel; + private String id; + private String isDel; + private String isUrgent; + private String minioFileName; + private String orderCode; + private String orderTime; + private String planDeliverTime; + private String remark; + private String requireOverTime; + private String status; + private String updateTime; + private String updateUser; + + public String getCertifications() { + return certifications; + } + + public void setCertifications(String certifications) { + this.certifications = certifications; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCustomerAddress() { + return customerAddress; + } + + public void setCustomerAddress(String customerAddress) { + this.customerAddress = customerAddress; + } + + public String getCustomerId() { + return customerId; + } + + public void setCustomerId(String customerId) { + this.customerId = customerId; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public String getCustomerPhone() { + return customerPhone; + } + + public void setCustomerPhone(String customerPhone) { + this.customerPhone = customerPhone; + } + + public List getCustomerSampleInfoList() { + return customerSampleInfoList; + } + + public void setCustomerSampleInfoList(List customerSampleInfoList) { + this.customerSampleInfoList = customerSampleInfoList; + } + + public String getDeliverTime() { + return deliverTime; + } + + public void setDeliverTime(String deliverTime) { + this.deliverTime = deliverTime; + } + + public String getDeliverer() { + return deliverer; + } + + public void setDeliverer(String deliverer) { + this.deliverer = deliverer; + } + + public String getDelivererId() { + return delivererId; + } + + public void setDelivererId(String delivererId) { + this.delivererId = delivererId; + } + + public String getDelivererTel() { + return delivererTel; + } + + public void setDelivererTel(String delivererTel) { + this.delivererTel = delivererTel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIsUrgent() { + return isUrgent; + } + + public void setIsUrgent(String isUrgent) { + this.isUrgent = isUrgent; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getOrderCode() { + return orderCode; + } + + public void setOrderCode(String orderCode) { + this.orderCode = orderCode; + } + + public String getOrderTime() { + return orderTime; + } + + public void setOrderTime(String orderTime) { + this.orderTime = orderTime; + } + + public String getPlanDeliverTime() { + return planDeliverTime; + } + + public void setPlanDeliverTime(String planDeliverTime) { + this.planDeliverTime = planDeliverTime; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getRequireOverTime() { + return requireOverTime; + } + + public void setRequireOverTime(String requireOverTime) { + this.requireOverTime = requireOverTime; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUpdateUser() { + return updateUser; + } + + public void setUpdateUser(String updateUser) { + this.updateUser = updateUser; + } + + public static class CustomerSampleModel { + private String abc; + private String appendix; + private String appendixDescn; + private String createTime; + private String createUser; + private String customerAddress; + private String customerId; + private String customerName; + private String customerNo; + private String deliverer; + private String delivererTel; + private String id; + private String isDel; + private String isExistSample; + private String labelBind; + private String manufacturer; + private String manufacturerCountry; + private String manufacturingDate; + private String manufacturingNo; + private String measureCategory; + private String measureCategoryName; + private String measureContent; + private String measureLastTime; + private String measurePeriod; + private String measureType; + private String measureTypeName; + private String minioFileName; + private String orderId; + private String phone; + private String postalCode; + private String powerVoltage; + private String remark; + private String sampleBelong; + private String sampleBelongName; + private String sampleModel; + private String sampleName; + private String sampleNo; + private String specialRequire; + private String updateTime; + private String updateUser; + private String validDeadline; + + public String getAbc() { + return abc; + } + + public void setAbc(String abc) { + this.abc = abc; + } + + public String getAppendix() { + return appendix; + } + + public void setAppendix(String appendix) { + this.appendix = appendix; + } + + public String getAppendixDescn() { + return appendixDescn; + } + + public void setAppendixDescn(String appendixDescn) { + this.appendixDescn = appendixDescn; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCustomerAddress() { + return customerAddress; + } + + public void setCustomerAddress(String customerAddress) { + this.customerAddress = customerAddress; + } + + public String getCustomerId() { + return customerId; + } + + public void setCustomerId(String customerId) { + this.customerId = customerId; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public String getDeliverer() { + return deliverer; + } + + public void setDeliverer(String deliverer) { + this.deliverer = deliverer; + } + + public String getDelivererTel() { + return delivererTel; + } + + public void setDelivererTel(String delivererTel) { + this.delivererTel = delivererTel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIsExistSample() { + return isExistSample; + } + + public void setIsExistSample(String isExistSample) { + this.isExistSample = isExistSample; + } + + public String getLabelBind() { + return labelBind; + } + + public void setLabelBind(String labelBind) { + this.labelBind = labelBind; + } + + public String getManufacturer() { + return manufacturer; + } + + public void setManufacturer(String manufacturer) { + this.manufacturer = manufacturer; + } + + public String getManufacturerCountry() { + return manufacturerCountry; + } + + public void setManufacturerCountry(String manufacturerCountry) { + this.manufacturerCountry = manufacturerCountry; + } + + public String getManufacturingDate() { + return manufacturingDate; + } + + public void setManufacturingDate(String manufacturingDate) { + this.manufacturingDate = manufacturingDate; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getMeasureCategory() { + return measureCategory; + } + + public void setMeasureCategory(String measureCategory) { + this.measureCategory = measureCategory; + } + + public String getMeasureCategoryName() { + return measureCategoryName; + } + + public void setMeasureCategoryName(String measureCategoryName) { + this.measureCategoryName = measureCategoryName; + } + + public String getMeasureContent() { + return measureContent; + } + + public void setMeasureContent(String measureContent) { + this.measureContent = measureContent; + } + + public String getMeasureLastTime() { + return measureLastTime; + } + + public void setMeasureLastTime(String measureLastTime) { + this.measureLastTime = measureLastTime; + } + + public String getMeasurePeriod() { + return measurePeriod; + } + + public void setMeasurePeriod(String measurePeriod) { + this.measurePeriod = measurePeriod; + } + + public String getMeasureType() { + return measureType; + } + + public void setMeasureType(String measureType) { + this.measureType = measureType; + } + + public String getMeasureTypeName() { + return measureTypeName; + } + + public void setMeasureTypeName(String measureTypeName) { + this.measureTypeName = measureTypeName; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getPostalCode() { + return postalCode; + } + + public void setPostalCode(String postalCode) { + this.postalCode = postalCode; + } + + public String getPowerVoltage() { + return powerVoltage; + } + + public void setPowerVoltage(String powerVoltage) { + this.powerVoltage = powerVoltage; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSampleBelong() { + return sampleBelong; + } + + public void setSampleBelong(String sampleBelong) { + this.sampleBelong = sampleBelong; + } + + public String getSampleBelongName() { + return sampleBelongName; + } + + public void setSampleBelongName(String sampleBelongName) { + this.sampleBelongName = sampleBelongName; + } + + public String getSampleModel() { + return sampleModel; + } + + public void setSampleModel(String sampleModel) { + this.sampleModel = sampleModel; + } + + public String getSampleName() { + return sampleName; + } + + public void setSampleName(String sampleName) { + this.sampleName = sampleName; + } + + public String getSampleNo() { + return sampleNo; + } + + public void setSampleNo(String sampleNo) { + this.sampleNo = sampleNo; + } + + public String getSpecialRequire() { + return specialRequire; + } + + public void setSpecialRequire(String specialRequire) { + this.specialRequire = specialRequire; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUpdateUser() { + return updateUser; + } + + public void setUpdateUser(String updateUser) { + this.updateUser = updateUser; + } + + public String getValidDeadline() { + return validDeadline; + } + + public void setValidDeadline(String validDeadline) { + this.validDeadline = validDeadline; + } + } + } + + public static class EquipmentModel { + private String abc; + private String abcName; + private String applyRelationId; + private String assetNo; + private String assetSource; + private String assetType; + private String assetTypeName; + private String attribute; + private String capitalSource; + private String capitalSourceName; + private String cardEstablishmentDate; + private String createTime; + private String createUser; + private String depreciationMethod; + private String depreciationMethodName; + private String depreciationPeriod; + private String enableDate; + private String equipmentCategory; + private String equipmentCategoryName; + private String equipmentName; + private String equipmentNo; + private String equipmentSpecifications; + private String equipmentType; + private String equipmentTypeName; + private String fileList; + private String id; + private String installIncidentalExpenses; + private String installPlace; + private String intactState; + private String isCalibrationTestEquipment; + private String isDel; + private String isFixedAssets; + private String isMeasureAccount; + private String isStandardSupportEquipment; + private String labelBind; + private String majorCategory; + private String majorCategoryName; + private String managerLevel; + private String managerLevelName; + private String managerState; + private String managerStateName; + private String manufacturer; + private String manufacturerCountry; + private String manufacturingDate; + private String manufacturingNo; + private String mesureCycle; + private String mesureDate; + private String mesureDept; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String mesureType; + private String mesureTypeName; + private String modelNo; + private String originValue; + private String overallDimension; + private String presentOriginValue; + private String purpose; + private String remark; + private String singlePrice; + private String supportStandardEquipmentName; + private String supportStandardEquipmentNo; + private String technicalLevel; + private String uncertainty; + private String updateTime; + private String useDept; + private String useDeptName; + private String usePerson; + private String usePersonName; + private String validDate; + private String version; + private String weight; + + public String getAbc() { + return abc; + } + + public void setAbc(String abc) { + this.abc = abc; + } + + public String getAbcName() { + return abcName; + } + + public void setAbcName(String abcName) { + this.abcName = abcName; + } + + public String getApplyRelationId() { + return applyRelationId; + } + + public void setApplyRelationId(String applyRelationId) { + this.applyRelationId = applyRelationId; + } + + public String getAssetNo() { + return assetNo; + } + + public void setAssetNo(String assetNo) { + this.assetNo = assetNo; + } + + public String getAssetSource() { + return assetSource; + } + + public void setAssetSource(String assetSource) { + this.assetSource = assetSource; + } + + public String getAssetType() { + return assetType; + } + + public void setAssetType(String assetType) { + this.assetType = assetType; + } + + public String getAssetTypeName() { + return assetTypeName; + } + + public void setAssetTypeName(String assetTypeName) { + this.assetTypeName = assetTypeName; + } + + public String getAttribute() { + return attribute; + } + + public void setAttribute(String attribute) { + this.attribute = attribute; + } + + public String getCapitalSource() { + return capitalSource; + } + + public void setCapitalSource(String capitalSource) { + this.capitalSource = capitalSource; + } + + public String getCapitalSourceName() { + return capitalSourceName; + } + + public void setCapitalSourceName(String capitalSourceName) { + this.capitalSourceName = capitalSourceName; + } + + public String getCardEstablishmentDate() { + return cardEstablishmentDate; + } + + public void setCardEstablishmentDate(String cardEstablishmentDate) { + this.cardEstablishmentDate = cardEstablishmentDate; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getDepreciationMethod() { + return depreciationMethod; + } + + public void setDepreciationMethod(String depreciationMethod) { + this.depreciationMethod = depreciationMethod; + } + + public String getDepreciationMethodName() { + return depreciationMethodName; + } + + public void setDepreciationMethodName(String depreciationMethodName) { + this.depreciationMethodName = depreciationMethodName; + } + + public String getDepreciationPeriod() { + return depreciationPeriod; + } + + public void setDepreciationPeriod(String depreciationPeriod) { + this.depreciationPeriod = depreciationPeriod; + } + + public String getEnableDate() { + return enableDate; + } + + public void setEnableDate(String enableDate) { + this.enableDate = enableDate; + } + + public String getEquipmentCategory() { + return equipmentCategory; + } + + public void setEquipmentCategory(String equipmentCategory) { + this.equipmentCategory = equipmentCategory; + } + + public String getEquipmentCategoryName() { + return equipmentCategoryName; + } + + public void setEquipmentCategoryName(String equipmentCategoryName) { + this.equipmentCategoryName = equipmentCategoryName; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getEquipmentSpecifications() { + return equipmentSpecifications; + } + + public void setEquipmentSpecifications(String equipmentSpecifications) { + this.equipmentSpecifications = equipmentSpecifications; + } + + public String getEquipmentType() { + return equipmentType; + } + + public void setEquipmentType(String equipmentType) { + this.equipmentType = equipmentType; + } + + public String getEquipmentTypeName() { + return equipmentTypeName; + } + + public void setEquipmentTypeName(String equipmentTypeName) { + this.equipmentTypeName = equipmentTypeName; + } + + public String getFileList() { + return fileList; + } + + public void setFileList(String fileList) { + this.fileList = fileList; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInstallIncidentalExpenses() { + return installIncidentalExpenses; + } + + public void setInstallIncidentalExpenses(String installIncidentalExpenses) { + this.installIncidentalExpenses = installIncidentalExpenses; + } + + public String getInstallPlace() { + return installPlace; + } + + public void setInstallPlace(String installPlace) { + this.installPlace = installPlace; + } + + public String getIntactState() { + return intactState; + } + + public void setIntactState(String intactState) { + this.intactState = intactState; + } + + public String getIsCalibrationTestEquipment() { + return isCalibrationTestEquipment; + } + + public void setIsCalibrationTestEquipment(String isCalibrationTestEquipment) { + this.isCalibrationTestEquipment = isCalibrationTestEquipment; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIsFixedAssets() { + return isFixedAssets; + } + + public void setIsFixedAssets(String isFixedAssets) { + this.isFixedAssets = isFixedAssets; + } + + public String getIsMeasureAccount() { + return isMeasureAccount; + } + + public void setIsMeasureAccount(String isMeasureAccount) { + this.isMeasureAccount = isMeasureAccount; + } + + public String getIsStandardSupportEquipment() { + return isStandardSupportEquipment; + } + + public void setIsStandardSupportEquipment(String isStandardSupportEquipment) { + this.isStandardSupportEquipment = isStandardSupportEquipment; + } + + public String getLabelBind() { + return labelBind; + } + + public void setLabelBind(String labelBind) { + this.labelBind = labelBind; + } + + public String getMajorCategory() { + return majorCategory; + } + + public void setMajorCategory(String majorCategory) { + this.majorCategory = majorCategory; + } + + public String getMajorCategoryName() { + return majorCategoryName; + } + + public void setMajorCategoryName(String majorCategoryName) { + this.majorCategoryName = majorCategoryName; + } + + public String getManagerLevel() { + return managerLevel; + } + + public void setManagerLevel(String managerLevel) { + this.managerLevel = managerLevel; + } + + public String getManagerLevelName() { + return managerLevelName; + } + + public void setManagerLevelName(String managerLevelName) { + this.managerLevelName = managerLevelName; + } + + public String getManagerState() { + return managerState; + } + + public void setManagerState(String managerState) { + this.managerState = managerState; + } + + public String getManagerStateName() { + return managerStateName; + } + + public void setManagerStateName(String managerStateName) { + this.managerStateName = managerStateName; + } + + public String getManufacturer() { + return manufacturer; + } + + public void setManufacturer(String manufacturer) { + this.manufacturer = manufacturer; + } + + public String getManufacturerCountry() { + return manufacturerCountry; + } + + public void setManufacturerCountry(String manufacturerCountry) { + this.manufacturerCountry = manufacturerCountry; + } + + public String getManufacturingDate() { + return manufacturingDate; + } + + public void setManufacturingDate(String manufacturingDate) { + this.manufacturingDate = manufacturingDate; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getMesureCycle() { + return mesureCycle; + } + + public void setMesureCycle(String mesureCycle) { + this.mesureCycle = mesureCycle; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureDept() { + return mesureDept; + } + + public void setMesureDept(String mesureDept) { + this.mesureDept = mesureDept; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getMesureType() { + return mesureType; + } + + public void setMesureType(String mesureType) { + this.mesureType = mesureType; + } + + public String getMesureTypeName() { + return mesureTypeName; + } + + public void setMesureTypeName(String mesureTypeName) { + this.mesureTypeName = mesureTypeName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getOriginValue() { + return originValue; + } + + public void setOriginValue(String originValue) { + this.originValue = originValue; + } + + public String getOverallDimension() { + return overallDimension; + } + + public void setOverallDimension(String overallDimension) { + this.overallDimension = overallDimension; + } + + public String getPresentOriginValue() { + return presentOriginValue; + } + + public void setPresentOriginValue(String presentOriginValue) { + this.presentOriginValue = presentOriginValue; + } + + public String getPurpose() { + return purpose; + } + + public void setPurpose(String purpose) { + this.purpose = purpose; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSinglePrice() { + return singlePrice; + } + + public void setSinglePrice(String singlePrice) { + this.singlePrice = singlePrice; + } + + public String getSupportStandardEquipmentName() { + return supportStandardEquipmentName; + } + + public void setSupportStandardEquipmentName(String supportStandardEquipmentName) { + this.supportStandardEquipmentName = supportStandardEquipmentName; + } + + public String getSupportStandardEquipmentNo() { + return supportStandardEquipmentNo; + } + + public void setSupportStandardEquipmentNo(String supportStandardEquipmentNo) { + this.supportStandardEquipmentNo = supportStandardEquipmentNo; + } + + public String getTechnicalLevel() { + return technicalLevel; + } + + public void setTechnicalLevel(String technicalLevel) { + this.technicalLevel = technicalLevel; + } + + public String getUncertainty() { + return uncertainty; + } + + public void setUncertainty(String uncertainty) { + this.uncertainty = uncertainty; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDept() { + return useDept; + } + + public void setUseDept(String useDept) { + this.useDept = useDept; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getUsePerson() { + return usePerson; + } + + public void setUsePerson(String usePerson) { + this.usePerson = usePerson; + } + + public String getUsePersonName() { + return usePersonName; + } + + public void setUsePersonName(String usePersonName) { + this.usePersonName = usePersonName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + + public String getVersion() { + return version; + } + + public void setVersion(String version) { + this.version = version; + } + + public String getWeight() { + return weight; + } + + public void setWeight(String weight) { + this.weight = weight; + } + } + + public static class FileModel { + private String approvalStatus; + private String approvalStatusName; + private String createTime; + private String createUser; + private String createUserId; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String fileType; + private String fileTypeName; + private String id; + private String isDel; + private String minioFileName; + private String processId; + private String publishTime; + private String publisher; + private String remark; + private String updateTime; + + public String getApprovalStatus() { + return approvalStatus; + } + + public void setApprovalStatus(String approvalStatus) { + this.approvalStatus = approvalStatus; + } + + public String getApprovalStatusName() { + return approvalStatusName; + } + + public void setApprovalStatusName(String approvalStatusName) { + this.approvalStatusName = approvalStatusName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCreateUserId() { + return createUserId; + } + + public void setCreateUserId(String createUserId) { + this.createUserId = createUserId; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getFileType() { + return fileType; + } + + public void setFileType(String fileType) { + this.fileType = fileType; + } + + public String getFileTypeName() { + return fileTypeName; + } + + public void setFileTypeName(String fileTypeName) { + this.fileTypeName = fileTypeName; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getPublishTime() { + return publishTime; + } + + public void setPublishTime(String publishTime) { + this.publishTime = publishTime; + } + + public String getPublisher() { + return publisher; + } + + public void setPublisher(String publisher) { + this.publisher = publisher; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/CertificateListModel.java b/app/src/main/java/com/casic/xz/meterage/model/CertificateListModel.java new file mode 100644 index 0000000..0eed915 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/CertificateListModel.java @@ -0,0 +1,229 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class CertificateListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String approvalStatus; + private String approvalStatusName; + private String calibrationMajor; + private String certificateReportCode; + private String certificateReportName; + private String createTime; + private String decisionItem; + private String id; + private String manufacturingNo; + private String measureCategory; + private String measureCategoryName; + private String measurePersonId; + private String measurePersonName; + private String orderCode; + private String processId; + private String sampleModel; + private String sampleName; + private String sampleNo; + private String taskId; + + public String getApprovalStatus() { + return approvalStatus; + } + + public void setApprovalStatus(String approvalStatus) { + this.approvalStatus = approvalStatus; + } + + public String getApprovalStatusName() { + return approvalStatusName; + } + + public void setApprovalStatusName(String approvalStatusName) { + this.approvalStatusName = approvalStatusName; + } + + public String getCalibrationMajor() { + return calibrationMajor; + } + + public void setCalibrationMajor(String calibrationMajor) { + this.calibrationMajor = calibrationMajor; + } + + public String getCertificateReportCode() { + return certificateReportCode; + } + + public void setCertificateReportCode(String certificateReportCode) { + this.certificateReportCode = certificateReportCode; + } + + public String getCertificateReportName() { + return certificateReportName; + } + + public void setCertificateReportName(String certificateReportName) { + this.certificateReportName = certificateReportName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getDecisionItem() { + return decisionItem; + } + + public void setDecisionItem(String decisionItem) { + this.decisionItem = decisionItem; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getMeasureCategory() { + return measureCategory; + } + + public void setMeasureCategory(String measureCategory) { + this.measureCategory = measureCategory; + } + + public String getMeasureCategoryName() { + return measureCategoryName; + } + + public void setMeasureCategoryName(String measureCategoryName) { + this.measureCategoryName = measureCategoryName; + } + + public String getMeasurePersonId() { + return measurePersonId; + } + + public void setMeasurePersonId(String measurePersonId) { + this.measurePersonId = measurePersonId; + } + + public String getMeasurePersonName() { + return measurePersonName; + } + + public void setMeasurePersonName(String measurePersonName) { + this.measurePersonName = measurePersonName; + } + + public String getOrderCode() { + return orderCode; + } + + public void setOrderCode(String orderCode) { + this.orderCode = orderCode; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getSampleModel() { + return sampleModel; + } + + public void setSampleModel(String sampleModel) { + this.sampleModel = sampleModel; + } + + public String getSampleName() { + return sampleName; + } + + public void setSampleName(String sampleName) { + this.sampleName = sampleName; + } + + public String getSampleNo() { + return sampleNo; + } + + public void setSampleNo(String sampleNo) { + this.sampleNo = sampleNo; + } + + public String getTaskId() { + return taskId; + } + + public void setTaskId(String taskId) { + this.taskId = taskId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/CertificateModel.java b/app/src/main/java/com/casic/xz/meterage/model/CertificateModel.java deleted file mode 100644 index ec0d25b..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/CertificateModel.java +++ /dev/null @@ -1,202 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class CertificateModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String approvalStatus; - private String approvalStatusName; - private String calibrationMajor; - private String certificateReportCode; - private String certificateReportName; - private String createTime; - private String decisionItem; - private String id; - private String manufacturingNo; - private String measurePersonId; - private String orderCode; - private String processId; - private String sampleModel; - private String sampleName; - private String sampleNo; - private String taskId; - - public String getApprovalStatus() { - return approvalStatus; - } - - public void setApprovalStatus(String approvalStatus) { - this.approvalStatus = approvalStatus; - } - - public String getApprovalStatusName() { - return approvalStatusName; - } - - public void setApprovalStatusName(String approvalStatusName) { - this.approvalStatusName = approvalStatusName; - } - - public String getCalibrationMajor() { - return calibrationMajor; - } - - public void setCalibrationMajor(String calibrationMajor) { - this.calibrationMajor = calibrationMajor; - } - - public String getCertificateReportCode() { - return certificateReportCode; - } - - public void setCertificateReportCode(String certificateReportCode) { - this.certificateReportCode = certificateReportCode; - } - - public String getCertificateReportName() { - return certificateReportName; - } - - public void setCertificateReportName(String certificateReportName) { - this.certificateReportName = certificateReportName; - } - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getDecisionItem() { - return decisionItem; - } - - public void setDecisionItem(String decisionItem) { - this.decisionItem = decisionItem; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getManufacturingNo() { - return manufacturingNo; - } - - public void setManufacturingNo(String manufacturingNo) { - this.manufacturingNo = manufacturingNo; - } - - public String getMeasurePersonId() { - return measurePersonId; - } - - public void setMeasurePersonId(String measurePersonId) { - this.measurePersonId = measurePersonId; - } - - public String getOrderCode() { - return orderCode; - } - - public void setOrderCode(String orderCode) { - this.orderCode = orderCode; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public String getSampleModel() { - return sampleModel; - } - - public void setSampleModel(String sampleModel) { - this.sampleModel = sampleModel; - } - - public String getSampleName() { - return sampleName; - } - - public void setSampleName(String sampleName) { - this.sampleName = sampleName; - } - - public String getSampleNo() { - return sampleNo; - } - - public void setSampleNo(String sampleNo) { - this.sampleNo = sampleNo; - } - - public String getTaskId() { - return taskId; - } - - public void setTaskId(String taskId) { - this.taskId = taskId; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index b0dec00..a4f3c46 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -345,4 +345,22 @@ @QueryMap limit: Map, @QueryMap offset: Map ): String + + /** + * 获取委托书详情 + */ + @POST("/business/certificateReport/detail") + suspend fun getCertificateReportDetail( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 提交证书 + */ + @POST("/business/certificateReport/submit") + suspend fun submit( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String } \ 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 cef55ec..8bf4070 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 @@ -800,4 +800,29 @@ AuthenticationHelper.token!!, requestBody, limitMap, offsetMap ) } + + /** + * 获取证书报告详情 + */ + suspend fun getCertificateReportDetail(id: String): String { + val param = JsonObject() + param.addProperty("id", id) + val requestBody = param.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getCertificateReportDetail(AuthenticationHelper.token!!, requestBody) + } + + /** + * 提交证书报告 + */ + suspend fun submit(id: String): String { + val param = JsonObject() + param.addProperty("formId", "ywglzsbg") + param.addProperty("id", id) + val requestBody = param.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.submit(AuthenticationHelper.token!!, requestBody) + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportActivity.kt index 2baefd2..fa4e129 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportActivity.kt @@ -19,15 +19,21 @@ "已通过", "未通过", "已取消", - "非草稿", - "未通过", "可打印" ) private var fragmentPages: ArrayList = ArrayList() init { - pageTitles.indices.forEach { - fragmentPages.add(CertificateReportFragment((it + 1).toString())) + pageTitles.forEach { + when (it) { + "草稿箱" -> fragmentPages.add(CertificateReportFragment("1")) + "待审批" -> fragmentPages.add(CertificateReportFragment("2")) + "审批中" -> fragmentPages.add(CertificateReportFragment("3")) + "已通过" -> fragmentPages.add(CertificateReportFragment("4")) + "未通过" -> fragmentPages.add(CertificateReportFragment("5")) + "已取消" -> fragmentPages.add(CertificateReportFragment("6")) + "可打印" -> fragmentPages.add(CertificateReportFragment("9")) + } } } diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt new file mode 100644 index 0000000..e30c7c3 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt @@ -0,0 +1,106 @@ +package com.casic.xz.meterage.view.home + +import android.view.View +import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.SubViewPagerAdapter +import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.casic.xz.meterage.fragment.certificate.ApprovalProcessFragment +import com.casic.xz.meterage.fragment.certificate.BasicInformationFragment +import com.casic.xz.meterage.fragment.certificate.ExceptionReportFragment +import com.casic.xz.meterage.model.CertificateDetailModel +import com.casic.xz.meterage.utils.LoadingDialogHub +import com.casic.xz.meterage.vm.CertificateViewModel +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.vm.LoadState +import kotlinx.android.synthetic.main.activity_certificate_detail.* + +//"草稿箱" -> "1" +//"待审批" -> "2" +//"审批中" -> "3" +//"已通过" -> "4" +//"未通过" -> "5" +//"已取消" -> "6" +//"可打印" -> "9" + +class CertificateReportDetailActivity : KotlinBaseActivity() { + + private var fragmentPages: ArrayList = ArrayList() + private lateinit var certificateViewModel: CertificateViewModel + private lateinit var detailModel: CertificateDetailModel.DataModel + + override fun initData() { + val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! + + when (args[0]) { + "1" -> { + approvalView.text = "提交" + } + "2" -> { + approvalView.text = "审批" + } + "9" -> { + approvalView.text = "打印" + } + else -> { + approvalView.visibility = View.GONE + } + } + + certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] + certificateViewModel.getCertificateReportDetail(args[1]) + certificateViewModel.certificateDetail.observe(this) { + if (it.code == 200) { + + detailModel = it.data + + fragmentPages.add(BasicInformationFragment(detailModel)) + fragmentPages.add(ApprovalProcessFragment()) + fragmentPages.add(ExceptionReportFragment()) + + val pageTitles = arrayOf("基础信息", "审批流程", "异常报告") + + approvalViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, pageTitles + ) + //绑定 + topTabLayout.setupWithViewPager(approvalViewPager) + } + } + + certificateViewModel.submitResult.observe(this) { + if (it.code == 200) { + "提交成功".show(this) + finish() + } + } + } + + override fun initEvent() { + leftBackView.setOnClickListener { finish() } + + approvalView.setOnClickListener { + certificateViewModel.submit(detailModel.id) + } + } + + override fun initLayoutView(): Int = R.layout.activity_certificate_detail + + override fun observeRequestState() { + certificateViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt index 080c380..77fe8a5 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt @@ -129,6 +129,5 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() initLayoutImmersionBar(rootView) - titleView.text = "委托需求" } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt index 735e530..e088887 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt @@ -4,7 +4,9 @@ import com.casic.xz.meterage.base.BaseApplication import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage -import com.casic.xz.meterage.model.CertificateModel +import com.casic.xz.meterage.model.ActionResultModel +import com.casic.xz.meterage.model.CertificateDetailModel +import com.casic.xz.meterage.model.CertificateListModel import com.casic.xz.meterage.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -19,7 +21,9 @@ class CertificateViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val certificateList = MutableLiveData() + val certificateList = MutableLiveData() + val certificateDetail = MutableLiveData() + val submitResult = MutableLiveData() fun getCertificateReportList( approvalStatus: String, @@ -47,8 +51,46 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - certificateList.value = gson.fromJson( - response, object : TypeToken() {}.type + certificateList.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + + fun getCertificateReportDetail(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.getCertificateReportDetail(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + certificateDetail.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + + fun submit(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.submit(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + submitResult.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { loadState.value = LoadState.Fail diff --git a/app/src/main/res/layout/activity_capability_detail.xml b/app/src/main/res/layout/activity_capability_detail.xml index 585960a..375d861 100644 --- a/app/src/main/res/layout/activity_capability_detail.xml +++ b/app/src/main/res/layout/activity_capability_detail.xml @@ -21,7 +21,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:padding="@dimen/dp_10"> + android:paddingHorizontal="@dimen/dp_10"> diff --git a/app/src/main/res/layout/activity_certificate_detail.xml b/app/src/main/res/layout/activity_certificate_detail.xml new file mode 100644 index 0000000..5bb3649 --- /dev/null +++ b/app/src/main/res/layout/activity_certificate_detail.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_standard_file_detail.xml b/app/src/main/res/layout/activity_standard_file_detail.xml index 7776230..02efb08 100644 --- a/app/src/main/res/layout/activity_standard_file_detail.xml +++ b/app/src/main/res/layout/activity_standard_file_detail.xml @@ -21,7 +21,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:padding="@dimen/dp_10"> + android:paddingHorizontal="@dimen/dp_10"> diff --git a/app/src/main/res/layout/fragment_certificate_approval_process.xml b/app/src/main/res/layout/fragment_certificate_approval_process.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/fragment_certificate_approval_process.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_certificate_basic_information.xml b/app/src/main/res/layout/fragment_certificate_basic_information.xml new file mode 100644 index 0000000..91882c7 --- /dev/null +++ b/app/src/main/res/layout/fragment_certificate_basic_information.xml @@ -0,0 +1,296 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_certificate_exception_report.xml b/app/src/main/res/layout/fragment_certificate_exception_report.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/fragment_certificate_exception_report.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_basic_information.xml b/app/src/main/res/layout/fragment_customer_basic_information.xml index e0debd1..dec78c7 100644 --- a/app/src/main/res/layout/fragment_customer_basic_information.xml +++ b/app/src/main/res/layout/fragment_customer_basic_information.xml @@ -12,7 +12,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:padding="@dimen/dp_10"> + android:paddingHorizontal="@dimen/dp_10"> diff --git a/app/src/main/res/layout/fragment_device_basic_information.xml b/app/src/main/res/layout/fragment_device_basic_information.xml index 0a7efc6..9d9cfac 100644 --- a/app/src/main/res/layout/fragment_device_basic_information.xml +++ b/app/src/main/res/layout/fragment_device_basic_information.xml @@ -12,7 +12,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:padding="@dimen/dp_10"> + android:paddingHorizontal="@dimen/dp_10"> diff --git a/app/build.gradle b/app/build.gradle index 5ba44f0..298f687 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -53,7 +53,8 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "XZJL_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" +// outputFileName = "XZJL_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "XZJL_" + getBuildDate() + "_Beta.apk" } } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4b914b5..ebea092 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -67,6 +67,7 @@ + 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 new file mode 100644 index 0000000..a75e566 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.certificate + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class ApprovalProcessFragment :KotlinBaseFragment(){ + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_certificate_approval_process + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt new file mode 100644 index 0000000..5882c3d --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt @@ -0,0 +1,77 @@ +package com.casic.xz.meterage.fragment.certificate + +import android.graphics.Color +import android.graphics.Paint +import android.util.Log +import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.watchAttachFile +import com.casic.xz.meterage.model.CertificateDetailModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.pengxh.kt.lite.extensions.toJson +import kotlinx.android.synthetic.main.fragment_certificate_basic_information.* + +class BasicInformationFragment(private val data: CertificateDetailModel.DataModel) : + KotlinBaseFragment() { + + override fun initData() { + val businessOriginal = data.businessOriginalRecord + + reportCodeView.text = data.certificateReportCode + originalCodeView.text = businessOriginal.originalRecordCode + checkCategoryView.text = businessOriginal.measureCategoryName + + Log.d( + "Casic", + "BasicInformationFragment => initData: ${businessOriginal.fileList.toJson()}" + ) +// basisFileView.text = businessOriginal.fileList + + val sampleInfo = businessOriginal.customerSampleInfo + sampleCodeView.text = sampleInfo.sampleNo + sampleNameView.text = sampleInfo.sampleName + manufacturingCodeView.text = sampleInfo.manufacturingNo + modelView.text = sampleInfo.sampleModel + entrustCodeView.text = sampleInfo.customerNo + entrustNameView.text = sampleInfo.customerName + entrustContactView.text = sampleInfo.phone + entrustEmailView.text = sampleInfo.postalCode + entrustAddressView.text = sampleInfo.customerAddress + senderView.text = sampleInfo.deliverer + senderContactView.text = sampleInfo.delivererTel + checkTypeView.text = sampleInfo.measureContent + remarkView.text = sampleInfo.remark + + estimateServedTimeView.text = businessOriginal.businessOrder.planDeliverTime + estimateCompleteTimeView.text = businessOriginal.businessOrder.requireOverTime + + if (data.certificateReportFile.isNullOrBlank()) { + reportFileView.text = "暂无附件" + } else { + val reportFileName = data.certificateReportFile + + reportFileView.text = reportFileName + val textPaint = reportFileView.paint + textPaint.flags = Paint.UNDERLINE_TEXT_FLAG + textPaint.isAntiAlias = true + reportFileView.setTextColor(Color.BLUE) + + reportFileView.setOnClickListener { + reportFileName.watchAttachFile(requireContext()) + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_certificate_basic_information + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt index 2f3c95c..b1df400 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt @@ -4,19 +4,24 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.addAll +import com.casic.xz.meterage.extensions.diffCurrentTime +import com.casic.xz.meterage.extensions.formatToDate import com.casic.xz.meterage.extensions.showEmptyPage -import com.casic.xz.meterage.model.CertificateModel +import com.casic.xz.meterage.model.CertificateListModel +import com.casic.xz.meterage.view.home.CertificateReportDetailActivity import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler import kotlinx.android.synthetic.main.fragment_certificate_report.* import kotlinx.android.synthetic.main.include_empty_view.* /** - * 计量法规 + * 证书报告 * * formId:ywglzsbg * */ @@ -24,8 +29,8 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var certificateViewModel: CertificateViewModel - private lateinit var certificateAdapter: NormalRecyclerAdapter - private var dataBeans: MutableList = ArrayList() + private lateinit var certificateAdapter: NormalRecyclerAdapter + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false @@ -119,40 +124,37 @@ } else { emptyView!!.hide() certificateAdapter = object : - NormalRecyclerAdapter( + NormalRecyclerAdapter( R.layout.item_certificate_rv_l, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, - item: CertificateModel.DataModel.RowsModel + item: CertificateListModel.DataModel.RowsModel ) { + val deltaT = item.createTime.diffCurrentTime() + val diffTime = if (deltaT < 24) { + "${deltaT}小时前" + } else { + item.createTime.formatToDate() + } + viewHolder.setText(R.id.reportNameView, item.certificateReportName) -// .setText(R.id.fileStateView, item.effectiveStatusName) -// .setText(R.id.remarkView, "备注：$remark") -// .setText(R.id.fileCodeView, "文件号：${item.fileNo}") -// .setText(R.id.releaseDateView, "实施时间：${item.publishTime}") -// -// if (!item.effectiveStatus.equals("1")) { -// viewHolder.setBackgroundColor( -// R.id.fileStateView, -// R.color.gray.convertColor(requireContext()) -// ) -// } + .setText(R.id.createTimeView, diffTime) + .setText(R.id.categoryView, "校验类别：${item.measureCategoryName}") + .setText(R.id.technicianView, "检定员：${item.measurePersonName}") + + viewHolder.setOnClickListener(R.id.showDetailButton) { + requireContext().navigatePageTo( + addAll(item.approvalStatus, item.id) + ) + } } } certificateRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) certificateRecyclerView.adapter = certificateAdapter - certificateAdapter.setOnItemClickedListener(object : - NormalRecyclerAdapter.OnItemClickedListener { - override fun onItemClicked( - position: Int, t: CertificateModel.DataModel.RowsModel - ) { -// requireContext().navigatePageTo(t.toJson()) - } - }) } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt new file mode 100644 index 0000000..2d5ac61 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.certificate + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class ExceptionReportFragment :KotlinBaseFragment(){ + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_certificate_exception_report + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/model/CertificateDetailModel.java b/app/src/main/java/com/casic/xz/meterage/model/CertificateDetailModel.java new file mode 100644 index 0000000..42efccd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/CertificateDetailModel.java @@ -0,0 +1,2080 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class CertificateDetailModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private String approvalSignId; + private String approvalStatus; + private String approvalStatusName; + private BusinessOriginalRecordModel businessOriginalRecord; + private String calibrationMajor; + private String calibrationMajorName; + private String certificateReportCategory; + private String certificateReportCode; + private String certificateReportFile; + private String certificateReportName; + private String createTime; + private String createUser; + private String expirationDate; + private String id; + private String isDel; + private String issuanceDate; + private String measureDeptId; + private String measurePersonId; + private String measureResult; + private String orderId; + private String originalRecordId; + private String printNum; + private String printStatus; + private String processId; + private String remark; + private String sampleId; + private String signId; + private String templateId; + private String updateTime; + + public String getApprovalSignId() { + return approvalSignId; + } + + public void setApprovalSignId(String approvalSignId) { + this.approvalSignId = approvalSignId; + } + + public String getApprovalStatus() { + return approvalStatus; + } + + public void setApprovalStatus(String approvalStatus) { + this.approvalStatus = approvalStatus; + } + + public String getApprovalStatusName() { + return approvalStatusName; + } + + public void setApprovalStatusName(String approvalStatusName) { + this.approvalStatusName = approvalStatusName; + } + + public BusinessOriginalRecordModel getBusinessOriginalRecord() { + return businessOriginalRecord; + } + + public void setBusinessOriginalRecord(BusinessOriginalRecordModel businessOriginalRecord) { + this.businessOriginalRecord = businessOriginalRecord; + } + + public String getCalibrationMajor() { + return calibrationMajor; + } + + public void setCalibrationMajor(String calibrationMajor) { + this.calibrationMajor = calibrationMajor; + } + + public String getCalibrationMajorName() { + return calibrationMajorName; + } + + public void setCalibrationMajorName(String calibrationMajorName) { + this.calibrationMajorName = calibrationMajorName; + } + + public String getCertificateReportCategory() { + return certificateReportCategory; + } + + public void setCertificateReportCategory(String certificateReportCategory) { + this.certificateReportCategory = certificateReportCategory; + } + + public String getCertificateReportCode() { + return certificateReportCode; + } + + public void setCertificateReportCode(String certificateReportCode) { + this.certificateReportCode = certificateReportCode; + } + + public String getCertificateReportFile() { + return certificateReportFile; + } + + public void setCertificateReportFile(String certificateReportFile) { + this.certificateReportFile = certificateReportFile; + } + + public String getCertificateReportName() { + return certificateReportName; + } + + public void setCertificateReportName(String certificateReportName) { + this.certificateReportName = certificateReportName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getExpirationDate() { + return expirationDate; + } + + public void setExpirationDate(String expirationDate) { + this.expirationDate = expirationDate; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String isIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIssuanceDate() { + return issuanceDate; + } + + public void setIssuanceDate(String issuanceDate) { + this.issuanceDate = issuanceDate; + } + + public String getMeasureDeptId() { + return measureDeptId; + } + + public void setMeasureDeptId(String measureDeptId) { + this.measureDeptId = measureDeptId; + } + + public String getMeasurePersonId() { + return measurePersonId; + } + + public void setMeasurePersonId(String measurePersonId) { + this.measurePersonId = measurePersonId; + } + + public String getMeasureResult() { + return measureResult; + } + + public void setMeasureResult(String measureResult) { + this.measureResult = measureResult; + } + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public String getOriginalRecordId() { + return originalRecordId; + } + + public void setOriginalRecordId(String originalRecordId) { + this.originalRecordId = originalRecordId; + } + + public String getPrintNum() { + return printNum; + } + + public void setPrintNum(String printNum) { + this.printNum = printNum; + } + + public String getPrintStatus() { + return printStatus; + } + + public void setPrintStatus(String printStatus) { + this.printStatus = printStatus; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSampleId() { + return sampleId; + } + + public void setSampleId(String sampleId) { + this.sampleId = sampleId; + } + + public String getSignId() { + return signId; + } + + public void setSignId(String signId) { + this.signId = signId; + } + + public String getTemplateId() { + return templateId; + } + + public void setTemplateId(String templateId) { + this.templateId = templateId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public static class BusinessOriginalRecordModel { + private BusinessEnvRecordModel businessEnvironmentRecord; + private BusinessOrderModel businessOrder; + private String calibrationPlace; + private String calibrationTime; + private String createTime; + private String createUser; + private BusinessOrderModel.CustomerSampleModel customerSampleInfo; + private String environmentId; + private List equipmentInfoList; + private List fileList; + private String id; + private String isDel; + private String measureCategory; + private String measureCategoryName; + private String orderId; + private String originalRecordCode; + private String originalRecordFile; + private String originalRecordName; + private String remark; + private String sampleId; + private String templateId; + private String templateName; + private String updateTime; + + public BusinessEnvRecordModel getBusinessEnvironmentRecord() { + return businessEnvironmentRecord; + } + + public void setBusinessEnvironmentRecord(BusinessEnvRecordModel businessEnvironmentRecord) { + this.businessEnvironmentRecord = businessEnvironmentRecord; + } + + public BusinessOrderModel getBusinessOrder() { + return businessOrder; + } + + public void setBusinessOrder(BusinessOrderModel businessOrder) { + this.businessOrder = businessOrder; + } + + public String getCalibrationPlace() { + return calibrationPlace; + } + + public void setCalibrationPlace(String calibrationPlace) { + this.calibrationPlace = calibrationPlace; + } + + public String getCalibrationTime() { + return calibrationTime; + } + + public void setCalibrationTime(String calibrationTime) { + this.calibrationTime = calibrationTime; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public BusinessOrderModel.CustomerSampleModel getCustomerSampleInfo() { + return customerSampleInfo; + } + + public void setCustomerSampleInfo(BusinessOrderModel.CustomerSampleModel customerSampleInfo) { + this.customerSampleInfo = customerSampleInfo; + } + + public String getEnvironmentId() { + return environmentId; + } + + public void setEnvironmentId(String environmentId) { + this.environmentId = environmentId; + } + + public List getEquipmentInfoList() { + return equipmentInfoList; + } + + public void setEquipmentInfoList(List equipmentInfoList) { + this.equipmentInfoList = equipmentInfoList; + } + + public List getFileList() { + return fileList; + } + + public void setFileList(List fileList) { + this.fileList = fileList; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String isIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getMeasureCategory() { + return measureCategory; + } + + public void setMeasureCategory(String measureCategory) { + this.measureCategory = measureCategory; + } + + public String getMeasureCategoryName() { + return measureCategoryName; + } + + public void setMeasureCategoryName(String measureCategoryName) { + this.measureCategoryName = measureCategoryName; + } + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public String getOriginalRecordCode() { + return originalRecordCode; + } + + public void setOriginalRecordCode(String originalRecordCode) { + this.originalRecordCode = originalRecordCode; + } + + public String getOriginalRecordFile() { + return originalRecordFile; + } + + public void setOriginalRecordFile(String originalRecordFile) { + this.originalRecordFile = originalRecordFile; + } + + public String getOriginalRecordName() { + return originalRecordName; + } + + public void setOriginalRecordName(String originalRecordName) { + this.originalRecordName = originalRecordName; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSampleId() { + return sampleId; + } + + public void setSampleId(String sampleId) { + this.sampleId = sampleId; + } + + public String getTemplateId() { + return templateId; + } + + public void setTemplateId(String templateId) { + this.templateId = templateId; + } + + public String getTemplateName() { + return templateName; + } + + public void setTemplateName(String templateName) { + this.templateName = templateName; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public static class BusinessEnvRecordModel { + private String createTime; + private String createUser; + private String environmentCode; + private String humidity; + private String id; + private String isDel; + private String outputVoltage; + private String recordTime; + private String recorder; + private String remark; + private String roomNumber; + private String temperature; + private String updateTime; + private String zeroGroundVoltage; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEnvironmentCode() { + return environmentCode; + } + + public void setEnvironmentCode(String environmentCode) { + this.environmentCode = environmentCode; + } + + public String getHumidity() { + return humidity; + } + + public void setHumidity(String humidity) { + this.humidity = humidity; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String isIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getOutputVoltage() { + return outputVoltage; + } + + public void setOutputVoltage(String outputVoltage) { + this.outputVoltage = outputVoltage; + } + + public String getRecordTime() { + return recordTime; + } + + public void setRecordTime(String recordTime) { + this.recordTime = recordTime; + } + + public String getRecorder() { + return recorder; + } + + public void setRecorder(String recorder) { + this.recorder = recorder; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getRoomNumber() { + return roomNumber; + } + + public void setRoomNumber(String roomNumber) { + this.roomNumber = roomNumber; + } + + public String getTemperature() { + return temperature; + } + + public void setTemperature(String temperature) { + this.temperature = temperature; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getZeroGroundVoltage() { + return zeroGroundVoltage; + } + + public void setZeroGroundVoltage(String zeroGroundVoltage) { + this.zeroGroundVoltage = zeroGroundVoltage; + } + } + + public static class BusinessOrderModel { + private String certifications; + private String createTime; + private String createUser; + private String customerAddress; + private String customerId; + private String customerName; + private String customerNo; + private String customerPhone; + private List customerSampleInfoList; + private String deliverTime; + private String deliverer; + private String delivererId; + private String delivererTel; + private String id; + private String isDel; + private String isUrgent; + private String minioFileName; + private String orderCode; + private String orderTime; + private String planDeliverTime; + private String remark; + private String requireOverTime; + private String status; + private String updateTime; + private String updateUser; + + public String getCertifications() { + return certifications; + } + + public void setCertifications(String certifications) { + this.certifications = certifications; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCustomerAddress() { + return customerAddress; + } + + public void setCustomerAddress(String customerAddress) { + this.customerAddress = customerAddress; + } + + public String getCustomerId() { + return customerId; + } + + public void setCustomerId(String customerId) { + this.customerId = customerId; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public String getCustomerPhone() { + return customerPhone; + } + + public void setCustomerPhone(String customerPhone) { + this.customerPhone = customerPhone; + } + + public List getCustomerSampleInfoList() { + return customerSampleInfoList; + } + + public void setCustomerSampleInfoList(List customerSampleInfoList) { + this.customerSampleInfoList = customerSampleInfoList; + } + + public String getDeliverTime() { + return deliverTime; + } + + public void setDeliverTime(String deliverTime) { + this.deliverTime = deliverTime; + } + + public String getDeliverer() { + return deliverer; + } + + public void setDeliverer(String deliverer) { + this.deliverer = deliverer; + } + + public String getDelivererId() { + return delivererId; + } + + public void setDelivererId(String delivererId) { + this.delivererId = delivererId; + } + + public String getDelivererTel() { + return delivererTel; + } + + public void setDelivererTel(String delivererTel) { + this.delivererTel = delivererTel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIsUrgent() { + return isUrgent; + } + + public void setIsUrgent(String isUrgent) { + this.isUrgent = isUrgent; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getOrderCode() { + return orderCode; + } + + public void setOrderCode(String orderCode) { + this.orderCode = orderCode; + } + + public String getOrderTime() { + return orderTime; + } + + public void setOrderTime(String orderTime) { + this.orderTime = orderTime; + } + + public String getPlanDeliverTime() { + return planDeliverTime; + } + + public void setPlanDeliverTime(String planDeliverTime) { + this.planDeliverTime = planDeliverTime; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getRequireOverTime() { + return requireOverTime; + } + + public void setRequireOverTime(String requireOverTime) { + this.requireOverTime = requireOverTime; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUpdateUser() { + return updateUser; + } + + public void setUpdateUser(String updateUser) { + this.updateUser = updateUser; + } + + public static class CustomerSampleModel { + private String abc; + private String appendix; + private String appendixDescn; + private String createTime; + private String createUser; + private String customerAddress; + private String customerId; + private String customerName; + private String customerNo; + private String deliverer; + private String delivererTel; + private String id; + private String isDel; + private String isExistSample; + private String labelBind; + private String manufacturer; + private String manufacturerCountry; + private String manufacturingDate; + private String manufacturingNo; + private String measureCategory; + private String measureCategoryName; + private String measureContent; + private String measureLastTime; + private String measurePeriod; + private String measureType; + private String measureTypeName; + private String minioFileName; + private String orderId; + private String phone; + private String postalCode; + private String powerVoltage; + private String remark; + private String sampleBelong; + private String sampleBelongName; + private String sampleModel; + private String sampleName; + private String sampleNo; + private String specialRequire; + private String updateTime; + private String updateUser; + private String validDeadline; + + public String getAbc() { + return abc; + } + + public void setAbc(String abc) { + this.abc = abc; + } + + public String getAppendix() { + return appendix; + } + + public void setAppendix(String appendix) { + this.appendix = appendix; + } + + public String getAppendixDescn() { + return appendixDescn; + } + + public void setAppendixDescn(String appendixDescn) { + this.appendixDescn = appendixDescn; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCustomerAddress() { + return customerAddress; + } + + public void setCustomerAddress(String customerAddress) { + this.customerAddress = customerAddress; + } + + public String getCustomerId() { + return customerId; + } + + public void setCustomerId(String customerId) { + this.customerId = customerId; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public String getDeliverer() { + return deliverer; + } + + public void setDeliverer(String deliverer) { + this.deliverer = deliverer; + } + + public String getDelivererTel() { + return delivererTel; + } + + public void setDelivererTel(String delivererTel) { + this.delivererTel = delivererTel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIsExistSample() { + return isExistSample; + } + + public void setIsExistSample(String isExistSample) { + this.isExistSample = isExistSample; + } + + public String getLabelBind() { + return labelBind; + } + + public void setLabelBind(String labelBind) { + this.labelBind = labelBind; + } + + public String getManufacturer() { + return manufacturer; + } + + public void setManufacturer(String manufacturer) { + this.manufacturer = manufacturer; + } + + public String getManufacturerCountry() { + return manufacturerCountry; + } + + public void setManufacturerCountry(String manufacturerCountry) { + this.manufacturerCountry = manufacturerCountry; + } + + public String getManufacturingDate() { + return manufacturingDate; + } + + public void setManufacturingDate(String manufacturingDate) { + this.manufacturingDate = manufacturingDate; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getMeasureCategory() { + return measureCategory; + } + + public void setMeasureCategory(String measureCategory) { + this.measureCategory = measureCategory; + } + + public String getMeasureCategoryName() { + return measureCategoryName; + } + + public void setMeasureCategoryName(String measureCategoryName) { + this.measureCategoryName = measureCategoryName; + } + + public String getMeasureContent() { + return measureContent; + } + + public void setMeasureContent(String measureContent) { + this.measureContent = measureContent; + } + + public String getMeasureLastTime() { + return measureLastTime; + } + + public void setMeasureLastTime(String measureLastTime) { + this.measureLastTime = measureLastTime; + } + + public String getMeasurePeriod() { + return measurePeriod; + } + + public void setMeasurePeriod(String measurePeriod) { + this.measurePeriod = measurePeriod; + } + + public String getMeasureType() { + return measureType; + } + + public void setMeasureType(String measureType) { + this.measureType = measureType; + } + + public String getMeasureTypeName() { + return measureTypeName; + } + + public void setMeasureTypeName(String measureTypeName) { + this.measureTypeName = measureTypeName; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getPostalCode() { + return postalCode; + } + + public void setPostalCode(String postalCode) { + this.postalCode = postalCode; + } + + public String getPowerVoltage() { + return powerVoltage; + } + + public void setPowerVoltage(String powerVoltage) { + this.powerVoltage = powerVoltage; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSampleBelong() { + return sampleBelong; + } + + public void setSampleBelong(String sampleBelong) { + this.sampleBelong = sampleBelong; + } + + public String getSampleBelongName() { + return sampleBelongName; + } + + public void setSampleBelongName(String sampleBelongName) { + this.sampleBelongName = sampleBelongName; + } + + public String getSampleModel() { + return sampleModel; + } + + public void setSampleModel(String sampleModel) { + this.sampleModel = sampleModel; + } + + public String getSampleName() { + return sampleName; + } + + public void setSampleName(String sampleName) { + this.sampleName = sampleName; + } + + public String getSampleNo() { + return sampleNo; + } + + public void setSampleNo(String sampleNo) { + this.sampleNo = sampleNo; + } + + public String getSpecialRequire() { + return specialRequire; + } + + public void setSpecialRequire(String specialRequire) { + this.specialRequire = specialRequire; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUpdateUser() { + return updateUser; + } + + public void setUpdateUser(String updateUser) { + this.updateUser = updateUser; + } + + public String getValidDeadline() { + return validDeadline; + } + + public void setValidDeadline(String validDeadline) { + this.validDeadline = validDeadline; + } + } + } + + public static class EquipmentModel { + private String abc; + private String abcName; + private String applyRelationId; + private String assetNo; + private String assetSource; + private String assetType; + private String assetTypeName; + private String attribute; + private String capitalSource; + private String capitalSourceName; + private String cardEstablishmentDate; + private String createTime; + private String createUser; + private String depreciationMethod; + private String depreciationMethodName; + private String depreciationPeriod; + private String enableDate; + private String equipmentCategory; + private String equipmentCategoryName; + private String equipmentName; + private String equipmentNo; + private String equipmentSpecifications; + private String equipmentType; + private String equipmentTypeName; + private String fileList; + private String id; + private String installIncidentalExpenses; + private String installPlace; + private String intactState; + private String isCalibrationTestEquipment; + private String isDel; + private String isFixedAssets; + private String isMeasureAccount; + private String isStandardSupportEquipment; + private String labelBind; + private String majorCategory; + private String majorCategoryName; + private String managerLevel; + private String managerLevelName; + private String managerState; + private String managerStateName; + private String manufacturer; + private String manufacturerCountry; + private String manufacturingDate; + private String manufacturingNo; + private String mesureCycle; + private String mesureDate; + private String mesureDept; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String mesureType; + private String mesureTypeName; + private String modelNo; + private String originValue; + private String overallDimension; + private String presentOriginValue; + private String purpose; + private String remark; + private String singlePrice; + private String supportStandardEquipmentName; + private String supportStandardEquipmentNo; + private String technicalLevel; + private String uncertainty; + private String updateTime; + private String useDept; + private String useDeptName; + private String usePerson; + private String usePersonName; + private String validDate; + private String version; + private String weight; + + public String getAbc() { + return abc; + } + + public void setAbc(String abc) { + this.abc = abc; + } + + public String getAbcName() { + return abcName; + } + + public void setAbcName(String abcName) { + this.abcName = abcName; + } + + public String getApplyRelationId() { + return applyRelationId; + } + + public void setApplyRelationId(String applyRelationId) { + this.applyRelationId = applyRelationId; + } + + public String getAssetNo() { + return assetNo; + } + + public void setAssetNo(String assetNo) { + this.assetNo = assetNo; + } + + public String getAssetSource() { + return assetSource; + } + + public void setAssetSource(String assetSource) { + this.assetSource = assetSource; + } + + public String getAssetType() { + return assetType; + } + + public void setAssetType(String assetType) { + this.assetType = assetType; + } + + public String getAssetTypeName() { + return assetTypeName; + } + + public void setAssetTypeName(String assetTypeName) { + this.assetTypeName = assetTypeName; + } + + public String getAttribute() { + return attribute; + } + + public void setAttribute(String attribute) { + this.attribute = attribute; + } + + public String getCapitalSource() { + return capitalSource; + } + + public void setCapitalSource(String capitalSource) { + this.capitalSource = capitalSource; + } + + public String getCapitalSourceName() { + return capitalSourceName; + } + + public void setCapitalSourceName(String capitalSourceName) { + this.capitalSourceName = capitalSourceName; + } + + public String getCardEstablishmentDate() { + return cardEstablishmentDate; + } + + public void setCardEstablishmentDate(String cardEstablishmentDate) { + this.cardEstablishmentDate = cardEstablishmentDate; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getDepreciationMethod() { + return depreciationMethod; + } + + public void setDepreciationMethod(String depreciationMethod) { + this.depreciationMethod = depreciationMethod; + } + + public String getDepreciationMethodName() { + return depreciationMethodName; + } + + public void setDepreciationMethodName(String depreciationMethodName) { + this.depreciationMethodName = depreciationMethodName; + } + + public String getDepreciationPeriod() { + return depreciationPeriod; + } + + public void setDepreciationPeriod(String depreciationPeriod) { + this.depreciationPeriod = depreciationPeriod; + } + + public String getEnableDate() { + return enableDate; + } + + public void setEnableDate(String enableDate) { + this.enableDate = enableDate; + } + + public String getEquipmentCategory() { + return equipmentCategory; + } + + public void setEquipmentCategory(String equipmentCategory) { + this.equipmentCategory = equipmentCategory; + } + + public String getEquipmentCategoryName() { + return equipmentCategoryName; + } + + public void setEquipmentCategoryName(String equipmentCategoryName) { + this.equipmentCategoryName = equipmentCategoryName; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getEquipmentSpecifications() { + return equipmentSpecifications; + } + + public void setEquipmentSpecifications(String equipmentSpecifications) { + this.equipmentSpecifications = equipmentSpecifications; + } + + public String getEquipmentType() { + return equipmentType; + } + + public void setEquipmentType(String equipmentType) { + this.equipmentType = equipmentType; + } + + public String getEquipmentTypeName() { + return equipmentTypeName; + } + + public void setEquipmentTypeName(String equipmentTypeName) { + this.equipmentTypeName = equipmentTypeName; + } + + public String getFileList() { + return fileList; + } + + public void setFileList(String fileList) { + this.fileList = fileList; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInstallIncidentalExpenses() { + return installIncidentalExpenses; + } + + public void setInstallIncidentalExpenses(String installIncidentalExpenses) { + this.installIncidentalExpenses = installIncidentalExpenses; + } + + public String getInstallPlace() { + return installPlace; + } + + public void setInstallPlace(String installPlace) { + this.installPlace = installPlace; + } + + public String getIntactState() { + return intactState; + } + + public void setIntactState(String intactState) { + this.intactState = intactState; + } + + public String getIsCalibrationTestEquipment() { + return isCalibrationTestEquipment; + } + + public void setIsCalibrationTestEquipment(String isCalibrationTestEquipment) { + this.isCalibrationTestEquipment = isCalibrationTestEquipment; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIsFixedAssets() { + return isFixedAssets; + } + + public void setIsFixedAssets(String isFixedAssets) { + this.isFixedAssets = isFixedAssets; + } + + public String getIsMeasureAccount() { + return isMeasureAccount; + } + + public void setIsMeasureAccount(String isMeasureAccount) { + this.isMeasureAccount = isMeasureAccount; + } + + public String getIsStandardSupportEquipment() { + return isStandardSupportEquipment; + } + + public void setIsStandardSupportEquipment(String isStandardSupportEquipment) { + this.isStandardSupportEquipment = isStandardSupportEquipment; + } + + public String getLabelBind() { + return labelBind; + } + + public void setLabelBind(String labelBind) { + this.labelBind = labelBind; + } + + public String getMajorCategory() { + return majorCategory; + } + + public void setMajorCategory(String majorCategory) { + this.majorCategory = majorCategory; + } + + public String getMajorCategoryName() { + return majorCategoryName; + } + + public void setMajorCategoryName(String majorCategoryName) { + this.majorCategoryName = majorCategoryName; + } + + public String getManagerLevel() { + return managerLevel; + } + + public void setManagerLevel(String managerLevel) { + this.managerLevel = managerLevel; + } + + public String getManagerLevelName() { + return managerLevelName; + } + + public void setManagerLevelName(String managerLevelName) { + this.managerLevelName = managerLevelName; + } + + public String getManagerState() { + return managerState; + } + + public void setManagerState(String managerState) { + this.managerState = managerState; + } + + public String getManagerStateName() { + return managerStateName; + } + + public void setManagerStateName(String managerStateName) { + this.managerStateName = managerStateName; + } + + public String getManufacturer() { + return manufacturer; + } + + public void setManufacturer(String manufacturer) { + this.manufacturer = manufacturer; + } + + public String getManufacturerCountry() { + return manufacturerCountry; + } + + public void setManufacturerCountry(String manufacturerCountry) { + this.manufacturerCountry = manufacturerCountry; + } + + public String getManufacturingDate() { + return manufacturingDate; + } + + public void setManufacturingDate(String manufacturingDate) { + this.manufacturingDate = manufacturingDate; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getMesureCycle() { + return mesureCycle; + } + + public void setMesureCycle(String mesureCycle) { + this.mesureCycle = mesureCycle; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureDept() { + return mesureDept; + } + + public void setMesureDept(String mesureDept) { + this.mesureDept = mesureDept; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getMesureType() { + return mesureType; + } + + public void setMesureType(String mesureType) { + this.mesureType = mesureType; + } + + public String getMesureTypeName() { + return mesureTypeName; + } + + public void setMesureTypeName(String mesureTypeName) { + this.mesureTypeName = mesureTypeName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getOriginValue() { + return originValue; + } + + public void setOriginValue(String originValue) { + this.originValue = originValue; + } + + public String getOverallDimension() { + return overallDimension; + } + + public void setOverallDimension(String overallDimension) { + this.overallDimension = overallDimension; + } + + public String getPresentOriginValue() { + return presentOriginValue; + } + + public void setPresentOriginValue(String presentOriginValue) { + this.presentOriginValue = presentOriginValue; + } + + public String getPurpose() { + return purpose; + } + + public void setPurpose(String purpose) { + this.purpose = purpose; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSinglePrice() { + return singlePrice; + } + + public void setSinglePrice(String singlePrice) { + this.singlePrice = singlePrice; + } + + public String getSupportStandardEquipmentName() { + return supportStandardEquipmentName; + } + + public void setSupportStandardEquipmentName(String supportStandardEquipmentName) { + this.supportStandardEquipmentName = supportStandardEquipmentName; + } + + public String getSupportStandardEquipmentNo() { + return supportStandardEquipmentNo; + } + + public void setSupportStandardEquipmentNo(String supportStandardEquipmentNo) { + this.supportStandardEquipmentNo = supportStandardEquipmentNo; + } + + public String getTechnicalLevel() { + return technicalLevel; + } + + public void setTechnicalLevel(String technicalLevel) { + this.technicalLevel = technicalLevel; + } + + public String getUncertainty() { + return uncertainty; + } + + public void setUncertainty(String uncertainty) { + this.uncertainty = uncertainty; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDept() { + return useDept; + } + + public void setUseDept(String useDept) { + this.useDept = useDept; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getUsePerson() { + return usePerson; + } + + public void setUsePerson(String usePerson) { + this.usePerson = usePerson; + } + + public String getUsePersonName() { + return usePersonName; + } + + public void setUsePersonName(String usePersonName) { + this.usePersonName = usePersonName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + + public String getVersion() { + return version; + } + + public void setVersion(String version) { + this.version = version; + } + + public String getWeight() { + return weight; + } + + public void setWeight(String weight) { + this.weight = weight; + } + } + + public static class FileModel { + private String approvalStatus; + private String approvalStatusName; + private String createTime; + private String createUser; + private String createUserId; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String fileType; + private String fileTypeName; + private String id; + private String isDel; + private String minioFileName; + private String processId; + private String publishTime; + private String publisher; + private String remark; + private String updateTime; + + public String getApprovalStatus() { + return approvalStatus; + } + + public void setApprovalStatus(String approvalStatus) { + this.approvalStatus = approvalStatus; + } + + public String getApprovalStatusName() { + return approvalStatusName; + } + + public void setApprovalStatusName(String approvalStatusName) { + this.approvalStatusName = approvalStatusName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCreateUserId() { + return createUserId; + } + + public void setCreateUserId(String createUserId) { + this.createUserId = createUserId; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getFileType() { + return fileType; + } + + public void setFileType(String fileType) { + this.fileType = fileType; + } + + public String getFileTypeName() { + return fileTypeName; + } + + public void setFileTypeName(String fileTypeName) { + this.fileTypeName = fileTypeName; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getPublishTime() { + return publishTime; + } + + public void setPublishTime(String publishTime) { + this.publishTime = publishTime; + } + + public String getPublisher() { + return publisher; + } + + public void setPublisher(String publisher) { + this.publisher = publisher; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/CertificateListModel.java b/app/src/main/java/com/casic/xz/meterage/model/CertificateListModel.java new file mode 100644 index 0000000..0eed915 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/CertificateListModel.java @@ -0,0 +1,229 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class CertificateListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String approvalStatus; + private String approvalStatusName; + private String calibrationMajor; + private String certificateReportCode; + private String certificateReportName; + private String createTime; + private String decisionItem; + private String id; + private String manufacturingNo; + private String measureCategory; + private String measureCategoryName; + private String measurePersonId; + private String measurePersonName; + private String orderCode; + private String processId; + private String sampleModel; + private String sampleName; + private String sampleNo; + private String taskId; + + public String getApprovalStatus() { + return approvalStatus; + } + + public void setApprovalStatus(String approvalStatus) { + this.approvalStatus = approvalStatus; + } + + public String getApprovalStatusName() { + return approvalStatusName; + } + + public void setApprovalStatusName(String approvalStatusName) { + this.approvalStatusName = approvalStatusName; + } + + public String getCalibrationMajor() { + return calibrationMajor; + } + + public void setCalibrationMajor(String calibrationMajor) { + this.calibrationMajor = calibrationMajor; + } + + public String getCertificateReportCode() { + return certificateReportCode; + } + + public void setCertificateReportCode(String certificateReportCode) { + this.certificateReportCode = certificateReportCode; + } + + public String getCertificateReportName() { + return certificateReportName; + } + + public void setCertificateReportName(String certificateReportName) { + this.certificateReportName = certificateReportName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getDecisionItem() { + return decisionItem; + } + + public void setDecisionItem(String decisionItem) { + this.decisionItem = decisionItem; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getMeasureCategory() { + return measureCategory; + } + + public void setMeasureCategory(String measureCategory) { + this.measureCategory = measureCategory; + } + + public String getMeasureCategoryName() { + return measureCategoryName; + } + + public void setMeasureCategoryName(String measureCategoryName) { + this.measureCategoryName = measureCategoryName; + } + + public String getMeasurePersonId() { + return measurePersonId; + } + + public void setMeasurePersonId(String measurePersonId) { + this.measurePersonId = measurePersonId; + } + + public String getMeasurePersonName() { + return measurePersonName; + } + + public void setMeasurePersonName(String measurePersonName) { + this.measurePersonName = measurePersonName; + } + + public String getOrderCode() { + return orderCode; + } + + public void setOrderCode(String orderCode) { + this.orderCode = orderCode; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getSampleModel() { + return sampleModel; + } + + public void setSampleModel(String sampleModel) { + this.sampleModel = sampleModel; + } + + public String getSampleName() { + return sampleName; + } + + public void setSampleName(String sampleName) { + this.sampleName = sampleName; + } + + public String getSampleNo() { + return sampleNo; + } + + public void setSampleNo(String sampleNo) { + this.sampleNo = sampleNo; + } + + public String getTaskId() { + return taskId; + } + + public void setTaskId(String taskId) { + this.taskId = taskId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/CertificateModel.java b/app/src/main/java/com/casic/xz/meterage/model/CertificateModel.java deleted file mode 100644 index ec0d25b..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/CertificateModel.java +++ /dev/null @@ -1,202 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class CertificateModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String approvalStatus; - private String approvalStatusName; - private String calibrationMajor; - private String certificateReportCode; - private String certificateReportName; - private String createTime; - private String decisionItem; - private String id; - private String manufacturingNo; - private String measurePersonId; - private String orderCode; - private String processId; - private String sampleModel; - private String sampleName; - private String sampleNo; - private String taskId; - - public String getApprovalStatus() { - return approvalStatus; - } - - public void setApprovalStatus(String approvalStatus) { - this.approvalStatus = approvalStatus; - } - - public String getApprovalStatusName() { - return approvalStatusName; - } - - public void setApprovalStatusName(String approvalStatusName) { - this.approvalStatusName = approvalStatusName; - } - - public String getCalibrationMajor() { - return calibrationMajor; - } - - public void setCalibrationMajor(String calibrationMajor) { - this.calibrationMajor = calibrationMajor; - } - - public String getCertificateReportCode() { - return certificateReportCode; - } - - public void setCertificateReportCode(String certificateReportCode) { - this.certificateReportCode = certificateReportCode; - } - - public String getCertificateReportName() { - return certificateReportName; - } - - public void setCertificateReportName(String certificateReportName) { - this.certificateReportName = certificateReportName; - } - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getDecisionItem() { - return decisionItem; - } - - public void setDecisionItem(String decisionItem) { - this.decisionItem = decisionItem; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getManufacturingNo() { - return manufacturingNo; - } - - public void setManufacturingNo(String manufacturingNo) { - this.manufacturingNo = manufacturingNo; - } - - public String getMeasurePersonId() { - return measurePersonId; - } - - public void setMeasurePersonId(String measurePersonId) { - this.measurePersonId = measurePersonId; - } - - public String getOrderCode() { - return orderCode; - } - - public void setOrderCode(String orderCode) { - this.orderCode = orderCode; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public String getSampleModel() { - return sampleModel; - } - - public void setSampleModel(String sampleModel) { - this.sampleModel = sampleModel; - } - - public String getSampleName() { - return sampleName; - } - - public void setSampleName(String sampleName) { - this.sampleName = sampleName; - } - - public String getSampleNo() { - return sampleNo; - } - - public void setSampleNo(String sampleNo) { - this.sampleNo = sampleNo; - } - - public String getTaskId() { - return taskId; - } - - public void setTaskId(String taskId) { - this.taskId = taskId; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index b0dec00..a4f3c46 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -345,4 +345,22 @@ @QueryMap limit: Map, @QueryMap offset: Map ): String + + /** + * 获取委托书详情 + */ + @POST("/business/certificateReport/detail") + suspend fun getCertificateReportDetail( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 提交证书 + */ + @POST("/business/certificateReport/submit") + suspend fun submit( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String } \ 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 cef55ec..8bf4070 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 @@ -800,4 +800,29 @@ AuthenticationHelper.token!!, requestBody, limitMap, offsetMap ) } + + /** + * 获取证书报告详情 + */ + suspend fun getCertificateReportDetail(id: String): String { + val param = JsonObject() + param.addProperty("id", id) + val requestBody = param.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getCertificateReportDetail(AuthenticationHelper.token!!, requestBody) + } + + /** + * 提交证书报告 + */ + suspend fun submit(id: String): String { + val param = JsonObject() + param.addProperty("formId", "ywglzsbg") + param.addProperty("id", id) + val requestBody = param.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.submit(AuthenticationHelper.token!!, requestBody) + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportActivity.kt index 2baefd2..fa4e129 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportActivity.kt @@ -19,15 +19,21 @@ "已通过", "未通过", "已取消", - "非草稿", - "未通过", "可打印" ) private var fragmentPages: ArrayList = ArrayList() init { - pageTitles.indices.forEach { - fragmentPages.add(CertificateReportFragment((it + 1).toString())) + pageTitles.forEach { + when (it) { + "草稿箱" -> fragmentPages.add(CertificateReportFragment("1")) + "待审批" -> fragmentPages.add(CertificateReportFragment("2")) + "审批中" -> fragmentPages.add(CertificateReportFragment("3")) + "已通过" -> fragmentPages.add(CertificateReportFragment("4")) + "未通过" -> fragmentPages.add(CertificateReportFragment("5")) + "已取消" -> fragmentPages.add(CertificateReportFragment("6")) + "可打印" -> fragmentPages.add(CertificateReportFragment("9")) + } } } diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt new file mode 100644 index 0000000..e30c7c3 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt @@ -0,0 +1,106 @@ +package com.casic.xz.meterage.view.home + +import android.view.View +import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.SubViewPagerAdapter +import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.casic.xz.meterage.fragment.certificate.ApprovalProcessFragment +import com.casic.xz.meterage.fragment.certificate.BasicInformationFragment +import com.casic.xz.meterage.fragment.certificate.ExceptionReportFragment +import com.casic.xz.meterage.model.CertificateDetailModel +import com.casic.xz.meterage.utils.LoadingDialogHub +import com.casic.xz.meterage.vm.CertificateViewModel +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.vm.LoadState +import kotlinx.android.synthetic.main.activity_certificate_detail.* + +//"草稿箱" -> "1" +//"待审批" -> "2" +//"审批中" -> "3" +//"已通过" -> "4" +//"未通过" -> "5" +//"已取消" -> "6" +//"可打印" -> "9" + +class CertificateReportDetailActivity : KotlinBaseActivity() { + + private var fragmentPages: ArrayList = ArrayList() + private lateinit var certificateViewModel: CertificateViewModel + private lateinit var detailModel: CertificateDetailModel.DataModel + + override fun initData() { + val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! + + when (args[0]) { + "1" -> { + approvalView.text = "提交" + } + "2" -> { + approvalView.text = "审批" + } + "9" -> { + approvalView.text = "打印" + } + else -> { + approvalView.visibility = View.GONE + } + } + + certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] + certificateViewModel.getCertificateReportDetail(args[1]) + certificateViewModel.certificateDetail.observe(this) { + if (it.code == 200) { + + detailModel = it.data + + fragmentPages.add(BasicInformationFragment(detailModel)) + fragmentPages.add(ApprovalProcessFragment()) + fragmentPages.add(ExceptionReportFragment()) + + val pageTitles = arrayOf("基础信息", "审批流程", "异常报告") + + approvalViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, pageTitles + ) + //绑定 + topTabLayout.setupWithViewPager(approvalViewPager) + } + } + + certificateViewModel.submitResult.observe(this) { + if (it.code == 200) { + "提交成功".show(this) + finish() + } + } + } + + override fun initEvent() { + leftBackView.setOnClickListener { finish() } + + approvalView.setOnClickListener { + certificateViewModel.submit(detailModel.id) + } + } + + override fun initLayoutView(): Int = R.layout.activity_certificate_detail + + override fun observeRequestState() { + certificateViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt index 080c380..77fe8a5 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt @@ -129,6 +129,5 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() initLayoutImmersionBar(rootView) - titleView.text = "委托需求" } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt index 735e530..e088887 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt @@ -4,7 +4,9 @@ import com.casic.xz.meterage.base.BaseApplication import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage -import com.casic.xz.meterage.model.CertificateModel +import com.casic.xz.meterage.model.ActionResultModel +import com.casic.xz.meterage.model.CertificateDetailModel +import com.casic.xz.meterage.model.CertificateListModel import com.casic.xz.meterage.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -19,7 +21,9 @@ class CertificateViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val certificateList = MutableLiveData() + val certificateList = MutableLiveData() + val certificateDetail = MutableLiveData() + val submitResult = MutableLiveData() fun getCertificateReportList( approvalStatus: String, @@ -47,8 +51,46 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - certificateList.value = gson.fromJson( - response, object : TypeToken() {}.type + certificateList.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + + fun getCertificateReportDetail(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.getCertificateReportDetail(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + certificateDetail.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + + fun submit(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.submit(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + submitResult.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { loadState.value = LoadState.Fail diff --git a/app/src/main/res/layout/activity_capability_detail.xml b/app/src/main/res/layout/activity_capability_detail.xml index 585960a..375d861 100644 --- a/app/src/main/res/layout/activity_capability_detail.xml +++ b/app/src/main/res/layout/activity_capability_detail.xml @@ -21,7 +21,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:padding="@dimen/dp_10"> + android:paddingHorizontal="@dimen/dp_10"> diff --git a/app/src/main/res/layout/activity_certificate_detail.xml b/app/src/main/res/layout/activity_certificate_detail.xml new file mode 100644 index 0000000..5bb3649 --- /dev/null +++ b/app/src/main/res/layout/activity_certificate_detail.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_standard_file_detail.xml b/app/src/main/res/layout/activity_standard_file_detail.xml index 7776230..02efb08 100644 --- a/app/src/main/res/layout/activity_standard_file_detail.xml +++ b/app/src/main/res/layout/activity_standard_file_detail.xml @@ -21,7 +21,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:padding="@dimen/dp_10"> + android:paddingHorizontal="@dimen/dp_10"> diff --git a/app/src/main/res/layout/fragment_certificate_approval_process.xml b/app/src/main/res/layout/fragment_certificate_approval_process.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/fragment_certificate_approval_process.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_certificate_basic_information.xml b/app/src/main/res/layout/fragment_certificate_basic_information.xml new file mode 100644 index 0000000..91882c7 --- /dev/null +++ b/app/src/main/res/layout/fragment_certificate_basic_information.xml @@ -0,0 +1,296 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_certificate_exception_report.xml b/app/src/main/res/layout/fragment_certificate_exception_report.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/fragment_certificate_exception_report.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_basic_information.xml b/app/src/main/res/layout/fragment_customer_basic_information.xml index e0debd1..dec78c7 100644 --- a/app/src/main/res/layout/fragment_customer_basic_information.xml +++ b/app/src/main/res/layout/fragment_customer_basic_information.xml @@ -12,7 +12,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:padding="@dimen/dp_10"> + android:paddingHorizontal="@dimen/dp_10"> diff --git a/app/src/main/res/layout/fragment_device_basic_information.xml b/app/src/main/res/layout/fragment_device_basic_information.xml index 0a7efc6..9d9cfac 100644 --- a/app/src/main/res/layout/fragment_device_basic_information.xml +++ b/app/src/main/res/layout/fragment_device_basic_information.xml @@ -12,7 +12,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:padding="@dimen/dp_10"> + android:paddingHorizontal="@dimen/dp_10"> diff --git a/app/src/main/res/layout/fragment_entrust_basic_information.xml b/app/src/main/res/layout/fragment_entrust_basic_information.xml index 07fbc24..3c23f9a 100644 --- a/app/src/main/res/layout/fragment_entrust_basic_information.xml +++ b/app/src/main/res/layout/fragment_entrust_basic_information.xml @@ -13,7 +13,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:padding="@dimen/dp_10"> + android:paddingHorizontal="@dimen/dp_10"> diff --git a/app/build.gradle b/app/build.gradle index 5ba44f0..298f687 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -53,7 +53,8 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "XZJL_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" +// outputFileName = "XZJL_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "XZJL_" + getBuildDate() + "_Beta.apk" } } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4b914b5..ebea092 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -67,6 +67,7 @@ + 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 new file mode 100644 index 0000000..a75e566 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.certificate + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class ApprovalProcessFragment :KotlinBaseFragment(){ + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_certificate_approval_process + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt new file mode 100644 index 0000000..5882c3d --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt @@ -0,0 +1,77 @@ +package com.casic.xz.meterage.fragment.certificate + +import android.graphics.Color +import android.graphics.Paint +import android.util.Log +import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.watchAttachFile +import com.casic.xz.meterage.model.CertificateDetailModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.pengxh.kt.lite.extensions.toJson +import kotlinx.android.synthetic.main.fragment_certificate_basic_information.* + +class BasicInformationFragment(private val data: CertificateDetailModel.DataModel) : + KotlinBaseFragment() { + + override fun initData() { + val businessOriginal = data.businessOriginalRecord + + reportCodeView.text = data.certificateReportCode + originalCodeView.text = businessOriginal.originalRecordCode + checkCategoryView.text = businessOriginal.measureCategoryName + + Log.d( + "Casic", + "BasicInformationFragment => initData: ${businessOriginal.fileList.toJson()}" + ) +// basisFileView.text = businessOriginal.fileList + + val sampleInfo = businessOriginal.customerSampleInfo + sampleCodeView.text = sampleInfo.sampleNo + sampleNameView.text = sampleInfo.sampleName + manufacturingCodeView.text = sampleInfo.manufacturingNo + modelView.text = sampleInfo.sampleModel + entrustCodeView.text = sampleInfo.customerNo + entrustNameView.text = sampleInfo.customerName + entrustContactView.text = sampleInfo.phone + entrustEmailView.text = sampleInfo.postalCode + entrustAddressView.text = sampleInfo.customerAddress + senderView.text = sampleInfo.deliverer + senderContactView.text = sampleInfo.delivererTel + checkTypeView.text = sampleInfo.measureContent + remarkView.text = sampleInfo.remark + + estimateServedTimeView.text = businessOriginal.businessOrder.planDeliverTime + estimateCompleteTimeView.text = businessOriginal.businessOrder.requireOverTime + + if (data.certificateReportFile.isNullOrBlank()) { + reportFileView.text = "暂无附件" + } else { + val reportFileName = data.certificateReportFile + + reportFileView.text = reportFileName + val textPaint = reportFileView.paint + textPaint.flags = Paint.UNDERLINE_TEXT_FLAG + textPaint.isAntiAlias = true + reportFileView.setTextColor(Color.BLUE) + + reportFileView.setOnClickListener { + reportFileName.watchAttachFile(requireContext()) + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_certificate_basic_information + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt index 2f3c95c..b1df400 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt @@ -4,19 +4,24 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.addAll +import com.casic.xz.meterage.extensions.diffCurrentTime +import com.casic.xz.meterage.extensions.formatToDate import com.casic.xz.meterage.extensions.showEmptyPage -import com.casic.xz.meterage.model.CertificateModel +import com.casic.xz.meterage.model.CertificateListModel +import com.casic.xz.meterage.view.home.CertificateReportDetailActivity import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler import kotlinx.android.synthetic.main.fragment_certificate_report.* import kotlinx.android.synthetic.main.include_empty_view.* /** - * 计量法规 + * 证书报告 * * formId:ywglzsbg * */ @@ -24,8 +29,8 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var certificateViewModel: CertificateViewModel - private lateinit var certificateAdapter: NormalRecyclerAdapter - private var dataBeans: MutableList = ArrayList() + private lateinit var certificateAdapter: NormalRecyclerAdapter + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false @@ -119,40 +124,37 @@ } else { emptyView!!.hide() certificateAdapter = object : - NormalRecyclerAdapter( + NormalRecyclerAdapter( R.layout.item_certificate_rv_l, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, - item: CertificateModel.DataModel.RowsModel + item: CertificateListModel.DataModel.RowsModel ) { + val deltaT = item.createTime.diffCurrentTime() + val diffTime = if (deltaT < 24) { + "${deltaT}小时前" + } else { + item.createTime.formatToDate() + } + viewHolder.setText(R.id.reportNameView, item.certificateReportName) -// .setText(R.id.fileStateView, item.effectiveStatusName) -// .setText(R.id.remarkView, "备注：$remark") -// .setText(R.id.fileCodeView, "文件号：${item.fileNo}") -// .setText(R.id.releaseDateView, "实施时间：${item.publishTime}") -// -// if (!item.effectiveStatus.equals("1")) { -// viewHolder.setBackgroundColor( -// R.id.fileStateView, -// R.color.gray.convertColor(requireContext()) -// ) -// } + .setText(R.id.createTimeView, diffTime) + .setText(R.id.categoryView, "校验类别：${item.measureCategoryName}") + .setText(R.id.technicianView, "检定员：${item.measurePersonName}") + + viewHolder.setOnClickListener(R.id.showDetailButton) { + requireContext().navigatePageTo( + addAll(item.approvalStatus, item.id) + ) + } } } certificateRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) certificateRecyclerView.adapter = certificateAdapter - certificateAdapter.setOnItemClickedListener(object : - NormalRecyclerAdapter.OnItemClickedListener { - override fun onItemClicked( - position: Int, t: CertificateModel.DataModel.RowsModel - ) { -// requireContext().navigatePageTo(t.toJson()) - } - }) } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt new file mode 100644 index 0000000..2d5ac61 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.certificate + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class ExceptionReportFragment :KotlinBaseFragment(){ + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_certificate_exception_report + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/model/CertificateDetailModel.java b/app/src/main/java/com/casic/xz/meterage/model/CertificateDetailModel.java new file mode 100644 index 0000000..42efccd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/CertificateDetailModel.java @@ -0,0 +1,2080 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class CertificateDetailModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private String approvalSignId; + private String approvalStatus; + private String approvalStatusName; + private BusinessOriginalRecordModel businessOriginalRecord; + private String calibrationMajor; + private String calibrationMajorName; + private String certificateReportCategory; + private String certificateReportCode; + private String certificateReportFile; + private String certificateReportName; + private String createTime; + private String createUser; + private String expirationDate; + private String id; + private String isDel; + private String issuanceDate; + private String measureDeptId; + private String measurePersonId; + private String measureResult; + private String orderId; + private String originalRecordId; + private String printNum; + private String printStatus; + private String processId; + private String remark; + private String sampleId; + private String signId; + private String templateId; + private String updateTime; + + public String getApprovalSignId() { + return approvalSignId; + } + + public void setApprovalSignId(String approvalSignId) { + this.approvalSignId = approvalSignId; + } + + public String getApprovalStatus() { + return approvalStatus; + } + + public void setApprovalStatus(String approvalStatus) { + this.approvalStatus = approvalStatus; + } + + public String getApprovalStatusName() { + return approvalStatusName; + } + + public void setApprovalStatusName(String approvalStatusName) { + this.approvalStatusName = approvalStatusName; + } + + public BusinessOriginalRecordModel getBusinessOriginalRecord() { + return businessOriginalRecord; + } + + public void setBusinessOriginalRecord(BusinessOriginalRecordModel businessOriginalRecord) { + this.businessOriginalRecord = businessOriginalRecord; + } + + public String getCalibrationMajor() { + return calibrationMajor; + } + + public void setCalibrationMajor(String calibrationMajor) { + this.calibrationMajor = calibrationMajor; + } + + public String getCalibrationMajorName() { + return calibrationMajorName; + } + + public void setCalibrationMajorName(String calibrationMajorName) { + this.calibrationMajorName = calibrationMajorName; + } + + public String getCertificateReportCategory() { + return certificateReportCategory; + } + + public void setCertificateReportCategory(String certificateReportCategory) { + this.certificateReportCategory = certificateReportCategory; + } + + public String getCertificateReportCode() { + return certificateReportCode; + } + + public void setCertificateReportCode(String certificateReportCode) { + this.certificateReportCode = certificateReportCode; + } + + public String getCertificateReportFile() { + return certificateReportFile; + } + + public void setCertificateReportFile(String certificateReportFile) { + this.certificateReportFile = certificateReportFile; + } + + public String getCertificateReportName() { + return certificateReportName; + } + + public void setCertificateReportName(String certificateReportName) { + this.certificateReportName = certificateReportName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getExpirationDate() { + return expirationDate; + } + + public void setExpirationDate(String expirationDate) { + this.expirationDate = expirationDate; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String isIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIssuanceDate() { + return issuanceDate; + } + + public void setIssuanceDate(String issuanceDate) { + this.issuanceDate = issuanceDate; + } + + public String getMeasureDeptId() { + return measureDeptId; + } + + public void setMeasureDeptId(String measureDeptId) { + this.measureDeptId = measureDeptId; + } + + public String getMeasurePersonId() { + return measurePersonId; + } + + public void setMeasurePersonId(String measurePersonId) { + this.measurePersonId = measurePersonId; + } + + public String getMeasureResult() { + return measureResult; + } + + public void setMeasureResult(String measureResult) { + this.measureResult = measureResult; + } + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public String getOriginalRecordId() { + return originalRecordId; + } + + public void setOriginalRecordId(String originalRecordId) { + this.originalRecordId = originalRecordId; + } + + public String getPrintNum() { + return printNum; + } + + public void setPrintNum(String printNum) { + this.printNum = printNum; + } + + public String getPrintStatus() { + return printStatus; + } + + public void setPrintStatus(String printStatus) { + this.printStatus = printStatus; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSampleId() { + return sampleId; + } + + public void setSampleId(String sampleId) { + this.sampleId = sampleId; + } + + public String getSignId() { + return signId; + } + + public void setSignId(String signId) { + this.signId = signId; + } + + public String getTemplateId() { + return templateId; + } + + public void setTemplateId(String templateId) { + this.templateId = templateId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public static class BusinessOriginalRecordModel { + private BusinessEnvRecordModel businessEnvironmentRecord; + private BusinessOrderModel businessOrder; + private String calibrationPlace; + private String calibrationTime; + private String createTime; + private String createUser; + private BusinessOrderModel.CustomerSampleModel customerSampleInfo; + private String environmentId; + private List equipmentInfoList; + private List fileList; + private String id; + private String isDel; + private String measureCategory; + private String measureCategoryName; + private String orderId; + private String originalRecordCode; + private String originalRecordFile; + private String originalRecordName; + private String remark; + private String sampleId; + private String templateId; + private String templateName; + private String updateTime; + + public BusinessEnvRecordModel getBusinessEnvironmentRecord() { + return businessEnvironmentRecord; + } + + public void setBusinessEnvironmentRecord(BusinessEnvRecordModel businessEnvironmentRecord) { + this.businessEnvironmentRecord = businessEnvironmentRecord; + } + + public BusinessOrderModel getBusinessOrder() { + return businessOrder; + } + + public void setBusinessOrder(BusinessOrderModel businessOrder) { + this.businessOrder = businessOrder; + } + + public String getCalibrationPlace() { + return calibrationPlace; + } + + public void setCalibrationPlace(String calibrationPlace) { + this.calibrationPlace = calibrationPlace; + } + + public String getCalibrationTime() { + return calibrationTime; + } + + public void setCalibrationTime(String calibrationTime) { + this.calibrationTime = calibrationTime; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public BusinessOrderModel.CustomerSampleModel getCustomerSampleInfo() { + return customerSampleInfo; + } + + public void setCustomerSampleInfo(BusinessOrderModel.CustomerSampleModel customerSampleInfo) { + this.customerSampleInfo = customerSampleInfo; + } + + public String getEnvironmentId() { + return environmentId; + } + + public void setEnvironmentId(String environmentId) { + this.environmentId = environmentId; + } + + public List getEquipmentInfoList() { + return equipmentInfoList; + } + + public void setEquipmentInfoList(List equipmentInfoList) { + this.equipmentInfoList = equipmentInfoList; + } + + public List getFileList() { + return fileList; + } + + public void setFileList(List fileList) { + this.fileList = fileList; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String isIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getMeasureCategory() { + return measureCategory; + } + + public void setMeasureCategory(String measureCategory) { + this.measureCategory = measureCategory; + } + + public String getMeasureCategoryName() { + return measureCategoryName; + } + + public void setMeasureCategoryName(String measureCategoryName) { + this.measureCategoryName = measureCategoryName; + } + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public String getOriginalRecordCode() { + return originalRecordCode; + } + + public void setOriginalRecordCode(String originalRecordCode) { + this.originalRecordCode = originalRecordCode; + } + + public String getOriginalRecordFile() { + return originalRecordFile; + } + + public void setOriginalRecordFile(String originalRecordFile) { + this.originalRecordFile = originalRecordFile; + } + + public String getOriginalRecordName() { + return originalRecordName; + } + + public void setOriginalRecordName(String originalRecordName) { + this.originalRecordName = originalRecordName; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSampleId() { + return sampleId; + } + + public void setSampleId(String sampleId) { + this.sampleId = sampleId; + } + + public String getTemplateId() { + return templateId; + } + + public void setTemplateId(String templateId) { + this.templateId = templateId; + } + + public String getTemplateName() { + return templateName; + } + + public void setTemplateName(String templateName) { + this.templateName = templateName; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public static class BusinessEnvRecordModel { + private String createTime; + private String createUser; + private String environmentCode; + private String humidity; + private String id; + private String isDel; + private String outputVoltage; + private String recordTime; + private String recorder; + private String remark; + private String roomNumber; + private String temperature; + private String updateTime; + private String zeroGroundVoltage; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEnvironmentCode() { + return environmentCode; + } + + public void setEnvironmentCode(String environmentCode) { + this.environmentCode = environmentCode; + } + + public String getHumidity() { + return humidity; + } + + public void setHumidity(String humidity) { + this.humidity = humidity; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String isIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getOutputVoltage() { + return outputVoltage; + } + + public void setOutputVoltage(String outputVoltage) { + this.outputVoltage = outputVoltage; + } + + public String getRecordTime() { + return recordTime; + } + + public void setRecordTime(String recordTime) { + this.recordTime = recordTime; + } + + public String getRecorder() { + return recorder; + } + + public void setRecorder(String recorder) { + this.recorder = recorder; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getRoomNumber() { + return roomNumber; + } + + public void setRoomNumber(String roomNumber) { + this.roomNumber = roomNumber; + } + + public String getTemperature() { + return temperature; + } + + public void setTemperature(String temperature) { + this.temperature = temperature; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getZeroGroundVoltage() { + return zeroGroundVoltage; + } + + public void setZeroGroundVoltage(String zeroGroundVoltage) { + this.zeroGroundVoltage = zeroGroundVoltage; + } + } + + public static class BusinessOrderModel { + private String certifications; + private String createTime; + private String createUser; + private String customerAddress; + private String customerId; + private String customerName; + private String customerNo; + private String customerPhone; + private List customerSampleInfoList; + private String deliverTime; + private String deliverer; + private String delivererId; + private String delivererTel; + private String id; + private String isDel; + private String isUrgent; + private String minioFileName; + private String orderCode; + private String orderTime; + private String planDeliverTime; + private String remark; + private String requireOverTime; + private String status; + private String updateTime; + private String updateUser; + + public String getCertifications() { + return certifications; + } + + public void setCertifications(String certifications) { + this.certifications = certifications; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCustomerAddress() { + return customerAddress; + } + + public void setCustomerAddress(String customerAddress) { + this.customerAddress = customerAddress; + } + + public String getCustomerId() { + return customerId; + } + + public void setCustomerId(String customerId) { + this.customerId = customerId; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public String getCustomerPhone() { + return customerPhone; + } + + public void setCustomerPhone(String customerPhone) { + this.customerPhone = customerPhone; + } + + public List getCustomerSampleInfoList() { + return customerSampleInfoList; + } + + public void setCustomerSampleInfoList(List customerSampleInfoList) { + this.customerSampleInfoList = customerSampleInfoList; + } + + public String getDeliverTime() { + return deliverTime; + } + + public void setDeliverTime(String deliverTime) { + this.deliverTime = deliverTime; + } + + public String getDeliverer() { + return deliverer; + } + + public void setDeliverer(String deliverer) { + this.deliverer = deliverer; + } + + public String getDelivererId() { + return delivererId; + } + + public void setDelivererId(String delivererId) { + this.delivererId = delivererId; + } + + public String getDelivererTel() { + return delivererTel; + } + + public void setDelivererTel(String delivererTel) { + this.delivererTel = delivererTel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIsUrgent() { + return isUrgent; + } + + public void setIsUrgent(String isUrgent) { + this.isUrgent = isUrgent; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getOrderCode() { + return orderCode; + } + + public void setOrderCode(String orderCode) { + this.orderCode = orderCode; + } + + public String getOrderTime() { + return orderTime; + } + + public void setOrderTime(String orderTime) { + this.orderTime = orderTime; + } + + public String getPlanDeliverTime() { + return planDeliverTime; + } + + public void setPlanDeliverTime(String planDeliverTime) { + this.planDeliverTime = planDeliverTime; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getRequireOverTime() { + return requireOverTime; + } + + public void setRequireOverTime(String requireOverTime) { + this.requireOverTime = requireOverTime; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUpdateUser() { + return updateUser; + } + + public void setUpdateUser(String updateUser) { + this.updateUser = updateUser; + } + + public static class CustomerSampleModel { + private String abc; + private String appendix; + private String appendixDescn; + private String createTime; + private String createUser; + private String customerAddress; + private String customerId; + private String customerName; + private String customerNo; + private String deliverer; + private String delivererTel; + private String id; + private String isDel; + private String isExistSample; + private String labelBind; + private String manufacturer; + private String manufacturerCountry; + private String manufacturingDate; + private String manufacturingNo; + private String measureCategory; + private String measureCategoryName; + private String measureContent; + private String measureLastTime; + private String measurePeriod; + private String measureType; + private String measureTypeName; + private String minioFileName; + private String orderId; + private String phone; + private String postalCode; + private String powerVoltage; + private String remark; + private String sampleBelong; + private String sampleBelongName; + private String sampleModel; + private String sampleName; + private String sampleNo; + private String specialRequire; + private String updateTime; + private String updateUser; + private String validDeadline; + + public String getAbc() { + return abc; + } + + public void setAbc(String abc) { + this.abc = abc; + } + + public String getAppendix() { + return appendix; + } + + public void setAppendix(String appendix) { + this.appendix = appendix; + } + + public String getAppendixDescn() { + return appendixDescn; + } + + public void setAppendixDescn(String appendixDescn) { + this.appendixDescn = appendixDescn; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCustomerAddress() { + return customerAddress; + } + + public void setCustomerAddress(String customerAddress) { + this.customerAddress = customerAddress; + } + + public String getCustomerId() { + return customerId; + } + + public void setCustomerId(String customerId) { + this.customerId = customerId; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public String getDeliverer() { + return deliverer; + } + + public void setDeliverer(String deliverer) { + this.deliverer = deliverer; + } + + public String getDelivererTel() { + return delivererTel; + } + + public void setDelivererTel(String delivererTel) { + this.delivererTel = delivererTel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIsExistSample() { + return isExistSample; + } + + public void setIsExistSample(String isExistSample) { + this.isExistSample = isExistSample; + } + + public String getLabelBind() { + return labelBind; + } + + public void setLabelBind(String labelBind) { + this.labelBind = labelBind; + } + + public String getManufacturer() { + return manufacturer; + } + + public void setManufacturer(String manufacturer) { + this.manufacturer = manufacturer; + } + + public String getManufacturerCountry() { + return manufacturerCountry; + } + + public void setManufacturerCountry(String manufacturerCountry) { + this.manufacturerCountry = manufacturerCountry; + } + + public String getManufacturingDate() { + return manufacturingDate; + } + + public void setManufacturingDate(String manufacturingDate) { + this.manufacturingDate = manufacturingDate; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getMeasureCategory() { + return measureCategory; + } + + public void setMeasureCategory(String measureCategory) { + this.measureCategory = measureCategory; + } + + public String getMeasureCategoryName() { + return measureCategoryName; + } + + public void setMeasureCategoryName(String measureCategoryName) { + this.measureCategoryName = measureCategoryName; + } + + public String getMeasureContent() { + return measureContent; + } + + public void setMeasureContent(String measureContent) { + this.measureContent = measureContent; + } + + public String getMeasureLastTime() { + return measureLastTime; + } + + public void setMeasureLastTime(String measureLastTime) { + this.measureLastTime = measureLastTime; + } + + public String getMeasurePeriod() { + return measurePeriod; + } + + public void setMeasurePeriod(String measurePeriod) { + this.measurePeriod = measurePeriod; + } + + public String getMeasureType() { + return measureType; + } + + public void setMeasureType(String measureType) { + this.measureType = measureType; + } + + public String getMeasureTypeName() { + return measureTypeName; + } + + public void setMeasureTypeName(String measureTypeName) { + this.measureTypeName = measureTypeName; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getPostalCode() { + return postalCode; + } + + public void setPostalCode(String postalCode) { + this.postalCode = postalCode; + } + + public String getPowerVoltage() { + return powerVoltage; + } + + public void setPowerVoltage(String powerVoltage) { + this.powerVoltage = powerVoltage; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSampleBelong() { + return sampleBelong; + } + + public void setSampleBelong(String sampleBelong) { + this.sampleBelong = sampleBelong; + } + + public String getSampleBelongName() { + return sampleBelongName; + } + + public void setSampleBelongName(String sampleBelongName) { + this.sampleBelongName = sampleBelongName; + } + + public String getSampleModel() { + return sampleModel; + } + + public void setSampleModel(String sampleModel) { + this.sampleModel = sampleModel; + } + + public String getSampleName() { + return sampleName; + } + + public void setSampleName(String sampleName) { + this.sampleName = sampleName; + } + + public String getSampleNo() { + return sampleNo; + } + + public void setSampleNo(String sampleNo) { + this.sampleNo = sampleNo; + } + + public String getSpecialRequire() { + return specialRequire; + } + + public void setSpecialRequire(String specialRequire) { + this.specialRequire = specialRequire; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUpdateUser() { + return updateUser; + } + + public void setUpdateUser(String updateUser) { + this.updateUser = updateUser; + } + + public String getValidDeadline() { + return validDeadline; + } + + public void setValidDeadline(String validDeadline) { + this.validDeadline = validDeadline; + } + } + } + + public static class EquipmentModel { + private String abc; + private String abcName; + private String applyRelationId; + private String assetNo; + private String assetSource; + private String assetType; + private String assetTypeName; + private String attribute; + private String capitalSource; + private String capitalSourceName; + private String cardEstablishmentDate; + private String createTime; + private String createUser; + private String depreciationMethod; + private String depreciationMethodName; + private String depreciationPeriod; + private String enableDate; + private String equipmentCategory; + private String equipmentCategoryName; + private String equipmentName; + private String equipmentNo; + private String equipmentSpecifications; + private String equipmentType; + private String equipmentTypeName; + private String fileList; + private String id; + private String installIncidentalExpenses; + private String installPlace; + private String intactState; + private String isCalibrationTestEquipment; + private String isDel; + private String isFixedAssets; + private String isMeasureAccount; + private String isStandardSupportEquipment; + private String labelBind; + private String majorCategory; + private String majorCategoryName; + private String managerLevel; + private String managerLevelName; + private String managerState; + private String managerStateName; + private String manufacturer; + private String manufacturerCountry; + private String manufacturingDate; + private String manufacturingNo; + private String mesureCycle; + private String mesureDate; + private String mesureDept; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String mesureType; + private String mesureTypeName; + private String modelNo; + private String originValue; + private String overallDimension; + private String presentOriginValue; + private String purpose; + private String remark; + private String singlePrice; + private String supportStandardEquipmentName; + private String supportStandardEquipmentNo; + private String technicalLevel; + private String uncertainty; + private String updateTime; + private String useDept; + private String useDeptName; + private String usePerson; + private String usePersonName; + private String validDate; + private String version; + private String weight; + + public String getAbc() { + return abc; + } + + public void setAbc(String abc) { + this.abc = abc; + } + + public String getAbcName() { + return abcName; + } + + public void setAbcName(String abcName) { + this.abcName = abcName; + } + + public String getApplyRelationId() { + return applyRelationId; + } + + public void setApplyRelationId(String applyRelationId) { + this.applyRelationId = applyRelationId; + } + + public String getAssetNo() { + return assetNo; + } + + public void setAssetNo(String assetNo) { + this.assetNo = assetNo; + } + + public String getAssetSource() { + return assetSource; + } + + public void setAssetSource(String assetSource) { + this.assetSource = assetSource; + } + + public String getAssetType() { + return assetType; + } + + public void setAssetType(String assetType) { + this.assetType = assetType; + } + + public String getAssetTypeName() { + return assetTypeName; + } + + public void setAssetTypeName(String assetTypeName) { + this.assetTypeName = assetTypeName; + } + + public String getAttribute() { + return attribute; + } + + public void setAttribute(String attribute) { + this.attribute = attribute; + } + + public String getCapitalSource() { + return capitalSource; + } + + public void setCapitalSource(String capitalSource) { + this.capitalSource = capitalSource; + } + + public String getCapitalSourceName() { + return capitalSourceName; + } + + public void setCapitalSourceName(String capitalSourceName) { + this.capitalSourceName = capitalSourceName; + } + + public String getCardEstablishmentDate() { + return cardEstablishmentDate; + } + + public void setCardEstablishmentDate(String cardEstablishmentDate) { + this.cardEstablishmentDate = cardEstablishmentDate; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getDepreciationMethod() { + return depreciationMethod; + } + + public void setDepreciationMethod(String depreciationMethod) { + this.depreciationMethod = depreciationMethod; + } + + public String getDepreciationMethodName() { + return depreciationMethodName; + } + + public void setDepreciationMethodName(String depreciationMethodName) { + this.depreciationMethodName = depreciationMethodName; + } + + public String getDepreciationPeriod() { + return depreciationPeriod; + } + + public void setDepreciationPeriod(String depreciationPeriod) { + this.depreciationPeriod = depreciationPeriod; + } + + public String getEnableDate() { + return enableDate; + } + + public void setEnableDate(String enableDate) { + this.enableDate = enableDate; + } + + public String getEquipmentCategory() { + return equipmentCategory; + } + + public void setEquipmentCategory(String equipmentCategory) { + this.equipmentCategory = equipmentCategory; + } + + public String getEquipmentCategoryName() { + return equipmentCategoryName; + } + + public void setEquipmentCategoryName(String equipmentCategoryName) { + this.equipmentCategoryName = equipmentCategoryName; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getEquipmentSpecifications() { + return equipmentSpecifications; + } + + public void setEquipmentSpecifications(String equipmentSpecifications) { + this.equipmentSpecifications = equipmentSpecifications; + } + + public String getEquipmentType() { + return equipmentType; + } + + public void setEquipmentType(String equipmentType) { + this.equipmentType = equipmentType; + } + + public String getEquipmentTypeName() { + return equipmentTypeName; + } + + public void setEquipmentTypeName(String equipmentTypeName) { + this.equipmentTypeName = equipmentTypeName; + } + + public String getFileList() { + return fileList; + } + + public void setFileList(String fileList) { + this.fileList = fileList; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInstallIncidentalExpenses() { + return installIncidentalExpenses; + } + + public void setInstallIncidentalExpenses(String installIncidentalExpenses) { + this.installIncidentalExpenses = installIncidentalExpenses; + } + + public String getInstallPlace() { + return installPlace; + } + + public void setInstallPlace(String installPlace) { + this.installPlace = installPlace; + } + + public String getIntactState() { + return intactState; + } + + public void setIntactState(String intactState) { + this.intactState = intactState; + } + + public String getIsCalibrationTestEquipment() { + return isCalibrationTestEquipment; + } + + public void setIsCalibrationTestEquipment(String isCalibrationTestEquipment) { + this.isCalibrationTestEquipment = isCalibrationTestEquipment; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIsFixedAssets() { + return isFixedAssets; + } + + public void setIsFixedAssets(String isFixedAssets) { + this.isFixedAssets = isFixedAssets; + } + + public String getIsMeasureAccount() { + return isMeasureAccount; + } + + public void setIsMeasureAccount(String isMeasureAccount) { + this.isMeasureAccount = isMeasureAccount; + } + + public String getIsStandardSupportEquipment() { + return isStandardSupportEquipment; + } + + public void setIsStandardSupportEquipment(String isStandardSupportEquipment) { + this.isStandardSupportEquipment = isStandardSupportEquipment; + } + + public String getLabelBind() { + return labelBind; + } + + public void setLabelBind(String labelBind) { + this.labelBind = labelBind; + } + + public String getMajorCategory() { + return majorCategory; + } + + public void setMajorCategory(String majorCategory) { + this.majorCategory = majorCategory; + } + + public String getMajorCategoryName() { + return majorCategoryName; + } + + public void setMajorCategoryName(String majorCategoryName) { + this.majorCategoryName = majorCategoryName; + } + + public String getManagerLevel() { + return managerLevel; + } + + public void setManagerLevel(String managerLevel) { + this.managerLevel = managerLevel; + } + + public String getManagerLevelName() { + return managerLevelName; + } + + public void setManagerLevelName(String managerLevelName) { + this.managerLevelName = managerLevelName; + } + + public String getManagerState() { + return managerState; + } + + public void setManagerState(String managerState) { + this.managerState = managerState; + } + + public String getManagerStateName() { + return managerStateName; + } + + public void setManagerStateName(String managerStateName) { + this.managerStateName = managerStateName; + } + + public String getManufacturer() { + return manufacturer; + } + + public void setManufacturer(String manufacturer) { + this.manufacturer = manufacturer; + } + + public String getManufacturerCountry() { + return manufacturerCountry; + } + + public void setManufacturerCountry(String manufacturerCountry) { + this.manufacturerCountry = manufacturerCountry; + } + + public String getManufacturingDate() { + return manufacturingDate; + } + + public void setManufacturingDate(String manufacturingDate) { + this.manufacturingDate = manufacturingDate; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getMesureCycle() { + return mesureCycle; + } + + public void setMesureCycle(String mesureCycle) { + this.mesureCycle = mesureCycle; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureDept() { + return mesureDept; + } + + public void setMesureDept(String mesureDept) { + this.mesureDept = mesureDept; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getMesureType() { + return mesureType; + } + + public void setMesureType(String mesureType) { + this.mesureType = mesureType; + } + + public String getMesureTypeName() { + return mesureTypeName; + } + + public void setMesureTypeName(String mesureTypeName) { + this.mesureTypeName = mesureTypeName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getOriginValue() { + return originValue; + } + + public void setOriginValue(String originValue) { + this.originValue = originValue; + } + + public String getOverallDimension() { + return overallDimension; + } + + public void setOverallDimension(String overallDimension) { + this.overallDimension = overallDimension; + } + + public String getPresentOriginValue() { + return presentOriginValue; + } + + public void setPresentOriginValue(String presentOriginValue) { + this.presentOriginValue = presentOriginValue; + } + + public String getPurpose() { + return purpose; + } + + public void setPurpose(String purpose) { + this.purpose = purpose; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSinglePrice() { + return singlePrice; + } + + public void setSinglePrice(String singlePrice) { + this.singlePrice = singlePrice; + } + + public String getSupportStandardEquipmentName() { + return supportStandardEquipmentName; + } + + public void setSupportStandardEquipmentName(String supportStandardEquipmentName) { + this.supportStandardEquipmentName = supportStandardEquipmentName; + } + + public String getSupportStandardEquipmentNo() { + return supportStandardEquipmentNo; + } + + public void setSupportStandardEquipmentNo(String supportStandardEquipmentNo) { + this.supportStandardEquipmentNo = supportStandardEquipmentNo; + } + + public String getTechnicalLevel() { + return technicalLevel; + } + + public void setTechnicalLevel(String technicalLevel) { + this.technicalLevel = technicalLevel; + } + + public String getUncertainty() { + return uncertainty; + } + + public void setUncertainty(String uncertainty) { + this.uncertainty = uncertainty; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDept() { + return useDept; + } + + public void setUseDept(String useDept) { + this.useDept = useDept; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getUsePerson() { + return usePerson; + } + + public void setUsePerson(String usePerson) { + this.usePerson = usePerson; + } + + public String getUsePersonName() { + return usePersonName; + } + + public void setUsePersonName(String usePersonName) { + this.usePersonName = usePersonName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + + public String getVersion() { + return version; + } + + public void setVersion(String version) { + this.version = version; + } + + public String getWeight() { + return weight; + } + + public void setWeight(String weight) { + this.weight = weight; + } + } + + public static class FileModel { + private String approvalStatus; + private String approvalStatusName; + private String createTime; + private String createUser; + private String createUserId; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String fileType; + private String fileTypeName; + private String id; + private String isDel; + private String minioFileName; + private String processId; + private String publishTime; + private String publisher; + private String remark; + private String updateTime; + + public String getApprovalStatus() { + return approvalStatus; + } + + public void setApprovalStatus(String approvalStatus) { + this.approvalStatus = approvalStatus; + } + + public String getApprovalStatusName() { + return approvalStatusName; + } + + public void setApprovalStatusName(String approvalStatusName) { + this.approvalStatusName = approvalStatusName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCreateUserId() { + return createUserId; + } + + public void setCreateUserId(String createUserId) { + this.createUserId = createUserId; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getFileType() { + return fileType; + } + + public void setFileType(String fileType) { + this.fileType = fileType; + } + + public String getFileTypeName() { + return fileTypeName; + } + + public void setFileTypeName(String fileTypeName) { + this.fileTypeName = fileTypeName; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getPublishTime() { + return publishTime; + } + + public void setPublishTime(String publishTime) { + this.publishTime = publishTime; + } + + public String getPublisher() { + return publisher; + } + + public void setPublisher(String publisher) { + this.publisher = publisher; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/CertificateListModel.java b/app/src/main/java/com/casic/xz/meterage/model/CertificateListModel.java new file mode 100644 index 0000000..0eed915 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/CertificateListModel.java @@ -0,0 +1,229 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class CertificateListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String approvalStatus; + private String approvalStatusName; + private String calibrationMajor; + private String certificateReportCode; + private String certificateReportName; + private String createTime; + private String decisionItem; + private String id; + private String manufacturingNo; + private String measureCategory; + private String measureCategoryName; + private String measurePersonId; + private String measurePersonName; + private String orderCode; + private String processId; + private String sampleModel; + private String sampleName; + private String sampleNo; + private String taskId; + + public String getApprovalStatus() { + return approvalStatus; + } + + public void setApprovalStatus(String approvalStatus) { + this.approvalStatus = approvalStatus; + } + + public String getApprovalStatusName() { + return approvalStatusName; + } + + public void setApprovalStatusName(String approvalStatusName) { + this.approvalStatusName = approvalStatusName; + } + + public String getCalibrationMajor() { + return calibrationMajor; + } + + public void setCalibrationMajor(String calibrationMajor) { + this.calibrationMajor = calibrationMajor; + } + + public String getCertificateReportCode() { + return certificateReportCode; + } + + public void setCertificateReportCode(String certificateReportCode) { + this.certificateReportCode = certificateReportCode; + } + + public String getCertificateReportName() { + return certificateReportName; + } + + public void setCertificateReportName(String certificateReportName) { + this.certificateReportName = certificateReportName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getDecisionItem() { + return decisionItem; + } + + public void setDecisionItem(String decisionItem) { + this.decisionItem = decisionItem; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getMeasureCategory() { + return measureCategory; + } + + public void setMeasureCategory(String measureCategory) { + this.measureCategory = measureCategory; + } + + public String getMeasureCategoryName() { + return measureCategoryName; + } + + public void setMeasureCategoryName(String measureCategoryName) { + this.measureCategoryName = measureCategoryName; + } + + public String getMeasurePersonId() { + return measurePersonId; + } + + public void setMeasurePersonId(String measurePersonId) { + this.measurePersonId = measurePersonId; + } + + public String getMeasurePersonName() { + return measurePersonName; + } + + public void setMeasurePersonName(String measurePersonName) { + this.measurePersonName = measurePersonName; + } + + public String getOrderCode() { + return orderCode; + } + + public void setOrderCode(String orderCode) { + this.orderCode = orderCode; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getSampleModel() { + return sampleModel; + } + + public void setSampleModel(String sampleModel) { + this.sampleModel = sampleModel; + } + + public String getSampleName() { + return sampleName; + } + + public void setSampleName(String sampleName) { + this.sampleName = sampleName; + } + + public String getSampleNo() { + return sampleNo; + } + + public void setSampleNo(String sampleNo) { + this.sampleNo = sampleNo; + } + + public String getTaskId() { + return taskId; + } + + public void setTaskId(String taskId) { + this.taskId = taskId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/CertificateModel.java b/app/src/main/java/com/casic/xz/meterage/model/CertificateModel.java deleted file mode 100644 index ec0d25b..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/CertificateModel.java +++ /dev/null @@ -1,202 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class CertificateModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String approvalStatus; - private String approvalStatusName; - private String calibrationMajor; - private String certificateReportCode; - private String certificateReportName; - private String createTime; - private String decisionItem; - private String id; - private String manufacturingNo; - private String measurePersonId; - private String orderCode; - private String processId; - private String sampleModel; - private String sampleName; - private String sampleNo; - private String taskId; - - public String getApprovalStatus() { - return approvalStatus; - } - - public void setApprovalStatus(String approvalStatus) { - this.approvalStatus = approvalStatus; - } - - public String getApprovalStatusName() { - return approvalStatusName; - } - - public void setApprovalStatusName(String approvalStatusName) { - this.approvalStatusName = approvalStatusName; - } - - public String getCalibrationMajor() { - return calibrationMajor; - } - - public void setCalibrationMajor(String calibrationMajor) { - this.calibrationMajor = calibrationMajor; - } - - public String getCertificateReportCode() { - return certificateReportCode; - } - - public void setCertificateReportCode(String certificateReportCode) { - this.certificateReportCode = certificateReportCode; - } - - public String getCertificateReportName() { - return certificateReportName; - } - - public void setCertificateReportName(String certificateReportName) { - this.certificateReportName = certificateReportName; - } - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getDecisionItem() { - return decisionItem; - } - - public void setDecisionItem(String decisionItem) { - this.decisionItem = decisionItem; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getManufacturingNo() { - return manufacturingNo; - } - - public void setManufacturingNo(String manufacturingNo) { - this.manufacturingNo = manufacturingNo; - } - - public String getMeasurePersonId() { - return measurePersonId; - } - - public void setMeasurePersonId(String measurePersonId) { - this.measurePersonId = measurePersonId; - } - - public String getOrderCode() { - return orderCode; - } - - public void setOrderCode(String orderCode) { - this.orderCode = orderCode; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public String getSampleModel() { - return sampleModel; - } - - public void setSampleModel(String sampleModel) { - this.sampleModel = sampleModel; - } - - public String getSampleName() { - return sampleName; - } - - public void setSampleName(String sampleName) { - this.sampleName = sampleName; - } - - public String getSampleNo() { - return sampleNo; - } - - public void setSampleNo(String sampleNo) { - this.sampleNo = sampleNo; - } - - public String getTaskId() { - return taskId; - } - - public void setTaskId(String taskId) { - this.taskId = taskId; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index b0dec00..a4f3c46 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -345,4 +345,22 @@ @QueryMap limit: Map, @QueryMap offset: Map ): String + + /** + * 获取委托书详情 + */ + @POST("/business/certificateReport/detail") + suspend fun getCertificateReportDetail( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 提交证书 + */ + @POST("/business/certificateReport/submit") + suspend fun submit( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String } \ 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 cef55ec..8bf4070 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 @@ -800,4 +800,29 @@ AuthenticationHelper.token!!, requestBody, limitMap, offsetMap ) } + + /** + * 获取证书报告详情 + */ + suspend fun getCertificateReportDetail(id: String): String { + val param = JsonObject() + param.addProperty("id", id) + val requestBody = param.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getCertificateReportDetail(AuthenticationHelper.token!!, requestBody) + } + + /** + * 提交证书报告 + */ + suspend fun submit(id: String): String { + val param = JsonObject() + param.addProperty("formId", "ywglzsbg") + param.addProperty("id", id) + val requestBody = param.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.submit(AuthenticationHelper.token!!, requestBody) + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportActivity.kt index 2baefd2..fa4e129 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportActivity.kt @@ -19,15 +19,21 @@ "已通过", "未通过", "已取消", - "非草稿", - "未通过", "可打印" ) private var fragmentPages: ArrayList = ArrayList() init { - pageTitles.indices.forEach { - fragmentPages.add(CertificateReportFragment((it + 1).toString())) + pageTitles.forEach { + when (it) { + "草稿箱" -> fragmentPages.add(CertificateReportFragment("1")) + "待审批" -> fragmentPages.add(CertificateReportFragment("2")) + "审批中" -> fragmentPages.add(CertificateReportFragment("3")) + "已通过" -> fragmentPages.add(CertificateReportFragment("4")) + "未通过" -> fragmentPages.add(CertificateReportFragment("5")) + "已取消" -> fragmentPages.add(CertificateReportFragment("6")) + "可打印" -> fragmentPages.add(CertificateReportFragment("9")) + } } } diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt new file mode 100644 index 0000000..e30c7c3 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt @@ -0,0 +1,106 @@ +package com.casic.xz.meterage.view.home + +import android.view.View +import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.SubViewPagerAdapter +import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.casic.xz.meterage.fragment.certificate.ApprovalProcessFragment +import com.casic.xz.meterage.fragment.certificate.BasicInformationFragment +import com.casic.xz.meterage.fragment.certificate.ExceptionReportFragment +import com.casic.xz.meterage.model.CertificateDetailModel +import com.casic.xz.meterage.utils.LoadingDialogHub +import com.casic.xz.meterage.vm.CertificateViewModel +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.vm.LoadState +import kotlinx.android.synthetic.main.activity_certificate_detail.* + +//"草稿箱" -> "1" +//"待审批" -> "2" +//"审批中" -> "3" +//"已通过" -> "4" +//"未通过" -> "5" +//"已取消" -> "6" +//"可打印" -> "9" + +class CertificateReportDetailActivity : KotlinBaseActivity() { + + private var fragmentPages: ArrayList = ArrayList() + private lateinit var certificateViewModel: CertificateViewModel + private lateinit var detailModel: CertificateDetailModel.DataModel + + override fun initData() { + val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! + + when (args[0]) { + "1" -> { + approvalView.text = "提交" + } + "2" -> { + approvalView.text = "审批" + } + "9" -> { + approvalView.text = "打印" + } + else -> { + approvalView.visibility = View.GONE + } + } + + certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] + certificateViewModel.getCertificateReportDetail(args[1]) + certificateViewModel.certificateDetail.observe(this) { + if (it.code == 200) { + + detailModel = it.data + + fragmentPages.add(BasicInformationFragment(detailModel)) + fragmentPages.add(ApprovalProcessFragment()) + fragmentPages.add(ExceptionReportFragment()) + + val pageTitles = arrayOf("基础信息", "审批流程", "异常报告") + + approvalViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, pageTitles + ) + //绑定 + topTabLayout.setupWithViewPager(approvalViewPager) + } + } + + certificateViewModel.submitResult.observe(this) { + if (it.code == 200) { + "提交成功".show(this) + finish() + } + } + } + + override fun initEvent() { + leftBackView.setOnClickListener { finish() } + + approvalView.setOnClickListener { + certificateViewModel.submit(detailModel.id) + } + } + + override fun initLayoutView(): Int = R.layout.activity_certificate_detail + + override fun observeRequestState() { + certificateViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt index 080c380..77fe8a5 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt @@ -129,6 +129,5 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() initLayoutImmersionBar(rootView) - titleView.text = "委托需求" } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt index 735e530..e088887 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt @@ -4,7 +4,9 @@ import com.casic.xz.meterage.base.BaseApplication import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage -import com.casic.xz.meterage.model.CertificateModel +import com.casic.xz.meterage.model.ActionResultModel +import com.casic.xz.meterage.model.CertificateDetailModel +import com.casic.xz.meterage.model.CertificateListModel import com.casic.xz.meterage.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -19,7 +21,9 @@ class CertificateViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val certificateList = MutableLiveData() + val certificateList = MutableLiveData() + val certificateDetail = MutableLiveData() + val submitResult = MutableLiveData() fun getCertificateReportList( approvalStatus: String, @@ -47,8 +51,46 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - certificateList.value = gson.fromJson( - response, object : TypeToken() {}.type + certificateList.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + + fun getCertificateReportDetail(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.getCertificateReportDetail(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + certificateDetail.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + + fun submit(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.submit(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + submitResult.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { loadState.value = LoadState.Fail diff --git a/app/src/main/res/layout/activity_capability_detail.xml b/app/src/main/res/layout/activity_capability_detail.xml index 585960a..375d861 100644 --- a/app/src/main/res/layout/activity_capability_detail.xml +++ b/app/src/main/res/layout/activity_capability_detail.xml @@ -21,7 +21,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:padding="@dimen/dp_10"> + android:paddingHorizontal="@dimen/dp_10"> diff --git a/app/src/main/res/layout/activity_certificate_detail.xml b/app/src/main/res/layout/activity_certificate_detail.xml new file mode 100644 index 0000000..5bb3649 --- /dev/null +++ b/app/src/main/res/layout/activity_certificate_detail.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_standard_file_detail.xml b/app/src/main/res/layout/activity_standard_file_detail.xml index 7776230..02efb08 100644 --- a/app/src/main/res/layout/activity_standard_file_detail.xml +++ b/app/src/main/res/layout/activity_standard_file_detail.xml @@ -21,7 +21,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:padding="@dimen/dp_10"> + android:paddingHorizontal="@dimen/dp_10"> diff --git a/app/src/main/res/layout/fragment_certificate_approval_process.xml b/app/src/main/res/layout/fragment_certificate_approval_process.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/fragment_certificate_approval_process.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_certificate_basic_information.xml b/app/src/main/res/layout/fragment_certificate_basic_information.xml new file mode 100644 index 0000000..91882c7 --- /dev/null +++ b/app/src/main/res/layout/fragment_certificate_basic_information.xml @@ -0,0 +1,296 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_certificate_exception_report.xml b/app/src/main/res/layout/fragment_certificate_exception_report.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/fragment_certificate_exception_report.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_basic_information.xml b/app/src/main/res/layout/fragment_customer_basic_information.xml index e0debd1..dec78c7 100644 --- a/app/src/main/res/layout/fragment_customer_basic_information.xml +++ b/app/src/main/res/layout/fragment_customer_basic_information.xml @@ -12,7 +12,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:padding="@dimen/dp_10"> + android:paddingHorizontal="@dimen/dp_10"> diff --git a/app/src/main/res/layout/fragment_device_basic_information.xml b/app/src/main/res/layout/fragment_device_basic_information.xml index 0a7efc6..9d9cfac 100644 --- a/app/src/main/res/layout/fragment_device_basic_information.xml +++ b/app/src/main/res/layout/fragment_device_basic_information.xml @@ -12,7 +12,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:padding="@dimen/dp_10"> + android:paddingHorizontal="@dimen/dp_10"> diff --git a/app/src/main/res/layout/fragment_entrust_basic_information.xml b/app/src/main/res/layout/fragment_entrust_basic_information.xml index 07fbc24..3c23f9a 100644 --- a/app/src/main/res/layout/fragment_entrust_basic_information.xml +++ b/app/src/main/res/layout/fragment_entrust_basic_information.xml @@ -13,7 +13,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:padding="@dimen/dp_10"> + android:paddingHorizontal="@dimen/dp_10"> diff --git a/app/src/main/res/layout/fragment_equipment_basic_information.xml b/app/src/main/res/layout/fragment_equipment_basic_information.xml index fd99df2..42e9748 100644 --- a/app/src/main/res/layout/fragment_equipment_basic_information.xml +++ b/app/src/main/res/layout/fragment_equipment_basic_information.xml @@ -12,7 +12,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:padding="@dimen/dp_10"> + android:paddingHorizontal="@dimen/dp_10"> diff --git a/app/build.gradle b/app/build.gradle index 5ba44f0..298f687 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -53,7 +53,8 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "XZJL_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" +// outputFileName = "XZJL_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "XZJL_" + getBuildDate() + "_Beta.apk" } } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4b914b5..ebea092 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -67,6 +67,7 @@ + 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 new file mode 100644 index 0000000..a75e566 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.certificate + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class ApprovalProcessFragment :KotlinBaseFragment(){ + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_certificate_approval_process + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt new file mode 100644 index 0000000..5882c3d --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt @@ -0,0 +1,77 @@ +package com.casic.xz.meterage.fragment.certificate + +import android.graphics.Color +import android.graphics.Paint +import android.util.Log +import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.watchAttachFile +import com.casic.xz.meterage.model.CertificateDetailModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.pengxh.kt.lite.extensions.toJson +import kotlinx.android.synthetic.main.fragment_certificate_basic_information.* + +class BasicInformationFragment(private val data: CertificateDetailModel.DataModel) : + KotlinBaseFragment() { + + override fun initData() { + val businessOriginal = data.businessOriginalRecord + + reportCodeView.text = data.certificateReportCode + originalCodeView.text = businessOriginal.originalRecordCode + checkCategoryView.text = businessOriginal.measureCategoryName + + Log.d( + "Casic", + "BasicInformationFragment => initData: ${businessOriginal.fileList.toJson()}" + ) +// basisFileView.text = businessOriginal.fileList + + val sampleInfo = businessOriginal.customerSampleInfo + sampleCodeView.text = sampleInfo.sampleNo + sampleNameView.text = sampleInfo.sampleName + manufacturingCodeView.text = sampleInfo.manufacturingNo + modelView.text = sampleInfo.sampleModel + entrustCodeView.text = sampleInfo.customerNo + entrustNameView.text = sampleInfo.customerName + entrustContactView.text = sampleInfo.phone + entrustEmailView.text = sampleInfo.postalCode + entrustAddressView.text = sampleInfo.customerAddress + senderView.text = sampleInfo.deliverer + senderContactView.text = sampleInfo.delivererTel + checkTypeView.text = sampleInfo.measureContent + remarkView.text = sampleInfo.remark + + estimateServedTimeView.text = businessOriginal.businessOrder.planDeliverTime + estimateCompleteTimeView.text = businessOriginal.businessOrder.requireOverTime + + if (data.certificateReportFile.isNullOrBlank()) { + reportFileView.text = "暂无附件" + } else { + val reportFileName = data.certificateReportFile + + reportFileView.text = reportFileName + val textPaint = reportFileView.paint + textPaint.flags = Paint.UNDERLINE_TEXT_FLAG + textPaint.isAntiAlias = true + reportFileView.setTextColor(Color.BLUE) + + reportFileView.setOnClickListener { + reportFileName.watchAttachFile(requireContext()) + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_certificate_basic_information + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt index 2f3c95c..b1df400 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt @@ -4,19 +4,24 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.addAll +import com.casic.xz.meterage.extensions.diffCurrentTime +import com.casic.xz.meterage.extensions.formatToDate import com.casic.xz.meterage.extensions.showEmptyPage -import com.casic.xz.meterage.model.CertificateModel +import com.casic.xz.meterage.model.CertificateListModel +import com.casic.xz.meterage.view.home.CertificateReportDetailActivity import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler import kotlinx.android.synthetic.main.fragment_certificate_report.* import kotlinx.android.synthetic.main.include_empty_view.* /** - * 计量法规 + * 证书报告 * * formId:ywglzsbg * */ @@ -24,8 +29,8 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var certificateViewModel: CertificateViewModel - private lateinit var certificateAdapter: NormalRecyclerAdapter - private var dataBeans: MutableList = ArrayList() + private lateinit var certificateAdapter: NormalRecyclerAdapter + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false @@ -119,40 +124,37 @@ } else { emptyView!!.hide() certificateAdapter = object : - NormalRecyclerAdapter( + NormalRecyclerAdapter( R.layout.item_certificate_rv_l, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, - item: CertificateModel.DataModel.RowsModel + item: CertificateListModel.DataModel.RowsModel ) { + val deltaT = item.createTime.diffCurrentTime() + val diffTime = if (deltaT < 24) { + "${deltaT}小时前" + } else { + item.createTime.formatToDate() + } + viewHolder.setText(R.id.reportNameView, item.certificateReportName) -// .setText(R.id.fileStateView, item.effectiveStatusName) -// .setText(R.id.remarkView, "备注：$remark") -// .setText(R.id.fileCodeView, "文件号：${item.fileNo}") -// .setText(R.id.releaseDateView, "实施时间：${item.publishTime}") -// -// if (!item.effectiveStatus.equals("1")) { -// viewHolder.setBackgroundColor( -// R.id.fileStateView, -// R.color.gray.convertColor(requireContext()) -// ) -// } + .setText(R.id.createTimeView, diffTime) + .setText(R.id.categoryView, "校验类别：${item.measureCategoryName}") + .setText(R.id.technicianView, "检定员：${item.measurePersonName}") + + viewHolder.setOnClickListener(R.id.showDetailButton) { + requireContext().navigatePageTo( + addAll(item.approvalStatus, item.id) + ) + } } } certificateRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) certificateRecyclerView.adapter = certificateAdapter - certificateAdapter.setOnItemClickedListener(object : - NormalRecyclerAdapter.OnItemClickedListener { - override fun onItemClicked( - position: Int, t: CertificateModel.DataModel.RowsModel - ) { -// requireContext().navigatePageTo(t.toJson()) - } - }) } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt new file mode 100644 index 0000000..2d5ac61 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.certificate + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class ExceptionReportFragment :KotlinBaseFragment(){ + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_certificate_exception_report + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/model/CertificateDetailModel.java b/app/src/main/java/com/casic/xz/meterage/model/CertificateDetailModel.java new file mode 100644 index 0000000..42efccd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/CertificateDetailModel.java @@ -0,0 +1,2080 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class CertificateDetailModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private String approvalSignId; + private String approvalStatus; + private String approvalStatusName; + private BusinessOriginalRecordModel businessOriginalRecord; + private String calibrationMajor; + private String calibrationMajorName; + private String certificateReportCategory; + private String certificateReportCode; + private String certificateReportFile; + private String certificateReportName; + private String createTime; + private String createUser; + private String expirationDate; + private String id; + private String isDel; + private String issuanceDate; + private String measureDeptId; + private String measurePersonId; + private String measureResult; + private String orderId; + private String originalRecordId; + private String printNum; + private String printStatus; + private String processId; + private String remark; + private String sampleId; + private String signId; + private String templateId; + private String updateTime; + + public String getApprovalSignId() { + return approvalSignId; + } + + public void setApprovalSignId(String approvalSignId) { + this.approvalSignId = approvalSignId; + } + + public String getApprovalStatus() { + return approvalStatus; + } + + public void setApprovalStatus(String approvalStatus) { + this.approvalStatus = approvalStatus; + } + + public String getApprovalStatusName() { + return approvalStatusName; + } + + public void setApprovalStatusName(String approvalStatusName) { + this.approvalStatusName = approvalStatusName; + } + + public BusinessOriginalRecordModel getBusinessOriginalRecord() { + return businessOriginalRecord; + } + + public void setBusinessOriginalRecord(BusinessOriginalRecordModel businessOriginalRecord) { + this.businessOriginalRecord = businessOriginalRecord; + } + + public String getCalibrationMajor() { + return calibrationMajor; + } + + public void setCalibrationMajor(String calibrationMajor) { + this.calibrationMajor = calibrationMajor; + } + + public String getCalibrationMajorName() { + return calibrationMajorName; + } + + public void setCalibrationMajorName(String calibrationMajorName) { + this.calibrationMajorName = calibrationMajorName; + } + + public String getCertificateReportCategory() { + return certificateReportCategory; + } + + public void setCertificateReportCategory(String certificateReportCategory) { + this.certificateReportCategory = certificateReportCategory; + } + + public String getCertificateReportCode() { + return certificateReportCode; + } + + public void setCertificateReportCode(String certificateReportCode) { + this.certificateReportCode = certificateReportCode; + } + + public String getCertificateReportFile() { + return certificateReportFile; + } + + public void setCertificateReportFile(String certificateReportFile) { + this.certificateReportFile = certificateReportFile; + } + + public String getCertificateReportName() { + return certificateReportName; + } + + public void setCertificateReportName(String certificateReportName) { + this.certificateReportName = certificateReportName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getExpirationDate() { + return expirationDate; + } + + public void setExpirationDate(String expirationDate) { + this.expirationDate = expirationDate; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String isIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIssuanceDate() { + return issuanceDate; + } + + public void setIssuanceDate(String issuanceDate) { + this.issuanceDate = issuanceDate; + } + + public String getMeasureDeptId() { + return measureDeptId; + } + + public void setMeasureDeptId(String measureDeptId) { + this.measureDeptId = measureDeptId; + } + + public String getMeasurePersonId() { + return measurePersonId; + } + + public void setMeasurePersonId(String measurePersonId) { + this.measurePersonId = measurePersonId; + } + + public String getMeasureResult() { + return measureResult; + } + + public void setMeasureResult(String measureResult) { + this.measureResult = measureResult; + } + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public String getOriginalRecordId() { + return originalRecordId; + } + + public void setOriginalRecordId(String originalRecordId) { + this.originalRecordId = originalRecordId; + } + + public String getPrintNum() { + return printNum; + } + + public void setPrintNum(String printNum) { + this.printNum = printNum; + } + + public String getPrintStatus() { + return printStatus; + } + + public void setPrintStatus(String printStatus) { + this.printStatus = printStatus; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSampleId() { + return sampleId; + } + + public void setSampleId(String sampleId) { + this.sampleId = sampleId; + } + + public String getSignId() { + return signId; + } + + public void setSignId(String signId) { + this.signId = signId; + } + + public String getTemplateId() { + return templateId; + } + + public void setTemplateId(String templateId) { + this.templateId = templateId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public static class BusinessOriginalRecordModel { + private BusinessEnvRecordModel businessEnvironmentRecord; + private BusinessOrderModel businessOrder; + private String calibrationPlace; + private String calibrationTime; + private String createTime; + private String createUser; + private BusinessOrderModel.CustomerSampleModel customerSampleInfo; + private String environmentId; + private List equipmentInfoList; + private List fileList; + private String id; + private String isDel; + private String measureCategory; + private String measureCategoryName; + private String orderId; + private String originalRecordCode; + private String originalRecordFile; + private String originalRecordName; + private String remark; + private String sampleId; + private String templateId; + private String templateName; + private String updateTime; + + public BusinessEnvRecordModel getBusinessEnvironmentRecord() { + return businessEnvironmentRecord; + } + + public void setBusinessEnvironmentRecord(BusinessEnvRecordModel businessEnvironmentRecord) { + this.businessEnvironmentRecord = businessEnvironmentRecord; + } + + public BusinessOrderModel getBusinessOrder() { + return businessOrder; + } + + public void setBusinessOrder(BusinessOrderModel businessOrder) { + this.businessOrder = businessOrder; + } + + public String getCalibrationPlace() { + return calibrationPlace; + } + + public void setCalibrationPlace(String calibrationPlace) { + this.calibrationPlace = calibrationPlace; + } + + public String getCalibrationTime() { + return calibrationTime; + } + + public void setCalibrationTime(String calibrationTime) { + this.calibrationTime = calibrationTime; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public BusinessOrderModel.CustomerSampleModel getCustomerSampleInfo() { + return customerSampleInfo; + } + + public void setCustomerSampleInfo(BusinessOrderModel.CustomerSampleModel customerSampleInfo) { + this.customerSampleInfo = customerSampleInfo; + } + + public String getEnvironmentId() { + return environmentId; + } + + public void setEnvironmentId(String environmentId) { + this.environmentId = environmentId; + } + + public List getEquipmentInfoList() { + return equipmentInfoList; + } + + public void setEquipmentInfoList(List equipmentInfoList) { + this.equipmentInfoList = equipmentInfoList; + } + + public List getFileList() { + return fileList; + } + + public void setFileList(List fileList) { + this.fileList = fileList; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String isIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getMeasureCategory() { + return measureCategory; + } + + public void setMeasureCategory(String measureCategory) { + this.measureCategory = measureCategory; + } + + public String getMeasureCategoryName() { + return measureCategoryName; + } + + public void setMeasureCategoryName(String measureCategoryName) { + this.measureCategoryName = measureCategoryName; + } + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public String getOriginalRecordCode() { + return originalRecordCode; + } + + public void setOriginalRecordCode(String originalRecordCode) { + this.originalRecordCode = originalRecordCode; + } + + public String getOriginalRecordFile() { + return originalRecordFile; + } + + public void setOriginalRecordFile(String originalRecordFile) { + this.originalRecordFile = originalRecordFile; + } + + public String getOriginalRecordName() { + return originalRecordName; + } + + public void setOriginalRecordName(String originalRecordName) { + this.originalRecordName = originalRecordName; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSampleId() { + return sampleId; + } + + public void setSampleId(String sampleId) { + this.sampleId = sampleId; + } + + public String getTemplateId() { + return templateId; + } + + public void setTemplateId(String templateId) { + this.templateId = templateId; + } + + public String getTemplateName() { + return templateName; + } + + public void setTemplateName(String templateName) { + this.templateName = templateName; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public static class BusinessEnvRecordModel { + private String createTime; + private String createUser; + private String environmentCode; + private String humidity; + private String id; + private String isDel; + private String outputVoltage; + private String recordTime; + private String recorder; + private String remark; + private String roomNumber; + private String temperature; + private String updateTime; + private String zeroGroundVoltage; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEnvironmentCode() { + return environmentCode; + } + + public void setEnvironmentCode(String environmentCode) { + this.environmentCode = environmentCode; + } + + public String getHumidity() { + return humidity; + } + + public void setHumidity(String humidity) { + this.humidity = humidity; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String isIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getOutputVoltage() { + return outputVoltage; + } + + public void setOutputVoltage(String outputVoltage) { + this.outputVoltage = outputVoltage; + } + + public String getRecordTime() { + return recordTime; + } + + public void setRecordTime(String recordTime) { + this.recordTime = recordTime; + } + + public String getRecorder() { + return recorder; + } + + public void setRecorder(String recorder) { + this.recorder = recorder; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getRoomNumber() { + return roomNumber; + } + + public void setRoomNumber(String roomNumber) { + this.roomNumber = roomNumber; + } + + public String getTemperature() { + return temperature; + } + + public void setTemperature(String temperature) { + this.temperature = temperature; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getZeroGroundVoltage() { + return zeroGroundVoltage; + } + + public void setZeroGroundVoltage(String zeroGroundVoltage) { + this.zeroGroundVoltage = zeroGroundVoltage; + } + } + + public static class BusinessOrderModel { + private String certifications; + private String createTime; + private String createUser; + private String customerAddress; + private String customerId; + private String customerName; + private String customerNo; + private String customerPhone; + private List customerSampleInfoList; + private String deliverTime; + private String deliverer; + private String delivererId; + private String delivererTel; + private String id; + private String isDel; + private String isUrgent; + private String minioFileName; + private String orderCode; + private String orderTime; + private String planDeliverTime; + private String remark; + private String requireOverTime; + private String status; + private String updateTime; + private String updateUser; + + public String getCertifications() { + return certifications; + } + + public void setCertifications(String certifications) { + this.certifications = certifications; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCustomerAddress() { + return customerAddress; + } + + public void setCustomerAddress(String customerAddress) { + this.customerAddress = customerAddress; + } + + public String getCustomerId() { + return customerId; + } + + public void setCustomerId(String customerId) { + this.customerId = customerId; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public String getCustomerPhone() { + return customerPhone; + } + + public void setCustomerPhone(String customerPhone) { + this.customerPhone = customerPhone; + } + + public List getCustomerSampleInfoList() { + return customerSampleInfoList; + } + + public void setCustomerSampleInfoList(List customerSampleInfoList) { + this.customerSampleInfoList = customerSampleInfoList; + } + + public String getDeliverTime() { + return deliverTime; + } + + public void setDeliverTime(String deliverTime) { + this.deliverTime = deliverTime; + } + + public String getDeliverer() { + return deliverer; + } + + public void setDeliverer(String deliverer) { + this.deliverer = deliverer; + } + + public String getDelivererId() { + return delivererId; + } + + public void setDelivererId(String delivererId) { + this.delivererId = delivererId; + } + + public String getDelivererTel() { + return delivererTel; + } + + public void setDelivererTel(String delivererTel) { + this.delivererTel = delivererTel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIsUrgent() { + return isUrgent; + } + + public void setIsUrgent(String isUrgent) { + this.isUrgent = isUrgent; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getOrderCode() { + return orderCode; + } + + public void setOrderCode(String orderCode) { + this.orderCode = orderCode; + } + + public String getOrderTime() { + return orderTime; + } + + public void setOrderTime(String orderTime) { + this.orderTime = orderTime; + } + + public String getPlanDeliverTime() { + return planDeliverTime; + } + + public void setPlanDeliverTime(String planDeliverTime) { + this.planDeliverTime = planDeliverTime; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getRequireOverTime() { + return requireOverTime; + } + + public void setRequireOverTime(String requireOverTime) { + this.requireOverTime = requireOverTime; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUpdateUser() { + return updateUser; + } + + public void setUpdateUser(String updateUser) { + this.updateUser = updateUser; + } + + public static class CustomerSampleModel { + private String abc; + private String appendix; + private String appendixDescn; + private String createTime; + private String createUser; + private String customerAddress; + private String customerId; + private String customerName; + private String customerNo; + private String deliverer; + private String delivererTel; + private String id; + private String isDel; + private String isExistSample; + private String labelBind; + private String manufacturer; + private String manufacturerCountry; + private String manufacturingDate; + private String manufacturingNo; + private String measureCategory; + private String measureCategoryName; + private String measureContent; + private String measureLastTime; + private String measurePeriod; + private String measureType; + private String measureTypeName; + private String minioFileName; + private String orderId; + private String phone; + private String postalCode; + private String powerVoltage; + private String remark; + private String sampleBelong; + private String sampleBelongName; + private String sampleModel; + private String sampleName; + private String sampleNo; + private String specialRequire; + private String updateTime; + private String updateUser; + private String validDeadline; + + public String getAbc() { + return abc; + } + + public void setAbc(String abc) { + this.abc = abc; + } + + public String getAppendix() { + return appendix; + } + + public void setAppendix(String appendix) { + this.appendix = appendix; + } + + public String getAppendixDescn() { + return appendixDescn; + } + + public void setAppendixDescn(String appendixDescn) { + this.appendixDescn = appendixDescn; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCustomerAddress() { + return customerAddress; + } + + public void setCustomerAddress(String customerAddress) { + this.customerAddress = customerAddress; + } + + public String getCustomerId() { + return customerId; + } + + public void setCustomerId(String customerId) { + this.customerId = customerId; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public String getDeliverer() { + return deliverer; + } + + public void setDeliverer(String deliverer) { + this.deliverer = deliverer; + } + + public String getDelivererTel() { + return delivererTel; + } + + public void setDelivererTel(String delivererTel) { + this.delivererTel = delivererTel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIsExistSample() { + return isExistSample; + } + + public void setIsExistSample(String isExistSample) { + this.isExistSample = isExistSample; + } + + public String getLabelBind() { + return labelBind; + } + + public void setLabelBind(String labelBind) { + this.labelBind = labelBind; + } + + public String getManufacturer() { + return manufacturer; + } + + public void setManufacturer(String manufacturer) { + this.manufacturer = manufacturer; + } + + public String getManufacturerCountry() { + return manufacturerCountry; + } + + public void setManufacturerCountry(String manufacturerCountry) { + this.manufacturerCountry = manufacturerCountry; + } + + public String getManufacturingDate() { + return manufacturingDate; + } + + public void setManufacturingDate(String manufacturingDate) { + this.manufacturingDate = manufacturingDate; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getMeasureCategory() { + return measureCategory; + } + + public void setMeasureCategory(String measureCategory) { + this.measureCategory = measureCategory; + } + + public String getMeasureCategoryName() { + return measureCategoryName; + } + + public void setMeasureCategoryName(String measureCategoryName) { + this.measureCategoryName = measureCategoryName; + } + + public String getMeasureContent() { + return measureContent; + } + + public void setMeasureContent(String measureContent) { + this.measureContent = measureContent; + } + + public String getMeasureLastTime() { + return measureLastTime; + } + + public void setMeasureLastTime(String measureLastTime) { + this.measureLastTime = measureLastTime; + } + + public String getMeasurePeriod() { + return measurePeriod; + } + + public void setMeasurePeriod(String measurePeriod) { + this.measurePeriod = measurePeriod; + } + + public String getMeasureType() { + return measureType; + } + + public void setMeasureType(String measureType) { + this.measureType = measureType; + } + + public String getMeasureTypeName() { + return measureTypeName; + } + + public void setMeasureTypeName(String measureTypeName) { + this.measureTypeName = measureTypeName; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getPostalCode() { + return postalCode; + } + + public void setPostalCode(String postalCode) { + this.postalCode = postalCode; + } + + public String getPowerVoltage() { + return powerVoltage; + } + + public void setPowerVoltage(String powerVoltage) { + this.powerVoltage = powerVoltage; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSampleBelong() { + return sampleBelong; + } + + public void setSampleBelong(String sampleBelong) { + this.sampleBelong = sampleBelong; + } + + public String getSampleBelongName() { + return sampleBelongName; + } + + public void setSampleBelongName(String sampleBelongName) { + this.sampleBelongName = sampleBelongName; + } + + public String getSampleModel() { + return sampleModel; + } + + public void setSampleModel(String sampleModel) { + this.sampleModel = sampleModel; + } + + public String getSampleName() { + return sampleName; + } + + public void setSampleName(String sampleName) { + this.sampleName = sampleName; + } + + public String getSampleNo() { + return sampleNo; + } + + public void setSampleNo(String sampleNo) { + this.sampleNo = sampleNo; + } + + public String getSpecialRequire() { + return specialRequire; + } + + public void setSpecialRequire(String specialRequire) { + this.specialRequire = specialRequire; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUpdateUser() { + return updateUser; + } + + public void setUpdateUser(String updateUser) { + this.updateUser = updateUser; + } + + public String getValidDeadline() { + return validDeadline; + } + + public void setValidDeadline(String validDeadline) { + this.validDeadline = validDeadline; + } + } + } + + public static class EquipmentModel { + private String abc; + private String abcName; + private String applyRelationId; + private String assetNo; + private String assetSource; + private String assetType; + private String assetTypeName; + private String attribute; + private String capitalSource; + private String capitalSourceName; + private String cardEstablishmentDate; + private String createTime; + private String createUser; + private String depreciationMethod; + private String depreciationMethodName; + private String depreciationPeriod; + private String enableDate; + private String equipmentCategory; + private String equipmentCategoryName; + private String equipmentName; + private String equipmentNo; + private String equipmentSpecifications; + private String equipmentType; + private String equipmentTypeName; + private String fileList; + private String id; + private String installIncidentalExpenses; + private String installPlace; + private String intactState; + private String isCalibrationTestEquipment; + private String isDel; + private String isFixedAssets; + private String isMeasureAccount; + private String isStandardSupportEquipment; + private String labelBind; + private String majorCategory; + private String majorCategoryName; + private String managerLevel; + private String managerLevelName; + private String managerState; + private String managerStateName; + private String manufacturer; + private String manufacturerCountry; + private String manufacturingDate; + private String manufacturingNo; + private String mesureCycle; + private String mesureDate; + private String mesureDept; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String mesureType; + private String mesureTypeName; + private String modelNo; + private String originValue; + private String overallDimension; + private String presentOriginValue; + private String purpose; + private String remark; + private String singlePrice; + private String supportStandardEquipmentName; + private String supportStandardEquipmentNo; + private String technicalLevel; + private String uncertainty; + private String updateTime; + private String useDept; + private String useDeptName; + private String usePerson; + private String usePersonName; + private String validDate; + private String version; + private String weight; + + public String getAbc() { + return abc; + } + + public void setAbc(String abc) { + this.abc = abc; + } + + public String getAbcName() { + return abcName; + } + + public void setAbcName(String abcName) { + this.abcName = abcName; + } + + public String getApplyRelationId() { + return applyRelationId; + } + + public void setApplyRelationId(String applyRelationId) { + this.applyRelationId = applyRelationId; + } + + public String getAssetNo() { + return assetNo; + } + + public void setAssetNo(String assetNo) { + this.assetNo = assetNo; + } + + public String getAssetSource() { + return assetSource; + } + + public void setAssetSource(String assetSource) { + this.assetSource = assetSource; + } + + public String getAssetType() { + return assetType; + } + + public void setAssetType(String assetType) { + this.assetType = assetType; + } + + public String getAssetTypeName() { + return assetTypeName; + } + + public void setAssetTypeName(String assetTypeName) { + this.assetTypeName = assetTypeName; + } + + public String getAttribute() { + return attribute; + } + + public void setAttribute(String attribute) { + this.attribute = attribute; + } + + public String getCapitalSource() { + return capitalSource; + } + + public void setCapitalSource(String capitalSource) { + this.capitalSource = capitalSource; + } + + public String getCapitalSourceName() { + return capitalSourceName; + } + + public void setCapitalSourceName(String capitalSourceName) { + this.capitalSourceName = capitalSourceName; + } + + public String getCardEstablishmentDate() { + return cardEstablishmentDate; + } + + public void setCardEstablishmentDate(String cardEstablishmentDate) { + this.cardEstablishmentDate = cardEstablishmentDate; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getDepreciationMethod() { + return depreciationMethod; + } + + public void setDepreciationMethod(String depreciationMethod) { + this.depreciationMethod = depreciationMethod; + } + + public String getDepreciationMethodName() { + return depreciationMethodName; + } + + public void setDepreciationMethodName(String depreciationMethodName) { + this.depreciationMethodName = depreciationMethodName; + } + + public String getDepreciationPeriod() { + return depreciationPeriod; + } + + public void setDepreciationPeriod(String depreciationPeriod) { + this.depreciationPeriod = depreciationPeriod; + } + + public String getEnableDate() { + return enableDate; + } + + public void setEnableDate(String enableDate) { + this.enableDate = enableDate; + } + + public String getEquipmentCategory() { + return equipmentCategory; + } + + public void setEquipmentCategory(String equipmentCategory) { + this.equipmentCategory = equipmentCategory; + } + + public String getEquipmentCategoryName() { + return equipmentCategoryName; + } + + public void setEquipmentCategoryName(String equipmentCategoryName) { + this.equipmentCategoryName = equipmentCategoryName; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getEquipmentSpecifications() { + return equipmentSpecifications; + } + + public void setEquipmentSpecifications(String equipmentSpecifications) { + this.equipmentSpecifications = equipmentSpecifications; + } + + public String getEquipmentType() { + return equipmentType; + } + + public void setEquipmentType(String equipmentType) { + this.equipmentType = equipmentType; + } + + public String getEquipmentTypeName() { + return equipmentTypeName; + } + + public void setEquipmentTypeName(String equipmentTypeName) { + this.equipmentTypeName = equipmentTypeName; + } + + public String getFileList() { + return fileList; + } + + public void setFileList(String fileList) { + this.fileList = fileList; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInstallIncidentalExpenses() { + return installIncidentalExpenses; + } + + public void setInstallIncidentalExpenses(String installIncidentalExpenses) { + this.installIncidentalExpenses = installIncidentalExpenses; + } + + public String getInstallPlace() { + return installPlace; + } + + public void setInstallPlace(String installPlace) { + this.installPlace = installPlace; + } + + public String getIntactState() { + return intactState; + } + + public void setIntactState(String intactState) { + this.intactState = intactState; + } + + public String getIsCalibrationTestEquipment() { + return isCalibrationTestEquipment; + } + + public void setIsCalibrationTestEquipment(String isCalibrationTestEquipment) { + this.isCalibrationTestEquipment = isCalibrationTestEquipment; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIsFixedAssets() { + return isFixedAssets; + } + + public void setIsFixedAssets(String isFixedAssets) { + this.isFixedAssets = isFixedAssets; + } + + public String getIsMeasureAccount() { + return isMeasureAccount; + } + + public void setIsMeasureAccount(String isMeasureAccount) { + this.isMeasureAccount = isMeasureAccount; + } + + public String getIsStandardSupportEquipment() { + return isStandardSupportEquipment; + } + + public void setIsStandardSupportEquipment(String isStandardSupportEquipment) { + this.isStandardSupportEquipment = isStandardSupportEquipment; + } + + public String getLabelBind() { + return labelBind; + } + + public void setLabelBind(String labelBind) { + this.labelBind = labelBind; + } + + public String getMajorCategory() { + return majorCategory; + } + + public void setMajorCategory(String majorCategory) { + this.majorCategory = majorCategory; + } + + public String getMajorCategoryName() { + return majorCategoryName; + } + + public void setMajorCategoryName(String majorCategoryName) { + this.majorCategoryName = majorCategoryName; + } + + public String getManagerLevel() { + return managerLevel; + } + + public void setManagerLevel(String managerLevel) { + this.managerLevel = managerLevel; + } + + public String getManagerLevelName() { + return managerLevelName; + } + + public void setManagerLevelName(String managerLevelName) { + this.managerLevelName = managerLevelName; + } + + public String getManagerState() { + return managerState; + } + + public void setManagerState(String managerState) { + this.managerState = managerState; + } + + public String getManagerStateName() { + return managerStateName; + } + + public void setManagerStateName(String managerStateName) { + this.managerStateName = managerStateName; + } + + public String getManufacturer() { + return manufacturer; + } + + public void setManufacturer(String manufacturer) { + this.manufacturer = manufacturer; + } + + public String getManufacturerCountry() { + return manufacturerCountry; + } + + public void setManufacturerCountry(String manufacturerCountry) { + this.manufacturerCountry = manufacturerCountry; + } + + public String getManufacturingDate() { + return manufacturingDate; + } + + public void setManufacturingDate(String manufacturingDate) { + this.manufacturingDate = manufacturingDate; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getMesureCycle() { + return mesureCycle; + } + + public void setMesureCycle(String mesureCycle) { + this.mesureCycle = mesureCycle; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureDept() { + return mesureDept; + } + + public void setMesureDept(String mesureDept) { + this.mesureDept = mesureDept; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getMesureType() { + return mesureType; + } + + public void setMesureType(String mesureType) { + this.mesureType = mesureType; + } + + public String getMesureTypeName() { + return mesureTypeName; + } + + public void setMesureTypeName(String mesureTypeName) { + this.mesureTypeName = mesureTypeName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getOriginValue() { + return originValue; + } + + public void setOriginValue(String originValue) { + this.originValue = originValue; + } + + public String getOverallDimension() { + return overallDimension; + } + + public void setOverallDimension(String overallDimension) { + this.overallDimension = overallDimension; + } + + public String getPresentOriginValue() { + return presentOriginValue; + } + + public void setPresentOriginValue(String presentOriginValue) { + this.presentOriginValue = presentOriginValue; + } + + public String getPurpose() { + return purpose; + } + + public void setPurpose(String purpose) { + this.purpose = purpose; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSinglePrice() { + return singlePrice; + } + + public void setSinglePrice(String singlePrice) { + this.singlePrice = singlePrice; + } + + public String getSupportStandardEquipmentName() { + return supportStandardEquipmentName; + } + + public void setSupportStandardEquipmentName(String supportStandardEquipmentName) { + this.supportStandardEquipmentName = supportStandardEquipmentName; + } + + public String getSupportStandardEquipmentNo() { + return supportStandardEquipmentNo; + } + + public void setSupportStandardEquipmentNo(String supportStandardEquipmentNo) { + this.supportStandardEquipmentNo = supportStandardEquipmentNo; + } + + public String getTechnicalLevel() { + return technicalLevel; + } + + public void setTechnicalLevel(String technicalLevel) { + this.technicalLevel = technicalLevel; + } + + public String getUncertainty() { + return uncertainty; + } + + public void setUncertainty(String uncertainty) { + this.uncertainty = uncertainty; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDept() { + return useDept; + } + + public void setUseDept(String useDept) { + this.useDept = useDept; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getUsePerson() { + return usePerson; + } + + public void setUsePerson(String usePerson) { + this.usePerson = usePerson; + } + + public String getUsePersonName() { + return usePersonName; + } + + public void setUsePersonName(String usePersonName) { + this.usePersonName = usePersonName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + + public String getVersion() { + return version; + } + + public void setVersion(String version) { + this.version = version; + } + + public String getWeight() { + return weight; + } + + public void setWeight(String weight) { + this.weight = weight; + } + } + + public static class FileModel { + private String approvalStatus; + private String approvalStatusName; + private String createTime; + private String createUser; + private String createUserId; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String fileType; + private String fileTypeName; + private String id; + private String isDel; + private String minioFileName; + private String processId; + private String publishTime; + private String publisher; + private String remark; + private String updateTime; + + public String getApprovalStatus() { + return approvalStatus; + } + + public void setApprovalStatus(String approvalStatus) { + this.approvalStatus = approvalStatus; + } + + public String getApprovalStatusName() { + return approvalStatusName; + } + + public void setApprovalStatusName(String approvalStatusName) { + this.approvalStatusName = approvalStatusName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCreateUserId() { + return createUserId; + } + + public void setCreateUserId(String createUserId) { + this.createUserId = createUserId; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getFileType() { + return fileType; + } + + public void setFileType(String fileType) { + this.fileType = fileType; + } + + public String getFileTypeName() { + return fileTypeName; + } + + public void setFileTypeName(String fileTypeName) { + this.fileTypeName = fileTypeName; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getPublishTime() { + return publishTime; + } + + public void setPublishTime(String publishTime) { + this.publishTime = publishTime; + } + + public String getPublisher() { + return publisher; + } + + public void setPublisher(String publisher) { + this.publisher = publisher; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/CertificateListModel.java b/app/src/main/java/com/casic/xz/meterage/model/CertificateListModel.java new file mode 100644 index 0000000..0eed915 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/CertificateListModel.java @@ -0,0 +1,229 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class CertificateListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String approvalStatus; + private String approvalStatusName; + private String calibrationMajor; + private String certificateReportCode; + private String certificateReportName; + private String createTime; + private String decisionItem; + private String id; + private String manufacturingNo; + private String measureCategory; + private String measureCategoryName; + private String measurePersonId; + private String measurePersonName; + private String orderCode; + private String processId; + private String sampleModel; + private String sampleName; + private String sampleNo; + private String taskId; + + public String getApprovalStatus() { + return approvalStatus; + } + + public void setApprovalStatus(String approvalStatus) { + this.approvalStatus = approvalStatus; + } + + public String getApprovalStatusName() { + return approvalStatusName; + } + + public void setApprovalStatusName(String approvalStatusName) { + this.approvalStatusName = approvalStatusName; + } + + public String getCalibrationMajor() { + return calibrationMajor; + } + + public void setCalibrationMajor(String calibrationMajor) { + this.calibrationMajor = calibrationMajor; + } + + public String getCertificateReportCode() { + return certificateReportCode; + } + + public void setCertificateReportCode(String certificateReportCode) { + this.certificateReportCode = certificateReportCode; + } + + public String getCertificateReportName() { + return certificateReportName; + } + + public void setCertificateReportName(String certificateReportName) { + this.certificateReportName = certificateReportName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getDecisionItem() { + return decisionItem; + } + + public void setDecisionItem(String decisionItem) { + this.decisionItem = decisionItem; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getMeasureCategory() { + return measureCategory; + } + + public void setMeasureCategory(String measureCategory) { + this.measureCategory = measureCategory; + } + + public String getMeasureCategoryName() { + return measureCategoryName; + } + + public void setMeasureCategoryName(String measureCategoryName) { + this.measureCategoryName = measureCategoryName; + } + + public String getMeasurePersonId() { + return measurePersonId; + } + + public void setMeasurePersonId(String measurePersonId) { + this.measurePersonId = measurePersonId; + } + + public String getMeasurePersonName() { + return measurePersonName; + } + + public void setMeasurePersonName(String measurePersonName) { + this.measurePersonName = measurePersonName; + } + + public String getOrderCode() { + return orderCode; + } + + public void setOrderCode(String orderCode) { + this.orderCode = orderCode; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getSampleModel() { + return sampleModel; + } + + public void setSampleModel(String sampleModel) { + this.sampleModel = sampleModel; + } + + public String getSampleName() { + return sampleName; + } + + public void setSampleName(String sampleName) { + this.sampleName = sampleName; + } + + public String getSampleNo() { + return sampleNo; + } + + public void setSampleNo(String sampleNo) { + this.sampleNo = sampleNo; + } + + public String getTaskId() { + return taskId; + } + + public void setTaskId(String taskId) { + this.taskId = taskId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/CertificateModel.java b/app/src/main/java/com/casic/xz/meterage/model/CertificateModel.java deleted file mode 100644 index ec0d25b..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/CertificateModel.java +++ /dev/null @@ -1,202 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class CertificateModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String approvalStatus; - private String approvalStatusName; - private String calibrationMajor; - private String certificateReportCode; - private String certificateReportName; - private String createTime; - private String decisionItem; - private String id; - private String manufacturingNo; - private String measurePersonId; - private String orderCode; - private String processId; - private String sampleModel; - private String sampleName; - private String sampleNo; - private String taskId; - - public String getApprovalStatus() { - return approvalStatus; - } - - public void setApprovalStatus(String approvalStatus) { - this.approvalStatus = approvalStatus; - } - - public String getApprovalStatusName() { - return approvalStatusName; - } - - public void setApprovalStatusName(String approvalStatusName) { - this.approvalStatusName = approvalStatusName; - } - - public String getCalibrationMajor() { - return calibrationMajor; - } - - public void setCalibrationMajor(String calibrationMajor) { - this.calibrationMajor = calibrationMajor; - } - - public String getCertificateReportCode() { - return certificateReportCode; - } - - public void setCertificateReportCode(String certificateReportCode) { - this.certificateReportCode = certificateReportCode; - } - - public String getCertificateReportName() { - return certificateReportName; - } - - public void setCertificateReportName(String certificateReportName) { - this.certificateReportName = certificateReportName; - } - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getDecisionItem() { - return decisionItem; - } - - public void setDecisionItem(String decisionItem) { - this.decisionItem = decisionItem; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getManufacturingNo() { - return manufacturingNo; - } - - public void setManufacturingNo(String manufacturingNo) { - this.manufacturingNo = manufacturingNo; - } - - public String getMeasurePersonId() { - return measurePersonId; - } - - public void setMeasurePersonId(String measurePersonId) { - this.measurePersonId = measurePersonId; - } - - public String getOrderCode() { - return orderCode; - } - - public void setOrderCode(String orderCode) { - this.orderCode = orderCode; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public String getSampleModel() { - return sampleModel; - } - - public void setSampleModel(String sampleModel) { - this.sampleModel = sampleModel; - } - - public String getSampleName() { - return sampleName; - } - - public void setSampleName(String sampleName) { - this.sampleName = sampleName; - } - - public String getSampleNo() { - return sampleNo; - } - - public void setSampleNo(String sampleNo) { - this.sampleNo = sampleNo; - } - - public String getTaskId() { - return taskId; - } - - public void setTaskId(String taskId) { - this.taskId = taskId; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index b0dec00..a4f3c46 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -345,4 +345,22 @@ @QueryMap limit: Map, @QueryMap offset: Map ): String + + /** + * 获取委托书详情 + */ + @POST("/business/certificateReport/detail") + suspend fun getCertificateReportDetail( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 提交证书 + */ + @POST("/business/certificateReport/submit") + suspend fun submit( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String } \ 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 cef55ec..8bf4070 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 @@ -800,4 +800,29 @@ AuthenticationHelper.token!!, requestBody, limitMap, offsetMap ) } + + /** + * 获取证书报告详情 + */ + suspend fun getCertificateReportDetail(id: String): String { + val param = JsonObject() + param.addProperty("id", id) + val requestBody = param.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getCertificateReportDetail(AuthenticationHelper.token!!, requestBody) + } + + /** + * 提交证书报告 + */ + suspend fun submit(id: String): String { + val param = JsonObject() + param.addProperty("formId", "ywglzsbg") + param.addProperty("id", id) + val requestBody = param.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.submit(AuthenticationHelper.token!!, requestBody) + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportActivity.kt index 2baefd2..fa4e129 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportActivity.kt @@ -19,15 +19,21 @@ "已通过", "未通过", "已取消", - "非草稿", - "未通过", "可打印" ) private var fragmentPages: ArrayList = ArrayList() init { - pageTitles.indices.forEach { - fragmentPages.add(CertificateReportFragment((it + 1).toString())) + pageTitles.forEach { + when (it) { + "草稿箱" -> fragmentPages.add(CertificateReportFragment("1")) + "待审批" -> fragmentPages.add(CertificateReportFragment("2")) + "审批中" -> fragmentPages.add(CertificateReportFragment("3")) + "已通过" -> fragmentPages.add(CertificateReportFragment("4")) + "未通过" -> fragmentPages.add(CertificateReportFragment("5")) + "已取消" -> fragmentPages.add(CertificateReportFragment("6")) + "可打印" -> fragmentPages.add(CertificateReportFragment("9")) + } } } diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt new file mode 100644 index 0000000..e30c7c3 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt @@ -0,0 +1,106 @@ +package com.casic.xz.meterage.view.home + +import android.view.View +import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.SubViewPagerAdapter +import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.casic.xz.meterage.fragment.certificate.ApprovalProcessFragment +import com.casic.xz.meterage.fragment.certificate.BasicInformationFragment +import com.casic.xz.meterage.fragment.certificate.ExceptionReportFragment +import com.casic.xz.meterage.model.CertificateDetailModel +import com.casic.xz.meterage.utils.LoadingDialogHub +import com.casic.xz.meterage.vm.CertificateViewModel +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.vm.LoadState +import kotlinx.android.synthetic.main.activity_certificate_detail.* + +//"草稿箱" -> "1" +//"待审批" -> "2" +//"审批中" -> "3" +//"已通过" -> "4" +//"未通过" -> "5" +//"已取消" -> "6" +//"可打印" -> "9" + +class CertificateReportDetailActivity : KotlinBaseActivity() { + + private var fragmentPages: ArrayList = ArrayList() + private lateinit var certificateViewModel: CertificateViewModel + private lateinit var detailModel: CertificateDetailModel.DataModel + + override fun initData() { + val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! + + when (args[0]) { + "1" -> { + approvalView.text = "提交" + } + "2" -> { + approvalView.text = "审批" + } + "9" -> { + approvalView.text = "打印" + } + else -> { + approvalView.visibility = View.GONE + } + } + + certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] + certificateViewModel.getCertificateReportDetail(args[1]) + certificateViewModel.certificateDetail.observe(this) { + if (it.code == 200) { + + detailModel = it.data + + fragmentPages.add(BasicInformationFragment(detailModel)) + fragmentPages.add(ApprovalProcessFragment()) + fragmentPages.add(ExceptionReportFragment()) + + val pageTitles = arrayOf("基础信息", "审批流程", "异常报告") + + approvalViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, pageTitles + ) + //绑定 + topTabLayout.setupWithViewPager(approvalViewPager) + } + } + + certificateViewModel.submitResult.observe(this) { + if (it.code == 200) { + "提交成功".show(this) + finish() + } + } + } + + override fun initEvent() { + leftBackView.setOnClickListener { finish() } + + approvalView.setOnClickListener { + certificateViewModel.submit(detailModel.id) + } + } + + override fun initLayoutView(): Int = R.layout.activity_certificate_detail + + override fun observeRequestState() { + certificateViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt index 080c380..77fe8a5 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt @@ -129,6 +129,5 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() initLayoutImmersionBar(rootView) - titleView.text = "委托需求" } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt index 735e530..e088887 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt @@ -4,7 +4,9 @@ import com.casic.xz.meterage.base.BaseApplication import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage -import com.casic.xz.meterage.model.CertificateModel +import com.casic.xz.meterage.model.ActionResultModel +import com.casic.xz.meterage.model.CertificateDetailModel +import com.casic.xz.meterage.model.CertificateListModel import com.casic.xz.meterage.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -19,7 +21,9 @@ class CertificateViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val certificateList = MutableLiveData() + val certificateList = MutableLiveData() + val certificateDetail = MutableLiveData() + val submitResult = MutableLiveData() fun getCertificateReportList( approvalStatus: String, @@ -47,8 +51,46 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - certificateList.value = gson.fromJson( - response, object : TypeToken() {}.type + certificateList.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + + fun getCertificateReportDetail(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.getCertificateReportDetail(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + certificateDetail.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + + fun submit(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.submit(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + submitResult.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { loadState.value = LoadState.Fail diff --git a/app/src/main/res/layout/activity_capability_detail.xml b/app/src/main/res/layout/activity_capability_detail.xml index 585960a..375d861 100644 --- a/app/src/main/res/layout/activity_capability_detail.xml +++ b/app/src/main/res/layout/activity_capability_detail.xml @@ -21,7 +21,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:padding="@dimen/dp_10"> + android:paddingHorizontal="@dimen/dp_10"> diff --git a/app/src/main/res/layout/activity_certificate_detail.xml b/app/src/main/res/layout/activity_certificate_detail.xml new file mode 100644 index 0000000..5bb3649 --- /dev/null +++ b/app/src/main/res/layout/activity_certificate_detail.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_standard_file_detail.xml b/app/src/main/res/layout/activity_standard_file_detail.xml index 7776230..02efb08 100644 --- a/app/src/main/res/layout/activity_standard_file_detail.xml +++ b/app/src/main/res/layout/activity_standard_file_detail.xml @@ -21,7 +21,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:padding="@dimen/dp_10"> + android:paddingHorizontal="@dimen/dp_10"> diff --git a/app/src/main/res/layout/fragment_certificate_approval_process.xml b/app/src/main/res/layout/fragment_certificate_approval_process.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/fragment_certificate_approval_process.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_certificate_basic_information.xml b/app/src/main/res/layout/fragment_certificate_basic_information.xml new file mode 100644 index 0000000..91882c7 --- /dev/null +++ b/app/src/main/res/layout/fragment_certificate_basic_information.xml @@ -0,0 +1,296 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_certificate_exception_report.xml b/app/src/main/res/layout/fragment_certificate_exception_report.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/fragment_certificate_exception_report.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_basic_information.xml b/app/src/main/res/layout/fragment_customer_basic_information.xml index e0debd1..dec78c7 100644 --- a/app/src/main/res/layout/fragment_customer_basic_information.xml +++ b/app/src/main/res/layout/fragment_customer_basic_information.xml @@ -12,7 +12,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:padding="@dimen/dp_10"> + android:paddingHorizontal="@dimen/dp_10"> diff --git a/app/src/main/res/layout/fragment_device_basic_information.xml b/app/src/main/res/layout/fragment_device_basic_information.xml index 0a7efc6..9d9cfac 100644 --- a/app/src/main/res/layout/fragment_device_basic_information.xml +++ b/app/src/main/res/layout/fragment_device_basic_information.xml @@ -12,7 +12,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:padding="@dimen/dp_10"> + android:paddingHorizontal="@dimen/dp_10"> diff --git a/app/src/main/res/layout/fragment_entrust_basic_information.xml b/app/src/main/res/layout/fragment_entrust_basic_information.xml index 07fbc24..3c23f9a 100644 --- a/app/src/main/res/layout/fragment_entrust_basic_information.xml +++ b/app/src/main/res/layout/fragment_entrust_basic_information.xml @@ -13,7 +13,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:padding="@dimen/dp_10"> + android:paddingHorizontal="@dimen/dp_10"> diff --git a/app/src/main/res/layout/fragment_equipment_basic_information.xml b/app/src/main/res/layout/fragment_equipment_basic_information.xml index fd99df2..42e9748 100644 --- a/app/src/main/res/layout/fragment_equipment_basic_information.xml +++ b/app/src/main/res/layout/fragment_equipment_basic_information.xml @@ -12,7 +12,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:padding="@dimen/dp_10"> + android:paddingHorizontal="@dimen/dp_10"> diff --git a/app/src/main/res/layout/fragment_train_basic_information.xml b/app/src/main/res/layout/fragment_train_basic_information.xml index 8ed8b7f..2fb3e73 100644 --- a/app/src/main/res/layout/fragment_train_basic_information.xml +++ b/app/src/main/res/layout/fragment_train_basic_information.xml @@ -12,7 +12,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:padding="@dimen/dp_10"> + android:paddingHorizontal="@dimen/dp_10"> diff --git a/app/build.gradle b/app/build.gradle index 5ba44f0..298f687 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -53,7 +53,8 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "XZJL_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" +// outputFileName = "XZJL_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "XZJL_" + getBuildDate() + "_Beta.apk" } } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4b914b5..ebea092 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -67,6 +67,7 @@ + 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 new file mode 100644 index 0000000..a75e566 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.certificate + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class ApprovalProcessFragment :KotlinBaseFragment(){ + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_certificate_approval_process + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt new file mode 100644 index 0000000..5882c3d --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt @@ -0,0 +1,77 @@ +package com.casic.xz.meterage.fragment.certificate + +import android.graphics.Color +import android.graphics.Paint +import android.util.Log +import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.watchAttachFile +import com.casic.xz.meterage.model.CertificateDetailModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.pengxh.kt.lite.extensions.toJson +import kotlinx.android.synthetic.main.fragment_certificate_basic_information.* + +class BasicInformationFragment(private val data: CertificateDetailModel.DataModel) : + KotlinBaseFragment() { + + override fun initData() { + val businessOriginal = data.businessOriginalRecord + + reportCodeView.text = data.certificateReportCode + originalCodeView.text = businessOriginal.originalRecordCode + checkCategoryView.text = businessOriginal.measureCategoryName + + Log.d( + "Casic", + "BasicInformationFragment => initData: ${businessOriginal.fileList.toJson()}" + ) +// basisFileView.text = businessOriginal.fileList + + val sampleInfo = businessOriginal.customerSampleInfo + sampleCodeView.text = sampleInfo.sampleNo + sampleNameView.text = sampleInfo.sampleName + manufacturingCodeView.text = sampleInfo.manufacturingNo + modelView.text = sampleInfo.sampleModel + entrustCodeView.text = sampleInfo.customerNo + entrustNameView.text = sampleInfo.customerName + entrustContactView.text = sampleInfo.phone + entrustEmailView.text = sampleInfo.postalCode + entrustAddressView.text = sampleInfo.customerAddress + senderView.text = sampleInfo.deliverer + senderContactView.text = sampleInfo.delivererTel + checkTypeView.text = sampleInfo.measureContent + remarkView.text = sampleInfo.remark + + estimateServedTimeView.text = businessOriginal.businessOrder.planDeliverTime + estimateCompleteTimeView.text = businessOriginal.businessOrder.requireOverTime + + if (data.certificateReportFile.isNullOrBlank()) { + reportFileView.text = "暂无附件" + } else { + val reportFileName = data.certificateReportFile + + reportFileView.text = reportFileName + val textPaint = reportFileView.paint + textPaint.flags = Paint.UNDERLINE_TEXT_FLAG + textPaint.isAntiAlias = true + reportFileView.setTextColor(Color.BLUE) + + reportFileView.setOnClickListener { + reportFileName.watchAttachFile(requireContext()) + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_certificate_basic_information + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt index 2f3c95c..b1df400 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt @@ -4,19 +4,24 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.addAll +import com.casic.xz.meterage.extensions.diffCurrentTime +import com.casic.xz.meterage.extensions.formatToDate import com.casic.xz.meterage.extensions.showEmptyPage -import com.casic.xz.meterage.model.CertificateModel +import com.casic.xz.meterage.model.CertificateListModel +import com.casic.xz.meterage.view.home.CertificateReportDetailActivity import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler import kotlinx.android.synthetic.main.fragment_certificate_report.* import kotlinx.android.synthetic.main.include_empty_view.* /** - * 计量法规 + * 证书报告 * * formId:ywglzsbg * */ @@ -24,8 +29,8 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var certificateViewModel: CertificateViewModel - private lateinit var certificateAdapter: NormalRecyclerAdapter - private var dataBeans: MutableList = ArrayList() + private lateinit var certificateAdapter: NormalRecyclerAdapter + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false @@ -119,40 +124,37 @@ } else { emptyView!!.hide() certificateAdapter = object : - NormalRecyclerAdapter( + NormalRecyclerAdapter( R.layout.item_certificate_rv_l, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, - item: CertificateModel.DataModel.RowsModel + item: CertificateListModel.DataModel.RowsModel ) { + val deltaT = item.createTime.diffCurrentTime() + val diffTime = if (deltaT < 24) { + "${deltaT}小时前" + } else { + item.createTime.formatToDate() + } + viewHolder.setText(R.id.reportNameView, item.certificateReportName) -// .setText(R.id.fileStateView, item.effectiveStatusName) -// .setText(R.id.remarkView, "备注：$remark") -// .setText(R.id.fileCodeView, "文件号：${item.fileNo}") -// .setText(R.id.releaseDateView, "实施时间：${item.publishTime}") -// -// if (!item.effectiveStatus.equals("1")) { -// viewHolder.setBackgroundColor( -// R.id.fileStateView, -// R.color.gray.convertColor(requireContext()) -// ) -// } + .setText(R.id.createTimeView, diffTime) + .setText(R.id.categoryView, "校验类别：${item.measureCategoryName}") + .setText(R.id.technicianView, "检定员：${item.measurePersonName}") + + viewHolder.setOnClickListener(R.id.showDetailButton) { + requireContext().navigatePageTo( + addAll(item.approvalStatus, item.id) + ) + } } } certificateRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) certificateRecyclerView.adapter = certificateAdapter - certificateAdapter.setOnItemClickedListener(object : - NormalRecyclerAdapter.OnItemClickedListener { - override fun onItemClicked( - position: Int, t: CertificateModel.DataModel.RowsModel - ) { -// requireContext().navigatePageTo(t.toJson()) - } - }) } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt new file mode 100644 index 0000000..2d5ac61 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.certificate + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class ExceptionReportFragment :KotlinBaseFragment(){ + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_certificate_exception_report + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/model/CertificateDetailModel.java b/app/src/main/java/com/casic/xz/meterage/model/CertificateDetailModel.java new file mode 100644 index 0000000..42efccd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/CertificateDetailModel.java @@ -0,0 +1,2080 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class CertificateDetailModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private String approvalSignId; + private String approvalStatus; + private String approvalStatusName; + private BusinessOriginalRecordModel businessOriginalRecord; + private String calibrationMajor; + private String calibrationMajorName; + private String certificateReportCategory; + private String certificateReportCode; + private String certificateReportFile; + private String certificateReportName; + private String createTime; + private String createUser; + private String expirationDate; + private String id; + private String isDel; + private String issuanceDate; + private String measureDeptId; + private String measurePersonId; + private String measureResult; + private String orderId; + private String originalRecordId; + private String printNum; + private String printStatus; + private String processId; + private String remark; + private String sampleId; + private String signId; + private String templateId; + private String updateTime; + + public String getApprovalSignId() { + return approvalSignId; + } + + public void setApprovalSignId(String approvalSignId) { + this.approvalSignId = approvalSignId; + } + + public String getApprovalStatus() { + return approvalStatus; + } + + public void setApprovalStatus(String approvalStatus) { + this.approvalStatus = approvalStatus; + } + + public String getApprovalStatusName() { + return approvalStatusName; + } + + public void setApprovalStatusName(String approvalStatusName) { + this.approvalStatusName = approvalStatusName; + } + + public BusinessOriginalRecordModel getBusinessOriginalRecord() { + return businessOriginalRecord; + } + + public void setBusinessOriginalRecord(BusinessOriginalRecordModel businessOriginalRecord) { + this.businessOriginalRecord = businessOriginalRecord; + } + + public String getCalibrationMajor() { + return calibrationMajor; + } + + public void setCalibrationMajor(String calibrationMajor) { + this.calibrationMajor = calibrationMajor; + } + + public String getCalibrationMajorName() { + return calibrationMajorName; + } + + public void setCalibrationMajorName(String calibrationMajorName) { + this.calibrationMajorName = calibrationMajorName; + } + + public String getCertificateReportCategory() { + return certificateReportCategory; + } + + public void setCertificateReportCategory(String certificateReportCategory) { + this.certificateReportCategory = certificateReportCategory; + } + + public String getCertificateReportCode() { + return certificateReportCode; + } + + public void setCertificateReportCode(String certificateReportCode) { + this.certificateReportCode = certificateReportCode; + } + + public String getCertificateReportFile() { + return certificateReportFile; + } + + public void setCertificateReportFile(String certificateReportFile) { + this.certificateReportFile = certificateReportFile; + } + + public String getCertificateReportName() { + return certificateReportName; + } + + public void setCertificateReportName(String certificateReportName) { + this.certificateReportName = certificateReportName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getExpirationDate() { + return expirationDate; + } + + public void setExpirationDate(String expirationDate) { + this.expirationDate = expirationDate; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String isIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIssuanceDate() { + return issuanceDate; + } + + public void setIssuanceDate(String issuanceDate) { + this.issuanceDate = issuanceDate; + } + + public String getMeasureDeptId() { + return measureDeptId; + } + + public void setMeasureDeptId(String measureDeptId) { + this.measureDeptId = measureDeptId; + } + + public String getMeasurePersonId() { + return measurePersonId; + } + + public void setMeasurePersonId(String measurePersonId) { + this.measurePersonId = measurePersonId; + } + + public String getMeasureResult() { + return measureResult; + } + + public void setMeasureResult(String measureResult) { + this.measureResult = measureResult; + } + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public String getOriginalRecordId() { + return originalRecordId; + } + + public void setOriginalRecordId(String originalRecordId) { + this.originalRecordId = originalRecordId; + } + + public String getPrintNum() { + return printNum; + } + + public void setPrintNum(String printNum) { + this.printNum = printNum; + } + + public String getPrintStatus() { + return printStatus; + } + + public void setPrintStatus(String printStatus) { + this.printStatus = printStatus; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSampleId() { + return sampleId; + } + + public void setSampleId(String sampleId) { + this.sampleId = sampleId; + } + + public String getSignId() { + return signId; + } + + public void setSignId(String signId) { + this.signId = signId; + } + + public String getTemplateId() { + return templateId; + } + + public void setTemplateId(String templateId) { + this.templateId = templateId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public static class BusinessOriginalRecordModel { + private BusinessEnvRecordModel businessEnvironmentRecord; + private BusinessOrderModel businessOrder; + private String calibrationPlace; + private String calibrationTime; + private String createTime; + private String createUser; + private BusinessOrderModel.CustomerSampleModel customerSampleInfo; + private String environmentId; + private List equipmentInfoList; + private List fileList; + private String id; + private String isDel; + private String measureCategory; + private String measureCategoryName; + private String orderId; + private String originalRecordCode; + private String originalRecordFile; + private String originalRecordName; + private String remark; + private String sampleId; + private String templateId; + private String templateName; + private String updateTime; + + public BusinessEnvRecordModel getBusinessEnvironmentRecord() { + return businessEnvironmentRecord; + } + + public void setBusinessEnvironmentRecord(BusinessEnvRecordModel businessEnvironmentRecord) { + this.businessEnvironmentRecord = businessEnvironmentRecord; + } + + public BusinessOrderModel getBusinessOrder() { + return businessOrder; + } + + public void setBusinessOrder(BusinessOrderModel businessOrder) { + this.businessOrder = businessOrder; + } + + public String getCalibrationPlace() { + return calibrationPlace; + } + + public void setCalibrationPlace(String calibrationPlace) { + this.calibrationPlace = calibrationPlace; + } + + public String getCalibrationTime() { + return calibrationTime; + } + + public void setCalibrationTime(String calibrationTime) { + this.calibrationTime = calibrationTime; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public BusinessOrderModel.CustomerSampleModel getCustomerSampleInfo() { + return customerSampleInfo; + } + + public void setCustomerSampleInfo(BusinessOrderModel.CustomerSampleModel customerSampleInfo) { + this.customerSampleInfo = customerSampleInfo; + } + + public String getEnvironmentId() { + return environmentId; + } + + public void setEnvironmentId(String environmentId) { + this.environmentId = environmentId; + } + + public List getEquipmentInfoList() { + return equipmentInfoList; + } + + public void setEquipmentInfoList(List equipmentInfoList) { + this.equipmentInfoList = equipmentInfoList; + } + + public List getFileList() { + return fileList; + } + + public void setFileList(List fileList) { + this.fileList = fileList; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String isIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getMeasureCategory() { + return measureCategory; + } + + public void setMeasureCategory(String measureCategory) { + this.measureCategory = measureCategory; + } + + public String getMeasureCategoryName() { + return measureCategoryName; + } + + public void setMeasureCategoryName(String measureCategoryName) { + this.measureCategoryName = measureCategoryName; + } + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public String getOriginalRecordCode() { + return originalRecordCode; + } + + public void setOriginalRecordCode(String originalRecordCode) { + this.originalRecordCode = originalRecordCode; + } + + public String getOriginalRecordFile() { + return originalRecordFile; + } + + public void setOriginalRecordFile(String originalRecordFile) { + this.originalRecordFile = originalRecordFile; + } + + public String getOriginalRecordName() { + return originalRecordName; + } + + public void setOriginalRecordName(String originalRecordName) { + this.originalRecordName = originalRecordName; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSampleId() { + return sampleId; + } + + public void setSampleId(String sampleId) { + this.sampleId = sampleId; + } + + public String getTemplateId() { + return templateId; + } + + public void setTemplateId(String templateId) { + this.templateId = templateId; + } + + public String getTemplateName() { + return templateName; + } + + public void setTemplateName(String templateName) { + this.templateName = templateName; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public static class BusinessEnvRecordModel { + private String createTime; + private String createUser; + private String environmentCode; + private String humidity; + private String id; + private String isDel; + private String outputVoltage; + private String recordTime; + private String recorder; + private String remark; + private String roomNumber; + private String temperature; + private String updateTime; + private String zeroGroundVoltage; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEnvironmentCode() { + return environmentCode; + } + + public void setEnvironmentCode(String environmentCode) { + this.environmentCode = environmentCode; + } + + public String getHumidity() { + return humidity; + } + + public void setHumidity(String humidity) { + this.humidity = humidity; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String isIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getOutputVoltage() { + return outputVoltage; + } + + public void setOutputVoltage(String outputVoltage) { + this.outputVoltage = outputVoltage; + } + + public String getRecordTime() { + return recordTime; + } + + public void setRecordTime(String recordTime) { + this.recordTime = recordTime; + } + + public String getRecorder() { + return recorder; + } + + public void setRecorder(String recorder) { + this.recorder = recorder; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getRoomNumber() { + return roomNumber; + } + + public void setRoomNumber(String roomNumber) { + this.roomNumber = roomNumber; + } + + public String getTemperature() { + return temperature; + } + + public void setTemperature(String temperature) { + this.temperature = temperature; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getZeroGroundVoltage() { + return zeroGroundVoltage; + } + + public void setZeroGroundVoltage(String zeroGroundVoltage) { + this.zeroGroundVoltage = zeroGroundVoltage; + } + } + + public static class BusinessOrderModel { + private String certifications; + private String createTime; + private String createUser; + private String customerAddress; + private String customerId; + private String customerName; + private String customerNo; + private String customerPhone; + private List customerSampleInfoList; + private String deliverTime; + private String deliverer; + private String delivererId; + private String delivererTel; + private String id; + private String isDel; + private String isUrgent; + private String minioFileName; + private String orderCode; + private String orderTime; + private String planDeliverTime; + private String remark; + private String requireOverTime; + private String status; + private String updateTime; + private String updateUser; + + public String getCertifications() { + return certifications; + } + + public void setCertifications(String certifications) { + this.certifications = certifications; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCustomerAddress() { + return customerAddress; + } + + public void setCustomerAddress(String customerAddress) { + this.customerAddress = customerAddress; + } + + public String getCustomerId() { + return customerId; + } + + public void setCustomerId(String customerId) { + this.customerId = customerId; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public String getCustomerPhone() { + return customerPhone; + } + + public void setCustomerPhone(String customerPhone) { + this.customerPhone = customerPhone; + } + + public List getCustomerSampleInfoList() { + return customerSampleInfoList; + } + + public void setCustomerSampleInfoList(List customerSampleInfoList) { + this.customerSampleInfoList = customerSampleInfoList; + } + + public String getDeliverTime() { + return deliverTime; + } + + public void setDeliverTime(String deliverTime) { + this.deliverTime = deliverTime; + } + + public String getDeliverer() { + return deliverer; + } + + public void setDeliverer(String deliverer) { + this.deliverer = deliverer; + } + + public String getDelivererId() { + return delivererId; + } + + public void setDelivererId(String delivererId) { + this.delivererId = delivererId; + } + + public String getDelivererTel() { + return delivererTel; + } + + public void setDelivererTel(String delivererTel) { + this.delivererTel = delivererTel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIsUrgent() { + return isUrgent; + } + + public void setIsUrgent(String isUrgent) { + this.isUrgent = isUrgent; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getOrderCode() { + return orderCode; + } + + public void setOrderCode(String orderCode) { + this.orderCode = orderCode; + } + + public String getOrderTime() { + return orderTime; + } + + public void setOrderTime(String orderTime) { + this.orderTime = orderTime; + } + + public String getPlanDeliverTime() { + return planDeliverTime; + } + + public void setPlanDeliverTime(String planDeliverTime) { + this.planDeliverTime = planDeliverTime; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getRequireOverTime() { + return requireOverTime; + } + + public void setRequireOverTime(String requireOverTime) { + this.requireOverTime = requireOverTime; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUpdateUser() { + return updateUser; + } + + public void setUpdateUser(String updateUser) { + this.updateUser = updateUser; + } + + public static class CustomerSampleModel { + private String abc; + private String appendix; + private String appendixDescn; + private String createTime; + private String createUser; + private String customerAddress; + private String customerId; + private String customerName; + private String customerNo; + private String deliverer; + private String delivererTel; + private String id; + private String isDel; + private String isExistSample; + private String labelBind; + private String manufacturer; + private String manufacturerCountry; + private String manufacturingDate; + private String manufacturingNo; + private String measureCategory; + private String measureCategoryName; + private String measureContent; + private String measureLastTime; + private String measurePeriod; + private String measureType; + private String measureTypeName; + private String minioFileName; + private String orderId; + private String phone; + private String postalCode; + private String powerVoltage; + private String remark; + private String sampleBelong; + private String sampleBelongName; + private String sampleModel; + private String sampleName; + private String sampleNo; + private String specialRequire; + private String updateTime; + private String updateUser; + private String validDeadline; + + public String getAbc() { + return abc; + } + + public void setAbc(String abc) { + this.abc = abc; + } + + public String getAppendix() { + return appendix; + } + + public void setAppendix(String appendix) { + this.appendix = appendix; + } + + public String getAppendixDescn() { + return appendixDescn; + } + + public void setAppendixDescn(String appendixDescn) { + this.appendixDescn = appendixDescn; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCustomerAddress() { + return customerAddress; + } + + public void setCustomerAddress(String customerAddress) { + this.customerAddress = customerAddress; + } + + public String getCustomerId() { + return customerId; + } + + public void setCustomerId(String customerId) { + this.customerId = customerId; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public String getDeliverer() { + return deliverer; + } + + public void setDeliverer(String deliverer) { + this.deliverer = deliverer; + } + + public String getDelivererTel() { + return delivererTel; + } + + public void setDelivererTel(String delivererTel) { + this.delivererTel = delivererTel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIsExistSample() { + return isExistSample; + } + + public void setIsExistSample(String isExistSample) { + this.isExistSample = isExistSample; + } + + public String getLabelBind() { + return labelBind; + } + + public void setLabelBind(String labelBind) { + this.labelBind = labelBind; + } + + public String getManufacturer() { + return manufacturer; + } + + public void setManufacturer(String manufacturer) { + this.manufacturer = manufacturer; + } + + public String getManufacturerCountry() { + return manufacturerCountry; + } + + public void setManufacturerCountry(String manufacturerCountry) { + this.manufacturerCountry = manufacturerCountry; + } + + public String getManufacturingDate() { + return manufacturingDate; + } + + public void setManufacturingDate(String manufacturingDate) { + this.manufacturingDate = manufacturingDate; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getMeasureCategory() { + return measureCategory; + } + + public void setMeasureCategory(String measureCategory) { + this.measureCategory = measureCategory; + } + + public String getMeasureCategoryName() { + return measureCategoryName; + } + + public void setMeasureCategoryName(String measureCategoryName) { + this.measureCategoryName = measureCategoryName; + } + + public String getMeasureContent() { + return measureContent; + } + + public void setMeasureContent(String measureContent) { + this.measureContent = measureContent; + } + + public String getMeasureLastTime() { + return measureLastTime; + } + + public void setMeasureLastTime(String measureLastTime) { + this.measureLastTime = measureLastTime; + } + + public String getMeasurePeriod() { + return measurePeriod; + } + + public void setMeasurePeriod(String measurePeriod) { + this.measurePeriod = measurePeriod; + } + + public String getMeasureType() { + return measureType; + } + + public void setMeasureType(String measureType) { + this.measureType = measureType; + } + + public String getMeasureTypeName() { + return measureTypeName; + } + + public void setMeasureTypeName(String measureTypeName) { + this.measureTypeName = measureTypeName; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getPostalCode() { + return postalCode; + } + + public void setPostalCode(String postalCode) { + this.postalCode = postalCode; + } + + public String getPowerVoltage() { + return powerVoltage; + } + + public void setPowerVoltage(String powerVoltage) { + this.powerVoltage = powerVoltage; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSampleBelong() { + return sampleBelong; + } + + public void setSampleBelong(String sampleBelong) { + this.sampleBelong = sampleBelong; + } + + public String getSampleBelongName() { + return sampleBelongName; + } + + public void setSampleBelongName(String sampleBelongName) { + this.sampleBelongName = sampleBelongName; + } + + public String getSampleModel() { + return sampleModel; + } + + public void setSampleModel(String sampleModel) { + this.sampleModel = sampleModel; + } + + public String getSampleName() { + return sampleName; + } + + public void setSampleName(String sampleName) { + this.sampleName = sampleName; + } + + public String getSampleNo() { + return sampleNo; + } + + public void setSampleNo(String sampleNo) { + this.sampleNo = sampleNo; + } + + public String getSpecialRequire() { + return specialRequire; + } + + public void setSpecialRequire(String specialRequire) { + this.specialRequire = specialRequire; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUpdateUser() { + return updateUser; + } + + public void setUpdateUser(String updateUser) { + this.updateUser = updateUser; + } + + public String getValidDeadline() { + return validDeadline; + } + + public void setValidDeadline(String validDeadline) { + this.validDeadline = validDeadline; + } + } + } + + public static class EquipmentModel { + private String abc; + private String abcName; + private String applyRelationId; + private String assetNo; + private String assetSource; + private String assetType; + private String assetTypeName; + private String attribute; + private String capitalSource; + private String capitalSourceName; + private String cardEstablishmentDate; + private String createTime; + private String createUser; + private String depreciationMethod; + private String depreciationMethodName; + private String depreciationPeriod; + private String enableDate; + private String equipmentCategory; + private String equipmentCategoryName; + private String equipmentName; + private String equipmentNo; + private String equipmentSpecifications; + private String equipmentType; + private String equipmentTypeName; + private String fileList; + private String id; + private String installIncidentalExpenses; + private String installPlace; + private String intactState; + private String isCalibrationTestEquipment; + private String isDel; + private String isFixedAssets; + private String isMeasureAccount; + private String isStandardSupportEquipment; + private String labelBind; + private String majorCategory; + private String majorCategoryName; + private String managerLevel; + private String managerLevelName; + private String managerState; + private String managerStateName; + private String manufacturer; + private String manufacturerCountry; + private String manufacturingDate; + private String manufacturingNo; + private String mesureCycle; + private String mesureDate; + private String mesureDept; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String mesureType; + private String mesureTypeName; + private String modelNo; + private String originValue; + private String overallDimension; + private String presentOriginValue; + private String purpose; + private String remark; + private String singlePrice; + private String supportStandardEquipmentName; + private String supportStandardEquipmentNo; + private String technicalLevel; + private String uncertainty; + private String updateTime; + private String useDept; + private String useDeptName; + private String usePerson; + private String usePersonName; + private String validDate; + private String version; + private String weight; + + public String getAbc() { + return abc; + } + + public void setAbc(String abc) { + this.abc = abc; + } + + public String getAbcName() { + return abcName; + } + + public void setAbcName(String abcName) { + this.abcName = abcName; + } + + public String getApplyRelationId() { + return applyRelationId; + } + + public void setApplyRelationId(String applyRelationId) { + this.applyRelationId = applyRelationId; + } + + public String getAssetNo() { + return assetNo; + } + + public void setAssetNo(String assetNo) { + this.assetNo = assetNo; + } + + public String getAssetSource() { + return assetSource; + } + + public void setAssetSource(String assetSource) { + this.assetSource = assetSource; + } + + public String getAssetType() { + return assetType; + } + + public void setAssetType(String assetType) { + this.assetType = assetType; + } + + public String getAssetTypeName() { + return assetTypeName; + } + + public void setAssetTypeName(String assetTypeName) { + this.assetTypeName = assetTypeName; + } + + public String getAttribute() { + return attribute; + } + + public void setAttribute(String attribute) { + this.attribute = attribute; + } + + public String getCapitalSource() { + return capitalSource; + } + + public void setCapitalSource(String capitalSource) { + this.capitalSource = capitalSource; + } + + public String getCapitalSourceName() { + return capitalSourceName; + } + + public void setCapitalSourceName(String capitalSourceName) { + this.capitalSourceName = capitalSourceName; + } + + public String getCardEstablishmentDate() { + return cardEstablishmentDate; + } + + public void setCardEstablishmentDate(String cardEstablishmentDate) { + this.cardEstablishmentDate = cardEstablishmentDate; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getDepreciationMethod() { + return depreciationMethod; + } + + public void setDepreciationMethod(String depreciationMethod) { + this.depreciationMethod = depreciationMethod; + } + + public String getDepreciationMethodName() { + return depreciationMethodName; + } + + public void setDepreciationMethodName(String depreciationMethodName) { + this.depreciationMethodName = depreciationMethodName; + } + + public String getDepreciationPeriod() { + return depreciationPeriod; + } + + public void setDepreciationPeriod(String depreciationPeriod) { + this.depreciationPeriod = depreciationPeriod; + } + + public String getEnableDate() { + return enableDate; + } + + public void setEnableDate(String enableDate) { + this.enableDate = enableDate; + } + + public String getEquipmentCategory() { + return equipmentCategory; + } + + public void setEquipmentCategory(String equipmentCategory) { + this.equipmentCategory = equipmentCategory; + } + + public String getEquipmentCategoryName() { + return equipmentCategoryName; + } + + public void setEquipmentCategoryName(String equipmentCategoryName) { + this.equipmentCategoryName = equipmentCategoryName; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getEquipmentSpecifications() { + return equipmentSpecifications; + } + + public void setEquipmentSpecifications(String equipmentSpecifications) { + this.equipmentSpecifications = equipmentSpecifications; + } + + public String getEquipmentType() { + return equipmentType; + } + + public void setEquipmentType(String equipmentType) { + this.equipmentType = equipmentType; + } + + public String getEquipmentTypeName() { + return equipmentTypeName; + } + + public void setEquipmentTypeName(String equipmentTypeName) { + this.equipmentTypeName = equipmentTypeName; + } + + public String getFileList() { + return fileList; + } + + public void setFileList(String fileList) { + this.fileList = fileList; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInstallIncidentalExpenses() { + return installIncidentalExpenses; + } + + public void setInstallIncidentalExpenses(String installIncidentalExpenses) { + this.installIncidentalExpenses = installIncidentalExpenses; + } + + public String getInstallPlace() { + return installPlace; + } + + public void setInstallPlace(String installPlace) { + this.installPlace = installPlace; + } + + public String getIntactState() { + return intactState; + } + + public void setIntactState(String intactState) { + this.intactState = intactState; + } + + public String getIsCalibrationTestEquipment() { + return isCalibrationTestEquipment; + } + + public void setIsCalibrationTestEquipment(String isCalibrationTestEquipment) { + this.isCalibrationTestEquipment = isCalibrationTestEquipment; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIsFixedAssets() { + return isFixedAssets; + } + + public void setIsFixedAssets(String isFixedAssets) { + this.isFixedAssets = isFixedAssets; + } + + public String getIsMeasureAccount() { + return isMeasureAccount; + } + + public void setIsMeasureAccount(String isMeasureAccount) { + this.isMeasureAccount = isMeasureAccount; + } + + public String getIsStandardSupportEquipment() { + return isStandardSupportEquipment; + } + + public void setIsStandardSupportEquipment(String isStandardSupportEquipment) { + this.isStandardSupportEquipment = isStandardSupportEquipment; + } + + public String getLabelBind() { + return labelBind; + } + + public void setLabelBind(String labelBind) { + this.labelBind = labelBind; + } + + public String getMajorCategory() { + return majorCategory; + } + + public void setMajorCategory(String majorCategory) { + this.majorCategory = majorCategory; + } + + public String getMajorCategoryName() { + return majorCategoryName; + } + + public void setMajorCategoryName(String majorCategoryName) { + this.majorCategoryName = majorCategoryName; + } + + public String getManagerLevel() { + return managerLevel; + } + + public void setManagerLevel(String managerLevel) { + this.managerLevel = managerLevel; + } + + public String getManagerLevelName() { + return managerLevelName; + } + + public void setManagerLevelName(String managerLevelName) { + this.managerLevelName = managerLevelName; + } + + public String getManagerState() { + return managerState; + } + + public void setManagerState(String managerState) { + this.managerState = managerState; + } + + public String getManagerStateName() { + return managerStateName; + } + + public void setManagerStateName(String managerStateName) { + this.managerStateName = managerStateName; + } + + public String getManufacturer() { + return manufacturer; + } + + public void setManufacturer(String manufacturer) { + this.manufacturer = manufacturer; + } + + public String getManufacturerCountry() { + return manufacturerCountry; + } + + public void setManufacturerCountry(String manufacturerCountry) { + this.manufacturerCountry = manufacturerCountry; + } + + public String getManufacturingDate() { + return manufacturingDate; + } + + public void setManufacturingDate(String manufacturingDate) { + this.manufacturingDate = manufacturingDate; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getMesureCycle() { + return mesureCycle; + } + + public void setMesureCycle(String mesureCycle) { + this.mesureCycle = mesureCycle; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureDept() { + return mesureDept; + } + + public void setMesureDept(String mesureDept) { + this.mesureDept = mesureDept; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getMesureType() { + return mesureType; + } + + public void setMesureType(String mesureType) { + this.mesureType = mesureType; + } + + public String getMesureTypeName() { + return mesureTypeName; + } + + public void setMesureTypeName(String mesureTypeName) { + this.mesureTypeName = mesureTypeName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getOriginValue() { + return originValue; + } + + public void setOriginValue(String originValue) { + this.originValue = originValue; + } + + public String getOverallDimension() { + return overallDimension; + } + + public void setOverallDimension(String overallDimension) { + this.overallDimension = overallDimension; + } + + public String getPresentOriginValue() { + return presentOriginValue; + } + + public void setPresentOriginValue(String presentOriginValue) { + this.presentOriginValue = presentOriginValue; + } + + public String getPurpose() { + return purpose; + } + + public void setPurpose(String purpose) { + this.purpose = purpose; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSinglePrice() { + return singlePrice; + } + + public void setSinglePrice(String singlePrice) { + this.singlePrice = singlePrice; + } + + public String getSupportStandardEquipmentName() { + return supportStandardEquipmentName; + } + + public void setSupportStandardEquipmentName(String supportStandardEquipmentName) { + this.supportStandardEquipmentName = supportStandardEquipmentName; + } + + public String getSupportStandardEquipmentNo() { + return supportStandardEquipmentNo; + } + + public void setSupportStandardEquipmentNo(String supportStandardEquipmentNo) { + this.supportStandardEquipmentNo = supportStandardEquipmentNo; + } + + public String getTechnicalLevel() { + return technicalLevel; + } + + public void setTechnicalLevel(String technicalLevel) { + this.technicalLevel = technicalLevel; + } + + public String getUncertainty() { + return uncertainty; + } + + public void setUncertainty(String uncertainty) { + this.uncertainty = uncertainty; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDept() { + return useDept; + } + + public void setUseDept(String useDept) { + this.useDept = useDept; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getUsePerson() { + return usePerson; + } + + public void setUsePerson(String usePerson) { + this.usePerson = usePerson; + } + + public String getUsePersonName() { + return usePersonName; + } + + public void setUsePersonName(String usePersonName) { + this.usePersonName = usePersonName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + + public String getVersion() { + return version; + } + + public void setVersion(String version) { + this.version = version; + } + + public String getWeight() { + return weight; + } + + public void setWeight(String weight) { + this.weight = weight; + } + } + + public static class FileModel { + private String approvalStatus; + private String approvalStatusName; + private String createTime; + private String createUser; + private String createUserId; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String fileType; + private String fileTypeName; + private String id; + private String isDel; + private String minioFileName; + private String processId; + private String publishTime; + private String publisher; + private String remark; + private String updateTime; + + public String getApprovalStatus() { + return approvalStatus; + } + + public void setApprovalStatus(String approvalStatus) { + this.approvalStatus = approvalStatus; + } + + public String getApprovalStatusName() { + return approvalStatusName; + } + + public void setApprovalStatusName(String approvalStatusName) { + this.approvalStatusName = approvalStatusName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCreateUserId() { + return createUserId; + } + + public void setCreateUserId(String createUserId) { + this.createUserId = createUserId; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getFileType() { + return fileType; + } + + public void setFileType(String fileType) { + this.fileType = fileType; + } + + public String getFileTypeName() { + return fileTypeName; + } + + public void setFileTypeName(String fileTypeName) { + this.fileTypeName = fileTypeName; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getPublishTime() { + return publishTime; + } + + public void setPublishTime(String publishTime) { + this.publishTime = publishTime; + } + + public String getPublisher() { + return publisher; + } + + public void setPublisher(String publisher) { + this.publisher = publisher; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/CertificateListModel.java b/app/src/main/java/com/casic/xz/meterage/model/CertificateListModel.java new file mode 100644 index 0000000..0eed915 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/CertificateListModel.java @@ -0,0 +1,229 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class CertificateListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String approvalStatus; + private String approvalStatusName; + private String calibrationMajor; + private String certificateReportCode; + private String certificateReportName; + private String createTime; + private String decisionItem; + private String id; + private String manufacturingNo; + private String measureCategory; + private String measureCategoryName; + private String measurePersonId; + private String measurePersonName; + private String orderCode; + private String processId; + private String sampleModel; + private String sampleName; + private String sampleNo; + private String taskId; + + public String getApprovalStatus() { + return approvalStatus; + } + + public void setApprovalStatus(String approvalStatus) { + this.approvalStatus = approvalStatus; + } + + public String getApprovalStatusName() { + return approvalStatusName; + } + + public void setApprovalStatusName(String approvalStatusName) { + this.approvalStatusName = approvalStatusName; + } + + public String getCalibrationMajor() { + return calibrationMajor; + } + + public void setCalibrationMajor(String calibrationMajor) { + this.calibrationMajor = calibrationMajor; + } + + public String getCertificateReportCode() { + return certificateReportCode; + } + + public void setCertificateReportCode(String certificateReportCode) { + this.certificateReportCode = certificateReportCode; + } + + public String getCertificateReportName() { + return certificateReportName; + } + + public void setCertificateReportName(String certificateReportName) { + this.certificateReportName = certificateReportName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getDecisionItem() { + return decisionItem; + } + + public void setDecisionItem(String decisionItem) { + this.decisionItem = decisionItem; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getMeasureCategory() { + return measureCategory; + } + + public void setMeasureCategory(String measureCategory) { + this.measureCategory = measureCategory; + } + + public String getMeasureCategoryName() { + return measureCategoryName; + } + + public void setMeasureCategoryName(String measureCategoryName) { + this.measureCategoryName = measureCategoryName; + } + + public String getMeasurePersonId() { + return measurePersonId; + } + + public void setMeasurePersonId(String measurePersonId) { + this.measurePersonId = measurePersonId; + } + + public String getMeasurePersonName() { + return measurePersonName; + } + + public void setMeasurePersonName(String measurePersonName) { + this.measurePersonName = measurePersonName; + } + + public String getOrderCode() { + return orderCode; + } + + public void setOrderCode(String orderCode) { + this.orderCode = orderCode; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getSampleModel() { + return sampleModel; + } + + public void setSampleModel(String sampleModel) { + this.sampleModel = sampleModel; + } + + public String getSampleName() { + return sampleName; + } + + public void setSampleName(String sampleName) { + this.sampleName = sampleName; + } + + public String getSampleNo() { + return sampleNo; + } + + public void setSampleNo(String sampleNo) { + this.sampleNo = sampleNo; + } + + public String getTaskId() { + return taskId; + } + + public void setTaskId(String taskId) { + this.taskId = taskId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/CertificateModel.java b/app/src/main/java/com/casic/xz/meterage/model/CertificateModel.java deleted file mode 100644 index ec0d25b..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/CertificateModel.java +++ /dev/null @@ -1,202 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class CertificateModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String approvalStatus; - private String approvalStatusName; - private String calibrationMajor; - private String certificateReportCode; - private String certificateReportName; - private String createTime; - private String decisionItem; - private String id; - private String manufacturingNo; - private String measurePersonId; - private String orderCode; - private String processId; - private String sampleModel; - private String sampleName; - private String sampleNo; - private String taskId; - - public String getApprovalStatus() { - return approvalStatus; - } - - public void setApprovalStatus(String approvalStatus) { - this.approvalStatus = approvalStatus; - } - - public String getApprovalStatusName() { - return approvalStatusName; - } - - public void setApprovalStatusName(String approvalStatusName) { - this.approvalStatusName = approvalStatusName; - } - - public String getCalibrationMajor() { - return calibrationMajor; - } - - public void setCalibrationMajor(String calibrationMajor) { - this.calibrationMajor = calibrationMajor; - } - - public String getCertificateReportCode() { - return certificateReportCode; - } - - public void setCertificateReportCode(String certificateReportCode) { - this.certificateReportCode = certificateReportCode; - } - - public String getCertificateReportName() { - return certificateReportName; - } - - public void setCertificateReportName(String certificateReportName) { - this.certificateReportName = certificateReportName; - } - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getDecisionItem() { - return decisionItem; - } - - public void setDecisionItem(String decisionItem) { - this.decisionItem = decisionItem; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getManufacturingNo() { - return manufacturingNo; - } - - public void setManufacturingNo(String manufacturingNo) { - this.manufacturingNo = manufacturingNo; - } - - public String getMeasurePersonId() { - return measurePersonId; - } - - public void setMeasurePersonId(String measurePersonId) { - this.measurePersonId = measurePersonId; - } - - public String getOrderCode() { - return orderCode; - } - - public void setOrderCode(String orderCode) { - this.orderCode = orderCode; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public String getSampleModel() { - return sampleModel; - } - - public void setSampleModel(String sampleModel) { - this.sampleModel = sampleModel; - } - - public String getSampleName() { - return sampleName; - } - - public void setSampleName(String sampleName) { - this.sampleName = sampleName; - } - - public String getSampleNo() { - return sampleNo; - } - - public void setSampleNo(String sampleNo) { - this.sampleNo = sampleNo; - } - - public String getTaskId() { - return taskId; - } - - public void setTaskId(String taskId) { - this.taskId = taskId; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index b0dec00..a4f3c46 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -345,4 +345,22 @@ @QueryMap limit: Map, @QueryMap offset: Map ): String + + /** + * 获取委托书详情 + */ + @POST("/business/certificateReport/detail") + suspend fun getCertificateReportDetail( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 提交证书 + */ + @POST("/business/certificateReport/submit") + suspend fun submit( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String } \ 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 cef55ec..8bf4070 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 @@ -800,4 +800,29 @@ AuthenticationHelper.token!!, requestBody, limitMap, offsetMap ) } + + /** + * 获取证书报告详情 + */ + suspend fun getCertificateReportDetail(id: String): String { + val param = JsonObject() + param.addProperty("id", id) + val requestBody = param.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getCertificateReportDetail(AuthenticationHelper.token!!, requestBody) + } + + /** + * 提交证书报告 + */ + suspend fun submit(id: String): String { + val param = JsonObject() + param.addProperty("formId", "ywglzsbg") + param.addProperty("id", id) + val requestBody = param.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.submit(AuthenticationHelper.token!!, requestBody) + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportActivity.kt index 2baefd2..fa4e129 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportActivity.kt @@ -19,15 +19,21 @@ "已通过", "未通过", "已取消", - "非草稿", - "未通过", "可打印" ) private var fragmentPages: ArrayList = ArrayList() init { - pageTitles.indices.forEach { - fragmentPages.add(CertificateReportFragment((it + 1).toString())) + pageTitles.forEach { + when (it) { + "草稿箱" -> fragmentPages.add(CertificateReportFragment("1")) + "待审批" -> fragmentPages.add(CertificateReportFragment("2")) + "审批中" -> fragmentPages.add(CertificateReportFragment("3")) + "已通过" -> fragmentPages.add(CertificateReportFragment("4")) + "未通过" -> fragmentPages.add(CertificateReportFragment("5")) + "已取消" -> fragmentPages.add(CertificateReportFragment("6")) + "可打印" -> fragmentPages.add(CertificateReportFragment("9")) + } } } diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt new file mode 100644 index 0000000..e30c7c3 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt @@ -0,0 +1,106 @@ +package com.casic.xz.meterage.view.home + +import android.view.View +import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.SubViewPagerAdapter +import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.casic.xz.meterage.fragment.certificate.ApprovalProcessFragment +import com.casic.xz.meterage.fragment.certificate.BasicInformationFragment +import com.casic.xz.meterage.fragment.certificate.ExceptionReportFragment +import com.casic.xz.meterage.model.CertificateDetailModel +import com.casic.xz.meterage.utils.LoadingDialogHub +import com.casic.xz.meterage.vm.CertificateViewModel +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.vm.LoadState +import kotlinx.android.synthetic.main.activity_certificate_detail.* + +//"草稿箱" -> "1" +//"待审批" -> "2" +//"审批中" -> "3" +//"已通过" -> "4" +//"未通过" -> "5" +//"已取消" -> "6" +//"可打印" -> "9" + +class CertificateReportDetailActivity : KotlinBaseActivity() { + + private var fragmentPages: ArrayList = ArrayList() + private lateinit var certificateViewModel: CertificateViewModel + private lateinit var detailModel: CertificateDetailModel.DataModel + + override fun initData() { + val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! + + when (args[0]) { + "1" -> { + approvalView.text = "提交" + } + "2" -> { + approvalView.text = "审批" + } + "9" -> { + approvalView.text = "打印" + } + else -> { + approvalView.visibility = View.GONE + } + } + + certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] + certificateViewModel.getCertificateReportDetail(args[1]) + certificateViewModel.certificateDetail.observe(this) { + if (it.code == 200) { + + detailModel = it.data + + fragmentPages.add(BasicInformationFragment(detailModel)) + fragmentPages.add(ApprovalProcessFragment()) + fragmentPages.add(ExceptionReportFragment()) + + val pageTitles = arrayOf("基础信息", "审批流程", "异常报告") + + approvalViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, pageTitles + ) + //绑定 + topTabLayout.setupWithViewPager(approvalViewPager) + } + } + + certificateViewModel.submitResult.observe(this) { + if (it.code == 200) { + "提交成功".show(this) + finish() + } + } + } + + override fun initEvent() { + leftBackView.setOnClickListener { finish() } + + approvalView.setOnClickListener { + certificateViewModel.submit(detailModel.id) + } + } + + override fun initLayoutView(): Int = R.layout.activity_certificate_detail + + override fun observeRequestState() { + certificateViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt index 080c380..77fe8a5 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt @@ -129,6 +129,5 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() initLayoutImmersionBar(rootView) - titleView.text = "委托需求" } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt index 735e530..e088887 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt @@ -4,7 +4,9 @@ import com.casic.xz.meterage.base.BaseApplication import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage -import com.casic.xz.meterage.model.CertificateModel +import com.casic.xz.meterage.model.ActionResultModel +import com.casic.xz.meterage.model.CertificateDetailModel +import com.casic.xz.meterage.model.CertificateListModel import com.casic.xz.meterage.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -19,7 +21,9 @@ class CertificateViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val certificateList = MutableLiveData() + val certificateList = MutableLiveData() + val certificateDetail = MutableLiveData() + val submitResult = MutableLiveData() fun getCertificateReportList( approvalStatus: String, @@ -47,8 +51,46 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - certificateList.value = gson.fromJson( - response, object : TypeToken() {}.type + certificateList.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + + fun getCertificateReportDetail(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.getCertificateReportDetail(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + certificateDetail.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + + fun submit(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.submit(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + submitResult.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { loadState.value = LoadState.Fail diff --git a/app/src/main/res/layout/activity_capability_detail.xml b/app/src/main/res/layout/activity_capability_detail.xml index 585960a..375d861 100644 --- a/app/src/main/res/layout/activity_capability_detail.xml +++ b/app/src/main/res/layout/activity_capability_detail.xml @@ -21,7 +21,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:padding="@dimen/dp_10"> + android:paddingHorizontal="@dimen/dp_10"> diff --git a/app/src/main/res/layout/activity_certificate_detail.xml b/app/src/main/res/layout/activity_certificate_detail.xml new file mode 100644 index 0000000..5bb3649 --- /dev/null +++ b/app/src/main/res/layout/activity_certificate_detail.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_standard_file_detail.xml b/app/src/main/res/layout/activity_standard_file_detail.xml index 7776230..02efb08 100644 --- a/app/src/main/res/layout/activity_standard_file_detail.xml +++ b/app/src/main/res/layout/activity_standard_file_detail.xml @@ -21,7 +21,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:padding="@dimen/dp_10"> + android:paddingHorizontal="@dimen/dp_10"> diff --git a/app/src/main/res/layout/fragment_certificate_approval_process.xml b/app/src/main/res/layout/fragment_certificate_approval_process.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/fragment_certificate_approval_process.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_certificate_basic_information.xml b/app/src/main/res/layout/fragment_certificate_basic_information.xml new file mode 100644 index 0000000..91882c7 --- /dev/null +++ b/app/src/main/res/layout/fragment_certificate_basic_information.xml @@ -0,0 +1,296 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_certificate_exception_report.xml b/app/src/main/res/layout/fragment_certificate_exception_report.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/fragment_certificate_exception_report.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_basic_information.xml b/app/src/main/res/layout/fragment_customer_basic_information.xml index e0debd1..dec78c7 100644 --- a/app/src/main/res/layout/fragment_customer_basic_information.xml +++ b/app/src/main/res/layout/fragment_customer_basic_information.xml @@ -12,7 +12,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:padding="@dimen/dp_10"> + android:paddingHorizontal="@dimen/dp_10"> diff --git a/app/src/main/res/layout/fragment_device_basic_information.xml b/app/src/main/res/layout/fragment_device_basic_information.xml index 0a7efc6..9d9cfac 100644 --- a/app/src/main/res/layout/fragment_device_basic_information.xml +++ b/app/src/main/res/layout/fragment_device_basic_information.xml @@ -12,7 +12,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:padding="@dimen/dp_10"> + android:paddingHorizontal="@dimen/dp_10"> diff --git a/app/src/main/res/layout/fragment_entrust_basic_information.xml b/app/src/main/res/layout/fragment_entrust_basic_information.xml index 07fbc24..3c23f9a 100644 --- a/app/src/main/res/layout/fragment_entrust_basic_information.xml +++ b/app/src/main/res/layout/fragment_entrust_basic_information.xml @@ -13,7 +13,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:padding="@dimen/dp_10"> + android:paddingHorizontal="@dimen/dp_10"> diff --git a/app/src/main/res/layout/fragment_equipment_basic_information.xml b/app/src/main/res/layout/fragment_equipment_basic_information.xml index fd99df2..42e9748 100644 --- a/app/src/main/res/layout/fragment_equipment_basic_information.xml +++ b/app/src/main/res/layout/fragment_equipment_basic_information.xml @@ -12,7 +12,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:padding="@dimen/dp_10"> + android:paddingHorizontal="@dimen/dp_10"> diff --git a/app/src/main/res/layout/fragment_train_basic_information.xml b/app/src/main/res/layout/fragment_train_basic_information.xml index 8ed8b7f..2fb3e73 100644 --- a/app/src/main/res/layout/fragment_train_basic_information.xml +++ b/app/src/main/res/layout/fragment_train_basic_information.xml @@ -12,7 +12,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:padding="@dimen/dp_10"> + android:paddingHorizontal="@dimen/dp_10"> diff --git a/app/src/main/res/layout/item_certificate_rv_l.xml b/app/src/main/res/layout/item_certificate_rv_l.xml index 2e39f0c..5476e2c 100644 --- a/app/src/main/res/layout/item_certificate_rv_l.xml +++ b/app/src/main/res/layout/item_certificate_rv_l.xml @@ -1,68 +1,64 @@ - + android:padding="@dimen/dp_7"> - + android:layout_height="wrap_content" + android:text="23小时前" + android:textColor="@color/gray" + android:textSize="@dimen/sp_12" /> - + - - - - - \ No newline at end of file + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 5ba44f0..298f687 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -53,7 +53,8 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "XZJL_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" +// outputFileName = "XZJL_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "XZJL_" + getBuildDate() + "_Beta.apk" } } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4b914b5..ebea092 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -67,6 +67,7 @@ + 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 new file mode 100644 index 0000000..a75e566 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.certificate + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class ApprovalProcessFragment :KotlinBaseFragment(){ + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_certificate_approval_process + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt new file mode 100644 index 0000000..5882c3d --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt @@ -0,0 +1,77 @@ +package com.casic.xz.meterage.fragment.certificate + +import android.graphics.Color +import android.graphics.Paint +import android.util.Log +import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.watchAttachFile +import com.casic.xz.meterage.model.CertificateDetailModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.pengxh.kt.lite.extensions.toJson +import kotlinx.android.synthetic.main.fragment_certificate_basic_information.* + +class BasicInformationFragment(private val data: CertificateDetailModel.DataModel) : + KotlinBaseFragment() { + + override fun initData() { + val businessOriginal = data.businessOriginalRecord + + reportCodeView.text = data.certificateReportCode + originalCodeView.text = businessOriginal.originalRecordCode + checkCategoryView.text = businessOriginal.measureCategoryName + + Log.d( + "Casic", + "BasicInformationFragment => initData: ${businessOriginal.fileList.toJson()}" + ) +// basisFileView.text = businessOriginal.fileList + + val sampleInfo = businessOriginal.customerSampleInfo + sampleCodeView.text = sampleInfo.sampleNo + sampleNameView.text = sampleInfo.sampleName + manufacturingCodeView.text = sampleInfo.manufacturingNo + modelView.text = sampleInfo.sampleModel + entrustCodeView.text = sampleInfo.customerNo + entrustNameView.text = sampleInfo.customerName + entrustContactView.text = sampleInfo.phone + entrustEmailView.text = sampleInfo.postalCode + entrustAddressView.text = sampleInfo.customerAddress + senderView.text = sampleInfo.deliverer + senderContactView.text = sampleInfo.delivererTel + checkTypeView.text = sampleInfo.measureContent + remarkView.text = sampleInfo.remark + + estimateServedTimeView.text = businessOriginal.businessOrder.planDeliverTime + estimateCompleteTimeView.text = businessOriginal.businessOrder.requireOverTime + + if (data.certificateReportFile.isNullOrBlank()) { + reportFileView.text = "暂无附件" + } else { + val reportFileName = data.certificateReportFile + + reportFileView.text = reportFileName + val textPaint = reportFileView.paint + textPaint.flags = Paint.UNDERLINE_TEXT_FLAG + textPaint.isAntiAlias = true + reportFileView.setTextColor(Color.BLUE) + + reportFileView.setOnClickListener { + reportFileName.watchAttachFile(requireContext()) + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_certificate_basic_information + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt index 2f3c95c..b1df400 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt @@ -4,19 +4,24 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.addAll +import com.casic.xz.meterage.extensions.diffCurrentTime +import com.casic.xz.meterage.extensions.formatToDate import com.casic.xz.meterage.extensions.showEmptyPage -import com.casic.xz.meterage.model.CertificateModel +import com.casic.xz.meterage.model.CertificateListModel +import com.casic.xz.meterage.view.home.CertificateReportDetailActivity import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler import kotlinx.android.synthetic.main.fragment_certificate_report.* import kotlinx.android.synthetic.main.include_empty_view.* /** - * 计量法规 + * 证书报告 * * formId:ywglzsbg * */ @@ -24,8 +29,8 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var certificateViewModel: CertificateViewModel - private lateinit var certificateAdapter: NormalRecyclerAdapter - private var dataBeans: MutableList = ArrayList() + private lateinit var certificateAdapter: NormalRecyclerAdapter + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false @@ -119,40 +124,37 @@ } else { emptyView!!.hide() certificateAdapter = object : - NormalRecyclerAdapter( + NormalRecyclerAdapter( R.layout.item_certificate_rv_l, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, - item: CertificateModel.DataModel.RowsModel + item: CertificateListModel.DataModel.RowsModel ) { + val deltaT = item.createTime.diffCurrentTime() + val diffTime = if (deltaT < 24) { + "${deltaT}小时前" + } else { + item.createTime.formatToDate() + } + viewHolder.setText(R.id.reportNameView, item.certificateReportName) -// .setText(R.id.fileStateView, item.effectiveStatusName) -// .setText(R.id.remarkView, "备注：$remark") -// .setText(R.id.fileCodeView, "文件号：${item.fileNo}") -// .setText(R.id.releaseDateView, "实施时间：${item.publishTime}") -// -// if (!item.effectiveStatus.equals("1")) { -// viewHolder.setBackgroundColor( -// R.id.fileStateView, -// R.color.gray.convertColor(requireContext()) -// ) -// } + .setText(R.id.createTimeView, diffTime) + .setText(R.id.categoryView, "校验类别：${item.measureCategoryName}") + .setText(R.id.technicianView, "检定员：${item.measurePersonName}") + + viewHolder.setOnClickListener(R.id.showDetailButton) { + requireContext().navigatePageTo( + addAll(item.approvalStatus, item.id) + ) + } } } certificateRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) certificateRecyclerView.adapter = certificateAdapter - certificateAdapter.setOnItemClickedListener(object : - NormalRecyclerAdapter.OnItemClickedListener { - override fun onItemClicked( - position: Int, t: CertificateModel.DataModel.RowsModel - ) { -// requireContext().navigatePageTo(t.toJson()) - } - }) } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt new file mode 100644 index 0000000..2d5ac61 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.certificate + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class ExceptionReportFragment :KotlinBaseFragment(){ + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_certificate_exception_report + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/model/CertificateDetailModel.java b/app/src/main/java/com/casic/xz/meterage/model/CertificateDetailModel.java new file mode 100644 index 0000000..42efccd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/CertificateDetailModel.java @@ -0,0 +1,2080 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class CertificateDetailModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private String approvalSignId; + private String approvalStatus; + private String approvalStatusName; + private BusinessOriginalRecordModel businessOriginalRecord; + private String calibrationMajor; + private String calibrationMajorName; + private String certificateReportCategory; + private String certificateReportCode; + private String certificateReportFile; + private String certificateReportName; + private String createTime; + private String createUser; + private String expirationDate; + private String id; + private String isDel; + private String issuanceDate; + private String measureDeptId; + private String measurePersonId; + private String measureResult; + private String orderId; + private String originalRecordId; + private String printNum; + private String printStatus; + private String processId; + private String remark; + private String sampleId; + private String signId; + private String templateId; + private String updateTime; + + public String getApprovalSignId() { + return approvalSignId; + } + + public void setApprovalSignId(String approvalSignId) { + this.approvalSignId = approvalSignId; + } + + public String getApprovalStatus() { + return approvalStatus; + } + + public void setApprovalStatus(String approvalStatus) { + this.approvalStatus = approvalStatus; + } + + public String getApprovalStatusName() { + return approvalStatusName; + } + + public void setApprovalStatusName(String approvalStatusName) { + this.approvalStatusName = approvalStatusName; + } + + public BusinessOriginalRecordModel getBusinessOriginalRecord() { + return businessOriginalRecord; + } + + public void setBusinessOriginalRecord(BusinessOriginalRecordModel businessOriginalRecord) { + this.businessOriginalRecord = businessOriginalRecord; + } + + public String getCalibrationMajor() { + return calibrationMajor; + } + + public void setCalibrationMajor(String calibrationMajor) { + this.calibrationMajor = calibrationMajor; + } + + public String getCalibrationMajorName() { + return calibrationMajorName; + } + + public void setCalibrationMajorName(String calibrationMajorName) { + this.calibrationMajorName = calibrationMajorName; + } + + public String getCertificateReportCategory() { + return certificateReportCategory; + } + + public void setCertificateReportCategory(String certificateReportCategory) { + this.certificateReportCategory = certificateReportCategory; + } + + public String getCertificateReportCode() { + return certificateReportCode; + } + + public void setCertificateReportCode(String certificateReportCode) { + this.certificateReportCode = certificateReportCode; + } + + public String getCertificateReportFile() { + return certificateReportFile; + } + + public void setCertificateReportFile(String certificateReportFile) { + this.certificateReportFile = certificateReportFile; + } + + public String getCertificateReportName() { + return certificateReportName; + } + + public void setCertificateReportName(String certificateReportName) { + this.certificateReportName = certificateReportName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getExpirationDate() { + return expirationDate; + } + + public void setExpirationDate(String expirationDate) { + this.expirationDate = expirationDate; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String isIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIssuanceDate() { + return issuanceDate; + } + + public void setIssuanceDate(String issuanceDate) { + this.issuanceDate = issuanceDate; + } + + public String getMeasureDeptId() { + return measureDeptId; + } + + public void setMeasureDeptId(String measureDeptId) { + this.measureDeptId = measureDeptId; + } + + public String getMeasurePersonId() { + return measurePersonId; + } + + public void setMeasurePersonId(String measurePersonId) { + this.measurePersonId = measurePersonId; + } + + public String getMeasureResult() { + return measureResult; + } + + public void setMeasureResult(String measureResult) { + this.measureResult = measureResult; + } + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public String getOriginalRecordId() { + return originalRecordId; + } + + public void setOriginalRecordId(String originalRecordId) { + this.originalRecordId = originalRecordId; + } + + public String getPrintNum() { + return printNum; + } + + public void setPrintNum(String printNum) { + this.printNum = printNum; + } + + public String getPrintStatus() { + return printStatus; + } + + public void setPrintStatus(String printStatus) { + this.printStatus = printStatus; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSampleId() { + return sampleId; + } + + public void setSampleId(String sampleId) { + this.sampleId = sampleId; + } + + public String getSignId() { + return signId; + } + + public void setSignId(String signId) { + this.signId = signId; + } + + public String getTemplateId() { + return templateId; + } + + public void setTemplateId(String templateId) { + this.templateId = templateId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public static class BusinessOriginalRecordModel { + private BusinessEnvRecordModel businessEnvironmentRecord; + private BusinessOrderModel businessOrder; + private String calibrationPlace; + private String calibrationTime; + private String createTime; + private String createUser; + private BusinessOrderModel.CustomerSampleModel customerSampleInfo; + private String environmentId; + private List equipmentInfoList; + private List fileList; + private String id; + private String isDel; + private String measureCategory; + private String measureCategoryName; + private String orderId; + private String originalRecordCode; + private String originalRecordFile; + private String originalRecordName; + private String remark; + private String sampleId; + private String templateId; + private String templateName; + private String updateTime; + + public BusinessEnvRecordModel getBusinessEnvironmentRecord() { + return businessEnvironmentRecord; + } + + public void setBusinessEnvironmentRecord(BusinessEnvRecordModel businessEnvironmentRecord) { + this.businessEnvironmentRecord = businessEnvironmentRecord; + } + + public BusinessOrderModel getBusinessOrder() { + return businessOrder; + } + + public void setBusinessOrder(BusinessOrderModel businessOrder) { + this.businessOrder = businessOrder; + } + + public String getCalibrationPlace() { + return calibrationPlace; + } + + public void setCalibrationPlace(String calibrationPlace) { + this.calibrationPlace = calibrationPlace; + } + + public String getCalibrationTime() { + return calibrationTime; + } + + public void setCalibrationTime(String calibrationTime) { + this.calibrationTime = calibrationTime; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public BusinessOrderModel.CustomerSampleModel getCustomerSampleInfo() { + return customerSampleInfo; + } + + public void setCustomerSampleInfo(BusinessOrderModel.CustomerSampleModel customerSampleInfo) { + this.customerSampleInfo = customerSampleInfo; + } + + public String getEnvironmentId() { + return environmentId; + } + + public void setEnvironmentId(String environmentId) { + this.environmentId = environmentId; + } + + public List getEquipmentInfoList() { + return equipmentInfoList; + } + + public void setEquipmentInfoList(List equipmentInfoList) { + this.equipmentInfoList = equipmentInfoList; + } + + public List getFileList() { + return fileList; + } + + public void setFileList(List fileList) { + this.fileList = fileList; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String isIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getMeasureCategory() { + return measureCategory; + } + + public void setMeasureCategory(String measureCategory) { + this.measureCategory = measureCategory; + } + + public String getMeasureCategoryName() { + return measureCategoryName; + } + + public void setMeasureCategoryName(String measureCategoryName) { + this.measureCategoryName = measureCategoryName; + } + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public String getOriginalRecordCode() { + return originalRecordCode; + } + + public void setOriginalRecordCode(String originalRecordCode) { + this.originalRecordCode = originalRecordCode; + } + + public String getOriginalRecordFile() { + return originalRecordFile; + } + + public void setOriginalRecordFile(String originalRecordFile) { + this.originalRecordFile = originalRecordFile; + } + + public String getOriginalRecordName() { + return originalRecordName; + } + + public void setOriginalRecordName(String originalRecordName) { + this.originalRecordName = originalRecordName; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSampleId() { + return sampleId; + } + + public void setSampleId(String sampleId) { + this.sampleId = sampleId; + } + + public String getTemplateId() { + return templateId; + } + + public void setTemplateId(String templateId) { + this.templateId = templateId; + } + + public String getTemplateName() { + return templateName; + } + + public void setTemplateName(String templateName) { + this.templateName = templateName; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public static class BusinessEnvRecordModel { + private String createTime; + private String createUser; + private String environmentCode; + private String humidity; + private String id; + private String isDel; + private String outputVoltage; + private String recordTime; + private String recorder; + private String remark; + private String roomNumber; + private String temperature; + private String updateTime; + private String zeroGroundVoltage; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEnvironmentCode() { + return environmentCode; + } + + public void setEnvironmentCode(String environmentCode) { + this.environmentCode = environmentCode; + } + + public String getHumidity() { + return humidity; + } + + public void setHumidity(String humidity) { + this.humidity = humidity; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String isIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getOutputVoltage() { + return outputVoltage; + } + + public void setOutputVoltage(String outputVoltage) { + this.outputVoltage = outputVoltage; + } + + public String getRecordTime() { + return recordTime; + } + + public void setRecordTime(String recordTime) { + this.recordTime = recordTime; + } + + public String getRecorder() { + return recorder; + } + + public void setRecorder(String recorder) { + this.recorder = recorder; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getRoomNumber() { + return roomNumber; + } + + public void setRoomNumber(String roomNumber) { + this.roomNumber = roomNumber; + } + + public String getTemperature() { + return temperature; + } + + public void setTemperature(String temperature) { + this.temperature = temperature; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getZeroGroundVoltage() { + return zeroGroundVoltage; + } + + public void setZeroGroundVoltage(String zeroGroundVoltage) { + this.zeroGroundVoltage = zeroGroundVoltage; + } + } + + public static class BusinessOrderModel { + private String certifications; + private String createTime; + private String createUser; + private String customerAddress; + private String customerId; + private String customerName; + private String customerNo; + private String customerPhone; + private List customerSampleInfoList; + private String deliverTime; + private String deliverer; + private String delivererId; + private String delivererTel; + private String id; + private String isDel; + private String isUrgent; + private String minioFileName; + private String orderCode; + private String orderTime; + private String planDeliverTime; + private String remark; + private String requireOverTime; + private String status; + private String updateTime; + private String updateUser; + + public String getCertifications() { + return certifications; + } + + public void setCertifications(String certifications) { + this.certifications = certifications; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCustomerAddress() { + return customerAddress; + } + + public void setCustomerAddress(String customerAddress) { + this.customerAddress = customerAddress; + } + + public String getCustomerId() { + return customerId; + } + + public void setCustomerId(String customerId) { + this.customerId = customerId; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public String getCustomerPhone() { + return customerPhone; + } + + public void setCustomerPhone(String customerPhone) { + this.customerPhone = customerPhone; + } + + public List getCustomerSampleInfoList() { + return customerSampleInfoList; + } + + public void setCustomerSampleInfoList(List customerSampleInfoList) { + this.customerSampleInfoList = customerSampleInfoList; + } + + public String getDeliverTime() { + return deliverTime; + } + + public void setDeliverTime(String deliverTime) { + this.deliverTime = deliverTime; + } + + public String getDeliverer() { + return deliverer; + } + + public void setDeliverer(String deliverer) { + this.deliverer = deliverer; + } + + public String getDelivererId() { + return delivererId; + } + + public void setDelivererId(String delivererId) { + this.delivererId = delivererId; + } + + public String getDelivererTel() { + return delivererTel; + } + + public void setDelivererTel(String delivererTel) { + this.delivererTel = delivererTel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIsUrgent() { + return isUrgent; + } + + public void setIsUrgent(String isUrgent) { + this.isUrgent = isUrgent; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getOrderCode() { + return orderCode; + } + + public void setOrderCode(String orderCode) { + this.orderCode = orderCode; + } + + public String getOrderTime() { + return orderTime; + } + + public void setOrderTime(String orderTime) { + this.orderTime = orderTime; + } + + public String getPlanDeliverTime() { + return planDeliverTime; + } + + public void setPlanDeliverTime(String planDeliverTime) { + this.planDeliverTime = planDeliverTime; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getRequireOverTime() { + return requireOverTime; + } + + public void setRequireOverTime(String requireOverTime) { + this.requireOverTime = requireOverTime; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUpdateUser() { + return updateUser; + } + + public void setUpdateUser(String updateUser) { + this.updateUser = updateUser; + } + + public static class CustomerSampleModel { + private String abc; + private String appendix; + private String appendixDescn; + private String createTime; + private String createUser; + private String customerAddress; + private String customerId; + private String customerName; + private String customerNo; + private String deliverer; + private String delivererTel; + private String id; + private String isDel; + private String isExistSample; + private String labelBind; + private String manufacturer; + private String manufacturerCountry; + private String manufacturingDate; + private String manufacturingNo; + private String measureCategory; + private String measureCategoryName; + private String measureContent; + private String measureLastTime; + private String measurePeriod; + private String measureType; + private String measureTypeName; + private String minioFileName; + private String orderId; + private String phone; + private String postalCode; + private String powerVoltage; + private String remark; + private String sampleBelong; + private String sampleBelongName; + private String sampleModel; + private String sampleName; + private String sampleNo; + private String specialRequire; + private String updateTime; + private String updateUser; + private String validDeadline; + + public String getAbc() { + return abc; + } + + public void setAbc(String abc) { + this.abc = abc; + } + + public String getAppendix() { + return appendix; + } + + public void setAppendix(String appendix) { + this.appendix = appendix; + } + + public String getAppendixDescn() { + return appendixDescn; + } + + public void setAppendixDescn(String appendixDescn) { + this.appendixDescn = appendixDescn; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCustomerAddress() { + return customerAddress; + } + + public void setCustomerAddress(String customerAddress) { + this.customerAddress = customerAddress; + } + + public String getCustomerId() { + return customerId; + } + + public void setCustomerId(String customerId) { + this.customerId = customerId; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public String getDeliverer() { + return deliverer; + } + + public void setDeliverer(String deliverer) { + this.deliverer = deliverer; + } + + public String getDelivererTel() { + return delivererTel; + } + + public void setDelivererTel(String delivererTel) { + this.delivererTel = delivererTel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIsExistSample() { + return isExistSample; + } + + public void setIsExistSample(String isExistSample) { + this.isExistSample = isExistSample; + } + + public String getLabelBind() { + return labelBind; + } + + public void setLabelBind(String labelBind) { + this.labelBind = labelBind; + } + + public String getManufacturer() { + return manufacturer; + } + + public void setManufacturer(String manufacturer) { + this.manufacturer = manufacturer; + } + + public String getManufacturerCountry() { + return manufacturerCountry; + } + + public void setManufacturerCountry(String manufacturerCountry) { + this.manufacturerCountry = manufacturerCountry; + } + + public String getManufacturingDate() { + return manufacturingDate; + } + + public void setManufacturingDate(String manufacturingDate) { + this.manufacturingDate = manufacturingDate; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getMeasureCategory() { + return measureCategory; + } + + public void setMeasureCategory(String measureCategory) { + this.measureCategory = measureCategory; + } + + public String getMeasureCategoryName() { + return measureCategoryName; + } + + public void setMeasureCategoryName(String measureCategoryName) { + this.measureCategoryName = measureCategoryName; + } + + public String getMeasureContent() { + return measureContent; + } + + public void setMeasureContent(String measureContent) { + this.measureContent = measureContent; + } + + public String getMeasureLastTime() { + return measureLastTime; + } + + public void setMeasureLastTime(String measureLastTime) { + this.measureLastTime = measureLastTime; + } + + public String getMeasurePeriod() { + return measurePeriod; + } + + public void setMeasurePeriod(String measurePeriod) { + this.measurePeriod = measurePeriod; + } + + public String getMeasureType() { + return measureType; + } + + public void setMeasureType(String measureType) { + this.measureType = measureType; + } + + public String getMeasureTypeName() { + return measureTypeName; + } + + public void setMeasureTypeName(String measureTypeName) { + this.measureTypeName = measureTypeName; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getPostalCode() { + return postalCode; + } + + public void setPostalCode(String postalCode) { + this.postalCode = postalCode; + } + + public String getPowerVoltage() { + return powerVoltage; + } + + public void setPowerVoltage(String powerVoltage) { + this.powerVoltage = powerVoltage; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSampleBelong() { + return sampleBelong; + } + + public void setSampleBelong(String sampleBelong) { + this.sampleBelong = sampleBelong; + } + + public String getSampleBelongName() { + return sampleBelongName; + } + + public void setSampleBelongName(String sampleBelongName) { + this.sampleBelongName = sampleBelongName; + } + + public String getSampleModel() { + return sampleModel; + } + + public void setSampleModel(String sampleModel) { + this.sampleModel = sampleModel; + } + + public String getSampleName() { + return sampleName; + } + + public void setSampleName(String sampleName) { + this.sampleName = sampleName; + } + + public String getSampleNo() { + return sampleNo; + } + + public void setSampleNo(String sampleNo) { + this.sampleNo = sampleNo; + } + + public String getSpecialRequire() { + return specialRequire; + } + + public void setSpecialRequire(String specialRequire) { + this.specialRequire = specialRequire; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUpdateUser() { + return updateUser; + } + + public void setUpdateUser(String updateUser) { + this.updateUser = updateUser; + } + + public String getValidDeadline() { + return validDeadline; + } + + public void setValidDeadline(String validDeadline) { + this.validDeadline = validDeadline; + } + } + } + + public static class EquipmentModel { + private String abc; + private String abcName; + private String applyRelationId; + private String assetNo; + private String assetSource; + private String assetType; + private String assetTypeName; + private String attribute; + private String capitalSource; + private String capitalSourceName; + private String cardEstablishmentDate; + private String createTime; + private String createUser; + private String depreciationMethod; + private String depreciationMethodName; + private String depreciationPeriod; + private String enableDate; + private String equipmentCategory; + private String equipmentCategoryName; + private String equipmentName; + private String equipmentNo; + private String equipmentSpecifications; + private String equipmentType; + private String equipmentTypeName; + private String fileList; + private String id; + private String installIncidentalExpenses; + private String installPlace; + private String intactState; + private String isCalibrationTestEquipment; + private String isDel; + private String isFixedAssets; + private String isMeasureAccount; + private String isStandardSupportEquipment; + private String labelBind; + private String majorCategory; + private String majorCategoryName; + private String managerLevel; + private String managerLevelName; + private String managerState; + private String managerStateName; + private String manufacturer; + private String manufacturerCountry; + private String manufacturingDate; + private String manufacturingNo; + private String mesureCycle; + private String mesureDate; + private String mesureDept; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String mesureType; + private String mesureTypeName; + private String modelNo; + private String originValue; + private String overallDimension; + private String presentOriginValue; + private String purpose; + private String remark; + private String singlePrice; + private String supportStandardEquipmentName; + private String supportStandardEquipmentNo; + private String technicalLevel; + private String uncertainty; + private String updateTime; + private String useDept; + private String useDeptName; + private String usePerson; + private String usePersonName; + private String validDate; + private String version; + private String weight; + + public String getAbc() { + return abc; + } + + public void setAbc(String abc) { + this.abc = abc; + } + + public String getAbcName() { + return abcName; + } + + public void setAbcName(String abcName) { + this.abcName = abcName; + } + + public String getApplyRelationId() { + return applyRelationId; + } + + public void setApplyRelationId(String applyRelationId) { + this.applyRelationId = applyRelationId; + } + + public String getAssetNo() { + return assetNo; + } + + public void setAssetNo(String assetNo) { + this.assetNo = assetNo; + } + + public String getAssetSource() { + return assetSource; + } + + public void setAssetSource(String assetSource) { + this.assetSource = assetSource; + } + + public String getAssetType() { + return assetType; + } + + public void setAssetType(String assetType) { + this.assetType = assetType; + } + + public String getAssetTypeName() { + return assetTypeName; + } + + public void setAssetTypeName(String assetTypeName) { + this.assetTypeName = assetTypeName; + } + + public String getAttribute() { + return attribute; + } + + public void setAttribute(String attribute) { + this.attribute = attribute; + } + + public String getCapitalSource() { + return capitalSource; + } + + public void setCapitalSource(String capitalSource) { + this.capitalSource = capitalSource; + } + + public String getCapitalSourceName() { + return capitalSourceName; + } + + public void setCapitalSourceName(String capitalSourceName) { + this.capitalSourceName = capitalSourceName; + } + + public String getCardEstablishmentDate() { + return cardEstablishmentDate; + } + + public void setCardEstablishmentDate(String cardEstablishmentDate) { + this.cardEstablishmentDate = cardEstablishmentDate; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getDepreciationMethod() { + return depreciationMethod; + } + + public void setDepreciationMethod(String depreciationMethod) { + this.depreciationMethod = depreciationMethod; + } + + public String getDepreciationMethodName() { + return depreciationMethodName; + } + + public void setDepreciationMethodName(String depreciationMethodName) { + this.depreciationMethodName = depreciationMethodName; + } + + public String getDepreciationPeriod() { + return depreciationPeriod; + } + + public void setDepreciationPeriod(String depreciationPeriod) { + this.depreciationPeriod = depreciationPeriod; + } + + public String getEnableDate() { + return enableDate; + } + + public void setEnableDate(String enableDate) { + this.enableDate = enableDate; + } + + public String getEquipmentCategory() { + return equipmentCategory; + } + + public void setEquipmentCategory(String equipmentCategory) { + this.equipmentCategory = equipmentCategory; + } + + public String getEquipmentCategoryName() { + return equipmentCategoryName; + } + + public void setEquipmentCategoryName(String equipmentCategoryName) { + this.equipmentCategoryName = equipmentCategoryName; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getEquipmentSpecifications() { + return equipmentSpecifications; + } + + public void setEquipmentSpecifications(String equipmentSpecifications) { + this.equipmentSpecifications = equipmentSpecifications; + } + + public String getEquipmentType() { + return equipmentType; + } + + public void setEquipmentType(String equipmentType) { + this.equipmentType = equipmentType; + } + + public String getEquipmentTypeName() { + return equipmentTypeName; + } + + public void setEquipmentTypeName(String equipmentTypeName) { + this.equipmentTypeName = equipmentTypeName; + } + + public String getFileList() { + return fileList; + } + + public void setFileList(String fileList) { + this.fileList = fileList; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInstallIncidentalExpenses() { + return installIncidentalExpenses; + } + + public void setInstallIncidentalExpenses(String installIncidentalExpenses) { + this.installIncidentalExpenses = installIncidentalExpenses; + } + + public String getInstallPlace() { + return installPlace; + } + + public void setInstallPlace(String installPlace) { + this.installPlace = installPlace; + } + + public String getIntactState() { + return intactState; + } + + public void setIntactState(String intactState) { + this.intactState = intactState; + } + + public String getIsCalibrationTestEquipment() { + return isCalibrationTestEquipment; + } + + public void setIsCalibrationTestEquipment(String isCalibrationTestEquipment) { + this.isCalibrationTestEquipment = isCalibrationTestEquipment; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getIsFixedAssets() { + return isFixedAssets; + } + + public void setIsFixedAssets(String isFixedAssets) { + this.isFixedAssets = isFixedAssets; + } + + public String getIsMeasureAccount() { + return isMeasureAccount; + } + + public void setIsMeasureAccount(String isMeasureAccount) { + this.isMeasureAccount = isMeasureAccount; + } + + public String getIsStandardSupportEquipment() { + return isStandardSupportEquipment; + } + + public void setIsStandardSupportEquipment(String isStandardSupportEquipment) { + this.isStandardSupportEquipment = isStandardSupportEquipment; + } + + public String getLabelBind() { + return labelBind; + } + + public void setLabelBind(String labelBind) { + this.labelBind = labelBind; + } + + public String getMajorCategory() { + return majorCategory; + } + + public void setMajorCategory(String majorCategory) { + this.majorCategory = majorCategory; + } + + public String getMajorCategoryName() { + return majorCategoryName; + } + + public void setMajorCategoryName(String majorCategoryName) { + this.majorCategoryName = majorCategoryName; + } + + public String getManagerLevel() { + return managerLevel; + } + + public void setManagerLevel(String managerLevel) { + this.managerLevel = managerLevel; + } + + public String getManagerLevelName() { + return managerLevelName; + } + + public void setManagerLevelName(String managerLevelName) { + this.managerLevelName = managerLevelName; + } + + public String getManagerState() { + return managerState; + } + + public void setManagerState(String managerState) { + this.managerState = managerState; + } + + public String getManagerStateName() { + return managerStateName; + } + + public void setManagerStateName(String managerStateName) { + this.managerStateName = managerStateName; + } + + public String getManufacturer() { + return manufacturer; + } + + public void setManufacturer(String manufacturer) { + this.manufacturer = manufacturer; + } + + public String getManufacturerCountry() { + return manufacturerCountry; + } + + public void setManufacturerCountry(String manufacturerCountry) { + this.manufacturerCountry = manufacturerCountry; + } + + public String getManufacturingDate() { + return manufacturingDate; + } + + public void setManufacturingDate(String manufacturingDate) { + this.manufacturingDate = manufacturingDate; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getMesureCycle() { + return mesureCycle; + } + + public void setMesureCycle(String mesureCycle) { + this.mesureCycle = mesureCycle; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureDept() { + return mesureDept; + } + + public void setMesureDept(String mesureDept) { + this.mesureDept = mesureDept; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getMesureType() { + return mesureType; + } + + public void setMesureType(String mesureType) { + this.mesureType = mesureType; + } + + public String getMesureTypeName() { + return mesureTypeName; + } + + public void setMesureTypeName(String mesureTypeName) { + this.mesureTypeName = mesureTypeName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getOriginValue() { + return originValue; + } + + public void setOriginValue(String originValue) { + this.originValue = originValue; + } + + public String getOverallDimension() { + return overallDimension; + } + + public void setOverallDimension(String overallDimension) { + this.overallDimension = overallDimension; + } + + public String getPresentOriginValue() { + return presentOriginValue; + } + + public void setPresentOriginValue(String presentOriginValue) { + this.presentOriginValue = presentOriginValue; + } + + public String getPurpose() { + return purpose; + } + + public void setPurpose(String purpose) { + this.purpose = purpose; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSinglePrice() { + return singlePrice; + } + + public void setSinglePrice(String singlePrice) { + this.singlePrice = singlePrice; + } + + public String getSupportStandardEquipmentName() { + return supportStandardEquipmentName; + } + + public void setSupportStandardEquipmentName(String supportStandardEquipmentName) { + this.supportStandardEquipmentName = supportStandardEquipmentName; + } + + public String getSupportStandardEquipmentNo() { + return supportStandardEquipmentNo; + } + + public void setSupportStandardEquipmentNo(String supportStandardEquipmentNo) { + this.supportStandardEquipmentNo = supportStandardEquipmentNo; + } + + public String getTechnicalLevel() { + return technicalLevel; + } + + public void setTechnicalLevel(String technicalLevel) { + this.technicalLevel = technicalLevel; + } + + public String getUncertainty() { + return uncertainty; + } + + public void setUncertainty(String uncertainty) { + this.uncertainty = uncertainty; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDept() { + return useDept; + } + + public void setUseDept(String useDept) { + this.useDept = useDept; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getUsePerson() { + return usePerson; + } + + public void setUsePerson(String usePerson) { + this.usePerson = usePerson; + } + + public String getUsePersonName() { + return usePersonName; + } + + public void setUsePersonName(String usePersonName) { + this.usePersonName = usePersonName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + + public String getVersion() { + return version; + } + + public void setVersion(String version) { + this.version = version; + } + + public String getWeight() { + return weight; + } + + public void setWeight(String weight) { + this.weight = weight; + } + } + + public static class FileModel { + private String approvalStatus; + private String approvalStatusName; + private String createTime; + private String createUser; + private String createUserId; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String fileType; + private String fileTypeName; + private String id; + private String isDel; + private String minioFileName; + private String processId; + private String publishTime; + private String publisher; + private String remark; + private String updateTime; + + public String getApprovalStatus() { + return approvalStatus; + } + + public void setApprovalStatus(String approvalStatus) { + this.approvalStatus = approvalStatus; + } + + public String getApprovalStatusName() { + return approvalStatusName; + } + + public void setApprovalStatusName(String approvalStatusName) { + this.approvalStatusName = approvalStatusName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCreateUserId() { + return createUserId; + } + + public void setCreateUserId(String createUserId) { + this.createUserId = createUserId; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getFileType() { + return fileType; + } + + public void setFileType(String fileType) { + this.fileType = fileType; + } + + public String getFileTypeName() { + return fileTypeName; + } + + public void setFileTypeName(String fileTypeName) { + this.fileTypeName = fileTypeName; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getPublishTime() { + return publishTime; + } + + public void setPublishTime(String publishTime) { + this.publishTime = publishTime; + } + + public String getPublisher() { + return publisher; + } + + public void setPublisher(String publisher) { + this.publisher = publisher; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/CertificateListModel.java b/app/src/main/java/com/casic/xz/meterage/model/CertificateListModel.java new file mode 100644 index 0000000..0eed915 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/CertificateListModel.java @@ -0,0 +1,229 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class CertificateListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String approvalStatus; + private String approvalStatusName; + private String calibrationMajor; + private String certificateReportCode; + private String certificateReportName; + private String createTime; + private String decisionItem; + private String id; + private String manufacturingNo; + private String measureCategory; + private String measureCategoryName; + private String measurePersonId; + private String measurePersonName; + private String orderCode; + private String processId; + private String sampleModel; + private String sampleName; + private String sampleNo; + private String taskId; + + public String getApprovalStatus() { + return approvalStatus; + } + + public void setApprovalStatus(String approvalStatus) { + this.approvalStatus = approvalStatus; + } + + public String getApprovalStatusName() { + return approvalStatusName; + } + + public void setApprovalStatusName(String approvalStatusName) { + this.approvalStatusName = approvalStatusName; + } + + public String getCalibrationMajor() { + return calibrationMajor; + } + + public void setCalibrationMajor(String calibrationMajor) { + this.calibrationMajor = calibrationMajor; + } + + public String getCertificateReportCode() { + return certificateReportCode; + } + + public void setCertificateReportCode(String certificateReportCode) { + this.certificateReportCode = certificateReportCode; + } + + public String getCertificateReportName() { + return certificateReportName; + } + + public void setCertificateReportName(String certificateReportName) { + this.certificateReportName = certificateReportName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getDecisionItem() { + return decisionItem; + } + + public void setDecisionItem(String decisionItem) { + this.decisionItem = decisionItem; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getMeasureCategory() { + return measureCategory; + } + + public void setMeasureCategory(String measureCategory) { + this.measureCategory = measureCategory; + } + + public String getMeasureCategoryName() { + return measureCategoryName; + } + + public void setMeasureCategoryName(String measureCategoryName) { + this.measureCategoryName = measureCategoryName; + } + + public String getMeasurePersonId() { + return measurePersonId; + } + + public void setMeasurePersonId(String measurePersonId) { + this.measurePersonId = measurePersonId; + } + + public String getMeasurePersonName() { + return measurePersonName; + } + + public void setMeasurePersonName(String measurePersonName) { + this.measurePersonName = measurePersonName; + } + + public String getOrderCode() { + return orderCode; + } + + public void setOrderCode(String orderCode) { + this.orderCode = orderCode; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public String getSampleModel() { + return sampleModel; + } + + public void setSampleModel(String sampleModel) { + this.sampleModel = sampleModel; + } + + public String getSampleName() { + return sampleName; + } + + public void setSampleName(String sampleName) { + this.sampleName = sampleName; + } + + public String getSampleNo() { + return sampleNo; + } + + public void setSampleNo(String sampleNo) { + this.sampleNo = sampleNo; + } + + public String getTaskId() { + return taskId; + } + + public void setTaskId(String taskId) { + this.taskId = taskId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/CertificateModel.java b/app/src/main/java/com/casic/xz/meterage/model/CertificateModel.java deleted file mode 100644 index ec0d25b..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/CertificateModel.java +++ /dev/null @@ -1,202 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class CertificateModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String approvalStatus; - private String approvalStatusName; - private String calibrationMajor; - private String certificateReportCode; - private String certificateReportName; - private String createTime; - private String decisionItem; - private String id; - private String manufacturingNo; - private String measurePersonId; - private String orderCode; - private String processId; - private String sampleModel; - private String sampleName; - private String sampleNo; - private String taskId; - - public String getApprovalStatus() { - return approvalStatus; - } - - public void setApprovalStatus(String approvalStatus) { - this.approvalStatus = approvalStatus; - } - - public String getApprovalStatusName() { - return approvalStatusName; - } - - public void setApprovalStatusName(String approvalStatusName) { - this.approvalStatusName = approvalStatusName; - } - - public String getCalibrationMajor() { - return calibrationMajor; - } - - public void setCalibrationMajor(String calibrationMajor) { - this.calibrationMajor = calibrationMajor; - } - - public String getCertificateReportCode() { - return certificateReportCode; - } - - public void setCertificateReportCode(String certificateReportCode) { - this.certificateReportCode = certificateReportCode; - } - - public String getCertificateReportName() { - return certificateReportName; - } - - public void setCertificateReportName(String certificateReportName) { - this.certificateReportName = certificateReportName; - } - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getDecisionItem() { - return decisionItem; - } - - public void setDecisionItem(String decisionItem) { - this.decisionItem = decisionItem; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getManufacturingNo() { - return manufacturingNo; - } - - public void setManufacturingNo(String manufacturingNo) { - this.manufacturingNo = manufacturingNo; - } - - public String getMeasurePersonId() { - return measurePersonId; - } - - public void setMeasurePersonId(String measurePersonId) { - this.measurePersonId = measurePersonId; - } - - public String getOrderCode() { - return orderCode; - } - - public void setOrderCode(String orderCode) { - this.orderCode = orderCode; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public String getSampleModel() { - return sampleModel; - } - - public void setSampleModel(String sampleModel) { - this.sampleModel = sampleModel; - } - - public String getSampleName() { - return sampleName; - } - - public void setSampleName(String sampleName) { - this.sampleName = sampleName; - } - - public String getSampleNo() { - return sampleNo; - } - - public void setSampleNo(String sampleNo) { - this.sampleNo = sampleNo; - } - - public String getTaskId() { - return taskId; - } - - public void setTaskId(String taskId) { - this.taskId = taskId; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index b0dec00..a4f3c46 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -345,4 +345,22 @@ @QueryMap limit: Map, @QueryMap offset: Map ): String + + /** + * 获取委托书详情 + */ + @POST("/business/certificateReport/detail") + suspend fun getCertificateReportDetail( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 提交证书 + */ + @POST("/business/certificateReport/submit") + suspend fun submit( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String } \ 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 cef55ec..8bf4070 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 @@ -800,4 +800,29 @@ AuthenticationHelper.token!!, requestBody, limitMap, offsetMap ) } + + /** + * 获取证书报告详情 + */ + suspend fun getCertificateReportDetail(id: String): String { + val param = JsonObject() + param.addProperty("id", id) + val requestBody = param.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getCertificateReportDetail(AuthenticationHelper.token!!, requestBody) + } + + /** + * 提交证书报告 + */ + suspend fun submit(id: String): String { + val param = JsonObject() + param.addProperty("formId", "ywglzsbg") + param.addProperty("id", id) + val requestBody = param.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.submit(AuthenticationHelper.token!!, requestBody) + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportActivity.kt index 2baefd2..fa4e129 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportActivity.kt @@ -19,15 +19,21 @@ "已通过", "未通过", "已取消", - "非草稿", - "未通过", "可打印" ) private var fragmentPages: ArrayList = ArrayList() init { - pageTitles.indices.forEach { - fragmentPages.add(CertificateReportFragment((it + 1).toString())) + pageTitles.forEach { + when (it) { + "草稿箱" -> fragmentPages.add(CertificateReportFragment("1")) + "待审批" -> fragmentPages.add(CertificateReportFragment("2")) + "审批中" -> fragmentPages.add(CertificateReportFragment("3")) + "已通过" -> fragmentPages.add(CertificateReportFragment("4")) + "未通过" -> fragmentPages.add(CertificateReportFragment("5")) + "已取消" -> fragmentPages.add(CertificateReportFragment("6")) + "可打印" -> fragmentPages.add(CertificateReportFragment("9")) + } } } diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt new file mode 100644 index 0000000..e30c7c3 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt @@ -0,0 +1,106 @@ +package com.casic.xz.meterage.view.home + +import android.view.View +import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.SubViewPagerAdapter +import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.casic.xz.meterage.fragment.certificate.ApprovalProcessFragment +import com.casic.xz.meterage.fragment.certificate.BasicInformationFragment +import com.casic.xz.meterage.fragment.certificate.ExceptionReportFragment +import com.casic.xz.meterage.model.CertificateDetailModel +import com.casic.xz.meterage.utils.LoadingDialogHub +import com.casic.xz.meterage.vm.CertificateViewModel +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.vm.LoadState +import kotlinx.android.synthetic.main.activity_certificate_detail.* + +//"草稿箱" -> "1" +//"待审批" -> "2" +//"审批中" -> "3" +//"已通过" -> "4" +//"未通过" -> "5" +//"已取消" -> "6" +//"可打印" -> "9" + +class CertificateReportDetailActivity : KotlinBaseActivity() { + + private var fragmentPages: ArrayList = ArrayList() + private lateinit var certificateViewModel: CertificateViewModel + private lateinit var detailModel: CertificateDetailModel.DataModel + + override fun initData() { + val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! + + when (args[0]) { + "1" -> { + approvalView.text = "提交" + } + "2" -> { + approvalView.text = "审批" + } + "9" -> { + approvalView.text = "打印" + } + else -> { + approvalView.visibility = View.GONE + } + } + + certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] + certificateViewModel.getCertificateReportDetail(args[1]) + certificateViewModel.certificateDetail.observe(this) { + if (it.code == 200) { + + detailModel = it.data + + fragmentPages.add(BasicInformationFragment(detailModel)) + fragmentPages.add(ApprovalProcessFragment()) + fragmentPages.add(ExceptionReportFragment()) + + val pageTitles = arrayOf("基础信息", "审批流程", "异常报告") + + approvalViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, pageTitles + ) + //绑定 + topTabLayout.setupWithViewPager(approvalViewPager) + } + } + + certificateViewModel.submitResult.observe(this) { + if (it.code == 200) { + "提交成功".show(this) + finish() + } + } + } + + override fun initEvent() { + leftBackView.setOnClickListener { finish() } + + approvalView.setOnClickListener { + certificateViewModel.submit(detailModel.id) + } + } + + override fun initLayoutView(): Int = R.layout.activity_certificate_detail + + override fun observeRequestState() { + certificateViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt index 080c380..77fe8a5 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt @@ -129,6 +129,5 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() initLayoutImmersionBar(rootView) - titleView.text = "委托需求" } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt index 735e530..e088887 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt @@ -4,7 +4,9 @@ import com.casic.xz.meterage.base.BaseApplication import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage -import com.casic.xz.meterage.model.CertificateModel +import com.casic.xz.meterage.model.ActionResultModel +import com.casic.xz.meterage.model.CertificateDetailModel +import com.casic.xz.meterage.model.CertificateListModel import com.casic.xz.meterage.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -19,7 +21,9 @@ class CertificateViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val certificateList = MutableLiveData() + val certificateList = MutableLiveData() + val certificateDetail = MutableLiveData() + val submitResult = MutableLiveData() fun getCertificateReportList( approvalStatus: String, @@ -47,8 +51,46 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - certificateList.value = gson.fromJson( - response, object : TypeToken() {}.type + certificateList.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + + fun getCertificateReportDetail(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.getCertificateReportDetail(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + certificateDetail.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + + fun submit(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.submit(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + submitResult.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { loadState.value = LoadState.Fail diff --git a/app/src/main/res/layout/activity_capability_detail.xml b/app/src/main/res/layout/activity_capability_detail.xml index 585960a..375d861 100644 --- a/app/src/main/res/layout/activity_capability_detail.xml +++ b/app/src/main/res/layout/activity_capability_detail.xml @@ -21,7 +21,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:padding="@dimen/dp_10"> + android:paddingHorizontal="@dimen/dp_10"> diff --git a/app/src/main/res/layout/activity_certificate_detail.xml b/app/src/main/res/layout/activity_certificate_detail.xml new file mode 100644 index 0000000..5bb3649 --- /dev/null +++ b/app/src/main/res/layout/activity_certificate_detail.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_standard_file_detail.xml b/app/src/main/res/layout/activity_standard_file_detail.xml index 7776230..02efb08 100644 --- a/app/src/main/res/layout/activity_standard_file_detail.xml +++ b/app/src/main/res/layout/activity_standard_file_detail.xml @@ -21,7 +21,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:padding="@dimen/dp_10"> + android:paddingHorizontal="@dimen/dp_10"> diff --git a/app/src/main/res/layout/fragment_certificate_approval_process.xml b/app/src/main/res/layout/fragment_certificate_approval_process.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/fragment_certificate_approval_process.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_certificate_basic_information.xml b/app/src/main/res/layout/fragment_certificate_basic_information.xml new file mode 100644 index 0000000..91882c7 --- /dev/null +++ b/app/src/main/res/layout/fragment_certificate_basic_information.xml @@ -0,0 +1,296 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_certificate_exception_report.xml b/app/src/main/res/layout/fragment_certificate_exception_report.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/fragment_certificate_exception_report.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_basic_information.xml b/app/src/main/res/layout/fragment_customer_basic_information.xml index e0debd1..dec78c7 100644 --- a/app/src/main/res/layout/fragment_customer_basic_information.xml +++ b/app/src/main/res/layout/fragment_customer_basic_information.xml @@ -12,7 +12,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:padding="@dimen/dp_10"> + android:paddingHorizontal="@dimen/dp_10"> diff --git a/app/src/main/res/layout/fragment_device_basic_information.xml b/app/src/main/res/layout/fragment_device_basic_information.xml index 0a7efc6..9d9cfac 100644 --- a/app/src/main/res/layout/fragment_device_basic_information.xml +++ b/app/src/main/res/layout/fragment_device_basic_information.xml @@ -12,7 +12,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:padding="@dimen/dp_10"> + android:paddingHorizontal="@dimen/dp_10"> diff --git a/app/src/main/res/layout/fragment_entrust_basic_information.xml b/app/src/main/res/layout/fragment_entrust_basic_information.xml index 07fbc24..3c23f9a 100644 --- a/app/src/main/res/layout/fragment_entrust_basic_information.xml +++ b/app/src/main/res/layout/fragment_entrust_basic_information.xml @@ -13,7 +13,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:padding="@dimen/dp_10"> + android:paddingHorizontal="@dimen/dp_10"> diff --git a/app/src/main/res/layout/fragment_equipment_basic_information.xml b/app/src/main/res/layout/fragment_equipment_basic_information.xml index fd99df2..42e9748 100644 --- a/app/src/main/res/layout/fragment_equipment_basic_information.xml +++ b/app/src/main/res/layout/fragment_equipment_basic_information.xml @@ -12,7 +12,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:padding="@dimen/dp_10"> + android:paddingHorizontal="@dimen/dp_10"> diff --git a/app/src/main/res/layout/fragment_train_basic_information.xml b/app/src/main/res/layout/fragment_train_basic_information.xml index 8ed8b7f..2fb3e73 100644 --- a/app/src/main/res/layout/fragment_train_basic_information.xml +++ b/app/src/main/res/layout/fragment_train_basic_information.xml @@ -12,7 +12,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:padding="@dimen/dp_10"> + android:paddingHorizontal="@dimen/dp_10"> diff --git a/app/src/main/res/layout/item_certificate_rv_l.xml b/app/src/main/res/layout/item_certificate_rv_l.xml index 2e39f0c..5476e2c 100644 --- a/app/src/main/res/layout/item_certificate_rv_l.xml +++ b/app/src/main/res/layout/item_certificate_rv_l.xml @@ -1,68 +1,64 @@ - + android:padding="@dimen/dp_7"> - + android:layout_height="wrap_content" + android:text="23小时前" + android:textColor="@color/gray" + android:textSize="@dimen/sp_12" /> - + - - - - - \ No newline at end of file + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_entrust_log_rv_l.xml b/app/src/main/res/layout/item_entrust_log_rv_l.xml index c995428..87b4bb7 100644 --- a/app/src/main/res/layout/item_entrust_log_rv_l.xml +++ b/app/src/main/res/layout/item_entrust_log_rv_l.xml @@ -30,7 +30,7 @@ android:layout_width="@dimen/dividerLine" android:layout_height="0dp" android:layout_marginTop="@dimen/dp_3" - android:layout_weight="6" + android:layout_weight="9" android:background="@color/hintColor" />