From 4c141764d64c37c4c27e372cd55d9e861b192c28 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期六, 09 五月 2026 18:06:49 +0800
Subject: [PATCH] 捐献基础增加入院时间,捐献上报基础增加入院时间
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java | 267 ++++++++++++++++++++++++++++++++++------------------
1 files changed, 173 insertions(+), 94 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java
index 43237dd..3605a75 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java
@@ -9,13 +9,18 @@
import java.util.concurrent.ConcurrentHashMap;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.project.common.CalculateDateUtils;
import com.ruoyi.project.domain.*;
+import com.ruoyi.project.domain.dto.DonatebaseinfoProgressDTO;
+import com.ruoyi.project.domain.entity.ServiceDonatemaintenanceEntity;
+import com.ruoyi.project.domain.vo.DonatebaseinfoProgressVO;
import com.ruoyi.project.domain.vo.TimeVO;
+import com.ruoyi.project.domain.vo.WorkFlowVO;
import com.ruoyi.project.domain.vo.countByRecordStateVO;
import com.ruoyi.project.mapper.*;
import com.ruoyi.project.service.*;
@@ -81,6 +86,10 @@
private IServiceDonatecompletioninfoService serviceDonatecompletioninfoService;
@Autowired
private SysUserMapper sysUserMapper;
+ @Autowired
+ IServiceDonatemaintenanceService serviceDonatemaintenanceService;
+ @Autowired
+ IServiceDeathinfoService serviceDeathinfoService;
/**
@@ -92,32 +101,22 @@
@Override
public List<ServiceDonatebaseinfo> queryList(ServiceDonatebaseinfo serviceDonatebaseinfo) {
LambdaQueryWrapper<ServiceDonatebaseinfo> wrappers = Wrappers.lambdaQuery();
- if (StringUtils.isNotBlank(serviceDonatebaseinfo.getName())) {
- wrappers.like(ServiceDonatebaseinfo::getName, serviceDonatebaseinfo.getName());
- }
- if (StringUtils.isNotBlank(serviceDonatebaseinfo.getIdcardno())) {
- wrappers.like(ServiceDonatebaseinfo::getIdcardno, serviceDonatebaseinfo.getIdcardno());
- }
- if (StringUtils.isNotBlank(serviceDonatebaseinfo.getResidenceprovince())) {
- wrappers.eq(ServiceDonatebaseinfo::getResidenceprovince, serviceDonatebaseinfo.getResidenceprovince());
- }
- if (serviceDonatebaseinfo.getRecordstate() != null) {
- wrappers.eq(ServiceDonatebaseinfo::getRecordstate, serviceDonatebaseinfo.getRecordstate());
- }
- if (StringUtils.isNotBlank(serviceDonatebaseinfo.getTreatmenthospitalname())) {
- wrappers.like(ServiceDonatebaseinfo::getTreatmenthospitalname, serviceDonatebaseinfo.getTreatmenthospitalname());
- }
- if (StringUtils.isNotBlank(serviceDonatebaseinfo.getDonorno())) {
- wrappers.eq(ServiceDonatebaseinfo::getDonorno, serviceDonatebaseinfo.getDonorno());
- }
- if (StringUtils.isNotBlank(serviceDonatebaseinfo.getReportername())) {
- wrappers.like(ServiceDonatebaseinfo::getReportername, serviceDonatebaseinfo.getReportername());
- }
- Map<String, Object> params = serviceDonatebaseinfo.getParams();
- if (params.get("beginReporttime") != null && params.get("endReporttime") != null) {
- wrappers.between(ServiceDonatebaseinfo::getReporttime, params.get("beginReporttime"), params.get("endReporttime"));
- }
+ setWrappers(wrappers, serviceDonatebaseinfo);
return this.list(wrappers);
+ }
+
+ @Override
+ public Page<ServiceDonatebaseinfo> queryListPage(ServiceDonatebaseinfo serviceDonatebaseinfo) {
+ LambdaQueryWrapper<ServiceDonatebaseinfo> wrappers = Wrappers.lambdaQuery();
+ setWrappers(wrappers, serviceDonatebaseinfo);
+
+ // 鍒涘缓鍒嗛〉瀵硅薄锛岃缃〉鐮佸拰姣忛〉澶у皬
+ int currentPage = (serviceDonatebaseinfo.getPageNum() == null || serviceDonatebaseinfo.getPageNum() < 1) ? 1 : serviceDonatebaseinfo.getPageNum();
+ int size = (serviceDonatebaseinfo.getPageSize() == null || serviceDonatebaseinfo.getPageSize() < 1) ? 10 : serviceDonatebaseinfo.getPageSize();
+ Page<ServiceDonatebaseinfo> page = new Page<>(currentPage, size);
+
+ List<ServiceDonatebaseinfo> serviceDonatemaintenanceList = serviceDonatebaseinfoMapper.selectPage(page, wrappers).getRecords();
+ return page.setRecords(serviceDonatemaintenanceList);
}
@Override
@@ -174,15 +173,6 @@
String number = "";
-// if (completeDonation < 10) {
-// number = "000" + completeDonation;
-// } else if (completeDonation >= 10 && completeDonation < 100) {
-// number = "00" + completeDonation;
-// } else if (completeDonation >= 100 && completeDonation < 1000) {
-// number = "0" + completeDonation;
-// } else {
-// number = "" + completeDonation;
-// }
Calendar calendar = Calendar.getInstance();
int year = calendar.get(Calendar.YEAR);
BaseOnlyvalue baseOnlyvalue = new BaseOnlyvalue();
@@ -236,40 +226,6 @@
serviceDonatebaseinfo.setDeptid(user.getDeptId());
}
List<ServiceDonatebaseinfo> serviceDonatebaseinfos = serviceDonatebaseinfoMapper.selectServiceDonatebaseinfoList(serviceDonatebaseinfo);
- for (ServiceDonatebaseinfo serviceDonatebaseinfo1 : serviceDonatebaseinfos) {
- //杩欓噷涓嶈兘鍐嶉�氳繃褰撳墠鏃堕棿绠楀勾榫勪簡锛屾偅鑰呭彲鑳藉凡缁忔浜′簡
-// if (serviceDonatebaseinfo1.getBirthday() != null) {
-// Map<String, String> map = CalculateDateUtils.calculateAge(serviceDonatebaseinfo1.getBirthday().toInstant().atZone(ZoneId.systemDefault()).toLocalDate(), LocalDate.now());
-// serviceDonatebaseinfo1.setAge(org.apache.commons.lang3.ObjectUtils.isNotEmpty(map.get("age")) ? Long.valueOf(map.get("age")) : null);
-// serviceDonatebaseinfo1.setAgeunit(map.get("ageUnit"));
-// serviceDonatebaseinfo1.setAge2(org.apache.commons.lang3.ObjectUtils.isNotEmpty(map.get("age2")) ? Long.valueOf(map.get("age2")) : null);
-// serviceDonatebaseinfo1.setAgeunit2(map.get("ageUnit2"));
-// }
- //鍏堢粰涓勾榫勯粯璁ゅ�硷紙鍥犱负age鏄暟瀛楃被鍨嬶紝涓嶈兘鏀炬í鏉狅紝鎵�浠ュ氨鎵�妯墰鏀惧埌鍗曚綅涓婏級
- serviceDonatebaseinfo1.setAgeunit("-");
- serviceDonatebaseinfo1.setAge(null);
- serviceDonatebaseinfo1.setAge2(null);
-
- //鑾峰彇姝讳骸鏃堕棿锛屽鏋滆幏鍙栬璇侀噷鏈夋浜℃椂闂达紝鍒欒繘琛岃绠椾粬鐨勫勾榫�
- ServiceDonationwitness sdw = new ServiceDonationwitness();
- sdw.setInfoid(serviceDonatebaseinfo1.getId());
- List<ServiceDonationwitness> serviceDonationwitnessList = serviceDonationwitnessMapper.selectServiceDonationwitnessList(sdw);
- if (!CollectionUtils.isEmpty(serviceDonationwitnessList) && serviceDonatebaseinfo1.getBirthday() != null) {
- Date deathtime = serviceDonationwitnessList.get(0).getDeathtime();
- if (ObjectUtils.isNotEmpty(deathtime)) {
- Map<String, String> map = CalculateDateUtils.calculateAge(serviceDonatebaseinfo1.getBirthday().toInstant().atZone(ZoneId.systemDefault()).toLocalDate(), deathtime.toInstant().atZone(ZoneId.systemDefault()).toLocalDate());
- if (Objects.isNull(map)) {
- log.error("ServiceDonationwitness鍑虹敓鏃ユ湡锛歿},ServiceDonationwitness姝讳骸鏃ユ湡锛歿}", serviceDonatebaseinfo1.getBirthday(), deathtime);
- continue;
- }
- serviceDonatebaseinfo1.setAge(org.apache.commons.lang3.ObjectUtils.isNotEmpty(map.get("age")) ? Long.valueOf(map.get("age")) : null);
- serviceDonatebaseinfo1.setAgeunit(map.get("ageUnit"));
- serviceDonatebaseinfo1.setAge2(org.apache.commons.lang3.ObjectUtils.isNotEmpty(map.get("age2")) ? Long.valueOf(map.get("age2")) : null);
- serviceDonatebaseinfo1.setAgeunit2(map.get("ageUnit2"));
- }
- }
-
- }
return serviceDonatebaseinfos;
}
@@ -289,6 +245,23 @@
}
return serviceDonatebaseinfoMapper.listForSearch(serviceDonatebaseinfo);
+ }
+
+ /**
+ * 鎹愮尞杩涘害鍩烘湰淇℃伅
+ *
+ * @param donatebaseinfoProgressVO
+ * @return
+ */
+ @Override
+ public List<DonatebaseinfoProgressDTO> donateBaseInfoProgressList(DonatebaseinfoProgressVO donatebaseinfoProgressVO) {
+ List<DonatebaseinfoProgressDTO> donatebaseinfoProgressDTOS = serviceDonatebaseinfoMapper.donateBaseInfoProgressList(donatebaseinfoProgressVO);
+ return donatebaseinfoProgressDTOS;
+ }
+
+ @Override
+ public List<Map<String,Object>> totalConfirmationBaseInfo(DonatebaseinfoProgressVO donatebaseinfoProgressVO) {
+ return serviceDonatebaseinfoMapper.totalConfirmationBaseInfo(donatebaseinfoProgressVO);
}
@Override
@@ -317,11 +290,9 @@
}
@Override
- public Map<String, Object> getWorkFlow(Long id) {
+ public WorkFlowVO getWorkFlow(Long id) {
log.info("getWorkFlow鐨勫叆鍙侷D涓猴細{}", id);
- //鐢ㄤ簬杩斿洖
- Map<String, Object> map = new ConcurrentHashMap<>();
-
+ WorkFlowVO map1=new WorkFlowVO();
ServiceDonatebaseinfo serviceDonatebaseinfo = getById(id);
if (ObjectUtils.isEmpty(serviceDonatebaseinfo)) {
@@ -349,12 +320,11 @@
donatebaseinfo.put("process", "");
//灏佽serviceDonateorgan娼滃湪鎹愮尞杩斿洖鏁版嵁
log.info("妫�鏌ュ皝瑁呮綔鍦ㄦ崘鐚繑鍥炴暟鎹甦onatebaseinfo鐨勫�间负锛歿}", donatebaseinfo);
- map.put("donatebaseinfo", donatebaseinfo);
-
+ map1.setDonatebaseinfo(donatebaseinfo);
//灏佽鍖诲璇勪及
log.info("妫�鏌erviceDonatebaseinfo.getWorkflow()鐨勫�间负锛歿}", serviceDonatebaseinfo.getWorkflow());
Map<String, String> medicalevaluation = new HashMap<>();
- if (serviceDonatebaseinfo.getWorkflow() >= 1) {
+ //if (serviceDonatebaseinfo.getWorkflow() >= 1) {
ServiceMedicalevaluation serviceMedicalevaluation = new ServiceMedicalevaluation();
serviceMedicalevaluation.setInfoid(id);
List<ServiceMedicalevaluation> serviceMedicalevaluations = serviceMedicalevaluationService.queryList(serviceMedicalevaluation);
@@ -379,14 +349,14 @@
}
medicalevaluation.put("process", "");
}
- }
+ //}
//灏佽鍖诲璇勪及杩斿洖鏁版嵁
log.info("妫�鏌ュ皝瑁呭尰瀛﹁瘎浼拌繑鍥炴暟鎹甿edicalevaluation鐨勫�间负锛歿}", medicalevaluation);
- map.put("medicalevaluation", medicalevaluation);
+ map1.setMedicalevaluation(medicalevaluation);
//灏佽鎹愮尞纭
Map<String, String> relativesconfirmation = new HashMap<>();
- if (serviceDonatebaseinfo.getWorkflow() >= 2) {
+ //if (serviceDonatebaseinfo.getWorkflow() >= 2) {
ServiceRelativesconfirmation serviceRelativesconfirmation = new ServiceRelativesconfirmation();
serviceRelativesconfirmation.setInfoid(id);
List<ServiceRelativesconfirmation> serviceRelativesconfirmations = serviceRelativesconfirmationService.queryList(serviceRelativesconfirmation);
@@ -411,15 +381,14 @@
}
relativesconfirmation.put("process", "");
}
- }
+ //}
//灏佽鎹愮尞纭杩斿洖鏁版嵁
log.info("妫�鏌ュ皝瑁呮崘鐚‘璁よ繑鍥炴暟鎹畆elativesconfirmation鐨勫�间负锛歿}", relativesconfirmation);
- map.put("relativesconfirmation", relativesconfirmation);
-
+ map1.setRelativesconfirmation(relativesconfirmation);
//灏佽浼︾悊瀹℃煡
Map<String, String> donateflowcharts = new HashMap<>();
- if (serviceDonatebaseinfo.getWorkflow() >= 3) {
+ //if (serviceDonatebaseinfo.getWorkflow() >= 3) {
ServiceEthicalreviewopinions serviceDonateflowchart = new ServiceEthicalreviewopinions();
serviceDonateflowchart.setInfoid(id);
List<ServiceEthicalreviewopinions> serviceEthicalreviewopinionsList = iServiceEthicalreviewopinionsService.queryList(serviceDonateflowchart);
@@ -445,14 +414,14 @@
}
donateflowcharts.put("process", "");
}
- }
+ //}
//灏佽浼︾悊瀹℃煡杩斿洖鏁版嵁
log.info("妫�鏌ュ皝瑁呬鸡鐞嗗鏌ヨ繑鍥炴暟鎹甦onateflowcharts鐨勫�间负锛歿}", donateflowcharts);
- map.put("donateflowcharts", donateflowcharts);
+ map1.setDonateflowcharts(donateflowcharts);
//灏佽鍣ㄥ畼鍒嗛厤
Map<String, String> donateorgansService = new HashMap<>();
- if (serviceDonatebaseinfo.getWorkflow() >= 4) {
+ // if (serviceDonatebaseinfo.getWorkflow() >= 4) {
ServiceDonateorgan serviceDonateorgan = new ServiceDonateorgan();
serviceDonateorgan.setInfoid(id);
List<ServiceDonateorgan> serviceDonateorgans = serviceDonateorganService.queryList(serviceDonateorgan);
@@ -478,14 +447,14 @@
}
donateorgansService.put("process", "");
}
- }
+ //}
log.info("妫�鏌ュ皝瑁呭櫒瀹樺垎閰嶈繑鍥炴暟鎹甦onateorgansService鐨勫�间负锛歿}", donateorgansService);
//灏佽鍣ㄥ畼鍒嗛厤杩斿洖鏁版嵁
- map.put("donateorgansService", donateorgansService);
+ map1.setDonateorgansService(donateorgansService);
//灏佽鑾峰彇瑙佽瘉
Map<String, String> donationwitness = new HashMap<>();
- if (serviceDonatebaseinfo.getWorkflow() >= 5) {
+ //if (serviceDonatebaseinfo.getWorkflow() >= 5) {
ServiceDonationwitness serviceDonationwitness = serviceDonationwitnessService.getByInfoId(id);
log.info("妫�鏌erviceDonationwitness鐨勫�间负锛歿}", serviceDonationwitness);
if (!ObjectUtils.isEmpty(serviceDonationwitness)) {
@@ -509,14 +478,14 @@
donationwitness.put("process", "");
}
- }
+ //}
log.info("妫�鏌ュ皝瑁呰幏鍙栬璇佽繑鍥炴暟鎹甦onationwitness鐨勫�间负锛歿}", donationwitness);
//灏佽鑾峰彇瑙佽瘉杩斿洖鏁版嵁
- map.put("donationwitness", donationwitness);
+ map1.setDonationwitness(donationwitness);
//灏佽瀹屾垚鐧昏
Map<String, String> donatecompletioninfo = new HashMap<>();
- if (serviceDonatebaseinfo.getWorkflow() >= 6) {
+ // if (serviceDonatebaseinfo.getWorkflow() >= 6) {
ServiceDonatecompletioninfo serviceDonatecompletioninfo = new ServiceDonatecompletioninfo();
serviceDonatecompletioninfo.setInfoid(id);
List<ServiceDonatecompletioninfo> serviceDonatecompletioninfos = serviceDonatecompletioninfoService.queryList(serviceDonatecompletioninfo);
@@ -542,12 +511,122 @@
donatecompletioninfo.put("process", "");
}
- }
+ //}
log.info("妫�鏌ュ皝瑁呭畬鎴愮櫥璁拌繑鍥炴暟鎹甦onatecompletioninfo鐨勫�间负锛歿}", donatecompletioninfo);
//灏佽瀹屾垚鐧昏杩斿洖鏁版嵁
- map.put("donatecompletioninfo", donatecompletioninfo);
+ map1.setDonatecompletioninfo(donatecompletioninfo);
+
+ //渚涗綋缁存姢璁板綍
+ Map<String, String> donatemaintenance = new HashMap<>();
+ ServiceDonatemaintenanceEntity serviceDonatemaintenanceEntity=new ServiceDonatemaintenanceEntity();
+ serviceDonatemaintenanceEntity.setInfoid(id);
+ List<ServiceDonatemaintenanceEntity> donatemaintenanceEntityList= serviceDonatemaintenanceService.queryList(serviceDonatemaintenanceEntity).getRecords();
+ if(donatemaintenanceEntityList.size()>0){
+ donatemaintenance.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", donatemaintenanceEntityList.get(0).getCreateTime()));
+ donatemaintenance.put("updatetime", donatemaintenanceEntityList.get(0).getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", donatemaintenanceEntityList.get(0).getUpdateTime()) : "");
+
+ donatemaintenance.put("createperson", null);
+ if (StringUtils.isNotBlank(donatemaintenanceEntityList.get(0).getCreateBy())) {
+ SysUser sysUser = sysUserMapper.selectUserByUserName(donatemaintenanceEntityList.get(0).getCreateBy());
+ if (!ObjectUtils.isEmpty(sysUser)) {
+ donatemaintenance.put("createperson", sysUser.getNickName());
+ }
+ }
+ donatemaintenance.put("updateperson", null);
+ if (StringUtils.isNotBlank(donatemaintenanceEntityList.get(0).getUpdateBy())) {
+ SysUser sysUser = sysUserMapper.selectUserByUserName(donatemaintenanceEntityList.get(0).getUpdateBy());
+ if (!ObjectUtils.isEmpty(sysUser)) {
+ donatemaintenance.put("updateperson", sysUser.getNickName());
+ }
+ }
+
+ donatemaintenance.put("process", "");
+ }
+ map1.setDonatemaintenance(donatemaintenance);
+
+ //鎮ｈ�呮浜′俊鎭�
+ Map<String, String> deathinfo = new HashMap<>();
+ ServiceDeathinfo serviceDeathinfo =new ServiceDeathinfo();
+ serviceDeathinfo.setInfoid(id);
+ List<ServiceDeathinfo> serviceDeathinfoList= serviceDeathinfoService.queryList(serviceDeathinfo).getRecords();
+ if(serviceDeathinfoList.size()>0){
+ deathinfo.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDeathinfoList.get(0).getCreateTime()));
+ deathinfo.put("updatetime", serviceDeathinfoList.get(0).getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", donatemaintenanceEntityList.get(0).getUpdateTime()) : "");
+
+ deathinfo.put("createperson", null);
+ if (StringUtils.isNotBlank(serviceDeathinfoList.get(0).getCreateBy())) {
+ SysUser sysUser = sysUserMapper.selectUserByUserName(serviceDeathinfoList.get(0).getCreateBy());
+ if (!ObjectUtils.isEmpty(sysUser)) {
+ deathinfo.put("createperson", sysUser.getNickName());
+ }
+ }
+ deathinfo.put("updateperson", null);
+ if (StringUtils.isNotBlank(serviceDeathinfoList.get(0).getUpdateBy())) {
+ SysUser sysUser = sysUserMapper.selectUserByUserName(serviceDeathinfoList.get(0).getUpdateBy());
+ if (!ObjectUtils.isEmpty(sysUser)) {
+ deathinfo.put("updateperson", sysUser.getNickName());
+ }
+ }
+
+ deathinfo.put("process", "");
+ }
+ map1.setDeathinfo(deathinfo);
//灏嗘暟鎹皝闂紝骞惰繑鍥�
- return map;
+ return map1;
}
+
+
+ private void setWrappers(LambdaQueryWrapper<ServiceDonatebaseinfo> wrappers, ServiceDonatebaseinfo serviceDonatebaseinfo) {
+ if (StringUtils.isNotBlank(serviceDonatebaseinfo.getName())) {
+ wrappers.like(ServiceDonatebaseinfo::getName, serviceDonatebaseinfo.getName());
+ }
+ if (StringUtils.isNotBlank(serviceDonatebaseinfo.getIdcardno())) {
+ wrappers.like(ServiceDonatebaseinfo::getIdcardno, serviceDonatebaseinfo.getIdcardno());
+ }
+ if (StringUtils.isNotBlank(serviceDonatebaseinfo.getResidenceprovince())) {
+ wrappers.eq(ServiceDonatebaseinfo::getResidenceprovince, serviceDonatebaseinfo.getResidenceprovince());
+ }
+ if (serviceDonatebaseinfo.getRecordstate() != null) {
+ wrappers.eq(ServiceDonatebaseinfo::getRecordstate, serviceDonatebaseinfo.getRecordstate());
+ }
+ if (StringUtils.isNotBlank(serviceDonatebaseinfo.getTreatmenthospitalname())) {
+ wrappers.like(ServiceDonatebaseinfo::getTreatmenthospitalname, serviceDonatebaseinfo.getTreatmenthospitalname());
+ }
+ if (StringUtils.isNotBlank(serviceDonatebaseinfo.getDonorno())) {
+ wrappers.eq(ServiceDonatebaseinfo::getDonorno, serviceDonatebaseinfo.getDonorno());
+ }
+ if (StringUtils.isNotBlank(serviceDonatebaseinfo.getReportername())) {
+ wrappers.like(ServiceDonatebaseinfo::getReportername, serviceDonatebaseinfo.getReportername());
+ }
+ if (StringUtils.isNotBlank(serviceDonatebaseinfo.getCaseNo())) {
+ wrappers.eq(ServiceDonatebaseinfo::getCaseNo, serviceDonatebaseinfo.getCaseNo());
+ }
+ if (StringUtils.isNotBlank(serviceDonatebaseinfo.getInfoName())) {
+ wrappers.like(ServiceDonatebaseinfo::getInfoName, serviceDonatebaseinfo.getInfoName());
+ }
+ if (StringUtils.isNotBlank(serviceDonatebaseinfo.getInfoNo())) {
+ wrappers.eq(ServiceDonatebaseinfo::getInfoNo, serviceDonatebaseinfo.getInfoNo());
+ }
+ if (StringUtils.isNotBlank(serviceDonatebaseinfo.getCoordinatorName())) {
+ wrappers.like(ServiceDonatebaseinfo::getCoordinatorName, serviceDonatebaseinfo.getCoordinatorName());
+ }
+ if (StringUtils.isNotBlank(serviceDonatebaseinfo.getCoordinatorNo())) {
+ wrappers.eq(ServiceDonatebaseinfo::getCoordinatorNo, serviceDonatebaseinfo.getCoordinatorNo());
+ }
+ if (StringUtils.isNotBlank(serviceDonatebaseinfo.getGcsScore())) {
+ wrappers.eq(ServiceDonatebaseinfo::getGcsScore, serviceDonatebaseinfo.getGcsScore());
+ }
+ if (StringUtils.isNotBlank(serviceDonatebaseinfo.getExtracontent())) {
+ wrappers.eq(ServiceDonatebaseinfo::getExtracontent, serviceDonatebaseinfo.getExtracontent());
+ }
+ if (serviceDonatebaseinfo.getTerminationType()!=null) {
+ wrappers.eq(ServiceDonatebaseinfo::getTerminationType, serviceDonatebaseinfo.getTerminationType());
+ }
+ Map<String, Object> params = serviceDonatebaseinfo.getParams();
+ if (params.get("beginReporttime") != null && params.get("endReporttime") != null) {
+ wrappers.between(ServiceDonatebaseinfo::getReporttime, params.get("beginReporttime"), params.get("endReporttime"));
+ }
+ }
+
}
--
Gitblit v1.9.3