|
|
|
|
@ -22,6 +22,7 @@ import org.springblade.desk.quality.pojo.vo.LiquidTankTaskVO; |
|
|
|
|
import org.springblade.desk.basic.util.IdUtil; |
|
|
|
|
import org.springblade.system.feign.IDictClient; |
|
|
|
|
import org.springblade.system.feign.IUserClient; |
|
|
|
|
import org.springblade.system.pojo.entity.User; |
|
|
|
|
import org.springblade.system.pojo.entity.UserInfo; |
|
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
|
|
|
|
|
|
@ -82,7 +83,10 @@ public class LiquidTankTaskSetVoService { |
|
|
|
|
if(null != r){ |
|
|
|
|
UserInfo testUI = r.getData(); |
|
|
|
|
if (testUI != null) { |
|
|
|
|
vo.setTestUserRealName(testUI.getUser().getRealName()); |
|
|
|
|
User usr = testUI.getUser(); |
|
|
|
|
if(usr != null){ |
|
|
|
|
vo.setTestUserRealName(usr.getRealName()); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
@ -92,7 +96,11 @@ public class LiquidTankTaskSetVoService { |
|
|
|
|
if(null != r){ |
|
|
|
|
UserInfo repeatTestUI = r.getData(); |
|
|
|
|
if (repeatTestUI != null) { |
|
|
|
|
vo.setRepeatTestUserRealName(repeatTestUI.getUser().getRealName()); |
|
|
|
|
User usr = repeatTestUI.getUser(); |
|
|
|
|
if(usr != null){ |
|
|
|
|
vo.setRepeatTestUserRealName(usr.getRealName()); |
|
|
|
|
} |
|
|
|
|
// vo.setRepeatTestUserRealName(repeatTestUI.getUser().getRealName());
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@ -107,7 +115,11 @@ public class LiquidTankTaskSetVoService { |
|
|
|
|
if(null != r){ |
|
|
|
|
UserInfo processUI = r.getData(); |
|
|
|
|
if (processUI != null) { |
|
|
|
|
vo.setProcessUserRealName(processUI.getUser().getRealName()); |
|
|
|
|
User usr = processUI.getUser(); |
|
|
|
|
if(usr != null){ |
|
|
|
|
vo.setProcessUserRealName(usr.getRealName()); |
|
|
|
|
} |
|
|
|
|
// vo.setProcessUserRealName(processUI.getUser().getRealName());
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@ -123,7 +135,11 @@ public class LiquidTankTaskSetVoService { |
|
|
|
|
if(null != r){ |
|
|
|
|
UserInfo reviewUI = r.getData(); |
|
|
|
|
if (reviewUI != null) { |
|
|
|
|
vo.setReviewUserRealName(reviewUI.getUser().getRealName()); |
|
|
|
|
User usr = reviewUI.getUser(); |
|
|
|
|
if(usr != null){ |
|
|
|
|
vo.setReviewUserRealName(usr.getRealName()); |
|
|
|
|
} |
|
|
|
|
// vo.setReviewUserRealName(reviewUI.getUser().getRealName());
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@ -140,7 +156,11 @@ public class LiquidTankTaskSetVoService { |
|
|
|
|
if(null != r){ |
|
|
|
|
UserInfo sendUI = r.getData(); |
|
|
|
|
if (sendUI != null) { |
|
|
|
|
vo.setSendDurgUserRealName(sendUI.getUser().getRealName()); |
|
|
|
|
User usr = sendUI.getUser(); |
|
|
|
|
if(usr != null){ |
|
|
|
|
vo.setSendDurgUserRealName(usr.getRealName()); |
|
|
|
|
} |
|
|
|
|
// vo.setSendDurgUserRealName(sendUI.getUser().getRealName());
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@ -156,7 +176,11 @@ public class LiquidTankTaskSetVoService { |
|
|
|
|
if(null != r){ |
|
|
|
|
UserInfo receiveUI = r.getData(); |
|
|
|
|
if (receiveUI != null) { |
|
|
|
|
vo.setReceiveDurgUserRealName(receiveUI.getUser().getRealName()); |
|
|
|
|
User usr = receiveUI.getUser(); |
|
|
|
|
if(usr != null){ |
|
|
|
|
vo.setReceiveDurgUserRealName(usr.getRealName()); |
|
|
|
|
} |
|
|
|
|
// vo.setReceiveDurgUserRealName(receiveUI.getUser().getRealName());
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|