rakor
/
nflg_project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'technology/rakor-w3' into technology-init-lhj1119

This commit is contained in:
曹鹏飞 2025-01-06 11:30:48 +08:00
parent 7981bf02eb cf4ec31dbd
commit cf293ab289
3 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/query/WorkingTypeQuery.java
View File

@ -20,10 +20,10 @@ public class WorkingTypeQuery implements Serializable {
@ApiModelProperty("名称") @ApiModelProperty("名称")
@NotBlank(message = "名称不能为空") @NotBlank(message = "名称不能为空")
@Length(max = 10, message = "名称不能超过10个字") @Length(max = 10, message = "名称不能超过10个字")
private String name; private String workingTypeName;
@ApiModelProperty("编号") @ApiModelProperty("编号")
@NotBlank(message = "编号不能为空") @NotBlank(message = "编号不能为空")
@Length(max = 10, message = "编号不能超过10个字") @Length(max = 10, message = "编号不能超过10个字")
private String code; private String workingTypeCode;
} }

29
nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/CostConfigService.java
View File

@ -61,18 +61,27 @@ public class CostConfigService {
manday.setHourlyWages(technologyConfigService.getHourlyWages()); manday.setHourlyWages(technologyConfigService.getHourlyWages());
manday.setBenefit(technologyConfigService.getBenefit()); manday.setBenefit(technologyConfigService.getBenefit());
vo.setManday(manday); vo.setManday(manday);
List<VirtualWorkingEntity> virtualWorkingEntities = virtualWorkingService.list(); List<VirtualWorkingItemVO> vos = new ArrayList<>();
if (CollectionUtil.isNotEmpty(virtualWorkingEntities)) { vo.setVirtualWorking(vos);
List<VirtualWorkingItemVO> vos = Convert.toList(VirtualWorkingItemVO.class, virtualWorkingEntities); List<WorkingTypeEntity> workingTypeEntities = workingTypeService.list();
List<WorkingTypeEntity> workingTypeEntities = workingTypeService.list(); if (CollectionUtil.isNotEmpty(workingTypeEntities)) {
vos.forEach(cvo -> { List<VirtualWorkingEntity> virtualWorkingEntities = virtualWorkingService.list();
WorkingTypeEntity wt = workingTypeEntities.stream().filter(w -> Objects.equals(w.getId(), cvo.getWorkingTypeId())).findFirst().orElse(null); workingTypeEntities.forEach(wt -> {
if (Objects.nonNull(wt)) { VirtualWorkingEntity vw = virtualWorkingEntities.stream()
cvo.setWorkingTypeName(wt.getName()); .filter(v -> Objects.equals(v.getWorkingTypeId(), wt.getId()))
cvo.setWorkingTypeCode(wt.getCode()); .findFirst()
.orElse(null);
VirtualWorkingItemVO itemVO;
if (Objects.isNull(vw)) {
itemVO = new VirtualWorkingItemVO();
itemVO.setWorkingTypeId(wt.getId());
} else {
itemVO = Convert.convert(VirtualWorkingItemVO.class, vw);
} }
itemVO.setWorkingTypeName(wt.getName());
itemVO.setWorkingTypeCode(wt.getCode());
vos.add(itemVO);
}); });
vo.setVirtualWorking(vos);
} }
return vo; return vo;
} }

4
nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/WorkingTypeService.java
View File

@ -37,8 +37,8 @@ public class WorkingTypeService extends ServiceImpl<WorkingTypeMapper, WorkingTy
list.forEach(l -> { list.forEach(l -> {
if (Objects.isNull(l.getId()) || 0 == l.getId()) { if (Objects.isNull(l.getId()) || 0 == l.getId()) {
WorkingTypeEntity entity = new WorkingTypeEntity(); WorkingTypeEntity entity = new WorkingTypeEntity();
entity.setName(l.getName()); entity.setName(l.getWorkingTypeName());
entity.setCode(l.getCode()); entity.setCode(l.getWorkingTypeCode());
entity.setCreateBy(SessionUtil.getRealName()); entity.setCreateBy(SessionUtil.getRealName());
entity.setCreateTime(LocalDateTime.now()); entity.setCreateTime(LocalDateTime.now());
forAdd.add(entity); forAdd.add(entity);