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

fix(标准化活动): bug修复

Browse Source
This commit is contained in:
yjz
2023-12-22 09:28:18 +08:00
parent 69b274237a
commit 3a83604720
1 changed files with 32 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java
+32 -16
View File
@@ -18,6 +18,7 @@ import com.jero.modules.system.entity.SysUser;
import com.jero.modules.system.service.ISysDepartService;
import com.jero.modules.system.service.ISysUserService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
@@ -391,22 +392,7 @@ public class LawsStandardizationServiceImpl extends ServiceImpl<LawsStandardizat
.orderByDesc(LawsStandardizationGroup::getCreateTime));
for (LawsStandardizationGroup lawsStandardizationGroup : lawsStandardizationGroupList) {
// 人员信息
if (StringUtils.isNotBlank(lawsStandardizationGroup.getPersonnelId())){
// 我司人员
SysUser sysUser = sysUserService.getOne(new LambdaQueryWrapper<SysUser>()
.eq(SysUser::getId, lawsStandardizationGroup.getPersonnelId()));
lawsStandardizationGroup.setPersonnel(sysUser.getRealname());
// 工号
lawsStandardizationGroup.setJobNum(sysUser.getUsername());
//部门
List<SysDepart> sysDeparts = sysDepartService.queryUserDeparts(sysUser.getId());
String departNames = sysDeparts.stream().map(SysDepart::getDepartName).collect(Collectors.joining(","));
lawsStandardizationGroup.setDepartment(departNames);
// 电话
lawsStandardizationGroup.setPhone(sysUser.getPhone());
// 邮箱
lawsStandardizationGroup.setMailbox(sysUser.getEmail());
}
setUserInfo(lawsStandardizationGroup);
// 文件信息
List<OSSFile> ossFileList = ossFileService.list(
@@ -421,6 +407,36 @@ public class LawsStandardizationServiceImpl extends ServiceImpl<LawsStandardizat
return lawsStandardizationGroupList;
}
private void setUserInfo(LawsStandardizationGroup lawsStandardizationGroup) {
if (StringUtils.isNotBlank(lawsStandardizationGroup.getPersonnelId())){
// 我司人员
SysUser sysUser = sysUserService.getOne(new LambdaQueryWrapper<SysUser>()
.eq(SysUser::getId, lawsStandardizationGroup.getPersonnelId()), false);
lawsStandardizationGroup.setPersonnel(sysUser.getRealname());
// 工号
lawsStandardizationGroup.setJobNum(sysUser.getUsername());
//部门
if (StringUtils.isBlank(lawsStandardizationGroup.getDepartment())
&& StringUtils.isNotBlank(sysUser.getDepartIds())){
List<SysDepart> sysDeparts = sysDepartService.queryUserDeparts(sysUser.getId());
if (CollectionUtils.isNotEmpty(sysDeparts)){
String departNames = sysDeparts.stream().map(SysDepart::getDepartName).collect(Collectors.joining(","));
lawsStandardizationGroup.setDepartment(departNames);
}
}
// 电话
if (StringUtils.isBlank(lawsStandardizationGroup.getPhone())
&& StringUtils.isNotBlank(sysUser.getPhone())){
lawsStandardizationGroup.setPhone(sysUser.getPhone());
}
// 邮箱
if (StringUtils.isBlank(lawsStandardizationGroup.getMailbox())
&& StringUtils.isNotBlank(sysUser.getEmail())){
lawsStandardizationGroup.setMailbox(sysUser.getEmail());
}
}
}
@Override
public List<LawsStandardizationPayment> queryPaymentByStandardizationId(String standardizationId) {
List<LawsStandardizationPayment> lawsStandardizationPaymentList = lawsStandardizationPaymentService.list(