Bläddra i källkod

销售盯盘 获取单日数据 修改

zhaoxian 2 år sedan
förälder
incheckning
85cbf4eee1

+ 12 - 3
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/service/impl/ManagerSaleValueServiceImpl.java

@@ -16,6 +16,7 @@ import org.springframework.stereotype.Service;
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
@@ -322,6 +323,8 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
     @Override
     public PageInfo getProjectChargeTop(String userId, String mediaId, String companyId, String startTime, String endTime, Integer pageNo, Integer pageSize) throws Exception {
         String roleCode = baseMapper.getRoleCodeByUserId(userId);
+        //当天日期
+        String today = DateUtils.formatDate(new Date());
         JSONObject data = null;
         //销售总监
         if ("saleDirector".equals(roleCode) || "saleAm".equals(roleCode)) {
@@ -332,8 +335,10 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
                 if (Check.isNull(accountIds)) {
                     throw new Exception("未查询到账户!");
                 }
-                if (startTime.equals(endTime)) {
+                if (startTime.equals(endTime) && today.equals(startTime)) {
                     return getProjectDailyCharges(accountIds, companyId, mediaId, startTime, null, pageNo, pageSize);
+                } else if (startTime.equals(endTime)) {
+                    return getProjectDailyCharges(accountIds, companyId, mediaId, startTime, startTime, pageNo, pageSize);
                 } else {
                     return getProjectDailyCharges(accountIds, companyId, mediaId, startTime, endTime, pageNo, pageSize);
                 }
@@ -347,8 +352,10 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
             if (Check.isNull(accountIds)) {
                 throw new Exception("未查询到账户!");
             }
-            if (startTime.equals(endTime)) {
+            if (startTime.equals(endTime) && today.equals(startTime)) {
                 return getProjectDailyCharges(accountIds, companyId, mediaId, startTime, null, pageNo, pageSize);
+            } else if (startTime.equals(endTime)) {
+                return getProjectDailyCharges(accountIds, companyId, mediaId, startTime, startTime, pageNo, pageSize);
             } else {
                 return getProjectDailyCharges(accountIds, companyId, mediaId, startTime, endTime, pageNo, pageSize);
             }
@@ -359,8 +366,10 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
             if (Check.isNull(accountIds)) {
                 throw new Exception("未查询到账户!");
             }
-            if (startTime.equals(endTime)) {
+            if (startTime.equals(endTime) && today.equals(startTime)) {
                 return getProjectDailyCharges(accountIds, companyId, mediaId, startTime, null, pageNo, pageSize);
+            } else if (startTime.equals(endTime)) {
+                return getProjectDailyCharges(accountIds, companyId, mediaId, startTime, startTime, pageNo, pageSize);
             } else {
                 return getProjectDailyCharges(accountIds, companyId, mediaId, startTime, endTime, pageNo, pageSize);
             }