问卷广场增加返回医院头像和医院名称

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/dto/BizQuestionGroupDTO.java

@@ -1,31 +1,29 @@
 package cn.tr.module.smart.common.dto;
 
-import cn.tr.plugin.mybatis.pojo.BaseDTO;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
 import cn.tr.core.validation.Update;
+import cn.tr.plugin.mybatis.pojo.BaseDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.checkerframework.checker.units.qual.A;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
-import javax.validation.constraints.*;
+import javax.validation.constraints.NotBlank;
 
 /**
  * 医院的问卷组传输对象
  *
  * @author lf
- * @date  2025/05/23 16:45
+ * @date 2025/05/23 16:45
  **/
 @Data
 @ApiModel("医院的问卷组传输对象")
 @EqualsAndHashCode(callSuper = true)
 @ToString
-public class BizQuestionGroupDTO extends BaseDTO  {
+public class BizQuestionGroupDTO extends BaseDTO {
     private static final long serialVersionUID = 1L;
     @ApiModelProperty(value = "id", position = 1)
-    @NotBlank  (message = "主键不能为空",groups = {Update.class})
+    @NotBlank(message = "主键不能为空", groups = {Update.class})
     private String id;
 
     @ApiModelProperty(value = "问卷名称", position = 2)
@@ -34,15 +32,15 @@ public class BizQuestionGroupDTO extends BaseDTO  {
     @ApiModelProperty(value = "问卷类型", position = 3)
     private String type;
 
-    @ApiModelProperty(value = "术后推送间隔（小时）",position = 4)
+    @ApiModelProperty(value = "术后推送间隔（小时）", position = 4)
     private Integer interval;
 
-    @ApiModelProperty(value = "术后推送频率(次)",position = 5)
+    @ApiModelProperty(value = "术后推送频率(次)", position = 5)
     private Integer frequency;
 
     @ApiModelProperty(value = "拉取squareID", position = 6)
     private String squareId;
 
-    @ApiModelProperty(value = "是否分享",position = 7)
+    @ApiModelProperty(value = "是否分享", position = 7)
     private Boolean isShare;
 }

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/dto/BizQuestionGroupSquareDTO.java

@@ -1,13 +1,14 @@
 package cn.tr.module.smart.common.dto;
 
-import cn.tr.plugin.mybatis.pojo.BaseDTO;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
 import cn.tr.core.validation.Update;
+import cn.tr.plugin.mybatis.pojo.BaseDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import javax.validation.constraints.*;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**
@@ -62,4 +63,10 @@ public class BizQuestionGroupSquareDTO extends BaseDTO  {
     @ApiModelProperty(value = "租户ID", position = 17)
     private String tenantId;
 
+    @ApiModelProperty(value = "医院名称", position = 18)
+    private String hospitalName;
+
+    @ApiModelProperty(value = "医院头像", position = 19)
+    private String avatar;
+
 }

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/repository/BizQuestionGroupRepository.java

@@ -1,13 +1,13 @@
 package cn.tr.module.smart.common.repository;
 
 import cn.tr.module.smart.app.controller.vo.AppQuestionAndDeptListVO;
+import cn.tr.module.smart.common.po.BizQuestionGroupPO;
 import cn.tr.module.smart.web.dto.BizDeptUnlinkQuestionQueryDTO;
 import cn.tr.module.smart.web.vo.BizDeptUnlinkQuestionVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
-import cn.tr.module.smart.common.po.BizQuestionGroupPO;
 
 import java.util.List;
 

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/service/impl/BizQuestionGroupServiceImpl.java

@@ -15,7 +15,10 @@ import cn.tr.module.smart.common.dto.*;
 import cn.tr.module.smart.common.enums.ClinicUndoType;
 import cn.tr.module.smart.common.enums.MpPublishTaskTypeEnums;
 import cn.tr.module.smart.common.enums.QuestionGroupTypeEnums;
-import cn.tr.module.smart.common.mapper.*;
+import cn.tr.module.smart.common.mapper.BizQuestionGroupMapper;
+import cn.tr.module.smart.common.mapper.BizQuestionGroupSquareMapper;
+import cn.tr.module.smart.common.mapper.BizQuestionMapper;
+import cn.tr.module.smart.common.mapper.BizQuestionSquareMapper;
 import cn.tr.module.smart.common.po.*;
 import cn.tr.module.smart.common.properties.ALiYunProperties;
 import cn.tr.module.smart.common.repository.*;
@@ -46,6 +49,7 @@ import org.springframework.core.io.Resource;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.FileCopyUtils;
+
 import javax.annotation.PostConstruct;
 import java.io.IOException;
 import java.io.InputStream;

tr-modules/tr-module-smartFollowUp/src/main/resources/mapper/smart/BizQuestionGroupSquareMapper.xml

@@ -20,28 +20,33 @@
         <result property="questionCount" column="question_count"/>
         <result property="isPull" column="is_pull"/>
         <result property="tenantId" column="tenant_id"/>
+        <result property="hospitalName" column="hospital_name"/>
+        <result property="avatar" column="avatar"/>
     </resultMap>
 
     <select id="selectALlList" resultMap="SquareList">
         SELECT
-            bqgs.id,
-            bqgs.name,
-            bqgs.type,
-            bqgs.version,
-            bqgs.md5,
-            bqgs.hospital_group_id,
-            bqgs.citation_count,
-            bqgs.interval,
-            bqgs.frequency,
-            bqgs.create_by,
-            bqgs.update_by,
-            bqgs.create_time,
-            bqgs.update_time,
-            bqgs.tenant_id,
-            ( SELECT COUNT ( 1 ) FROM biz_question_square bqs WHERE bqs.group_id = bqgs.ID ) AS question_count,
-            ( SELECT CASE WHEN EXISTS ( SELECT id FROM biz_question_group bqg WHERE bqg.square_id = bqgs.ID ) THEN 1 ELSE 0 END ) AS is_pull
+        bqgs.id,
+        bqgs.name,
+        bqgs.type,
+        bqgs.version,
+        bqgs.md5,
+        bqgs.hospital_group_id,
+        bqgs.citation_count,
+        bqgs.interval,
+        bqgs.frequency,
+        bqgs.create_by,
+        bqgs.update_by,
+        bqgs.create_time,
+        bqgs.update_time,
+        bqgs.tenant_id,
+        ( SELECT COUNT ( 1 ) FROM biz_question_square bqs WHERE bqs.group_id = bqgs.ID ) AS question_count,
+        ( SELECT CASE WHEN EXISTS ( SELECT id FROM biz_question_group bqg WHERE bqg.square_id = bqgs.ID ) THEN 1 ELSE 0 END ) AS is_pull,
+        st.name as hospital_name,
+        st.avatar
         FROM
-            biz_question_group_square bqgs
+        biz_question_group_square bqgs
+        left join sys_tenant st on st.id = bqgs.tenant_id
         <where>
             <if test="query.name != null and query.name != ''">
                 AND bqgs.name LIKE CONCAT(CONCAT('%', #{query.name}), '%')