optimize

yd-api/src/main/resources/mapper/commission/CommissionEGoldenMapper.xml

@@ -44,8 +44,8 @@
         if((pay.MON025_108 = "S02" or pay.MON025_108 = "S01"),convert(receive.incommission,decimal(10,2)),0) as rightReceiveCommission, -- 来佣金额
         pay.paycommission as rightPayCommission, -- 应发佣金
         commissionType.SRA_BS_NAME as commissionType-- 佣奖类型
-        from ins001 policy right join (select MON024_002,MON024_301,MON024_302,MON024_303,sum(MON024_404) as incommission from MON024 where mon024_104 != "5" or mon024_104 != "6"  group by MON024_002 ,MON024_301) receive on policy.INS_MST_ID = receive.MON024_002
-        right join (select MON025_002,MON025_301,MON025_302,MON025_303,MON025_005,MON025_006,MON025_008,MON025_007,MON025_403,MON025_402,sum(MON025_401) as premium,sum(MON025_405) as paycommission,MON025_108 from MON025 where mon025_109 != "5" or mon025_109 != "6" group by mon025_002,mon025_301,MON025_007) pay on policy.INS_MST_ID = pay.MON025_002 and receive.MON024_303 = pay.MON025_303
+        from ins001 policy right join (select MON024_002,MON024_301,MON024_302,MON024_303,sum(MON024_404) as incommission from MON024 where mon024_104 != "3" and mon024_104 != "4"  group by MON024_002 ,MON024_301) receive on policy.INS_MST_ID = receive.MON024_002
+        right join (select MON025_002,MON025_301,MON025_302,MON025_303,MON025_005,MON025_006,MON025_008,MON025_007,MON025_403,MON025_402,sum(MON025_401) as premium,sum(MON025_405) as paycommission,MON025_108 from MON025 where mon025_109 != "5" and mon025_109 != "6" group by mon025_002,mon025_301,MON025_007) pay on policy.INS_MST_ID = pay.MON025_002 and receive.MON024_303 = pay.MON025_303
         left join sal001 practitioner on practitioner.SAL_MST_ID = pay.MON025_007
         left join spc002 dept on dept.SPC_BUS_ID = practitioner.FK_SPC_BUS_ID
         left join spc001 branch on branch.SPC_AREA_ID = dept.FK_AREA_ID