he2802 1 năm trước cách đây
mục cha
commit
fe46504962

+ 4 - 3
zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopOldOrderServiceImpl.java

@@ -2629,7 +2629,8 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
             topOrderStatisticsBo.setStartTime(startTime - time);
             topOrderStatisticsBo.setEndTime(startTime);
             topOrderStatisticsBo.setTenantId(bo.getTenantId());
-            topOrderStatisticsBo.setCreateNo(bo.getCreateNo());
+            topOrderStatisticsBo.setCreateSysUserId(bo.getCreateSysUserId());
+            topOrderStatisticsBo.setBusinessName(item.getBusinessName());
             List<TopOrderStatisticsNumVo> numStatistics = baseMapper.getBusinessOrderNum(topOrderStatisticsBo);
             if (CollectionUtils.isNotEmpty(numStatistics)&&numStatistics.size()>0){
                 Long num = numStatistics.stream().findFirst().get().getOrderNum();
@@ -3440,9 +3441,9 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
         detailVos.forEach(item -> {
             //订单客户机构ID
 
-            if (item.getMoney().compareTo(BigDecimal.ZERO) == 0){
+          /*  if (item.getMoney().compareTo(BigDecimal.ZERO) == 0){
                 return;
-            }
+            }*/
             //订单金额
             //环比
             Long startTime = bo.getStartTime();

+ 3 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/top/order/vo/TopOrderStatisticsNumVo.java

@@ -46,4 +46,7 @@ public class TopOrderStatisticsNumVo implements Serializable {
     @ApiModelProperty("业务层次")
     private String businessName;
 
+    @ApiModelProperty("业务员ID")
+    private String createSysUserId;
+
 }

+ 6 - 0
zhongzheng-system/src/main/resources/mapper/modules/top/TopOldOrderMapper.xml

@@ -1701,9 +1701,15 @@
             AND 1=0
         </if>
                 ) nou
+
+
             GROUP BY
                 nou.business_name
         ) allu
+        where 1=1
+        <if test="businessName != null and businessName != ''">
+            AND allu.business_name = #{businessName}
+        </if>
         GROUP BY
         allu.business_name
         ORDER BY