|
@@ -710,8 +710,8 @@ object RelationTypeProjectService : RService<RelationTypeProject>(SMybatisDao(Re
|
|
|
}else if (equipmentList.size>1) {
|
|
|
row.createCell(4).setCellValue("本地编码重复")
|
|
|
}else {
|
|
|
- val entity = dictDefFuncId.select(SFilter.eq("type", equipmentList[0].classCode!!), SFilter.eq("code", id1)).entity()
|
|
|
- if (entity == null) {
|
|
|
+ val entity = dictDefFuncId.select(SFilter.eq("classCode", equipmentList[0].classCode!!), SFilter.eq("code", id1)).entity()
|
|
|
+ if (entity == null ) {
|
|
|
row.createCell(4).setCellValue("信息点不存在")
|
|
|
}else {
|
|
|
val equip = equipUpdate(equipmentList[0], id1, id2, id3)
|
|
@@ -744,7 +744,7 @@ object RelationTypeProjectService : RService<RelationTypeProject>(SMybatisDao(Re
|
|
|
} // Fun readExcelRelation()
|
|
|
|
|
|
fun equipUpdate(equipment: Equipment,id1: String,id2: String,id3: String):Equipment {
|
|
|
- val entity = dictDefFuncId.select(SFilter.eq("type", equipment.classCode!!), SFilter.eq("code", id1)).entity()
|
|
|
+ val entity = dictDefFuncId.select(SFilter.eq("classCode", equipment.classCode!!), SFilter.eq("code", id1)).entity()
|
|
|
logger.debug("信息点1=${equipment.classCode}")
|
|
|
logger.debug("信息点=${entity?.toJson()}")
|
|
|
if (entity!=null) {
|