dev
This commit is contained in:
parent
f10ddf1ed2
commit
cc1c3a50e1
|
|
@ -6,11 +6,9 @@ import com.syjiaer.clinic.server.common.config.Config;
|
|||
import com.syjiaer.clinic.server.common.exception.MessageException;
|
||||
import com.syjiaer.clinic.server.common.util.*;
|
||||
import com.syjiaer.clinic.server.common.vo.Page;
|
||||
import com.syjiaer.clinic.server.entity.social.SocialDirectory;
|
||||
import com.syjiaer.clinic.server.entity.social.SocialDirectoryVersion;
|
||||
import com.syjiaer.clinic.server.entity.social.*;
|
||||
import com.syjiaer.clinic.server.entity.social.dto.SocialDirectoryView;
|
||||
import com.syjiaer.clinic.server.mapper.social.SocialDirectoryMapper;
|
||||
import com.syjiaer.clinic.server.mapper.social.SocialDirectoryVersionMapper;
|
||||
import com.syjiaer.clinic.server.mapper.social.*;
|
||||
import com.syjiaer.clinic.server.service.BaseService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
|
@ -39,6 +37,12 @@ public class SocialDirectoryService extends BaseService {
|
|||
@Autowired
|
||||
private SocialDirectoryMapper socialDirectoryMapper;
|
||||
@Autowired
|
||||
private SocialDirectoryUpinfoMapper socialDirectoryUpinfoMapper;
|
||||
@Autowired
|
||||
private SocialDirectoryLimitMapper socialDirectoryLimitMapper;
|
||||
@Autowired
|
||||
private SocialDirectorySelfMapper socialDirectorySelfMapper;
|
||||
@Autowired
|
||||
private SocialDirectoryVersionMapper socialDirectoryVersionMapper;
|
||||
|
||||
/*
|
||||
|
|
@ -194,8 +198,59 @@ public class SocialDirectoryService extends BaseService {
|
|||
* 搜索接口
|
||||
* @param keyword 关键字
|
||||
*/
|
||||
public Page<SocialDirectoryView> search(String keyword,int[] type,int pageNum,int pageSize){
|
||||
return null;
|
||||
public Page<SocialDirectoryView> search(String keyword,int type,int pageNum,int pageSize){
|
||||
QueryWrapper<SocialDirectory> codeqw = new QueryWrapper<>();
|
||||
codeqw.eq("type", type);
|
||||
|
||||
//模糊搜索
|
||||
if (!keyword.trim().isEmpty()) {
|
||||
codeqw.like("name", keyword);
|
||||
codeqw.or().like("code", keyword);
|
||||
codeqw.or().like("keyword", keyword);
|
||||
}
|
||||
// 执行查询
|
||||
|
||||
// return success(SelectPage(queryWrapper, page, size, iSocialDirectoryService));
|
||||
codeqw.select("code");
|
||||
long count=socialDirectoryMapper.selectCount(codeqw);
|
||||
|
||||
codeqw.last("LIMIT " + pageSize + " OFFSET " + (pageNum - 1) * pageSize);
|
||||
List<String> codeList = socialDirectoryMapper.selectObjs(codeqw);
|
||||
|
||||
List<SocialDirectoryView> list= new ArrayList<>();
|
||||
if(codeList.isEmpty()){
|
||||
Page<SocialDirectoryView> empty_result = new Page<>();
|
||||
empty_result.setList(new ArrayList<>());
|
||||
empty_result.setTotal_count(0);
|
||||
empty_result.setTotal_page(1);
|
||||
return empty_result;
|
||||
}
|
||||
QueryWrapper queryWrapper = new QueryWrapper();
|
||||
queryWrapper.in("code", codeList);
|
||||
//第一步 拿到字典表数据
|
||||
List<SocialDirectory> socialDirectoryList=socialDirectoryMapper.selectList(queryWrapper);
|
||||
List<SocialDirectoryUpinfo> socialDirectoryUpinfoList=socialDirectoryUpinfoMapper.selectList(queryWrapper);
|
||||
List<SocialDirectoryLimit> socialDirectoryLimitList=socialDirectoryLimitMapper.selectList(queryWrapper);
|
||||
List<SocialDirectorySelf> socialDirectorySelfList=socialDirectorySelfMapper.selectList(queryWrapper);
|
||||
System.out.println(socialDirectoryList);
|
||||
System.out.println(socialDirectoryUpinfoList);
|
||||
System.out.println(socialDirectoryLimitList);
|
||||
System.out.println(socialDirectorySelfList);
|
||||
//第二部 构建新的返回List
|
||||
List<SocialDirectoryView> socialDirectoryViewList=new ArrayList<>();
|
||||
for(SocialDirectory socialDirectory:socialDirectoryList){
|
||||
SocialDirectoryView socialDirectoryView=JSONObject.parseObject(JSONObject.toJSONString(socialDirectory), SocialDirectoryView.class);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Page<SocialDirectoryView> result=new Page<>();
|
||||
result.setTotal_page((int) Math.ceil((double) count / pageSize));
|
||||
result.setTotal_count(count);
|
||||
result.setList(socialDirectoryViewList);
|
||||
return result;
|
||||
}
|
||||
/*
|
||||
* 列表接口
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ class ServerApplicationTests {
|
|||
private SocialDirectoryService socialDirectoryService;
|
||||
@Test
|
||||
void contextLoads() {
|
||||
|
||||
Page<SocialDirectoryView> search = socialDirectoryService.search("劳拉", 1301, 1, 10);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue