Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

liukangdong

2024-05-27 ee903836deabebc81d8cd3d683513a425fcc144e

 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);
@@ -121,18 +123,19 @@
        }
        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 += ",";
@@ -141,7 +144,7 @@
                    idss += ",";
                }
                names += member.getName();
                names += member.getId();
                idss += member.getId();
            }
            model.setMemberNames(names);
            model.setMemberIds(idss);
@@ -176,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);
    }
  
@@ -189,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())
@@ -203,6 +205,7 @@
                .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)
        ;
@@ -213,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