App合伙人费用展示

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

@@ -893,38 +893,55 @@ public class SysAgencyLeaderServiceImpl extends ServiceImpl<SysAgencyLeaderMappe
                             List<SysUser> sysUsers = sysUserMapper.selectList(new LambdaQueryWrapper<SysUser>()
                                     .likeRight(SysUser::getId, sysDept.getId()).eq(SysUser::getStatus, 1));
                             deptManNum = deptManNum + sysUsers.size();
-                            List<InsOrders> insOrderList;
-                            //筛选订单，选择时间
+
                             Date updateTime = sysAgencyLeader.getUpdateTime();
-                            if (updateTime == null) {
-                                //机构下所有订单
-                                insOrderList = insOrdersMapper.selectList(new LambdaQueryWrapper<InsOrders>()
-                                        .likeRight(InsOrders::getDeptid, sysDept.getId())
-                                        .ge(InsOrders::getCreatetime, sysAgencyLeader.getCreateTime()));
-                                agencyTeamVo.setStartTime(sysAgencyLeader.getCreateTime());
+                            Date createTime = sysAgencyLeader.getCreateTime();
 
-                            } else {
-                                insOrderList = insOrdersMapper.selectList(new LambdaQueryWrapper<InsOrders>()
-                                        .likeRight(InsOrders::getDeptid, sysDept.getId())
-                                        .ge(InsOrders::getCreatetime, updateTime));
+                            String dateStr = "";
+                            if (updateTime != null) {
+                                dateStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(updateTime);
                                 agencyTeamVo.setStartTime(updateTime);
+                            } else {
+                                dateStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(createTime);
+                                agencyTeamVo.setStartTime(createTime);
                             }
+                            HashMap<String, BigDecimal> map = baseMapper.getBigDecimalNum(sysDept.getId(), dateStr,null,null);
+                            if (CollectionUtil.isNotEmpty(map)) {
 
-                            if (insOrderList.size() > 0) {
-                                List<String> collect = insOrderList.stream().map(InsOrders::getOrderno).collect(Collectors.toList());
-                                //查询订单下的所有子订单
-                                List<InsAreaCompany> insAreaCompanies = insAreaCompanyMapper.selectList(new LambdaQueryWrapper<InsAreaCompany>()
-                                        .in(InsAreaCompany::getOrderno, collect)
-                                        .eq(InsAreaCompany::getOrderstatus, 3));
-                                if (insAreaCompanies.size() > 0) {
-                                    BigDecimal jqpremium = insAreaCompanies.stream().map(InsAreaCompany::getJqpremium).reduce(BigDecimal.ZERO, BigDecimal::add);
-                                    BigDecimal sypremium = insAreaCompanies.stream().map(InsAreaCompany::getSypremium).reduce(BigDecimal.ZERO, BigDecimal::add);
-                                    BigDecimal jypremium = insAreaCompanies.stream().map(InsAreaCompany::getJypremium).reduce(BigDecimal.ZERO, BigDecimal::add);
-
-                                    bigDecimal = jqpremium.add(sypremium).add(jypremium);
-
-                                }
+                                bigDecimal = bigDecimal.add(map.get("bigDecimal") == null ? BigDecimal.ZERO : map.get("bigDecimal"));
                             }
+//                            List<InsOrders> insOrderList;
+//                            //筛选订单，选择时间
+//                            Date updateTime = sysAgencyLeader.getUpdateTime();
+//                            if (updateTime == null) {
+//                                //机构下所有订单
+//                                insOrderList = insOrdersMapper.selectList(new LambdaQueryWrapper<InsOrders>()
+//                                        .likeRight(InsOrders::getDeptid, sysDept.getId())
+//                                        .ge(InsOrders::getCreatetime, sysAgencyLeader.getCreateTime()));
+//                                agencyTeamVo.setStartTime(sysAgencyLeader.getCreateTime());
+//
+//                            } else {
+//                                insOrderList = insOrdersMapper.selectList(new LambdaQueryWrapper<InsOrders>()
+//                                        .likeRight(InsOrders::getDeptid, sysDept.getId())
+//                                        .ge(InsOrders::getCreatetime, updateTime));
+//                                agencyTeamVo.setStartTime(updateTime);
+//                            }
+//
+//                            if (insOrderList.size() > 0) {
+//                                List<String> collect = insOrderList.stream().map(InsOrders::getOrderno).collect(Collectors.toList());
+//                                //查询订单下的所有子订单
+//                                List<InsAreaCompany> insAreaCompanies = insAreaCompanyMapper.selectList(new LambdaQueryWrapper<InsAreaCompany>()
+//                                        .in(InsAreaCompany::getOrderno, collect)
+//                                        .eq(InsAreaCompany::getOrderstatus, 3));
+//                                if (insAreaCompanies.size() > 0) {
+//                                    BigDecimal jqpremium = insAreaCompanies.stream().map(InsAreaCompany::getJqpremium).reduce(BigDecimal.ZERO, BigDecimal::add);
+//                                    BigDecimal sypremium = insAreaCompanies.stream().map(InsAreaCompany::getSypremium).reduce(BigDecimal.ZERO, BigDecimal::add);
+//                                    BigDecimal jypremium = insAreaCompanies.stream().map(InsAreaCompany::getJypremium).reduce(BigDecimal.ZERO, BigDecimal::add);
+//
+//                                    bigDecimal = jqpremium.add(sypremium).add(jypremium);
+//
+//                                }
+//                            }
 
                         }