瀏覽代碼

设备归属枚举值修改

zhangqiankun 3 年之前
父節點
當前提交
bf63b6c693

+ 6 - 5
src/main/java/com/persagy/transfer/constant/DictType.java

@@ -81,11 +81,12 @@ public class DictType {
 
 		EQUIPMENT_MANAGE_OWNERSHIP.put("1", "商管");
 		EQUIPMENT_MANAGE_OWNERSHIP.put("2", "百货");
-		EQUIPMENT_MANAGE_OWNERSHIP.put("3", "大歌星");
-		EQUIPMENT_MANAGE_OWNERSHIP.put("4", "超市");
-		EQUIPMENT_MANAGE_OWNERSHIP.put("5", "影院");
-		EQUIPMENT_MANAGE_OWNERSHIP.put("6", "大酒楼");
-		EQUIPMENT_MANAGE_OWNERSHIP.put("99", "其他");
+		EQUIPMENT_MANAGE_OWNERSHIP.put("3", "超市");
+		EQUIPMENT_MANAGE_OWNERSHIP.put("4", "影院");
+		EQUIPMENT_MANAGE_OWNERSHIP.put("5", "金街");
+		EQUIPMENT_MANAGE_OWNERSHIP.put("6", "主力店");
+		EQUIPMENT_MANAGE_OWNERSHIP.put("7", "宝贝王");
+		EQUIPMENT_MANAGE_OWNERSHIP.put("99", "其他商铺");
 		ALL_INFOCODE_MAP.put(InfosKeyConstant.EQUIPMENT_MANAGE_OWNERSHIP, EQUIPMENT_MANAGE_OWNERSHIP);
 		
 		INSTALL_TYPE.put("1", "立式");

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

@@ -130,7 +130,7 @@ public class HydomcAssetServiceImpl extends SuperServiceImpl<HydomcAssetMapper,
 		    	.dxzq(StringTool.object2Integer(infos.get(InfosKeyConstant.OVERHAUL_CYCLE))) 
 		    	// 物业类型 自持/销售/合作方
 		    	.wylx(DictType.getCodeDesc(InfosKeyConstant.PROPERTY_TYPE, StringTool.object2String(infos.get(InfosKeyConstant.PROPERTY_TYPE)))) 
-		    	// 设备管理归属 商管/百货/大歌星/超市/影院/大酒楼/其他
+		    	// 设备管理归属 
 		    	.sbglgs(DictType.getCodeDesc(InfosKeyConstant.EQUIPMENT_MANAGE_OWNERSHIP, StringTool.object2String(infos.get(InfosKeyConstant.EQUIPMENT_MANAGE_OWNERSHIP)))) 
 		    	// 慧云设备编码
 		    	.hysbbm(StringTool.object2String(infos.get(InfosKeyConstant.WISDOM_CLOUD_LOCAL_CODE))) 

+ 3 - 2
src/main/java/com/persagy/transfer/service/impl/HydomcAssetspecServiceImpl.java

@@ -67,8 +67,9 @@ public class HydomcAssetspecServiceImpl extends SuperServiceImpl<HydomcAssetspec
 		
 		// key为wdfacility_rel_persagy的code值从debugs取 有值update 无值(空、空字符串)就是delete
 		if (StringUtils.isBlank(StringTool.object2String(infos.get(wdfacilityRelPersagy.getCode())))) {
-			hydomcAssetspec.setDatastatus(SwitchConstant.IS_DELETE); // 数据状态 update/delete
-			hydomcAssetspec.setChangedate(updateTime); 				// 数据更新时间 增量字段
+			// 因为工程信息化那边去掉了 delete状态,所以这里直接不在更新为delete状态,哪怕此值在我们系统内不存在
+			//hydomcAssetspec.setDatastatus(SwitchConstant.IS_DELETE); // 数据状态 update/delete
+			//hydomcAssetspec.setChangedate(updateTime); 				// 数据更新时间 增量字段
 		} else {
 			hydomcAssetspec = this.buildHydomcAssetspec(infos, wdfacilityRelPersagy, hydomcAssetspec.getAssetspecid(), wdProjectid, classstructureid, updateTime);
 			hydomcAssetspec.setDatastatus(SwitchConstant.IS_UPDATE); // 数据状态 update/delete