解决冲突

yun-zuoyi
Silliter 6 years ago
parent cc3bb9e9ae
commit 8fa14247f5

@ -263,7 +263,6 @@ public class CoreHqlPack {
HqlPack.getStringLikerPack(message.getMessageSenderNameRdd(),"messageSenderNameRdd",result); HqlPack.getStringLikerPack(message.getMessageSenderNameRdd(),"messageSenderNameRdd",result);
HqlPack.getStringLikerPack(message.getMessageReceiversNameRdd(),"messageReceiversNameRdd",result); HqlPack.getStringLikerPack(message.getMessageReceiversNameRdd(),"messageReceiversNameRdd",result);
HqlPack.timeBuilder(message.getMessageSendTime(),"messageSendTime", result, false,false); HqlPack.timeBuilder(message.getMessageSendTime(),"messageSendTime", result, false,false);
HqlPack.getNumEqualPack(message.getMessageSenderId(),"messageSenderId",result);
return result.toString(); return result.toString();
} }
@ -277,7 +276,7 @@ public class CoreHqlPack {
StringBuffer result = new StringBuffer(); StringBuffer result = new StringBuffer();
// hql拼接 // hql拼接
HqlPack.getStringLikerPack(file.getFileOriginalName(),"fileOriginalName",result); HqlPack.getStringLikerPack(file.getName(),"name",result);
HqlPack.getNumEqualPack(file.getFileTypeId(),"fileTypeId",result); HqlPack.getNumEqualPack(file.getFileTypeId(),"fileTypeId",result);
HqlPack.getStringLikerPack(file.getCreateUser(),"createUser",result); HqlPack.getStringLikerPack(file.getCreateUser(),"createUser",result);
HqlPack.timeBuilder(file.getCreateDatetime(),"createDatetime",result,false,false); HqlPack.timeBuilder(file.getCreateDatetime(),"createDatetime",result,false,false);
@ -363,7 +362,6 @@ public class CoreHqlPack {
// and // and
HqlPack.getStringEqualPack(dictionary.getDictionaryValue(),"dictionaryValue",result); HqlPack.getStringEqualPack(dictionary.getDictionaryValue(),"dictionaryValue",result);
HqlPack.getNumEqualPack(dictionary.getParentId(),"parentId",result);
// not // not
HqlPack.getNumNOEqualPack(dictionary.getId(),"id",result); HqlPack.getNumNOEqualPack(dictionary.getId(),"id",result);
@ -480,11 +478,11 @@ public class CoreHqlPack {
StringBuffer result = new StringBuffer(); StringBuffer result = new StringBuffer();
HqlPack.getNumEqualPack(sysRefUserMessage.getMessageTypeRdd(),"messageTypeRdd",result); HqlPack.getNumEqualPack(sysRefUserMessage.getMessageTypeRdd(),"messageTypeRdd",result);
HqlPack.getNumEqualPack(sysRefUserMessage.getReceiverId(),"receiverId",result);
HqlPack.getStringLikerPack(sysRefUserMessage.getMessageTitleRdd(),"messageTitleRdd",result); HqlPack.getStringLikerPack(sysRefUserMessage.getMessageTitleRdd(),"messageTitleRdd",result);
HqlPack.getStringLikerPack(sysRefUserMessage.getMessageSenderNameRdd(),"messageSenderNameRdd",result); HqlPack.getStringLikerPack(sysRefUserMessage.getMessageSenderNameRdd(),"messageSenderNameRdd",result);
HqlPack.getNumEqualPack(sysRefUserMessage.getMessageStatus(),"messageStatus",result); HqlPack.getNumEqualPack(sysRefUserMessage.getMessageStatus(),"messageStatus",result);
HqlPack.getStringLikerPack(sysRefUserMessage.getReceiverTime(),"receiverTime",result); HqlPack.getStringLikerPack(sysRefUserMessage.getReceiverTime(),"receiverTime",result);
HqlPack.getNumEqualPack(sysRefUserMessage.getReceiverId(),"receiverId",result);
return result.toString(); return result.toString();
} }

Loading…
Cancel
Save