xiangshan
/
lcoa-java
22
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

人事信息查询表改动

This commit is contained in:
mash 2023-02-20 15:26:24 +08:00
parent f4f9c84fba
commit 395908cc11
6 changed files with 38 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/ydool/staff/controller/AuditController.java
View File

@ -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);
}
}

18
src/main/java/com/ydool/staff/controller/PersonnelReportController.java
View File

@ -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);
}
}

2
src/main/java/com/ydool/staff/service/IAuditService.java
View File

@ -20,7 +20,7 @@ public interface IAuditService {
Integer saveAuditLog(String personnelId,String approverId,String auditSate);
AjaxResult perStatement(String id);
}

4
src/main/java/com/ydool/staff/service/ICompanyNameService.java
View File

@ -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);
}

16
src/main/java/com/ydool/staff/service/impl/AuditServiceImpl.java
View File

@ -170,21 +170,7 @@ public class AuditServiceImpl extends BaseService<AuditMapper, Audit> 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);
}
}

19
src/main/java/com/ydool/staff/service/impl/CompanyNameServiceImpl.java
View File

@ -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<CompanyNameMapper, Compa
EasyExcelAlibabaUtil.download(EnterpriseIndicatorsExportVO.class, enterpriseIndicatorsExportVO.getEnterpriseIndicatorsExportVO(), "国有企业指标人数.xlsx");
}
@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);
}
}