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

新增部分代码

Browse Source
This commit is contained in:
wulin 2020-12-09 16:05:17 +08:00
parent 196727b8a0
commit 86f244d091
6 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/com/lz/modules/app/controller/ResultRecordController.java
View File

@ -26,6 +26,7 @@ import com.lz.modules.flow.req.ResultDetailReq;
import com.lz.modules.flow.service.*;
import com.lz.modules.job.business.DingtalkBusiness;
import com.lz.modules.performance.dto.ResultTaskDto;
import com.lz.modules.performance.req.ResultUpdateTaskReq;
import com.lz.modules.performance.res.ResultRankListRes;
import com.lz.modules.performance.service.ChartResultService;
import com.lz.modules.performance.service.ResultTaskService;
@ -134,6 +135,8 @@ public class ResultRecordController extends AbstractController {
@Autowired
private ResultTaskService resultTaskService;
private final static String TYPE = "H5_URL";
private final static String SEC_TYPE = "RECORD";
@ -839,6 +842,27 @@ public class ResultRecordController extends AbstractController {
index++;
if(resultDetail.getId() != null){
updates.add(resultDetail);
if(resultDetail.getIsDelete() != null && resultDetail.getIsDelete().intValue() == 1){
//删除任务
resultTaskService.deleteResultTasksByDetailId(resultDetail.getId());
}else{
//更新任务
if(detailDto.getTaskDtos() != null && detailDto.getTaskDtos().size() > 0){
log.info("任务个数{}", detailDto.getTaskDtos().size());
for (ResultTaskDto taskDto:detailDto.getTaskDtos()
) {
ResultUpdateTaskReq taskReq = new ResultUpdateTaskReq();
taskReq.setDetailId(resultDetail.getId());
taskReq.setTasklId(taskDto.getId());
taskReq.setName(taskDto.getName());
taskReq.setProcessRate(taskDto.getProcessRate());
resultTaskService.saveOrUpdateResultTask(taskReq);
}
}
}
}else{
resultDetail.setStaffId(resultRecord.getStaffId());
resultDetail.setRecordId(resultRecord.getId());

2
src/main/java/com/lz/modules/flow/model/ResultDetailDto.java
View File

@ -63,6 +63,8 @@ public class ResultDetailDto {
private Long modelId;
@ApiModelProperty(value = "指标任务列表", name = "taskDtos")
List<ResultTaskDto> taskDtos;
@ApiModelProperty(value = "进度", name = "processRate")
private BigDecimal processRate;
/**
*
* @return

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

@ -35,4 +35,5 @@ public interface ResultTaskMapper extends BaseMapper<ResultTask> {
List<ResultTaskDto> selectResultTasksByDetailId(@Param("detailId") Long detailId);
int deleteResultTasksByDetailId(Long detailId);
}

2
src/main/java/com/lz/modules/performance/service/ResultTaskService.java
View File

@ -40,4 +40,6 @@ public interface ResultTaskService extends IService<ResultTask> {
List<ResultTaskDto> selectResultTasksByDetailId(Long detailId);
int deleteResultTasksByDetailId(Long detailId);
}

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

@ -173,4 +173,10 @@ public class ResultTaskServiceImpl extends ServiceImpl<ResultTaskMapper, ResultT
public List<ResultTaskDto> selectResultTasksByDetailId(Long detailId){
return resultTaskMapper.selectResultTasksByDetailId(detailId);
}
@Override
public int deleteResultTasksByDetailId(Long detailId){
//List<ResultTask> tasks = resultTaskMapper.selectResultTasksByDetailId()
return resultTaskMapper.deleteResultTasksByDetailId(detailId);
}
}

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

@ -88,5 +88,9 @@
select * from lz_result_task where detail_id=#{detailId} and is_delete = 0 order by order_by asc
</select>
<update id="deleteResultTasksByDetailId" parameterType="java.lang.Long">
update lz_result_task set is_delete = 1 where detail_id=#{detailId} limit 1
</update>
</mapper>