好友欢迎语

fs-company/src/main/java/com/fs/qw/vo/QwFriendWelcomeVO.java

@@ -10,7 +10,7 @@ import java.util.List;
 
 /**
  * 好友欢迎语对象 qw_friend_welcome
- * 
+ *
  * @author fs
  * @date 2024-07-20
  */
@@ -62,4 +62,5 @@ public class QwFriendWelcomeVO extends BaseEntity
 
     public List<QwUserVO> userSelectList;
 
+    private Integer project;
 }

fs-service-system/src/main/java/com/fs/qw/domain/QwFriendWelcome.java

@@ -57,4 +57,11 @@ public class QwFriendWelcome extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 
+    /**
+     * 项目
+     */
+    private Integer project;
+    @Excel(name = "项目")
+    private String projectName;
+
 }

fs-service-system/src/main/java/com/fs/qw/mapper/QwFriendWelcomeMapper.java

@@ -67,6 +67,7 @@ public interface QwFriendWelcomeMapper
             "            <if test=\"createTime != null \"> and qfw.create_time = #{createTime}</if>\n" +
             "            <if test=\"updateTime != null \"> and qfw.update_time = #{updateTime}</if>\n" +
             "            <if test=\"companyUserId != null \"> and qu.company_user_id = #{companyUserId}</if>\n" +
+            " <if test=\"project != null \"> and project = #{project}</if> "+
             "        </where>" +
             "</script>")
     public List<QwFriendWelcome> selectQwFriendWelcomeListMyVO(QwFriendWelcomeParam qwFriendWelcomeParam);

fs-service-system/src/main/java/com/fs/qw/param/QwFriendWelcomeParam.java

@@ -54,4 +54,9 @@ public class QwFriendWelcomeParam extends BaseEntity {
     @Excel(name = "公司员工id")
     private Long companyUserId;
 
+    /**
+     * 项目
+     */
+    private Integer project;
+
 }

fs-service-system/src/main/java/com/fs/qw/service/impl/QwFriendWelcomeServiceImpl.java

@@ -1,7 +1,9 @@
 package com.fs.qw.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.fs.common.core.domain.R;
+import com.fs.common.utils.DictUtils;
 import com.fs.qw.domain.QwFriendWelcome;
 import com.fs.qw.mapper.QwFriendWelcomeItemMapper;
 import com.fs.qw.mapper.QwFriendWelcomeMapper;
@@ -15,6 +17,8 @@ import com.fs.qwApi.Result.QwUploadImgResult;
 import com.fs.qwApi.param.SendWelcomeMsgParam;
 import com.fs.qwApi.service.QwApiService;
 import com.fs.voice.utils.StringUtil;
+import com.hc.openapi.tool.util.StringUtils;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
@@ -35,6 +39,7 @@ import java.util.List;
  * @date 2024-07-20
  */
 @Service
+@Slf4j
 public class QwFriendWelcomeServiceImpl implements IQwFriendWelcomeService
 {
     @Autowired
@@ -59,6 +64,7 @@ public class QwFriendWelcomeServiceImpl implements IQwFriendWelcomeService
     public QwFriendWelcomeVO selectQwFriendWelcomeById(Long id)
     {
         QwFriendWelcomeVO qwFriendWelcomeVO = qwFriendWelcomeMapper.selectQwFriendWelcomeByIdVO(id);
+        log.info("qwFriendWelcomeVO:{}",qwFriendWelcomeVO);
 
         // 假设 qwFriendWelcomeVO 是已经初始化的对象
         String qwUserIds = qwFriendWelcomeVO.getQwUserIds();
@@ -84,7 +90,16 @@ public class QwFriendWelcomeServiceImpl implements IQwFriendWelcomeService
     @Override
     public List<QwFriendWelcome> selectQwFriendWelcomeListVO(QwFriendWelcomeParam qwFriendWelcomeParam)
     {
-        return qwFriendWelcomeMapper.selectQwFriendWelcomeListVO(qwFriendWelcomeParam);
+        List<QwFriendWelcome> qwFriendWelcomes = qwFriendWelcomeMapper.selectQwFriendWelcomeListVO(qwFriendWelcomeParam);
+        for (QwFriendWelcome qwFriendWelcome : qwFriendWelcomes) {
+            if(ObjectUtils.isNotNull(qwFriendWelcome.getProject())){
+                String sysCourseProject = DictUtils.getDictLabel("sys_course_project", String.valueOf(qwFriendWelcome.getProject()));
+                if(StringUtils.isNotBlank(sysCourseProject)){
+                    qwFriendWelcome.setProjectName(sysCourseProject);
+                }
+            }
+        }
+        return qwFriendWelcomes;
     }
 
     @Override

fs-service-system/src/main/java/com/fs/qw/vo/QwFriendWelcomeVO.java

@@ -4,16 +4,18 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fs.common.annotation.Excel;
 import com.fs.common.core.domain.BaseEntity;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.Date;
 import java.util.List;
 
 /**
  * 好友欢迎语对象 qw_friend_welcome
- * 
+ *
  * @author fs
  * @date 2024-07-20
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
 public class QwFriendWelcomeVO extends BaseEntity
 {
@@ -60,6 +62,11 @@ public class QwFriendWelcomeVO extends BaseEntity
     /** 分时段欢迎语 */
     private String daypartingItemlist;
 
-    public List<QwUserVO> userSelectList;
+    private List<QwUserVO> userSelectList;
+
+    /**
+     * 项目
+     */
+    private Integer project;
 
 }

fs-service-system/src/main/resources/mapper/qw/QwFriendWelcomeMapper.xml

@@ -19,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectQwFriendWelcomeVo">
-        select id, qw_user_ids,corp_id, is_send_msg, welcome_text, attachments, is_dayparting, dayparting_ItemList, company_id, create_time, update_time from qw_friend_welcome
+        select id, qw_user_ids,corp_id, is_send_msg, welcome_text, attachments, is_dayparting, dayparting_ItemList, company_id, create_time, update_time,project from qw_friend_welcome
     </sql>
 
     <select id="selectQwFriendWelcomeListVO" parameterType="QwFriendWelcome" resultMap="QwFriendWelcomeResult">
@@ -33,6 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null "> and create_time = #{createTime}</if>
             <if test="corpId != null "> and corp_id = #{corpId}</if>
             <if test="updateTime != null "> and update_time = #{updateTime}</if>
+            <if test="project != null "> and project = #{project}</if>
         </where>
     </select>
 
@@ -54,6 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="corpId != null">corp_id,</if>
+            <if test="project != null">project,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="qwUserIds != null">#{qwUserIds},</if>
@@ -66,6 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">#{createTime},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="corpId != null">#{corpId},</if>
+            <if test="project != null">#{project},</if>
          </trim>
     </insert>
 
@@ -82,6 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="corpId != null">corp_id = #{corpId},</if>
+            <if test="project != null">project = #{project},</if>
         </trim>
         where id = #{id}
     </update>