zhangqiankun před 3 roky
rodič
revize
9bfca6edbc

+ 4 - 6
src/main/java/com/persagy/transfer/handle/WDRwdObjectTransferHandler.java

@@ -94,8 +94,6 @@ public class WDRwdObjectTransferHandler {
     	// 获取万达项目ID
         String wdProjectId = LocalCache.PROJECT_MAPPING_BY_WD.get(projectId);
         
-        
-        List<WdfacilityRelPersagy> wdfacilityRelList = null;
         for (RwdObjectWd rwdObjectWd : rwdObjecWdList) {
         	// 验证此对象是否需要进行同步
         	String localId = rwdObjectWd.getLocalId();
@@ -131,10 +129,10 @@ public class WDRwdObjectTransferHandler {
         		}
             	
             	// 查询出18类设备单独的信息点
-                if (CollectionUtil.isEmpty(wdfacilityRelList)) {
-                	// 循环万达项目ID与博锐尚格项目ID映射表数据时,wdfacility_rel_persagy只查询一次
-                    wdfacilityRelList = this.listWdfacilityRelPersagy(calassPersagy.getWdClassCode(), calassPersagy.getClassstructureid());
-                }
+                //if (CollectionUtil.isEmpty(wdfacilityRelList)) {
+            	// 循环万达项目ID与博锐尚格项目ID映射表数据时,wdfacility_rel_persagy只查询一次
+            	List<WdfacilityRelPersagy> wdfacilityRelList = this.listWdfacilityRelPersagy(calassPersagy.getWdClassCode(), calassPersagy.getClassstructureid());
+            	//}
                 
                 // 正常数据开始同步
                 this.saveHydomcAssetAndAssetspec(wdfacilityRelList, rwdObjectWd, infos, wdProjectId, calassPersagy.getClassstructureid(), sbybm);

+ 1 - 1
src/main/java/com/persagy/transfer/service/impl/HydomcAssetServiceImpl.java

@@ -108,7 +108,7 @@ public class HydomcAssetServiceImpl extends SuperServiceImpl<HydomcAssetMapper,
     			// 服务商公司供方管理系统编码code
     			.fws(StringTool.object2String(infos.get(InfosKeyConstant.MAINTAINER)))
     			// 采购金额 填写人民币元
-    			.purchaseprice(Double.valueOf(StringTool.object2String(infos.get(InfosKeyConstant.PURCHASE_PRICE))))
+    			.purchaseprice(StringTool.object2Double(infos.get(InfosKeyConstant.PURCHASE_PRICE)))
     			// 折旧/使用年限 按年填写 如3年半则填写 3.5
     			.zjsynx(StringTool.object2Double(infos.get(InfosKeyConstant.SERVICE_LIFE)))
     			// 生产日期/出厂日期 年/月/日