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

bug修改2.2

This commit is contained in:
mash 2023-02-24 11:02:30 +08:00
parent 81671e21cd
commit 8272cd7324
10 changed files with 48 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,8 +33,10 @@ public class AlterationController extends BaseController {
@GetMapping( "alterationPage")
@ApiOperation(value = "变更记录列表")
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "员工id")})
public AjaxResult alterationPage(String id){
return alterationService.alterationList(id);
@ApiImplicitParam(name = "id", value = "员工id"),
@ApiImplicitParam(name = "personnelType", value = "人员类型：personnel人员 change变更")
})
public AjaxResult alterationPage(String id,String personnelType){
return alterationService.alterationList(id,personnelType);
}
}

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

@ -48,9 +48,13 @@ public class AuditController extends BaseController {
@GetMapping("audtiLog")
@ApiOperation(value = "处理日志",response = AuditLogDto.class)
@ApiImplicitParam(name = "id",value = "员工id")
public AjaxResult audtiLog(String id){
return auditLogService.auditLog(id);
@ApiImplicitParams({
@ApiImplicitParam(name = "id",value = "员工id"),
@ApiImplicitParam(name = "personnelType",value = "人员类型：personnel人员 change变更")
})
public AjaxResult audtiLog(String id, String personnelType){
return auditLogService.auditLog(id,personnelType);
}

7
src/main/java/com/ydool/staff/controller/PersonnelController.java
View File

@ -63,10 +63,11 @@ public class PersonnelController extends BaseController {
@ApiOperation(value = "查询一条",response = PersonnelUpdateDto.class)
@ApiImplicitParams({
@ApiImplicitParam(name = "id",value = "id" ),
@ApiImplicitParam(name = "type",value = "类型，修改传update，审批传audit" ),
@ApiImplicitParam(name = "type",value = "修改类型，修改传update，审批传audit" ),
@ApiImplicitParam(name = "personnelType",value = "人员类型，人员：personnel，变更change" ),
})
public AjaxResult getById(String id,String type){
return personnelService.getById(id,type);
public AjaxResult getById(String id,String type,String personnelType){
return personnelService.getById(id,type,personnelType);
}
@PostMapping(value = "savePersonnel")

3
src/main/java/com/ydool/staff/service/IAlterationService.java
View File

@ -1,6 +1,5 @@
package com.ydool.staff.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ydool.common.data.dto.AjaxResult;
/**
@ -13,7 +12,7 @@ import com.ydool.common.data.dto.AjaxResult;
*/
public interface IAlterationService {
AjaxResult alterationList(String id);
AjaxResult alterationList(String id, String personnelType);
}

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

@ -12,6 +12,6 @@ import com.ydool.common.data.dto.AjaxResult;
*/
public interface IAuditLogService {
AjaxResult auditLog(String id);
AjaxResult auditLog(String id, String personnelType);
}

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

@ -29,7 +29,7 @@ public interface IPersonnelService {
*/
AjaxResult personnelList(Page page , SelectRequest request, String orderBy,String column);
AjaxResult getById(String id,String type);
AjaxResult getById(String id,String type,String personnelType);
AjaxResult personnelByExchangeList();
/**

15
src/main/java/com/ydool/staff/service/impl/AlterationServiceImpl.java
View File

@ -1,17 +1,13 @@
package com.ydool.staff.service.impl;
import cn.dev33.satoken.stp.StpUtil;
import cn.hutool.core.bean.BeanUtil;
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.constant.ArgsConst;
import com.ydool.common.data.dto.AjaxResult;
import com.ydool.staff.dto.AlterationDto;
import com.ydool.staff.dto.PersonnelDto;
import com.ydool.staff.entity.Alteration;
import com.ydool.staff.entity.Organization;
import com.ydool.staff.entity.Personnel;
import com.ydool.staff.mapper.AlterationMapper;
import com.ydool.staff.service.IAlterationService;
import com.ydool.system.entity.Dept;
@ -21,10 +17,8 @@ import com.ydool.system.mapper.UserMapper;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
/**
* <p>
@ -41,8 +35,11 @@ public class AlterationServiceImpl extends BaseService<AlterationMapper, Alterat
private UserMapper userMapper;
@Override
public AjaxResult alterationList(String id) {
List<Alteration> list = list(new LambdaQueryWrapper<Alteration>().eq(Alteration::getRelevancyId, id));
public AjaxResult alterationList(String id, String personnelType) {
LambdaQueryWrapper<Alteration> wrapper = new LambdaQueryWrapper<Alteration>()
.eq(Alteration::getRelevancyId, id).eq(Alteration::getType,personnelType)
.orderByDesc(Alteration::getCreatedAt);
List<Alteration> list = list(wrapper);
List<AlterationDto> alterationDtos = new ArrayList<>();
DeptMapper deptMapper = SpringUtil.getBean(DeptMapper.class);
for (Alteration alteration : list) {

10
src/main/java/com/ydool/staff/service/impl/AuditLogServiceImpl.java
View File

@ -1,11 +1,14 @@
package com.ydool.staff.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ydool.common.base.BaseService;
import com.ydool.common.constant.ArgsConst;
import com.ydool.common.data.dto.AjaxResult;
import com.ydool.staff.dto.AuditLogDto;
import com.ydool.staff.entity.AuditLog;
import com.ydool.staff.entity.Personnel;
import com.ydool.staff.mapper.AuditLogMapper;
import com.ydool.staff.service.IAuditLogService;
import com.ydool.system.entity.User;
@ -29,8 +32,11 @@ public class AuditLogServiceImpl extends BaseService<AuditLogMapper, AuditLog> i
private UserMapper userMapper;
@Override
public AjaxResult auditLog(String id) {
List<AuditLog> list = list(new LambdaQueryWrapper<AuditLog>().eq(AuditLog::getPersonnelId, id).orderByDesc(AuditLog::getCreatedAt));
public AjaxResult auditLog(String id, String personnelType) {
LambdaQueryWrapper<AuditLog> wrapper = new LambdaQueryWrapper<AuditLog>()
.eq(AuditLog::getType,personnelType)
.eq(AuditLog::getPersonnelId, id).orderByDesc(AuditLog::getCreatedAt);
List<AuditLog> list = list(wrapper);
List<AuditLogDto> auditLogDtos = BeanUtil.copyToList(list, AuditLogDto.class);
for (AuditLogDto auditLogDto : auditLogDtos) {
User user = userMapper.selectById(auditLogDto.getApprover());

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

@ -147,6 +147,7 @@ public class AuditServiceImpl extends BaseService<AuditMapper, Audit> implements
personnelOne.setState("2");
if (ArgsConst.PERSONNEL.equals(auditRequest.getType())){
personnelOne.setFinalTrialRemark(auditRequest.getAuditOpinion());
personnelOne.setWorkState("在职");
personnelOne.setAlterationSign("2");
personnelOne.setAuditState(3);
}

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

@ -143,18 +143,24 @@ public class PersonnelServiceImpl extends BaseService<PersonnelMapper, Personnel
return AjaxResult.ok().data(personnelPage);
}
public AjaxResult getById(String id,String type) {
/**
* 获取一条
* @param id 人员id
* @param type update修改 audit审批
* @return
*/
public AjaxResult getById(String id,String type,String personnelType) {
if (StrUtil.isBlank(id)) {
return AjaxResult.fail().msg("id不能为空，查询失败！");
}
Personnel personnel = new Personnel();
if (type.equals(ArgsConst.UPDATE)){
PersonnelMiddle middle = personnelMiddleMapper.selectOne(new LambdaQueryWrapper<PersonnelMiddle>()
.eq(PersonnelMiddle::getBeforeId, id).eq(PersonnelMiddle::getType,ArgsConst.PERSONNEL).eq(PersonnelMiddle::getState, "1"));
BeanUtil.copyProperties(personnelMapper.selectById(middle.getAfterId()),personnel);
BeanUtil.copyProperties(personnelMapper.selectById(id),personnel);
}else {
PersonnelMiddle middle = personnelMiddleMapper.selectOne(new LambdaQueryWrapper<PersonnelMiddle>()
.eq(PersonnelMiddle::getBeforeId, id).eq(PersonnelMiddle::getType,ArgsConst.CHANGE).eq(PersonnelMiddle::getState, "1"));
LambdaQueryWrapper<PersonnelMiddle> wrapper = new LambdaQueryWrapper<PersonnelMiddle>()
.eq(PersonnelMiddle::getBeforeId, id).eq(PersonnelMiddle::getState, "1")
.eq(PersonnelMiddle::getType, personnelType);
PersonnelMiddle middle = personnelMiddleMapper.selectOne(wrapper);
BeanUtil.copyProperties(personnelMapper.selectById(middle.getAfterId()),personnel);
}
if (ObjectUtil.isEmpty(personnel))return AjaxResult.fail().msg("该人员不存在！");
@ -289,8 +295,8 @@ public class PersonnelServiceImpl extends BaseService<PersonnelMapper, Personnel
List<AttachmentRequest> engageFiles = request.getEngageFiles();
List<AttachmentRequest> educationFiles = request.getEducationFiles();
List<AttachmentRequest> auditFiles = request.getAuditFiles();
if ("1".equals(per.getChangeAlterationSign())) {
return AjaxResult.fail().msg("该人员修改的资料未审批完成，请联系管理员！");
if ("1".equals(per.getAlterationSign())) {
return AjaxResult.fail().msg("该人员在申报中，资料未完成审批，请等待领导审批！");
}
String type = ArgsConst.CHANGE;
String card = StringUtils.join(saveFilePath(cardFiles, ArgsConst.CARD_FILE, type, request.getId()), ',');