luyan
/
epmet-cloud-rizhao0920
forked from rongchao/epmet-cloud-rizhao
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/dev_staff_info' into develop 

# Conflicts:
#	epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/InfoServiceImpl.java
dev
yinzuomei 4 years ago
parent
1acf472b3f 78f90a7026
commit
a28ceebd37
1 changed files with 10 additions and 10 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/InfoServiceImpl.java

20
epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/InfoServiceImpl.java
View File

@ -157,7 +157,7 @@ public class InfoServiceImpl extends BaseServiceImpl<InfoDao, InfoEntity> implem
userMessageEntity.setTitle(UserMessageConstans.INFO_TITLE); userMessageEntity.setTitle(UserMessageConstans.INFO_TITLE);
userMessageEntity.setMessageContent(String.format(UserMessageConstans.INFO_CONTENT_TEMP, userMessageEntity.setMessageContent(String.format(UserMessageConstans.INFO_CONTENT_TEMP,
infoEntity.getContent().length() > NumConstant.FIFTY ? infoEntity.getContent().length() > NumConstant.FIFTY ?
StringUtils.substring(infoEntity.getContent(), NumConstant.ZERO,NumConstant.FORTY_NINE) : infoEntity.getContent())); StringUtils.substring(infoEntity.getContent(), NumConstant.ZERO,NumConstant.FORTY_NINE) : infoEntity.getContent()));
userMessageEntity.setReadFlag(UserMessageConstans.UNREAD); userMessageEntity.setReadFlag(UserMessageConstans.UNREAD);
userMessageEntity.setMessageType(UserMessageConstans.MESSAGE_TYPE_INFO); userMessageEntity.setMessageType(UserMessageConstans.MESSAGE_TYPE_INFO);
userMessageEntity.setTargetId(infoEntity.getId()); userMessageEntity.setTargetId(infoEntity.getId());
@ -237,14 +237,14 @@ public class InfoServiceImpl extends BaseServiceImpl<InfoDao, InfoEntity> implem
infoReplyDao.insert(infoReplyEntity); infoReplyDao.insert(infoReplyEntity);
int sort=1; int sort=1;
if(StringUtils.isNotBlank(formDTO.getContent())){ if(StringUtils.isNotBlank(formDTO.getContent())){
InfoReplyContentEntity contentEntity=new InfoReplyContentEntity(); InfoReplyContentEntity contentEntity=new InfoReplyContentEntity();
contentEntity.setCustomerId(formDTO.getCustomerId()); contentEntity.setCustomerId(formDTO.getCustomerId());
contentEntity.setInfoReplyId(infoReplyEntity.getId()); contentEntity.setInfoReplyId(infoReplyEntity.getId());
contentEntity.setReplyType("text"); contentEntity.setReplyType("text");
contentEntity.setContent(formDTO.getContent()); contentEntity.setContent(formDTO.getContent());
contentEntity.setSort(sort); contentEntity.setSort(sort);
infoReplyContentDao.insert(contentEntity); infoReplyContentDao.insert(contentEntity);
sort++; sort++;
} }
if(CollectionUtils.isNotEmpty(formDTO.getAttachmentList())){ if(CollectionUtils.isNotEmpty(formDTO.getAttachmentList())){
for(FileCommonDTO att:formDTO.getAttachmentList()) { for(FileCommonDTO att:formDTO.getAttachmentList()) {
@ -358,7 +358,7 @@ public class InfoServiceImpl extends BaseServiceImpl<InfoDao, InfoEntity> implem
orgStaffFormDTO.setCustomerId(customerId); orgStaffFormDTO.setCustomerId(customerId);
for(OrgCommonDTO org:orgList){ for(OrgCommonDTO org:orgList){
if(OrgTypeEnum.GRID.getCode().equals(org.getOrgType())){ if(OrgTypeEnum.GRID.getCode().equals(org.getOrgType())){
orgStaffFormDTO.getGridIds().add(org.getOrgId()); orgStaffFormDTO.getGridIds().add(org.getOrgId());
}else if(OrgTypeEnum.AGENCY.getCode().equals(org.getOrgType())){ }else if(OrgTypeEnum.AGENCY.getCode().equals(org.getOrgType())){
orgStaffFormDTO.getAgencyIds().add(org.getOrgId()); orgStaffFormDTO.getAgencyIds().add(org.getOrgId());
}else if(OrgTypeEnum.DEPT.getCode().equals(org.getOrgType())){ }else if(OrgTypeEnum.DEPT.getCode().equals(org.getOrgType())){

Write Preview
Loading…
Cancel
Save