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

fix

Browse Source
This commit is contained in:
DirectionOfMind 2021-01-25 10:45:48 +08:00
parent b10514ca66
commit b359259e59
3 changed files with 37 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/lz/modules/performance/dao/ResultTaskMapper.java
View File

@ -43,5 +43,5 @@ public interface ResultTaskMapper extends BaseMapper<ResultTask> {
int deleteResultTasksByDetailId(Long detailId);
List<ResultDto> listResultTask(SysUserEntity user);
List<ResultDto> listResultTask(@Param("detailIds") List<String> detailIds);
}

26
src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java
View File

@ -19,6 +19,7 @@ import com.lz.modules.performance.req.ResultUpdateTaskReq;
import com.lz.modules.performance.res.ResultTaskDetailRes;
import com.lz.modules.performance.service.ResultTaskService;
import com.lz.modules.performance.service.TaskProcessRecordService;
import com.lz.modules.sys.dao.app.ResultDetailMapper;
import com.lz.modules.sys.entity.SysUserEntity;
import com.lz.modules.sys.entity.app.ResultDetail;
import com.lz.modules.sys.service.app.ResultDetailService;
@ -30,8 +31,11 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
import java.util.function.Function;
import java.util.stream.Collectors;
/**
* <p>
@ -57,6 +61,10 @@ public class ResultTaskServiceImpl extends ServiceImpl<ResultTaskMapper, ResultT
private TaskProcessRecordMapper taskProcessRecordMapper;
@Autowired
private StaffService staffService;
@Autowired
private ResultDetailMapper resultDetailMapper;
@Autowired
private TaskProcessRecordMapper taskProcessRecordMapper;
@ -322,12 +330,26 @@ public class ResultTaskServiceImpl extends ServiceImpl<ResultTaskMapper, ResultT
@Override
public List<ResultDto> listResultTask(SysUserEntity user) {
return null;
List<ResultDto> resultDtos = resultDetailMapper.listRecord(user.getUserId());
if(CollectionUtils.isEmpty(resultDtos)){
return Collections.EMPTY_LIST;
}
List<String> detailIds = resultDtos.stream().map(resultDto -> resultDto.getId() + "").collect(Collectors.toList());
return resultTaskMapper.listResultTask(detailIds);
}
@Override
public R addOrUpdateTask(SysUserEntity user, TaskDto second) {
return null;
ResultUpdateTaskReq resultUpdateTaskReq = new ResultUpdateTaskReq();
resultUpdateTaskReq.setRemark(second.getMark());
resultUpdateTaskReq.setTaskId(second.getId());
resultUpdateTaskReq.setName(second.getName());
resultUpdateTaskReq.setProcessRate(BigDecimal.valueOf(second.getRate()));
ResultTask resultTask = resultTaskMapper.selectResultTaskById(second.getId());
if(resultTask!=null){
resultUpdateTaskReq.setDetailId(resultTask.getDetailId());
}
return this.saveOrUpdateResultTask(resultUpdateTaskReq,user.getUserId());
}
}

12
src/main/resources/mapper/performance/ResultTaskMapper.xml
View File

@ -99,5 +99,17 @@
<select id="selectAllResultTaskDtosByDetailId" resultType="com.lz.modules.performance.dto.ResultTaskDto" >
select id, is_delete, name,process_rate from lz_result_task where detail_id=#{detailId}
</select>
<select id="listResultTask" resultType="com.lz.modules.app.dto.ResultDto">
select id,name content,process_rate rate from lz_result_task where is_delete = 0
<if test="detailIds !=null and detailIds!=''">
and detail_id in
<foreach item="detailId" collection="detailIds" open="(" separator="," close=")">
#{detailId}
</foreach>
</if>
order by order_by
</select>
</mapper>