From d3767d594de66cb5f9d1294931acefea1866f783 Mon Sep 17 00:00:00 2001
From: renkang <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 24 一月 2025 18:24:25 +0800
Subject: [PATCH] 客户资料 巡检任务业务

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolSchemeServiceImpl.java |   44 +++++++++++++++++++++++++++++---------------
 1 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolSchemeServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolSchemeServiceImpl.java
index 6c64cf8..c8c5326 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolSchemeServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolSchemeServiceImpl.java
@@ -1,5 +1,6 @@
 package com.doumee.service.business.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.doumee.core.constants.ResponseStatus;
 import com.doumee.core.exception.BusinessException;
 import com.doumee.core.model.LoginUserInfo;
@@ -213,22 +214,35 @@
 
         if(StringUtils.isNotBlank(ywPatrolScheme.getUserIds())){
             String [] userIds = ywPatrolScheme.getUserIds().split(",");
-            for (String userId:userIds) {
-                //娣诲姞寰呭姙淇℃伅
-                Notices notices = new Notices();
-                notices.setCreateDate(new Date());
-                notices.setCreator(ywPatrolScheme.getCreator());
-                notices.setIsdeleted(Constants.ZERO);
-                notices.setParam1(DateUtil.formatDate(ywPatrolTask.getStartDate(),"yyyy-MM-dd"));
-                notices.setTitle("宸℃浠诲姟寰呭姙");
-                notices.setContent("["+ywPatrolTask.getCode()+"]灏嗗湪["+notices.getParam1()+"]杩涜宸℃锛岃鎸夋椂鎵ц");
-                notices.setObjId(ywPatrolTask.getId());
-                notices.setObjType(Constants.ONE);
-                notices.setType(notices.getObjType());
-                notices.setUserId(Integer.valueOf(userId));
-                notices.setStatus(Constants.ZERO);
-                noticesJoinMapper.insert(notices);
+            List<SystemUser> systemUserList = systemUserMapper.selectList(new QueryWrapper<SystemUser>().lambda().in(SystemUser::getId,userIds));
+            if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(systemUserList)){
+                List<String> names = systemUserList.stream().filter(i->StringUtils.isNotBlank(i.getRealname())).map(i->i.getRealname()).collect(Collectors.toList());
+                for (SystemUser systemUser:systemUserList) {
+                    //娣诲姞寰呭姙淇℃伅
+                    Notices notices = new Notices();
+                    notices.setCreateDate(new Date());
+                    notices.setCreator(ywPatrolScheme.getCreator());
+                    notices.setIsdeleted(Constants.ZERO);
+                    notices.setParam1(DateUtil.formatDate(ywPatrolTask.getStartDate(),"yyyy-MM-dd"));
+                    notices.setTitle("宸℃浠诲姟寰呭姙");
+                    notices.setContent("["+ywPatrolTask.getCode()+"]灏嗗湪["+notices.getParam1()+"]杩涜宸℃锛岃鎸夋椂鎵ц");
+                    notices.setObjId(ywPatrolTask.getId());
+                    notices.setObjType(Constants.ONE);
+                    notices.setType(notices.getObjType());
+                    notices.setUserId(Integer.valueOf(systemUser.getId()));
+                    notices.setStatus(Constants.ZERO);
+                    //鏁寸悊json鏁版嵁
+                    Map<String,Object> jsonMap = new HashMap<>();
+                    jsonMap.put("key1", ywPatrolScheme.getTitle());
+                    jsonMap.put("key2", DateUtil.getFomartDate(ywPatrolTask.getStartDate(),"yyyy-MM-dd"));
+                    jsonMap.put("key3", DateUtil.getFomartDate(ywPatrolTask.getStartDate(),"HH:mm") + "-" + DateUtil.getFomartDate(ywPatrolTask.getEndDate(),"HH:mm"));
+                    jsonMap.put("key4", StringUtils.join(names , "銆�"));
+                    notices.setParam2(JSONObject.toJSONString(jsonMap));
+                    notices.setParam3(Constants.ZERO+"");
+                    noticesJoinMapper.insert(notices);
+                }
             }
+
         }
     }
 

--
Gitblit v1.9.3