From efcdc8c49b0452d9c7f192ab351da09bf8aafc80 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期一, 27 五月 2024 18:34:58 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerParamServiceImpl.java | 37 ++++++++++++++++++++++---------------
1 files changed, 22 insertions(+), 15 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerParamServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerParamServiceImpl.java
index 437393f..d0ad267 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerParamServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerParamServiceImpl.java
@@ -10,6 +10,7 @@
import com.doumee.dao.business.HiddenDangerParamMapper;
import com.doumee.dao.business.MemberMapper;
import com.doumee.dao.business.model.CarDriver;
+import com.doumee.dao.business.model.HiddenDanger;
import com.doumee.dao.business.model.HiddenDangerParam;
import com.doumee.dao.business.model.Member;
import com.doumee.service.business.HiddenDangerParamService;
@@ -47,18 +48,19 @@
}
if(Constants.equalsInteger(model.getType(),Constants.ZERO)){
//濡傛灉鏄尯鍩熼厤缃�
- List<Integer> ids = Constants.getIntegerListByStrs(model.getMemberIds());
+ List<Integer> ids = model.getMemberIdList();
if(ids==null || ids.size() ==0){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝瀹夊叏鍛樹俊鎭笉姝ｇ‘锛岃鎸夎姹傚～鍐欏唴瀹癸紒");
}
List<Member> memberList = memberMapper.selectList(new QueryWrapper<Member>().lambda()
.eq(Member::getType,Constants.TWO)
+ .in(Member::getId,ids)
.eq(Member::getIsdeleted,Constants.ZERO));
if(memberList == null || memberList.size() == 0 || memberList.size() != ids.size() ){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇烽�夋嫨姝ｇ‘鐨勫畨鍏ㄥ憳淇℃伅锛�");
}
- String names = null;
- String idss = null;
+ String names = "";
+ String idss = "";
for(Member member : memberList){
if(StringUtils.isNotBlank(names)){
names += ",";
@@ -67,7 +69,7 @@
idss += ",";
}
names += member.getName();
- names += member.getId();
+ idss += member.getId();
}
model.setMemberNames(names);
model.setMemberIds(idss);
@@ -78,6 +80,7 @@
model.setEditDate(new Date());
model.setEditor(loginUserInfo.getId());
model.setStatus(Constants.ZERO);
+ model.setIsdeleted(Constants.ZERO);
hiddenDangerParamMapper.insert(model);
return model.getId();
}
@@ -115,23 +118,24 @@
loginUserInfo = model.getLoginUserInfo();
}
HiddenDangerParam hiddenDangerParam = hiddenDangerParamMapper.selectById(model.getId());
- if(hiddenDangerParam == null || Constants.equalsObject(hiddenDangerParam.getIsdeleted(),Constants.ONE)){
+ if(hiddenDangerParam == null || Constants.equalsInteger(hiddenDangerParam.getIsdeleted(),Constants.ONE)){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝璇ラ厤缃俊鎭笉瀛樺湪锛岃杩斿洖鍒锋柊椤甸潰閲嶈瘯锛�");
}
if(Constants.equalsInteger(hiddenDangerParam.getType(),Constants.ZERO)){
//濡傛灉鏄尯鍩熼厤缃�,鏍￠獙瀹夊叏鍛樹俊鎭槸鍚︽纭�
- List<Integer> ids = Constants.getIntegerListByStrs(model.getMemberIds());
+ List<Integer> ids =model.getMemberIdList();
if(ids==null || ids.size() ==0){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝瀹夊叏鍛樹俊鎭笉姝ｇ‘锛岃鎸夎姹傚～鍐欏唴瀹癸紒");
}
List<Member> memberList = memberMapper.selectList(new QueryWrapper<Member>().lambda()
.eq(Member::getType,Constants.TWO)
+ .in(Member::getId,ids)
.eq(Member::getIsdeleted,Constants.ZERO));
if(memberList == null || memberList.size() == 0 || memberList.size() != ids.size() ){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇烽�夋嫨姝ｇ‘鐨勫畨鍏ㄥ憳淇℃伅锛�");
}
- String names = null;
- String idss = null;
+ String names = "";
+ String idss = "";
for(Member member : memberList){
if(StringUtils.isNotBlank(names)){
names += ",";
@@ -140,7 +144,7 @@
idss += ",";
}
names += member.getName();
- names += member.getId();
+ idss += member.getId();
}
model.setMemberNames(names);
model.setMemberIds(idss);
@@ -175,7 +179,10 @@
@Override
public List<HiddenDangerParam> findList(HiddenDangerParam hiddenDangerParam) {
+
+ hiddenDangerParam.setIsdeleted(Constants.ZERO);
QueryWrapper<HiddenDangerParam> wrapper = new QueryWrapper<>(hiddenDangerParam);
+ wrapper.lambda().orderByAsc(HiddenDangerParam::getSortnum);
return hiddenDangerParamMapper.selectList(wrapper);
}
@@ -188,13 +195,9 @@
queryWrapper.lambda()
.eq(pageWrap.getModel().getId() != null, HiddenDangerParam::getId, pageWrap.getModel().getId())
.eq(pageWrap.getModel().getCreator() != null, HiddenDangerParam::getCreator, pageWrap.getModel().getCreator())
- .ge(pageWrap.getModel().getCreateDate() != null, HiddenDangerParam::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()))
- .le(pageWrap.getModel().getCreateDate() != null, HiddenDangerParam::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()))
.eq(pageWrap.getModel().getEditor() != null, HiddenDangerParam::getEditor, pageWrap.getModel().getEditor())
- .ge(pageWrap.getModel().getEditDate() != null, HiddenDangerParam::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()))
- .le(pageWrap.getModel().getEditDate() != null, HiddenDangerParam::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()))
.eq(pageWrap.getModel().getIsdeleted() != null, HiddenDangerParam::getIsdeleted, pageWrap.getModel().getIsdeleted())
- .eq(pageWrap.getModel().getName() != null, HiddenDangerParam::getName, pageWrap.getModel().getName())
+ .like(pageWrap.getModel().getName() != null, HiddenDangerParam::getName, pageWrap.getModel().getName())
.eq(pageWrap.getModel().getRemark() != null, HiddenDangerParam::getRemark, pageWrap.getModel().getRemark())
.eq(pageWrap.getModel().getStatus() != null, HiddenDangerParam::getStatus, pageWrap.getModel().getStatus())
.eq(pageWrap.getModel().getSortnum() != null, HiddenDangerParam::getSortnum, pageWrap.getModel().getSortnum())
@@ -202,7 +205,9 @@
.eq(pageWrap.getModel().getMemberIds() != null, HiddenDangerParam::getMemberIds, pageWrap.getModel().getMemberIds())
.eq(pageWrap.getModel().getMemberNames() != null, HiddenDangerParam::getMemberNames, pageWrap.getModel().getMemberNames())
.eq(pageWrap.getModel().getType() != null, HiddenDangerParam::getType, pageWrap.getModel().getType())
+ .orderByAsc(HiddenDangerParam::getSortnum)
.orderByDesc(HiddenDangerParam::getCreateDate)
+ .eq( HiddenDangerParam::getIsdeleted, Constants.ZERO)
;
for(PageWrap.SortData sortData: pageWrap.getSorts()) {
if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
@@ -211,7 +216,9 @@
queryWrapper.orderByAsc(sortData.getProperty());
}
}
- return PageData.from(hiddenDangerParamMapper.selectPage(page, queryWrapper));
+ PageData<HiddenDangerParam> result = PageData.from(hiddenDangerParamMapper.selectPage(page, queryWrapper));
+
+ return result;
}
@Override
--
Gitblit v1.9.3