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

bug修改1.01

This commit is contained in:
mash 2023-02-23 17:11:27 +08:00
parent 20d94bfbfb
commit b3fece6fc3
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -150,20 +150,21 @@ public class CompanyNameServiceImpl extends BaseService<CompanyNameMapper, Compa
throw new RuntimeException(e); throw new RuntimeException(e);
} }
CompanyNameMapper companyNameMapper = SpringUtil.getBean(CompanyNameMapper.class); CompanyNameMapper companyNameMapper = SpringUtil.getBean(CompanyNameMapper.class);
PersonnelStatementDto statementDto = new PersonnelStatementDto();
List<PersonnelStatementDto> statementDtos = new ArrayList<>(); List<PersonnelStatementDto> statementDtos = new ArrayList<>();
LambdaQueryWrapper<CompanyName> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<CompanyName> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(StrUtil.isNotBlank(id),CompanyName::getId,id); queryWrapper.eq(StrUtil.isNotBlank(id),CompanyName::getId,id);
List<CompanyName> list = companyNameMapper.selectList(queryWrapper); List<CompanyName> list = companyNameMapper.selectList(queryWrapper);
list.forEach(System.out::println); list.forEach(System.out::println);
for (CompanyName companyName : list) { for (CompanyName companyName : list) {
System.out.println("companyName = " + companyName.getId());
Integer count = directorsSupervisorsMapper.selectCount(new LambdaQueryWrapper<DirectorsSupervisors>().eq(DirectorsSupervisors::getAuditState, 3).eq(DirectorsSupervisors::getOrganizationId, companyName.getId())); Integer count = directorsSupervisorsMapper.selectCount(new LambdaQueryWrapper<DirectorsSupervisors>().eq(DirectorsSupervisors::getAuditState, 3).eq(DirectorsSupervisors::getOrganizationId, companyName.getId()));
LambdaQueryWrapper<Personnel> wrapper = new LambdaQueryWrapper<Personnel>() LambdaQueryWrapper<Personnel> wrapper = new LambdaQueryWrapper<Personnel>()
.eq(Personnel::getCompanyName, companyName.getId()) .eq(Personnel::getCompanyName, companyName.getId())
.eq(Personnel::getWorkState,"在职")
.eq(Personnel::getState,"2")
.ge(ObjectUtil.isNotNull(first), Personnel::getHireDate, first) .ge(ObjectUtil.isNotNull(first), Personnel::getHireDate, first)
.le(ObjectUtil.isNotNull(finals), Personnel::getHireDate, finals); .le(ObjectUtil.isNotNull(finals), Personnel::getHireDate, finals);
List<Personnel> listPersonnel = personnelMapper.selectList(wrapper); List<Personnel> listPersonnel = personnelMapper.selectList(wrapper);
PersonnelStatementDto statementDto = new PersonnelStatementDto();
statementDto.setSupervisorsNum(count); statementDto.setSupervisorsNum(count);
statementDto.setCompetentDeptName("县发展和改革局"); statementDto.setCompetentDeptName("县发展和改革局");
statementDto.setSocialCreditCode(companyName.getCreditCode()); statementDto.setSocialCreditCode(companyName.getCreditCode());

7
src/main/java/com/ydool/staff/service/impl/PersonnelServiceImpl.java
View File

@ -255,9 +255,15 @@ public class PersonnelServiceImpl extends BaseService<PersonnelMapper, Personnel
per.setSpecialty(saveAlteration("专业更改", per.getSpecialty(), updateRequest.getSpecialty(), type, updateRequest.getId(), ColumnUtil.getFieldName(Personnel::getSpecialty)).toString()); per.setSpecialty(saveAlteration("专业更改", per.getSpecialty(), updateRequest.getSpecialty(), type, updateRequest.getId(), ColumnUtil.getFieldName(Personnel::getSpecialty)).toString());
per.setPresentDept(saveAlteration("所在部门更改", per.getPresentDept(), updateRequest.getPresentDept(), type, updateRequest.getId(), ColumnUtil.getFieldName(Personnel::getPresentDept)).toString()); per.setPresentDept(saveAlteration("所在部门更改", per.getPresentDept(), updateRequest.getPresentDept(), type, updateRequest.getId(), ColumnUtil.getFieldName(Personnel::getPresentDept)).toString());
per.setContractModality(saveAlteration("合同形式更改", per.getContractModality(), updateRequest.getContractModality(), type, updateRequest.getId(), ColumnUtil.getFieldName(Personnel::getContractModality)).toString()); per.setContractModality(saveAlteration("合同形式更改", per.getContractModality(), updateRequest.getContractModality(), type, updateRequest.getId(), ColumnUtil.getFieldName(Personnel::getContractModality)).toString());
if (StrUtil.isNotBlank(card)){
per.setCardFile(saveAlteration("身份证附件更改", per.getCardFile(), card, type, updateRequest.getId(), ColumnUtil.getFieldName(Personnel::getCardFile)).toString()); per.setCardFile(saveAlteration("身份证附件更改", per.getCardFile(), card, type, updateRequest.getId(), ColumnUtil.getFieldName(Personnel::getCardFile)).toString());
}
if (StrUtil.isNotBlank(education)){
per.setEducationFile(saveAlteration("学历证书附件更改", per.getEducationFile(), education, type, updateRequest.getId(), ColumnUtil.getFieldName(Personnel::getEducationFile)).toString()); per.setEducationFile(saveAlteration("学历证书附件更改", per.getEducationFile(), education, type, updateRequest.getId(), ColumnUtil.getFieldName(Personnel::getEducationFile)).toString());
}
if (StrUtil.isNotBlank(audit)){
per.setAuditFile(saveAlteration("审批资料附件更改", per.getAuditFile(), audit, type, updateRequest.getId(), ColumnUtil.getFieldName(Personnel::getAuditFile)).toString()); per.setAuditFile(saveAlteration("审批资料附件更改", per.getAuditFile(), audit, type, updateRequest.getId(), ColumnUtil.getFieldName(Personnel::getAuditFile)).toString());
}
per.setId(""); per.setId("");
per.setState("1"); per.setState("1");
per.setAlterationSign("1"); per.setAlterationSign("1");
@ -629,7 +635,6 @@ public class PersonnelServiceImpl extends BaseService<PersonnelMapper, Personnel
} }
}else if (ArgsConst.EXCHANGE.equals(type)) { }else if (ArgsConst.EXCHANGE.equals(type)) {
Exchange exchange = exchangeMapper.selectById(id); Exchange exchange = exchangeMapper.selectById(id);
System.out.println("exchange = " + exchange);
Personnel personnel = get(exchange.getPersonnelId()); Personnel personnel = get(exchange.getPersonnelId());
if ("1".equals(personnel.getAlterationSign())||"1".equals(personnel.getChangeAlterationSign())){ if ("1".equals(personnel.getAlterationSign())||"1".equals(personnel.getChangeAlterationSign())){
return message="该人员有变更数据，不能进行选调！"; return message="该人员有变更数据，不能进行选调！";