|
|
@@ -15,16 +15,15 @@ import com.fdkankan.manage.service.IFeedbackOptionService;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.fdkankan.manage.service.ISysUserService;
|
|
|
import com.fdkankan.manage.vo.request.FeedbackOptionParam;
|
|
|
+import com.fdkankan.manage.vo.response.CaseVo;
|
|
|
import org.apache.commons.lang3.ObjectUtils;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
+import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
import java.sql.BatchUpdateException;
|
|
|
-import java.util.HashMap;
|
|
|
-import java.util.HashSet;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Set;
|
|
|
+import java.util.*;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
|
@@ -57,6 +56,8 @@ public class FeedbackOptionServiceImpl extends ServiceImpl<IFeedbackOptionMapper
|
|
|
}
|
|
|
}
|
|
|
HashMap<Integer, FeedbackOption> mapByIds = this.getMapByIds(ids);
|
|
|
+ List<FeedbackOption> voList = new ArrayList<>();
|
|
|
+
|
|
|
for (FeedbackOption record : page.getRecords()) {
|
|
|
SysUser sysUser = byIds.get(record.getSysUserId());
|
|
|
if(sysUser != null){
|
|
|
@@ -72,8 +73,15 @@ public class FeedbackOptionServiceImpl extends ServiceImpl<IFeedbackOptionMapper
|
|
|
newFeedIds.add(feedbackOption.getId());
|
|
|
}
|
|
|
}
|
|
|
- record.setAiOption(newFeedIds);
|
|
|
+ FeedbackOption feedbackOption = new FeedbackOption();
|
|
|
+ BeanUtils.copyProperties(record,feedbackOption);
|
|
|
+ feedbackOption.setAiOption(newFeedIds);
|
|
|
+ voList.add(feedbackOption);
|
|
|
+
|
|
|
}
|
|
|
+ Page<FeedbackOption> pageVo = new Page<>(param.getPageNum(), param.getPageSize());
|
|
|
+ pageVo.setRecords(voList);
|
|
|
+ pageVo.setTotal(page.getTotal());
|
|
|
return PageInfo.PageInfo(page);
|
|
|
}
|
|
|
|