From 9b1a7b26c781e18eea12f82124e2fb8a57872f33 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 27 十月 2023 18:08:09 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceOrganallocationServiceImpl.java | 163 ++++++++++++++++++++++++++++++++----------------------
1 files changed, 97 insertions(+), 66 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceOrganallocationServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceOrganallocationServiceImpl.java
index f873f66..32b3dfc 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceOrganallocationServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceOrganallocationServiceImpl.java
@@ -1,9 +1,11 @@
package com.ruoyi.project.service.impl;
+import java.util.ArrayList;
import java.util.List;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -14,16 +16,20 @@
import com.ruoyi.project.mapper.ServiceOrganallocationMapper;
import com.ruoyi.project.domain.ServiceOrganallocation;
import com.ruoyi.project.service.IServiceOrganallocationService;
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.TransactionDefinition;
+import org.springframework.transaction.TransactionStatus;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.DefaultTransactionDefinition;
/**
* 鍣ㄥ畼鍒嗛厤Service涓氬姟灞傚鐞�
- *
+ *
* @author ruoyi
* @date 2021-11-10
*/
@Service
-public class ServiceOrganallocationServiceImpl extends ServiceImpl<ServiceOrganallocationMapper, ServiceOrganallocation> implements IServiceOrganallocationService
-{
+public class ServiceOrganallocationServiceImpl extends ServiceImpl<ServiceOrganallocationMapper, ServiceOrganallocation> implements IServiceOrganallocationService {
@Autowired
ServiceOrganallocationMapper serviceOrganallocationMapper;
@@ -31,99 +37,99 @@
/**
* 鏌ヨ鍣ㄥ畼鍒嗛厤鍒楄〃
- *
+ *
* @param serviceOrganallocation 鍣ㄥ畼鍒嗛厤
* @return 鍣ㄥ畼鍒嗛厤
*/
@Override
public List<ServiceOrganallocation> queryList(ServiceOrganallocation serviceOrganallocation) {
LambdaQueryWrapper<ServiceOrganallocation> wrappers = Wrappers.lambdaQuery();
- if (serviceOrganallocation.getOrganid() != null){
- wrappers.eq(ServiceOrganallocation::getOrganid ,serviceOrganallocation.getOrganid());
+ if (serviceOrganallocation.getOrganid() != null) {
+ wrappers.eq(ServiceOrganallocation::getOrganid, serviceOrganallocation.getOrganid());
}
- if (StringUtils.isNotBlank(serviceOrganallocation.getOrgannumber())){
- wrappers.eq(ServiceOrganallocation::getOrgannumber ,serviceOrganallocation.getOrgannumber());
+ if (StringUtils.isNotBlank(serviceOrganallocation.getOrgannumber())) {
+ wrappers.eq(ServiceOrganallocation::getOrgannumber, serviceOrganallocation.getOrgannumber());
}
- if (StringUtils.isNotBlank(serviceOrganallocation.getApplicantuserid())){
- wrappers.eq(ServiceOrganallocation::getApplicantuserid ,serviceOrganallocation.getApplicantuserid());
+ if (StringUtils.isNotBlank(serviceOrganallocation.getApplicantuserid())) {
+ wrappers.eq(ServiceOrganallocation::getApplicantuserid, serviceOrganallocation.getApplicantuserid());
}
- if (StringUtils.isNotBlank(serviceOrganallocation.getApplicantusername())){
- wrappers.like(ServiceOrganallocation::getApplicantusername ,serviceOrganallocation.getApplicantusername());
+ if (StringUtils.isNotBlank(serviceOrganallocation.getApplicantusername())) {
+ wrappers.like(ServiceOrganallocation::getApplicantusername, serviceOrganallocation.getApplicantusername());
}
- if (serviceOrganallocation.getApplicanttime() != null){
- wrappers.eq(ServiceOrganallocation::getApplicanttime ,serviceOrganallocation.getApplicanttime());
+ if (serviceOrganallocation.getApplicanttime() != null) {
+ wrappers.eq(ServiceOrganallocation::getApplicanttime, serviceOrganallocation.getApplicanttime());
}
- if (StringUtils.isNotBlank(serviceOrganallocation.getCheckuserid())){
- wrappers.eq(ServiceOrganallocation::getCheckuserid ,serviceOrganallocation.getCheckuserid());
+ if (StringUtils.isNotBlank(serviceOrganallocation.getCheckuserid())) {
+ wrappers.eq(ServiceOrganallocation::getCheckuserid, serviceOrganallocation.getCheckuserid());
}
- if (StringUtils.isNotBlank(serviceOrganallocation.getCheckusername())){
- wrappers.like(ServiceOrganallocation::getCheckusername ,serviceOrganallocation.getCheckusername());
+ if (StringUtils.isNotBlank(serviceOrganallocation.getCheckusername())) {
+ wrappers.like(ServiceOrganallocation::getCheckusername, serviceOrganallocation.getCheckusername());
}
- if (serviceOrganallocation.getChecktime() != null){
- wrappers.eq(ServiceOrganallocation::getChecktime ,serviceOrganallocation.getChecktime());
+ if (serviceOrganallocation.getChecktime() != null) {
+ wrappers.eq(ServiceOrganallocation::getChecktime, serviceOrganallocation.getChecktime());
}
- if (StringUtils.isNotBlank(serviceOrganallocation.getChecksuggestion())){
- wrappers.eq(ServiceOrganallocation::getChecksuggestion ,serviceOrganallocation.getChecksuggestion());
+ if (StringUtils.isNotBlank(serviceOrganallocation.getChecksuggestion())) {
+ wrappers.eq(ServiceOrganallocation::getChecksuggestion, serviceOrganallocation.getChecksuggestion());
}
- if (serviceOrganallocation.getAllocationstatus() != null){
- wrappers.eq(ServiceOrganallocation::getAllocationstatus ,serviceOrganallocation.getAllocationstatus());
+ if (serviceOrganallocation.getAllocationstatus() != null) {
+ wrappers.eq(ServiceOrganallocation::getAllocationstatus, serviceOrganallocation.getAllocationstatus());
}
- if (StringUtils.isNotBlank(serviceOrganallocation.getName())){
- wrappers.like(ServiceOrganallocation::getName ,serviceOrganallocation.getName());
+ if (StringUtils.isNotBlank(serviceOrganallocation.getName())) {
+ wrappers.like(ServiceOrganallocation::getName, serviceOrganallocation.getName());
}
- if (serviceOrganallocation.getSex() != null){
- wrappers.eq(ServiceOrganallocation::getSex ,serviceOrganallocation.getSex());
+ if (serviceOrganallocation.getSex() != null) {
+ wrappers.eq(ServiceOrganallocation::getSex, serviceOrganallocation.getSex());
}
- if (serviceOrganallocation.getIdcardtype() != null){
- wrappers.eq(ServiceOrganallocation::getIdcardtype ,serviceOrganallocation.getIdcardtype());
+ if (serviceOrganallocation.getIdcardtype() != null) {
+ wrappers.eq(ServiceOrganallocation::getIdcardtype, serviceOrganallocation.getIdcardtype());
}
- if (StringUtils.isNotBlank(serviceOrganallocation.getIdcardno())){
- wrappers.eq(ServiceOrganallocation::getIdcardno ,serviceOrganallocation.getIdcardno());
+ if (StringUtils.isNotBlank(serviceOrganallocation.getIdcardno())) {
+ wrappers.eq(ServiceOrganallocation::getIdcardno, serviceOrganallocation.getIdcardno());
}
- if (serviceOrganallocation.getAge() != null){
- wrappers.eq(ServiceOrganallocation::getAge ,serviceOrganallocation.getAge());
+ if (serviceOrganallocation.getAge() != null) {
+ wrappers.eq(ServiceOrganallocation::getAge, serviceOrganallocation.getAge());
}
- if (StringUtils.isNotBlank(serviceOrganallocation.getAgeunit())){
- wrappers.eq(ServiceOrganallocation::getAgeunit ,serviceOrganallocation.getAgeunit());
+ if (StringUtils.isNotBlank(serviceOrganallocation.getAgeunit())) {
+ wrappers.eq(ServiceOrganallocation::getAgeunit, serviceOrganallocation.getAgeunit());
}
- if (StringUtils.isNotBlank(serviceOrganallocation.getBirthday())){
- wrappers.eq(ServiceOrganallocation::getBirthday ,serviceOrganallocation.getBirthday());
+ if (StringUtils.isNotBlank(serviceOrganallocation.getBirthday())) {
+ wrappers.eq(ServiceOrganallocation::getBirthday, serviceOrganallocation.getBirthday());
}
- if (StringUtils.isNotBlank(serviceOrganallocation.getPhone())){
- wrappers.eq(ServiceOrganallocation::getPhone ,serviceOrganallocation.getPhone());
+ if (StringUtils.isNotBlank(serviceOrganallocation.getPhone())) {
+ wrappers.eq(ServiceOrganallocation::getPhone, serviceOrganallocation.getPhone());
}
- if (StringUtils.isNotBlank(serviceOrganallocation.getResidenceaddress())){
- wrappers.eq(ServiceOrganallocation::getResidenceaddress ,serviceOrganallocation.getResidenceaddress());
+ if (StringUtils.isNotBlank(serviceOrganallocation.getResidenceaddress())) {
+ wrappers.eq(ServiceOrganallocation::getResidenceaddress, serviceOrganallocation.getResidenceaddress());
}
- if (StringUtils.isNotBlank(serviceOrganallocation.getResidenceprovince())){
- wrappers.eq(ServiceOrganallocation::getResidenceprovince ,serviceOrganallocation.getResidenceprovince());
+ if (StringUtils.isNotBlank(serviceOrganallocation.getResidenceprovince())) {
+ wrappers.eq(ServiceOrganallocation::getResidenceprovince, serviceOrganallocation.getResidenceprovince());
}
- if (StringUtils.isNotBlank(serviceOrganallocation.getResidenceprovincename())){
- wrappers.like(ServiceOrganallocation::getResidenceprovincename ,serviceOrganallocation.getResidenceprovincename());
+ if (StringUtils.isNotBlank(serviceOrganallocation.getResidenceprovincename())) {
+ wrappers.like(ServiceOrganallocation::getResidenceprovincename, serviceOrganallocation.getResidenceprovincename());
}
- if (StringUtils.isNotBlank(serviceOrganallocation.getResidencecity())){
- wrappers.eq(ServiceOrganallocation::getResidencecity ,serviceOrganallocation.getResidencecity());
+ if (StringUtils.isNotBlank(serviceOrganallocation.getResidencecity())) {
+ wrappers.eq(ServiceOrganallocation::getResidencecity, serviceOrganallocation.getResidencecity());
}
- if (StringUtils.isNotBlank(serviceOrganallocation.getResidencecityname())){
- wrappers.like(ServiceOrganallocation::getResidencecityname ,serviceOrganallocation.getResidencecityname());
+ if (StringUtils.isNotBlank(serviceOrganallocation.getResidencecityname())) {
+ wrappers.like(ServiceOrganallocation::getResidencecityname, serviceOrganallocation.getResidencecityname());
}
- if (StringUtils.isNotBlank(serviceOrganallocation.getResidencetown())){
- wrappers.eq(ServiceOrganallocation::getResidencetown ,serviceOrganallocation.getResidencetown());
+ if (StringUtils.isNotBlank(serviceOrganallocation.getResidencetown())) {
+ wrappers.eq(ServiceOrganallocation::getResidencetown, serviceOrganallocation.getResidencetown());
}
- if (StringUtils.isNotBlank(serviceOrganallocation.getResidencetownname())){
- wrappers.like(ServiceOrganallocation::getResidencetownname ,serviceOrganallocation.getResidencetownname());
+ if (StringUtils.isNotBlank(serviceOrganallocation.getResidencetownname())) {
+ wrappers.like(ServiceOrganallocation::getResidencetownname, serviceOrganallocation.getResidencetownname());
}
- if (StringUtils.isNotBlank(serviceOrganallocation.getResidencecommunity())){
- wrappers.eq(ServiceOrganallocation::getResidencecommunity ,serviceOrganallocation.getResidencecommunity());
+ if (StringUtils.isNotBlank(serviceOrganallocation.getResidencecommunity())) {
+ wrappers.eq(ServiceOrganallocation::getResidencecommunity, serviceOrganallocation.getResidencecommunity());
}
- if (StringUtils.isNotBlank(serviceOrganallocation.getResidencecommunityname())){
- wrappers.like(ServiceOrganallocation::getResidencecommunityname ,serviceOrganallocation.getResidencecommunityname());
+ if (StringUtils.isNotBlank(serviceOrganallocation.getResidencecommunityname())) {
+ wrappers.like(ServiceOrganallocation::getResidencecommunityname, serviceOrganallocation.getResidencecommunityname());
}
- if (StringUtils.isNotBlank(serviceOrganallocation.getResidencecountycode())){
- wrappers.eq(ServiceOrganallocation::getResidencecountycode ,serviceOrganallocation.getResidencecountycode());
+ if (StringUtils.isNotBlank(serviceOrganallocation.getResidencecountycode())) {
+ wrappers.eq(ServiceOrganallocation::getResidencecountycode, serviceOrganallocation.getResidencecountycode());
}
- if (StringUtils.isNotBlank(serviceOrganallocation.getResidencecountyname())){
- wrappers.like(ServiceOrganallocation::getResidencecountyname ,serviceOrganallocation.getResidencecountyname());
+ if (StringUtils.isNotBlank(serviceOrganallocation.getResidencecountyname())) {
+ wrappers.like(ServiceOrganallocation::getResidencecountyname, serviceOrganallocation.getResidencecountyname());
}
return this.list(wrappers);
}
@@ -132,18 +138,43 @@
public List<ServiceOrganallocation> selectServiceOrganallocationList(ServiceOrganallocation serviceOrganallocation) {
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) {
serviceOrganallocation.setCreateBy(user.getUserName());
}
return serviceOrganallocationMapper.selectServiceOrganallocationList(serviceOrganallocation);
}
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public List<ServiceOrganallocation> saveDate(List<ServiceOrganallocation> serviceOrganallocations) {
+
+ for (ServiceOrganallocation serviceOrganallocation : serviceOrganallocations) {
+ this.save(serviceOrganallocation);
+ }
+ //灏嗗甫ID鐨勬暟鎹繑鍥�
+ return serviceOrganallocations;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Boolean editArrayData(List<ServiceOrganallocation> serviceOrganallocations) {
+ for (ServiceOrganallocation serviceOrganallocation : serviceOrganallocations) {
+ if (serviceOrganallocation.getId() == null) {
+ throw new BaseException("id涓虹┖浜� 锛�" + serviceOrganallocation);
+ }
+ this.updateById(serviceOrganallocation);
+ }
+ //灏嗗甫ID鐨勬暟鎹繑鍥�
+ return true;
+ }
+
}
--
Gitblit v1.9.3