私有协议-协议报表-结算记录 查询按照结算时间倒序排列

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsFeeAuditServiceImpl.java

@@ -563,13 +563,6 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
             List<SysUserAccountIncomeLog>builderIncomeLog = this.builderIncomeLog(param.getOrderNo(),feeOrders,userAccount,distributor1,distributor2,distributor3);
             HttpResult result2 = orgClient.addUserAccountIncomeLog(builderIncomeLog);
             AssertionUtils.isFail(result2.getCode() != 200,"账户记录添加失败,审核失败");
-
-            //合伙人佣金比例
-            try {
-                partnerClient.extractFeeSave(orders.getQuoteNo(),orders.getId());
-            }catch (Exception e){
-                log.error("保存合伙人佣金计算异常:{}",e.getMessage(), e);
-            }
         }else{
             log.info("订单审核驳回：param=[{}]", JSONUtil.toJsonStr(param));
             StateResult stateFailResult = auditStateListener.statusChange(AuditState.AuditStateEnum.FAIL_AUDIT,audit.getAuditStatus()+"");
@@ -582,6 +575,13 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
         audit.setAuditUser(userName);
         audit.setAuditTime(LocalDateTime.now());
         this.updateById(audit);
+
+        //合伙人佣金比例
+        try {
+            partnerClient.extractFeeSave(orders.getQuoteNo(),orders.getId());
+        }catch (Exception e){
+            log.error("保存合伙人佣金计算异常:{}",e.getMessage(), e);
+        }
     }
 
     /**

tenant/organization/src/main/resources/mapper/ReceivableMapper.xml

@@ -1313,7 +1313,7 @@
         SELECT
             eic.id AS companyId,
             eic.name AS companyName,
-            COALESCE(SUM(ifo.jq_commission_premium + ifo.sy_commission_premium + ifo.jy_commission_premium), 0) AS superviseAmount
+        SUM(COALESCE(ifo.jq_commission_premium, 0) + COALESCE(ifo.sy_commission_premium, 0) + COALESCE(ifo.jy_commission_premium, 0)) AS superviseAmount
         FROM
             esm_ins_company eic
                 LEFT JOIN
@@ -1322,8 +1322,7 @@
             ins_fee_orders ifo ON pa.id = ifo.agreement_id
         GROUP BY
             eic.id, eic.name
-        ORDER BY
-            eic.id;
+        ORDER BY  eic.name
     </select>
 
     <select id="getReceiverSettlementReport" resultType="com.jzg.commons.entity.finance.dto.ReceiverSettlementReportDto">