diff --git a/src/main/java/com/peanut/modules/common/controller/TaihuTalentController.java b/src/main/java/com/peanut/modules/common/controller/TaihuTalentController.java index 0a494d07..97119ceb 100644 --- a/src/main/java/com/peanut/modules/common/controller/TaihuTalentController.java +++ b/src/main/java/com/peanut/modules/common/controller/TaihuTalentController.java @@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import java.util.*; +import java.util.stream.Collectors; @Slf4j @RestController("commonTaihuTalent") @@ -34,8 +35,26 @@ public class TaihuTalentController { public R getTaihuTalents(@RequestBody Map params){ LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.like(StringUtils.isNotEmpty(params.get("name").toString()),TaihuTalent::getName,params.get("name")); + wrapper.like(StringUtils.isNotEmpty(params.get("department").toString()),TaihuTalent::getDepartment,params.get("department")); wrapper.like(StringUtils.isNotEmpty(params.get("region").toString()),TaihuTalent::getRegion,params.get("region")); - return R.ok().put("list",taihuTalentService.list(wrapper)); + wrapper.orderByAsc(TaihuTalent::getCreateTime); + List list = taihuTalentService.list(wrapper); + List titleList = Arrays.asList("主任","副主任","主治医师"); + list = list.stream().sorted((taihuTalent1,taihuTalent2)->{ + for (String str:titleList){ + if (str.equals(taihuTalent1.getTitle())||str.equals(taihuTalent2.getTitle())){ + if (taihuTalent1.getTitle().equals(taihuTalent2.getTitle())){ + return 0; + }else if (str.equals(taihuTalent1.getTitle())){ + return -1; + }else { + return 1; + } + } + } + return 0; + }).collect(Collectors.toList()); + return R.ok().put("list",list); } //太湖英才详情 diff --git a/src/main/java/com/peanut/modules/common/entity/TaihuTalent.java b/src/main/java/com/peanut/modules/common/entity/TaihuTalent.java index 61880f0c..c6389808 100644 --- a/src/main/java/com/peanut/modules/common/entity/TaihuTalent.java +++ b/src/main/java/com/peanut/modules/common/entity/TaihuTalent.java @@ -21,6 +21,9 @@ public class TaihuTalent implements Serializable { //姓名 private String name; + //科室 + private String department; + //职称 private String title;