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

提交修改

Browse Source
This commit is contained in:
quyixiao 2020-08-20 15:08:56 +08:00
parent 23c29ad2db
commit 00ed287025
9 changed files with 8 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/lz/modules/app/controller/TestController.java
View File

@ -63,12 +63,6 @@ public class TestController {
}
}
@RequestMapping("/test/relate")
public void relate(){
List<DepartmentsStaffRelateEntity> list = departmentsStaffRelateService.selectAll();

4
src/main/java/com/lz/modules/app/entity/StaffEntity.java
View File

@ -109,10 +109,6 @@ public class StaffEntity implements Serializable {
* 工号
*/
private String jobNumber;
/**
* 是否为领导 不存入staff表中
* */
private Integer isLeader;
//密码

14
src/main/java/com/lz/modules/app/resp/ResultRecordResp.java
View File

@ -34,16 +34,6 @@ public class ResultRecordResp {
private String departmentName;
public String getStatusStr() {
if (this.status == 0) {
return "新建";
} else if (this.status == 1) {
return "审批中";
} else if (this.status == 2) {
return "拒绝";
} else if (this.status == 3) {
return "审批通过";
}
return "";
}
private Integer type ;
}

2
src/main/java/com/lz/modules/app/service/impl/DepartmentsStaffRelateServiceImpl.java
View File

@ -45,7 +45,7 @@ public class DepartmentsStaffRelateServiceImpl extends ServiceImpl<DepartmentsSt
DepartmentsStaffRelateEntity departmentsStaffRelateBo = new DepartmentsStaffRelateEntity();
departmentsStaffRelateBo.setDepartmentId(departmentId);
departmentsStaffRelateBo.setStaffId(staffId.getId());
departmentsStaffRelateBo.setIsLeader(staffId.getIsLeader());
//departmentsStaffRelateBo.setIsLeader(staffId.getIsLeader());
departStaffRelateList.add(departmentsStaffRelateBo);
} else /*if (!StringUtil.equals(departmentId, departId))*/ {
departmentsStaffRelateDao.updateByStaffId(departmentId, staffId);

1
src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java
View File

@ -344,7 +344,6 @@ public class StaffServiceImpl extends ServiceImpl<StaffDao, StaffEntity> impleme
staffEntity.setUnionId(staffBo.getUnionId());
staffEntity.setAvatar(staffBo.getAvatar());
staffEntity.setJobNumber(staffBo.getEmployeeNo());
staffEntity.setIsLeader(staffBo.getIsLeader());
return staffEntity;
}

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

@ -33,7 +33,6 @@ public class RecordAuthServiceImpl extends ServiceImpl<RecordAuthMapper, RecordA
private RecordAuthMapper recordAuthMapper;
@Override
public RecordAuth selectRecordAuthById(Long id){
return recordAuthMapper.selectRecordAuthById(id);
@ -76,7 +75,7 @@ public class RecordAuthServiceImpl extends ServiceImpl<RecordAuthMapper, RecordA
if (StringUtil.isNotBlank(flowStaffIdRole)) {
List<StaffRoleDto> list = JSONObject.parseArray(flowStaffIdRole, StaffRoleDto.class);
if (CollectionUtils.isNotEmpty(list)) {
staffEntityMap = list.stream().collect(Collectors.toMap(StaffRoleDto::getStaffId, StaffRoleDto::getRole));
staffEntityMap = list.stream().collect(Collectors.toMap(StaffRoleDto::getStaffId, StaffRoleDto::getRoleId));
}
}
return staffEntityMap;

4
src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
View File

@ -124,6 +124,7 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
departmentStaffIds = new ArrayList<>(setStaffId);
}
}
if(StringUtil.isNotBlank(params.getName())){
List<StaffEntity> staffEntities = staffService.selectByName(params.getName());
if(CollectionUtils.isNotEmpty(staffEntities)){
@ -133,9 +134,8 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
params.setDepartmentStaffIds(departmentStaffIds);
params.setStaffIds(staffIds);
PageUtils pageUtils = null;
if(params.getIsSelf() == 1 ){ // 我的业绩
if(params.getIsSelf() == 1){ // 我的业绩
params.setStaffId(user.getUserId());
pageUtils = PageUtils.startPage(params.getPage(), params.getLimit() ).doSelect(
page -> resultRecordMapper.selectByCondition(page, params)

2
src/main/resources/mapper/app/ResultRecordMapper.xml
View File

@ -130,11 +130,11 @@
#{item}
</foreach>
</if>
and staff_id = #{req.staffId}
order by id desc
</select>
<select id="selectByConditionTest" resultType="com.lz.modules.sys.entity.app.ResultRecord">
select * from lz_result_record where is_delete = 0
<if test="monthBeginDate != null and monthBeginDate != '' ">

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

@ -91,7 +91,7 @@
<select id="selectByStaffId" resultType="com.lz.modules.flow.entity.FlowDepartment">
select * from lz_flow_department where is_delete = 0 and taff_id = #{staffId} limit 1
select * from lz_flow_department where is_delete = 0 and staff_id = #{staffId} limit 1
</select>