From df6b610c57536058d1292a086d56e49dab0acf46 Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期四, 25 五月 2023 20:12:37 +0800
Subject: [PATCH] 456
---
zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java | 61 ++++++++++++++++++++++--------
1 files changed, 45 insertions(+), 16 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java
index d1c5af7..a684a63 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java
@@ -11,6 +11,8 @@
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.ZInfoUser;
+import com.ruoyi.domain.ZfEquipment;
+import com.ruoyi.domain.ZfEvent;
import com.ruoyi.domain.ZfProperty;
import com.ruoyi.mapper.ZfPropertyMapper;
import com.ruoyi.service.IZfPropertyService;
@@ -22,8 +24,9 @@
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.List;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
import java.util.stream.Collectors;
import static com.ruoyi.constant.MenuAuthority.PROPERTY_LIST;
@@ -38,14 +41,11 @@
@Service
public class IZfPropertyServiceImpl extends ServiceImpl<ZfPropertyMapper, ZfProperty> implements IZfPropertyService {
-
-
@Resource
IZfPropertyService zfPropertyService;
@Resource
ZInfoUserService zInfoUserService;
-
private LambdaQueryWrapper<ZfProperty> buildCondition(ZfProperty zfProperty) {
@@ -57,7 +57,8 @@
.like(!StringUtils.isEmpty(zfProperty.getHolder()), ZfProperty::getHolder, zfProperty.getHolder())
.like(!StringUtils.isEmpty(zfProperty.getAddress()), ZfProperty::getAddress, zfProperty.getAddress())
.like(!StringUtils.isEmpty(zfProperty.getRemark()), ZfProperty::getRemark, zfProperty.getRemark())
- .like(zfProperty.getCreateTime() != null, ZfProperty::getCreateTime, zfProperty.getCreateTime());
+ .eq(zfProperty.getHappenTime()!=null,ZfProperty::getHappenTime,zfProperty.getHappenTime())
+ .between(zfProperty.getHappenStartTime() != null && zfProperty.getHappenEndTime() != null, ZfProperty::getHappenTime, zfProperty.getHappenStartTime(), zfProperty.getHappenEndTime());
return lqw;
}
@@ -86,7 +87,7 @@
secondFamilyIdsBuffer.deleteCharAt(secondFamilyIdsBuffer.length() - 1);
}
- }else{
+ } else {
setSecondFamilyAuthority(secondFamilyIdsBuffer, secondFamilyAuthority);
//鎶婂悗闈㈢殑閫楀彿鍘绘帀
if (secondFamilyIdsBuffer.length() > 1) {
@@ -140,7 +141,7 @@
}
- lqw.orderByDesc(ZfProperty::getId);
+ lqw.orderByDesc(ZfProperty::getCreateTime);
return lqw;
}
@@ -183,7 +184,7 @@
}
@Override
- public List<ZfProperty> selectByCondition(ZfProperty zfProperty) {
+ public List<ZfProperty> selectByCondition(ZfProperty zfProperty) {
String familyIds = listFamilyIds();
String secondFamilyIds = listSecondFamilyIds();
LambdaQueryWrapper<ZfProperty> lambdaQueryWrapper = buildCondition(zfProperty, familyIds, secondFamilyIds);
@@ -228,6 +229,16 @@
}
@Override
+ public List<ZfProperty> selectByIds(Long[] ids) {
+ List<ZfProperty> list = new ArrayList<>();
+ if(ids.length!=0)
+ list = listByIds(Arrays.asList(ids));
+ else
+ list = list();
+ return list;
+ }
+
+ @Override
public AjaxResult addData(ZfProperty zfProperty) {
String familyIds = listFamilyIds();
@@ -247,7 +258,7 @@
if (flag) {
if (save(zfProperty)) {
return AjaxResult.success();
- }else {
+ } else {
return AjaxResult.error();
}
@@ -257,34 +268,52 @@
}
@Override
- public AjaxResult addData2(ZfProperty zfProperty){
+ public AjaxResult addData2(ZfProperty zfProperty) {
ZInfoUser mySelf = getMySelf();
String myFamilyId = mySelf.getFamilyId();
- if (StringUtils.isNotEmpty(zfProperty.getFamilyId())){
+ if (StringUtils.isNotEmpty(zfProperty.getFamilyId())) {
throw new RuntimeException("瀵煎叆鏁版嵁鏃舵偍涓嶈兘鎸囧畾瀹跺涵鍙�");
}
- if(StringUtils.isEmpty(myFamilyId)){
+ if (StringUtils.isEmpty(myFamilyId)) {
throw new RuntimeException("鎮ㄨ繕鏈姞鍏ヤ换浣曞搴�");
}
- if (myFamilyId.contains(",")){
+ if (myFamilyId.contains(",")) {
String[] myFamilyIds = myFamilyId.split(",");
//榛樿娣诲姞绗竴涓搴殑鏁版嵁
zfProperty.setFamilyId(myFamilyIds[0]);
- }else {
+ } else {
zfProperty.setFamilyId(myFamilyId);
+ }
+
+ //鍒ゆ柇鏄惁鏈夐噸澶嶆暟鎹�
+ LambdaQueryWrapper<ZfProperty> lqw = uniqueCondition(zfProperty);
+ List<ZfProperty> list = list(lqw);
+ if(list.size()>0){
+ throw new RuntimeException("璇峰嬁鏂板閲嶅鏁版嵁");
}
if (save(zfProperty)) {
return AjaxResult.success();
- }else {
+ } else {
return AjaxResult.error();
}
}
+ private LambdaQueryWrapper<ZfProperty> uniqueCondition(ZfProperty zfProperty) {
+ LambdaQueryWrapper<ZfProperty> lqw = new LambdaQueryWrapper<>();
+ lqw.eq(!StringUtils.isEmpty(zfProperty.getType()), ZfProperty::getType, zfProperty.getType())
+ .eq(!StringUtils.isEmpty(zfProperty.getTitle()), ZfProperty::getTitle, zfProperty.getTitle())
+ .eq(!StringUtils.isEmpty(zfProperty.getLocation()), ZfProperty::getLocation, zfProperty.getLocation())
+ .eq(!StringUtils.isEmpty(zfProperty.getHolder()), ZfProperty::getHolder, zfProperty.getHolder())
+ .eq(!StringUtils.isEmpty(zfProperty.getAddress()), ZfProperty::getAddress, zfProperty.getAddress())
+ .eq(!StringUtils.isEmpty(zfProperty.getRemark()), ZfProperty::getRemark, zfProperty.getRemark())
+ .eq(zfProperty.getHappenTime()!=null,ZfProperty::getHappenTime,zfProperty.getHappenTime());
+ return lqw;
+ }
@Override
@Transactional
--
Gitblit v1.9.1