推送消息

src/main/java/com/dk/mdm/service/mst/CusFollowService.java

@@ -417,7 +417,7 @@ public class CusFollowService extends BaseService<CusFollow> {
             log.info("sendFollowMessage:{}", JSONObject.toJSONString(followStaff));
             Customer customer = customerMapper.selectById(follow.getCusId());
             if (customer != null) {
-                String loginType = "1";
+                String loginType = "4";
                 List<String> list = new ArrayList<>();
                 if (Constant.BasicDataConstant.FOLLOW_STATUS_4.getValue().equals(follow.getFollowStatus()) ||
                         Constant.BasicDataConstant.FOLLOW_STATUS_1.getValue().equals(follow.getFollowStatus())) {

src/main/java/com/dk/mdm/service/report/ReportService.java

@@ -133,7 +133,14 @@ public class ReportService {
             dataList = reportMapper.getPurDetailReport(param);
         }
         data.setList(dataList);
-        data.setTotal(reportMapper.getSalesTrackingReportCount(param));
+        if (param.get("flgViewItem") == null) {
+            // 查询主表
+            data.setTotal(reportMapper.getPurReportCount(param));
+        } else {
+            // 查询明细
+            data.setTotal(reportMapper.getPurDetailReportCount(param));
+        }
+
         data.setPageSize((Integer) param.get("pageSize"));
         data.setCurrentPage((Integer) param.get("currentPage"));
         return ResponseResultUtil.success(data);
@@ -163,7 +170,14 @@ public class ReportService {
             dataList = reportMapper.getOrderDetailReport(param);
         }
         data.setList(dataList);
-        data.setTotal(reportMapper.getSalesTrackingReportCount(param));
+        if (param.get("flgViewItem") == null) {
+            // 查询主表
+            data.setTotal(reportMapper.getOrderReportCount(param));
+        } else {
+            // 查询明细
+            data.setTotal(reportMapper.getOrderDetailReportCount(param));
+        }
+
         data.setPageSize((Integer) param.get("pageSize"));
         data.setCurrentPage((Integer) param.get("currentPage"));
         return ResponseResultUtil.success(data);
@@ -192,7 +206,13 @@ public class ReportService {
             dataList = reportMapper.getOutboundDetailReport(param);
         }
         data.setList(dataList);
-        data.setTotal(reportMapper.getOutboundDetailReportCount(param));
+        if (param.get("flgViewItem") == null) {
+            // 查询主表
+            data.setTotal(reportMapper.getOutboundReportCount(param));
+        } else {
+            // 查询明细
+            data.setTotal(reportMapper.getOutboundDetailReportCount(param));
+        }
         data.setPageSize((Integer) param.get("pageSize"));
         data.setCurrentPage((Integer) param.get("currentPage"));
         return ResponseResultUtil.success(data);
@@ -221,7 +241,13 @@ public class ReportService {
             dataList = reportMapper.getInboundDetailReport(param);
         }
         data.setList(dataList);
-        data.setTotal(reportMapper.getSalesTrackingReportCount(param));
+        if (param.get("flgViewItem") == null) {
+            // 查询主表
+            data.setTotal(reportMapper.getInboundlReportCount(param));
+        } else {
+            // 查询明细
+            data.setTotal(reportMapper.getInboundDetailReportCount(param));
+        }
         data.setPageSize((Integer) param.get("pageSize"));
         data.setCurrentPage((Integer) param.get("currentPage"));
         return ResponseResultUtil.success(data);