ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(文档对比): 评论

Browse Source
This commit is contained in:
yjz
2023-10-23 15:05:54 +08:00
parent a7275f1868
commit bcfe64047a
5 changed files with 41 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareResCommentServiceImpl.java
+26 -2
View File
@@ -7,7 +7,10 @@ import com.jero.modules.compare.entity.SarFileCompareResComVO;
import com.jero.modules.compare.entity.SarFileCompareResComment;
import com.jero.modules.compare.mapper.SarFileCompareResCommentMapper;
import com.jero.modules.compare.service.ISarFileCompareResCommentService;
import com.jero.modules.system.entity.SysUser;
import com.jero.modules.system.service.ISysUserService;
import com.jero.modules.system.util.MyStringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.text.SimpleDateFormat;
@@ -23,6 +26,8 @@ import java.util.*;
public class SarFileCompareResCommentServiceImpl extends ServiceImpl<SarFileCompareResCommentMapper, SarFileCompareResComment> implements ISarFileCompareResCommentService {
private static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@Autowired
private ISysUserService sysUserService;
/**
* 保存
@@ -111,15 +116,26 @@ public class SarFileCompareResCommentServiceImpl extends ServiceImpl<SarFileComp
resList.add(resComVO);
}
}
// 填充属性
for (SarFileCompareResComVO sarFileCompareResComVO : resList) {
SysUser user = sysUserService.getUserByName(sarFileCompareResComVO.getName());
if (!Objects.isNull(user)){
sarFileCompareResComVO.setName(user.calcNameWorkNo());
}
}
return resList;
}
private SarFileCompareResComVO wrapperSarFileCompareResComVO(SarFileCompareResComment rc) {
SarFileCompareResComVO resComVO = new SarFileCompareResComVO();
resComVO.setId(rc.getId());
resComVO.setName(rc.getCreateBy());
resComVO.setCreateTime(sdf.format(rc.getCreateTime()));
resComVO.setContent(rc.getComment());
// 填充属性
SysUser user = sysUserService.getUserByName(rc.getCreateBy());
if (!Objects.isNull(user)){
resComVO.setName(user.calcNameWorkNo());
}
return resComVO;
}
@@ -154,6 +170,14 @@ public class SarFileCompareResCommentServiceImpl extends ServiceImpl<SarFileComp
resCommentMap.put(prcVo.getId(), prcVo);
}
}
return Lists.newArrayList(resCommentMap.values());
ArrayList<SarFileCompareResComVO> sarFileCompareResComVOS = Lists.newArrayList(resCommentMap.values());
// 填充属性
for (SarFileCompareResComVO sarFileCompareResComVO : sarFileCompareResComVOS) {
SysUser user = sysUserService.getUserByName(sarFileCompareResComVO.getName());
if (!Objects.isNull(user)){
sarFileCompareResComVO.setName(user.calcNameWorkNo());
}
}
return sarFileCompareResComVOS;
}
}