|
|
|
@ -1,12 +1,10 @@
|
|
|
|
|
package com.hnac.hzims.operational.defect.wrapper; |
|
|
|
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
|
|
import com.hnac.hzims.operational.defect.entity.OperDefectStatisticsEntity; |
|
|
|
|
import com.hnac.hzims.operational.defect.vo.OperDefectStatisticsVO; |
|
|
|
|
import org.springblade.core.mp.support.BaseEntityWrapper; |
|
|
|
|
import org.springblade.core.tool.utils.BeanUtil; |
|
|
|
|
import org.springblade.core.tool.utils.Func; |
|
|
|
|
import org.springblade.system.entity.Dept; |
|
|
|
|
import org.springblade.system.user.cache.UserCache; |
|
|
|
|
import org.springblade.system.user.entity.User; |
|
|
|
|
|
|
|
|
@ -30,19 +28,22 @@ public class OperDefectStatisticsWrapper extends BaseEntityWrapper<OperDefectSta
|
|
|
|
|
User updateUser = UserCache.getUser(entity.getUpdateUser()); |
|
|
|
|
vo.setCreateUserName(createUser == null ? "" : createUser.getName()); |
|
|
|
|
vo.setUpdateUserName(updateUser == null ? "" : updateUser.getName()); |
|
|
|
|
|
|
|
|
|
if (Func.isNotEmpty(entity.getConclusionPeople())) { |
|
|
|
|
User userC = UserCache.getUser(entity.getConclusionPeople()); |
|
|
|
|
vo.setConclusionPeopleName(userC == null ? "" : userC.getName()); |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
if (Func.isNotEmpty(entity.getFinder())) { |
|
|
|
|
User userF = UserCache.getUser(entity.getFinder()); |
|
|
|
|
vo.setFinderName(userF == null ? "" : userF.getName()); |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
if (Func.isNotEmpty(entity.getDiscriminator())) { |
|
|
|
|
User userD = UserCache.getUser(entity.getDiscriminator()); |
|
|
|
|
vo.setDiscriminatorName(userD == null ? "" : userD.getName()); |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
if (Func.isNotEmpty(entity.getHandler())) { |
|
|
|
|
User userHn = UserCache.getUser(entity.getHandler()); |
|
|
|
|
vo.setHandlerName(userHn == null ? "" : userHn.getName()); |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
// 赋值消缺处理人名称
|
|
|
|
|
vo.setPlanHandlerName(Optional.ofNullable(entity.getPlanHandler()).map(Long::parseLong).map(UserCache::getUser).map(User::getName).orElse(entity.getPlanHandler())); |
|
|
|
|
// 赋值两票工作负责人名称
|
|
|
|
|