From f4f9c84fbad0353a452216822cc1b642c4e5f52b Mon Sep 17 00:00:00 2001 From: mash Date: Mon, 20 Feb 2023 15:21:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E4=BA=8B=E4=BF=A1=E6=81=AF=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../staff/controller/AuditController.java | 9 +++ .../staff/controller/PersonnelController.java | 9 ++- .../staff/dto/PersonnelStatementDto.java | 36 ++++++++++++ .../ydool/staff/service/IAuditService.java | 2 + .../service/IPersonnelMiddleService.java | 3 + .../staff/service/IPersonnelService.java | 7 ++- .../staff/service/impl/AuditServiceImpl.java | 40 +++++++++++-- .../impl/PersonnelMiddleServiceImpl.java | 4 +- .../service/impl/PersonnelServiceImpl.java | 57 +++++++++++-------- 9 files changed, 134 insertions(+), 33 deletions(-) create mode 100644 src/main/java/com/ydool/staff/dto/PersonnelStatementDto.java diff --git a/src/main/java/com/ydool/staff/controller/AuditController.java b/src/main/java/com/ydool/staff/controller/AuditController.java index 5758599..2caf22f 100644 --- a/src/main/java/com/ydool/staff/controller/AuditController.java +++ b/src/main/java/com/ydool/staff/controller/AuditController.java @@ -5,6 +5,7 @@ import com.ydool.common.base.BaseController; import com.ydool.common.constant.UrlConstant; import com.ydool.common.data.dto.AjaxResult; import com.ydool.staff.dto.AuditLogDto; +import com.ydool.staff.dto.PersonnelStatementDto; import com.ydool.staff.request.AuditRequest; import com.ydool.staff.service.IAuditLogService; import com.ydool.staff.service.IAuditService; @@ -62,4 +63,12 @@ public class AuditController extends BaseController { } return AjaxResult.fail().msg("审批状态错误"); } + @GetMapping("perStatement") + @ApiOperation(value = "人事信息报表",response = PersonnelStatementDto.class) + @ApiImplicitParam(name = "id",value = "企业id") + public AjaxResult perStatement(String id) { + return auditService.perStatement(id); + } + + } diff --git a/src/main/java/com/ydool/staff/controller/PersonnelController.java b/src/main/java/com/ydool/staff/controller/PersonnelController.java index 4a09baa..3c458f4 100644 --- a/src/main/java/com/ydool/staff/controller/PersonnelController.java +++ b/src/main/java/com/ydool/staff/controller/PersonnelController.java @@ -60,9 +60,12 @@ public class PersonnelController extends BaseController { @GetMapping("getById") @ApiOperation(value = "查询一条",response = PersonnelUpdateDto.class) - @ApiImplicitParam(name = "id",value = "id" ) - public AjaxResult getById(String id){ - return personnelService.getById(id); + @ApiImplicitParams({ + @ApiImplicitParam(name = "id",value = "id" ), + @ApiImplicitParam(name = "type",value = "类型，修改传update，审批传audit" ), + }) + public AjaxResult getById(String id,String type){ + return personnelService.getById(id,type); } @PostMapping(value = "savePersonnel") diff --git a/src/main/java/com/ydool/staff/dto/PersonnelStatementDto.java b/src/main/java/com/ydool/staff/dto/PersonnelStatementDto.java new file mode 100644 index 0000000..4bc1fb0 --- /dev/null +++ b/src/main/java/com/ydool/staff/dto/PersonnelStatementDto.java @@ -0,0 +1,36 @@ +package com.ydool.staff.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author msh + * @version 1.0 + * @date 2023/2/20 13:59 + */ +@Data +public class PersonnelStatementDto { + @ApiModelProperty(value = "主管部门名称") + private String competentDeptName; + + @ApiModelProperty(value = "统一社会信用代码") + private String socialCreditCode; + + @ApiModelProperty(value = "国有企业名称") + private String competent; + + @ApiModelProperty(value = "注册资本") + private Integer capital; + + @ApiModelProperty(value = "内设机构数") + private Integer mechanismNum; + + @ApiModelProperty(value = "用工计划数") + private Integer EmploymentNum; + + @ApiModelProperty(value = "现用工人数") + private Integer num; + + @ApiModelProperty(value = "其中：用工计划数") + private Integer thereIntoNum; +} diff --git a/src/main/java/com/ydool/staff/service/IAuditService.java b/src/main/java/com/ydool/staff/service/IAuditService.java index dff29b1..2a2e73c 100644 --- a/src/main/java/com/ydool/staff/service/IAuditService.java +++ b/src/main/java/com/ydool/staff/service/IAuditService.java @@ -20,5 +20,7 @@ public interface IAuditService { Integer saveAuditLog(String personnelId,String approverId,String auditSate); + AjaxResult perStatement(String id); + } diff --git a/src/main/java/com/ydool/staff/service/IPersonnelMiddleService.java b/src/main/java/com/ydool/staff/service/IPersonnelMiddleService.java index 1918b99..ea41514 100644 --- a/src/main/java/com/ydool/staff/service/IPersonnelMiddleService.java +++ b/src/main/java/com/ydool/staff/service/IPersonnelMiddleService.java @@ -1,5 +1,7 @@ package com.ydool.staff.service; +import com.ydool.staff.entity.PersonnelMiddle; + /** *

* 人员修改中间表 服务类 @@ -10,5 +12,6 @@ package com.ydool.staff.service; */ public interface IPersonnelMiddleService { + Boolean savePer(PersonnelMiddle middle); } diff --git a/src/main/java/com/ydool/staff/service/IPersonnelService.java b/src/main/java/com/ydool/staff/service/IPersonnelService.java index 34d91db..9cdfaa0 100644 --- a/src/main/java/com/ydool/staff/service/IPersonnelService.java +++ b/src/main/java/com/ydool/staff/service/IPersonnelService.java @@ -2,6 +2,7 @@ package com.ydool.staff.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ydool.common.data.dto.AjaxResult; +import com.ydool.staff.dto.AttachmentDto; import com.ydool.staff.entity.SelectRequest; import com.ydool.staff.request.ChangeRequest; import com.ydool.staff.request.PersonnelDeleteRequest; @@ -10,6 +11,7 @@ import com.ydool.staff.request.PersonnelUpdateRequest; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; +import java.util.List; /** *

@@ -26,7 +28,7 @@ public interface IPersonnelService { */ AjaxResult personnelList(Page page , SelectRequest request, String orderBy,String column); - AjaxResult getById(String id); + AjaxResult getById(String id,String type); AjaxResult personnelByExchangeList(); /** @@ -65,5 +67,8 @@ public interface IPersonnelService { AjaxResult getEntityParam(); AjaxResult giveAudit(String id, String type); + + List nameAndPath(String file, 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 b7b84c0..2108f20 100644 --- a/src/main/java/com/ydool/staff/service/impl/AuditServiceImpl.java +++ b/src/main/java/com/ydool/staff/service/impl/AuditServiceImpl.java @@ -2,22 +2,27 @@ package com.ydool.staff.service.impl; import cn.dev33.satoken.stp.StpUtil; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.extra.spring.SpringUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ydool.common.base.BaseService; import com.ydool.common.cache.ConfigCache; import com.ydool.common.constant.ArgsConst; import com.ydool.common.data.dto.AjaxResult; +import com.ydool.staff.dto.PersonnelStatementDto; import com.ydool.staff.entity.Audit; import com.ydool.staff.entity.AuditLog; +import com.ydool.staff.entity.CompanyName; import com.ydool.staff.entity.Personnel; import com.ydool.staff.entity.PersonnelMiddle; import com.ydool.staff.mapper.AuditLogMapper; import com.ydool.staff.mapper.AuditMapper; +import com.ydool.staff.mapper.CompanyNameMapper; import com.ydool.staff.mapper.PersonnelMapper; import com.ydool.staff.mapper.PersonnelMiddleMapper; import com.ydool.staff.request.AuditRequest; import com.ydool.staff.service.IAuditService; +import com.ydool.staff.service.IPersonnelService; import com.ydool.system.entity.Config; import com.ydool.system.entity.User; import com.ydool.system.mapper.ConfigMapper; @@ -46,6 +51,12 @@ public class AuditServiceImpl extends BaseService implements @Resource private AuditLogMapper auditLogMapper; + @Resource + private IPersonnelService personnelService; + + @Resource + private AuditMapper auditMapper; + @Resource private PersonnelMapper personnelMapper; @Resource @@ -97,14 +108,16 @@ public class AuditServiceImpl extends BaseService implements Personnel personnel = personnelMapper.selectById(auditRequest.getPersonnelId()); PersonnelMiddle middle = personnelMiddleMapper.selectOne(new LambdaQueryWrapper().eq(PersonnelMiddle::getBeforeId, personnel.getId()).eq(PersonnelMiddle::getState, "1")); System.out.println("middle = " + middle); - Personnel personnel1 = personnelMapper.selectById(middle.getAfterId()); - String id = personnel1.getId(); - personnel1.setState("2"); - personnel1.setId(personnel.getId()); + Personnel personnelOne = personnelMapper.selectById(middle.getAfterId()); + String id = personnelOne.getId(); + personnelOne.setState("2"); + personnelOne.setId(personnel.getId()); personnel.setId(id); personnel.setState("0"); - personnelMapper.updateById(personnel1); + middle.setState("0"); + personnelMapper.updateById(personnelOne); personnelMapper.updateById(personnel); + personnelMiddleMapper.updateById(middle); } return update ? AjaxResult.ok().msg("审批成功！"):AjaxResult.fail().msg("审批成功！"); @@ -157,5 +170,22 @@ public class AuditServiceImpl extends BaseService implements return auditLogMapper.insert(auditLog); } + @Override + public AjaxResult perStatement(String id) { + CompanyNameMapper companyNameMapper = SpringUtil.getBean(CompanyNameMapper.class); + PersonnelStatementDto statementDto = new PersonnelStatementDto(); + CompanyName companyName = companyNameMapper.selectById(id); + statementDto.setCompetentDeptName("县发展和改革局"); + statementDto.setSocialCreditCode(companyName.getCreditCode()); + statementDto.setCompetent(companyName.getCompanyName()); + statementDto.setCapital(100); + statementDto.setMechanismNum(5); + statementDto.setEmploymentNum(16); + statementDto.setNum(1); + statementDto.setThereIntoNum(0); + return AjaxResult.ok().data(statementDto); + } + + } diff --git a/src/main/java/com/ydool/staff/service/impl/PersonnelMiddleServiceImpl.java b/src/main/java/com/ydool/staff/service/impl/PersonnelMiddleServiceImpl.java index 0a26e53..513027a 100644 --- a/src/main/java/com/ydool/staff/service/impl/PersonnelMiddleServiceImpl.java +++ b/src/main/java/com/ydool/staff/service/impl/PersonnelMiddleServiceImpl.java @@ -16,6 +16,8 @@ import org.springframework.stereotype.Service; */ @Service public class PersonnelMiddleServiceImpl extends BaseService implements IPersonnelMiddleService { - + public Boolean savePer(PersonnelMiddle middle){ + return save(middle); + } } diff --git a/src/main/java/com/ydool/staff/service/impl/PersonnelServiceImpl.java b/src/main/java/com/ydool/staff/service/impl/PersonnelServiceImpl.java index 3fec385..87ae5c8 100644 --- a/src/main/java/com/ydool/staff/service/impl/PersonnelServiceImpl.java +++ b/src/main/java/com/ydool/staff/service/impl/PersonnelServiceImpl.java @@ -43,6 +43,7 @@ import com.ydool.staff.request.PersonnelRequest; import com.ydool.staff.request.PersonnelUpdateRequest; import com.ydool.staff.service.IAttachmentService; import com.ydool.staff.service.IAuditService; +import com.ydool.staff.service.IPersonnelMiddleService; import com.ydool.staff.service.IPersonnelService; import com.ydool.system.entity.Config; import com.ydool.system.entity.Dept; @@ -104,6 +105,8 @@ public class PersonnelServiceImpl extends BaseService list = auditMapper.selectList(new LambdaQueryWrapper() - .eq(Audit::getPersonnelId, personnel.getId()) - .eq(Audit::getApprover,StpUtil.getLoginIdAsString())); - for (Audit audit : list) { - if (ArgsConst.WAITING.equals(audit.getAuditOrder())){ - personnelUpdateDto.setAuditBtn(true); - } - } - - personnelUpdateDto.setCardFiles(nameAndPath(personnel.getCardFile(), personnel.getId())); - personnelUpdateDto.setEngageFiles(nameAndPath(personnel.getEngageFile(), personnel.getId())); - personnelUpdateDto.setEducationFiles(nameAndPath(personnel.getEducationFile(), personnel.getId())); - personnelUpdateDto.setJobTitleFiles(nameAndPath(personnel.getJobTitleFile(), personnel.getId())); - personnelUpdateDto.setAuditFiles(nameAndPath(personnel.getAuditFile(), personnel.getId())); - - return AjaxResult.ok().data(personnelUpdateDto); + public AjaxResult getById(String id,String type) { + if (StrUtil.isBlank(id)) { + return AjaxResult.fail().msg("id不能为空，查询失败！"); } - return AjaxResult.fail().msg("查询失败！"); + Personnel personnel = new Personnel(); + if (type.equals(ArgsConst.UPDATE)){ + BeanUtil.copyProperties(personnelMapper.selectById(id),personnel); + }else { + PersonnelMiddle middle = personnelMiddleMapper.selectOne(new LambdaQueryWrapper() + .eq(PersonnelMiddle::getBeforeId, id).eq(PersonnelMiddle::getState, "1")); + BeanUtil.copyProperties(personnelMapper.selectById(middle.getAfterId()),personnel); + } + PersonnelUpdateDto personnelUpdateDto = BeanUtil.copyProperties(personnel, PersonnelUpdateDto.class); + List list = auditMapper.selectList(new LambdaQueryWrapper() + .eq(Audit::getPersonnelId, personnel.getId()) + .eq(Audit::getApprover,StpUtil.getLoginIdAsString())); + for (Audit audit : list) { + if (ArgsConst.WAITING.equals(audit.getAuditOrder())){ + personnelUpdateDto.setAuditBtn(true); + } + } + personnelUpdateDto.setCardFiles(nameAndPath(personnel.getCardFile(), personnel.getId())); + personnelUpdateDto.setEngageFiles(nameAndPath(personnel.getEngageFile(), personnel.getId())); + personnelUpdateDto.setEducationFiles(nameAndPath(personnel.getEducationFile(), personnel.getId())); + personnelUpdateDto.setJobTitleFiles(nameAndPath(personnel.getJobTitleFile(), personnel.getId())); + personnelUpdateDto.setAuditFiles(nameAndPath(personnel.getAuditFile(), personnel.getId())); + + return AjaxResult.ok().data(personnelUpdateDto); + + } @@ -238,7 +249,7 @@ public class PersonnelServiceImpl extends BaseService