新增部分代码
This commit is contained in:
parent
196727b8a0
commit
86f244d091
@ -26,6 +26,7 @@ import com.lz.modules.flow.req.ResultDetailReq;
|
|||||||
import com.lz.modules.flow.service.*;
|
import com.lz.modules.flow.service.*;
|
||||||
import com.lz.modules.job.business.DingtalkBusiness;
|
import com.lz.modules.job.business.DingtalkBusiness;
|
||||||
import com.lz.modules.performance.dto.ResultTaskDto;
|
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.res.ResultRankListRes;
|
||||||
import com.lz.modules.performance.service.ChartResultService;
|
import com.lz.modules.performance.service.ChartResultService;
|
||||||
import com.lz.modules.performance.service.ResultTaskService;
|
import com.lz.modules.performance.service.ResultTaskService;
|
||||||
@ -134,6 +135,8 @@ public class ResultRecordController extends AbstractController {
|
|||||||
@Autowired
|
@Autowired
|
||||||
private ResultTaskService resultTaskService;
|
private ResultTaskService resultTaskService;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
private final static String TYPE = "H5_URL";
|
private final static String TYPE = "H5_URL";
|
||||||
private final static String SEC_TYPE = "RECORD";
|
private final static String SEC_TYPE = "RECORD";
|
||||||
|
|
||||||
@ -839,6 +842,27 @@ public class ResultRecordController extends AbstractController {
|
|||||||
index++;
|
index++;
|
||||||
if(resultDetail.getId() != null){
|
if(resultDetail.getId() != null){
|
||||||
updates.add(resultDetail);
|
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{
|
}else{
|
||||||
resultDetail.setStaffId(resultRecord.getStaffId());
|
resultDetail.setStaffId(resultRecord.getStaffId());
|
||||||
resultDetail.setRecordId(resultRecord.getId());
|
resultDetail.setRecordId(resultRecord.getId());
|
||||||
|
|||||||
@ -63,6 +63,8 @@ public class ResultDetailDto {
|
|||||||
private Long modelId;
|
private Long modelId;
|
||||||
@ApiModelProperty(value = "指标任务列表", name = "taskDtos")
|
@ApiModelProperty(value = "指标任务列表", name = "taskDtos")
|
||||||
List<ResultTaskDto> taskDtos;
|
List<ResultTaskDto> taskDtos;
|
||||||
|
@ApiModelProperty(value = "进度", name = "processRate")
|
||||||
|
private BigDecimal processRate;
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* @return
|
* @return
|
||||||
|
|||||||
@ -35,4 +35,5 @@ public interface ResultTaskMapper extends BaseMapper<ResultTask> {
|
|||||||
|
|
||||||
List<ResultTaskDto> selectResultTasksByDetailId(@Param("detailId") Long detailId);
|
List<ResultTaskDto> selectResultTasksByDetailId(@Param("detailId") Long detailId);
|
||||||
|
|
||||||
|
int deleteResultTasksByDetailId(Long detailId);
|
||||||
}
|
}
|
||||||
@ -40,4 +40,6 @@ public interface ResultTaskService extends IService<ResultTask> {
|
|||||||
|
|
||||||
|
|
||||||
List<ResultTaskDto> selectResultTasksByDetailId(Long detailId);
|
List<ResultTaskDto> selectResultTasksByDetailId(Long detailId);
|
||||||
|
|
||||||
|
int deleteResultTasksByDetailId(Long detailId);
|
||||||
}
|
}
|
||||||
@ -173,4 +173,10 @@ public class ResultTaskServiceImpl extends ServiceImpl<ResultTaskMapper, ResultT
|
|||||||
public List<ResultTaskDto> selectResultTasksByDetailId(Long detailId){
|
public List<ResultTaskDto> selectResultTasksByDetailId(Long detailId){
|
||||||
return resultTaskMapper.selectResultTasksByDetailId(detailId);
|
return resultTaskMapper.selectResultTasksByDetailId(detailId);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int deleteResultTasksByDetailId(Long detailId){
|
||||||
|
//List<ResultTask> tasks = resultTaskMapper.selectResultTasksByDetailId()
|
||||||
|
return resultTaskMapper.deleteResultTasksByDetailId(detailId);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -88,5 +88,9 @@
|
|||||||
select * from lz_result_task where detail_id=#{detailId} and is_delete = 0 order by order_by asc
|
select * from lz_result_task where detail_id=#{detailId} and is_delete = 0 order by order_by asc
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
<update id="deleteResultTasksByDetailId" parameterType="java.lang.Long">
|
||||||
|
update lz_result_task set is_delete = 1 where detail_id=#{detailId} limit 1
|
||||||
|
</update>
|
||||||
|
|
||||||
</mapper>
|
</mapper>
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user