设施设备超期null提醒 修正

git-svn-id: https://192.168.57.71/svn/hbghj@40 201dd7a2-ec1b-f84b-8b06-88221118ff88

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

@@ -42,14 +42,14 @@ public class JyrSynTimer extends BaseController {
 	private UserService userService;
 
 	public void execute() {
-			jyrSave();
-			ryjbxxSave();
-			gksssbSave();
-			glzdSave();
+		jyrSave();
+		ryjbxxSave();
+		gksssbSave();
+		glzdSave();
 	}
 
 	// 经营人的新增，修改，删除定时
-	public void jyrSave() {	
+	public void jyrSave() {
 		List<JyrEntity> list = jyrService.findValid();
 		List<UserEntity> userList = userService
 				.findByRoleType(Constants.JYR_JZZY_ROLE_TYPE);
@@ -232,7 +232,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());
@@ -240,8 +243,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() + gksssbEntity.getGgxh()==null?"": gksssbEntity.getGgxh() + "即将到期", userEntity,
+						setGztx(gksssbEntity.getQymc().getGkjyr()
+								+ "的"
+								+ (gksssbEntity.getGgxh() == null ? "" : "型号为"
+										+ gksssbEntity.getGgxh() + "的")
+								+ gksssbEntity.getSsmc() + "即将到期", userEntity,
 								Constants.BUSTYPE_YXQ_SSSBXX, gksssbEntity
 										.getId().toString());
 					}
@@ -250,9 +256,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());
 					}
 				}
 			}
@@ -275,7 +284,7 @@ public class JyrSynTimer extends BaseController {
 
 	// 管理制度信息的定时同步
 	public void glzdSave() {
-		
+
 	}
 
 	/**