From d29cce61fb3a38f9f57a64a2a20d276b0d1254bc Mon Sep 17 00:00:00 2001 From: feige <feige@qq.com> Date: 星期六, 16 九月 2023 11:54:24 +0800 Subject: [PATCH] es的增加索引和查询已经写好了,可以直接调用了 --- zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorServiceImpl.java | 26 ++++++++++++++++++++++---- 1 files changed, 22 insertions(+), 4 deletions(-) diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorServiceImpl.java index e90659e..fc73747 100644 --- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorServiceImpl.java +++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorServiceImpl.java @@ -10,15 +10,14 @@ import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.domain.*; import com.ruoyi.mapper.ZfDoctorMapper; -import com.ruoyi.service.ZAuthorityService; -import com.ruoyi.service.ZInfoUserService; -import com.ruoyi.service.ZfDoctorService; +import com.ruoyi.service.*; import com.ruoyi.service.ZfDoctorService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; +import java.time.LocalDateTime; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -47,6 +46,9 @@ @Resource ZAuthorityService zAuthorityService; + + @Resource + ZfDoctorMapper zfDoctorMapper; @Override public AjaxResult selectDoctorList(ZfDoctor zfDoctor, Integer pageNum, Integer pageSize) { @@ -114,7 +116,7 @@ bean.setOwnData(0); } } - ).collect(Collectors.toList()); + ).sorted((a,b)-> b.getOwnData()-a.getOwnData()).collect(Collectors.toList()); } @Override @@ -184,6 +186,9 @@ } } + @Resource + ZfLogService zfLogService; + @Override public AjaxResult updateData(ZfDoctor zfDoctor) { ZInfoUser myself = zInfoUserService.getMyself(); @@ -199,6 +204,13 @@ if (dataFamilyId!=null && !familyIdList.contains(dataFamilyId)) { throw new RuntimeException("浣犳病鏈夋潈闄愭搷浣滄瀹跺涵鐨勬暟鎹�"); } + + //鎿嶄綔鍚庡姞鍏ユ棩蹇� + ZfLog zfLog = new ZfLog(); + zfLog.setUpdateTime(LocalDateTime.now()); + zfLog.setModule("瀹跺涵灏忓尰鐢�"); + zfLog.setUpdater(zInfoUserService.getMyself().getNickName()); + zfLogService.save(zfLog); if(updateById(zfDoctor)){ return AjaxResult.success(); @@ -231,6 +243,12 @@ } } + @Override + public AjaxResult listType() { + List<String> result = zfDoctorMapper.listType(); + return AjaxResult.success(result); + } + // @Override // public AjaxResult mySave(ZfDoctor zfDoctor) { // //鍒ゆ柇鏄惁鏈夐噸澶嶆暟鎹� -- Gitblit v1.9.1