更新了消息通知的根据条件搜索

ruoyi-equity/src/main/java/com/ruoyi/equity/controller/EquityMessageRecordController.java

@@ -5,6 +5,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.equity.domain.dto.EquityMessageRecordDTO;
 import com.ruoyi.equity.domain.vo.EquityMessageRecordVO;
 import com.ruoyi.equity.facade.EquityMessageRecordFacade;
 import io.swagger.annotations.Api;
@@ -88,10 +89,10 @@ public class EquityMessageRecordController extends BaseController
     @ApiOperation("查询股权消息通知列表")
     @PreAuthorize("@ss.hasPermi('equity:message:list')")
     @GetMapping("/list")
-    public TableDataInfo list(EquityMessageRecord equityMessageRecord)
+    public TableDataInfo list(EquityMessageRecordDTO equityMessageRecordDTO)
     {
         startPage();
-        List<EquityMessageRecordVO> list = equityMessageRecordService.selectEquityMessageRecordList(equityMessageRecord);
+        List<EquityMessageRecordVO> list = equityMessageRecordService.selectEquityMessageRecordList(equityMessageRecordDTO);
         return getDataTable(list);
     }
 

ruoyi-equity/src/main/java/com/ruoyi/equity/domain/dto/EquityMessageRecordDTO.java

@@ -0,0 +1,16 @@
+package com.ruoyi.equity.domain.dto;
+
+import com.ruoyi.equity.domain.EquityMessageRecord;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.stereotype.Component;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Component
+public class EquityMessageRecordDTO extends EquityMessageRecord {
+
+    private String selectDate ;
+}

ruoyi-equity/src/main/java/com/ruoyi/equity/mapper/EquityMessageRecordMapper.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.equity.domain.EquityMessageRecord;
+import com.ruoyi.equity.domain.dto.EquityMessageRecordDTO;
 import com.ruoyi.equity.domain.vo.EquityMessageRecordVO;
 import org.apache.ibatis.annotations.Param;
 
@@ -26,10 +27,10 @@ public interface EquityMessageRecordMapper extends BaseMapper<EquityMessageRecor
     /**
      * 查询股权消息通知列表
      * 
-     * @param equityMessageRecord 股权消息通知
+     * @param equityMessageRecordDTO 股权消息通知
      * @return 股权消息通知集合
      */
-    public List<EquityMessageRecordVO> selectEquityMessageRecordList(EquityMessageRecord equityMessageRecord,@Param("userId") Long userId);
+    public List<EquityMessageRecordVO> selectEquityMessageRecordList(@Param("emr") EquityMessageRecordDTO equityMessageRecordDTO, @Param("userId") Long userId);
 
     /**
      * 新增股权消息通知

ruoyi-equity/src/main/java/com/ruoyi/equity/service/IEquityMessageRecordService.java

@@ -5,6 +5,7 @@ import java.util.List;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.equity.domain.EquityMessageRecord;
 import com.ruoyi.equity.domain.EquityTransferRecord;
+import com.ruoyi.equity.domain.dto.EquityMessageRecordDTO;
 import com.ruoyi.equity.domain.vo.EquityMessageRecordVO;
 
 /**
@@ -26,10 +27,10 @@ public interface IEquityMessageRecordService extends IService<EquityMessageRecor
     /**
      * 查询股权消息通知列表
      * 
-     * @param equityMessageRecord 股权消息通知
+     * @param equityMessageRecordDTO 股权消息通知
      * @return 股权消息通知集合
      */
-    public List<EquityMessageRecordVO> selectEquityMessageRecordList(EquityMessageRecord equityMessageRecord);
+    public List<EquityMessageRecordVO> selectEquityMessageRecordList(EquityMessageRecordDTO equityMessageRecordDTO);
 
     /**
      * 新增股权消息通知

ruoyi-equity/src/main/java/com/ruoyi/equity/service/impl/EquityMessageRecordServiceImpl.java

@@ -1,12 +1,16 @@
 package com.ruoyi.equity.service.impl;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.equity.domain.EquityTransferRecord;
+import com.ruoyi.equity.domain.dto.EquityMessageRecordDTO;
 import com.ruoyi.equity.domain.vo.EquityMessageRecordVO;
 import com.ruoyi.equity.mapper.EquityTransferRecordMapper;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,88 +21,86 @@ import com.ruoyi.equity.service.IEquityMessageRecordService;
 
 /**
  * 股权消息通知Service业务层处理
- * 
+ *
  * @author ruoyi
  * @date 2025-03-05
  */
 @Service
-public class EquityMessageRecordServiceImpl extends ServiceImpl<EquityMessageRecordMapper, EquityMessageRecord> implements IEquityMessageRecordService
-{
+public class EquityMessageRecordServiceImpl extends ServiceImpl<EquityMessageRecordMapper, EquityMessageRecord> implements IEquityMessageRecordService {
     @Autowired
     private EquityMessageRecordMapper equityMessageRecordMapper;
 
     /**
      * 查询股权消息通知
-     * 
+     *
      * @param equityMessageId 股权消息通知主键
      * @return 股权消息通知
      */
     @Override
-    public EquityMessageRecord selectEquityMessageRecordByEquityMessageId(Long equityMessageId)
-    {
+    public EquityMessageRecord selectEquityMessageRecordByEquityMessageId(Long equityMessageId) {
         return equityMessageRecordMapper.selectEquityMessageRecordByEquityMessageId(equityMessageId);
     }
 
     /**
      * 查询股权消息通知列表
-     * 
-     * @param equityMessageRecord 股权消息通知
+     *
+     * @param equityMessageRecordDTO 股权消息通知
      * @return 股权消息通知
      */
     @Override
-    public List<EquityMessageRecordVO> selectEquityMessageRecordList(EquityMessageRecord equityMessageRecord)
-    {
-
-        return equityMessageRecordMapper.selectEquityMessageRecordList(equityMessageRecord,SecurityUtils.getUserId());
+    public List<EquityMessageRecordVO> selectEquityMessageRecordList(EquityMessageRecordDTO equityMessageRecordDTO) {
+        Date msgTime = equityMessageRecordDTO.getMsgTime();
+        if (msgTime != null) {
+            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+            String selectDate = dateFormat.format(msgTime);
+            equityMessageRecordDTO.setSelectDate(selectDate);
+        }
+        return equityMessageRecordMapper.selectEquityMessageRecordList(equityMessageRecordDTO, SecurityUtils.getUserId());
     }
 
     /**
      * 新增股权消息通知
-     * 
+     *
      * @param equityMessageRecord 股权消息通知
      * @return 结果
      */
     @Override
-    public int insertEquityMessageRecord(EquityMessageRecord equityMessageRecord)
-    {
+    public int insertEquityMessageRecord(EquityMessageRecord equityMessageRecord) {
         equityMessageRecord.setCreateTime(DateUtils.getNowDate());
         return equityMessageRecordMapper.insertEquityMessageRecord(equityMessageRecord);
     }
 
     /**
      * 修改股权消息通知
-     * 
+     *
      * @param equityMessageRecord 股权消息通知
      * @return 结果
      */
     @Override
-    public int updateEquityMessageRecord(EquityMessageRecord equityMessageRecord)
-    {
+    public int updateEquityMessageRecord(EquityMessageRecord equityMessageRecord) {
         equityMessageRecord.setUpdateTime(DateUtils.getNowDate());
         return equityMessageRecordMapper.updateEquityMessageRecord(equityMessageRecord);
     }
 
     /**
      * 批量删除股权消息通知
-     * 
+     *
      * @param equityMessageIds 需要删除的股权消息通知主键
      * @return 结果
      */
     @Override
-    public int deleteEquityMessageRecordByEquityMessageIds(Long[] equityMessageIds)
-    {
+    public int deleteEquityMessageRecordByEquityMessageIds(Long[] equityMessageIds) {
         return equityMessageRecordMapper.deleteEquityMessageRecordByEquityMessageIds(equityMessageIds);
     }
 
     /**
      * 删除股权消息通知信息
-     * 
+     *
      * @param equityMessageId 股权消息通知主键
      * @return 结果
      */
     @Override
-    public int deleteEquityMessageRecordByEquityMessageId(Long equityMessageId)
-    {
+    public int deleteEquityMessageRecordByEquityMessageId(Long equityMessageId) {
         return equityMessageRecordMapper.deleteEquityMessageRecordByEquityMessageId(equityMessageId);
     }
 

ruoyi-equity/src/main/resources/mapper/equity/EquityMessageRecordMapper.xml

@@ -28,14 +28,38 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectEquityMessageRecordVo"/>
         where equity_message_id = #{equityMessageId}
     </select>
+
+
     <select id="selectEquityMessageRecordList" resultType="com.ruoyi.equity.domain.vo.EquityMessageRecordVO">
-       select * from e_equity_message_record
-       where user_id = #{userId} and del_flag = '0' order by create_time desc
-        <!--            <if test="msgType != null  and msgType != ''"> and msg_type = #{msgType}</if>-->
-        <!--            <if test="msgContent != null  and msgContent != ''"> and msg_content = #{msgContent}</if>-->
-        <!--            <if test="msgTime != null "> and msg_time = #{msgTime}</if>-->
-        <!--            <if test="isRead != null  and isRead != ''"> and is_read = #{isRead}</if>-->
-        <!--            <if test="userId != null  and userId != ''"> and user_id = #{userId}</if>-->
+            select * from e_equity_message_record
+            where user_id = #{userId} and del_flag = '0'
+        <if test="emr.msgType != null  and emr.msgType != ''"> and msg_type = #{emr.msgType}</if>
+       <!-- <if test="emr.msgTime != null "> and msg_time = #{emr.msgTime}</if>-->
+
+        <if test="emr.selectDate != null and emr.selectDate != ''">
+            and msg_time &gt;= DATE(#{emr.selectDate})
+        </if>
+        <if test="emr.selectDate != null and emr.selectDate != ''">
+            and msg_time &lt; DATE(DATE_ADD(#{emr.selectDate}, INTERVAL 1 DAY))
+        </if>
+
+        <!--<if test="emr.msgTime != null and emr.msgTime != ''">
+            and DATE(msg_time) &lt;= DATE(#{emr.selectDate})
+        </if>-->
+
+        <if test="emr.isRead != null  and emr.isRead != ''">
+            and is_read =
+            <choose>
+                <when test="emr.isRead == '未读'">0</when>
+                <when test="emr.isRead == '已读'">1</when>
+                <when test="emr.isRead == '否决'">4</when>
+                <when test="emr.isRead == '同意'">2</when>
+                <otherwise>null</otherwise>
+            </choose>
+        </if>
+        order by create_time desc
+        <!-- <if test="userId != null  and userId != ''"> and user_id = #{userId}</if>-->
+        <!-- <if test="msgContent != null  and msgContent != ''"> and msg_content = #{msgContent}</if>-->
     </select>
 
     <insert id="insertEquityMessageRecord" parameterType="EquityMessageRecord" useGeneratedKeys="true" keyProperty="equityMessageId">