|
@@ -247,21 +247,23 @@ public class UserInfoServiceImpl implements IUserInfoService {
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
- for (OdsQssHsjcxx odsQssHsjcxx : OdsQssHsjcxxList) {
|
|
|
|
- for (UserInfo userInfo : userList) {
|
|
|
|
- if (userInfo.getIdCard().equals(odsQssHsjcxx.getSfzhm())) {
|
|
|
|
- UserNucleicTime userNucleicTime = new UserNucleicTime();
|
|
|
|
- userNucleicTime.setInfoId(userInfo.getId());
|
|
|
|
- userNucleicTime.setIdCard(odsQssHsjcxx.getSfzhm());
|
|
|
|
- userNucleicTime.setCollectPlace(odsQssHsjcxx.getJcdd());
|
|
|
|
- userNucleicTime.setNucleicCollectTime(odsQssHsjcxx.getCjsj());
|
|
|
|
- userNucleicTime.setNucleicResultsTime(odsQssHsjcxx.getJgcjss());
|
|
|
|
- userNucleicTime.setJobStyle(jobStyle);
|
|
|
|
- userNucleicTime.setFocusCrowdStyle(focusCrowdStyle);
|
|
|
|
- userNucleicTime.setName(userInfo.getName());
|
|
|
|
- userNucleicTime.setPhoneNum(userInfo.getPhoneNum());
|
|
|
|
- userNucleicTime.setDeptId(user.getDeptId().toString());
|
|
|
|
- UserNucleicTimeList.add(userNucleicTime);
|
|
|
|
|
|
+ if (OdsQssHsjcxxList != null && OdsQssHsjcxxList.size() > 0) {
|
|
|
|
+ for (OdsQssHsjcxx odsQssHsjcxx : OdsQssHsjcxxList) {
|
|
|
|
+ for (UserInfo userInfo : userList) {
|
|
|
|
+ if (userInfo.getIdCard().equals(odsQssHsjcxx.getSfzhm())) {
|
|
|
|
+ UserNucleicTime userNucleicTime = new UserNucleicTime();
|
|
|
|
+ userNucleicTime.setInfoId(userInfo.getId());
|
|
|
|
+ userNucleicTime.setIdCard(odsQssHsjcxx.getSfzhm());
|
|
|
|
+ userNucleicTime.setCollectPlace(odsQssHsjcxx.getJcdd());
|
|
|
|
+ userNucleicTime.setNucleicCollectTime(odsQssHsjcxx.getCjsj());
|
|
|
|
+ userNucleicTime.setNucleicResultsTime(odsQssHsjcxx.getJgcjss());
|
|
|
|
+ userNucleicTime.setJobStyle(jobStyle);
|
|
|
|
+ userNucleicTime.setFocusCrowdStyle(focusCrowdStyle);
|
|
|
|
+ userNucleicTime.setName(userInfo.getName());
|
|
|
|
+ userNucleicTime.setPhoneNum(userInfo.getPhoneNum());
|
|
|
|
+ userNucleicTime.setDeptId(user.getDeptId().toString());
|
|
|
|
+ UserNucleicTimeList.add(userNucleicTime);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|