From 395908cc11cb715537c96fed1538462cc1924296 Mon Sep 17 00:00:00 2001 From: mash Date: Mon, 20 Feb 2023 15:26:24 +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=E6=94=B9=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../staff/controller/AuditController.java | 8 +------- .../controller/PersonnelReportController.java | 18 +++++++++++++++--- .../ydool/staff/service/IAuditService.java | 2 +- .../staff/service/ICompanyNameService.java | 4 ++-- .../staff/service/impl/AuditServiceImpl.java | 16 +--------------- .../service/impl/CompanyNameServiceImpl.java | 19 ++++++++++++++++++- 6 files changed, 38 insertions(+), 29 deletions(-) diff --git a/src/main/java/com/ydool/staff/controller/AuditController.java b/src/main/java/com/ydool/staff/controller/AuditController.java index 2caf22f..6b26afe 100644 --- a/src/main/java/com/ydool/staff/controller/AuditController.java +++ b/src/main/java/com/ydool/staff/controller/AuditController.java @@ -5,7 +5,6 @@ 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; @@ -63,12 +62,7 @@ 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/PersonnelReportController.java b/src/main/java/com/ydool/staff/controller/PersonnelReportController.java index 5804b36..3f726d2 100644 --- a/src/main/java/com/ydool/staff/controller/PersonnelReportController.java +++ b/src/main/java/com/ydool/staff/controller/PersonnelReportController.java @@ -9,6 +9,7 @@ import com.ydool.common.constant.UrlConstant; import com.ydool.common.data.dto.AjaxResult; import com.ydool.staff.dto.EnterpriseIndicatorsExportDto; import com.ydool.staff.dto.PersonnelReportExportDto; +import com.ydool.staff.dto.PersonnelStatementDto; import com.ydool.staff.excel.EnterpriseIndicatorsExportVO; import com.ydool.staff.excel.PersonnelReportExportVO; import com.ydool.staff.service.ICompanyNameService; @@ -16,9 +17,13 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; /** @@ -35,7 +40,7 @@ import javax.servlet.http.HttpServletResponse; @ApiSupport(order = 20) public class PersonnelReportController extends BaseController { - @Autowired + @Resource ICompanyNameService companyNameService; @GetMapping("/personnelReport") @@ -67,4 +72,11 @@ public class PersonnelReportController extends BaseController { public void exportEnterpriseIndicators(@RequestBody EnterpriseIndicatorsExportDto enterpriseIndicatorsExportVO, HttpServletResponse response) { companyNameService.exportEnterpriseIndicators(enterpriseIndicatorsExportVO, response); } + + @GetMapping("perStatement") + @ApiOperation(value = "人事信息报表",response = PersonnelStatementDto.class) + @ApiImplicitParam(name = "id",value = "企业id") + public AjaxResult perStatement(String id) { + return companyNameService.perStatement(id); + } } diff --git a/src/main/java/com/ydool/staff/service/IAuditService.java b/src/main/java/com/ydool/staff/service/IAuditService.java index 2a2e73c..51f707e 100644 --- a/src/main/java/com/ydool/staff/service/IAuditService.java +++ b/src/main/java/com/ydool/staff/service/IAuditService.java @@ -20,7 +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/ICompanyNameService.java b/src/main/java/com/ydool/staff/service/ICompanyNameService.java index cf276b4..c3cc298 100644 --- a/src/main/java/com/ydool/staff/service/ICompanyNameService.java +++ b/src/main/java/com/ydool/staff/service/ICompanyNameService.java @@ -3,8 +3,6 @@ package com.ydool.staff.service; import com.ydool.common.data.dto.AjaxResult; import com.ydool.staff.dto.EnterpriseIndicatorsExportDto; import com.ydool.staff.dto.PersonnelReportExportDto; -import com.ydool.staff.excel.EnterpriseIndicatorsExportVO; -import com.ydool.staff.excel.PersonnelReportExportVO; import javax.servlet.http.HttpServletResponse; @@ -31,5 +29,7 @@ public interface ICompanyNameService { AjaxResult getEnterpriseIndicators(String companyId, String hireDate); void exportEnterpriseIndicators(EnterpriseIndicatorsExportDto enterpriseIndicatorsExportVO, HttpServletResponse response); + + AjaxResult perStatement(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 2108f20..1ca7d3b 100644 --- a/src/main/java/com/ydool/staff/service/impl/AuditServiceImpl.java +++ b/src/main/java/com/ydool/staff/service/impl/AuditServiceImpl.java @@ -170,21 +170,7 @@ 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/CompanyNameServiceImpl.java b/src/main/java/com/ydool/staff/service/impl/CompanyNameServiceImpl.java index db90c8d..441c626 100644 --- a/src/main/java/com/ydool/staff/service/impl/CompanyNameServiceImpl.java +++ b/src/main/java/com/ydool/staff/service/impl/CompanyNameServiceImpl.java @@ -2,6 +2,7 @@ package com.ydool.staff.service.impl; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; +import cn.hutool.extra.spring.SpringUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.github.yulichang.query.MPJQueryWrapper; import com.ydool.common.base.BaseService; @@ -9,11 +10,11 @@ import com.ydool.common.data.dto.AjaxResult; import com.ydool.common.utils.EasyExcelAlibabaUtil; import com.ydool.staff.dto.EnterpriseIndicatorsExportDto; import com.ydool.staff.dto.PersonnelReportExportDto; +import com.ydool.staff.dto.PersonnelStatementDto; import com.ydool.staff.entity.CompanyName; import com.ydool.staff.entity.Personnel; import com.ydool.staff.entity.Recruitment; import com.ydool.staff.excel.EnterpriseIndicatorsExportVO; -import com.ydool.staff.excel.ExcelPersonnel; import com.ydool.staff.excel.PersonnelReportExportVO; import com.ydool.staff.mapper.CompanyNameMapper; import com.ydool.staff.mapper.PersonnelMapper; @@ -116,6 +117,22 @@ public class CompanyNameServiceImpl extends BaseService