xdd 3 veckor sedan
förälder
incheckning
0b184b6653

+ 17 - 22
fs-company/src/main/java/com/fs/qw/vo/QwWatchLogStatisticsListVO.java

@@ -7,27 +7,22 @@ import java.util.Date;
 
 @Data
 public class QwWatchLogStatisticsListVO {
-    Long id;
-    String qwUserName;
+    private Long id;
+    private String qwUserName;
+    private String companyUserName;
     @JsonFormat(pattern = "yyyy-MM-dd")
-    Date createTime;
-
-    Long line;//进线数
-
-    Long firstOnline;//先导课上线
-
-    Long firstOver;//先导课完课
-
-    Long d1Online;//首日上线
-
-    Long d1Over;//首日完课
-
-    Long sign;//综合报名数
-    Long interact;//互动数
-    Long a;
-    Long b;
-    Long c;
-    Long d;
-    Long los;//流失数
-    Long del;//删除数
+    private Date createTime;
+    private Long line;//进线数
+    private Long firstOnline;//先导课上线
+    private Long firstOver;//先导课完课
+    private Long d1Online;//首日上线
+    private Long d1Over;//首日完课
+    private Long sign;//综合报名数
+    private Long interact;//互动数
+    private Long a;
+    private Long b;
+    private Long c;
+    private Long d;
+    private Long los;//流失数
+    private Long del;//删除数
 }

+ 1 - 1
fs-service-system/src/main/java/com/fs/qw/service/impl/QwWatchLogServiceImpl.java

@@ -142,7 +142,7 @@ public class QwWatchLogServiceImpl extends ServiceImpl<QwWatchLogMapper, QwWatch
             // 统计销售下面的所有记录
             QwWatchLogStatisticsListVO vo = qwWatchLogMapper.selectQwWatchLogByCompanyUserId(companyUser.getCompanyId(),
                     param.getSTime(),param.getETime());
-            vo.setQwUserName(companyUser.getUserName());
+            vo.setCompanyUserName(String.format("%s_%d",companyUser.getUserName(),companyUser.getUserId()));
             vo.setCreateTime(companyUser.getCreateTime());
             list.add(vo);
         }

+ 17 - 23
fs-service-system/src/main/java/com/fs/qw/vo/QwWatchLogStatisticsListVO.java

@@ -7,28 +7,22 @@ import java.util.Date;
 
 @Data
 public class QwWatchLogStatisticsListVO {
-    Long id;
-    String qwUserName;
-
+    private Long id;
+    private String qwUserName;
+    private String companyUserName;
     @JsonFormat(pattern = "yyyy-MM-dd")
-    Date createTime;
-
-    Long line;//进线数
-
-    Long firstOnline;//先导课上线
-
-    Long firstOver;//先导课完课
-
-    Long d1Online;//首日上线
-
-    Long d1Over;//首日完课
-
-    Long sign;//综合报名数
-    Long interact;//互动数
-    Long a;
-    Long b;
-    Long c;
-    Long d;
-    Long los;//流失数
-    Long del;//删除数
+    private Date createTime;
+    private Long line;//进线数
+    private Long firstOnline;//先导课上线
+    private Long firstOver;//先导课完课
+    private Long d1Online;//首日上线
+    private Long d1Over;//首日完课
+    private Long sign;//综合报名数
+    private Long interact;//互动数
+    private Long a;
+    private Long b;
+    private Long c;
+    private Long d;
+    private Long los;//流失数
+    private Long del;//删除数
 }