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-10-23 17:56:34 +08:00
commit b212baa434
3 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/lz/modules/app/dto/DepartmentsSimpleDto.java
View File

@ -21,7 +21,7 @@ public class DepartmentsSimpleDto implements Serializable{
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "部门id", name = "id")
private Integer id;
private String id;
/**
* 飞书显示部门人数
*/

27
src/main/java/com/lz/modules/performance/controller/FlowStartController.java
View File

@ -9,6 +9,8 @@ import com.lz.common.utils.R;
import com.lz.common.utils.StringUtil;
import com.lz.modules.flow.entity.*;
import com.lz.modules.flow.service.*;
import com.lz.modules.sys.entity.app.ResultDetail;
import com.lz.modules.sys.entity.app.ResultRecord;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@ -90,6 +92,9 @@ public class FlowStartController {
) {
//下面初始化员工考核流程
List<String> staffIds = evaluationGroupService.selectAllStaffIdsByGroupId(evaluationGroup.getId());
if(staffIds.size() == 0){
return R.error(evaluationGroup.getName() + "——无有效考核人员");
}
@ -104,6 +109,11 @@ public class FlowStartController {
return R.error(evaluationGroup.getName() + "——没有设置考核流程");
}
//初始化lz_result_records数据
List<ResultRecord> resultRecords = new ArrayList<>();
//初始化lz_result_details数据
List<ResultDetail> resultDetails = new ArrayList<>();
List<EvaluationStartStaff> evaluationStartStaffs = new ArrayList<>();
//下面初始化参与人员
for (String staffId:staffIds
@ -115,6 +125,14 @@ public class FlowStartController {
evaluationStartStaff.setType(CheckStaffType.STAFF.getCode());
evaluationStartStaffs.add(evaluationStartStaff);
for (ResultModel resultModel:resultModels
) {
ResultRecord resultRecord = new ResultRecord();
}
}
if(evaluationStartStaffs.size() == 0){
@ -188,16 +206,9 @@ public class FlowStartController {
if(flowApprovalRoles.size() > 0){
flowApprovalRoleService.insertFlowApprovalRoles(flowApprovalRoles);
}
for (EvaluationStartStaff startStaff:evaluationStartStaffs
) {
if(startStaff.getType().intValue() == CheckStaffType.STAFF.getCode()){
//初始化人员及流程表id
}
//下面初始化lz_result_record表和lz_result_detail表
}
}

2
src/main/resources/mapper/flow/StaffRoleDepartmentMapper.xml
View File

@ -113,7 +113,7 @@
<select id="selectDepartmentSimpleInfos"
resultType="com.lz.modules.app.dto.DepartmentsSimpleDto">
select id, member_count, department_name from lz_departments where is_delete = 0
select department_id as id, member_count, department_name from lz_departments where is_delete = 0
and department_id in
<foreach collection="ids" item="item" index="index" separator="," open="(" close=")">
#{item}