From 00e066b1b6c1f2c5e94adfcf50b49cf2a3d682d0 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 12 九月 2023 13:43:02 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java | 83 ++++++++++++++++++++---------------------
1 files changed, 41 insertions(+), 42 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 549a817..daf25c0 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
@@ -4,6 +4,7 @@
import java.util.Date;
import java.util.List;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.DateUtils;
@@ -18,8 +19,10 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
import java.util.ArrayList;
import java.util.Map;
+
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.project.domain.ServiceDonatebaseinfo;
import com.ruoyi.project.mapper.BaseOrganizationMapper;
@@ -27,13 +30,12 @@
/**
* 鎹愮尞鍩虹Service涓氬姟灞傚鐞�
- *
+ *
* @author ruoyi
* @date 2021-11-13
*/
@Service
-public class ServiceDonatebaseinfoServiceImpl extends ServiceImpl<ServiceDonatebaseinfoMapper, ServiceDonatebaseinfo> implements IServiceDonatebaseinfoService
-{
+public class ServiceDonatebaseinfoServiceImpl extends ServiceImpl<ServiceDonatebaseinfoMapper, ServiceDonatebaseinfo> implements IServiceDonatebaseinfoService {
@Autowired
BaseOrganizationMapper baseOrganizationMapper;
@@ -48,40 +50,39 @@
ServiceDonationwitnessMapper serviceDonationwitnessMapper;
-
/**
* 鏌ヨ鎹愮尞鍩虹鍒楄〃
- *
+ *
* @param serviceDonatebaseinfo 鎹愮尞鍩虹
* @return 鎹愮尞鍩虹
*/
@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.getName())) {
+ wrappers.like(ServiceDonatebaseinfo::getName, serviceDonatebaseinfo.getName());
}
- if (StringUtils.isNotBlank(serviceDonatebaseinfo.getIdcardno())){
- wrappers.like(ServiceDonatebaseinfo::getIdcardno ,serviceDonatebaseinfo.getIdcardno());
+ if (StringUtils.isNotBlank(serviceDonatebaseinfo.getIdcardno())) {
+ wrappers.like(ServiceDonatebaseinfo::getIdcardno, serviceDonatebaseinfo.getIdcardno());
}
- if (StringUtils.isNotBlank(serviceDonatebaseinfo.getResidenceprovince())){
- wrappers.eq(ServiceDonatebaseinfo::getResidenceprovince ,serviceDonatebaseinfo.getResidenceprovince());
+ if (StringUtils.isNotBlank(serviceDonatebaseinfo.getResidenceprovince())) {
+ wrappers.eq(ServiceDonatebaseinfo::getResidenceprovince, serviceDonatebaseinfo.getResidenceprovince());
}
- if (serviceDonatebaseinfo.getRecordstate() != null){
- wrappers.eq(ServiceDonatebaseinfo::getRecordstate ,serviceDonatebaseinfo.getRecordstate());
+ 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.getTreatmenthospitalname())) {
+ wrappers.like(ServiceDonatebaseinfo::getTreatmenthospitalname, serviceDonatebaseinfo.getTreatmenthospitalname());
}
- if (StringUtils.isNotBlank(serviceDonatebaseinfo.getDonorno())){
- wrappers.eq(ServiceDonatebaseinfo::getDonorno ,serviceDonatebaseinfo.getDonorno());
+ 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.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"));
+ wrappers.between(ServiceDonatebaseinfo::getReporttime, params.get("beginReporttime"), params.get("endReporttime"));
}
return this.list(wrappers);
}
@@ -95,7 +96,9 @@
//鍙戠幇鍖婚櫌 C1C2AF1N1
String hospitalNo = serviceDonatebaseinfo.getTreatmenthospitalno();
BaseOrganization baseOrganization = baseOrganizationMapper.getOrganizationByNumber(hospitalNo);
- donateNumber += baseOrganization.getOrganizationid();
+ if (ObjectUtils.isNotEmpty(baseOrganization)) {
+ donateNumber += baseOrganization.getOrganizationid();
+ }
//宸ヤ綔浜哄憳 H1H2H3
donateNumber += serviceDonatebaseinfo.getReporterno();
@@ -133,29 +136,25 @@
public String updateS1S2S3S4(Long id) {
String oldDonateNumber = serviceDonatebaseinfoMapper.getDonateNumberById(id);
- List <ServiceDonationwitness> list = serviceDonationwitnessMapper.getWitnessList();
+ List<ServiceDonationwitness> list = serviceDonationwitnessMapper.getWitnessList();
int completeDonation = list.size();
String number = "";
- if(completeDonation < 10){
+ if (completeDonation < 10) {
number = "000" + completeDonation;
- }
- else if(completeDonation >= 10 && completeDonation < 100){
+ } else if (completeDonation >= 10 && completeDonation < 100) {
number = "00" + completeDonation;
- }
- else if(completeDonation >= 100 && completeDonation < 1000){
+ } else if (completeDonation >= 100 && completeDonation < 1000) {
number = "0" + completeDonation;
- }
- else {
+ } else {
number = "" + completeDonation;
}
int last = oldDonateNumber.lastIndexOf("*");
- if(last == -1){
+ if (last == -1) {
return oldDonateNumber;
- }
- else {
+ } else {
StringBuilder newDonateNumber = new StringBuilder(oldDonateNumber);
newDonateNumber.replace(last - 3, last + 1, number);
@@ -170,21 +169,21 @@
public List<ServiceDonatebaseinfo> selectServiceDonatebaseinfoList(ServiceDonatebaseinfo serviceDonatebaseinfo) {
SysUser user = SecurityUtils.getLoginUser().getUser();
- List <SysRole> l = user.getRoles();
+ List<SysRole> l = user.getRoles();
int b = 0;
- for(SysRole r : l){
- if(r.getRoleId().longValue() == 3){
+ for (SysRole r : l) {
+ if (r.getRoleId().longValue() == 3) {
b = 1;
}
- if(r.getRoleId().longValue() == 13){
+ if (r.getRoleId().longValue() == 13) {
b = 2;
}
}
- if(b == 1){
+ if (b == 1) {
serviceDonatebaseinfo.setCreateBy(user.getUserName());
}
- if(b == 2){
+ if (b == 2) {
serviceDonatebaseinfo.setDeptid(user.getDeptId());
}
return serviceDonatebaseinfoMapper.selectServiceDonatebaseinfoList(serviceDonatebaseinfo);
@@ -193,14 +192,14 @@
@Override
public List<ServiceDonatebaseinfo> listForSearch(ServiceDonatebaseinfo serviceDonatebaseinfo) {
SysUser user = SecurityUtils.getLoginUser().getUser();
- List <SysRole> l = user.getRoles();
+ List<SysRole> l = user.getRoles();
Boolean b = false;
- for(SysRole r : l){
- if(r.getRoleId().longValue() == 3){
+ for (SysRole r : l) {
+ if (r.getRoleId().longValue() == 3) {
b = true;
}
}
- if(b){
+ if (b) {
serviceDonatebaseinfo.setCreateBy(user.getUserName());
}
--
Gitblit v1.9.3