|
|
@@ -2,6 +2,7 @@ package com.rongwei.sfcommon.sys.service.impl;
|
|
|
|
|
|
import cn.hutool.core.bean.BeanUtil;
|
|
|
import cn.hutool.core.date.DateUtil;
|
|
|
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.rongwe.scentity.domian.*;
|
|
|
import com.rongwe.scentity.vo.CheckTemplateItemsVo;
|
|
|
@@ -10,6 +11,7 @@ import com.rongwei.commonservice.serial.service.CommonDictService;
|
|
|
import com.rongwei.commonservice.serial.service.SysSerialNumberService;
|
|
|
import com.rongwei.rwadmincommon.system.dao.SysUserDao;
|
|
|
import com.rongwei.rwadmincommon.system.domain.SysDictDo;
|
|
|
+import com.rongwei.rwcommon.base.BaseDo;
|
|
|
import com.rongwei.rwcommon.utils.SecurityUtil;
|
|
|
import com.rongwei.rwcommon.utils.StringUtils;
|
|
|
import com.rongwei.rwcommon.vo.generalsql.GeneralApiParameter;
|
|
|
@@ -335,11 +337,11 @@ public class CheckTemplateServiceImpl extends ServiceImpl<CheckTemplateDao, Chec
|
|
|
pointCheckDo.setSource("1");
|
|
|
pointCheckDo.setTemplatetype(templatetype);
|
|
|
//设备负责人
|
|
|
- Map<String, Object> duMap = new HashMap<>();
|
|
|
- duMap.put("CHECKITEMID", checkItemsdo.getId());
|
|
|
- duMap.put("DUTYUSERATTRIBUTE",templatetype);
|
|
|
- List<CheckItemsDutyuserDo> checkItemsDutyusers = (List<CheckItemsDutyuserDo>) checkItemsDutyuserService.
|
|
|
- listByMap(duMap);
|
|
|
+ List<CheckItemsDutyuserDo> checkItemsDutyusers =checkItemsDutyuserService.list(new LambdaQueryWrapper<CheckItemsDutyuserDo>()
|
|
|
+ .eq(BaseDo::getDeleted,"0")
|
|
|
+ .eq(CheckItemsDutyuserDo::getCheckitemid,checkItemsdo.getId())
|
|
|
+ .like(CheckItemsDutyuserDo::getDutyuserattribute,templatetype));
|
|
|
+
|
|
|
// 组织需要发送德消息
|
|
|
if (!checkItemsDutyusers.isEmpty()){
|
|
|
notifyType.put(pointCheckDo,checkItemsDutyusers.stream().map(CheckItemsDutyuserDo::getDutyuserid).distinct().collect(Collectors.toList()));
|
xiahan