1.控制台合伙人调整

2.控制台财务应收时间筛选
3.控制台财务应收详情金额调整

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

@@ -262,7 +262,7 @@ public class DeptBalanceServiceImpl implements DeptBalanceService {
                             if (sysDeptList.size() > 0) {
                                 for (SysDept sysDept : sysDeptList) {
                                     List<SysUser> sysUsers = sysUserMapper.selectList(new LambdaQueryWrapper<SysUser>()
-                                            .likeRight(SysUser::getId, sysDept.getId()).ne(SysUser::getStatus, 0));
+                                            .likeRight(SysUser::getId, sysDept.getId()));
                                     deptManNum = deptManNum + sysUsers.size();
 
                                 }
@@ -532,7 +532,7 @@ public class DeptBalanceServiceImpl implements DeptBalanceService {
                             if (sysDeptList.size() > 0) {
                                 for (SysDept sysDept : sysDeptList) {
                                     List<SysUser> sysUsers = sysUserMapper.selectList(new LambdaQueryWrapper<SysUser>()
-                                            .likeRight(SysUser::getId, sysDept.getId()).ne(SysUser::getStatus, 0));
+                                            .likeRight(SysUser::getId, sysDept.getId()));
                                     deptManNum = deptManNum + sysUsers.size();
                                 }
                             }
@@ -734,7 +734,7 @@ public class DeptBalanceServiceImpl implements DeptBalanceService {
                                 if (sysDeptList.size() > 0) {
                                     for (SysDept sysDept : sysDeptList) {
                                         List<SysUser> sysUsers = sysUserMapper.selectList(new LambdaQueryWrapper<SysUser>()
-                                                .likeRight(SysUser::getId, sysDept.getId()).ne(SysUser::getStatus, 0));
+                                                .likeRight(SysUser::getId, sysDept.getId()));
                                         deptManNum = deptManNum + sysUsers.size();
 
                                     }
@@ -791,7 +791,7 @@ public class DeptBalanceServiceImpl implements DeptBalanceService {
                 if (sysDeptList.size() > 0) {
                     for (SysDept sysDept : sysDeptList) {
                         List<SysUser> sysUsers = sysUserMapper.selectList(new LambdaQueryWrapper<SysUser>()
-                                .likeRight(SysUser::getId, sysDept.getId()).ne(SysUser::getStatus, 0));
+                                .likeRight(SysUser::getId, sysDept.getId()));
                         deptManNum = deptManNum + sysUsers.size();
                         if (CollectionUtil.isNotEmpty(sysUsers)) {
                             for (SysUser user : sysUsers) {
@@ -911,7 +911,7 @@ public class DeptBalanceServiceImpl implements DeptBalanceService {
             if (sysDepTeam.size() > 0) {
                 for (SysDept sysDept1 : sysDepTeam) {
                     List<SysUser> sysUsers = sysUserMapper.selectList(new LambdaQueryWrapper<SysUser>()
-                            .likeRight(SysUser::getId, sysDept1.getId()).ne(SysUser::getStatus, 0));
+                            .likeRight(SysUser::getId, sysDept1.getId()));
                     deptManNum = deptManNum + sysUsers.size();
                     if (sysUsers.size() > 0) {
                         List<String> collect = sysUsers.stream().map(SysUser::getId).collect(Collectors.toList());
@@ -1091,7 +1091,7 @@ public class DeptBalanceServiceImpl implements DeptBalanceService {
                     if (sysDeptList.size() > 0) {
                         for (SysDept sysDept : sysDeptList) {
                             List<SysUser> sysUsers = sysUserMapper.selectList(new LambdaQueryWrapper<SysUser>()
-                                    .likeRight(SysUser::getId, sysDept.getId()).ne(SysUser::getStatus, 0));
+                                    .likeRight(SysUser::getId, sysDept.getId()));
                             if (sysUsers.size()>0) {
                                 userIds.addAll(sysUsers.stream().map(SysUser::getId).collect(Collectors.toList()));
                             }
@@ -1116,7 +1116,7 @@ public class DeptBalanceServiceImpl implements DeptBalanceService {
                 if (sysDeptList.size() > 0) {
                     for (SysDept sysDept : sysDeptList) {
                         List<SysUser> sysUsers = sysUserMapper.selectList(new LambdaQueryWrapper<SysUser>()
-                                .likeRight(SysUser::getId, sysDept.getId()).ne(SysUser::getStatus, 0));
+                                .likeRight(SysUser::getId, sysDept.getId()));
                         if (sysUsers.size()>0) {
                             userIds.addAll(sysUsers.stream().map(SysUser::getId).collect(Collectors.toList()));
                         }

src/main/resources/mapper/modules/fnc/InsPlyIncomeMapper.xml

@@ -2475,6 +2475,9 @@
             <if test="vo.isNotCar !=null  and  vo.isNotCar  !=''">
                 and a.is_not_car =#{vo.isNotCar}
             </if>
+            <if test="vo.year !=null  and  vo.year  !=''">
+                and YEAR(a.signdate) =#{vo.year}
+            </if>
         </where>
         GROUP BY
         DATE_FORMAT( a.signdate, '%Y-%m' )
@@ -2617,9 +2620,9 @@
             a.partnerCompaniesId  as "partnerCompaniesId",
             IFNULL(a.allAmount,0) as "commissionFeevalue",
             a.companyId as "companyId",
-            IFNULL(b.noSettHandlingFee,0) as "settlementAmount",
-            IFNULL(a.allAmount,0) - IFNULL( b.settAmount,0)  as "noSettlementAmount",
-            (IFNULL(a.allAmount,0) - IFNULL( b.settAmount,0)) +IFNULL(b.noSettHandlingFee,0) as  "noInvoicCommissionFeevalue",
+            IFNULL(a.allInvoicCommissionFeevalue,0) - IFNULL( b.settAmount,0)  as "settlementAmount",
+            IFNULL(a.allAmount,0) - IFNULL( b.settAmount,0) - (IFNULL(a.allInvoicCommissionFeevalue,0) - IFNULL( b.settAmount,0))  as "noSettlementAmount",
+            (IFNULL(a.allAmount,0) - IFNULL( b.settAmount,0))  as  "noInvoicCommissionFeevalue",
             "手续费" as  "isHand",
             IFNULL( b.settAmount,0)  as "readyCommissionFeevalue"
 
@@ -2629,7 +2632,8 @@
                     SUBSTRING( a.partner_companies_id, 6, 11 ) AS "subPathner",
                     a.company_id AS "companyId",
                     a.partner_companies_id AS "partnerCompaniesId" ,
-                    sum(a.commission_feevalue)   as "allAmount"
+                    sum(a.commission_feevalue)   as "allAmount",
+                SUM( CASE WHEN a.handling_fees_status != '0' AND a.task_id IS NOT NULL THEN IFNULL( a.commission_feevalue, 0 ) ELSE 0 END ) AS "allInvoicCommissionFeevalue"
                 FROM
                     ins_ply_income a
                         LEFT JOIN ptl_agreement pa ON a.agreement_id = pa.id
@@ -2846,6 +2850,9 @@
                     <if test="vo.isNotCar !=null  and  vo.isNotCar  !=''">
                         and a.is_not_car =#{vo.isNotCar}
                     </if>
+                    <if test="vo.year !=null  and  vo.year  !=''">
+                        and YEAR(a.signdate) =#{vo.year}
+                    </if>
                 </where>
                 GROUP BY
                     DATE_FORMAT( a.signdate, '%Y-%m' )