fs-service/src/main/java/com/fs/crm/param/CrmLineCustomerListQueryParam.java

@@ -85,4 +85,9 @@ public class CrmLineCustomerListQueryParam extends BaseQueryParam
     @Excel(name = "标签" )
     private String tags;
 
+    /** 客户级别 */
+    private Long customerLevel;
+    /** 员工姓名 */
+    private String companyUserNickName;
+
 }

fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreOrderAuditScrmServiceImpl.java

@@ -1,5 +1,7 @@
 package com.fs.hisStore.service.impl;
 
+import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fs.common.exception.CustomException;
 import com.fs.common.utils.StringUtils;
@@ -13,6 +15,7 @@ import com.fs.hisStore.param.FsStoreOrderAuditReviewParam;
 import com.fs.hisStore.service.IFsStoreOrderAuditLogScrmService;
 import com.fs.hisStore.service.IFsStoreOrderAuditScrmService;
 import com.fs.hisStore.vo.FsStoreOrderAuditVO;
+import com.fs.hisStore.vo.FsStoreOrderItemVO;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -43,6 +46,13 @@ public class FsStoreOrderAuditScrmServiceImpl extends ServiceImpl<FsStoreOrderAu
             }else if(StringUtils.isNotEmpty(item.getAdminAuditUserName())){
                 item.setCompanyAuditUserName("总后台:"+item.getAdminAuditUserName());
             }
+            if (StringUtils.isNotEmpty(item.getItemJson())) {
+                JSONArray jsonArray = JSONUtil.parseArray(item.getItemJson());
+                List<FsStoreOrderItemVO> items = JSONUtil.toList(jsonArray, FsStoreOrderItemVO.class);
+                if (!items.isEmpty()) {
+                    item.setItems(items);
+                }
+            }
         });
         return list;
     }

fs-service/src/main/java/com/fs/hisStore/vo/FsStoreOrderAuditVO.java

@@ -5,6 +5,7 @@ import lombok.Data;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.List;
 
 @Data
 public class FsStoreOrderAuditVO {
@@ -98,4 +99,9 @@ public class FsStoreOrderAuditVO {
 
     /* 备注 */
     private String mark;
+    /* 订单商品信息 */
+    private String itemJson;
+
+    private List<FsStoreOrderItemVO> items;
+
 }

fs-service/src/main/resources/mapper/course/FsCourseWatchLogMapper.xml

@@ -134,10 +134,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and l.camp_period_time <= #{maps.scheduleEndTime}
             </if>
             <if test= 'maps.upSTime != null '>
-                and l.update_time &gt;= #{maps.upSTime}
+                and l.update_time &gt;= str_to_date(CONCAT(#{maps.upSTime},' 00:00:00' ),'%Y-%m-%d %H:%i:%s')
             </if>
             <if test='maps.upETime != null '>
-                and l.update_time &lt;= #{maps.upETime}
+                and l.update_time &lt;=  str_to_date(CONCAT(#{maps.upETime},' 23:59:59'),'%Y-%m-%d %H:%i:%s')
             </if>
             <if test="maps.sopIds != null and maps.sopIds.size() > 0">
                 and l.sop_id in

fs-service/src/main/resources/mapper/hisStore/FsStoreOrderAuditScrmMapper.xml

@@ -28,6 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             fso.order_type,
             fso.create_time orderCreateTime,
             fso.mark,
+            fso.item_json,
             c.company_name,
             cu.nick_name companyUserName,
             cau.nick_name companyAuditUserName,