设施设备null超期提醒修正

git-svn-id: https://192.168.57.71/svn/lyggkj@43 1a6f6e3a-4066-fe46-b609-79c204482ece

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/common/systimer/JyrSynTimer.java

@@ -280,7 +280,10 @@ public class JyrSynTimer extends BaseController {
 					deleteGztx(gksssbEntity.getId().toString(),
 							gksssbEntity.getAddUser(),
 							Constants.BUSTYPE_YXQ_SSSBXX);
-					setGztx("你单位的" + gksssbEntity.getSsmc() + gksssbEntity.getGgxh()==null?"": gksssbEntity.getGgxh() + "即将到期",
+					setGztx("你单位的"
+							+ (gksssbEntity.getGgxh() == null ? "" : "型号为"
+									+ gksssbEntity.getGgxh() + "的")
+							+ gksssbEntity.getSsmc() + "即将到期",
 							gksssbEntity.getAddUser(),
 							Constants.BUSTYPE_YXQ_SSSBXX, gksssbEntity.getId()
 									.toString());
@@ -288,8 +291,11 @@ public class JyrSynTimer extends BaseController {
 					for (UserEntity userEntity : adminList) {
 						deleteGztx(gksssbEntity.getId().toString(), userEntity,
 								Constants.BUSTYPE_YXQ_SSSBXX);
-						setGztx(gksssbEntity.getQymc().getGkjyr() + "的"
-								+ gksssbEntity.getSsmc()  + "即将到期", userEntity,
+						setGztx(gksssbEntity.getQymc().getGkjyr()
+								+ "的"
+								+ (gksssbEntity.getGgxh() == null ? "" : "型号为"
+										+ gksssbEntity.getGgxh() + "的")
+								+ gksssbEntity.getSsmc() + "即将到期", userEntity,
 								Constants.BUSTYPE_YXQ_SSSBXX, gksssbEntity
 										.getId().toString());
 					}
@@ -298,9 +304,12 @@ public class JyrSynTimer extends BaseController {
 					for (UserEntity userEntity : qyadminList) {
 						deleteGztx(gksssbEntity.getId().toString(), userEntity,
 								Constants.BUSTYPE_YXQ_SSSBXX);
-						setGztx("你单位的" + gksssbEntity.getSsmc() + gksssbEntity.getGgxh()==null?"": gksssbEntity.getGgxh() + "即将到期",
-								userEntity, Constants.BUSTYPE_YXQ_SSSBXX,
-								gksssbEntity.getId().toString());
+						setGztx("你单位的"
+								+ (gksssbEntity.getGgxh() == null ? "" : "型号为"
+										+ gksssbEntity.getGgxh() + "的")
+								+ gksssbEntity.getSsmc() + "即将到期", userEntity,
+								Constants.BUSTYPE_YXQ_SSSBXX, gksssbEntity
+										.getId().toString());
 					}
 				}
 			}