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> { } 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 = "责任部门编码（关联company）", example = "1") // @ExcelColumn(name="提报人编码（关联member）") private Integer dutyCompanyId; @ApiModelProperty(value = "处理时间") // @ExcelColumn(name="处理时间") 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 = "责任部门编码（关联company）", example = "1") // @ExcelColumn(name="提报人编码（关联member）") private Integer companyId; @ApiModelProperty(value = "责任部门编码", example = "1") // @ExcelColumn(name="提报人编码（关联member）") @TableField(exist = false) private Integer companyName; } 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; } 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()))
