From 1d14ba39daf0422199c44b5b2ffc67d2364b2be2 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期日, 07 四月 2024 17:24:50 +0800
Subject: [PATCH] 工单状态完善
---
ycl-server/src/main/java/com/ycl/platform/service/impl/YwPeopleServiceImpl.java | 78 ++++++++++++++++++++++++++++++++++-----
1 files changed, 68 insertions(+), 10 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPeopleServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPeopleServiceImpl.java
index 576185f..53a6c0a 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPeopleServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPeopleServiceImpl.java
@@ -1,7 +1,9 @@
package com.ycl.platform.service.impl;
import com.ycl.platform.domain.entity.YwPeople;
+import com.ycl.platform.domain.entity.YwUnit;
import com.ycl.platform.mapper.YwPeopleMapper;
+import com.ycl.platform.mapper.YwUnitMapper;
import com.ycl.platform.service.YwPeopleService;
import com.ycl.system.Result;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -11,15 +13,21 @@
import java.util.List;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ycl.system.entity.SysUser;
+import com.ycl.system.mapper.SysUserMapper;
import com.ycl.system.page.PageUtil;
+import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.stereotype.Service;
import org.springframework.beans.BeanUtils;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;
+import java.util.Objects;
import java.util.stream.Collectors;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import lombok.RequiredArgsConstructor;
+import org.springframework.util.StringUtils;
/**
* 杩愮淮浜哄憳 鏈嶅姟瀹炵幇绫�
@@ -32,6 +40,9 @@
public class YwPeopleServiceImpl extends ServiceImpl<YwPeopleMapper, YwPeople> implements YwPeopleService {
private final YwPeopleMapper ywPeopleMapper;
+ private final YwUnitMapper ywUnitMapper;
+ private final PasswordEncoder passwordEncoder;
+ private final SysUserMapper sysUserMapper;
/**
* 娣诲姞
@@ -39,12 +50,34 @@
* @return
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public Result add(YwPeopleForm form) {
+ // 涓鸿繍缁翠汉鍛樻坊鍔犺处鍙�
+ SysUser sysUser = new SysUser();
+ fullUser(sysUser, form);
+ sysUserMapper.insertUser(sysUser);
+
YwPeople entity = YwPeopleForm.getEntityByForm(form, null);
+ entity.setUserId(sysUser.getUserId());
+ entity.setAddWay("manual");
if(baseMapper.insert(entity) > 0) {
return Result.ok("娣诲姞鎴愬姛");
}
return Result.error("娣诲姞澶辫触");
+ }
+
+ /**
+ * 璧嬪�紆ser
+ * @param sysUser
+ * @param form
+ */
+ public void fullUser(SysUser sysUser, YwPeopleForm form) {
+ sysUser.setUserName(form.getYwPersonAccount());
+ sysUser.setPassword(passwordEncoder.encode("123456"));
+ sysUser.setStatus("0");
+ sysUser.setDelFlag("0");
+ sysUser.setFirstLogin((short) 0);
+ sysUser.setNickName(form.getYwPersonName());
}
/**
@@ -53,12 +86,18 @@
* @return
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public Result update(YwPeopleForm form) {
YwPeople entity = baseMapper.selectById(form.getId());
-
// 涓虹┖鎶汭llegalArgumentException锛屽仛鍏ㄥ眬寮傚父澶勭悊
Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
+
+ SysUser sysUser = sysUserMapper.selectUserById(entity.getUserId());
+ sysUser.setUserName(form.getYwPersonAccount());
+ sysUser.setNickName(form.getYwPersonName());
+ sysUserMapper.updateUser(sysUser);
+
BeanUtils.copyProperties(form, entity);
if (baseMapper.updateById(entity) > 0) {
return Result.ok("淇敼鎴愬姛");
@@ -72,11 +111,16 @@
* @return
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public Result remove(List<String> ids) {
- if(baseMapper.deleteBatchIds(ids) > 0) {
- return Result.ok("鍒犻櫎鎴愬姛");
- }
- return Result.error("鍒犻櫎澶辫触");
+ List<YwPeople> list = new LambdaQueryChainWrapper<>(baseMapper)
+ .select(YwPeople::getUserId)
+ .in(YwPeople::getId, ids)
+ .list();
+ List<Long> userIds = list.stream().map(YwPeople::getUserId).collect(Collectors.toList());
+ baseMapper.deleteBatchIds(ids);
+ sysUserMapper.deleteUserByIds((Long[]) userIds.toArray());
+ return Result.ok("鍒犻櫎鎴愬姛");
}
/**
@@ -85,11 +129,12 @@
* @return
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public Result removeById(String id) {
- if(baseMapper.deleteById(id) > 0) {
- return Result.ok("鍒犻櫎鎴愬姛");
- }
- return Result.error("鍒犻櫎澶辫触");
+ YwPeople ywPeople = baseMapper.selectById(id);
+ sysUserMapper.deleteUserById(ywPeople.getUserId());
+ baseMapper.deleteById(id);
+ return Result.ok("鍒犻櫎鎴愬姛");
}
/**
@@ -101,12 +146,25 @@
public Result page(YwPeopleQuery query) {
IPage<YwPeople> page = new LambdaQueryChainWrapper<>(baseMapper)
+ .eq(StringUtils.hasText(query.getYwPersonCode()), YwPeople::getYwPersonCode, query.getYwPersonCode())
+ .like(StringUtils.hasText(query.getYwPersonName()), YwPeople::getYwPersonName, query.getYwPersonName())
+ .eq(Objects.nonNull(query.getBelongUnit()), YwPeople::getBelongUnit, query.getBelongUnit())
.orderByDesc(YwPeople::getCreateTime)
.page(PageUtil.getPage(query, YwPeople.class));
List<YwPeopleVO> vos = page.getRecords().stream()
.map(
- entity -> YwPeopleVO.getVoByEntity(entity, null)
+ entity -> {
+ YwPeopleVO vo = YwPeopleVO.getVoByEntity(entity, null);
+ YwUnit unit = new LambdaQueryChainWrapper<>(ywUnitMapper)
+ .eq(YwUnit::getId, vo.getBelongUnit())
+ .select(YwUnit::getUnitName)
+ .one();
+ if (Objects.nonNull(unit)) {
+ vo.setBelongUnitName(unit.getUnitName());
+ }
+ return vo;
+ }
)
.collect(Collectors.toList());
return Result.ok().data(vos).total(page.getTotal());
--
Gitblit v1.8.0