diff --git a/src/main/java/com/ydool/staff/controller/OrganizationController.java b/src/main/java/com/ydool/staff/controller/OrganizationController.java index 431ceaf..1b4895c 100644 --- a/src/main/java/com/ydool/staff/controller/OrganizationController.java +++ b/src/main/java/com/ydool/staff/controller/OrganizationController.java @@ -49,8 +49,9 @@ public class OrganizationController extends BaseController { @GetMapping(value = "/approval") @ApiOperation(value = "招聘单号") - public AjaxResult approval() { - return organizationService.approval(); + @ApiImplicitParams({@ApiImplicitParam(value = "企业id", name = "id", required = true)}) + public AjaxResult approval(@RequestParam("id") String id) { + return organizationService.approval(id); } @GetMapping("/submitRecruitment") diff --git a/src/main/java/com/ydool/staff/entity/Places.java b/src/main/java/com/ydool/staff/entity/Places.java index 9927905..d96d987 100644 --- a/src/main/java/com/ydool/staff/entity/Places.java +++ b/src/main/java/com/ydool/staff/entity/Places.java @@ -18,9 +18,11 @@ public class Places extends BaseEntity { private String organizationId; @ApiModelProperty(value = "单号") - private String odd; - @ApiModelProperty(value = "状态") + @ApiModelProperty(value = "状态") private Boolean status; + + @ApiModelProperty(value = "人数") + private Long sum; } diff --git a/src/main/java/com/ydool/staff/service/IOrganizationService.java b/src/main/java/com/ydool/staff/service/IOrganizationService.java index fe9731c..a6b401a 100644 --- a/src/main/java/com/ydool/staff/service/IOrganizationService.java +++ b/src/main/java/com/ydool/staff/service/IOrganizationService.java @@ -23,6 +23,6 @@ public interface IOrganizationService { AjaxResult submitRecruitment(String id, String type); - AjaxResult approval(); + AjaxResult approval(String id); } diff --git a/src/main/java/com/ydool/staff/service/impl/AuditServiceImpl.java b/src/main/java/com/ydool/staff/service/impl/AuditServiceImpl.java index ac9ccde..56e47f6 100644 --- a/src/main/java/com/ydool/staff/service/impl/AuditServiceImpl.java +++ b/src/main/java/com/ydool/staff/service/impl/AuditServiceImpl.java @@ -311,15 +311,16 @@ public class AuditServiceImpl extends BaseService implements organization.setLastInstance(auditRequest.getAuditOpinion()); organizationMapper.updateById(organization); } + List recruitments = recruitmentMapper.selectList(Wrappers.lambdaQuery(Recruitment.class).eq(Recruitment::getCompanyId, organization.getId())); + long sum = recruitments.stream().mapToLong(Recruitment::getPlaces).sum(); // 生成单号 Places places = new Places(); places.setStatus(Boolean.FALSE); + places.setSum(sum); places.setCompanyId(organization.getCompanyId()); places.setOrganizationId(organization.getId()); places.setOdd(DateUtil.format(DateUtil.date(), "yyyyMMddHHmmss" + getNextId())); placesMapper.insert(places); - // List recruitments = recruitmentMapper.selectList(Wrappers.lambdaQuery(Recruitment.class).eq(Recruitment::getCompanyId, organization.getId())); - // List list = recruitments.stream().map(Recruitment::getPlaces).collect(Collectors.toList()); // for (Long aLong : list) { // for (int i = 0; i < aLong.intValue(); i++) { // Places places = new Places(); diff --git a/src/main/java/com/ydool/staff/service/impl/OrganizationServiceImpl.java b/src/main/java/com/ydool/staff/service/impl/OrganizationServiceImpl.java index 06f420c..9806a34 100644 --- a/src/main/java/com/ydool/staff/service/impl/OrganizationServiceImpl.java +++ b/src/main/java/com/ydool/staff/service/impl/OrganizationServiceImpl.java @@ -161,8 +161,11 @@ public class OrganizationServiceImpl extends BaseService places = placesMapper.selectList(Wrappers.lambdaQuery(Places.class).eq(Places::getStatus, Boolean.FALSE).orderByAsc(Places::getOdd)); + public AjaxResult approval(String id) { + List places = placesMapper.selectList(Wrappers.lambdaQuery(Places.class) + .eq(Places::getCompanyId, id) + .eq(Places::getStatus, Boolean.FALSE) + .orderByAsc(Places::getOdd)); return AjaxResult.ok().data(BeanUtil.copyToList(places, PlacesDto.class)); } }