wulin/wl_management
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
杜建超 2020-11-02 10:06:27 +08:00
parent c877ae244b
commit d2094cf630
4 changed files with 46 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/lz/modules/flow/service/EvaluationGroupService.java
View File

@ -7,6 +7,7 @@ import com.lz.modules.app.entity.StaffSimpleInfo;
import com.lz.modules.flow.entity.EvaluationGroup;
import com.lz.modules.flow.req.EvaluationGroupReq;
import com.lz.modules.performance.dto.CheckStaffDto;
import com.lz.modules.performance.req.CheckStaffReq;
import java.util.List;
@ -52,5 +53,5 @@ public interface EvaluationGroupService extends IService<EvaluationGroup> {
void deleteByCopyIds(List<Long> ids);
R checkStaff(EvaluationGroup evaluationGroup);
R checkStaff(CheckStaffReq checkStaffReq);
}

6
src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java
View File

@ -22,8 +22,10 @@ import com.lz.modules.flow.req.EvaluationGroupReq;
import com.lz.modules.flow.service.EvaluationGroupService;
import com.lz.modules.flow.service.FlowStartService;
import com.lz.modules.performance.dto.CheckStaffDto;
import com.lz.modules.performance.req.CheckStaffReq;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -272,7 +274,9 @@ public class EvaluationGroupServiceImpl extends ServiceImpl<EvaluationGroupMappe
@Override
public R checkStaff(EvaluationGroup evaluationGroup) {
public R checkStaff(CheckStaffReq checkStaffReq) {
EvaluationGroup evaluationGroup = new EvaluationGroup();
BeanUtils.copyProperties(checkStaffReq,evaluationGroup);
//本次参加人员
List<String> staffIdsByGroup = getStaffIdsByGroup(evaluationGroup);
//其他组全部成员

11
src/main/java/com/lz/modules/performance/controller/EvaluationGroupController.java
View File

@ -15,6 +15,7 @@ import com.lz.modules.flow.entity.StaffRole;
import com.lz.modules.flow.model.EvaluationGroupDto;
import com.lz.modules.flow.req.EvaluationGroupReq;
import com.lz.modules.flow.service.*;
import com.lz.modules.performance.req.CheckStaffReq;
import io.swagger.annotations.*;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@ -190,13 +191,9 @@ public class EvaluationGroupController {
}
@GetMapping("/checkStaff")
@PostMapping("/checkStaff")
@ApiOperation("校验是否有跨组人员")
public R checkStaff(@RequestParam @RequestBody @ApiParam EvaluationGroup evaluationGroup) {
evaluationGroupService.checkStaff(evaluationGroup);
return R.ok();
public R checkStaff(@RequestBody @ApiParam(required = true,name = "body") CheckStaffReq checkStaffReq) {
return evaluationGroupService.checkStaff(checkStaffReq);
}
}

35
src/main/java/com/lz/modules/performance/req/CheckStaffReq.java Normal file
View File

@ -0,0 +1,35 @@
package com.lz.modules.performance.req;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* @Author: djc
* @Desc:
* @Date: 2020/11/2 9:55
*/
@ApiModel("校验人员是否存在其他组")
@Data
public class CheckStaffReq {
//
@ApiModelProperty(value = "如果不传，那么表示新建，否则更新", name = "id")
private Long id;
//参与部门id，逗号隔开
@ApiModelProperty(value = "参与部门id，逗号隔开", name = "depIds")
private String depIds;
//参与考核员工staff_id，逗号隔开
@ApiModelProperty(value = "参与考核员工staff_id，逗号隔开", name = "staffIds")
private String staffIds;
//排除人员ids，逗号隔开
@ApiModelProperty(value = "排除人员ids，逗号隔开", name = "outIds")
private String outIds;
@ApiModelProperty(value = "是否确认变更组 0 :首次否 1：确认", name = "confirm")
private int confirm;
}