no message

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/report/WorkerPurchaseCategoryBean.java

@@ -17,6 +17,8 @@ public class WorkerPurchaseCategoryBean {
     private String websitId;
     @ApiModelProperty(value = "网点名称")
     private String websitName;
+    @ApiModelProperty(value = "师傅所属网点编号")
+    private String workerWebsit;
     @ApiModelProperty(value = "师傅编号")
     private String workerId;
     @ApiModelProperty(value = "师傅名称")

mall-server-api/src/main/java/com/gree/mall/manager/logic/material/report/ReportLogic.java

@@ -96,7 +96,7 @@ public class ReportLogic {
     }
 
     public ExcelData workerBuySumExport(List<MaterialSalesSumBean> beanList) {
-        String[] titles = new String[]{"网点编码", "网点名称","工程师手机","工程师编号","工程师名称", "合计销售金额",
+        String[] titles = new String[]{"销售网点编码", "销售网点名称","工程师手机","工程师编号","工程师名称", "合计销售金额",
                 "现金销售金额", "通联销售金额", "现金支付次数", "通联次数", "退货金额"};
         List<List<Object>> rows = new ArrayList<>();
         for (MaterialSalesSumBean bean : beanList) {
@@ -150,7 +150,7 @@ public class ReportLogic {
             excelData.setName("数据为空");
             return excelData;
         }
-        String[] titles = new String[]{"网点编码","网点名称", "支付状态", "工程师手机","工程师编号","工程师名称",
+        String[] titles = new String[]{"销售网点编码","销售网点名称", "支付状态", "工程师手机","工程师编号","工程师名称",
                 "商品名称", "类别名称", "销售数量", "总销售额", "总进价额", "单位转换系数", "转换数"};
         List<List<Object>> rows = new ArrayList<>();
         String curWebsitId = beanList.get(0).getWebsitId();
@@ -265,7 +265,7 @@ public class ReportLogic {
 
     public ExcelData sumBuyDetailExport(List<MaterialSalesSumDetailBean> beanList) {
         AdminUserCom adminUser = commonLogic.getAdminUser();
-        String[] titles = new String[]{"网点编码","网点名称", "支付状态", "商品名称", "类别名称", "规格",
+        String[] titles = new String[]{"销售网点编码","销售网点名称", "支付状态", "商品名称", "类别名称", "规格",
                 "销售数量", "总销售额", "总进价额", "销售利润", "单位转换系数", "转换数"};
         List<List<Object>> rows = new ArrayList<>();
         BigDecimal sumSaleQty = new BigDecimal(0);
@@ -506,7 +506,7 @@ public class ReportLogic {
     }
 
     public ExcelData workerPurchaseCategorySumExport(List<WorkerPurchaseCategoryBean> workerPurchaseCategoryBeanList) {
-        String[] titles = new String[]{"年月","网点编号","网点名称","师傅编号", "师傅名称","铜管(公斤)","铜管(米)","铜管总价"
+        String[] titles = new String[]{"年月","采购网点编号","采购网点名称","师傅所属网点","师傅编号", "师傅名称","铜管(公斤)","铜管(米)","铜管总价"
                 ,"保温棉(条)","保温棉总价","电缆(米)","电缆总价","支架(付)","支架总价","冷媒(罐)","冷媒总价","开关","开关总价","包扎带"
                 ,"包扎带总价","连接器","连接器总价","双壁热缩套管","双壁热缩套管总价","清洗工具","清洗工具总价","管槽","管槽总价","热水器"
                 ,"热水器总价","总采购金额"

mall-server-api/src/main/resources/mapper/MaterialMapper.xml

@@ -1360,6 +1360,7 @@
             LEFT(#{startDate}, 7) AS `yearMonth`,
             a.worker_id,
             a.worker_name,
+            CONCAT('(', a.worker_websit_id, ')', a.worker_websit_name) AS `worker_websit`,
             a.websit_id,
             a.websit_name,
             ROUND(IFNULL( SUM( IF ( a.category_id = 6, a.totalQty, 0 )), 0 ), 4)  AS 'tgQty',
@@ -1412,6 +1413,8 @@
                     a.worker_name,
                     a.websit_id,
                     a.websit_name,
+                    a.worker_websit_id,
+                    a.worker_websit_name,
                     b.goods_category_id AS category_id,
                     SUM( a.sales_qty ) AS totalQty,
                     SUM( a.totalSaleVal ) AS totalSaleVal,
@@ -1424,6 +1427,8 @@
                             a.worker_name,
                             a.websit_id,
                             a.websit_name,
+                            a.worker_websit_id,
+                            a.worker_websit_name,
                             b.goods_id,
                             b.sales_qty,
                             b.sales_qty * b.price AS totalSaleVal,
@@ -1449,6 +1454,8 @@
                             a.worker_name,
                             a.websit_id,
                             a.websit_name,
+                            a.worker_websit_id,
+                            a.worker_websit_name,
                             b.goods_id,
                             b.ret_qty * - 1 AS saleQty,
                             (b.ret_qty * b.price) * - 1 AS totalSaleVal,
@@ -1472,12 +1479,14 @@
                 GROUP BY
                     a.worker_id,
                     a.worker_name,
+                    a.worker_websit_id
                     a.websit_id,
                     a.websit_name,
                     b.goods_category_id
             ) a
         GROUP BY
             a.worker_id,
+            a.worker_websit_id
             a.websit_id
     </select>