|
|
@@ -815,12 +815,12 @@ public class TechnicianServiceImpl extends BaseServiceImpl<TechnicianMapper, Tec
|
|
|
if (CollectionUtil.isEmpty(dataList)) {
|
|
|
throw new ServiceException("未能从模板中读取数据,请检查模板格式是否正确");
|
|
|
}
|
|
|
- for (XmTechnicianEntity excel : dataList) {
|
|
|
- String unicode = baseMapper.getUnicodeByNumberAndIdentityCard(excel.getNumber(), excel.getIdCard());
|
|
|
+ for (XmTechnicianEntity xmTechnician : dataList) {
|
|
|
+ String unicode = baseMapper.getUnicodeByNumberAndIdentityCard(xmTechnician.getNumber(), xmTechnician.getIdCard());
|
|
|
if (Func.isBlank(unicode)) {
|
|
|
- throw new ServiceException("工号[" + excel.getNumber() + "]/身份证[" + excel.getIdCard() + "]不存在");
|
|
|
+ throw new ServiceException("工号[" + xmTechnician.getNumber() + "]/身份证[" + xmTechnician.getIdCard() + "]不存在");
|
|
|
}
|
|
|
- Long xmId = xmMapper.getXmIdByXmmcOrXmbh(null, null, excel.getXmbh());
|
|
|
+ Long xmId = xmMapper.getXmIdByXmmcOrXmbh(null, null, xmTechnician.getXmbh());
|
|
|
if (Func.isNull(xmId)) {
|
|
|
throw new ServiceException("项目不存在,请检查数据");
|
|
|
}
|
|
|
@@ -831,7 +831,12 @@ public class TechnicianServiceImpl extends BaseServiceImpl<TechnicianMapper, Tec
|
|
|
eq(XmTechnicianEntity::getUnicode, unicode).
|
|
|
eq(XmTechnicianEntity::getXmId, xmId);
|
|
|
if (xmTechnicianMapper.selectCount(wrapper) == 0) {
|
|
|
- xmTechnicianMapper.insert(excel);
|
|
|
+ xmTechnician.setYearAndMonth(yearAndMonth);
|
|
|
+ xmTechnician.setXmId(xmId);
|
|
|
+ xmTechnician.setUnicode(unicode);
|
|
|
+ xmTechnician.setCreateDept(Long.valueOf(SecureUtil.getDeptId()));
|
|
|
+ xmTechnician.setCreateUser(SecureUtil.getUserId());
|
|
|
+ xmTechnicianMapper.insert(xmTechnician);
|
|
|
} else {
|
|
|
throw new ServiceException("科技人员已是参研人员,请勿重复添加");
|
|
|
}
|