浏览代码

修复叮当国医bug

peicj 3 天之前
父节点
当前提交
34587cfcd2

+ 0 - 3
fs-service/src/main/java/com/fs/course/vo/FsCourseRedPacketLogListPVO.java

@@ -70,9 +70,6 @@ public class FsCourseRedPacketLogListPVO extends BaseEntity
     @Excel(name = "所属团队")
     private String companyName;
 
-    @Excel(name = "销售部门")
-    private String deptName;
-
 
     @Excel(name = "发送方式")
     private Integer sendType; //归属发送方式:1 个微  2 企微

+ 2 - 2
fs-service/src/main/resources/mapper/qw/CustomerTransferApprovalMapper.xml

@@ -40,8 +40,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="approverUserId != null "> and approver_user_id = #{approverUserId}</if>
             <if test="approvalRemark != null  and approvalRemark != ''"> and approval_remark = #{approvalRemark}</if>
             <if test="processedAt != null "> and processed_at = #{processedAt}</if>
-            <if test="createdAt != null "> and created_at = #{createdAt}</if>
-            <if test="updatedAt != null "> and updated_at = #{updatedAt}</if>
+            <if test="createdAt != null "> and date_format(created_at,'%y%m%d') = date_format(#{createdAt},'%y%m%d')</if>
+            <if test="updatedAt != null "> and date_format(updated_at,'%y%m%d') = date_format(#{updatedAt},'%y%m%d')</if>
         </where>
         order by id desc
     </select>