业绩查询结果过滤店铺

src/main/java/com/gogirl/application/store/store/impl/StoreDataServiceImpl.java

@@ -26,11 +26,12 @@ public class StoreDataServiceImpl extends ServiceImpl<StoreDataMapper, StoreData
 
     @Override
     public StoreData storeData(String month) {
-        Integer technicianId = SessionUtils.getTechnicianId();
         GogirlToken gogirlToken = SessionUtils.getTechnicianToken();
+
         StoreData storeData = storeDataMapper.selectOne(new LambdaQueryWrapper<StoreData>().eq(StoreData::getDepartmentId, gogirlToken.getDepartmentId()));
 
         Integer departmentId = SessionUtils.getTechnicianToken().getDepartmentId();
+
         //总订单业绩
         List<StoreTradeAmount> storeTradeAmountList = storeDataMapper.storeTradeAmount(month, departmentId);
 

src/main/java/com/gogirl/dto/admin/AdminTechnicianScore.java

 package com.gogirl.dto.admin;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 @Data
 public class AdminTechnicianScore {
     private Integer technician_id;//:70
+
+    @ApiModelProperty("信息填写完整度")
     private BigDecimal avg_data_integrity;//:22.857143
 
-    //信息填写完整度
-    private Integer avg_data_integrity_str;//:"23.00 %"
-    private Integer service_criterion_proportion;//:0.2857
-    private Integer service_criterion_proportion_str;//:"29.00 %"
-    private Integer technician_name;//:"卢丹彤"
-    private Integer store_name;//:"gogirl天河南店"
-    private Integer entry_time;//:"2019-02-21T08:00:00"
-    private Integer grade;//:"中级美甲师"
-    private Integer jobs;//:"美甲师,美睫师,店长"
-    private Integer mobile;//:"13725950791"
+    @ApiModelProperty("信息填写完整度")
+    private String avg_data_integrity_str;//:"23.00 %"
+
+    @ApiModelProperty("服务时长达标率")
+    private BigDecimal service_criterion_proportion;//:0.2857
+
+    @ApiModelProperty("服务时长达标率")
+    private String service_criterion_proportion_str;//:"29.00 %"
+
+    @ApiModelProperty("美甲师姓名")
+    private String technician_name;//:"卢丹彤"
+
+    @ApiModelProperty("店铺名")
+    private String store_name;//:"gogirl天河南店"
+
+    private Date entry_time;//:"2019-02-21T08:00:00"
+
+    private String grade;//:"中级美甲师"
+
+    private String jobs;//:"美甲师,美睫师,店长"
+
+    private String mobile;//:"13725950791"
+
     private Integer status;//:1
+
+    @ApiModelProperty("总服务次数")
     private Integer total_service_count;//:11
+
+    @ApiModelProperty("总服务客户")
     private Integer total_client_count;//:8
+
+    @ApiModelProperty("复购客户数")
     private Integer total_repeat_purchase_client_count;//:5
-    private Integer repeat_purchase_client_roportion;//:0.625
-    private Integer repeat_purchase_client_roportion_str;//:"62.50 %"
-    private Integer average_amount;//:97.14
-    private Integer total_achievement;//:1370
+
+    @ApiModelProperty("复购客户比率")
+    private BigDecimal repeat_purchase_client_roportion;//:0.625
+
+    @ApiModelProperty("复购客户比率")
+    private String repeat_purchase_client_roportion_str;//:"62.50 %"
+
+    @ApiModelProperty("平均服务金额")
+    private BigDecimal average_amount;//:97.14
+
+    @ApiModelProperty("累计业绩")
+    private BigDecimal total_achievement;//:1370
+
+    @ApiModelProperty("开卡数量")
     private Integer card_count;//:null
-    private Integer card_roportion;//:0
-    private Integer card_roportion_str;//:"0.00 %"
-    private Integer card_amount;//:null
+
+    @ApiModelProperty("开卡率")
+    private BigDecimal card_roportion;//:0
+
+    @ApiModelProperty("开卡率")
+    private String card_roportion_str;//:"0.00 %"
+
+    @ApiModelProperty("开卡金额")
+    private BigDecimal card_amount;//:null
+
+    @ApiModelProperty("预约次数")
     private Integer sch_count;//:15
+
+    @ApiModelProperty("流失次数")
     private Integer sch_loss_count;//:4
+
+    @ApiModelProperty("投诉次数")
     private Integer complaint_count;//:null
+
+    @ApiModelProperty("好评次数")
     private Integer praise_count;//:2
+
     private Integer external_count;//:null
-    private Integer praise_proportion;//:0.1818
-    private Integer praise_proportion_str;//:"18.18 %"
-    private Integer complaint_proportion;//:null
-    private Integer complaint_proportion_str; //:""
+
+    @ApiModelProperty("好评率")
+    private BigDecimal praise_proportion;//:0.1818
+
+    @ApiModelProperty("好评率")
+    private String praise_proportion_str;//:"18.18 %"
+
+    @ApiModelProperty("投诉率")
+    private BigDecimal complaint_proportion;//:null
+
+    @ApiModelProperty("好评率")
+    private String complaint_proportion_str; //:""
 }

src/main/resources/mapper/store/StoreDataMapper.xml

@@ -118,7 +118,7 @@
                         t2.id as        technician_id,
                         t2.`name`       technician_name,
                         t2.picture_path technician_picture,
-                        t2.department_id
+                        a.department_id
                  FROM customer_balance_record a
                           JOIN mysql.help_topic AS b ON b.help_topic_id < (char_length(a.referee_id) -
                                                                               char_length(REPLACE(a.referee_id, ',', '')) +
@@ -148,7 +148,7 @@
                                         -1)                                                                  as technician_id,
                         t2.`name`                                                                               technician_name,
                         t2.picture_path                                                                         technician_picture,
-                        t2.department_id
+                        c.department_id
                  FROM order_serve a
                           JOIN mysql.help_topic AS b ON b.help_topic_id < (char_length(a.technician_id) -
                                                                               char_length(REPLACE(a.technician_id, ',', '')) +