|
@@ -27,12 +27,15 @@
|
|
|
package com.persagy.server.service.objects
|
|
|
|
|
|
import com.alibaba.fastjson.JSONArray
|
|
|
+import com.google.gson.Gson
|
|
|
+import com.google.gson.reflect.TypeToken
|
|
|
import com.persagy.base.extensions.toJson
|
|
|
import com.persagy.database.SFilter
|
|
|
import com.persagy.database.SQueryBuilder
|
|
|
import com.persagy.mybatis.SMybatisDao
|
|
|
import com.persagy.server.Opt
|
|
|
import com.persagy.server.dao.mappers.CustomSql
|
|
|
+import com.persagy.server.datacenter.models.entities.assistant.TaskPic
|
|
|
import com.persagy.server.datacenter.models.entities.dict.EquipFamily
|
|
|
import com.persagy.server.datacenter.models.entities.dictnew.DefClass
|
|
|
import com.persagy.server.datacenter.models.entities.objects.Equipment
|
|
@@ -656,20 +659,31 @@ object EquipmentService : Service<Equipment>(SMybatisDao(Equipment::class.java))
|
|
|
if (!equipUpDateEnclosure.pic.isNullOrEmpty()){
|
|
|
val containsKey1 = equip!!.infos!!.containsKey(Opt.PIC)
|
|
|
if (containsKey1) {
|
|
|
- val any = equip!!.infos!![Opt.PIC] as JSONArray
|
|
|
- any.addAll(equipUpDateEnclosure.pic!!)
|
|
|
- equip!!.infos!![Opt.PIC] = any
|
|
|
+ if (!equip.infos!![Opt.PIC].toString().isNullOrEmpty()&&equip.infos!![Opt.PIC].toString()!="null"){
|
|
|
+ val gson = Gson()
|
|
|
+ val type = object : TypeToken<ArrayList<TaskPic>>() {}.type
|
|
|
+ val list: ArrayList<TaskPic> = gson.fromJson(equip.infos!![Opt.PIC]!!.toString(), type)
|
|
|
+ list.addAll(equipUpDateEnclosure.pic!!)
|
|
|
+ equip!!.infos!![Opt.PIC] = list
|
|
|
+ }else {
|
|
|
+ equip!!.infos!![Opt.PIC] = equipUpDateEnclosure.pic!!
|
|
|
+ }
|
|
|
} else {
|
|
|
equip!!.infos!![Opt.PIC] = equipUpDateEnclosure.pic!!
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
if (!equipUpDateEnclosure.archive.isNullOrEmpty()){
|
|
|
val containsKey1 = equip!!.infos!!.containsKey(Opt.ARCHIVE)
|
|
|
if (containsKey1) {
|
|
|
- val any = equip!!.infos!![Opt.ARCHIVE] as JSONArray
|
|
|
- any.addAll(equipUpDateEnclosure.archive!!)
|
|
|
- equip!!.infos!![Opt.ARCHIVE] = any
|
|
|
+ if (!equip.infos!![Opt.ARCHIVE].toString().isNullOrEmpty()&&equip.infos!![Opt.ARCHIVE].toString()!="null"){
|
|
|
+ val gson = Gson()
|
|
|
+ val type = object : TypeToken<ArrayList<TaskPic>>() {}.getType()
|
|
|
+ val list: ArrayList<TaskPic> = gson.fromJson(equip.infos!![Opt.ARCHIVE]!!.toJson(), type)
|
|
|
+ list.addAll(equipUpDateEnclosure.archive!!)
|
|
|
+ equip!!.infos!![Opt.ARCHIVE] = list
|
|
|
+ }else {
|
|
|
+ equip!!.infos!![Opt.ARCHIVE] = equipUpDateEnclosure.archive!!
|
|
|
+ }
|
|
|
} else {
|
|
|
equip!!.infos!![Opt.ARCHIVE] = equipUpDateEnclosure.archive!!
|
|
|
}
|
|
@@ -679,9 +693,19 @@ object EquipmentService : Service<Equipment>(SMybatisDao(Equipment::class.java))
|
|
|
|
|
|
val containsKey1 = equip!!.infos!!.containsKey(Opt.CHECKREPORT)
|
|
|
if (containsKey1) {
|
|
|
- val any = equip!!.infos!![Opt.CHECKREPORT] as JSONArray
|
|
|
- any.addAll(equipUpDateEnclosure.checkReport!!)
|
|
|
- equip!!.infos!![Opt.CHECKREPORT] = any
|
|
|
+
|
|
|
+ if (!equip.infos!![Opt.CHECKREPORT].toString().isNullOrEmpty()&&equip.infos!![Opt.CHECKREPORT].toString()!="null"){
|
|
|
+ val gson = Gson()
|
|
|
+ val type = object : TypeToken<ArrayList<TaskPic>>() {}.getType()
|
|
|
+ val list: ArrayList<TaskPic> = gson.fromJson(equip.infos!![Opt.CHECKREPORT]!!.toJson(), type)
|
|
|
+ list.addAll(equipUpDateEnclosure.checkReport!!)
|
|
|
+ equip!!.infos!![Opt.CHECKREPORT] = list
|
|
|
+ }else {
|
|
|
+ equip!!.infos!![Opt.CHECKREPORT] = equipUpDateEnclosure.checkReport!!
|
|
|
+ }
|
|
|
+// val any = equip!!.infos!![Opt.CHECKREPORT] as JSONArray
|
|
|
+// any.addAll(equipUpDateEnclosure.checkReport!!)
|
|
|
+// equip!!.infos!![Opt.CHECKREPORT] = any
|
|
|
} else {
|
|
|
equip!!.infos!![Opt.CHECKREPORT] = equipUpDateEnclosure.checkReport
|
|
|
}
|
|
@@ -689,9 +713,19 @@ object EquipmentService : Service<Equipment>(SMybatisDao(Equipment::class.java))
|
|
|
if (!equipUpDateEnclosure.drawing.isNullOrEmpty()){
|
|
|
val containsKey1 = equip!!.infos!!.containsKey(Opt.DRAWING)
|
|
|
if (containsKey1) {
|
|
|
- val any = equip!!.infos!![Opt.DRAWING] as JSONArray
|
|
|
- any.addAll(equipUpDateEnclosure.drawing!!)
|
|
|
- equip!!.infos!![Opt.DRAWING] = any
|
|
|
+
|
|
|
+ if (!equip.infos!![Opt.DRAWING].toString().isNullOrEmpty()&&equip.infos!![Opt.DRAWING].toString()!="null"){
|
|
|
+ val gson = Gson()
|
|
|
+ val type = object : TypeToken<ArrayList<TaskPic>>() {}.getType()
|
|
|
+ val list: ArrayList<TaskPic> = gson.fromJson(equip.infos!![Opt.DRAWING]!!.toJson(), type)
|
|
|
+ list.addAll(equipUpDateEnclosure.drawing!!)
|
|
|
+ equip!!.infos!![Opt.DRAWING] = list
|
|
|
+ }else {
|
|
|
+ equip!!.infos!![Opt.DRAWING] = equipUpDateEnclosure.drawing!!
|
|
|
+ }
|
|
|
+// val any = equip!!.infos!![Opt.DRAWING] as JSONArray
|
|
|
+// any.addAll(equipUpDateEnclosure.drawing!!)
|
|
|
+// equip!!.infos!![Opt.DRAWING] = any
|
|
|
} else {
|
|
|
equip!!.infos!![Opt.DRAWING] = equipUpDateEnclosure.drawing
|
|
|
}
|
|
@@ -699,9 +733,20 @@ object EquipmentService : Service<Equipment>(SMybatisDao(Equipment::class.java))
|
|
|
if (!equipUpDateEnclosure.installDrawing.isNullOrEmpty()){
|
|
|
val containsKey1 = equip!!.infos!!.containsKey(Opt.INSTALLDRAWING)
|
|
|
if (containsKey1) {
|
|
|
- val any = equip!!.infos!![Opt.INSTALLDRAWING] as JSONArray
|
|
|
- any.addAll(equipUpDateEnclosure.installDrawing!!)
|
|
|
- equip!!.infos!![Opt.INSTALLDRAWING] = any
|
|
|
+
|
|
|
+ if (!equip.infos!![Opt.INSTALLDRAWING].toString().isNullOrEmpty()&&equip.infos!![Opt.INSTALLDRAWING].toString()!="null"){
|
|
|
+ val gson = Gson()
|
|
|
+ val type = object : TypeToken<ArrayList<TaskPic>>() {}.getType()
|
|
|
+ val list: ArrayList<TaskPic> = gson.fromJson(equip.infos!![Opt.INSTALLDRAWING]!!.toJson(), type)
|
|
|
+ list.addAll(equipUpDateEnclosure.installDrawing!!)
|
|
|
+ equip!!.infos!![Opt.INSTALLDRAWING] = list
|
|
|
+ }else {
|
|
|
+ equip!!.infos!![Opt.INSTALLDRAWING] = equipUpDateEnclosure.installDrawing!!
|
|
|
+ }
|
|
|
+
|
|
|
+// val any = equip!!.infos!![Opt.INSTALLDRAWING] as JSONArray
|
|
|
+// any.addAll(equipUpDateEnclosure.installDrawing!!)
|
|
|
+// equip!!.infos!![Opt.INSTALLDRAWING] = any
|
|
|
} else {
|
|
|
equip!!.infos!![Opt.INSTALLDRAWING]
|
|
|
}
|
|
@@ -709,9 +754,19 @@ object EquipmentService : Service<Equipment>(SMybatisDao(Equipment::class.java))
|
|
|
if (!equipUpDateEnclosure.installPic.isNullOrEmpty()){
|
|
|
val containsKey1 = equip!!.infos!!.containsKey(Opt.INSTALLPIC)
|
|
|
if (containsKey1) {
|
|
|
- val any = equip!!.infos!![Opt.INSTALLPIC] as JSONArray
|
|
|
- any.addAll(equipUpDateEnclosure.installPic!!)
|
|
|
- equip!!.infos!![Opt.INSTALLPIC] = any
|
|
|
+
|
|
|
+ if (!equip.infos!![Opt.INSTALLPIC].toString().isNullOrEmpty()&&equip.infos!![Opt.INSTALLPIC].toString()!="null"){
|
|
|
+ val gson = Gson()
|
|
|
+ val type = object : TypeToken<ArrayList<TaskPic>>() {}.getType()
|
|
|
+ val list: ArrayList<TaskPic> = gson.fromJson(equip.infos!![Opt.INSTALLPIC]!!.toJson(), type)
|
|
|
+ list.addAll(equipUpDateEnclosure.installPic!!)
|
|
|
+ equip!!.infos!![Opt.INSTALLPIC] = list
|
|
|
+ }else {
|
|
|
+ equip!!.infos!![Opt.INSTALLPIC] = equipUpDateEnclosure.installPic!!
|
|
|
+ }
|
|
|
+// val any = equip!!.infos!![Opt.INSTALLPIC] as JSONArray
|
|
|
+// any.addAll(equipUpDateEnclosure.installPic!!)
|
|
|
+// equip!!.infos!![Opt.INSTALLPIC] = any
|
|
|
} else {
|
|
|
equip!!.infos!![Opt.INSTALLPIC] = equipUpDateEnclosure.installPic
|
|
|
}
|
|
@@ -720,8 +775,18 @@ object EquipmentService : Service<Equipment>(SMybatisDao(Equipment::class.java))
|
|
|
if (!equipUpDateEnclosure.insuranceFile.isNullOrEmpty()){
|
|
|
val containsKey1 = equip!!.infos!!.containsKey(Opt.INSURANCEFILE)
|
|
|
if (containsKey1) {
|
|
|
- val any = equip!!.infos!![Opt.INSURANCEFILE] as JSONArray
|
|
|
- any.addAll(equipUpDateEnclosure.insuranceFile!!)
|
|
|
+
|
|
|
+ if (!equip.infos!![Opt.INSURANCEFILE].toString().isNullOrEmpty()&&equip.infos!![Opt.INSURANCEFILE].toString()!="null"){
|
|
|
+ val gson = Gson()
|
|
|
+ val type = object : TypeToken<ArrayList<TaskPic>>() {}.getType()
|
|
|
+ val list: ArrayList<TaskPic> = gson.fromJson(equip.infos!![Opt.INSURANCEFILE]!!.toJson(), type)
|
|
|
+ list.addAll(equipUpDateEnclosure.insuranceFile!!)
|
|
|
+ equip!!.infos!![Opt.INSURANCEFILE] = list
|
|
|
+ }else {
|
|
|
+ equip!!.infos!![Opt.INSURANCEFILE] = equipUpDateEnclosure.insuranceFile!!
|
|
|
+ }
|
|
|
+// val any = equip!!.infos!![Opt.INSURANCEFILE] as JSONArray
|
|
|
+// any.addAll(equipUpDateEnclosure.insuranceFile!!)
|
|
|
} else {
|
|
|
equip!!.infos!![Opt.INSURANCEFILE] = equipUpDateEnclosure.insuranceFile
|
|
|
}
|
|
@@ -730,8 +795,17 @@ object EquipmentService : Service<Equipment>(SMybatisDao(Equipment::class.java))
|
|
|
|
|
|
val containsKey1 = equip!!.infos!!.containsKey(Opt.NAMEPLATE)
|
|
|
if (containsKey1) {
|
|
|
- val any = equip!!.infos!![Opt.NAMEPLATE] as JSONArray
|
|
|
- any.addAll(equipUpDateEnclosure.nameplate!!)
|
|
|
+ if (!equip.infos!![Opt.NAMEPLATE].toString().isNullOrEmpty()&&equip.infos!![Opt.NAMEPLATE].toString()!="null"){
|
|
|
+ val gson = Gson()
|
|
|
+ val type = object : TypeToken<ArrayList<TaskPic>>() {}.getType()
|
|
|
+ val list: ArrayList<TaskPic> = gson.fromJson(equip.infos!![Opt.NAMEPLATE]!!.toJson(), type)
|
|
|
+ list.addAll(equipUpDateEnclosure.nameplate!!)
|
|
|
+ equip!!.infos!![Opt.NAMEPLATE] = list
|
|
|
+ }else {
|
|
|
+ equip!!.infos!![Opt.NAMEPLATE] = equipUpDateEnclosure.nameplate!!
|
|
|
+ }
|
|
|
+// val any = equip!!.infos!![Opt.NAMEPLATE] as JSONArray
|
|
|
+// any.addAll(equipUpDateEnclosure.nameplate!!)
|
|
|
} else {
|
|
|
equip!!.infos!![Opt.NAMEPLATE] = equipUpDateEnclosure.nameplate
|
|
|
}
|
|
@@ -740,8 +814,18 @@ object EquipmentService : Service<Equipment>(SMybatisDao(Equipment::class.java))
|
|
|
if (!equipUpDateEnclosure.operationManual.isNullOrEmpty()){
|
|
|
val containsKey1 = equip!!.infos!!.containsKey(Opt.OPERATIONMANUAL)
|
|
|
if (containsKey1) {
|
|
|
- val any = equip!!.infos!![Opt.OPERATIONMANUAL] as JSONArray
|
|
|
- any.addAll(equipUpDateEnclosure.operationManual!!)
|
|
|
+
|
|
|
+ if (!equip.infos!![Opt.OPERATIONMANUAL].toString().isNullOrEmpty()&&equip.infos!![Opt.OPERATIONMANUAL].toString()!="null"){
|
|
|
+ val gson = Gson()
|
|
|
+ val type = object : TypeToken<ArrayList<TaskPic>>() {}.getType()
|
|
|
+ val list: ArrayList<TaskPic> = gson.fromJson(equip.infos!![Opt.OPERATIONMANUAL]!!.toJson(), type)
|
|
|
+ list.addAll(equipUpDateEnclosure.operationManual!!)
|
|
|
+ equip!!.infos!![Opt.OPERATIONMANUAL] = list
|
|
|
+ }else {
|
|
|
+ equip!!.infos!![Opt.OPERATIONMANUAL] = equipUpDateEnclosure.operationManual!!
|
|
|
+ }
|
|
|
+// val any = equip!!.infos!![Opt.OPERATIONMANUAL] as JSONArray
|
|
|
+// any.addAll(equipUpDateEnclosure.operationManual!!)
|
|
|
} else {
|
|
|
equip!!.infos!![Opt.OPERATIONMANUAL] = equipUpDateEnclosure.operationManual
|
|
|
}
|
|
@@ -750,8 +834,18 @@ object EquipmentService : Service<Equipment>(SMybatisDao(Equipment::class.java))
|
|
|
if (!equipUpDateEnclosure.productCertification.isNullOrEmpty()){
|
|
|
val containsKey1 = equip!!.infos!!.containsKey(Opt.PRODUCTCERTIFICATION)
|
|
|
if (containsKey1) {
|
|
|
- val any = equip!!.infos!![Opt.PRODUCTCERTIFICATION] as JSONArray
|
|
|
- any.addAll(equipUpDateEnclosure.productCertification!!)
|
|
|
+
|
|
|
+ if (!equip.infos!![Opt.PRODUCTCERTIFICATION].toString().isNullOrEmpty()&&equip.infos!![Opt.PRODUCTCERTIFICATION].toString()!="null"){
|
|
|
+ val gson = Gson()
|
|
|
+ val type = object : TypeToken<ArrayList<TaskPic>>() {}.getType()
|
|
|
+ val list: ArrayList<TaskPic> = gson.fromJson(equip.infos!![Opt.PRODUCTCERTIFICATION]!!.toJson(), type)
|
|
|
+ list.addAll(equipUpDateEnclosure.productCertification!!)
|
|
|
+ equip!!.infos!![Opt.PRODUCTCERTIFICATION] = list
|
|
|
+ }else {
|
|
|
+ equip!!.infos!![Opt.PRODUCTCERTIFICATION] = equipUpDateEnclosure.productCertification!!
|
|
|
+ }
|
|
|
+// val any = equip!!.infos!![Opt.PRODUCTCERTIFICATION] as JSONArray
|
|
|
+// any.addAll(equipUpDateEnclosure.productCertification!!)
|
|
|
} else {
|
|
|
equip!!.infos!![Opt.PRODUCTCERTIFICATION] = equipUpDateEnclosure.productCertification
|
|
|
}
|
|
@@ -760,8 +854,19 @@ object EquipmentService : Service<Equipment>(SMybatisDao(Equipment::class.java))
|
|
|
if (!equipUpDateEnclosure.maintainManual.isNullOrEmpty()){
|
|
|
val containsKey1 = equip!!.infos!!.containsKey(Opt.MAINTAINMANUAL)
|
|
|
if (containsKey1) {
|
|
|
- val any = equip!!.infos!![Opt.MAINTAINMANUAL] as JSONArray
|
|
|
- any.addAll(equipUpDateEnclosure.maintainManual!!)
|
|
|
+
|
|
|
+ if (!equip.infos!![Opt.MAINTAINMANUAL].toString().isNullOrEmpty()&&equip.infos!![Opt.MAINTAINMANUAL].toString()!="null"){
|
|
|
+ val gson = Gson()
|
|
|
+ val type = object : TypeToken<ArrayList<TaskPic>>() {}.getType()
|
|
|
+ val list: ArrayList<TaskPic> = gson.fromJson(equip.infos!![Opt.MAINTAINMANUAL]!!.toJson(), type)
|
|
|
+ list.addAll(equipUpDateEnclosure.maintainManual!!)
|
|
|
+ equip!!.infos!![Opt.MAINTAINMANUAL] = list
|
|
|
+ }else {
|
|
|
+ equip!!.infos!![Opt.MAINTAINMANUAL] = equipUpDateEnclosure.maintainManual!!
|
|
|
+ }
|
|
|
+
|
|
|
+// val any = equip!!.infos!![Opt.MAINTAINMANUAL] as JSONArray
|
|
|
+// any.addAll(equipUpDateEnclosure.maintainManual!!)
|
|
|
} else {
|
|
|
equip!!.infos!![Opt.MAINTAINMANUAL] = equipUpDateEnclosure.maintainManual
|
|
|
}
|
|
@@ -770,8 +875,19 @@ object EquipmentService : Service<Equipment>(SMybatisDao(Equipment::class.java))
|
|
|
if (!equipUpDateEnclosure.installInstruction.isNullOrEmpty()){
|
|
|
val containsKey1 = equip!!.infos!!.containsKey(Opt.INSTALLINSTRUCTION)
|
|
|
if (containsKey1) {
|
|
|
- val any = equip!!.infos!![Opt.INSTALLINSTRUCTION] as JSONArray
|
|
|
- any.addAll(equipUpDateEnclosure.installInstruction!!)
|
|
|
+
|
|
|
+ if (!equip.infos!![Opt.INSTALLINSTRUCTION].toString().isNullOrEmpty()&&equip.infos!![Opt.INSTALLINSTRUCTION].toString()!="null"){
|
|
|
+ val gson = Gson()
|
|
|
+ val type = object : TypeToken<ArrayList<TaskPic>>() {}.getType()
|
|
|
+ val list: ArrayList<TaskPic> = gson.fromJson(equip.infos!![Opt.INSTALLINSTRUCTION]!!.toJson(), type)
|
|
|
+ list.addAll(equipUpDateEnclosure.installInstruction!!)
|
|
|
+ equip!!.infos!![Opt.INSTALLINSTRUCTION] = list
|
|
|
+ }else {
|
|
|
+ equip!!.infos!![Opt.INSTALLINSTRUCTION] = equipUpDateEnclosure.installInstruction!!
|
|
|
+ }
|
|
|
+
|
|
|
+// val any = equip!!.infos!![Opt.INSTALLINSTRUCTION] as JSONArray
|
|
|
+// any.addAll(equipUpDateEnclosure.installInstruction!!)
|
|
|
} else {
|
|
|
equip!!.infos!![Opt.INSTALLINSTRUCTION] = equipUpDateEnclosure.installInstruction
|
|
|
}
|
|
@@ -780,8 +896,19 @@ object EquipmentService : Service<Equipment>(SMybatisDao(Equipment::class.java))
|
|
|
if (!equipUpDateEnclosure.acceptanceReport.isNullOrEmpty()){
|
|
|
val containsKey1 = equip!!.infos!!.containsKey(Opt.ACCEPTANCEREPORT)
|
|
|
if (containsKey1) {
|
|
|
- val any = equip!!.infos!![Opt.ACCEPTANCEREPORT] as JSONArray
|
|
|
- any.addAll(equipUpDateEnclosure.acceptanceReport!!)
|
|
|
+
|
|
|
+ if (!equip.infos!![Opt.ACCEPTANCEREPORT].toString().isNullOrEmpty()&&equip.infos!![Opt.ACCEPTANCEREPORT].toString()!="null"){
|
|
|
+ val gson = Gson()
|
|
|
+ val type = object : TypeToken<ArrayList<TaskPic>>() {}.getType()
|
|
|
+ val list: ArrayList<TaskPic> = gson.fromJson(equip.infos!![Opt.ACCEPTANCEREPORT]!!.toJson(), type)
|
|
|
+ list.addAll(equipUpDateEnclosure.acceptanceReport!!)
|
|
|
+ equip!!.infos!![Opt.ACCEPTANCEREPORT] = list
|
|
|
+ }else {
|
|
|
+ equip!!.infos!![Opt.ACCEPTANCEREPORT] = equipUpDateEnclosure.acceptanceReport!!
|
|
|
+ }
|
|
|
+
|
|
|
+// val any = equip!!.infos!![Opt.ACCEPTANCEREPORT] as JSONArray
|
|
|
+// any.addAll(equipUpDateEnclosure.acceptanceReport!!)
|
|
|
} else {
|
|
|
equip!!.infos!![Opt.ACCEPTANCEREPORT] = equipUpDateEnclosure.acceptanceReport
|
|
|
}
|
|
@@ -790,8 +917,18 @@ object EquipmentService : Service<Equipment>(SMybatisDao(Equipment::class.java))
|
|
|
if (!equipUpDateEnclosure.approachingAcceptance.isNullOrEmpty()){
|
|
|
val containsKey1 = equip!!.infos!!.containsKey(Opt.APPROACHINGACCEPTANCE)
|
|
|
if (containsKey1) {
|
|
|
- val any = equip!!.infos!![Opt.APPROACHINGACCEPTANCE] as JSONArray
|
|
|
- any.addAll(equipUpDateEnclosure.approachingAcceptance!!)
|
|
|
+
|
|
|
+ if (!equip.infos!![Opt.APPROACHINGACCEPTANCE].toString().isNullOrEmpty()&&equip.infos!![Opt.APPROACHINGACCEPTANCE].toString()!="null"){
|
|
|
+ val gson = Gson()
|
|
|
+ val type = object : TypeToken<ArrayList<TaskPic>>() {}.getType()
|
|
|
+ val list: ArrayList<TaskPic> = gson.fromJson(equip.infos!![Opt.APPROACHINGACCEPTANCE]!!.toJson(), type)
|
|
|
+ list.addAll(equipUpDateEnclosure.approachingAcceptance!!)
|
|
|
+ equip!!.infos!![Opt.APPROACHINGACCEPTANCE] = list
|
|
|
+ }else {
|
|
|
+ equip!!.infos!![Opt.APPROACHINGACCEPTANCE] = equipUpDateEnclosure.approachingAcceptance!!
|
|
|
+ }
|
|
|
+// val any = equip!!.infos!![Opt.APPROACHINGACCEPTANCE] as JSONArray
|
|
|
+// any.addAll(equipUpDateEnclosure.approachingAcceptance!!)
|
|
|
} else {
|
|
|
equip!!.infos!![Opt.APPROACHINGACCEPTANCE] = equipUpDateEnclosure.approachingAcceptance
|
|
|
}
|
|
@@ -800,8 +937,19 @@ object EquipmentService : Service<Equipment>(SMybatisDao(Equipment::class.java))
|
|
|
if (!equipUpDateEnclosure.supplierContract.isNullOrEmpty()){
|
|
|
val containsKey1 = equip!!.infos!!.containsKey(Opt.SUPPLIERCONTRACT)
|
|
|
if (containsKey1) {
|
|
|
- val any = equip!!.infos!![Opt.SUPPLIERCONTRACT] as JSONArray
|
|
|
- any.addAll(equipUpDateEnclosure.supplierContract!!)
|
|
|
+
|
|
|
+ if (!equip.infos!![Opt.SUPPLIERCONTRACT].toString().isNullOrEmpty()&&equip.infos!![Opt.SUPPLIERCONTRACT].toString()!="null"){
|
|
|
+ val gson = Gson()
|
|
|
+ val type = object : TypeToken<ArrayList<TaskPic>>() {}.getType()
|
|
|
+ val list: ArrayList<TaskPic> = gson.fromJson(equip.infos!![Opt.SUPPLIERCONTRACT]!!.toJson(), type)
|
|
|
+ list.addAll(equipUpDateEnclosure.supplierContract!!)
|
|
|
+ equip!!.infos!![Opt.SUPPLIERCONTRACT] = list
|
|
|
+ }else {
|
|
|
+ equip!!.infos!![Opt.SUPPLIERCONTRACT] = equipUpDateEnclosure.supplierContract!!
|
|
|
+ }
|
|
|
+
|
|
|
+// val any = equip!!.infos!![Opt.SUPPLIERCONTRACT] as JSONArray
|
|
|
+// any.addAll(equipUpDateEnclosure.supplierContract!!)
|
|
|
} else {
|
|
|
equip!!.infos!![Opt.SUPPLIERCONTRACT] = equipUpDateEnclosure.supplierContract
|
|
|
}
|
|
@@ -810,8 +958,19 @@ object EquipmentService : Service<Equipment>(SMybatisDao(Equipment::class.java))
|
|
|
if (!equipUpDateEnclosure.testReport.isNullOrEmpty()){
|
|
|
val containsKey1 = equip!!.infos!!.containsKey(Opt.TESTREPORT)
|
|
|
if (containsKey1) {
|
|
|
- val any = equip!!.infos!![Opt.TESTREPORT] as JSONArray
|
|
|
- any.addAll(equipUpDateEnclosure.testReport!!)
|
|
|
+
|
|
|
+ if (!equip.infos!![Opt.TESTREPORT].toString().isNullOrEmpty()&&equip.infos!![Opt.TESTREPORT].toString()!="null"){
|
|
|
+ val gson = Gson()
|
|
|
+ val type = object : TypeToken<ArrayList<TaskPic>>() {}.getType()
|
|
|
+ val list: ArrayList<TaskPic> = gson.fromJson(equip.infos!![Opt.TESTREPORT]!!.toJson(), type)
|
|
|
+ list.addAll(equipUpDateEnclosure.testReport!!)
|
|
|
+ equip!!.infos!![Opt.TESTREPORT] = list
|
|
|
+ }else {
|
|
|
+ equip!!.infos!![Opt.TESTREPORT] = equipUpDateEnclosure.testReport!!
|
|
|
+ }
|
|
|
+
|
|
|
+// val any = equip!!.infos!![Opt.TESTREPORT] as JSONArray
|
|
|
+// any.addAll(equipUpDateEnclosure.testReport!!)
|
|
|
} else {
|
|
|
equip!!.infos!![Opt.TESTREPORT] = equipUpDateEnclosure.testReport
|
|
|
}
|
|
@@ -821,8 +980,19 @@ object EquipmentService : Service<Equipment>(SMybatisDao(Equipment::class.java))
|
|
|
if (!equipUpDateEnclosure.originalCertificate.isNullOrEmpty()){
|
|
|
val containsKey1 = equip!!.infos!!.containsKey(Opt.ORIGINALCERTIFICATE)
|
|
|
if (containsKey1) {
|
|
|
- val any = equip!!.infos!![Opt.ORIGINALCERTIFICATE] as JSONArray
|
|
|
- any.addAll(equipUpDateEnclosure.originalCertificate!!)
|
|
|
+
|
|
|
+ if (!equip.infos!![Opt.ORIGINALCERTIFICATE].toString().isNullOrEmpty()&&equip.infos!![Opt.ORIGINALCERTIFICATE].toString()!="null"){
|
|
|
+ val gson = Gson()
|
|
|
+ val type = object : TypeToken<ArrayList<TaskPic>>() {}.getType()
|
|
|
+ val list: ArrayList<TaskPic> = gson.fromJson(equip.infos!![Opt.ORIGINALCERTIFICATE]!!.toJson(), type)
|
|
|
+ list.addAll(equipUpDateEnclosure.originalCertificate!!)
|
|
|
+ equip!!.infos!![Opt.ORIGINALCERTIFICATE] = list
|
|
|
+ }else {
|
|
|
+ equip!!.infos!![Opt.ORIGINALCERTIFICATE] = equipUpDateEnclosure.originalCertificate!!
|
|
|
+ }
|
|
|
+//
|
|
|
+// val any = equip!!.infos!![Opt.ORIGINALCERTIFICATE] as JSONArray
|
|
|
+// any.addAll(equipUpDateEnclosure.originalCertificate!!)
|
|
|
} else {
|
|
|
equip!!.infos!![Opt.ORIGINALCERTIFICATE] = equipUpDateEnclosure.originalCertificate
|
|
|
}
|