1.数据大屏当日签单改为大订单数字

src/main/java/com/ydtech/modules/admin/service/impl/DeptBalanceServiceImpl.java

@@ -343,10 +343,19 @@ public class DeptBalanceServiceImpl implements DeptBalanceService {
                     BigDecimal sxAmount =BigDecimal.ZERO;
                     //未提现
                     BigDecimal wtxAmount =BigDecimal.ZERO;
+
                     MySumAmountQueryDto mySumAmountQueryDto = new MySumAmountQueryDto();
+
+                    if ("21".equals(record.getRoleId()) && "1".equals(record.getManagementSource())) {
+                        mySumAmountQueryDto.setDeptId(record.getDeptId());
+                    }
                     //如果是电销组长，将组员的数据算进来
                     if ("72".equals(record.getRoleId()) && "3".equals(record.getManagementSource())) {
                         mySumAmountQueryDto.setGroupFlag(true);
+                    }
+
+                    //如果是电销组长，将组员的数据算进来
+                        mySumAmountQueryDto.setGroupFlag(true);
                         List<String> userList = sysUserService.getGroupByUserId(userId);
                         //sumAmount= deptBalanceMapper.getDxWalletAgentAmount(userList,deptBalanceVo.getBeginDate(),deptBalanceVo.getEndDate());
                         SysUserAccount sysUserAccountEntity = sysUserAccountService.getById(record.getUserId());
@@ -358,7 +367,6 @@ public class DeptBalanceServiceImpl implements DeptBalanceService {
                         wtxAmount= (sysUserAccountEntity==null || sysUserAccountEntity.getSumAmount()==null)?BigDecimal.ZERO:sysUserAccountEntity.getSumAmount();
                         //总的 =  已提现金额+  可提现金额 +  提现中
                         sumAmount = wtxAmount.add(sxAmount).add(ytxAmount);
-                    }
                     record.setWithdrawn(ytxAmount);
                     record.setNotWithdrawn(wtxAmount);
                     record.setTotalIncome(sumAmount);

src/main/resources/mapper/modules/largescreen/AgreementDataMapper.xml

@@ -50,9 +50,10 @@
         COALESCE(SUM(sypremium), 0) AS syPremium,
         COALESCE(SUM(taxamount), 0) AS taxPremium,
         COALESCE(SUM(jqpremium) + SUM(sypremium) + SUM(jypremium), 0) AS sumPremium,
-        COALESCE(COUNT(iac.id), 0) as sumOrderNum
+        COALESCE(COUNT(io.orderno), 0) as sumOrderNum
         FROM
         ins_area_company iac
+        left join ins_orders io  on io.orderno  =  iac.orderno
         WHERE
         1=1
         <if test="orderStatus != null and orderStatus != ''">
@@ -112,11 +113,12 @@
 
     <select id="getOrderNumber" parameterType="com.ydtech.modules.largescreen.model.query.DataQuery"
             resultType="Integer">
+        select count(a.orderno) from (
         SELECT
-        count( io.orderno )
+        io.orderno
         FROM
         ins_orders io
-        left join  ins_area_company iac  on  iac.orderno  =io.orderno
+        left join ins_area_company iac on iac.orderno =io.orderno
         WHERE
         1=1
         <if test="startDate != null and startDate != ''">
@@ -126,6 +128,8 @@
         <if test="signStartDate != null and signStartDate != ''  and signEndDate !=null and signEndDate !=''">
             and iac.signing_time BETWEEN #{signStartDate} and #{signEndDate}
         </if>
+        group by io.orderno
+        ) a
     </select>