diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/ApprovalProcessAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/ApprovalProcessAdapter.kt new file mode 100644 index 0000000..5b851d0 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/ApprovalProcessAdapter.kt @@ -0,0 +1,106 @@ +package com.casic.xz.meterage.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.ImageView +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.casic.xz.meterage.R +import com.casic.xz.meterage.model.ApprovalProcessModel +import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter +import com.pengxh.kt.lite.adapter.ViewHolder +import com.pengxh.kt.lite.extensions.toJson +import org.json.JSONObject + +class ApprovalProcessAdapter( + context: Context, + private val dataRows: List>, + private val lastRow: ApprovalProcessModel.DataModel +) : RecyclerView.Adapter() { + + private val kTag = "ApprovalProcessAdapter" + private var layoutInflater: LayoutInflater = LayoutInflater.from(context) + + override fun getItemCount(): Int = dataRows.size + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + layoutInflater.inflate(R.layout.item_approval_log_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val childRows = dataRows[position] + when (position) { + 0 -> { + holder.childRecyclerView.visibility = View.VISIBLE + + //最后一项 + holder.topLineView.visibility = View.INVISIBLE + holder.tagImageView.setImageResource(R.drawable.ic_dot_red) + + holder.childRecyclerView.adapter = object : + NormalRecyclerAdapter( + R.layout.item_approval_log_child_rv_l, childRows + ) { + override fun convertView( + viewHolder: ViewHolder, position: Int, item: ApprovalProcessModel.DataModel + ) { + val json = item.comment.toJson() + //{"comment":"同意","type":"1"} + val jsonObject = JSONObject(json) + viewHolder.setText(R.id.statusView, jsonObject.getString("comment")) + .setText(R.id.operatorNameView, item.assigneeName) + .setText(R.id.deptNameView, item.deptName) + .setText(R.id.operateTimeView, item.finishTime) + } + } + } + dataRows.size - 1 -> { + holder.childRecyclerView.visibility = View.GONE + holder.bottomLineView.visibility = View.INVISIBLE + holder.tagImageView.setImageResource(R.drawable.ic_dot_gray) + + holder.statusView.text = "新建" + holder.operatorNameView.text = lastRow.assigneeName + holder.deptNameView.text = lastRow.deptName + holder.operateTimeView.text = lastRow.finishTime + } + else -> { + holder.childRecyclerView.visibility = View.VISIBLE + + holder.tagImageView.setImageResource(R.drawable.ic_dot) + + holder.childRecyclerView.adapter = object : + NormalRecyclerAdapter( + R.layout.item_approval_log_child_rv_l, childRows + ) { + override fun convertView( + viewHolder: ViewHolder, position: Int, item: ApprovalProcessModel.DataModel + ) { + val json = item.comment.toJson() + //{"comment":"同意","type":"1"} + val jsonObject = JSONObject(json) + viewHolder.setText(R.id.statusView, jsonObject.getString("comment")) + .setText(R.id.operatorNameView, item.assigneeName) + .setText(R.id.deptNameView, item.deptName) + .setText(R.id.operateTimeView, item.finishTime) + } + } + } + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var childRecyclerView: RecyclerView = view.findViewById(R.id.childRecyclerView) + + var topLineView: View = view.findViewById(R.id.topLineView) + var tagImageView: ImageView = view.findViewById(R.id.tagImageView) + var bottomLineView: View = view.findViewById(R.id.bottomLineView) + var statusView: TextView = view.findViewById(R.id.statusView) + var operatorNameView: TextView = view.findViewById(R.id.operatorNameView) + var deptNameView: TextView = view.findViewById(R.id.deptNameView) + var operateTimeView: TextView = view.findViewById(R.id.operateTimeView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/ApprovalProcessAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/ApprovalProcessAdapter.kt new file mode 100644 index 0000000..5b851d0 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/ApprovalProcessAdapter.kt @@ -0,0 +1,106 @@ +package com.casic.xz.meterage.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.ImageView +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.casic.xz.meterage.R +import com.casic.xz.meterage.model.ApprovalProcessModel +import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter +import com.pengxh.kt.lite.adapter.ViewHolder +import com.pengxh.kt.lite.extensions.toJson +import org.json.JSONObject + +class ApprovalProcessAdapter( + context: Context, + private val dataRows: List>, + private val lastRow: ApprovalProcessModel.DataModel +) : RecyclerView.Adapter() { + + private val kTag = "ApprovalProcessAdapter" + private var layoutInflater: LayoutInflater = LayoutInflater.from(context) + + override fun getItemCount(): Int = dataRows.size + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + layoutInflater.inflate(R.layout.item_approval_log_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val childRows = dataRows[position] + when (position) { + 0 -> { + holder.childRecyclerView.visibility = View.VISIBLE + + //最后一项 + holder.topLineView.visibility = View.INVISIBLE + holder.tagImageView.setImageResource(R.drawable.ic_dot_red) + + holder.childRecyclerView.adapter = object : + NormalRecyclerAdapter( + R.layout.item_approval_log_child_rv_l, childRows + ) { + override fun convertView( + viewHolder: ViewHolder, position: Int, item: ApprovalProcessModel.DataModel + ) { + val json = item.comment.toJson() + //{"comment":"同意","type":"1"} + val jsonObject = JSONObject(json) + viewHolder.setText(R.id.statusView, jsonObject.getString("comment")) + .setText(R.id.operatorNameView, item.assigneeName) + .setText(R.id.deptNameView, item.deptName) + .setText(R.id.operateTimeView, item.finishTime) + } + } + } + dataRows.size - 1 -> { + holder.childRecyclerView.visibility = View.GONE + holder.bottomLineView.visibility = View.INVISIBLE + holder.tagImageView.setImageResource(R.drawable.ic_dot_gray) + + holder.statusView.text = "新建" + holder.operatorNameView.text = lastRow.assigneeName + holder.deptNameView.text = lastRow.deptName + holder.operateTimeView.text = lastRow.finishTime + } + else -> { + holder.childRecyclerView.visibility = View.VISIBLE + + holder.tagImageView.setImageResource(R.drawable.ic_dot) + + holder.childRecyclerView.adapter = object : + NormalRecyclerAdapter( + R.layout.item_approval_log_child_rv_l, childRows + ) { + override fun convertView( + viewHolder: ViewHolder, position: Int, item: ApprovalProcessModel.DataModel + ) { + val json = item.comment.toJson() + //{"comment":"同意","type":"1"} + val jsonObject = JSONObject(json) + viewHolder.setText(R.id.statusView, jsonObject.getString("comment")) + .setText(R.id.operatorNameView, item.assigneeName) + .setText(R.id.deptNameView, item.deptName) + .setText(R.id.operateTimeView, item.finishTime) + } + } + } + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var childRecyclerView: RecyclerView = view.findViewById(R.id.childRecyclerView) + + var topLineView: View = view.findViewById(R.id.topLineView) + var tagImageView: ImageView = view.findViewById(R.id.tagImageView) + var bottomLineView: View = view.findViewById(R.id.bottomLineView) + var statusView: TextView = view.findViewById(R.id.statusView) + var operatorNameView: TextView = view.findViewById(R.id.operatorNameView) + var deptNameView: TextView = view.findViewById(R.id.deptNameView) + var operateTimeView: TextView = view.findViewById(R.id.operateTimeView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt index a75e566..45e3780 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -1,25 +1,39 @@ package com.casic.xz.meterage.fragment.certificate +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.ApprovalProcessAdapter +import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_certificate_approval_process.* -class ApprovalProcessFragment :KotlinBaseFragment(){ +class ApprovalProcessFragment(private val processId: String) : KotlinBaseFragment() { + + private lateinit var certificateViewModel: CertificateViewModel override fun initData() { - + certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] + certificateViewModel.getApprovalProcess(processId) + certificateViewModel.processResult.observe(this) { + if (it.code == 200) { + logRecyclerView.adapter = ApprovalProcessAdapter( + requireContext(), it.data, it.data.last().first() + ) + } + } } 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/adapter/ApprovalProcessAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/ApprovalProcessAdapter.kt new file mode 100644 index 0000000..5b851d0 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/ApprovalProcessAdapter.kt @@ -0,0 +1,106 @@ +package com.casic.xz.meterage.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.ImageView +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.casic.xz.meterage.R +import com.casic.xz.meterage.model.ApprovalProcessModel +import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter +import com.pengxh.kt.lite.adapter.ViewHolder +import com.pengxh.kt.lite.extensions.toJson +import org.json.JSONObject + +class ApprovalProcessAdapter( + context: Context, + private val dataRows: List>, + private val lastRow: ApprovalProcessModel.DataModel +) : RecyclerView.Adapter() { + + private val kTag = "ApprovalProcessAdapter" + private var layoutInflater: LayoutInflater = LayoutInflater.from(context) + + override fun getItemCount(): Int = dataRows.size + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + layoutInflater.inflate(R.layout.item_approval_log_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val childRows = dataRows[position] + when (position) { + 0 -> { + holder.childRecyclerView.visibility = View.VISIBLE + + //最后一项 + holder.topLineView.visibility = View.INVISIBLE + holder.tagImageView.setImageResource(R.drawable.ic_dot_red) + + holder.childRecyclerView.adapter = object : + NormalRecyclerAdapter( + R.layout.item_approval_log_child_rv_l, childRows + ) { + override fun convertView( + viewHolder: ViewHolder, position: Int, item: ApprovalProcessModel.DataModel + ) { + val json = item.comment.toJson() + //{"comment":"同意","type":"1"} + val jsonObject = JSONObject(json) + viewHolder.setText(R.id.statusView, jsonObject.getString("comment")) + .setText(R.id.operatorNameView, item.assigneeName) + .setText(R.id.deptNameView, item.deptName) + .setText(R.id.operateTimeView, item.finishTime) + } + } + } + dataRows.size - 1 -> { + holder.childRecyclerView.visibility = View.GONE + holder.bottomLineView.visibility = View.INVISIBLE + holder.tagImageView.setImageResource(R.drawable.ic_dot_gray) + + holder.statusView.text = "新建" + holder.operatorNameView.text = lastRow.assigneeName + holder.deptNameView.text = lastRow.deptName + holder.operateTimeView.text = lastRow.finishTime + } + else -> { + holder.childRecyclerView.visibility = View.VISIBLE + + holder.tagImageView.setImageResource(R.drawable.ic_dot) + + holder.childRecyclerView.adapter = object : + NormalRecyclerAdapter( + R.layout.item_approval_log_child_rv_l, childRows + ) { + override fun convertView( + viewHolder: ViewHolder, position: Int, item: ApprovalProcessModel.DataModel + ) { + val json = item.comment.toJson() + //{"comment":"同意","type":"1"} + val jsonObject = JSONObject(json) + viewHolder.setText(R.id.statusView, jsonObject.getString("comment")) + .setText(R.id.operatorNameView, item.assigneeName) + .setText(R.id.deptNameView, item.deptName) + .setText(R.id.operateTimeView, item.finishTime) + } + } + } + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var childRecyclerView: RecyclerView = view.findViewById(R.id.childRecyclerView) + + var topLineView: View = view.findViewById(R.id.topLineView) + var tagImageView: ImageView = view.findViewById(R.id.tagImageView) + var bottomLineView: View = view.findViewById(R.id.bottomLineView) + var statusView: TextView = view.findViewById(R.id.statusView) + var operatorNameView: TextView = view.findViewById(R.id.operatorNameView) + var deptNameView: TextView = view.findViewById(R.id.deptNameView) + var operateTimeView: TextView = view.findViewById(R.id.operateTimeView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt index a75e566..45e3780 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -1,25 +1,39 @@ package com.casic.xz.meterage.fragment.certificate +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.ApprovalProcessAdapter +import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_certificate_approval_process.* -class ApprovalProcessFragment :KotlinBaseFragment(){ +class ApprovalProcessFragment(private val processId: String) : KotlinBaseFragment() { + + private lateinit var certificateViewModel: CertificateViewModel override fun initData() { - + certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] + certificateViewModel.getApprovalProcess(processId) + certificateViewModel.processResult.observe(this) { + if (it.code == 200) { + logRecyclerView.adapter = ApprovalProcessAdapter( + requireContext(), it.data, it.data.last().first() + ) + } + } } 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 index 5882c3d..bf851c0 100644 --- 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 @@ -2,47 +2,41 @@ 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.casic.xz.meterage.model.kt.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 + 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 + 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 + estimateServedTimeView.text = businessOriginal.businessOrder?.planDeliverTime + estimateCompleteTimeView.text = businessOriginal.businessOrder?.requireOverTime if (data.certificateReportFile.isNullOrBlank()) { reportFileView.text = "暂无附件" diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/ApprovalProcessAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/ApprovalProcessAdapter.kt new file mode 100644 index 0000000..5b851d0 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/ApprovalProcessAdapter.kt @@ -0,0 +1,106 @@ +package com.casic.xz.meterage.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.ImageView +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.casic.xz.meterage.R +import com.casic.xz.meterage.model.ApprovalProcessModel +import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter +import com.pengxh.kt.lite.adapter.ViewHolder +import com.pengxh.kt.lite.extensions.toJson +import org.json.JSONObject + +class ApprovalProcessAdapter( + context: Context, + private val dataRows: List>, + private val lastRow: ApprovalProcessModel.DataModel +) : RecyclerView.Adapter() { + + private val kTag = "ApprovalProcessAdapter" + private var layoutInflater: LayoutInflater = LayoutInflater.from(context) + + override fun getItemCount(): Int = dataRows.size + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + layoutInflater.inflate(R.layout.item_approval_log_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val childRows = dataRows[position] + when (position) { + 0 -> { + holder.childRecyclerView.visibility = View.VISIBLE + + //最后一项 + holder.topLineView.visibility = View.INVISIBLE + holder.tagImageView.setImageResource(R.drawable.ic_dot_red) + + holder.childRecyclerView.adapter = object : + NormalRecyclerAdapter( + R.layout.item_approval_log_child_rv_l, childRows + ) { + override fun convertView( + viewHolder: ViewHolder, position: Int, item: ApprovalProcessModel.DataModel + ) { + val json = item.comment.toJson() + //{"comment":"同意","type":"1"} + val jsonObject = JSONObject(json) + viewHolder.setText(R.id.statusView, jsonObject.getString("comment")) + .setText(R.id.operatorNameView, item.assigneeName) + .setText(R.id.deptNameView, item.deptName) + .setText(R.id.operateTimeView, item.finishTime) + } + } + } + dataRows.size - 1 -> { + holder.childRecyclerView.visibility = View.GONE + holder.bottomLineView.visibility = View.INVISIBLE + holder.tagImageView.setImageResource(R.drawable.ic_dot_gray) + + holder.statusView.text = "新建" + holder.operatorNameView.text = lastRow.assigneeName + holder.deptNameView.text = lastRow.deptName + holder.operateTimeView.text = lastRow.finishTime + } + else -> { + holder.childRecyclerView.visibility = View.VISIBLE + + holder.tagImageView.setImageResource(R.drawable.ic_dot) + + holder.childRecyclerView.adapter = object : + NormalRecyclerAdapter( + R.layout.item_approval_log_child_rv_l, childRows + ) { + override fun convertView( + viewHolder: ViewHolder, position: Int, item: ApprovalProcessModel.DataModel + ) { + val json = item.comment.toJson() + //{"comment":"同意","type":"1"} + val jsonObject = JSONObject(json) + viewHolder.setText(R.id.statusView, jsonObject.getString("comment")) + .setText(R.id.operatorNameView, item.assigneeName) + .setText(R.id.deptNameView, item.deptName) + .setText(R.id.operateTimeView, item.finishTime) + } + } + } + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var childRecyclerView: RecyclerView = view.findViewById(R.id.childRecyclerView) + + var topLineView: View = view.findViewById(R.id.topLineView) + var tagImageView: ImageView = view.findViewById(R.id.tagImageView) + var bottomLineView: View = view.findViewById(R.id.bottomLineView) + var statusView: TextView = view.findViewById(R.id.statusView) + var operatorNameView: TextView = view.findViewById(R.id.operatorNameView) + var deptNameView: TextView = view.findViewById(R.id.deptNameView) + var operateTimeView: TextView = view.findViewById(R.id.operateTimeView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt index a75e566..45e3780 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -1,25 +1,39 @@ package com.casic.xz.meterage.fragment.certificate +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.ApprovalProcessAdapter +import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_certificate_approval_process.* -class ApprovalProcessFragment :KotlinBaseFragment(){ +class ApprovalProcessFragment(private val processId: String) : KotlinBaseFragment() { + + private lateinit var certificateViewModel: CertificateViewModel override fun initData() { - + certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] + certificateViewModel.getApprovalProcess(processId) + certificateViewModel.processResult.observe(this) { + if (it.code == 200) { + logRecyclerView.adapter = ApprovalProcessAdapter( + requireContext(), it.data, it.data.last().first() + ) + } + } } 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 index 5882c3d..bf851c0 100644 --- 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 @@ -2,47 +2,41 @@ 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.casic.xz.meterage.model.kt.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 + 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 + 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 + estimateServedTimeView.text = businessOriginal.businessOrder?.planDeliverTime + estimateCompleteTimeView.text = businessOriginal.businessOrder?.requireOverTime if (data.certificateReportFile.isNullOrBlank()) { reportFileView.text = "暂无附件" diff --git a/app/src/main/java/com/casic/xz/meterage/model/ApprovalProcessModel.java b/app/src/main/java/com/casic/xz/meterage/model/ApprovalProcessModel.java new file mode 100644 index 0000000..40b29e2 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/ApprovalProcessModel.java @@ -0,0 +1,157 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class ApprovalProcessModel { + + private int code; + private List> data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List> getData() { + return data; + } + + public void setData(List> data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private String approvalStatus; + private String assigneeId; + private String assigneeName; + private Object comment; + private String createTime; + private String deptId; + private String deptName; + private String duration; + private String finishTime; + private String taskId; + private String taskName; + + public String getApprovalStatus() { + return approvalStatus; + } + + public void setApprovalStatus(String approvalStatus) { + this.approvalStatus = approvalStatus; + } + + public String getAssigneeId() { + return assigneeId; + } + + public void setAssigneeId(String assigneeId) { + this.assigneeId = assigneeId; + } + + public String getAssigneeName() { + return assigneeName; + } + + public void setAssigneeName(String assigneeName) { + this.assigneeName = assigneeName; + } + + public Object getComment() { + return comment; + } + + public void setComment(Object comment) { + this.comment = comment; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getDeptId() { + return deptId; + } + + public void setDeptId(String deptId) { + this.deptId = deptId; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getDuration() { + return duration; + } + + public void setDuration(String duration) { + this.duration = duration; + } + + public String getFinishTime() { + return finishTime; + } + + public void setFinishTime(String finishTime) { + this.finishTime = finishTime; + } + + public String getTaskId() { + return taskId; + } + + public void setTaskId(String taskId) { + this.taskId = taskId; + } + + public String getTaskName() { + return taskName; + } + + public void setTaskName(String taskName) { + this.taskName = taskName; + } + + public static class CommentModel { + private String comment; + private String type; + + public String getComment() { + return comment; + } + + public void setComment(String comment) { + this.comment = comment; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/ApprovalProcessAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/ApprovalProcessAdapter.kt new file mode 100644 index 0000000..5b851d0 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/ApprovalProcessAdapter.kt @@ -0,0 +1,106 @@ +package com.casic.xz.meterage.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.ImageView +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.casic.xz.meterage.R +import com.casic.xz.meterage.model.ApprovalProcessModel +import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter +import com.pengxh.kt.lite.adapter.ViewHolder +import com.pengxh.kt.lite.extensions.toJson +import org.json.JSONObject + +class ApprovalProcessAdapter( + context: Context, + private val dataRows: List>, + private val lastRow: ApprovalProcessModel.DataModel +) : RecyclerView.Adapter() { + + private val kTag = "ApprovalProcessAdapter" + private var layoutInflater: LayoutInflater = LayoutInflater.from(context) + + override fun getItemCount(): Int = dataRows.size + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + layoutInflater.inflate(R.layout.item_approval_log_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val childRows = dataRows[position] + when (position) { + 0 -> { + holder.childRecyclerView.visibility = View.VISIBLE + + //最后一项 + holder.topLineView.visibility = View.INVISIBLE + holder.tagImageView.setImageResource(R.drawable.ic_dot_red) + + holder.childRecyclerView.adapter = object : + NormalRecyclerAdapter( + R.layout.item_approval_log_child_rv_l, childRows + ) { + override fun convertView( + viewHolder: ViewHolder, position: Int, item: ApprovalProcessModel.DataModel + ) { + val json = item.comment.toJson() + //{"comment":"同意","type":"1"} + val jsonObject = JSONObject(json) + viewHolder.setText(R.id.statusView, jsonObject.getString("comment")) + .setText(R.id.operatorNameView, item.assigneeName) + .setText(R.id.deptNameView, item.deptName) + .setText(R.id.operateTimeView, item.finishTime) + } + } + } + dataRows.size - 1 -> { + holder.childRecyclerView.visibility = View.GONE + holder.bottomLineView.visibility = View.INVISIBLE + holder.tagImageView.setImageResource(R.drawable.ic_dot_gray) + + holder.statusView.text = "新建" + holder.operatorNameView.text = lastRow.assigneeName + holder.deptNameView.text = lastRow.deptName + holder.operateTimeView.text = lastRow.finishTime + } + else -> { + holder.childRecyclerView.visibility = View.VISIBLE + + holder.tagImageView.setImageResource(R.drawable.ic_dot) + + holder.childRecyclerView.adapter = object : + NormalRecyclerAdapter( + R.layout.item_approval_log_child_rv_l, childRows + ) { + override fun convertView( + viewHolder: ViewHolder, position: Int, item: ApprovalProcessModel.DataModel + ) { + val json = item.comment.toJson() + //{"comment":"同意","type":"1"} + val jsonObject = JSONObject(json) + viewHolder.setText(R.id.statusView, jsonObject.getString("comment")) + .setText(R.id.operatorNameView, item.assigneeName) + .setText(R.id.deptNameView, item.deptName) + .setText(R.id.operateTimeView, item.finishTime) + } + } + } + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var childRecyclerView: RecyclerView = view.findViewById(R.id.childRecyclerView) + + var topLineView: View = view.findViewById(R.id.topLineView) + var tagImageView: ImageView = view.findViewById(R.id.tagImageView) + var bottomLineView: View = view.findViewById(R.id.bottomLineView) + var statusView: TextView = view.findViewById(R.id.statusView) + var operatorNameView: TextView = view.findViewById(R.id.operatorNameView) + var deptNameView: TextView = view.findViewById(R.id.deptNameView) + var operateTimeView: TextView = view.findViewById(R.id.operateTimeView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt index a75e566..45e3780 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -1,25 +1,39 @@ package com.casic.xz.meterage.fragment.certificate +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.ApprovalProcessAdapter +import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_certificate_approval_process.* -class ApprovalProcessFragment :KotlinBaseFragment(){ +class ApprovalProcessFragment(private val processId: String) : KotlinBaseFragment() { + + private lateinit var certificateViewModel: CertificateViewModel override fun initData() { - + certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] + certificateViewModel.getApprovalProcess(processId) + certificateViewModel.processResult.observe(this) { + if (it.code == 200) { + logRecyclerView.adapter = ApprovalProcessAdapter( + requireContext(), it.data, it.data.last().first() + ) + } + } } 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 index 5882c3d..bf851c0 100644 --- 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 @@ -2,47 +2,41 @@ 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.casic.xz.meterage.model.kt.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 + 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 + 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 + estimateServedTimeView.text = businessOriginal.businessOrder?.planDeliverTime + estimateCompleteTimeView.text = businessOriginal.businessOrder?.requireOverTime if (data.certificateReportFile.isNullOrBlank()) { reportFileView.text = "暂无附件" diff --git a/app/src/main/java/com/casic/xz/meterage/model/ApprovalProcessModel.java b/app/src/main/java/com/casic/xz/meterage/model/ApprovalProcessModel.java new file mode 100644 index 0000000..40b29e2 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/ApprovalProcessModel.java @@ -0,0 +1,157 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class ApprovalProcessModel { + + private int code; + private List> data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List> getData() { + return data; + } + + public void setData(List> data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private String approvalStatus; + private String assigneeId; + private String assigneeName; + private Object comment; + private String createTime; + private String deptId; + private String deptName; + private String duration; + private String finishTime; + private String taskId; + private String taskName; + + public String getApprovalStatus() { + return approvalStatus; + } + + public void setApprovalStatus(String approvalStatus) { + this.approvalStatus = approvalStatus; + } + + public String getAssigneeId() { + return assigneeId; + } + + public void setAssigneeId(String assigneeId) { + this.assigneeId = assigneeId; + } + + public String getAssigneeName() { + return assigneeName; + } + + public void setAssigneeName(String assigneeName) { + this.assigneeName = assigneeName; + } + + public Object getComment() { + return comment; + } + + public void setComment(Object comment) { + this.comment = comment; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getDeptId() { + return deptId; + } + + public void setDeptId(String deptId) { + this.deptId = deptId; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getDuration() { + return duration; + } + + public void setDuration(String duration) { + this.duration = duration; + } + + public String getFinishTime() { + return finishTime; + } + + public void setFinishTime(String finishTime) { + this.finishTime = finishTime; + } + + public String getTaskId() { + return taskId; + } + + public void setTaskId(String taskId) { + this.taskId = taskId; + } + + public String getTaskName() { + return taskName; + } + + public void setTaskName(String taskName) { + this.taskName = taskName; + } + + public static class CommentModel { + private String comment; + private String type; + + public String getComment() { + return comment; + } + + public void setComment(String comment) { + this.comment = comment; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + } + } +} \ 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 deleted file mode 100644 index 42efccd..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/CertificateDetailModel.java +++ /dev/null @@ -1,2080 +0,0 @@ -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/adapter/ApprovalProcessAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/ApprovalProcessAdapter.kt new file mode 100644 index 0000000..5b851d0 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/ApprovalProcessAdapter.kt @@ -0,0 +1,106 @@ +package com.casic.xz.meterage.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.ImageView +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.casic.xz.meterage.R +import com.casic.xz.meterage.model.ApprovalProcessModel +import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter +import com.pengxh.kt.lite.adapter.ViewHolder +import com.pengxh.kt.lite.extensions.toJson +import org.json.JSONObject + +class ApprovalProcessAdapter( + context: Context, + private val dataRows: List>, + private val lastRow: ApprovalProcessModel.DataModel +) : RecyclerView.Adapter() { + + private val kTag = "ApprovalProcessAdapter" + private var layoutInflater: LayoutInflater = LayoutInflater.from(context) + + override fun getItemCount(): Int = dataRows.size + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + layoutInflater.inflate(R.layout.item_approval_log_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val childRows = dataRows[position] + when (position) { + 0 -> { + holder.childRecyclerView.visibility = View.VISIBLE + + //最后一项 + holder.topLineView.visibility = View.INVISIBLE + holder.tagImageView.setImageResource(R.drawable.ic_dot_red) + + holder.childRecyclerView.adapter = object : + NormalRecyclerAdapter( + R.layout.item_approval_log_child_rv_l, childRows + ) { + override fun convertView( + viewHolder: ViewHolder, position: Int, item: ApprovalProcessModel.DataModel + ) { + val json = item.comment.toJson() + //{"comment":"同意","type":"1"} + val jsonObject = JSONObject(json) + viewHolder.setText(R.id.statusView, jsonObject.getString("comment")) + .setText(R.id.operatorNameView, item.assigneeName) + .setText(R.id.deptNameView, item.deptName) + .setText(R.id.operateTimeView, item.finishTime) + } + } + } + dataRows.size - 1 -> { + holder.childRecyclerView.visibility = View.GONE + holder.bottomLineView.visibility = View.INVISIBLE + holder.tagImageView.setImageResource(R.drawable.ic_dot_gray) + + holder.statusView.text = "新建" + holder.operatorNameView.text = lastRow.assigneeName + holder.deptNameView.text = lastRow.deptName + holder.operateTimeView.text = lastRow.finishTime + } + else -> { + holder.childRecyclerView.visibility = View.VISIBLE + + holder.tagImageView.setImageResource(R.drawable.ic_dot) + + holder.childRecyclerView.adapter = object : + NormalRecyclerAdapter( + R.layout.item_approval_log_child_rv_l, childRows + ) { + override fun convertView( + viewHolder: ViewHolder, position: Int, item: ApprovalProcessModel.DataModel + ) { + val json = item.comment.toJson() + //{"comment":"同意","type":"1"} + val jsonObject = JSONObject(json) + viewHolder.setText(R.id.statusView, jsonObject.getString("comment")) + .setText(R.id.operatorNameView, item.assigneeName) + .setText(R.id.deptNameView, item.deptName) + .setText(R.id.operateTimeView, item.finishTime) + } + } + } + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var childRecyclerView: RecyclerView = view.findViewById(R.id.childRecyclerView) + + var topLineView: View = view.findViewById(R.id.topLineView) + var tagImageView: ImageView = view.findViewById(R.id.tagImageView) + var bottomLineView: View = view.findViewById(R.id.bottomLineView) + var statusView: TextView = view.findViewById(R.id.statusView) + var operatorNameView: TextView = view.findViewById(R.id.operatorNameView) + var deptNameView: TextView = view.findViewById(R.id.deptNameView) + var operateTimeView: TextView = view.findViewById(R.id.operateTimeView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt index a75e566..45e3780 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -1,25 +1,39 @@ package com.casic.xz.meterage.fragment.certificate +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.ApprovalProcessAdapter +import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_certificate_approval_process.* -class ApprovalProcessFragment :KotlinBaseFragment(){ +class ApprovalProcessFragment(private val processId: String) : KotlinBaseFragment() { + + private lateinit var certificateViewModel: CertificateViewModel override fun initData() { - + certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] + certificateViewModel.getApprovalProcess(processId) + certificateViewModel.processResult.observe(this) { + if (it.code == 200) { + logRecyclerView.adapter = ApprovalProcessAdapter( + requireContext(), it.data, it.data.last().first() + ) + } + } } 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 index 5882c3d..bf851c0 100644 --- 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 @@ -2,47 +2,41 @@ 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.casic.xz.meterage.model.kt.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 + 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 + 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 + estimateServedTimeView.text = businessOriginal.businessOrder?.planDeliverTime + estimateCompleteTimeView.text = businessOriginal.businessOrder?.requireOverTime if (data.certificateReportFile.isNullOrBlank()) { reportFileView.text = "暂无附件" diff --git a/app/src/main/java/com/casic/xz/meterage/model/ApprovalProcessModel.java b/app/src/main/java/com/casic/xz/meterage/model/ApprovalProcessModel.java new file mode 100644 index 0000000..40b29e2 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/ApprovalProcessModel.java @@ -0,0 +1,157 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class ApprovalProcessModel { + + private int code; + private List> data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List> getData() { + return data; + } + + public void setData(List> data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private String approvalStatus; + private String assigneeId; + private String assigneeName; + private Object comment; + private String createTime; + private String deptId; + private String deptName; + private String duration; + private String finishTime; + private String taskId; + private String taskName; + + public String getApprovalStatus() { + return approvalStatus; + } + + public void setApprovalStatus(String approvalStatus) { + this.approvalStatus = approvalStatus; + } + + public String getAssigneeId() { + return assigneeId; + } + + public void setAssigneeId(String assigneeId) { + this.assigneeId = assigneeId; + } + + public String getAssigneeName() { + return assigneeName; + } + + public void setAssigneeName(String assigneeName) { + this.assigneeName = assigneeName; + } + + public Object getComment() { + return comment; + } + + public void setComment(Object comment) { + this.comment = comment; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getDeptId() { + return deptId; + } + + public void setDeptId(String deptId) { + this.deptId = deptId; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getDuration() { + return duration; + } + + public void setDuration(String duration) { + this.duration = duration; + } + + public String getFinishTime() { + return finishTime; + } + + public void setFinishTime(String finishTime) { + this.finishTime = finishTime; + } + + public String getTaskId() { + return taskId; + } + + public void setTaskId(String taskId) { + this.taskId = taskId; + } + + public String getTaskName() { + return taskName; + } + + public void setTaskName(String taskName) { + this.taskName = taskName; + } + + public static class CommentModel { + private String comment; + private String type; + + public String getComment() { + return comment; + } + + public void setComment(String comment) { + this.comment = comment; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + } + } +} \ 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 deleted file mode 100644 index 42efccd..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/CertificateDetailModel.java +++ /dev/null @@ -1,2080 +0,0 @@ -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/kt/CertificateDetailModel.kt b/app/src/main/java/com/casic/xz/meterage/model/kt/CertificateDetailModel.kt new file mode 100644 index 0000000..b2440b9 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/kt/CertificateDetailModel.kt @@ -0,0 +1,584 @@ +package com.casic.xz.meterage.model.kt + +import com.google.gson.annotations.SerializedName + +data class CertificateDetailModel( + @SerializedName("code") + val code: Int?, + @SerializedName("data") + val `data`: DataModel?, + @SerializedName("message") + val message: String? +) { + data class DataModel( + @SerializedName("approvalSignId") + val approvalSignId: String?, + @SerializedName("approvalSignName") + val approvalSignName: String?, + @SerializedName("approvalStatus") + val approvalStatus: String?, + @SerializedName("approvalStatusName") + val approvalStatusName: String?, + @SerializedName("businessOriginalRecord") + val businessOriginalRecord: BusinessOriginalRecord?, + @SerializedName("calibrationMajor") + val calibrationMajor: String?, + @SerializedName("calibrationMajorName") + val calibrationMajorName: String?, + @SerializedName("certificateReportCategory") + val certificateReportCategory: String?, + @SerializedName("certificateReportCode") + val certificateReportCode: String?, + @SerializedName("certificateReportFile") + val certificateReportFile: String?, + @SerializedName("certificateReportName") + val certificateReportName: String?, + @SerializedName("certificateReportType") + val certificateReportType: String?, + @SerializedName("certificateReportTypeName") + val certificateReportTypeName: String?, + @SerializedName("createTime") + val createTime: String?, + @SerializedName("createUser") + val createUser: String?, + @SerializedName("expirationDate") + val expirationDate: String?, + @SerializedName("id") + val id: String?, + @SerializedName("isDel") + val isDel: Boolean?, + @SerializedName("issuanceDate") + val issuanceDate: String?, + @SerializedName("measureDeptId") + val measureDeptId: String?, + @SerializedName("measurePersonId") + val measurePersonId: String?, + @SerializedName("measureResult") + val measureResult: String?, + @SerializedName("orderId") + val orderId: String?, + @SerializedName("originalRecordId") + val originalRecordId: String?, + @SerializedName("printApprovalStatus") + val printApprovalStatus: String?, + @SerializedName("printNum") + val printNum: Int?, + @SerializedName("printStatus") + val printStatus: String?, + @SerializedName("processId") + val processId: String?, + @SerializedName("remark") + val remark: String?, + @SerializedName("sampleId") + val sampleId: String?, + @SerializedName("signId") + val signId: String?, + @SerializedName("signName") + val signName: String?, + @SerializedName("submitDate") + val submitDate: String?, + @SerializedName("templateId") + val templateId: String?, + @SerializedName("templateName") + val templateName: String?, + @SerializedName("updateTime") + val updateTime: String? + ) { + data class BusinessOriginalRecord( + @SerializedName("businessEnvironmentRecord") + val businessEnvironmentRecord: BusinessEnvironmentRecord?, + @SerializedName("businessOrder") + val businessOrder: BusinessOrder?, + @SerializedName("calibrationPlace") + val calibrationPlace: String?, + @SerializedName("calibrationTime") + val calibrationTime: String?, + @SerializedName("createTime") + val createTime: String?, + @SerializedName("createUser") + val createUser: String?, + @SerializedName("createUserName") + val createUserName: String?, + @SerializedName("customerSampleInfo") + val customerSampleInfo: CustomerSampleInfo?, + @SerializedName("environmentId") + val environmentId: String?, + @SerializedName("equipmentInfoList") + val equipmentInfoList: List?, + @SerializedName("fileList") + val fileList: List?, + @SerializedName("id") + val id: String?, + @SerializedName("isDel") + val isDel: Boolean?, + @SerializedName("measureCategory") + val measureCategory: String?, + @SerializedName("measureCategoryName") + val measureCategoryName: String?, + @SerializedName("orderId") + val orderId: String?, + @SerializedName("originalRecordCode") + val originalRecordCode: String?, + @SerializedName("originalRecordFile") + val originalRecordFile: String?, + @SerializedName("originalRecordName") + val originalRecordName: String?, + @SerializedName("remark") + val remark: String?, + @SerializedName("sampleId") + val sampleId: String?, + @SerializedName("templateId") + val templateId: String?, + @SerializedName("templateName") + val templateName: String?, + @SerializedName("updateTime") + val updateTime: String? + ) { + data class BusinessEnvironmentRecord( + @SerializedName("createTime") + val createTime: String?, + @SerializedName("createUser") + val createUser: String?, + @SerializedName("environmentCode") + val environmentCode: String?, + @SerializedName("humidity") + val humidity: String?, + @SerializedName("id") + val id: String?, + @SerializedName("isDel") + val isDel: Boolean?, + @SerializedName("outputVoltage") + val outputVoltage: String?, + @SerializedName("recordTime") + val recordTime: String?, + @SerializedName("recorder") + val recorder: String?, + @SerializedName("remark") + val remark: String?, + @SerializedName("roomNumber") + val roomNumber: String?, + @SerializedName("temperature") + val temperature: String?, + @SerializedName("updateTime") + val updateTime: String?, + @SerializedName("zeroGroundVoltage") + val zeroGroundVoltage: String? + ) + + data class BusinessOrder( + @SerializedName("certifications") + val certifications: String?, + @SerializedName("createTime") + val createTime: String?, + @SerializedName("createUser") + val createUser: String?, + @SerializedName("customerAddress") + val customerAddress: String?, + @SerializedName("customerId") + val customerId: String?, + @SerializedName("customerName") + val customerName: String?, + @SerializedName("customerNo") + val customerNo: String?, + @SerializedName("customerPhone") + val customerPhone: String?, + @SerializedName("customerSampleInfoList") + val customerSampleInfoList: List?, + @SerializedName("deliverTime") + val deliverTime: String?, + @SerializedName("deliverer") + val deliverer: String?, + @SerializedName("delivererId") + val delivererId: String?, + @SerializedName("delivererTel") + val delivererTel: String?, + @SerializedName("id") + val id: String?, + @SerializedName("isDel") + val isDel: Int?, + @SerializedName("isUrgent") + val isUrgent: Int?, + @SerializedName("minioFileName") + val minioFileName: String?, + @SerializedName("orderCode") + val orderCode: String?, + @SerializedName("orderTime") + val orderTime: String?, + @SerializedName("planDeliverTime") + val planDeliverTime: String?, + @SerializedName("remark") + val remark: String?, + @SerializedName("requireOverTime") + val requireOverTime: String?, + @SerializedName("status") + val status: String?, + @SerializedName("updateTime") + val updateTime: String?, + @SerializedName("updateUser") + val updateUser: String? + ) { + data class CustomerSampleInfo( + @SerializedName("abc") + val abc: String?, + @SerializedName("appendix") + val appendix: String?, + @SerializedName("appendixDescn") + val appendixDescn: String?, + @SerializedName("createTime") + val createTime: String?, + @SerializedName("createUser") + val createUser: String?, + @SerializedName("customerAddress") + val customerAddress: String?, + @SerializedName("customerId") + val customerId: String?, + @SerializedName("customerName") + val customerName: String?, + @SerializedName("customerNo") + val customerNo: String?, + @SerializedName("deliverer") + val deliverer: String?, + @SerializedName("delivererTel") + val delivererTel: String?, + @SerializedName("id") + val id: String?, + @SerializedName("isDel") + val isDel: Int?, + @SerializedName("isExistSample") + val isExistSample: String?, + @SerializedName("labelBind") + val labelBind: String?, + @SerializedName("manufacturer") + val manufacturer: String?, + @SerializedName("manufacturerCountry") + val manufacturerCountry: String?, + @SerializedName("manufacturingDate") + val manufacturingDate: String?, + @SerializedName("manufacturingNo") + val manufacturingNo: String?, + @SerializedName("measureCategory") + val measureCategory: String?, + @SerializedName("measureCategoryName") + val measureCategoryName: String?, + @SerializedName("measureContent") + val measureContent: String?, + @SerializedName("measureLastTime") + val measureLastTime: String?, + @SerializedName("measurePeriod") + val measurePeriod: String?, + @SerializedName("measureType") + val measureType: String?, + @SerializedName("measureTypeName") + val measureTypeName: String?, + @SerializedName("minioFileName") + val minioFileName: String?, + @SerializedName("orderId") + val orderId: String?, + @SerializedName("phone") + val phone: String?, + @SerializedName("postalCode") + val postalCode: String?, + @SerializedName("powerVoltage") + val powerVoltage: String?, + @SerializedName("remark") + val remark: String?, + @SerializedName("sampleBelong") + val sampleBelong: String?, + @SerializedName("sampleBelongName") + val sampleBelongName: String?, + @SerializedName("sampleModel") + val sampleModel: String?, + @SerializedName("sampleName") + val sampleName: String?, + @SerializedName("sampleNo") + val sampleNo: String?, + @SerializedName("specialRequire") + val specialRequire: String?, + @SerializedName("updateTime") + val updateTime: String?, + @SerializedName("updateUser") + val updateUser: String?, + @SerializedName("validDeadline") + val validDeadline: String? + ) + } + + data class CustomerSampleInfo( + @SerializedName("abc") + val abc: String?, + @SerializedName("appendix") + val appendix: String?, + @SerializedName("appendixDescn") + val appendixDescn: String?, + @SerializedName("createTime") + val createTime: String?, + @SerializedName("createUser") + val createUser: String?, + @SerializedName("customerAddress") + val customerAddress: String?, + @SerializedName("customerId") + val customerId: String?, + @SerializedName("customerName") + val customerName: String?, + @SerializedName("customerNo") + val customerNo: String?, + @SerializedName("deliverer") + val deliverer: String?, + @SerializedName("delivererTel") + val delivererTel: String?, + @SerializedName("id") + val id: String?, + @SerializedName("isDel") + val isDel: Int?, + @SerializedName("isExistSample") + val isExistSample: String?, + @SerializedName("labelBind") + val labelBind: String?, + @SerializedName("manufacturer") + val manufacturer: String?, + @SerializedName("manufacturerCountry") + val manufacturerCountry: String?, + @SerializedName("manufacturingDate") + val manufacturingDate: String?, + @SerializedName("manufacturingNo") + val manufacturingNo: String?, + @SerializedName("measureCategory") + val measureCategory: String?, + @SerializedName("measureCategoryName") + val measureCategoryName: String?, + @SerializedName("measureContent") + val measureContent: String?, + @SerializedName("measureLastTime") + val measureLastTime: String?, + @SerializedName("measurePeriod") + val measurePeriod: String?, + @SerializedName("measureType") + val measureType: String?, + @SerializedName("measureTypeName") + val measureTypeName: String?, + @SerializedName("minioFileName") + val minioFileName: String?, + @SerializedName("orderId") + val orderId: String?, + @SerializedName("phone") + val phone: String?, + @SerializedName("postalCode") + val postalCode: String?, + @SerializedName("powerVoltage") + val powerVoltage: String?, + @SerializedName("remark") + val remark: String?, + @SerializedName("sampleBelong") + val sampleBelong: String?, + @SerializedName("sampleBelongName") + val sampleBelongName: String?, + @SerializedName("sampleModel") + val sampleModel: String?, + @SerializedName("sampleName") + val sampleName: String?, + @SerializedName("sampleNo") + val sampleNo: String?, + @SerializedName("specialRequire") + val specialRequire: String?, + @SerializedName("updateTime") + val updateTime: String?, + @SerializedName("updateUser") + val updateUser: String?, + @SerializedName("validDeadline") + val validDeadline: String? + ) + + data class EquipmentInfo( + @SerializedName("abc") + val abc: String?, + @SerializedName("abcName") + val abcName: String?, + @SerializedName("applyRelationId") + val applyRelationId: String?, + @SerializedName("assetNo") + val assetNo: String?, + @SerializedName("assetSource") + val assetSource: String?, + @SerializedName("assetType") + val assetType: String?, + @SerializedName("assetTypeName") + val assetTypeName: String?, + @SerializedName("attribute") + val attribute: String?, + @SerializedName("capitalSource") + val capitalSource: String?, + @SerializedName("capitalSourceName") + val capitalSourceName: String?, + @SerializedName("cardEstablishmentDate") + val cardEstablishmentDate: String?, + @SerializedName("createTime") + val createTime: String?, + @SerializedName("createUser") + val createUser: String?, + @SerializedName("depreciationMethod") + val depreciationMethod: String?, + @SerializedName("depreciationMethodName") + val depreciationMethodName: String?, + @SerializedName("depreciationPeriod") + val depreciationPeriod: String?, + @SerializedName("enableDate") + val enableDate: String?, + @SerializedName("equipmentCategory") + val equipmentCategory: String?, + @SerializedName("equipmentCategoryName") + val equipmentCategoryName: String?, + @SerializedName("equipmentName") + val equipmentName: String?, + @SerializedName("equipmentNo") + val equipmentNo: String?, + @SerializedName("equipmentSpecifications") + val equipmentSpecifications: String?, + @SerializedName("equipmentType") + val equipmentType: String?, + @SerializedName("equipmentTypeName") + val equipmentTypeName: String?, + @SerializedName("fileList") + val fileList: String?, + @SerializedName("id") + val id: String?, + @SerializedName("installIncidentalExpenses") + val installIncidentalExpenses: String?, + @SerializedName("installPlace") + val installPlace: String?, + @SerializedName("intactState") + val intactState: String?, + @SerializedName("isCalibrationTestEquipment") + val isCalibrationTestEquipment: Int?, + @SerializedName("isDel") + val isDel: Int?, + @SerializedName("isFixedAssets") + val isFixedAssets: Int?, + @SerializedName("isMeasureAccount") + val isMeasureAccount: Int?, + @SerializedName("isStandardSupportEquipment") + val isStandardSupportEquipment: Int?, + @SerializedName("labelBind") + val labelBind: String?, + @SerializedName("majorCategory") + val majorCategory: String?, + @SerializedName("majorCategoryName") + val majorCategoryName: String?, + @SerializedName("managerLevel") + val managerLevel: String?, + @SerializedName("managerLevelName") + val managerLevelName: String?, + @SerializedName("managerState") + val managerState: String?, + @SerializedName("managerStateName") + val managerStateName: String?, + @SerializedName("manufacturer") + val manufacturer: String?, + @SerializedName("manufacturerCountry") + val manufacturerCountry: String?, + @SerializedName("manufacturingDate") + val manufacturingDate: String?, + @SerializedName("manufacturingNo") + val manufacturingNo: String?, + @SerializedName("mesureCycle") + val mesureCycle: Int?, + @SerializedName("mesureDate") + val mesureDate: String?, + @SerializedName("mesureDept") + val mesureDept: String?, + @SerializedName("mesureRange") + val mesureRange: String?, + @SerializedName("mesureResult") + val mesureResult: String?, + @SerializedName("mesureResultName") + val mesureResultName: String?, + @SerializedName("mesureType") + val mesureType: String?, + @SerializedName("mesureTypeName") + val mesureTypeName: String?, + @SerializedName("modelNo") + val modelNo: String?, + @SerializedName("originValue") + val originValue: String?, + @SerializedName("overallDimension") + val overallDimension: String?, + @SerializedName("presentOriginValue") + val presentOriginValue: String?, + @SerializedName("purpose") + val purpose: String?, + @SerializedName("remark") + val remark: String?, + @SerializedName("singlePrice") + val singlePrice: String?, + @SerializedName("supportStandardEquipmentName") + val supportStandardEquipmentName: String?, + @SerializedName("supportStandardEquipmentNo") + val supportStandardEquipmentNo: String?, + @SerializedName("technicalLevel") + val technicalLevel: String?, + @SerializedName("uncertainty") + val uncertainty: String?, + @SerializedName("updateTime") + val updateTime: String?, + @SerializedName("useDept") + val useDept: String?, + @SerializedName("useDeptName") + val useDeptName: String?, + @SerializedName("usePerson") + val usePerson: String?, + @SerializedName("usePersonName") + val usePersonName: String?, + @SerializedName("validDate") + val validDate: String?, + @SerializedName("version") + val version: Int?, + @SerializedName("weight") + val weight: String? + ) + + data class FileModel( + @SerializedName("approvalStatus") + val approvalStatus: String?, + @SerializedName("approvalStatusName") + val approvalStatusName: String?, + @SerializedName("createTime") + val createTime: String?, + @SerializedName("createUser") + val createUser: String?, + @SerializedName("createUserId") + val createUserId: String?, + @SerializedName("effectiveStatus") + val effectiveStatus: String?, + @SerializedName("effectiveStatusName") + val effectiveStatusName: String?, + @SerializedName("effectiveTime") + val effectiveTime: String?, + @SerializedName("fileCode") + val fileCode: String?, + @SerializedName("fileName") + val fileName: String?, + @SerializedName("fileNo") + val fileNo: String?, + @SerializedName("fileType") + val fileType: String?, + @SerializedName("fileTypeName") + val fileTypeName: String?, + @SerializedName("id") + val id: String?, + @SerializedName("isDel") + val isDel: Int?, + @SerializedName("minioFileName") + val minioFileName: String?, + @SerializedName("processId") + val processId: String?, + @SerializedName("publishTime") + val publishTime: String?, + @SerializedName("publisher") + val publisher: String?, + @SerializedName("remark") + val remark: String?, + @SerializedName("updateTime") + val updateTime: String? + ) + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/ApprovalProcessAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/ApprovalProcessAdapter.kt new file mode 100644 index 0000000..5b851d0 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/ApprovalProcessAdapter.kt @@ -0,0 +1,106 @@ +package com.casic.xz.meterage.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.ImageView +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.casic.xz.meterage.R +import com.casic.xz.meterage.model.ApprovalProcessModel +import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter +import com.pengxh.kt.lite.adapter.ViewHolder +import com.pengxh.kt.lite.extensions.toJson +import org.json.JSONObject + +class ApprovalProcessAdapter( + context: Context, + private val dataRows: List>, + private val lastRow: ApprovalProcessModel.DataModel +) : RecyclerView.Adapter() { + + private val kTag = "ApprovalProcessAdapter" + private var layoutInflater: LayoutInflater = LayoutInflater.from(context) + + override fun getItemCount(): Int = dataRows.size + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + layoutInflater.inflate(R.layout.item_approval_log_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val childRows = dataRows[position] + when (position) { + 0 -> { + holder.childRecyclerView.visibility = View.VISIBLE + + //最后一项 + holder.topLineView.visibility = View.INVISIBLE + holder.tagImageView.setImageResource(R.drawable.ic_dot_red) + + holder.childRecyclerView.adapter = object : + NormalRecyclerAdapter( + R.layout.item_approval_log_child_rv_l, childRows + ) { + override fun convertView( + viewHolder: ViewHolder, position: Int, item: ApprovalProcessModel.DataModel + ) { + val json = item.comment.toJson() + //{"comment":"同意","type":"1"} + val jsonObject = JSONObject(json) + viewHolder.setText(R.id.statusView, jsonObject.getString("comment")) + .setText(R.id.operatorNameView, item.assigneeName) + .setText(R.id.deptNameView, item.deptName) + .setText(R.id.operateTimeView, item.finishTime) + } + } + } + dataRows.size - 1 -> { + holder.childRecyclerView.visibility = View.GONE + holder.bottomLineView.visibility = View.INVISIBLE + holder.tagImageView.setImageResource(R.drawable.ic_dot_gray) + + holder.statusView.text = "新建" + holder.operatorNameView.text = lastRow.assigneeName + holder.deptNameView.text = lastRow.deptName + holder.operateTimeView.text = lastRow.finishTime + } + else -> { + holder.childRecyclerView.visibility = View.VISIBLE + + holder.tagImageView.setImageResource(R.drawable.ic_dot) + + holder.childRecyclerView.adapter = object : + NormalRecyclerAdapter( + R.layout.item_approval_log_child_rv_l, childRows + ) { + override fun convertView( + viewHolder: ViewHolder, position: Int, item: ApprovalProcessModel.DataModel + ) { + val json = item.comment.toJson() + //{"comment":"同意","type":"1"} + val jsonObject = JSONObject(json) + viewHolder.setText(R.id.statusView, jsonObject.getString("comment")) + .setText(R.id.operatorNameView, item.assigneeName) + .setText(R.id.deptNameView, item.deptName) + .setText(R.id.operateTimeView, item.finishTime) + } + } + } + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var childRecyclerView: RecyclerView = view.findViewById(R.id.childRecyclerView) + + var topLineView: View = view.findViewById(R.id.topLineView) + var tagImageView: ImageView = view.findViewById(R.id.tagImageView) + var bottomLineView: View = view.findViewById(R.id.bottomLineView) + var statusView: TextView = view.findViewById(R.id.statusView) + var operatorNameView: TextView = view.findViewById(R.id.operatorNameView) + var deptNameView: TextView = view.findViewById(R.id.deptNameView) + var operateTimeView: TextView = view.findViewById(R.id.operateTimeView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt index a75e566..45e3780 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -1,25 +1,39 @@ package com.casic.xz.meterage.fragment.certificate +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.ApprovalProcessAdapter +import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_certificate_approval_process.* -class ApprovalProcessFragment :KotlinBaseFragment(){ +class ApprovalProcessFragment(private val processId: String) : KotlinBaseFragment() { + + private lateinit var certificateViewModel: CertificateViewModel override fun initData() { - + certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] + certificateViewModel.getApprovalProcess(processId) + certificateViewModel.processResult.observe(this) { + if (it.code == 200) { + logRecyclerView.adapter = ApprovalProcessAdapter( + requireContext(), it.data, it.data.last().first() + ) + } + } } 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 index 5882c3d..bf851c0 100644 --- 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 @@ -2,47 +2,41 @@ 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.casic.xz.meterage.model.kt.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 + 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 + 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 + estimateServedTimeView.text = businessOriginal.businessOrder?.planDeliverTime + estimateCompleteTimeView.text = businessOriginal.businessOrder?.requireOverTime if (data.certificateReportFile.isNullOrBlank()) { reportFileView.text = "暂无附件" diff --git a/app/src/main/java/com/casic/xz/meterage/model/ApprovalProcessModel.java b/app/src/main/java/com/casic/xz/meterage/model/ApprovalProcessModel.java new file mode 100644 index 0000000..40b29e2 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/ApprovalProcessModel.java @@ -0,0 +1,157 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class ApprovalProcessModel { + + private int code; + private List> data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List> getData() { + return data; + } + + public void setData(List> data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private String approvalStatus; + private String assigneeId; + private String assigneeName; + private Object comment; + private String createTime; + private String deptId; + private String deptName; + private String duration; + private String finishTime; + private String taskId; + private String taskName; + + public String getApprovalStatus() { + return approvalStatus; + } + + public void setApprovalStatus(String approvalStatus) { + this.approvalStatus = approvalStatus; + } + + public String getAssigneeId() { + return assigneeId; + } + + public void setAssigneeId(String assigneeId) { + this.assigneeId = assigneeId; + } + + public String getAssigneeName() { + return assigneeName; + } + + public void setAssigneeName(String assigneeName) { + this.assigneeName = assigneeName; + } + + public Object getComment() { + return comment; + } + + public void setComment(Object comment) { + this.comment = comment; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getDeptId() { + return deptId; + } + + public void setDeptId(String deptId) { + this.deptId = deptId; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getDuration() { + return duration; + } + + public void setDuration(String duration) { + this.duration = duration; + } + + public String getFinishTime() { + return finishTime; + } + + public void setFinishTime(String finishTime) { + this.finishTime = finishTime; + } + + public String getTaskId() { + return taskId; + } + + public void setTaskId(String taskId) { + this.taskId = taskId; + } + + public String getTaskName() { + return taskName; + } + + public void setTaskName(String taskName) { + this.taskName = taskName; + } + + public static class CommentModel { + private String comment; + private String type; + + public String getComment() { + return comment; + } + + public void setComment(String comment) { + this.comment = comment; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + } + } +} \ 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 deleted file mode 100644 index 42efccd..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/CertificateDetailModel.java +++ /dev/null @@ -1,2080 +0,0 @@ -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/kt/CertificateDetailModel.kt b/app/src/main/java/com/casic/xz/meterage/model/kt/CertificateDetailModel.kt new file mode 100644 index 0000000..b2440b9 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/kt/CertificateDetailModel.kt @@ -0,0 +1,584 @@ +package com.casic.xz.meterage.model.kt + +import com.google.gson.annotations.SerializedName + +data class CertificateDetailModel( + @SerializedName("code") + val code: Int?, + @SerializedName("data") + val `data`: DataModel?, + @SerializedName("message") + val message: String? +) { + data class DataModel( + @SerializedName("approvalSignId") + val approvalSignId: String?, + @SerializedName("approvalSignName") + val approvalSignName: String?, + @SerializedName("approvalStatus") + val approvalStatus: String?, + @SerializedName("approvalStatusName") + val approvalStatusName: String?, + @SerializedName("businessOriginalRecord") + val businessOriginalRecord: BusinessOriginalRecord?, + @SerializedName("calibrationMajor") + val calibrationMajor: String?, + @SerializedName("calibrationMajorName") + val calibrationMajorName: String?, + @SerializedName("certificateReportCategory") + val certificateReportCategory: String?, + @SerializedName("certificateReportCode") + val certificateReportCode: String?, + @SerializedName("certificateReportFile") + val certificateReportFile: String?, + @SerializedName("certificateReportName") + val certificateReportName: String?, + @SerializedName("certificateReportType") + val certificateReportType: String?, + @SerializedName("certificateReportTypeName") + val certificateReportTypeName: String?, + @SerializedName("createTime") + val createTime: String?, + @SerializedName("createUser") + val createUser: String?, + @SerializedName("expirationDate") + val expirationDate: String?, + @SerializedName("id") + val id: String?, + @SerializedName("isDel") + val isDel: Boolean?, + @SerializedName("issuanceDate") + val issuanceDate: String?, + @SerializedName("measureDeptId") + val measureDeptId: String?, + @SerializedName("measurePersonId") + val measurePersonId: String?, + @SerializedName("measureResult") + val measureResult: String?, + @SerializedName("orderId") + val orderId: String?, + @SerializedName("originalRecordId") + val originalRecordId: String?, + @SerializedName("printApprovalStatus") + val printApprovalStatus: String?, + @SerializedName("printNum") + val printNum: Int?, + @SerializedName("printStatus") + val printStatus: String?, + @SerializedName("processId") + val processId: String?, + @SerializedName("remark") + val remark: String?, + @SerializedName("sampleId") + val sampleId: String?, + @SerializedName("signId") + val signId: String?, + @SerializedName("signName") + val signName: String?, + @SerializedName("submitDate") + val submitDate: String?, + @SerializedName("templateId") + val templateId: String?, + @SerializedName("templateName") + val templateName: String?, + @SerializedName("updateTime") + val updateTime: String? + ) { + data class BusinessOriginalRecord( + @SerializedName("businessEnvironmentRecord") + val businessEnvironmentRecord: BusinessEnvironmentRecord?, + @SerializedName("businessOrder") + val businessOrder: BusinessOrder?, + @SerializedName("calibrationPlace") + val calibrationPlace: String?, + @SerializedName("calibrationTime") + val calibrationTime: String?, + @SerializedName("createTime") + val createTime: String?, + @SerializedName("createUser") + val createUser: String?, + @SerializedName("createUserName") + val createUserName: String?, + @SerializedName("customerSampleInfo") + val customerSampleInfo: CustomerSampleInfo?, + @SerializedName("environmentId") + val environmentId: String?, + @SerializedName("equipmentInfoList") + val equipmentInfoList: List?, + @SerializedName("fileList") + val fileList: List?, + @SerializedName("id") + val id: String?, + @SerializedName("isDel") + val isDel: Boolean?, + @SerializedName("measureCategory") + val measureCategory: String?, + @SerializedName("measureCategoryName") + val measureCategoryName: String?, + @SerializedName("orderId") + val orderId: String?, + @SerializedName("originalRecordCode") + val originalRecordCode: String?, + @SerializedName("originalRecordFile") + val originalRecordFile: String?, + @SerializedName("originalRecordName") + val originalRecordName: String?, + @SerializedName("remark") + val remark: String?, + @SerializedName("sampleId") + val sampleId: String?, + @SerializedName("templateId") + val templateId: String?, + @SerializedName("templateName") + val templateName: String?, + @SerializedName("updateTime") + val updateTime: String? + ) { + data class BusinessEnvironmentRecord( + @SerializedName("createTime") + val createTime: String?, + @SerializedName("createUser") + val createUser: String?, + @SerializedName("environmentCode") + val environmentCode: String?, + @SerializedName("humidity") + val humidity: String?, + @SerializedName("id") + val id: String?, + @SerializedName("isDel") + val isDel: Boolean?, + @SerializedName("outputVoltage") + val outputVoltage: String?, + @SerializedName("recordTime") + val recordTime: String?, + @SerializedName("recorder") + val recorder: String?, + @SerializedName("remark") + val remark: String?, + @SerializedName("roomNumber") + val roomNumber: String?, + @SerializedName("temperature") + val temperature: String?, + @SerializedName("updateTime") + val updateTime: String?, + @SerializedName("zeroGroundVoltage") + val zeroGroundVoltage: String? + ) + + data class BusinessOrder( + @SerializedName("certifications") + val certifications: String?, + @SerializedName("createTime") + val createTime: String?, + @SerializedName("createUser") + val createUser: String?, + @SerializedName("customerAddress") + val customerAddress: String?, + @SerializedName("customerId") + val customerId: String?, + @SerializedName("customerName") + val customerName: String?, + @SerializedName("customerNo") + val customerNo: String?, + @SerializedName("customerPhone") + val customerPhone: String?, + @SerializedName("customerSampleInfoList") + val customerSampleInfoList: List?, + @SerializedName("deliverTime") + val deliverTime: String?, + @SerializedName("deliverer") + val deliverer: String?, + @SerializedName("delivererId") + val delivererId: String?, + @SerializedName("delivererTel") + val delivererTel: String?, + @SerializedName("id") + val id: String?, + @SerializedName("isDel") + val isDel: Int?, + @SerializedName("isUrgent") + val isUrgent: Int?, + @SerializedName("minioFileName") + val minioFileName: String?, + @SerializedName("orderCode") + val orderCode: String?, + @SerializedName("orderTime") + val orderTime: String?, + @SerializedName("planDeliverTime") + val planDeliverTime: String?, + @SerializedName("remark") + val remark: String?, + @SerializedName("requireOverTime") + val requireOverTime: String?, + @SerializedName("status") + val status: String?, + @SerializedName("updateTime") + val updateTime: String?, + @SerializedName("updateUser") + val updateUser: String? + ) { + data class CustomerSampleInfo( + @SerializedName("abc") + val abc: String?, + @SerializedName("appendix") + val appendix: String?, + @SerializedName("appendixDescn") + val appendixDescn: String?, + @SerializedName("createTime") + val createTime: String?, + @SerializedName("createUser") + val createUser: String?, + @SerializedName("customerAddress") + val customerAddress: String?, + @SerializedName("customerId") + val customerId: String?, + @SerializedName("customerName") + val customerName: String?, + @SerializedName("customerNo") + val customerNo: String?, + @SerializedName("deliverer") + val deliverer: String?, + @SerializedName("delivererTel") + val delivererTel: String?, + @SerializedName("id") + val id: String?, + @SerializedName("isDel") + val isDel: Int?, + @SerializedName("isExistSample") + val isExistSample: String?, + @SerializedName("labelBind") + val labelBind: String?, + @SerializedName("manufacturer") + val manufacturer: String?, + @SerializedName("manufacturerCountry") + val manufacturerCountry: String?, + @SerializedName("manufacturingDate") + val manufacturingDate: String?, + @SerializedName("manufacturingNo") + val manufacturingNo: String?, + @SerializedName("measureCategory") + val measureCategory: String?, + @SerializedName("measureCategoryName") + val measureCategoryName: String?, + @SerializedName("measureContent") + val measureContent: String?, + @SerializedName("measureLastTime") + val measureLastTime: String?, + @SerializedName("measurePeriod") + val measurePeriod: String?, + @SerializedName("measureType") + val measureType: String?, + @SerializedName("measureTypeName") + val measureTypeName: String?, + @SerializedName("minioFileName") + val minioFileName: String?, + @SerializedName("orderId") + val orderId: String?, + @SerializedName("phone") + val phone: String?, + @SerializedName("postalCode") + val postalCode: String?, + @SerializedName("powerVoltage") + val powerVoltage: String?, + @SerializedName("remark") + val remark: String?, + @SerializedName("sampleBelong") + val sampleBelong: String?, + @SerializedName("sampleBelongName") + val sampleBelongName: String?, + @SerializedName("sampleModel") + val sampleModel: String?, + @SerializedName("sampleName") + val sampleName: String?, + @SerializedName("sampleNo") + val sampleNo: String?, + @SerializedName("specialRequire") + val specialRequire: String?, + @SerializedName("updateTime") + val updateTime: String?, + @SerializedName("updateUser") + val updateUser: String?, + @SerializedName("validDeadline") + val validDeadline: String? + ) + } + + data class CustomerSampleInfo( + @SerializedName("abc") + val abc: String?, + @SerializedName("appendix") + val appendix: String?, + @SerializedName("appendixDescn") + val appendixDescn: String?, + @SerializedName("createTime") + val createTime: String?, + @SerializedName("createUser") + val createUser: String?, + @SerializedName("customerAddress") + val customerAddress: String?, + @SerializedName("customerId") + val customerId: String?, + @SerializedName("customerName") + val customerName: String?, + @SerializedName("customerNo") + val customerNo: String?, + @SerializedName("deliverer") + val deliverer: String?, + @SerializedName("delivererTel") + val delivererTel: String?, + @SerializedName("id") + val id: String?, + @SerializedName("isDel") + val isDel: Int?, + @SerializedName("isExistSample") + val isExistSample: String?, + @SerializedName("labelBind") + val labelBind: String?, + @SerializedName("manufacturer") + val manufacturer: String?, + @SerializedName("manufacturerCountry") + val manufacturerCountry: String?, + @SerializedName("manufacturingDate") + val manufacturingDate: String?, + @SerializedName("manufacturingNo") + val manufacturingNo: String?, + @SerializedName("measureCategory") + val measureCategory: String?, + @SerializedName("measureCategoryName") + val measureCategoryName: String?, + @SerializedName("measureContent") + val measureContent: String?, + @SerializedName("measureLastTime") + val measureLastTime: String?, + @SerializedName("measurePeriod") + val measurePeriod: String?, + @SerializedName("measureType") + val measureType: String?, + @SerializedName("measureTypeName") + val measureTypeName: String?, + @SerializedName("minioFileName") + val minioFileName: String?, + @SerializedName("orderId") + val orderId: String?, + @SerializedName("phone") + val phone: String?, + @SerializedName("postalCode") + val postalCode: String?, + @SerializedName("powerVoltage") + val powerVoltage: String?, + @SerializedName("remark") + val remark: String?, + @SerializedName("sampleBelong") + val sampleBelong: String?, + @SerializedName("sampleBelongName") + val sampleBelongName: String?, + @SerializedName("sampleModel") + val sampleModel: String?, + @SerializedName("sampleName") + val sampleName: String?, + @SerializedName("sampleNo") + val sampleNo: String?, + @SerializedName("specialRequire") + val specialRequire: String?, + @SerializedName("updateTime") + val updateTime: String?, + @SerializedName("updateUser") + val updateUser: String?, + @SerializedName("validDeadline") + val validDeadline: String? + ) + + data class EquipmentInfo( + @SerializedName("abc") + val abc: String?, + @SerializedName("abcName") + val abcName: String?, + @SerializedName("applyRelationId") + val applyRelationId: String?, + @SerializedName("assetNo") + val assetNo: String?, + @SerializedName("assetSource") + val assetSource: String?, + @SerializedName("assetType") + val assetType: String?, + @SerializedName("assetTypeName") + val assetTypeName: String?, + @SerializedName("attribute") + val attribute: String?, + @SerializedName("capitalSource") + val capitalSource: String?, + @SerializedName("capitalSourceName") + val capitalSourceName: String?, + @SerializedName("cardEstablishmentDate") + val cardEstablishmentDate: String?, + @SerializedName("createTime") + val createTime: String?, + @SerializedName("createUser") + val createUser: String?, + @SerializedName("depreciationMethod") + val depreciationMethod: String?, + @SerializedName("depreciationMethodName") + val depreciationMethodName: String?, + @SerializedName("depreciationPeriod") + val depreciationPeriod: String?, + @SerializedName("enableDate") + val enableDate: String?, + @SerializedName("equipmentCategory") + val equipmentCategory: String?, + @SerializedName("equipmentCategoryName") + val equipmentCategoryName: String?, + @SerializedName("equipmentName") + val equipmentName: String?, + @SerializedName("equipmentNo") + val equipmentNo: String?, + @SerializedName("equipmentSpecifications") + val equipmentSpecifications: String?, + @SerializedName("equipmentType") + val equipmentType: String?, + @SerializedName("equipmentTypeName") + val equipmentTypeName: String?, + @SerializedName("fileList") + val fileList: String?, + @SerializedName("id") + val id: String?, + @SerializedName("installIncidentalExpenses") + val installIncidentalExpenses: String?, + @SerializedName("installPlace") + val installPlace: String?, + @SerializedName("intactState") + val intactState: String?, + @SerializedName("isCalibrationTestEquipment") + val isCalibrationTestEquipment: Int?, + @SerializedName("isDel") + val isDel: Int?, + @SerializedName("isFixedAssets") + val isFixedAssets: Int?, + @SerializedName("isMeasureAccount") + val isMeasureAccount: Int?, + @SerializedName("isStandardSupportEquipment") + val isStandardSupportEquipment: Int?, + @SerializedName("labelBind") + val labelBind: String?, + @SerializedName("majorCategory") + val majorCategory: String?, + @SerializedName("majorCategoryName") + val majorCategoryName: String?, + @SerializedName("managerLevel") + val managerLevel: String?, + @SerializedName("managerLevelName") + val managerLevelName: String?, + @SerializedName("managerState") + val managerState: String?, + @SerializedName("managerStateName") + val managerStateName: String?, + @SerializedName("manufacturer") + val manufacturer: String?, + @SerializedName("manufacturerCountry") + val manufacturerCountry: String?, + @SerializedName("manufacturingDate") + val manufacturingDate: String?, + @SerializedName("manufacturingNo") + val manufacturingNo: String?, + @SerializedName("mesureCycle") + val mesureCycle: Int?, + @SerializedName("mesureDate") + val mesureDate: String?, + @SerializedName("mesureDept") + val mesureDept: String?, + @SerializedName("mesureRange") + val mesureRange: String?, + @SerializedName("mesureResult") + val mesureResult: String?, + @SerializedName("mesureResultName") + val mesureResultName: String?, + @SerializedName("mesureType") + val mesureType: String?, + @SerializedName("mesureTypeName") + val mesureTypeName: String?, + @SerializedName("modelNo") + val modelNo: String?, + @SerializedName("originValue") + val originValue: String?, + @SerializedName("overallDimension") + val overallDimension: String?, + @SerializedName("presentOriginValue") + val presentOriginValue: String?, + @SerializedName("purpose") + val purpose: String?, + @SerializedName("remark") + val remark: String?, + @SerializedName("singlePrice") + val singlePrice: String?, + @SerializedName("supportStandardEquipmentName") + val supportStandardEquipmentName: String?, + @SerializedName("supportStandardEquipmentNo") + val supportStandardEquipmentNo: String?, + @SerializedName("technicalLevel") + val technicalLevel: String?, + @SerializedName("uncertainty") + val uncertainty: String?, + @SerializedName("updateTime") + val updateTime: String?, + @SerializedName("useDept") + val useDept: String?, + @SerializedName("useDeptName") + val useDeptName: String?, + @SerializedName("usePerson") + val usePerson: String?, + @SerializedName("usePersonName") + val usePersonName: String?, + @SerializedName("validDate") + val validDate: String?, + @SerializedName("version") + val version: Int?, + @SerializedName("weight") + val weight: String? + ) + + data class FileModel( + @SerializedName("approvalStatus") + val approvalStatus: String?, + @SerializedName("approvalStatusName") + val approvalStatusName: String?, + @SerializedName("createTime") + val createTime: String?, + @SerializedName("createUser") + val createUser: String?, + @SerializedName("createUserId") + val createUserId: String?, + @SerializedName("effectiveStatus") + val effectiveStatus: String?, + @SerializedName("effectiveStatusName") + val effectiveStatusName: String?, + @SerializedName("effectiveTime") + val effectiveTime: String?, + @SerializedName("fileCode") + val fileCode: String?, + @SerializedName("fileName") + val fileName: String?, + @SerializedName("fileNo") + val fileNo: String?, + @SerializedName("fileType") + val fileType: String?, + @SerializedName("fileTypeName") + val fileTypeName: String?, + @SerializedName("id") + val id: String?, + @SerializedName("isDel") + val isDel: Int?, + @SerializedName("minioFileName") + val minioFileName: String?, + @SerializedName("processId") + val processId: String?, + @SerializedName("publishTime") + val publishTime: String?, + @SerializedName("publisher") + val publisher: String?, + @SerializedName("remark") + val remark: String?, + @SerializedName("updateTime") + val updateTime: String? + ) + } + } +} \ No newline at end of file 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 index bad7697..b4a44b8 100644 --- 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 @@ -9,7 +9,7 @@ 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.model.kt.CertificateDetailModel import com.casic.xz.meterage.utils.LoadingDialogHub import com.casic.xz.meterage.vm.CertificateViewModel import com.gyf.immersionbar.ImmersionBar @@ -50,7 +50,7 @@ certificateViewModel.certificateDetail.observe(this) { if (it.code == 200) { - detailModel = it.data + detailModel = it.data!! fragmentPages.add(BasicInformationFragment(detailModel)) fragmentPages.add(ApprovalProcessFragment(args[3])) @@ -79,7 +79,7 @@ approvalView.setOnClickListener { if (approvalView.text == "提交") { - certificateViewModel.submit(detailModel.id) + certificateViewModel.submit(detailModel.id!!) } else if (approvalView.text == "审批") { //taskId navigatePageTo(args[2]) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/ApprovalProcessAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/ApprovalProcessAdapter.kt new file mode 100644 index 0000000..5b851d0 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/ApprovalProcessAdapter.kt @@ -0,0 +1,106 @@ +package com.casic.xz.meterage.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.ImageView +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.casic.xz.meterage.R +import com.casic.xz.meterage.model.ApprovalProcessModel +import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter +import com.pengxh.kt.lite.adapter.ViewHolder +import com.pengxh.kt.lite.extensions.toJson +import org.json.JSONObject + +class ApprovalProcessAdapter( + context: Context, + private val dataRows: List>, + private val lastRow: ApprovalProcessModel.DataModel +) : RecyclerView.Adapter() { + + private val kTag = "ApprovalProcessAdapter" + private var layoutInflater: LayoutInflater = LayoutInflater.from(context) + + override fun getItemCount(): Int = dataRows.size + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + layoutInflater.inflate(R.layout.item_approval_log_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val childRows = dataRows[position] + when (position) { + 0 -> { + holder.childRecyclerView.visibility = View.VISIBLE + + //最后一项 + holder.topLineView.visibility = View.INVISIBLE + holder.tagImageView.setImageResource(R.drawable.ic_dot_red) + + holder.childRecyclerView.adapter = object : + NormalRecyclerAdapter( + R.layout.item_approval_log_child_rv_l, childRows + ) { + override fun convertView( + viewHolder: ViewHolder, position: Int, item: ApprovalProcessModel.DataModel + ) { + val json = item.comment.toJson() + //{"comment":"同意","type":"1"} + val jsonObject = JSONObject(json) + viewHolder.setText(R.id.statusView, jsonObject.getString("comment")) + .setText(R.id.operatorNameView, item.assigneeName) + .setText(R.id.deptNameView, item.deptName) + .setText(R.id.operateTimeView, item.finishTime) + } + } + } + dataRows.size - 1 -> { + holder.childRecyclerView.visibility = View.GONE + holder.bottomLineView.visibility = View.INVISIBLE + holder.tagImageView.setImageResource(R.drawable.ic_dot_gray) + + holder.statusView.text = "新建" + holder.operatorNameView.text = lastRow.assigneeName + holder.deptNameView.text = lastRow.deptName + holder.operateTimeView.text = lastRow.finishTime + } + else -> { + holder.childRecyclerView.visibility = View.VISIBLE + + holder.tagImageView.setImageResource(R.drawable.ic_dot) + + holder.childRecyclerView.adapter = object : + NormalRecyclerAdapter( + R.layout.item_approval_log_child_rv_l, childRows + ) { + override fun convertView( + viewHolder: ViewHolder, position: Int, item: ApprovalProcessModel.DataModel + ) { + val json = item.comment.toJson() + //{"comment":"同意","type":"1"} + val jsonObject = JSONObject(json) + viewHolder.setText(R.id.statusView, jsonObject.getString("comment")) + .setText(R.id.operatorNameView, item.assigneeName) + .setText(R.id.deptNameView, item.deptName) + .setText(R.id.operateTimeView, item.finishTime) + } + } + } + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var childRecyclerView: RecyclerView = view.findViewById(R.id.childRecyclerView) + + var topLineView: View = view.findViewById(R.id.topLineView) + var tagImageView: ImageView = view.findViewById(R.id.tagImageView) + var bottomLineView: View = view.findViewById(R.id.bottomLineView) + var statusView: TextView = view.findViewById(R.id.statusView) + var operatorNameView: TextView = view.findViewById(R.id.operatorNameView) + var deptNameView: TextView = view.findViewById(R.id.deptNameView) + var operateTimeView: TextView = view.findViewById(R.id.operateTimeView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt index a75e566..45e3780 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -1,25 +1,39 @@ package com.casic.xz.meterage.fragment.certificate +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.ApprovalProcessAdapter +import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_certificate_approval_process.* -class ApprovalProcessFragment :KotlinBaseFragment(){ +class ApprovalProcessFragment(private val processId: String) : KotlinBaseFragment() { + + private lateinit var certificateViewModel: CertificateViewModel override fun initData() { - + certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] + certificateViewModel.getApprovalProcess(processId) + certificateViewModel.processResult.observe(this) { + if (it.code == 200) { + logRecyclerView.adapter = ApprovalProcessAdapter( + requireContext(), it.data, it.data.last().first() + ) + } + } } 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 index 5882c3d..bf851c0 100644 --- 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 @@ -2,47 +2,41 @@ 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.casic.xz.meterage.model.kt.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 + 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 + 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 + estimateServedTimeView.text = businessOriginal.businessOrder?.planDeliverTime + estimateCompleteTimeView.text = businessOriginal.businessOrder?.requireOverTime if (data.certificateReportFile.isNullOrBlank()) { reportFileView.text = "暂无附件" diff --git a/app/src/main/java/com/casic/xz/meterage/model/ApprovalProcessModel.java b/app/src/main/java/com/casic/xz/meterage/model/ApprovalProcessModel.java new file mode 100644 index 0000000..40b29e2 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/ApprovalProcessModel.java @@ -0,0 +1,157 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class ApprovalProcessModel { + + private int code; + private List> data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List> getData() { + return data; + } + + public void setData(List> data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private String approvalStatus; + private String assigneeId; + private String assigneeName; + private Object comment; + private String createTime; + private String deptId; + private String deptName; + private String duration; + private String finishTime; + private String taskId; + private String taskName; + + public String getApprovalStatus() { + return approvalStatus; + } + + public void setApprovalStatus(String approvalStatus) { + this.approvalStatus = approvalStatus; + } + + public String getAssigneeId() { + return assigneeId; + } + + public void setAssigneeId(String assigneeId) { + this.assigneeId = assigneeId; + } + + public String getAssigneeName() { + return assigneeName; + } + + public void setAssigneeName(String assigneeName) { + this.assigneeName = assigneeName; + } + + public Object getComment() { + return comment; + } + + public void setComment(Object comment) { + this.comment = comment; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getDeptId() { + return deptId; + } + + public void setDeptId(String deptId) { + this.deptId = deptId; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getDuration() { + return duration; + } + + public void setDuration(String duration) { + this.duration = duration; + } + + public String getFinishTime() { + return finishTime; + } + + public void setFinishTime(String finishTime) { + this.finishTime = finishTime; + } + + public String getTaskId() { + return taskId; + } + + public void setTaskId(String taskId) { + this.taskId = taskId; + } + + public String getTaskName() { + return taskName; + } + + public void setTaskName(String taskName) { + this.taskName = taskName; + } + + public static class CommentModel { + private String comment; + private String type; + + public String getComment() { + return comment; + } + + public void setComment(String comment) { + this.comment = comment; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + } + } +} \ 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 deleted file mode 100644 index 42efccd..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/CertificateDetailModel.java +++ /dev/null @@ -1,2080 +0,0 @@ -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/kt/CertificateDetailModel.kt b/app/src/main/java/com/casic/xz/meterage/model/kt/CertificateDetailModel.kt new file mode 100644 index 0000000..b2440b9 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/kt/CertificateDetailModel.kt @@ -0,0 +1,584 @@ +package com.casic.xz.meterage.model.kt + +import com.google.gson.annotations.SerializedName + +data class CertificateDetailModel( + @SerializedName("code") + val code: Int?, + @SerializedName("data") + val `data`: DataModel?, + @SerializedName("message") + val message: String? +) { + data class DataModel( + @SerializedName("approvalSignId") + val approvalSignId: String?, + @SerializedName("approvalSignName") + val approvalSignName: String?, + @SerializedName("approvalStatus") + val approvalStatus: String?, + @SerializedName("approvalStatusName") + val approvalStatusName: String?, + @SerializedName("businessOriginalRecord") + val businessOriginalRecord: BusinessOriginalRecord?, + @SerializedName("calibrationMajor") + val calibrationMajor: String?, + @SerializedName("calibrationMajorName") + val calibrationMajorName: String?, + @SerializedName("certificateReportCategory") + val certificateReportCategory: String?, + @SerializedName("certificateReportCode") + val certificateReportCode: String?, + @SerializedName("certificateReportFile") + val certificateReportFile: String?, + @SerializedName("certificateReportName") + val certificateReportName: String?, + @SerializedName("certificateReportType") + val certificateReportType: String?, + @SerializedName("certificateReportTypeName") + val certificateReportTypeName: String?, + @SerializedName("createTime") + val createTime: String?, + @SerializedName("createUser") + val createUser: String?, + @SerializedName("expirationDate") + val expirationDate: String?, + @SerializedName("id") + val id: String?, + @SerializedName("isDel") + val isDel: Boolean?, + @SerializedName("issuanceDate") + val issuanceDate: String?, + @SerializedName("measureDeptId") + val measureDeptId: String?, + @SerializedName("measurePersonId") + val measurePersonId: String?, + @SerializedName("measureResult") + val measureResult: String?, + @SerializedName("orderId") + val orderId: String?, + @SerializedName("originalRecordId") + val originalRecordId: String?, + @SerializedName("printApprovalStatus") + val printApprovalStatus: String?, + @SerializedName("printNum") + val printNum: Int?, + @SerializedName("printStatus") + val printStatus: String?, + @SerializedName("processId") + val processId: String?, + @SerializedName("remark") + val remark: String?, + @SerializedName("sampleId") + val sampleId: String?, + @SerializedName("signId") + val signId: String?, + @SerializedName("signName") + val signName: String?, + @SerializedName("submitDate") + val submitDate: String?, + @SerializedName("templateId") + val templateId: String?, + @SerializedName("templateName") + val templateName: String?, + @SerializedName("updateTime") + val updateTime: String? + ) { + data class BusinessOriginalRecord( + @SerializedName("businessEnvironmentRecord") + val businessEnvironmentRecord: BusinessEnvironmentRecord?, + @SerializedName("businessOrder") + val businessOrder: BusinessOrder?, + @SerializedName("calibrationPlace") + val calibrationPlace: String?, + @SerializedName("calibrationTime") + val calibrationTime: String?, + @SerializedName("createTime") + val createTime: String?, + @SerializedName("createUser") + val createUser: String?, + @SerializedName("createUserName") + val createUserName: String?, + @SerializedName("customerSampleInfo") + val customerSampleInfo: CustomerSampleInfo?, + @SerializedName("environmentId") + val environmentId: String?, + @SerializedName("equipmentInfoList") + val equipmentInfoList: List?, + @SerializedName("fileList") + val fileList: List?, + @SerializedName("id") + val id: String?, + @SerializedName("isDel") + val isDel: Boolean?, + @SerializedName("measureCategory") + val measureCategory: String?, + @SerializedName("measureCategoryName") + val measureCategoryName: String?, + @SerializedName("orderId") + val orderId: String?, + @SerializedName("originalRecordCode") + val originalRecordCode: String?, + @SerializedName("originalRecordFile") + val originalRecordFile: String?, + @SerializedName("originalRecordName") + val originalRecordName: String?, + @SerializedName("remark") + val remark: String?, + @SerializedName("sampleId") + val sampleId: String?, + @SerializedName("templateId") + val templateId: String?, + @SerializedName("templateName") + val templateName: String?, + @SerializedName("updateTime") + val updateTime: String? + ) { + data class BusinessEnvironmentRecord( + @SerializedName("createTime") + val createTime: String?, + @SerializedName("createUser") + val createUser: String?, + @SerializedName("environmentCode") + val environmentCode: String?, + @SerializedName("humidity") + val humidity: String?, + @SerializedName("id") + val id: String?, + @SerializedName("isDel") + val isDel: Boolean?, + @SerializedName("outputVoltage") + val outputVoltage: String?, + @SerializedName("recordTime") + val recordTime: String?, + @SerializedName("recorder") + val recorder: String?, + @SerializedName("remark") + val remark: String?, + @SerializedName("roomNumber") + val roomNumber: String?, + @SerializedName("temperature") + val temperature: String?, + @SerializedName("updateTime") + val updateTime: String?, + @SerializedName("zeroGroundVoltage") + val zeroGroundVoltage: String? + ) + + data class BusinessOrder( + @SerializedName("certifications") + val certifications: String?, + @SerializedName("createTime") + val createTime: String?, + @SerializedName("createUser") + val createUser: String?, + @SerializedName("customerAddress") + val customerAddress: String?, + @SerializedName("customerId") + val customerId: String?, + @SerializedName("customerName") + val customerName: String?, + @SerializedName("customerNo") + val customerNo: String?, + @SerializedName("customerPhone") + val customerPhone: String?, + @SerializedName("customerSampleInfoList") + val customerSampleInfoList: List?, + @SerializedName("deliverTime") + val deliverTime: String?, + @SerializedName("deliverer") + val deliverer: String?, + @SerializedName("delivererId") + val delivererId: String?, + @SerializedName("delivererTel") + val delivererTel: String?, + @SerializedName("id") + val id: String?, + @SerializedName("isDel") + val isDel: Int?, + @SerializedName("isUrgent") + val isUrgent: Int?, + @SerializedName("minioFileName") + val minioFileName: String?, + @SerializedName("orderCode") + val orderCode: String?, + @SerializedName("orderTime") + val orderTime: String?, + @SerializedName("planDeliverTime") + val planDeliverTime: String?, + @SerializedName("remark") + val remark: String?, + @SerializedName("requireOverTime") + val requireOverTime: String?, + @SerializedName("status") + val status: String?, + @SerializedName("updateTime") + val updateTime: String?, + @SerializedName("updateUser") + val updateUser: String? + ) { + data class CustomerSampleInfo( + @SerializedName("abc") + val abc: String?, + @SerializedName("appendix") + val appendix: String?, + @SerializedName("appendixDescn") + val appendixDescn: String?, + @SerializedName("createTime") + val createTime: String?, + @SerializedName("createUser") + val createUser: String?, + @SerializedName("customerAddress") + val customerAddress: String?, + @SerializedName("customerId") + val customerId: String?, + @SerializedName("customerName") + val customerName: String?, + @SerializedName("customerNo") + val customerNo: String?, + @SerializedName("deliverer") + val deliverer: String?, + @SerializedName("delivererTel") + val delivererTel: String?, + @SerializedName("id") + val id: String?, + @SerializedName("isDel") + val isDel: Int?, + @SerializedName("isExistSample") + val isExistSample: String?, + @SerializedName("labelBind") + val labelBind: String?, + @SerializedName("manufacturer") + val manufacturer: String?, + @SerializedName("manufacturerCountry") + val manufacturerCountry: String?, + @SerializedName("manufacturingDate") + val manufacturingDate: String?, + @SerializedName("manufacturingNo") + val manufacturingNo: String?, + @SerializedName("measureCategory") + val measureCategory: String?, + @SerializedName("measureCategoryName") + val measureCategoryName: String?, + @SerializedName("measureContent") + val measureContent: String?, + @SerializedName("measureLastTime") + val measureLastTime: String?, + @SerializedName("measurePeriod") + val measurePeriod: String?, + @SerializedName("measureType") + val measureType: String?, + @SerializedName("measureTypeName") + val measureTypeName: String?, + @SerializedName("minioFileName") + val minioFileName: String?, + @SerializedName("orderId") + val orderId: String?, + @SerializedName("phone") + val phone: String?, + @SerializedName("postalCode") + val postalCode: String?, + @SerializedName("powerVoltage") + val powerVoltage: String?, + @SerializedName("remark") + val remark: String?, + @SerializedName("sampleBelong") + val sampleBelong: String?, + @SerializedName("sampleBelongName") + val sampleBelongName: String?, + @SerializedName("sampleModel") + val sampleModel: String?, + @SerializedName("sampleName") + val sampleName: String?, + @SerializedName("sampleNo") + val sampleNo: String?, + @SerializedName("specialRequire") + val specialRequire: String?, + @SerializedName("updateTime") + val updateTime: String?, + @SerializedName("updateUser") + val updateUser: String?, + @SerializedName("validDeadline") + val validDeadline: String? + ) + } + + data class CustomerSampleInfo( + @SerializedName("abc") + val abc: String?, + @SerializedName("appendix") + val appendix: String?, + @SerializedName("appendixDescn") + val appendixDescn: String?, + @SerializedName("createTime") + val createTime: String?, + @SerializedName("createUser") + val createUser: String?, + @SerializedName("customerAddress") + val customerAddress: String?, + @SerializedName("customerId") + val customerId: String?, + @SerializedName("customerName") + val customerName: String?, + @SerializedName("customerNo") + val customerNo: String?, + @SerializedName("deliverer") + val deliverer: String?, + @SerializedName("delivererTel") + val delivererTel: String?, + @SerializedName("id") + val id: String?, + @SerializedName("isDel") + val isDel: Int?, + @SerializedName("isExistSample") + val isExistSample: String?, + @SerializedName("labelBind") + val labelBind: String?, + @SerializedName("manufacturer") + val manufacturer: String?, + @SerializedName("manufacturerCountry") + val manufacturerCountry: String?, + @SerializedName("manufacturingDate") + val manufacturingDate: String?, + @SerializedName("manufacturingNo") + val manufacturingNo: String?, + @SerializedName("measureCategory") + val measureCategory: String?, + @SerializedName("measureCategoryName") + val measureCategoryName: String?, + @SerializedName("measureContent") + val measureContent: String?, + @SerializedName("measureLastTime") + val measureLastTime: String?, + @SerializedName("measurePeriod") + val measurePeriod: String?, + @SerializedName("measureType") + val measureType: String?, + @SerializedName("measureTypeName") + val measureTypeName: String?, + @SerializedName("minioFileName") + val minioFileName: String?, + @SerializedName("orderId") + val orderId: String?, + @SerializedName("phone") + val phone: String?, + @SerializedName("postalCode") + val postalCode: String?, + @SerializedName("powerVoltage") + val powerVoltage: String?, + @SerializedName("remark") + val remark: String?, + @SerializedName("sampleBelong") + val sampleBelong: String?, + @SerializedName("sampleBelongName") + val sampleBelongName: String?, + @SerializedName("sampleModel") + val sampleModel: String?, + @SerializedName("sampleName") + val sampleName: String?, + @SerializedName("sampleNo") + val sampleNo: String?, + @SerializedName("specialRequire") + val specialRequire: String?, + @SerializedName("updateTime") + val updateTime: String?, + @SerializedName("updateUser") + val updateUser: String?, + @SerializedName("validDeadline") + val validDeadline: String? + ) + + data class EquipmentInfo( + @SerializedName("abc") + val abc: String?, + @SerializedName("abcName") + val abcName: String?, + @SerializedName("applyRelationId") + val applyRelationId: String?, + @SerializedName("assetNo") + val assetNo: String?, + @SerializedName("assetSource") + val assetSource: String?, + @SerializedName("assetType") + val assetType: String?, + @SerializedName("assetTypeName") + val assetTypeName: String?, + @SerializedName("attribute") + val attribute: String?, + @SerializedName("capitalSource") + val capitalSource: String?, + @SerializedName("capitalSourceName") + val capitalSourceName: String?, + @SerializedName("cardEstablishmentDate") + val cardEstablishmentDate: String?, + @SerializedName("createTime") + val createTime: String?, + @SerializedName("createUser") + val createUser: String?, + @SerializedName("depreciationMethod") + val depreciationMethod: String?, + @SerializedName("depreciationMethodName") + val depreciationMethodName: String?, + @SerializedName("depreciationPeriod") + val depreciationPeriod: String?, + @SerializedName("enableDate") + val enableDate: String?, + @SerializedName("equipmentCategory") + val equipmentCategory: String?, + @SerializedName("equipmentCategoryName") + val equipmentCategoryName: String?, + @SerializedName("equipmentName") + val equipmentName: String?, + @SerializedName("equipmentNo") + val equipmentNo: String?, + @SerializedName("equipmentSpecifications") + val equipmentSpecifications: String?, + @SerializedName("equipmentType") + val equipmentType: String?, + @SerializedName("equipmentTypeName") + val equipmentTypeName: String?, + @SerializedName("fileList") + val fileList: String?, + @SerializedName("id") + val id: String?, + @SerializedName("installIncidentalExpenses") + val installIncidentalExpenses: String?, + @SerializedName("installPlace") + val installPlace: String?, + @SerializedName("intactState") + val intactState: String?, + @SerializedName("isCalibrationTestEquipment") + val isCalibrationTestEquipment: Int?, + @SerializedName("isDel") + val isDel: Int?, + @SerializedName("isFixedAssets") + val isFixedAssets: Int?, + @SerializedName("isMeasureAccount") + val isMeasureAccount: Int?, + @SerializedName("isStandardSupportEquipment") + val isStandardSupportEquipment: Int?, + @SerializedName("labelBind") + val labelBind: String?, + @SerializedName("majorCategory") + val majorCategory: String?, + @SerializedName("majorCategoryName") + val majorCategoryName: String?, + @SerializedName("managerLevel") + val managerLevel: String?, + @SerializedName("managerLevelName") + val managerLevelName: String?, + @SerializedName("managerState") + val managerState: String?, + @SerializedName("managerStateName") + val managerStateName: String?, + @SerializedName("manufacturer") + val manufacturer: String?, + @SerializedName("manufacturerCountry") + val manufacturerCountry: String?, + @SerializedName("manufacturingDate") + val manufacturingDate: String?, + @SerializedName("manufacturingNo") + val manufacturingNo: String?, + @SerializedName("mesureCycle") + val mesureCycle: Int?, + @SerializedName("mesureDate") + val mesureDate: String?, + @SerializedName("mesureDept") + val mesureDept: String?, + @SerializedName("mesureRange") + val mesureRange: String?, + @SerializedName("mesureResult") + val mesureResult: String?, + @SerializedName("mesureResultName") + val mesureResultName: String?, + @SerializedName("mesureType") + val mesureType: String?, + @SerializedName("mesureTypeName") + val mesureTypeName: String?, + @SerializedName("modelNo") + val modelNo: String?, + @SerializedName("originValue") + val originValue: String?, + @SerializedName("overallDimension") + val overallDimension: String?, + @SerializedName("presentOriginValue") + val presentOriginValue: String?, + @SerializedName("purpose") + val purpose: String?, + @SerializedName("remark") + val remark: String?, + @SerializedName("singlePrice") + val singlePrice: String?, + @SerializedName("supportStandardEquipmentName") + val supportStandardEquipmentName: String?, + @SerializedName("supportStandardEquipmentNo") + val supportStandardEquipmentNo: String?, + @SerializedName("technicalLevel") + val technicalLevel: String?, + @SerializedName("uncertainty") + val uncertainty: String?, + @SerializedName("updateTime") + val updateTime: String?, + @SerializedName("useDept") + val useDept: String?, + @SerializedName("useDeptName") + val useDeptName: String?, + @SerializedName("usePerson") + val usePerson: String?, + @SerializedName("usePersonName") + val usePersonName: String?, + @SerializedName("validDate") + val validDate: String?, + @SerializedName("version") + val version: Int?, + @SerializedName("weight") + val weight: String? + ) + + data class FileModel( + @SerializedName("approvalStatus") + val approvalStatus: String?, + @SerializedName("approvalStatusName") + val approvalStatusName: String?, + @SerializedName("createTime") + val createTime: String?, + @SerializedName("createUser") + val createUser: String?, + @SerializedName("createUserId") + val createUserId: String?, + @SerializedName("effectiveStatus") + val effectiveStatus: String?, + @SerializedName("effectiveStatusName") + val effectiveStatusName: String?, + @SerializedName("effectiveTime") + val effectiveTime: String?, + @SerializedName("fileCode") + val fileCode: String?, + @SerializedName("fileName") + val fileName: String?, + @SerializedName("fileNo") + val fileNo: String?, + @SerializedName("fileType") + val fileType: String?, + @SerializedName("fileTypeName") + val fileTypeName: String?, + @SerializedName("id") + val id: String?, + @SerializedName("isDel") + val isDel: Int?, + @SerializedName("minioFileName") + val minioFileName: String?, + @SerializedName("processId") + val processId: String?, + @SerializedName("publishTime") + val publishTime: String?, + @SerializedName("publisher") + val publisher: String?, + @SerializedName("remark") + val remark: String?, + @SerializedName("updateTime") + val updateTime: String? + ) + } + } +} \ No newline at end of file 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 index bad7697..b4a44b8 100644 --- 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 @@ -9,7 +9,7 @@ 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.model.kt.CertificateDetailModel import com.casic.xz.meterage.utils.LoadingDialogHub import com.casic.xz.meterage.vm.CertificateViewModel import com.gyf.immersionbar.ImmersionBar @@ -50,7 +50,7 @@ certificateViewModel.certificateDetail.observe(this) { if (it.code == 200) { - detailModel = it.data + detailModel = it.data!! fragmentPages.add(BasicInformationFragment(detailModel)) fragmentPages.add(ApprovalProcessFragment(args[3])) @@ -79,7 +79,7 @@ approvalView.setOnClickListener { if (approvalView.text == "提交") { - certificateViewModel.submit(detailModel.id) + certificateViewModel.submit(detailModel.id!!) } else if (approvalView.text == "审批") { //taskId navigatePageTo(args[2]) 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 1607533..438637c 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 @@ -6,8 +6,8 @@ import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.ActionResultModel import com.casic.xz.meterage.model.ApprovalProcessModel -import com.casic.xz.meterage.model.CertificateDetailModel import com.casic.xz.meterage.model.CertificateListModel +import com.casic.xz.meterage.model.kt.CertificateDetailModel import com.casic.xz.meterage.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/ApprovalProcessAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/ApprovalProcessAdapter.kt new file mode 100644 index 0000000..5b851d0 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/ApprovalProcessAdapter.kt @@ -0,0 +1,106 @@ +package com.casic.xz.meterage.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.ImageView +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.casic.xz.meterage.R +import com.casic.xz.meterage.model.ApprovalProcessModel +import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter +import com.pengxh.kt.lite.adapter.ViewHolder +import com.pengxh.kt.lite.extensions.toJson +import org.json.JSONObject + +class ApprovalProcessAdapter( + context: Context, + private val dataRows: List>, + private val lastRow: ApprovalProcessModel.DataModel +) : RecyclerView.Adapter() { + + private val kTag = "ApprovalProcessAdapter" + private var layoutInflater: LayoutInflater = LayoutInflater.from(context) + + override fun getItemCount(): Int = dataRows.size + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + layoutInflater.inflate(R.layout.item_approval_log_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val childRows = dataRows[position] + when (position) { + 0 -> { + holder.childRecyclerView.visibility = View.VISIBLE + + //最后一项 + holder.topLineView.visibility = View.INVISIBLE + holder.tagImageView.setImageResource(R.drawable.ic_dot_red) + + holder.childRecyclerView.adapter = object : + NormalRecyclerAdapter( + R.layout.item_approval_log_child_rv_l, childRows + ) { + override fun convertView( + viewHolder: ViewHolder, position: Int, item: ApprovalProcessModel.DataModel + ) { + val json = item.comment.toJson() + //{"comment":"同意","type":"1"} + val jsonObject = JSONObject(json) + viewHolder.setText(R.id.statusView, jsonObject.getString("comment")) + .setText(R.id.operatorNameView, item.assigneeName) + .setText(R.id.deptNameView, item.deptName) + .setText(R.id.operateTimeView, item.finishTime) + } + } + } + dataRows.size - 1 -> { + holder.childRecyclerView.visibility = View.GONE + holder.bottomLineView.visibility = View.INVISIBLE + holder.tagImageView.setImageResource(R.drawable.ic_dot_gray) + + holder.statusView.text = "新建" + holder.operatorNameView.text = lastRow.assigneeName + holder.deptNameView.text = lastRow.deptName + holder.operateTimeView.text = lastRow.finishTime + } + else -> { + holder.childRecyclerView.visibility = View.VISIBLE + + holder.tagImageView.setImageResource(R.drawable.ic_dot) + + holder.childRecyclerView.adapter = object : + NormalRecyclerAdapter( + R.layout.item_approval_log_child_rv_l, childRows + ) { + override fun convertView( + viewHolder: ViewHolder, position: Int, item: ApprovalProcessModel.DataModel + ) { + val json = item.comment.toJson() + //{"comment":"同意","type":"1"} + val jsonObject = JSONObject(json) + viewHolder.setText(R.id.statusView, jsonObject.getString("comment")) + .setText(R.id.operatorNameView, item.assigneeName) + .setText(R.id.deptNameView, item.deptName) + .setText(R.id.operateTimeView, item.finishTime) + } + } + } + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var childRecyclerView: RecyclerView = view.findViewById(R.id.childRecyclerView) + + var topLineView: View = view.findViewById(R.id.topLineView) + var tagImageView: ImageView = view.findViewById(R.id.tagImageView) + var bottomLineView: View = view.findViewById(R.id.bottomLineView) + var statusView: TextView = view.findViewById(R.id.statusView) + var operatorNameView: TextView = view.findViewById(R.id.operatorNameView) + var deptNameView: TextView = view.findViewById(R.id.deptNameView) + var operateTimeView: TextView = view.findViewById(R.id.operateTimeView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt index a75e566..45e3780 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -1,25 +1,39 @@ package com.casic.xz.meterage.fragment.certificate +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.ApprovalProcessAdapter +import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_certificate_approval_process.* -class ApprovalProcessFragment :KotlinBaseFragment(){ +class ApprovalProcessFragment(private val processId: String) : KotlinBaseFragment() { + + private lateinit var certificateViewModel: CertificateViewModel override fun initData() { - + certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] + certificateViewModel.getApprovalProcess(processId) + certificateViewModel.processResult.observe(this) { + if (it.code == 200) { + logRecyclerView.adapter = ApprovalProcessAdapter( + requireContext(), it.data, it.data.last().first() + ) + } + } } 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 index 5882c3d..bf851c0 100644 --- 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 @@ -2,47 +2,41 @@ 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.casic.xz.meterage.model.kt.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 + 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 + 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 + estimateServedTimeView.text = businessOriginal.businessOrder?.planDeliverTime + estimateCompleteTimeView.text = businessOriginal.businessOrder?.requireOverTime if (data.certificateReportFile.isNullOrBlank()) { reportFileView.text = "暂无附件" diff --git a/app/src/main/java/com/casic/xz/meterage/model/ApprovalProcessModel.java b/app/src/main/java/com/casic/xz/meterage/model/ApprovalProcessModel.java new file mode 100644 index 0000000..40b29e2 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/ApprovalProcessModel.java @@ -0,0 +1,157 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class ApprovalProcessModel { + + private int code; + private List> data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List> getData() { + return data; + } + + public void setData(List> data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private String approvalStatus; + private String assigneeId; + private String assigneeName; + private Object comment; + private String createTime; + private String deptId; + private String deptName; + private String duration; + private String finishTime; + private String taskId; + private String taskName; + + public String getApprovalStatus() { + return approvalStatus; + } + + public void setApprovalStatus(String approvalStatus) { + this.approvalStatus = approvalStatus; + } + + public String getAssigneeId() { + return assigneeId; + } + + public void setAssigneeId(String assigneeId) { + this.assigneeId = assigneeId; + } + + public String getAssigneeName() { + return assigneeName; + } + + public void setAssigneeName(String assigneeName) { + this.assigneeName = assigneeName; + } + + public Object getComment() { + return comment; + } + + public void setComment(Object comment) { + this.comment = comment; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getDeptId() { + return deptId; + } + + public void setDeptId(String deptId) { + this.deptId = deptId; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getDuration() { + return duration; + } + + public void setDuration(String duration) { + this.duration = duration; + } + + public String getFinishTime() { + return finishTime; + } + + public void setFinishTime(String finishTime) { + this.finishTime = finishTime; + } + + public String getTaskId() { + return taskId; + } + + public void setTaskId(String taskId) { + this.taskId = taskId; + } + + public String getTaskName() { + return taskName; + } + + public void setTaskName(String taskName) { + this.taskName = taskName; + } + + public static class CommentModel { + private String comment; + private String type; + + public String getComment() { + return comment; + } + + public void setComment(String comment) { + this.comment = comment; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + } + } +} \ 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 deleted file mode 100644 index 42efccd..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/CertificateDetailModel.java +++ /dev/null @@ -1,2080 +0,0 @@ -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/kt/CertificateDetailModel.kt b/app/src/main/java/com/casic/xz/meterage/model/kt/CertificateDetailModel.kt new file mode 100644 index 0000000..b2440b9 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/kt/CertificateDetailModel.kt @@ -0,0 +1,584 @@ +package com.casic.xz.meterage.model.kt + +import com.google.gson.annotations.SerializedName + +data class CertificateDetailModel( + @SerializedName("code") + val code: Int?, + @SerializedName("data") + val `data`: DataModel?, + @SerializedName("message") + val message: String? +) { + data class DataModel( + @SerializedName("approvalSignId") + val approvalSignId: String?, + @SerializedName("approvalSignName") + val approvalSignName: String?, + @SerializedName("approvalStatus") + val approvalStatus: String?, + @SerializedName("approvalStatusName") + val approvalStatusName: String?, + @SerializedName("businessOriginalRecord") + val businessOriginalRecord: BusinessOriginalRecord?, + @SerializedName("calibrationMajor") + val calibrationMajor: String?, + @SerializedName("calibrationMajorName") + val calibrationMajorName: String?, + @SerializedName("certificateReportCategory") + val certificateReportCategory: String?, + @SerializedName("certificateReportCode") + val certificateReportCode: String?, + @SerializedName("certificateReportFile") + val certificateReportFile: String?, + @SerializedName("certificateReportName") + val certificateReportName: String?, + @SerializedName("certificateReportType") + val certificateReportType: String?, + @SerializedName("certificateReportTypeName") + val certificateReportTypeName: String?, + @SerializedName("createTime") + val createTime: String?, + @SerializedName("createUser") + val createUser: String?, + @SerializedName("expirationDate") + val expirationDate: String?, + @SerializedName("id") + val id: String?, + @SerializedName("isDel") + val isDel: Boolean?, + @SerializedName("issuanceDate") + val issuanceDate: String?, + @SerializedName("measureDeptId") + val measureDeptId: String?, + @SerializedName("measurePersonId") + val measurePersonId: String?, + @SerializedName("measureResult") + val measureResult: String?, + @SerializedName("orderId") + val orderId: String?, + @SerializedName("originalRecordId") + val originalRecordId: String?, + @SerializedName("printApprovalStatus") + val printApprovalStatus: String?, + @SerializedName("printNum") + val printNum: Int?, + @SerializedName("printStatus") + val printStatus: String?, + @SerializedName("processId") + val processId: String?, + @SerializedName("remark") + val remark: String?, + @SerializedName("sampleId") + val sampleId: String?, + @SerializedName("signId") + val signId: String?, + @SerializedName("signName") + val signName: String?, + @SerializedName("submitDate") + val submitDate: String?, + @SerializedName("templateId") + val templateId: String?, + @SerializedName("templateName") + val templateName: String?, + @SerializedName("updateTime") + val updateTime: String? + ) { + data class BusinessOriginalRecord( + @SerializedName("businessEnvironmentRecord") + val businessEnvironmentRecord: BusinessEnvironmentRecord?, + @SerializedName("businessOrder") + val businessOrder: BusinessOrder?, + @SerializedName("calibrationPlace") + val calibrationPlace: String?, + @SerializedName("calibrationTime") + val calibrationTime: String?, + @SerializedName("createTime") + val createTime: String?, + @SerializedName("createUser") + val createUser: String?, + @SerializedName("createUserName") + val createUserName: String?, + @SerializedName("customerSampleInfo") + val customerSampleInfo: CustomerSampleInfo?, + @SerializedName("environmentId") + val environmentId: String?, + @SerializedName("equipmentInfoList") + val equipmentInfoList: List?, + @SerializedName("fileList") + val fileList: List?, + @SerializedName("id") + val id: String?, + @SerializedName("isDel") + val isDel: Boolean?, + @SerializedName("measureCategory") + val measureCategory: String?, + @SerializedName("measureCategoryName") + val measureCategoryName: String?, + @SerializedName("orderId") + val orderId: String?, + @SerializedName("originalRecordCode") + val originalRecordCode: String?, + @SerializedName("originalRecordFile") + val originalRecordFile: String?, + @SerializedName("originalRecordName") + val originalRecordName: String?, + @SerializedName("remark") + val remark: String?, + @SerializedName("sampleId") + val sampleId: String?, + @SerializedName("templateId") + val templateId: String?, + @SerializedName("templateName") + val templateName: String?, + @SerializedName("updateTime") + val updateTime: String? + ) { + data class BusinessEnvironmentRecord( + @SerializedName("createTime") + val createTime: String?, + @SerializedName("createUser") + val createUser: String?, + @SerializedName("environmentCode") + val environmentCode: String?, + @SerializedName("humidity") + val humidity: String?, + @SerializedName("id") + val id: String?, + @SerializedName("isDel") + val isDel: Boolean?, + @SerializedName("outputVoltage") + val outputVoltage: String?, + @SerializedName("recordTime") + val recordTime: String?, + @SerializedName("recorder") + val recorder: String?, + @SerializedName("remark") + val remark: String?, + @SerializedName("roomNumber") + val roomNumber: String?, + @SerializedName("temperature") + val temperature: String?, + @SerializedName("updateTime") + val updateTime: String?, + @SerializedName("zeroGroundVoltage") + val zeroGroundVoltage: String? + ) + + data class BusinessOrder( + @SerializedName("certifications") + val certifications: String?, + @SerializedName("createTime") + val createTime: String?, + @SerializedName("createUser") + val createUser: String?, + @SerializedName("customerAddress") + val customerAddress: String?, + @SerializedName("customerId") + val customerId: String?, + @SerializedName("customerName") + val customerName: String?, + @SerializedName("customerNo") + val customerNo: String?, + @SerializedName("customerPhone") + val customerPhone: String?, + @SerializedName("customerSampleInfoList") + val customerSampleInfoList: List?, + @SerializedName("deliverTime") + val deliverTime: String?, + @SerializedName("deliverer") + val deliverer: String?, + @SerializedName("delivererId") + val delivererId: String?, + @SerializedName("delivererTel") + val delivererTel: String?, + @SerializedName("id") + val id: String?, + @SerializedName("isDel") + val isDel: Int?, + @SerializedName("isUrgent") + val isUrgent: Int?, + @SerializedName("minioFileName") + val minioFileName: String?, + @SerializedName("orderCode") + val orderCode: String?, + @SerializedName("orderTime") + val orderTime: String?, + @SerializedName("planDeliverTime") + val planDeliverTime: String?, + @SerializedName("remark") + val remark: String?, + @SerializedName("requireOverTime") + val requireOverTime: String?, + @SerializedName("status") + val status: String?, + @SerializedName("updateTime") + val updateTime: String?, + @SerializedName("updateUser") + val updateUser: String? + ) { + data class CustomerSampleInfo( + @SerializedName("abc") + val abc: String?, + @SerializedName("appendix") + val appendix: String?, + @SerializedName("appendixDescn") + val appendixDescn: String?, + @SerializedName("createTime") + val createTime: String?, + @SerializedName("createUser") + val createUser: String?, + @SerializedName("customerAddress") + val customerAddress: String?, + @SerializedName("customerId") + val customerId: String?, + @SerializedName("customerName") + val customerName: String?, + @SerializedName("customerNo") + val customerNo: String?, + @SerializedName("deliverer") + val deliverer: String?, + @SerializedName("delivererTel") + val delivererTel: String?, + @SerializedName("id") + val id: String?, + @SerializedName("isDel") + val isDel: Int?, + @SerializedName("isExistSample") + val isExistSample: String?, + @SerializedName("labelBind") + val labelBind: String?, + @SerializedName("manufacturer") + val manufacturer: String?, + @SerializedName("manufacturerCountry") + val manufacturerCountry: String?, + @SerializedName("manufacturingDate") + val manufacturingDate: String?, + @SerializedName("manufacturingNo") + val manufacturingNo: String?, + @SerializedName("measureCategory") + val measureCategory: String?, + @SerializedName("measureCategoryName") + val measureCategoryName: String?, + @SerializedName("measureContent") + val measureContent: String?, + @SerializedName("measureLastTime") + val measureLastTime: String?, + @SerializedName("measurePeriod") + val measurePeriod: String?, + @SerializedName("measureType") + val measureType: String?, + @SerializedName("measureTypeName") + val measureTypeName: String?, + @SerializedName("minioFileName") + val minioFileName: String?, + @SerializedName("orderId") + val orderId: String?, + @SerializedName("phone") + val phone: String?, + @SerializedName("postalCode") + val postalCode: String?, + @SerializedName("powerVoltage") + val powerVoltage: String?, + @SerializedName("remark") + val remark: String?, + @SerializedName("sampleBelong") + val sampleBelong: String?, + @SerializedName("sampleBelongName") + val sampleBelongName: String?, + @SerializedName("sampleModel") + val sampleModel: String?, + @SerializedName("sampleName") + val sampleName: String?, + @SerializedName("sampleNo") + val sampleNo: String?, + @SerializedName("specialRequire") + val specialRequire: String?, + @SerializedName("updateTime") + val updateTime: String?, + @SerializedName("updateUser") + val updateUser: String?, + @SerializedName("validDeadline") + val validDeadline: String? + ) + } + + data class CustomerSampleInfo( + @SerializedName("abc") + val abc: String?, + @SerializedName("appendix") + val appendix: String?, + @SerializedName("appendixDescn") + val appendixDescn: String?, + @SerializedName("createTime") + val createTime: String?, + @SerializedName("createUser") + val createUser: String?, + @SerializedName("customerAddress") + val customerAddress: String?, + @SerializedName("customerId") + val customerId: String?, + @SerializedName("customerName") + val customerName: String?, + @SerializedName("customerNo") + val customerNo: String?, + @SerializedName("deliverer") + val deliverer: String?, + @SerializedName("delivererTel") + val delivererTel: String?, + @SerializedName("id") + val id: String?, + @SerializedName("isDel") + val isDel: Int?, + @SerializedName("isExistSample") + val isExistSample: String?, + @SerializedName("labelBind") + val labelBind: String?, + @SerializedName("manufacturer") + val manufacturer: String?, + @SerializedName("manufacturerCountry") + val manufacturerCountry: String?, + @SerializedName("manufacturingDate") + val manufacturingDate: String?, + @SerializedName("manufacturingNo") + val manufacturingNo: String?, + @SerializedName("measureCategory") + val measureCategory: String?, + @SerializedName("measureCategoryName") + val measureCategoryName: String?, + @SerializedName("measureContent") + val measureContent: String?, + @SerializedName("measureLastTime") + val measureLastTime: String?, + @SerializedName("measurePeriod") + val measurePeriod: String?, + @SerializedName("measureType") + val measureType: String?, + @SerializedName("measureTypeName") + val measureTypeName: String?, + @SerializedName("minioFileName") + val minioFileName: String?, + @SerializedName("orderId") + val orderId: String?, + @SerializedName("phone") + val phone: String?, + @SerializedName("postalCode") + val postalCode: String?, + @SerializedName("powerVoltage") + val powerVoltage: String?, + @SerializedName("remark") + val remark: String?, + @SerializedName("sampleBelong") + val sampleBelong: String?, + @SerializedName("sampleBelongName") + val sampleBelongName: String?, + @SerializedName("sampleModel") + val sampleModel: String?, + @SerializedName("sampleName") + val sampleName: String?, + @SerializedName("sampleNo") + val sampleNo: String?, + @SerializedName("specialRequire") + val specialRequire: String?, + @SerializedName("updateTime") + val updateTime: String?, + @SerializedName("updateUser") + val updateUser: String?, + @SerializedName("validDeadline") + val validDeadline: String? + ) + + data class EquipmentInfo( + @SerializedName("abc") + val abc: String?, + @SerializedName("abcName") + val abcName: String?, + @SerializedName("applyRelationId") + val applyRelationId: String?, + @SerializedName("assetNo") + val assetNo: String?, + @SerializedName("assetSource") + val assetSource: String?, + @SerializedName("assetType") + val assetType: String?, + @SerializedName("assetTypeName") + val assetTypeName: String?, + @SerializedName("attribute") + val attribute: String?, + @SerializedName("capitalSource") + val capitalSource: String?, + @SerializedName("capitalSourceName") + val capitalSourceName: String?, + @SerializedName("cardEstablishmentDate") + val cardEstablishmentDate: String?, + @SerializedName("createTime") + val createTime: String?, + @SerializedName("createUser") + val createUser: String?, + @SerializedName("depreciationMethod") + val depreciationMethod: String?, + @SerializedName("depreciationMethodName") + val depreciationMethodName: String?, + @SerializedName("depreciationPeriod") + val depreciationPeriod: String?, + @SerializedName("enableDate") + val enableDate: String?, + @SerializedName("equipmentCategory") + val equipmentCategory: String?, + @SerializedName("equipmentCategoryName") + val equipmentCategoryName: String?, + @SerializedName("equipmentName") + val equipmentName: String?, + @SerializedName("equipmentNo") + val equipmentNo: String?, + @SerializedName("equipmentSpecifications") + val equipmentSpecifications: String?, + @SerializedName("equipmentType") + val equipmentType: String?, + @SerializedName("equipmentTypeName") + val equipmentTypeName: String?, + @SerializedName("fileList") + val fileList: String?, + @SerializedName("id") + val id: String?, + @SerializedName("installIncidentalExpenses") + val installIncidentalExpenses: String?, + @SerializedName("installPlace") + val installPlace: String?, + @SerializedName("intactState") + val intactState: String?, + @SerializedName("isCalibrationTestEquipment") + val isCalibrationTestEquipment: Int?, + @SerializedName("isDel") + val isDel: Int?, + @SerializedName("isFixedAssets") + val isFixedAssets: Int?, + @SerializedName("isMeasureAccount") + val isMeasureAccount: Int?, + @SerializedName("isStandardSupportEquipment") + val isStandardSupportEquipment: Int?, + @SerializedName("labelBind") + val labelBind: String?, + @SerializedName("majorCategory") + val majorCategory: String?, + @SerializedName("majorCategoryName") + val majorCategoryName: String?, + @SerializedName("managerLevel") + val managerLevel: String?, + @SerializedName("managerLevelName") + val managerLevelName: String?, + @SerializedName("managerState") + val managerState: String?, + @SerializedName("managerStateName") + val managerStateName: String?, + @SerializedName("manufacturer") + val manufacturer: String?, + @SerializedName("manufacturerCountry") + val manufacturerCountry: String?, + @SerializedName("manufacturingDate") + val manufacturingDate: String?, + @SerializedName("manufacturingNo") + val manufacturingNo: String?, + @SerializedName("mesureCycle") + val mesureCycle: Int?, + @SerializedName("mesureDate") + val mesureDate: String?, + @SerializedName("mesureDept") + val mesureDept: String?, + @SerializedName("mesureRange") + val mesureRange: String?, + @SerializedName("mesureResult") + val mesureResult: String?, + @SerializedName("mesureResultName") + val mesureResultName: String?, + @SerializedName("mesureType") + val mesureType: String?, + @SerializedName("mesureTypeName") + val mesureTypeName: String?, + @SerializedName("modelNo") + val modelNo: String?, + @SerializedName("originValue") + val originValue: String?, + @SerializedName("overallDimension") + val overallDimension: String?, + @SerializedName("presentOriginValue") + val presentOriginValue: String?, + @SerializedName("purpose") + val purpose: String?, + @SerializedName("remark") + val remark: String?, + @SerializedName("singlePrice") + val singlePrice: String?, + @SerializedName("supportStandardEquipmentName") + val supportStandardEquipmentName: String?, + @SerializedName("supportStandardEquipmentNo") + val supportStandardEquipmentNo: String?, + @SerializedName("technicalLevel") + val technicalLevel: String?, + @SerializedName("uncertainty") + val uncertainty: String?, + @SerializedName("updateTime") + val updateTime: String?, + @SerializedName("useDept") + val useDept: String?, + @SerializedName("useDeptName") + val useDeptName: String?, + @SerializedName("usePerson") + val usePerson: String?, + @SerializedName("usePersonName") + val usePersonName: String?, + @SerializedName("validDate") + val validDate: String?, + @SerializedName("version") + val version: Int?, + @SerializedName("weight") + val weight: String? + ) + + data class FileModel( + @SerializedName("approvalStatus") + val approvalStatus: String?, + @SerializedName("approvalStatusName") + val approvalStatusName: String?, + @SerializedName("createTime") + val createTime: String?, + @SerializedName("createUser") + val createUser: String?, + @SerializedName("createUserId") + val createUserId: String?, + @SerializedName("effectiveStatus") + val effectiveStatus: String?, + @SerializedName("effectiveStatusName") + val effectiveStatusName: String?, + @SerializedName("effectiveTime") + val effectiveTime: String?, + @SerializedName("fileCode") + val fileCode: String?, + @SerializedName("fileName") + val fileName: String?, + @SerializedName("fileNo") + val fileNo: String?, + @SerializedName("fileType") + val fileType: String?, + @SerializedName("fileTypeName") + val fileTypeName: String?, + @SerializedName("id") + val id: String?, + @SerializedName("isDel") + val isDel: Int?, + @SerializedName("minioFileName") + val minioFileName: String?, + @SerializedName("processId") + val processId: String?, + @SerializedName("publishTime") + val publishTime: String?, + @SerializedName("publisher") + val publisher: String?, + @SerializedName("remark") + val remark: String?, + @SerializedName("updateTime") + val updateTime: String? + ) + } + } +} \ No newline at end of file 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 index bad7697..b4a44b8 100644 --- 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 @@ -9,7 +9,7 @@ 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.model.kt.CertificateDetailModel import com.casic.xz.meterage.utils.LoadingDialogHub import com.casic.xz.meterage.vm.CertificateViewModel import com.gyf.immersionbar.ImmersionBar @@ -50,7 +50,7 @@ certificateViewModel.certificateDetail.observe(this) { if (it.code == 200) { - detailModel = it.data + detailModel = it.data!! fragmentPages.add(BasicInformationFragment(detailModel)) fragmentPages.add(ApprovalProcessFragment(args[3])) @@ -79,7 +79,7 @@ approvalView.setOnClickListener { if (approvalView.text == "提交") { - certificateViewModel.submit(detailModel.id) + certificateViewModel.submit(detailModel.id!!) } else if (approvalView.text == "审批") { //taskId navigatePageTo(args[2]) 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 1607533..438637c 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 @@ -6,8 +6,8 @@ import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.ActionResultModel import com.casic.xz.meterage.model.ApprovalProcessModel -import com.casic.xz.meterage.model.CertificateDetailModel import com.casic.xz.meterage.model.CertificateListModel +import com.casic.xz.meterage.model.kt.CertificateDetailModel import com.casic.xz.meterage.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken diff --git a/app/src/main/res/layout/fragment_certificate_approval_process.xml b/app/src/main/res/layout/fragment_certificate_approval_process.xml index 77d9ef6..f5c09cf 100644 --- a/app/src/main/res/layout/fragment_certificate_approval_process.xml +++ b/app/src/main/res/layout/fragment_certificate_approval_process.xml @@ -1,6 +1,13 @@ - + android:layout_height="match_parent" + android:background="@color/white"> - \ No newline at end of file + + \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/ApprovalProcessAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/ApprovalProcessAdapter.kt new file mode 100644 index 0000000..5b851d0 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/ApprovalProcessAdapter.kt @@ -0,0 +1,106 @@ +package com.casic.xz.meterage.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.ImageView +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.casic.xz.meterage.R +import com.casic.xz.meterage.model.ApprovalProcessModel +import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter +import com.pengxh.kt.lite.adapter.ViewHolder +import com.pengxh.kt.lite.extensions.toJson +import org.json.JSONObject + +class ApprovalProcessAdapter( + context: Context, + private val dataRows: List>, + private val lastRow: ApprovalProcessModel.DataModel +) : RecyclerView.Adapter() { + + private val kTag = "ApprovalProcessAdapter" + private var layoutInflater: LayoutInflater = LayoutInflater.from(context) + + override fun getItemCount(): Int = dataRows.size + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + layoutInflater.inflate(R.layout.item_approval_log_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val childRows = dataRows[position] + when (position) { + 0 -> { + holder.childRecyclerView.visibility = View.VISIBLE + + //最后一项 + holder.topLineView.visibility = View.INVISIBLE + holder.tagImageView.setImageResource(R.drawable.ic_dot_red) + + holder.childRecyclerView.adapter = object : + NormalRecyclerAdapter( + R.layout.item_approval_log_child_rv_l, childRows + ) { + override fun convertView( + viewHolder: ViewHolder, position: Int, item: ApprovalProcessModel.DataModel + ) { + val json = item.comment.toJson() + //{"comment":"同意","type":"1"} + val jsonObject = JSONObject(json) + viewHolder.setText(R.id.statusView, jsonObject.getString("comment")) + .setText(R.id.operatorNameView, item.assigneeName) + .setText(R.id.deptNameView, item.deptName) + .setText(R.id.operateTimeView, item.finishTime) + } + } + } + dataRows.size - 1 -> { + holder.childRecyclerView.visibility = View.GONE + holder.bottomLineView.visibility = View.INVISIBLE + holder.tagImageView.setImageResource(R.drawable.ic_dot_gray) + + holder.statusView.text = "新建" + holder.operatorNameView.text = lastRow.assigneeName + holder.deptNameView.text = lastRow.deptName + holder.operateTimeView.text = lastRow.finishTime + } + else -> { + holder.childRecyclerView.visibility = View.VISIBLE + + holder.tagImageView.setImageResource(R.drawable.ic_dot) + + holder.childRecyclerView.adapter = object : + NormalRecyclerAdapter( + R.layout.item_approval_log_child_rv_l, childRows + ) { + override fun convertView( + viewHolder: ViewHolder, position: Int, item: ApprovalProcessModel.DataModel + ) { + val json = item.comment.toJson() + //{"comment":"同意","type":"1"} + val jsonObject = JSONObject(json) + viewHolder.setText(R.id.statusView, jsonObject.getString("comment")) + .setText(R.id.operatorNameView, item.assigneeName) + .setText(R.id.deptNameView, item.deptName) + .setText(R.id.operateTimeView, item.finishTime) + } + } + } + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var childRecyclerView: RecyclerView = view.findViewById(R.id.childRecyclerView) + + var topLineView: View = view.findViewById(R.id.topLineView) + var tagImageView: ImageView = view.findViewById(R.id.tagImageView) + var bottomLineView: View = view.findViewById(R.id.bottomLineView) + var statusView: TextView = view.findViewById(R.id.statusView) + var operatorNameView: TextView = view.findViewById(R.id.operatorNameView) + var deptNameView: TextView = view.findViewById(R.id.deptNameView) + var operateTimeView: TextView = view.findViewById(R.id.operateTimeView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt index a75e566..45e3780 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -1,25 +1,39 @@ package com.casic.xz.meterage.fragment.certificate +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.ApprovalProcessAdapter +import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_certificate_approval_process.* -class ApprovalProcessFragment :KotlinBaseFragment(){ +class ApprovalProcessFragment(private val processId: String) : KotlinBaseFragment() { + + private lateinit var certificateViewModel: CertificateViewModel override fun initData() { - + certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] + certificateViewModel.getApprovalProcess(processId) + certificateViewModel.processResult.observe(this) { + if (it.code == 200) { + logRecyclerView.adapter = ApprovalProcessAdapter( + requireContext(), it.data, it.data.last().first() + ) + } + } } 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 index 5882c3d..bf851c0 100644 --- 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 @@ -2,47 +2,41 @@ 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.casic.xz.meterage.model.kt.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 + 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 + 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 + estimateServedTimeView.text = businessOriginal.businessOrder?.planDeliverTime + estimateCompleteTimeView.text = businessOriginal.businessOrder?.requireOverTime if (data.certificateReportFile.isNullOrBlank()) { reportFileView.text = "暂无附件" diff --git a/app/src/main/java/com/casic/xz/meterage/model/ApprovalProcessModel.java b/app/src/main/java/com/casic/xz/meterage/model/ApprovalProcessModel.java new file mode 100644 index 0000000..40b29e2 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/ApprovalProcessModel.java @@ -0,0 +1,157 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class ApprovalProcessModel { + + private int code; + private List> data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List> getData() { + return data; + } + + public void setData(List> data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private String approvalStatus; + private String assigneeId; + private String assigneeName; + private Object comment; + private String createTime; + private String deptId; + private String deptName; + private String duration; + private String finishTime; + private String taskId; + private String taskName; + + public String getApprovalStatus() { + return approvalStatus; + } + + public void setApprovalStatus(String approvalStatus) { + this.approvalStatus = approvalStatus; + } + + public String getAssigneeId() { + return assigneeId; + } + + public void setAssigneeId(String assigneeId) { + this.assigneeId = assigneeId; + } + + public String getAssigneeName() { + return assigneeName; + } + + public void setAssigneeName(String assigneeName) { + this.assigneeName = assigneeName; + } + + public Object getComment() { + return comment; + } + + public void setComment(Object comment) { + this.comment = comment; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getDeptId() { + return deptId; + } + + public void setDeptId(String deptId) { + this.deptId = deptId; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getDuration() { + return duration; + } + + public void setDuration(String duration) { + this.duration = duration; + } + + public String getFinishTime() { + return finishTime; + } + + public void setFinishTime(String finishTime) { + this.finishTime = finishTime; + } + + public String getTaskId() { + return taskId; + } + + public void setTaskId(String taskId) { + this.taskId = taskId; + } + + public String getTaskName() { + return taskName; + } + + public void setTaskName(String taskName) { + this.taskName = taskName; + } + + public static class CommentModel { + private String comment; + private String type; + + public String getComment() { + return comment; + } + + public void setComment(String comment) { + this.comment = comment; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + } + } +} \ 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 deleted file mode 100644 index 42efccd..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/CertificateDetailModel.java +++ /dev/null @@ -1,2080 +0,0 @@ -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/kt/CertificateDetailModel.kt b/app/src/main/java/com/casic/xz/meterage/model/kt/CertificateDetailModel.kt new file mode 100644 index 0000000..b2440b9 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/kt/CertificateDetailModel.kt @@ -0,0 +1,584 @@ +package com.casic.xz.meterage.model.kt + +import com.google.gson.annotations.SerializedName + +data class CertificateDetailModel( + @SerializedName("code") + val code: Int?, + @SerializedName("data") + val `data`: DataModel?, + @SerializedName("message") + val message: String? +) { + data class DataModel( + @SerializedName("approvalSignId") + val approvalSignId: String?, + @SerializedName("approvalSignName") + val approvalSignName: String?, + @SerializedName("approvalStatus") + val approvalStatus: String?, + @SerializedName("approvalStatusName") + val approvalStatusName: String?, + @SerializedName("businessOriginalRecord") + val businessOriginalRecord: BusinessOriginalRecord?, + @SerializedName("calibrationMajor") + val calibrationMajor: String?, + @SerializedName("calibrationMajorName") + val calibrationMajorName: String?, + @SerializedName("certificateReportCategory") + val certificateReportCategory: String?, + @SerializedName("certificateReportCode") + val certificateReportCode: String?, + @SerializedName("certificateReportFile") + val certificateReportFile: String?, + @SerializedName("certificateReportName") + val certificateReportName: String?, + @SerializedName("certificateReportType") + val certificateReportType: String?, + @SerializedName("certificateReportTypeName") + val certificateReportTypeName: String?, + @SerializedName("createTime") + val createTime: String?, + @SerializedName("createUser") + val createUser: String?, + @SerializedName("expirationDate") + val expirationDate: String?, + @SerializedName("id") + val id: String?, + @SerializedName("isDel") + val isDel: Boolean?, + @SerializedName("issuanceDate") + val issuanceDate: String?, + @SerializedName("measureDeptId") + val measureDeptId: String?, + @SerializedName("measurePersonId") + val measurePersonId: String?, + @SerializedName("measureResult") + val measureResult: String?, + @SerializedName("orderId") + val orderId: String?, + @SerializedName("originalRecordId") + val originalRecordId: String?, + @SerializedName("printApprovalStatus") + val printApprovalStatus: String?, + @SerializedName("printNum") + val printNum: Int?, + @SerializedName("printStatus") + val printStatus: String?, + @SerializedName("processId") + val processId: String?, + @SerializedName("remark") + val remark: String?, + @SerializedName("sampleId") + val sampleId: String?, + @SerializedName("signId") + val signId: String?, + @SerializedName("signName") + val signName: String?, + @SerializedName("submitDate") + val submitDate: String?, + @SerializedName("templateId") + val templateId: String?, + @SerializedName("templateName") + val templateName: String?, + @SerializedName("updateTime") + val updateTime: String? + ) { + data class BusinessOriginalRecord( + @SerializedName("businessEnvironmentRecord") + val businessEnvironmentRecord: BusinessEnvironmentRecord?, + @SerializedName("businessOrder") + val businessOrder: BusinessOrder?, + @SerializedName("calibrationPlace") + val calibrationPlace: String?, + @SerializedName("calibrationTime") + val calibrationTime: String?, + @SerializedName("createTime") + val createTime: String?, + @SerializedName("createUser") + val createUser: String?, + @SerializedName("createUserName") + val createUserName: String?, + @SerializedName("customerSampleInfo") + val customerSampleInfo: CustomerSampleInfo?, + @SerializedName("environmentId") + val environmentId: String?, + @SerializedName("equipmentInfoList") + val equipmentInfoList: List?, + @SerializedName("fileList") + val fileList: List?, + @SerializedName("id") + val id: String?, + @SerializedName("isDel") + val isDel: Boolean?, + @SerializedName("measureCategory") + val measureCategory: String?, + @SerializedName("measureCategoryName") + val measureCategoryName: String?, + @SerializedName("orderId") + val orderId: String?, + @SerializedName("originalRecordCode") + val originalRecordCode: String?, + @SerializedName("originalRecordFile") + val originalRecordFile: String?, + @SerializedName("originalRecordName") + val originalRecordName: String?, + @SerializedName("remark") + val remark: String?, + @SerializedName("sampleId") + val sampleId: String?, + @SerializedName("templateId") + val templateId: String?, + @SerializedName("templateName") + val templateName: String?, + @SerializedName("updateTime") + val updateTime: String? + ) { + data class BusinessEnvironmentRecord( + @SerializedName("createTime") + val createTime: String?, + @SerializedName("createUser") + val createUser: String?, + @SerializedName("environmentCode") + val environmentCode: String?, + @SerializedName("humidity") + val humidity: String?, + @SerializedName("id") + val id: String?, + @SerializedName("isDel") + val isDel: Boolean?, + @SerializedName("outputVoltage") + val outputVoltage: String?, + @SerializedName("recordTime") + val recordTime: String?, + @SerializedName("recorder") + val recorder: String?, + @SerializedName("remark") + val remark: String?, + @SerializedName("roomNumber") + val roomNumber: String?, + @SerializedName("temperature") + val temperature: String?, + @SerializedName("updateTime") + val updateTime: String?, + @SerializedName("zeroGroundVoltage") + val zeroGroundVoltage: String? + ) + + data class BusinessOrder( + @SerializedName("certifications") + val certifications: String?, + @SerializedName("createTime") + val createTime: String?, + @SerializedName("createUser") + val createUser: String?, + @SerializedName("customerAddress") + val customerAddress: String?, + @SerializedName("customerId") + val customerId: String?, + @SerializedName("customerName") + val customerName: String?, + @SerializedName("customerNo") + val customerNo: String?, + @SerializedName("customerPhone") + val customerPhone: String?, + @SerializedName("customerSampleInfoList") + val customerSampleInfoList: List?, + @SerializedName("deliverTime") + val deliverTime: String?, + @SerializedName("deliverer") + val deliverer: String?, + @SerializedName("delivererId") + val delivererId: String?, + @SerializedName("delivererTel") + val delivererTel: String?, + @SerializedName("id") + val id: String?, + @SerializedName("isDel") + val isDel: Int?, + @SerializedName("isUrgent") + val isUrgent: Int?, + @SerializedName("minioFileName") + val minioFileName: String?, + @SerializedName("orderCode") + val orderCode: String?, + @SerializedName("orderTime") + val orderTime: String?, + @SerializedName("planDeliverTime") + val planDeliverTime: String?, + @SerializedName("remark") + val remark: String?, + @SerializedName("requireOverTime") + val requireOverTime: String?, + @SerializedName("status") + val status: String?, + @SerializedName("updateTime") + val updateTime: String?, + @SerializedName("updateUser") + val updateUser: String? + ) { + data class CustomerSampleInfo( + @SerializedName("abc") + val abc: String?, + @SerializedName("appendix") + val appendix: String?, + @SerializedName("appendixDescn") + val appendixDescn: String?, + @SerializedName("createTime") + val createTime: String?, + @SerializedName("createUser") + val createUser: String?, + @SerializedName("customerAddress") + val customerAddress: String?, + @SerializedName("customerId") + val customerId: String?, + @SerializedName("customerName") + val customerName: String?, + @SerializedName("customerNo") + val customerNo: String?, + @SerializedName("deliverer") + val deliverer: String?, + @SerializedName("delivererTel") + val delivererTel: String?, + @SerializedName("id") + val id: String?, + @SerializedName("isDel") + val isDel: Int?, + @SerializedName("isExistSample") + val isExistSample: String?, + @SerializedName("labelBind") + val labelBind: String?, + @SerializedName("manufacturer") + val manufacturer: String?, + @SerializedName("manufacturerCountry") + val manufacturerCountry: String?, + @SerializedName("manufacturingDate") + val manufacturingDate: String?, + @SerializedName("manufacturingNo") + val manufacturingNo: String?, + @SerializedName("measureCategory") + val measureCategory: String?, + @SerializedName("measureCategoryName") + val measureCategoryName: String?, + @SerializedName("measureContent") + val measureContent: String?, + @SerializedName("measureLastTime") + val measureLastTime: String?, + @SerializedName("measurePeriod") + val measurePeriod: String?, + @SerializedName("measureType") + val measureType: String?, + @SerializedName("measureTypeName") + val measureTypeName: String?, + @SerializedName("minioFileName") + val minioFileName: String?, + @SerializedName("orderId") + val orderId: String?, + @SerializedName("phone") + val phone: String?, + @SerializedName("postalCode") + val postalCode: String?, + @SerializedName("powerVoltage") + val powerVoltage: String?, + @SerializedName("remark") + val remark: String?, + @SerializedName("sampleBelong") + val sampleBelong: String?, + @SerializedName("sampleBelongName") + val sampleBelongName: String?, + @SerializedName("sampleModel") + val sampleModel: String?, + @SerializedName("sampleName") + val sampleName: String?, + @SerializedName("sampleNo") + val sampleNo: String?, + @SerializedName("specialRequire") + val specialRequire: String?, + @SerializedName("updateTime") + val updateTime: String?, + @SerializedName("updateUser") + val updateUser: String?, + @SerializedName("validDeadline") + val validDeadline: String? + ) + } + + data class CustomerSampleInfo( + @SerializedName("abc") + val abc: String?, + @SerializedName("appendix") + val appendix: String?, + @SerializedName("appendixDescn") + val appendixDescn: String?, + @SerializedName("createTime") + val createTime: String?, + @SerializedName("createUser") + val createUser: String?, + @SerializedName("customerAddress") + val customerAddress: String?, + @SerializedName("customerId") + val customerId: String?, + @SerializedName("customerName") + val customerName: String?, + @SerializedName("customerNo") + val customerNo: String?, + @SerializedName("deliverer") + val deliverer: String?, + @SerializedName("delivererTel") + val delivererTel: String?, + @SerializedName("id") + val id: String?, + @SerializedName("isDel") + val isDel: Int?, + @SerializedName("isExistSample") + val isExistSample: String?, + @SerializedName("labelBind") + val labelBind: String?, + @SerializedName("manufacturer") + val manufacturer: String?, + @SerializedName("manufacturerCountry") + val manufacturerCountry: String?, + @SerializedName("manufacturingDate") + val manufacturingDate: String?, + @SerializedName("manufacturingNo") + val manufacturingNo: String?, + @SerializedName("measureCategory") + val measureCategory: String?, + @SerializedName("measureCategoryName") + val measureCategoryName: String?, + @SerializedName("measureContent") + val measureContent: String?, + @SerializedName("measureLastTime") + val measureLastTime: String?, + @SerializedName("measurePeriod") + val measurePeriod: String?, + @SerializedName("measureType") + val measureType: String?, + @SerializedName("measureTypeName") + val measureTypeName: String?, + @SerializedName("minioFileName") + val minioFileName: String?, + @SerializedName("orderId") + val orderId: String?, + @SerializedName("phone") + val phone: String?, + @SerializedName("postalCode") + val postalCode: String?, + @SerializedName("powerVoltage") + val powerVoltage: String?, + @SerializedName("remark") + val remark: String?, + @SerializedName("sampleBelong") + val sampleBelong: String?, + @SerializedName("sampleBelongName") + val sampleBelongName: String?, + @SerializedName("sampleModel") + val sampleModel: String?, + @SerializedName("sampleName") + val sampleName: String?, + @SerializedName("sampleNo") + val sampleNo: String?, + @SerializedName("specialRequire") + val specialRequire: String?, + @SerializedName("updateTime") + val updateTime: String?, + @SerializedName("updateUser") + val updateUser: String?, + @SerializedName("validDeadline") + val validDeadline: String? + ) + + data class EquipmentInfo( + @SerializedName("abc") + val abc: String?, + @SerializedName("abcName") + val abcName: String?, + @SerializedName("applyRelationId") + val applyRelationId: String?, + @SerializedName("assetNo") + val assetNo: String?, + @SerializedName("assetSource") + val assetSource: String?, + @SerializedName("assetType") + val assetType: String?, + @SerializedName("assetTypeName") + val assetTypeName: String?, + @SerializedName("attribute") + val attribute: String?, + @SerializedName("capitalSource") + val capitalSource: String?, + @SerializedName("capitalSourceName") + val capitalSourceName: String?, + @SerializedName("cardEstablishmentDate") + val cardEstablishmentDate: String?, + @SerializedName("createTime") + val createTime: String?, + @SerializedName("createUser") + val createUser: String?, + @SerializedName("depreciationMethod") + val depreciationMethod: String?, + @SerializedName("depreciationMethodName") + val depreciationMethodName: String?, + @SerializedName("depreciationPeriod") + val depreciationPeriod: String?, + @SerializedName("enableDate") + val enableDate: String?, + @SerializedName("equipmentCategory") + val equipmentCategory: String?, + @SerializedName("equipmentCategoryName") + val equipmentCategoryName: String?, + @SerializedName("equipmentName") + val equipmentName: String?, + @SerializedName("equipmentNo") + val equipmentNo: String?, + @SerializedName("equipmentSpecifications") + val equipmentSpecifications: String?, + @SerializedName("equipmentType") + val equipmentType: String?, + @SerializedName("equipmentTypeName") + val equipmentTypeName: String?, + @SerializedName("fileList") + val fileList: String?, + @SerializedName("id") + val id: String?, + @SerializedName("installIncidentalExpenses") + val installIncidentalExpenses: String?, + @SerializedName("installPlace") + val installPlace: String?, + @SerializedName("intactState") + val intactState: String?, + @SerializedName("isCalibrationTestEquipment") + val isCalibrationTestEquipment: Int?, + @SerializedName("isDel") + val isDel: Int?, + @SerializedName("isFixedAssets") + val isFixedAssets: Int?, + @SerializedName("isMeasureAccount") + val isMeasureAccount: Int?, + @SerializedName("isStandardSupportEquipment") + val isStandardSupportEquipment: Int?, + @SerializedName("labelBind") + val labelBind: String?, + @SerializedName("majorCategory") + val majorCategory: String?, + @SerializedName("majorCategoryName") + val majorCategoryName: String?, + @SerializedName("managerLevel") + val managerLevel: String?, + @SerializedName("managerLevelName") + val managerLevelName: String?, + @SerializedName("managerState") + val managerState: String?, + @SerializedName("managerStateName") + val managerStateName: String?, + @SerializedName("manufacturer") + val manufacturer: String?, + @SerializedName("manufacturerCountry") + val manufacturerCountry: String?, + @SerializedName("manufacturingDate") + val manufacturingDate: String?, + @SerializedName("manufacturingNo") + val manufacturingNo: String?, + @SerializedName("mesureCycle") + val mesureCycle: Int?, + @SerializedName("mesureDate") + val mesureDate: String?, + @SerializedName("mesureDept") + val mesureDept: String?, + @SerializedName("mesureRange") + val mesureRange: String?, + @SerializedName("mesureResult") + val mesureResult: String?, + @SerializedName("mesureResultName") + val mesureResultName: String?, + @SerializedName("mesureType") + val mesureType: String?, + @SerializedName("mesureTypeName") + val mesureTypeName: String?, + @SerializedName("modelNo") + val modelNo: String?, + @SerializedName("originValue") + val originValue: String?, + @SerializedName("overallDimension") + val overallDimension: String?, + @SerializedName("presentOriginValue") + val presentOriginValue: String?, + @SerializedName("purpose") + val purpose: String?, + @SerializedName("remark") + val remark: String?, + @SerializedName("singlePrice") + val singlePrice: String?, + @SerializedName("supportStandardEquipmentName") + val supportStandardEquipmentName: String?, + @SerializedName("supportStandardEquipmentNo") + val supportStandardEquipmentNo: String?, + @SerializedName("technicalLevel") + val technicalLevel: String?, + @SerializedName("uncertainty") + val uncertainty: String?, + @SerializedName("updateTime") + val updateTime: String?, + @SerializedName("useDept") + val useDept: String?, + @SerializedName("useDeptName") + val useDeptName: String?, + @SerializedName("usePerson") + val usePerson: String?, + @SerializedName("usePersonName") + val usePersonName: String?, + @SerializedName("validDate") + val validDate: String?, + @SerializedName("version") + val version: Int?, + @SerializedName("weight") + val weight: String? + ) + + data class FileModel( + @SerializedName("approvalStatus") + val approvalStatus: String?, + @SerializedName("approvalStatusName") + val approvalStatusName: String?, + @SerializedName("createTime") + val createTime: String?, + @SerializedName("createUser") + val createUser: String?, + @SerializedName("createUserId") + val createUserId: String?, + @SerializedName("effectiveStatus") + val effectiveStatus: String?, + @SerializedName("effectiveStatusName") + val effectiveStatusName: String?, + @SerializedName("effectiveTime") + val effectiveTime: String?, + @SerializedName("fileCode") + val fileCode: String?, + @SerializedName("fileName") + val fileName: String?, + @SerializedName("fileNo") + val fileNo: String?, + @SerializedName("fileType") + val fileType: String?, + @SerializedName("fileTypeName") + val fileTypeName: String?, + @SerializedName("id") + val id: String?, + @SerializedName("isDel") + val isDel: Int?, + @SerializedName("minioFileName") + val minioFileName: String?, + @SerializedName("processId") + val processId: String?, + @SerializedName("publishTime") + val publishTime: String?, + @SerializedName("publisher") + val publisher: String?, + @SerializedName("remark") + val remark: String?, + @SerializedName("updateTime") + val updateTime: String? + ) + } + } +} \ No newline at end of file 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 index bad7697..b4a44b8 100644 --- 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 @@ -9,7 +9,7 @@ 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.model.kt.CertificateDetailModel import com.casic.xz.meterage.utils.LoadingDialogHub import com.casic.xz.meterage.vm.CertificateViewModel import com.gyf.immersionbar.ImmersionBar @@ -50,7 +50,7 @@ certificateViewModel.certificateDetail.observe(this) { if (it.code == 200) { - detailModel = it.data + detailModel = it.data!! fragmentPages.add(BasicInformationFragment(detailModel)) fragmentPages.add(ApprovalProcessFragment(args[3])) @@ -79,7 +79,7 @@ approvalView.setOnClickListener { if (approvalView.text == "提交") { - certificateViewModel.submit(detailModel.id) + certificateViewModel.submit(detailModel.id!!) } else if (approvalView.text == "审批") { //taskId navigatePageTo(args[2]) 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 1607533..438637c 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 @@ -6,8 +6,8 @@ import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.ActionResultModel import com.casic.xz.meterage.model.ApprovalProcessModel -import com.casic.xz.meterage.model.CertificateDetailModel import com.casic.xz.meterage.model.CertificateListModel +import com.casic.xz.meterage.model.kt.CertificateDetailModel import com.casic.xz.meterage.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken diff --git a/app/src/main/res/layout/fragment_certificate_approval_process.xml b/app/src/main/res/layout/fragment_certificate_approval_process.xml index 77d9ef6..f5c09cf 100644 --- a/app/src/main/res/layout/fragment_certificate_approval_process.xml +++ b/app/src/main/res/layout/fragment_certificate_approval_process.xml @@ -1,6 +1,13 @@ - + android:layout_height="match_parent" + android:background="@color/white"> - \ No newline at end of file + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_approval_log_child_rv_l.xml b/app/src/main/res/layout/item_approval_log_child_rv_l.xml new file mode 100644 index 0000000..0a44525 --- /dev/null +++ b/app/src/main/res/layout/item_approval_log_child_rv_l.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/ApprovalProcessAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/ApprovalProcessAdapter.kt new file mode 100644 index 0000000..5b851d0 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/ApprovalProcessAdapter.kt @@ -0,0 +1,106 @@ +package com.casic.xz.meterage.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.ImageView +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.casic.xz.meterage.R +import com.casic.xz.meterage.model.ApprovalProcessModel +import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter +import com.pengxh.kt.lite.adapter.ViewHolder +import com.pengxh.kt.lite.extensions.toJson +import org.json.JSONObject + +class ApprovalProcessAdapter( + context: Context, + private val dataRows: List>, + private val lastRow: ApprovalProcessModel.DataModel +) : RecyclerView.Adapter() { + + private val kTag = "ApprovalProcessAdapter" + private var layoutInflater: LayoutInflater = LayoutInflater.from(context) + + override fun getItemCount(): Int = dataRows.size + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + layoutInflater.inflate(R.layout.item_approval_log_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val childRows = dataRows[position] + when (position) { + 0 -> { + holder.childRecyclerView.visibility = View.VISIBLE + + //最后一项 + holder.topLineView.visibility = View.INVISIBLE + holder.tagImageView.setImageResource(R.drawable.ic_dot_red) + + holder.childRecyclerView.adapter = object : + NormalRecyclerAdapter( + R.layout.item_approval_log_child_rv_l, childRows + ) { + override fun convertView( + viewHolder: ViewHolder, position: Int, item: ApprovalProcessModel.DataModel + ) { + val json = item.comment.toJson() + //{"comment":"同意","type":"1"} + val jsonObject = JSONObject(json) + viewHolder.setText(R.id.statusView, jsonObject.getString("comment")) + .setText(R.id.operatorNameView, item.assigneeName) + .setText(R.id.deptNameView, item.deptName) + .setText(R.id.operateTimeView, item.finishTime) + } + } + } + dataRows.size - 1 -> { + holder.childRecyclerView.visibility = View.GONE + holder.bottomLineView.visibility = View.INVISIBLE + holder.tagImageView.setImageResource(R.drawable.ic_dot_gray) + + holder.statusView.text = "新建" + holder.operatorNameView.text = lastRow.assigneeName + holder.deptNameView.text = lastRow.deptName + holder.operateTimeView.text = lastRow.finishTime + } + else -> { + holder.childRecyclerView.visibility = View.VISIBLE + + holder.tagImageView.setImageResource(R.drawable.ic_dot) + + holder.childRecyclerView.adapter = object : + NormalRecyclerAdapter( + R.layout.item_approval_log_child_rv_l, childRows + ) { + override fun convertView( + viewHolder: ViewHolder, position: Int, item: ApprovalProcessModel.DataModel + ) { + val json = item.comment.toJson() + //{"comment":"同意","type":"1"} + val jsonObject = JSONObject(json) + viewHolder.setText(R.id.statusView, jsonObject.getString("comment")) + .setText(R.id.operatorNameView, item.assigneeName) + .setText(R.id.deptNameView, item.deptName) + .setText(R.id.operateTimeView, item.finishTime) + } + } + } + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var childRecyclerView: RecyclerView = view.findViewById(R.id.childRecyclerView) + + var topLineView: View = view.findViewById(R.id.topLineView) + var tagImageView: ImageView = view.findViewById(R.id.tagImageView) + var bottomLineView: View = view.findViewById(R.id.bottomLineView) + var statusView: TextView = view.findViewById(R.id.statusView) + var operatorNameView: TextView = view.findViewById(R.id.operatorNameView) + var deptNameView: TextView = view.findViewById(R.id.deptNameView) + var operateTimeView: TextView = view.findViewById(R.id.operateTimeView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt index a75e566..45e3780 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -1,25 +1,39 @@ package com.casic.xz.meterage.fragment.certificate +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.ApprovalProcessAdapter +import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_certificate_approval_process.* -class ApprovalProcessFragment :KotlinBaseFragment(){ +class ApprovalProcessFragment(private val processId: String) : KotlinBaseFragment() { + + private lateinit var certificateViewModel: CertificateViewModel override fun initData() { - + certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] + certificateViewModel.getApprovalProcess(processId) + certificateViewModel.processResult.observe(this) { + if (it.code == 200) { + logRecyclerView.adapter = ApprovalProcessAdapter( + requireContext(), it.data, it.data.last().first() + ) + } + } } 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 index 5882c3d..bf851c0 100644 --- 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 @@ -2,47 +2,41 @@ 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.casic.xz.meterage.model.kt.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 + 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 + 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 + estimateServedTimeView.text = businessOriginal.businessOrder?.planDeliverTime + estimateCompleteTimeView.text = businessOriginal.businessOrder?.requireOverTime if (data.certificateReportFile.isNullOrBlank()) { reportFileView.text = "暂无附件" diff --git a/app/src/main/java/com/casic/xz/meterage/model/ApprovalProcessModel.java b/app/src/main/java/com/casic/xz/meterage/model/ApprovalProcessModel.java new file mode 100644 index 0000000..40b29e2 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/ApprovalProcessModel.java @@ -0,0 +1,157 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class ApprovalProcessModel { + + private int code; + private List> data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List> getData() { + return data; + } + + public void setData(List> data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private String approvalStatus; + private String assigneeId; + private String assigneeName; + private Object comment; + private String createTime; + private String deptId; + private String deptName; + private String duration; + private String finishTime; + private String taskId; + private String taskName; + + public String getApprovalStatus() { + return approvalStatus; + } + + public void setApprovalStatus(String approvalStatus) { + this.approvalStatus = approvalStatus; + } + + public String getAssigneeId() { + return assigneeId; + } + + public void setAssigneeId(String assigneeId) { + this.assigneeId = assigneeId; + } + + public String getAssigneeName() { + return assigneeName; + } + + public void setAssigneeName(String assigneeName) { + this.assigneeName = assigneeName; + } + + public Object getComment() { + return comment; + } + + public void setComment(Object comment) { + this.comment = comment; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getDeptId() { + return deptId; + } + + public void setDeptId(String deptId) { + this.deptId = deptId; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getDuration() { + return duration; + } + + public void setDuration(String duration) { + this.duration = duration; + } + + public String getFinishTime() { + return finishTime; + } + + public void setFinishTime(String finishTime) { + this.finishTime = finishTime; + } + + public String getTaskId() { + return taskId; + } + + public void setTaskId(String taskId) { + this.taskId = taskId; + } + + public String getTaskName() { + return taskName; + } + + public void setTaskName(String taskName) { + this.taskName = taskName; + } + + public static class CommentModel { + private String comment; + private String type; + + public String getComment() { + return comment; + } + + public void setComment(String comment) { + this.comment = comment; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + } + } +} \ 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 deleted file mode 100644 index 42efccd..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/CertificateDetailModel.java +++ /dev/null @@ -1,2080 +0,0 @@ -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/kt/CertificateDetailModel.kt b/app/src/main/java/com/casic/xz/meterage/model/kt/CertificateDetailModel.kt new file mode 100644 index 0000000..b2440b9 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/kt/CertificateDetailModel.kt @@ -0,0 +1,584 @@ +package com.casic.xz.meterage.model.kt + +import com.google.gson.annotations.SerializedName + +data class CertificateDetailModel( + @SerializedName("code") + val code: Int?, + @SerializedName("data") + val `data`: DataModel?, + @SerializedName("message") + val message: String? +) { + data class DataModel( + @SerializedName("approvalSignId") + val approvalSignId: String?, + @SerializedName("approvalSignName") + val approvalSignName: String?, + @SerializedName("approvalStatus") + val approvalStatus: String?, + @SerializedName("approvalStatusName") + val approvalStatusName: String?, + @SerializedName("businessOriginalRecord") + val businessOriginalRecord: BusinessOriginalRecord?, + @SerializedName("calibrationMajor") + val calibrationMajor: String?, + @SerializedName("calibrationMajorName") + val calibrationMajorName: String?, + @SerializedName("certificateReportCategory") + val certificateReportCategory: String?, + @SerializedName("certificateReportCode") + val certificateReportCode: String?, + @SerializedName("certificateReportFile") + val certificateReportFile: String?, + @SerializedName("certificateReportName") + val certificateReportName: String?, + @SerializedName("certificateReportType") + val certificateReportType: String?, + @SerializedName("certificateReportTypeName") + val certificateReportTypeName: String?, + @SerializedName("createTime") + val createTime: String?, + @SerializedName("createUser") + val createUser: String?, + @SerializedName("expirationDate") + val expirationDate: String?, + @SerializedName("id") + val id: String?, + @SerializedName("isDel") + val isDel: Boolean?, + @SerializedName("issuanceDate") + val issuanceDate: String?, + @SerializedName("measureDeptId") + val measureDeptId: String?, + @SerializedName("measurePersonId") + val measurePersonId: String?, + @SerializedName("measureResult") + val measureResult: String?, + @SerializedName("orderId") + val orderId: String?, + @SerializedName("originalRecordId") + val originalRecordId: String?, + @SerializedName("printApprovalStatus") + val printApprovalStatus: String?, + @SerializedName("printNum") + val printNum: Int?, + @SerializedName("printStatus") + val printStatus: String?, + @SerializedName("processId") + val processId: String?, + @SerializedName("remark") + val remark: String?, + @SerializedName("sampleId") + val sampleId: String?, + @SerializedName("signId") + val signId: String?, + @SerializedName("signName") + val signName: String?, + @SerializedName("submitDate") + val submitDate: String?, + @SerializedName("templateId") + val templateId: String?, + @SerializedName("templateName") + val templateName: String?, + @SerializedName("updateTime") + val updateTime: String? + ) { + data class BusinessOriginalRecord( + @SerializedName("businessEnvironmentRecord") + val businessEnvironmentRecord: BusinessEnvironmentRecord?, + @SerializedName("businessOrder") + val businessOrder: BusinessOrder?, + @SerializedName("calibrationPlace") + val calibrationPlace: String?, + @SerializedName("calibrationTime") + val calibrationTime: String?, + @SerializedName("createTime") + val createTime: String?, + @SerializedName("createUser") + val createUser: String?, + @SerializedName("createUserName") + val createUserName: String?, + @SerializedName("customerSampleInfo") + val customerSampleInfo: CustomerSampleInfo?, + @SerializedName("environmentId") + val environmentId: String?, + @SerializedName("equipmentInfoList") + val equipmentInfoList: List?, + @SerializedName("fileList") + val fileList: List?, + @SerializedName("id") + val id: String?, + @SerializedName("isDel") + val isDel: Boolean?, + @SerializedName("measureCategory") + val measureCategory: String?, + @SerializedName("measureCategoryName") + val measureCategoryName: String?, + @SerializedName("orderId") + val orderId: String?, + @SerializedName("originalRecordCode") + val originalRecordCode: String?, + @SerializedName("originalRecordFile") + val originalRecordFile: String?, + @SerializedName("originalRecordName") + val originalRecordName: String?, + @SerializedName("remark") + val remark: String?, + @SerializedName("sampleId") + val sampleId: String?, + @SerializedName("templateId") + val templateId: String?, + @SerializedName("templateName") + val templateName: String?, + @SerializedName("updateTime") + val updateTime: String? + ) { + data class BusinessEnvironmentRecord( + @SerializedName("createTime") + val createTime: String?, + @SerializedName("createUser") + val createUser: String?, + @SerializedName("environmentCode") + val environmentCode: String?, + @SerializedName("humidity") + val humidity: String?, + @SerializedName("id") + val id: String?, + @SerializedName("isDel") + val isDel: Boolean?, + @SerializedName("outputVoltage") + val outputVoltage: String?, + @SerializedName("recordTime") + val recordTime: String?, + @SerializedName("recorder") + val recorder: String?, + @SerializedName("remark") + val remark: String?, + @SerializedName("roomNumber") + val roomNumber: String?, + @SerializedName("temperature") + val temperature: String?, + @SerializedName("updateTime") + val updateTime: String?, + @SerializedName("zeroGroundVoltage") + val zeroGroundVoltage: String? + ) + + data class BusinessOrder( + @SerializedName("certifications") + val certifications: String?, + @SerializedName("createTime") + val createTime: String?, + @SerializedName("createUser") + val createUser: String?, + @SerializedName("customerAddress") + val customerAddress: String?, + @SerializedName("customerId") + val customerId: String?, + @SerializedName("customerName") + val customerName: String?, + @SerializedName("customerNo") + val customerNo: String?, + @SerializedName("customerPhone") + val customerPhone: String?, + @SerializedName("customerSampleInfoList") + val customerSampleInfoList: List?, + @SerializedName("deliverTime") + val deliverTime: String?, + @SerializedName("deliverer") + val deliverer: String?, + @SerializedName("delivererId") + val delivererId: String?, + @SerializedName("delivererTel") + val delivererTel: String?, + @SerializedName("id") + val id: String?, + @SerializedName("isDel") + val isDel: Int?, + @SerializedName("isUrgent") + val isUrgent: Int?, + @SerializedName("minioFileName") + val minioFileName: String?, + @SerializedName("orderCode") + val orderCode: String?, + @SerializedName("orderTime") + val orderTime: String?, + @SerializedName("planDeliverTime") + val planDeliverTime: String?, + @SerializedName("remark") + val remark: String?, + @SerializedName("requireOverTime") + val requireOverTime: String?, + @SerializedName("status") + val status: String?, + @SerializedName("updateTime") + val updateTime: String?, + @SerializedName("updateUser") + val updateUser: String? + ) { + data class CustomerSampleInfo( + @SerializedName("abc") + val abc: String?, + @SerializedName("appendix") + val appendix: String?, + @SerializedName("appendixDescn") + val appendixDescn: String?, + @SerializedName("createTime") + val createTime: String?, + @SerializedName("createUser") + val createUser: String?, + @SerializedName("customerAddress") + val customerAddress: String?, + @SerializedName("customerId") + val customerId: String?, + @SerializedName("customerName") + val customerName: String?, + @SerializedName("customerNo") + val customerNo: String?, + @SerializedName("deliverer") + val deliverer: String?, + @SerializedName("delivererTel") + val delivererTel: String?, + @SerializedName("id") + val id: String?, + @SerializedName("isDel") + val isDel: Int?, + @SerializedName("isExistSample") + val isExistSample: String?, + @SerializedName("labelBind") + val labelBind: String?, + @SerializedName("manufacturer") + val manufacturer: String?, + @SerializedName("manufacturerCountry") + val manufacturerCountry: String?, + @SerializedName("manufacturingDate") + val manufacturingDate: String?, + @SerializedName("manufacturingNo") + val manufacturingNo: String?, + @SerializedName("measureCategory") + val measureCategory: String?, + @SerializedName("measureCategoryName") + val measureCategoryName: String?, + @SerializedName("measureContent") + val measureContent: String?, + @SerializedName("measureLastTime") + val measureLastTime: String?, + @SerializedName("measurePeriod") + val measurePeriod: String?, + @SerializedName("measureType") + val measureType: String?, + @SerializedName("measureTypeName") + val measureTypeName: String?, + @SerializedName("minioFileName") + val minioFileName: String?, + @SerializedName("orderId") + val orderId: String?, + @SerializedName("phone") + val phone: String?, + @SerializedName("postalCode") + val postalCode: String?, + @SerializedName("powerVoltage") + val powerVoltage: String?, + @SerializedName("remark") + val remark: String?, + @SerializedName("sampleBelong") + val sampleBelong: String?, + @SerializedName("sampleBelongName") + val sampleBelongName: String?, + @SerializedName("sampleModel") + val sampleModel: String?, + @SerializedName("sampleName") + val sampleName: String?, + @SerializedName("sampleNo") + val sampleNo: String?, + @SerializedName("specialRequire") + val specialRequire: String?, + @SerializedName("updateTime") + val updateTime: String?, + @SerializedName("updateUser") + val updateUser: String?, + @SerializedName("validDeadline") + val validDeadline: String? + ) + } + + data class CustomerSampleInfo( + @SerializedName("abc") + val abc: String?, + @SerializedName("appendix") + val appendix: String?, + @SerializedName("appendixDescn") + val appendixDescn: String?, + @SerializedName("createTime") + val createTime: String?, + @SerializedName("createUser") + val createUser: String?, + @SerializedName("customerAddress") + val customerAddress: String?, + @SerializedName("customerId") + val customerId: String?, + @SerializedName("customerName") + val customerName: String?, + @SerializedName("customerNo") + val customerNo: String?, + @SerializedName("deliverer") + val deliverer: String?, + @SerializedName("delivererTel") + val delivererTel: String?, + @SerializedName("id") + val id: String?, + @SerializedName("isDel") + val isDel: Int?, + @SerializedName("isExistSample") + val isExistSample: String?, + @SerializedName("labelBind") + val labelBind: String?, + @SerializedName("manufacturer") + val manufacturer: String?, + @SerializedName("manufacturerCountry") + val manufacturerCountry: String?, + @SerializedName("manufacturingDate") + val manufacturingDate: String?, + @SerializedName("manufacturingNo") + val manufacturingNo: String?, + @SerializedName("measureCategory") + val measureCategory: String?, + @SerializedName("measureCategoryName") + val measureCategoryName: String?, + @SerializedName("measureContent") + val measureContent: String?, + @SerializedName("measureLastTime") + val measureLastTime: String?, + @SerializedName("measurePeriod") + val measurePeriod: String?, + @SerializedName("measureType") + val measureType: String?, + @SerializedName("measureTypeName") + val measureTypeName: String?, + @SerializedName("minioFileName") + val minioFileName: String?, + @SerializedName("orderId") + val orderId: String?, + @SerializedName("phone") + val phone: String?, + @SerializedName("postalCode") + val postalCode: String?, + @SerializedName("powerVoltage") + val powerVoltage: String?, + @SerializedName("remark") + val remark: String?, + @SerializedName("sampleBelong") + val sampleBelong: String?, + @SerializedName("sampleBelongName") + val sampleBelongName: String?, + @SerializedName("sampleModel") + val sampleModel: String?, + @SerializedName("sampleName") + val sampleName: String?, + @SerializedName("sampleNo") + val sampleNo: String?, + @SerializedName("specialRequire") + val specialRequire: String?, + @SerializedName("updateTime") + val updateTime: String?, + @SerializedName("updateUser") + val updateUser: String?, + @SerializedName("validDeadline") + val validDeadline: String? + ) + + data class EquipmentInfo( + @SerializedName("abc") + val abc: String?, + @SerializedName("abcName") + val abcName: String?, + @SerializedName("applyRelationId") + val applyRelationId: String?, + @SerializedName("assetNo") + val assetNo: String?, + @SerializedName("assetSource") + val assetSource: String?, + @SerializedName("assetType") + val assetType: String?, + @SerializedName("assetTypeName") + val assetTypeName: String?, + @SerializedName("attribute") + val attribute: String?, + @SerializedName("capitalSource") + val capitalSource: String?, + @SerializedName("capitalSourceName") + val capitalSourceName: String?, + @SerializedName("cardEstablishmentDate") + val cardEstablishmentDate: String?, + @SerializedName("createTime") + val createTime: String?, + @SerializedName("createUser") + val createUser: String?, + @SerializedName("depreciationMethod") + val depreciationMethod: String?, + @SerializedName("depreciationMethodName") + val depreciationMethodName: String?, + @SerializedName("depreciationPeriod") + val depreciationPeriod: String?, + @SerializedName("enableDate") + val enableDate: String?, + @SerializedName("equipmentCategory") + val equipmentCategory: String?, + @SerializedName("equipmentCategoryName") + val equipmentCategoryName: String?, + @SerializedName("equipmentName") + val equipmentName: String?, + @SerializedName("equipmentNo") + val equipmentNo: String?, + @SerializedName("equipmentSpecifications") + val equipmentSpecifications: String?, + @SerializedName("equipmentType") + val equipmentType: String?, + @SerializedName("equipmentTypeName") + val equipmentTypeName: String?, + @SerializedName("fileList") + val fileList: String?, + @SerializedName("id") + val id: String?, + @SerializedName("installIncidentalExpenses") + val installIncidentalExpenses: String?, + @SerializedName("installPlace") + val installPlace: String?, + @SerializedName("intactState") + val intactState: String?, + @SerializedName("isCalibrationTestEquipment") + val isCalibrationTestEquipment: Int?, + @SerializedName("isDel") + val isDel: Int?, + @SerializedName("isFixedAssets") + val isFixedAssets: Int?, + @SerializedName("isMeasureAccount") + val isMeasureAccount: Int?, + @SerializedName("isStandardSupportEquipment") + val isStandardSupportEquipment: Int?, + @SerializedName("labelBind") + val labelBind: String?, + @SerializedName("majorCategory") + val majorCategory: String?, + @SerializedName("majorCategoryName") + val majorCategoryName: String?, + @SerializedName("managerLevel") + val managerLevel: String?, + @SerializedName("managerLevelName") + val managerLevelName: String?, + @SerializedName("managerState") + val managerState: String?, + @SerializedName("managerStateName") + val managerStateName: String?, + @SerializedName("manufacturer") + val manufacturer: String?, + @SerializedName("manufacturerCountry") + val manufacturerCountry: String?, + @SerializedName("manufacturingDate") + val manufacturingDate: String?, + @SerializedName("manufacturingNo") + val manufacturingNo: String?, + @SerializedName("mesureCycle") + val mesureCycle: Int?, + @SerializedName("mesureDate") + val mesureDate: String?, + @SerializedName("mesureDept") + val mesureDept: String?, + @SerializedName("mesureRange") + val mesureRange: String?, + @SerializedName("mesureResult") + val mesureResult: String?, + @SerializedName("mesureResultName") + val mesureResultName: String?, + @SerializedName("mesureType") + val mesureType: String?, + @SerializedName("mesureTypeName") + val mesureTypeName: String?, + @SerializedName("modelNo") + val modelNo: String?, + @SerializedName("originValue") + val originValue: String?, + @SerializedName("overallDimension") + val overallDimension: String?, + @SerializedName("presentOriginValue") + val presentOriginValue: String?, + @SerializedName("purpose") + val purpose: String?, + @SerializedName("remark") + val remark: String?, + @SerializedName("singlePrice") + val singlePrice: String?, + @SerializedName("supportStandardEquipmentName") + val supportStandardEquipmentName: String?, + @SerializedName("supportStandardEquipmentNo") + val supportStandardEquipmentNo: String?, + @SerializedName("technicalLevel") + val technicalLevel: String?, + @SerializedName("uncertainty") + val uncertainty: String?, + @SerializedName("updateTime") + val updateTime: String?, + @SerializedName("useDept") + val useDept: String?, + @SerializedName("useDeptName") + val useDeptName: String?, + @SerializedName("usePerson") + val usePerson: String?, + @SerializedName("usePersonName") + val usePersonName: String?, + @SerializedName("validDate") + val validDate: String?, + @SerializedName("version") + val version: Int?, + @SerializedName("weight") + val weight: String? + ) + + data class FileModel( + @SerializedName("approvalStatus") + val approvalStatus: String?, + @SerializedName("approvalStatusName") + val approvalStatusName: String?, + @SerializedName("createTime") + val createTime: String?, + @SerializedName("createUser") + val createUser: String?, + @SerializedName("createUserId") + val createUserId: String?, + @SerializedName("effectiveStatus") + val effectiveStatus: String?, + @SerializedName("effectiveStatusName") + val effectiveStatusName: String?, + @SerializedName("effectiveTime") + val effectiveTime: String?, + @SerializedName("fileCode") + val fileCode: String?, + @SerializedName("fileName") + val fileName: String?, + @SerializedName("fileNo") + val fileNo: String?, + @SerializedName("fileType") + val fileType: String?, + @SerializedName("fileTypeName") + val fileTypeName: String?, + @SerializedName("id") + val id: String?, + @SerializedName("isDel") + val isDel: Int?, + @SerializedName("minioFileName") + val minioFileName: String?, + @SerializedName("processId") + val processId: String?, + @SerializedName("publishTime") + val publishTime: String?, + @SerializedName("publisher") + val publisher: String?, + @SerializedName("remark") + val remark: String?, + @SerializedName("updateTime") + val updateTime: String? + ) + } + } +} \ No newline at end of file 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 index bad7697..b4a44b8 100644 --- 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 @@ -9,7 +9,7 @@ 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.model.kt.CertificateDetailModel import com.casic.xz.meterage.utils.LoadingDialogHub import com.casic.xz.meterage.vm.CertificateViewModel import com.gyf.immersionbar.ImmersionBar @@ -50,7 +50,7 @@ certificateViewModel.certificateDetail.observe(this) { if (it.code == 200) { - detailModel = it.data + detailModel = it.data!! fragmentPages.add(BasicInformationFragment(detailModel)) fragmentPages.add(ApprovalProcessFragment(args[3])) @@ -79,7 +79,7 @@ approvalView.setOnClickListener { if (approvalView.text == "提交") { - certificateViewModel.submit(detailModel.id) + certificateViewModel.submit(detailModel.id!!) } else if (approvalView.text == "审批") { //taskId navigatePageTo(args[2]) 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 1607533..438637c 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 @@ -6,8 +6,8 @@ import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.ActionResultModel import com.casic.xz.meterage.model.ApprovalProcessModel -import com.casic.xz.meterage.model.CertificateDetailModel import com.casic.xz.meterage.model.CertificateListModel +import com.casic.xz.meterage.model.kt.CertificateDetailModel import com.casic.xz.meterage.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken diff --git a/app/src/main/res/layout/fragment_certificate_approval_process.xml b/app/src/main/res/layout/fragment_certificate_approval_process.xml index 77d9ef6..f5c09cf 100644 --- a/app/src/main/res/layout/fragment_certificate_approval_process.xml +++ b/app/src/main/res/layout/fragment_certificate_approval_process.xml @@ -1,6 +1,13 @@ - + android:layout_height="match_parent" + android:background="@color/white"> - \ No newline at end of file + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_approval_log_child_rv_l.xml b/app/src/main/res/layout/item_approval_log_child_rv_l.xml new file mode 100644 index 0000000..0a44525 --- /dev/null +++ b/app/src/main/res/layout/item_approval_log_child_rv_l.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_approval_log_rv_l.xml b/app/src/main/res/layout/item_approval_log_rv_l.xml new file mode 100644 index 0000000..1ce5d47 --- /dev/null +++ b/app/src/main/res/layout/item_approval_log_rv_l.xml @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +