From a8395146b319d746a27d9ea2d7adb2aaec5ccdb8 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 19 四月 2024 17:56:20 +0800
Subject: [PATCH] 考核规则图标存储
---
ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java | 76 ++++++++++++++++++++++++++++++++++----
1 files changed, 68 insertions(+), 8 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java
index 811d071..b297192 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java
@@ -1,10 +1,18 @@
package com.ycl.platform.service.impl;
+import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
+import com.ycl.platform.base.BaseSelect;
+import com.ycl.platform.domain.entity.Region;
+import com.ycl.platform.domain.entity.YwPeople;
import com.ycl.platform.domain.entity.YwPoint;
import com.ycl.platform.domain.entity.YwUnit;
+import com.ycl.platform.domain.form.BatchEditPointForm;
+import com.ycl.platform.mapper.RegionMapper;
+import com.ycl.platform.mapper.YwPeopleMapper;
import com.ycl.platform.mapper.YwPointMapper;
import com.ycl.platform.mapper.YwUnitMapper;
import com.ycl.platform.service.YwPointService;
+import com.ycl.platform.service.YwUnitService;
import com.ycl.system.Result;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.platform.domain.form.YwPointForm;
@@ -12,16 +20,20 @@
import com.ycl.platform.domain.query.YwPointQuery;
import java.util.List;
+import com.ycl.system.entity.SysUser;
+import com.ycl.system.service.ISysDeptService;
+
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ycl.system.page.PageUtil;
+import com.ycl.utils.SecurityUtils;
+import enumeration.general.RegionLevelEnum;
import org.springframework.stereotype.Service;
-import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.beans.BeanUtils;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;
import java.util.ArrayList;
+import java.util.Objects;
import java.util.stream.Collectors;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import lombok.RequiredArgsConstructor;
import org.springframework.util.StringUtils;
@@ -37,7 +49,11 @@
public class YwPointServiceImpl extends ServiceImpl<YwPointMapper, YwPoint> implements YwPointService {
private final YwPointMapper ywPointMapper;
+ private final ISysDeptService deptService;
+ private final YwUnitService unitService;
private final YwUnitMapper ywUnitMapper;
+ private final RegionMapper regionMapper;
+ private final YwPeopleMapper ywPeopleMapper;
/**
* 娣诲姞
@@ -63,6 +79,27 @@
baseMapper.insert(entity);
});
return Result.ok("娣诲姞鎴愬姛");
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Result batchEdit(BatchEditPointForm form) {
+ if (Objects.nonNull(form.getUnitId())) {
+ new LambdaUpdateChainWrapper<>(baseMapper)
+ .in(YwPoint::getId, form.getIds())
+ .set(YwPoint::getUnitId, form.getUnitId())
+ .set(YwPoint::getStartTime, form.getStartTime())
+ .set(YwPoint::getEndTime, form.getEndTime())
+ .update();
+ } else {
+ new LambdaUpdateChainWrapper<>(baseMapper)
+ .in(YwPoint::getId, form.getIds())
+ .set(YwPoint::getUnitId, form.getUnitId())
+ .set(YwPoint::getStartTime, null)
+ .set(YwPoint::getEndTime, null)
+ .update();
+ }
+ return Result.ok("淇敼鎴愬姛");
}
/**
@@ -125,14 +162,12 @@
List<YwPointVO> vos = page.getRecords().stream()
.map(
- entity -> {
- YwPointVO vo = YwPointVO.getVoByEntity(entity, null);
- YwUnit unit = ywUnitMapper.selectById(vo.getUnitId());
- vo.setUnitName(unit.getUnitName());
- return vo;
- }
+ entity -> YwPointVO.getVoByEntity(entity, null)
+ .setDeptName(deptService.selectDeptById(entity.getDeptId()).getDeptName())
+ .setUnitName(unitService.getById(entity.getUnitId()).getUnitName())
)
.collect(Collectors.toList());
+
return Result.ok().data(vos).total(page.getTotal());
}
@@ -164,4 +199,29 @@
.collect(Collectors.toList());
return Result.ok().data(vos);
}
+
+ @Override
+ public Result select(String keyword) {
+ Long userId = SecurityUtils.getUserId();
+ // 鑾峰彇褰撳墠杩愮淮浜哄憳鐨勮繍缁村崟浣�
+ YwPeople people = new LambdaQueryChainWrapper<>(ywPeopleMapper)
+ .eq(YwPeople::getUserId, userId)
+ .one();
+ Integer unitId = null;
+ if (Objects.nonNull(people)) {
+ unitId = people.getBelongUnit();
+ }
+
+ List<YwPoint> list = new LambdaQueryChainWrapper<>(baseMapper)
+ .eq(YwPoint::getUnitId, unitId)
+ .like(YwPoint::getPointName, keyword)
+ .list();
+ List<BaseSelect> data = list.stream().map(item -> {
+ BaseSelect baseSelect = new BaseSelect();
+ baseSelect.setId(item.getId());
+ baseSelect.setValue(item.getPointName());
+ return baseSelect;
+ }).collect(Collectors.toList());
+ return Result.ok().data(data);
+ }
}
--
Gitblit v1.8.0