Merge remote-tracking branch 'origin/dev' into dev

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/dal/dataobject/businessmemberrelation/BusinessMemberRelationDO.java

@@ -35,6 +35,15 @@ public class BusinessMemberRelationDO extends BaseDO {
      * 平台用户id
      */
     private String memberId;
+    /**
+     * 接收人名称
+     */
+    private String memberName;
+    /**
+     * 接收人电话
+     */
+    private String memberPhone;
+
     /**
      * 业务类型(0=报告,1=任务单,2=受理单)
      */

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/boilertaskorder/BoilerTaskOrderInspectionServiceImpl.java

@@ -218,6 +218,8 @@ public class BoilerTaskOrderInspectionServiceImpl implements BoilerTaskOrderInsp
                         BusinessMemberRelationDO relationDO = new BusinessMemberRelationDO();
                         relationDO.setBusinessType(0);
                         relationDO.setBusinessId(taskOrderItemReportDO.getId());
+                        relationDO.setMemberName(inspectionOpinionSendVo.getRecipient());
+                        relationDO.setMemberPhone(inspectionOpinionSendVo.getRecipientPhone());
                         relationDO.setMemberId(memberId);
                         businessMemberRelationMapper.insert(relationDO);
                     }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/boilertaskorder/BoilerTaskOrderServiceImpl.java

@@ -6111,12 +6111,12 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
         List<BusinessMemberRelationDO> businessMemberRelations = businessMemberRelationMapper.selectList(queryRelation);
 
         //获取发送记录人员信息
-        Map<String, MemberUserRespDTO> userMap = Map.of();
-        if (CollUtil.isNotEmpty(businessMemberRelations)) {
-            List<String> memberIds = businessMemberRelations.stream().map(BusinessMemberRelationDO::getMemberId).distinct().toList();
-            userMap = memberUserApi.getUserMap(memberIds);
-        }
-        Map<String, MemberUserRespDTO> finalUserMap = userMap;
+//        Map<String, MemberUserRespDTO> userMap = Map.of();
+//        if (CollUtil.isNotEmpty(businessMemberRelations)) {
+//            List<String> memberIds = businessMemberRelations.stream().map(BusinessMemberRelationDO::getMemberId).distinct().toList();
+//            userMap = memberUserApi.getUserMap(memberIds);
+//        }
+//        Map<String, MemberUserRespDTO> finalUserMap = userMap;
 
         //获取任务单关联部门信息
         List<String> deptIds = new ArrayList<>(pageResult.getList().stream().map(BoilerOrderItemPageRespVO::getDeptId).filter(Objects::nonNull).toList());
@@ -6188,15 +6188,11 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
                         .filter(x -> x.getBusinessId().equals(item.getReportId()))
                         .max(Comparator.comparing(BusinessMemberRelationDO::getCreateTime));
                 max.ifPresent(businessMemberRelationDO -> {
-                    MemberUserRespDTO memberUserRespDTO = finalUserMap.get(businessMemberRelationDO.getMemberId());
-                    if (ObjectUtil.isNotEmpty(memberUserRespDTO)) {
-                        if (memberUserRespDTO.getName() != null && !memberUserRespDTO.getName().isEmpty()){
-                            item.setRecipient(memberUserRespDTO.getName());
-                        }else{
-                            item.setRecipient(memberUserRespDTO.getNickname());
-                        }
-                        item.setRecipientPhone(memberUserRespDTO.getMobile());
-                    }
+//                    MemberUserRespDTO memberUserRespDTO = finalUserMap.get(businessMemberRelationDO.getMemberId());
+//                    if (ObjectUtil.isNotEmpty(memberUserRespDTO)) {
+                        item.setRecipient(businessMemberRelationDO.getMemberName());
+                        item.setRecipientPhone(businessMemberRelationDO.getMemberPhone());
+//                    }
                 });
             }
             if (StringUtils.isNotEmpty(item.getPrepareJson()) && !"{}".equals(item.getPrepareJson())) {

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/pipetaskorder/PipeTaskOrderInspectionServiceImpl.java

@@ -228,6 +228,8 @@ public class PipeTaskOrderInspectionServiceImpl implements PipeTaskOrderInspecti
                         BusinessMemberRelationDO relationDO = new BusinessMemberRelationDO();
                         relationDO.setBusinessType(0);
                         relationDO.setBusinessId(taskOrderItemReportDO.getId());
+                        relationDO.setMemberName(inspectionOpinionSendVo.getRecipient());
+                        relationDO.setMemberPhone(inspectionOpinionSendVo.getRecipientPhone());
                         relationDO.setMemberId(memberId);
                         businessMemberRelationMapper.insert(relationDO);
                     }