Commit 0e7859b1 authored by fangxinjiang's avatar fangxinjiang

Merge remote-tracking branch 'origin/MVP1.7.7' into MVP1.7.7

parents 9d044193 797119ed
......@@ -275,6 +275,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
EmployeeRegistrationVo excel;
int inNum = 0;
int outNum = 0;
List<EmployeeRegistration> insertList = new ArrayList<>();
for (int i = 0; i < excelVOList.size(); i++) {
excel = excelVOList.get(i);
// 插入
......@@ -294,12 +295,14 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), RegistConstants.IMPORT_EXIT_CHECK, excel));
continue;
}
insert.setDeptNo(selectVo.getDepartNo());
String error = registCheck(insert);
if (null != error) {
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), error, excel));
continue;
}
initRegistInfo(insert,user, selectVo);
insertList.add(insert);
//新增记录,新增操作记录
baseMapper.insert(insert);
if (CommonConstants.ONE_STRING.equals(insert.getFeedbackType())) {
......@@ -310,6 +313,8 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
logService.saveLog(insert.getId(), CommonConstants.ZERO_STRING,RegistConstants.MESSAGE_REGIST, LocalDateTime.now(),
insert.getRegistorUsername(),null);
}
if (!Common.isEmpty(insertList)) {
insertList.clear();
//发送企业微信待办
EmployeeRegistration msgRegistration = new EmployeeRegistration();
msgRegistration.setInNum(inNum);
......@@ -318,7 +323,8 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
msgRegistration.setDeptName(selectVo.getDepartName());
msgRegistration.setDeptNo(selectVo.getDepartNo());
//企业微信消息提醒
sendMessageToWx(msgRegistration,CommonConstants.THREE_STRING);
sendMessageToWx(msgRegistration, CommonConstants.THREE_STRING);
}
}
......@@ -452,7 +458,6 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
insert.setCustomerPhone(selectVo.getCsPhone());
insert.setCustomerUsername(selectVo.getCsName());
insert.setCustomerUserLoginname(selectVo.getCsLoginName());
insert.setDeptNo(selectVo.getDepartNo());
insert.setDeptName(selectVo.getDepartName());
insert.setDeptId(selectVo.getId());
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment