Commit 2595f6a5 authored by 赵啸非's avatar 赵啸非

添加离职管理

parent e8b6856c
...@@ -200,10 +200,7 @@ public class CompanyServiceImpl extends AbstractCRUDServiceImpl<CompanyDao, Comp ...@@ -200,10 +200,7 @@ public class CompanyServiceImpl extends AbstractCRUDServiceImpl<CompanyDao, Comp
homeStatInfo.setProductDistributionList(companyList); homeStatInfo.setProductDistributionList(companyList);
//发送名片分布 //发送名片分布
List<BussinesscardEntity> bussinesscardList = bussinesscardService.find(new BussinesscardQuery()); List<BussinesscardEntity> bussinesscardList = bussinesscardService.find(new BussinesscardQuery());
Map<String, Integer> collect = bussinesscardList.stream().collect(Collectors.groupingBy(x -> x.getCompanyId(), Collectors.summingInt(BussinesscardEntity::getSendBusinessCardTimes))); Map<String, Integer> collect = bussinesscardList.stream().collect(Collectors.groupingBy(x -> x.getCompanyId(), Collectors.summingInt(BussinesscardEntity::getSendBusinessCardTimes)));
/* Map<String, Integer> collect = staffList.stream().collect(Collectors.groupingBy(x -> x.getCompanyIds(), Collectors.summingInt(StaffEntity::getSendBusinessCardTimes))); /* Map<String, Integer> collect = staffList.stream().collect(Collectors.groupingBy(x -> x.getCompanyIds(), Collectors.summingInt(StaffEntity::getSendBusinessCardTimes)));
*/ */
......
...@@ -53,6 +53,7 @@ public class StaffServiceImpl extends AbstractCRUDCacheServiceImpl<StaffDao, Sta ...@@ -53,6 +53,7 @@ public class StaffServiceImpl extends AbstractCRUDCacheServiceImpl<StaffDao, Sta
staffLeave.initAttrValue(); staffLeave.initAttrValue();
BeanUtils.copyProperties(staffCache, staffLeave, BeanUtil.getNullPropertyNames(staffCache)); BeanUtils.copyProperties(staffCache, staffLeave, BeanUtil.getNullPropertyNames(staffCache));
staffLeave.setId(null); staffLeave.setId(null);
staffLeave.setCreateTime(new Date());
staffLeaveService.save(staffLeave, context); staffLeaveService.save(staffLeave, context);
} }
return Rest.ok(); return Rest.ok();
......
...@@ -113,7 +113,8 @@ public class StaffController extends BaseCRUDJsonBodyMappingController<StaffServ ...@@ -113,7 +113,8 @@ public class StaffController extends BaseCRUDJsonBodyMappingController<StaffServ
try { try {
Rest<Void> rest = this.service.leave(staff, getContext()); Rest<Void> rest = this.service.leave(staff, getContext());
ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS); ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
ret.put(KEY_RESULT_DATA, model); ret.put(KEY_RESULT_MSG,"员工离职成功!");
recordSysLog(request, busiDesc + "【成功】"); recordSysLog(request, busiDesc + "【成功】");
} catch (Exception e) { } catch (Exception e) {
log.error("离职", e); log.error("离职", e);
......
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