|
@@ -133,29 +133,34 @@ public class AccountantReimbursementUserServiceImpl implements AccountantReimbur
|
|
|
@Override
|
|
|
@Transactional(readOnly = false)
|
|
|
public Map<String,Object> delete(List<String> idList) {
|
|
|
- Map<String,Object> map = new HashMap<>();
|
|
|
- List<String> userName = Lists.newArrayList();
|
|
|
- //删除发票信息
|
|
|
- //判断该人员该年度是否已经存在报销情况,如存在则不可以删除
|
|
|
- //根据id集合查询人员信息
|
|
|
- for (String id: idList) {
|
|
|
- AccountantReimbursementUserDTO reimbursementUserDTO = mapper.queryById(id);
|
|
|
- AccountantReimbursementBusinessDTO reimbursementBusiness = new AccountantReimbursementBusinessDTO();
|
|
|
- reimbursementBusiness.setUserId(reimbursementUserDTO.getUserId());
|
|
|
- reimbursementBusiness.setYear(reimbursementUserDTO.getYear());
|
|
|
- List<AccountantReimbursementBusinessDTO> list = businessMapper.findListByUserIdAndYear(reimbursementBusiness);
|
|
|
- if(list.size()>0){
|
|
|
- userName.add(reimbursementUserDTO.getUser().getName());
|
|
|
+ Map<String, Object> map = new HashMap<>();
|
|
|
+ if(idList.size()>0) {
|
|
|
+ List<String> userName = Lists.newArrayList();
|
|
|
+ //删除发票信息
|
|
|
+ //判断该人员该年度是否已经存在报销情况,如存在则不可以删除
|
|
|
+ //根据id集合查询人员信息
|
|
|
+ for (String id : idList) {
|
|
|
+ AccountantReimbursementUserDTO reimbursementUserDTO = mapper.queryById(id);
|
|
|
+ AccountantReimbursementBusinessDTO reimbursementBusiness = new AccountantReimbursementBusinessDTO();
|
|
|
+ reimbursementBusiness.setUserId(reimbursementUserDTO.getUserId());
|
|
|
+ reimbursementBusiness.setYear(reimbursementUserDTO.getYear());
|
|
|
+ List<AccountantReimbursementBusinessDTO> list = businessMapper.findListByUserIdAndYear(reimbursementBusiness);
|
|
|
+ if (list.size() > 0) {
|
|
|
+ userName.add(reimbursementUserDTO.getUser().getName());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (userName.size() > 0) {
|
|
|
+ map.put("success", false);
|
|
|
+ String userNames = StringUtils.join(userName, "、");
|
|
|
+ map.put("message", "员工 " + userNames + " 存在已报销情况,本次删除失败");
|
|
|
+ } else {
|
|
|
+ mapper.delete(idList);
|
|
|
+ map.put("success", true);
|
|
|
+ map.put("message", "删除成功");
|
|
|
}
|
|
|
- }
|
|
|
- if(userName.size()>0){
|
|
|
- map.put("success",false);
|
|
|
- String userNames = StringUtils.join(userName, "、");
|
|
|
- map.put("message", "员工 " + userNames + " 存在已报销情况,本次删除失败");
|
|
|
}else{
|
|
|
- mapper.delete(idList);
|
|
|
- map.put("success",true);
|
|
|
- map.put("message", "删除成功");
|
|
|
+ map.put("success", false);
|
|
|
+ map.put("message", "没有需要删除的数据");
|
|
|
}
|
|
|
return map;
|
|
|
}
|