zm/nuttyreading-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

科室和医案收集里的科室列表一致

Browse Source
This commit is contained in:
wuchunlei
2025-08-05 09:50:03 +08:00
parent 79154cbd7c
commit b9e9f9b9f9
3 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/peanut/modules/common/entity/TaihuTalent.java
View File

@@ -1,5 +1,6 @@
package com.peanut.modules.common.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,7 +23,7 @@ public class TaihuTalent implements Serializable {
private String name;
//科室
private String department;
private Integer deptLabelId;
//职称
private String title;
@@ -52,4 +53,7 @@ public class TaihuTalent implements Serializable {
@TableLogic
private Integer delFlag;
@TableField(exist = false)
private String department;
}

14
src/main/java/com/peanut/modules/master/controller/TaihuTalentController.java
View File

@@ -4,12 +4,10 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.peanut.common.utils.R;
import com.peanut.modules.common.entity.CourseEntity;
import com.peanut.modules.common.entity.CourseToTaihumed;
import com.peanut.modules.common.entity.CourseToTalent;
import com.peanut.modules.common.entity.TaihuTalent;
import com.peanut.modules.common.entity.*;
import com.peanut.modules.common.service.CourseToTaihumedService;
import com.peanut.modules.common.service.CourseToTalentService;
import com.peanut.modules.common.service.MedicalRecordsLabelService;
import com.peanut.modules.common.service.TaihuTalentService;
import com.peanut.modules.common.to.ParamTo;
import com.peanut.modules.master.service.CourseService;
@@ -38,6 +36,8 @@ public class TaihuTalentController {
private CourseToTalentService courseToTalentService;
@Autowired
private CourseToTaihumedService courseToTaihumedService;
@Autowired
private MedicalRecordsLabelService medicalRecordsLabelService;
//太湖英才课程列表
@@ -108,7 +108,10 @@ public class TaihuTalentController {
//太湖英才列表
@RequestMapping("/getTaihuTalents")
public R getTaihuTalents(@RequestBody Map<String,Object> params){
LambdaQueryWrapper<TaihuTalent> wrapper = new LambdaQueryWrapper<>();
MPJLambdaWrapper<TaihuTalent> wrapper = new MPJLambdaWrapper<>();
wrapper.leftJoin(MedicalRecordsLabel.class,MedicalRecordsLabel::getId,TaihuTalent::getDeptLabelId);
wrapper.selectAll(TaihuTalent.class);
wrapper.selectAs(MedicalRecordsLabel::getTitle,TaihuTalent::getDepartment);
wrapper.like(StringUtils.isNotEmpty(params.get("name").toString()),TaihuTalent::getName,params.get("name"));
wrapper.like(StringUtils.isNotEmpty(params.get("region").toString()),TaihuTalent::getRegion,params.get("region"));
wrapper.orderByDesc(TaihuTalent::getCreateTime);
@@ -145,6 +148,7 @@ public class TaihuTalentController {
@RequestMapping("/taihuTalentInfo")
public R taihuTalentInfo(@RequestBody Map<String,Object> params){
TaihuTalent taihuTalent = taihuTalentService.getById(params.get("id").toString());
taihuTalent.setDepartment(medicalRecordsLabelService.getById(taihuTalent.getDeptLabelId()).getTitle());
return R.ok().put("taihuTalent",taihuTalent);
}

17
src/main/java/com/peanut/modules/taihumed/controller/TaihuTalentController.java
View File

@@ -4,10 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.peanut.common.utils.R;
import com.peanut.modules.common.entity.*;
import com.peanut.modules.common.service.MedicalRecordsService;
import com.peanut.modules.common.service.TaihuTalentService;
import com.peanut.modules.common.service.UserCertificateLabelService;
import com.peanut.modules.common.service.UserCertificateService;
import com.peanut.modules.common.service.*;
import com.peanut.modules.master.service.CourseService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
@@ -33,15 +30,18 @@ public class TaihuTalentController {
private CourseService courseService;
@Autowired
private MedicalRecordsService medicalRecordsService;
@Autowired
private MedicalRecordsLabelService medicalRecordsLabelService;
//太湖英才列表
@RequestMapping("/getTaihuTalents")
public R getTaihuTalents(@RequestBody Map<String,Object> params){
LambdaQueryWrapper<TaihuTalent> wrapper = new LambdaQueryWrapper<>();
MPJLambdaWrapper<TaihuTalent> wrapper = new MPJLambdaWrapper<>();
wrapper.leftJoin(MedicalRecordsLabel.class,MedicalRecordsLabel::getId,TaihuTalent::getDeptLabelId);
wrapper.selectAll(TaihuTalent.class);
wrapper.selectAs(MedicalRecordsLabel::getTitle,TaihuTalent::getDepartment);
wrapper.like(StringUtils.isNotEmpty(params.get("name").toString()),TaihuTalent::getName,params.get("name"));
if (params.containsKey("department")){
wrapper.like(StringUtils.isNotEmpty(params.get("department").toString()),TaihuTalent::getDepartment,params.get("department"));
}
wrapper.eq(StringUtils.isNotEmpty(params.get("deptLabelId").toString()),TaihuTalent::getDeptLabelId,params.get("deptLabelId"));
wrapper.like(StringUtils.isNotEmpty(params.get("region").toString()),TaihuTalent::getRegion,params.get("region"));
wrapper.orderByAsc(TaihuTalent::getCreateTime);
List<TaihuTalent> list = taihuTalentService.list(wrapper);
@@ -68,6 +68,7 @@ public class TaihuTalentController {
@RequestMapping("/taihuTalentInfo")
public R taihuTalentInfo(@RequestBody Map<String,Object> params){
TaihuTalent taihuTalent = taihuTalentService.getById(params.get("id").toString());
taihuTalent.setDepartment(medicalRecordsLabelService.getById(taihuTalent.getDeptLabelId()).getTitle());
List<UserCertificateLabel> labels = userCertificateLabelService.list(new LambdaQueryWrapper<UserCertificateLabel>()
.eq(UserCertificateLabel::getPid,0));
List<UserCertificateLabel> filterLabels = new ArrayList<>();