增加消息通知,修改抄送部门
This commit is contained in:
parent
84b196d088
commit
777b88ea45
@ -30,7 +30,7 @@ public class Notice implements Serializable {
|
||||
private java.lang.Long id;
|
||||
@ApiModelProperty(value = "类型,1考勤提醒,2人员报警,3车辆,4混凝土监测,5卸料平台,6配电箱,7扬尘,8视频,9标养室,10安全检查,11质量检查,12塔吊,13升降机," +
|
||||
"14电表,15水表,16访客,17,防疫人员通知,18访客通知,19巡检点,20人员的资质证书即将到期,21人员的合同信息即将到期,22人员的保险信息即将到期," +
|
||||
"23同步人员到海康isc,24同步车辆到海康isc,25同步组织到海康isc")
|
||||
"23同步人员到海康isc,24同步车辆到海康isc,25同步组织到海康isc 30工作流审批通知")
|
||||
private java.lang.String type;
|
||||
/**
|
||||
* 消息内容
|
||||
|
||||
@ -9,6 +9,7 @@ import com.wflow.bean.do_.DeptDo;
|
||||
import com.wflow.bean.do_.RoleDo;
|
||||
import com.wflow.bean.do_.UserDeptDo;
|
||||
import com.wflow.bean.do_.UserDo;
|
||||
import com.wflow.bean.entity.WflowModelHistorys;
|
||||
import com.wflow.bean.entity.WflowModelPerms;
|
||||
import com.wflow.bean.entity.WflowModels;
|
||||
import com.wflow.bean.vo.ModelGroupVo;
|
||||
@ -17,6 +18,7 @@ import com.wflow.bean.vo.UserVo;
|
||||
import com.wflow.mapper.WflowModelPermsMapper;
|
||||
import com.wflow.mapper.WflowModelsMapper;
|
||||
import com.wflow.service.OrgRepositoryService;
|
||||
import com.wflow.workflow.bean.dto.NotifyDto;
|
||||
import com.zhgd.xmgl.modules.basicdata.entity.BaseRole;
|
||||
import com.zhgd.xmgl.modules.basicdata.entity.BaseRoleUser;
|
||||
import com.zhgd.xmgl.modules.basicdata.entity.Company;
|
||||
@ -72,6 +74,9 @@ public class FlowOrgRepositoryServiceImpl implements OrgRepositoryService {
|
||||
@Autowired
|
||||
private EnterpriseInfoMapper enterpriseInfoMapper;
|
||||
|
||||
@Autowired
|
||||
private NoticeServiceImpl noticeService;
|
||||
|
||||
@Override
|
||||
public List<ModelGroupVo.Form> getModelsByPerm(String userId) {
|
||||
List<ModelGroupVo.Form> list = new ArrayList<>();
|
||||
@ -154,8 +159,8 @@ public class FlowOrgRepositoryServiceImpl implements OrgRepositoryService {
|
||||
return systemUserMapper.selectList(
|
||||
new LambdaQueryWrapper<SystemUser>()
|
||||
.select(SystemUser::getUserId)
|
||||
.in(SystemUser::getDepartment, deptIds))
|
||||
.stream().map(Object::toString)
|
||||
.in(SystemUser::getXzProjectOrgId, deptIds))
|
||||
.stream().map(u -> u.getUserId().toString())
|
||||
.collect(Collectors.toSet());
|
||||
} catch (Exception e) {
|
||||
return Collections.emptySet();
|
||||
@ -295,6 +300,12 @@ public class FlowOrgRepositoryServiceImpl implements OrgRepositoryService {
|
||||
return orgTreeVos;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void notifyCustom(NotifyDto notify, WflowModelHistorys model, com.alibaba.fastjson2.JSONObject notifySetUp) {
|
||||
System.out.println("收到消息");
|
||||
noticeService.addUserNoticeAndApp(Long.valueOf(notify.getTarget()), notify.getContent(), notify.getTitle(), "30");
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<OrgTreeVo> selectEnterpriseByPy(String py) {
|
||||
String tenantId = TenantContextHolder.getTenantId();
|
||||
|
||||
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user