From 67a4d4128fe6e4101d34e92689c8e3284ef4dbd4 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 30 十月 2024 09:17:10 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerParamServiceImpl.java | 16 +++++++++++++---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDangerParam.java | 9 +++++++++
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/HiddenDangerParamMapper.java | 3 ++-
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java | 5 ++---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDanger.java | 3 ---
5 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/HiddenDangerParamMapper.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/HiddenDangerParamMapper.java
index 5ce0ac1..4b95368 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/HiddenDangerParamMapper.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/HiddenDangerParamMapper.java
@@ -2,11 +2,12 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.doumee.dao.business.model.HiddenDangerParam;
+import com.github.yulichang.base.MPJBaseMapper;
/**
* @author 姹熻箘韫�
* @since 2024/04/28 16:06
*/
-public interface HiddenDangerParamMapper extends BaseMapper<HiddenDangerParam> {
+public interface HiddenDangerParamMapper extends MPJBaseMapper<HiddenDangerParam> {
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDanger.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDanger.java
index 9119694..dd3c760 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDanger.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDanger.java
@@ -77,9 +77,6 @@
@ApiModelProperty(value = "鎻愭姤浜虹紪鐮侊紙鍏宠仈member锛�", example = "1")
// @ExcelColumn(name="鎻愭姤浜虹紪鐮侊紙鍏宠仈member锛�")
private Integer memberId;
- @ApiModelProperty(value = "璐ｄ换閮ㄩ棬缂栫爜锛堝叧鑱攃ompany锛�", example = "1")
-// @ExcelColumn(name="鎻愭姤浜虹紪鐮侊紙鍏宠仈member锛�")
- private Integer dutyCompanyId;
@ApiModelProperty(value = "澶勭悊鏃堕棿")
// @ExcelColumn(name="澶勭悊鏃堕棿")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDangerParam.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDangerParam.java
index 16662f9..dcb7980 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDangerParam.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDangerParam.java
@@ -83,4 +83,13 @@
@TableField(exist = false)
private List<Integer> memberIdList;
+
+ @ApiModelProperty(value = "璐ｄ换閮ㄩ棬缂栫爜锛堝叧鑱攃ompany锛�", example = "1")
+// @ExcelColumn(name="鎻愭姤浜虹紪鐮侊紙鍏宠仈member锛�")
+ private Integer companyId;
+ @ApiModelProperty(value = "璐ｄ换閮ㄩ棬缂栫爜", example = "1")
+// @ExcelColumn(name="鎻愭姤浜虹紪鐮侊紙鍏宠仈member锛�")
+ @TableField(exist = false)
+ private Integer companyName;
+
}
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 a81e0ef..0fc9114 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
@@ -59,12 +59,16 @@
}
if(Constants.equalsInteger(model.getType(),Constants.ZERO)){
//濡傛灉鏄尯鍩熼厤缃�
+ if(model.getCompanyId() == null){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇烽�夋嫨璐ｄ换閮ㄩ棬锛�");
+ }
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)
+ .eq(Member::getCompanyId,model.getCompanyId())
.in(Member::getId,ids)
.eq(Member::getIsdeleted,Constants.ZERO));
if(memberList == null || memberList.size() == 0 || memberList.size() != ids.size() ){
@@ -142,12 +146,16 @@
}
if(Constants.equalsInteger(hiddenDangerParam.getType(),Constants.ZERO)){
//濡傛灉鏄尯鍩熼厤缃�,鏍￠獙瀹夊叏鍛樹俊鎭槸鍚︽纭�
+ if(model.getCompanyId() == null){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇烽�夋嫨璐ｄ换閮ㄩ棬锛�");
+ }
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)
+ .eq(Member::getCompanyId,model.getCompanyId())
.in(Member::getId,ids)
.eq(Member::getIsdeleted,Constants.ZERO));
if(memberList == null || memberList.size() == 0 || memberList.size() != ids.size() ){
@@ -208,10 +216,12 @@
@Override
public PageData<HiddenDangerParam> findPage(PageWrap<HiddenDangerParam> pageWrap) {
IPage<HiddenDangerParam> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- QueryWrapper<HiddenDangerParam> queryWrapper = new QueryWrapper<>();
+ MPJLambdaWrapper<HiddenDangerParam> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
pageWrap.getModel().setIsdeleted(Constants.ZERO);
- queryWrapper.lambda()
+ queryWrapper. selectAll(HiddenDangerParam.class)
+ .selectAs(Company::getCompanyNamePath,HiddenDangerParam::getCompanyName)
+ .leftJoin(Company.class,Company::getId,HiddenDangerParam::getCompanyId)
.eq(pageWrap.getModel().getId() != null, HiddenDangerParam::getId, pageWrap.getModel().getId())
.eq(pageWrap.getModel().getCreator() != null, HiddenDangerParam::getCreator, pageWrap.getModel().getCreator())
.eq(pageWrap.getModel().getEditor() != null, HiddenDangerParam::getEditor, pageWrap.getModel().getEditor())
@@ -235,7 +245,7 @@
queryWrapper.orderByAsc(sortData.getProperty());
}
}
- PageData<HiddenDangerParam> result = PageData.from(hiddenDangerParamMapper.selectPage(page, queryWrapper));
+ PageData<HiddenDangerParam> result = PageData.from(hiddenDangerParamMapper.selectJoinPage(page,HiddenDangerParam.class, queryWrapper));
return result;
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
index a920b7b..8c93aed 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
@@ -244,7 +244,7 @@
.leftJoin(Member.class,Member::getId,HiddenDanger::getCheckUserId)
.leftJoin(HiddenDangerParam.class,HiddenDangerParam::getId,HiddenDanger::getCateId)
.leftJoin("company t4 on t1.company_id=t4.id")
- .leftJoin("company t5 on t.duty_company_id=t5.id");
+ .leftJoin("company t5 on t3.company_id=t5.id");
queryWrapper
.eq(HiddenDanger::getId, id).last("limit 1");
@@ -326,7 +326,7 @@
.leftJoin(Member.class,Member::getId,HiddenDanger::getCheckUserId)
.leftJoin(HiddenDangerParam.class,HiddenDangerParam::getId,HiddenDanger::getCateId)
.leftJoin("company t4 on t1.company_id=t4.id")
- .leftJoin("company t5 on t.duty_company_id=t5.id");
+ .leftJoin("company t5 on t3.company_id=t5.id");
//鏁版嵁鏉冮檺寮�濮�--------------------start----------------
LoginUserInfo userInfo =pageWrap.getModel().getLoginUserInfo();
@@ -354,7 +354,6 @@
.eq(pageWrap.getModel().getStatus() != null, HiddenDanger::getStatus, pageWrap.getModel().getStatus())
.eq(pageWrap.getModel().getApplyCheckUserId() != null, HiddenDanger::getApplyCheckUserId, pageWrap.getModel().getApplyCheckUserId())
.eq(pageWrap.getModel().getCateId() != null, HiddenDanger::getCateId, pageWrap.getModel().getCateId())
- .eq(pageWrap.getModel().getDutyCompanyId() != null, HiddenDanger::getDutyCompanyId, pageWrap.getModel().getDutyCompanyId())
.eq(pageWrap.getModel().getContent() != null, HiddenDanger::getContent, pageWrap.getModel().getContent())
.eq(pageWrap.getModel().getMemberId() != null, HiddenDanger::getMemberId, pageWrap.getModel().getMemberId())
.ge(pageWrap.getModel().getCheckDate() != null, HiddenDanger::getCheckDate, Utils.Date.getStart(pageWrap.getModel().getCheckDate()))
--
Gitblit v1.9.3