Commit 623ba08b authored by 刘林's avatar 刘林

fix(jg):设备履历字接口开发

parent 28e6dae5
...@@ -17,6 +17,6 @@ public interface JgResumeInfoMapper extends BaseMapper<JgResumeInfo> { ...@@ -17,6 +17,6 @@ public interface JgResumeInfoMapper extends BaseMapper<JgResumeInfo> {
void deleteBatchByBusinessId(@Param("idList") Set<String> idList); void deleteBatchByBusinessId(@Param("idList") Set<String> idList);
Page<JgResumeInfoDto> selectByChangeIds(Page<?> page, @Param("equIds") Set<String> equIds); Page<JgResumeInfoDto> queryPageListByChangeIds(Page<?> page, @Param("equIds") Set<String> equIds);
} }
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
</foreach> </foreach>
</delete> </delete>
<select id="selectByChangeIds" resultType="com.yeejoin.amos.boot.module.jg.api.dto.JgResumeInfoDto"> <select id="queryPageListByChangeIds" resultType="com.yeejoin.amos.boot.module.jg.api.dto.JgResumeInfoDto">
SELECT * SELECT *
FROM tzs_jg_resume_info FROM tzs_jg_resume_info
WHERE equ_id IN WHERE equ_id IN
......
...@@ -12,6 +12,7 @@ import com.yeejoin.amos.boot.module.jg.api.mapper.JgBizChangeLogMapper; ...@@ -12,6 +12,7 @@ import com.yeejoin.amos.boot.module.jg.api.mapper.JgBizChangeLogMapper;
import com.yeejoin.amos.boot.module.jg.api.service.IJgBizChangeLogService; import com.yeejoin.amos.boot.module.jg.api.service.IJgBizChangeLogService;
import com.yeejoin.amos.boot.module.jg.biz.dao.ESDataChangeLogDao; import com.yeejoin.amos.boot.module.jg.biz.dao.ESDataChangeLogDao;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.apache.commons.collections4.CollectionUtils;
import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.action.search.SearchRequest;
import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.client.RequestOptions; import org.elasticsearch.client.RequestOptions;
...@@ -50,11 +51,12 @@ public class JgBizChangeLogServiceImpl extends BaseService<JgBizChangeLogDto, Jg ...@@ -50,11 +51,12 @@ public class JgBizChangeLogServiceImpl extends BaseService<JgBizChangeLogDto, Jg
} }
@Override @Override
public IPage<?> queryPageListByChangeIds(Set<String> changeIds, int current, int size) { public IPage<JgResumeInfoDto> queryPageListByChangeIds(Set<String> changeIds, int current, int size) {
Page<JgResumeInfoDto> page = new Page<>(); if (CollectionUtils.isEmpty(changeIds)) {
page.setCurrent(current); return new Page<>(current, size);
page.setSize(size); }
return jgResumeInfoService.selectByChangeIds(page, changeIds); Page<JgResumeInfoDto> page = new Page<>(current, size);
return jgResumeInfoService.queryPageListByChangeIds(page, changeIds);
} }
public Map<String, Object> getDetails(String changeLogId) { public Map<String, Object> getDetails(String changeLogId) {
......
...@@ -29,8 +29,8 @@ public class JgResumeInfoServiceImpl extends BaseService<JgResumeInfoDto, JgResu ...@@ -29,8 +29,8 @@ public class JgResumeInfoServiceImpl extends BaseService<JgResumeInfoDto, JgResu
return this.queryForPage(page, null, false, equId); return this.queryForPage(page, null, false, equId);
} }
public Page<JgResumeInfoDto> selectByChangeIds(Page<JgResumeInfoDto> page, Set<String> equIds) { public Page<JgResumeInfoDto> queryPageListByChangeIds(Page<JgResumeInfoDto> page, Set<String> equIds) {
return this.baseMapper.selectByChangeIds(page, equIds); return this.baseMapper.queryPageListByChangeIds(page, equIds);
} }
/** /**
* 列表查询 示例 * 列表查询 示例
......
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