Commit 80b99f4e authored by lisong's avatar lisong

修改bug

parent 4e7623b9
...@@ -40,6 +40,7 @@ import org.springframework.data.domain.Page; ...@@ -40,6 +40,7 @@ import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.PageImpl;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil; import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.restful.utils.ResponseModel; import org.typroject.tyboot.core.restful.utils.ResponseModel;
...@@ -86,6 +87,9 @@ public class PlanTaskServiceImpl implements IPlanTaskService { ...@@ -86,6 +87,9 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
@Autowired @Autowired
JCSFeignClient jcsFeignClient; JCSFeignClient jcsFeignClient;
@Autowired
ICheckInputDao checkInputDao;
@Override @Override
public Page<HashMap<String, Object>> getPlanTaskInfo(PlanTaskPageParam params) { public Page<HashMap<String, Object>> getPlanTaskInfo(PlanTaskPageParam params) {
long total = planTaskMapper.countPlanTask(params); long total = planTaskMapper.countPlanTask(params);
...@@ -760,6 +764,10 @@ public class PlanTaskServiceImpl implements IPlanTaskService { ...@@ -760,6 +764,10 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
PlanTask planTask = iplanTaskDao.findById(planTaskDetail.getTaskNo()).orElseThrow(() -> new RuntimeException("主任务不存在")); PlanTask planTask = iplanTaskDao.findById(planTaskDetail.getTaskNo()).orElseThrow(() -> new RuntimeException("主任务不存在"));
Map<String, Object> facility = this.buildFacilityDetail(point, planTask); Map<String, Object> facility = this.buildFacilityDetail(point, planTask);
List<Map<String, Object>> itemList = this.buildCheckInputItem(routePointId); List<Map<String, Object>> itemList = this.buildCheckInputItem(routePointId);
// 修复bug:6131
CheckInput checkInput = checkInputDao.findByCheckId(Long.valueOf(planTaskDetailId));
Map<String, Object> map = itemList.get(0);
map.put("inputValue", ObjectUtils.isEmpty(checkInput) ? "" : checkInput.getInputValue());
result.put("facility", facility); result.put("facility", facility);
result.put("itemList", itemList); result.put("itemList", itemList);
return result; return result;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment