Merge remote-tracking branch 'origin/dev_jzg_lipf_v20260518' into dev_jzg_lipf_v20260518

commons/src/main/java/com/jzg/commons/entity/finance/po/InsPlyIncome.java

@@ -230,6 +230,10 @@ public class InsPlyIncome extends BaseModel {
     @Schema(description = "对接人手机号")
     private String contactPersonPhone;
 
+    public String getDockingPerson(){
+        return this.contactPerson + "-" + this.contactPersonPhone;
+    }
+
     @Schema(description = "系统code")
     @ExcelProperty("系统code")
     private String systemCode;

commons/src/main/java/com/jzg/commons/entity/quote/vo/base/OrderBase.java

@@ -85,6 +85,16 @@ public class OrderBase implements Serializable {
      */
     private String dispatchId;
 
+    /**
+     * 对接人姓名
+     */
+    private String dockingPerson;
+
+    /**
+     * 对接人联系方式
+     */
+    private String dockingPersonPhone;
+
     /**
      * 获取保险公司编码
      */

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/controller/UnifyOrderManager.java

@@ -255,6 +255,9 @@ public class UnifyOrderManager {
         }
         quoteVo.getOrder().setAgreementId(ptlAgreement.getId());
         quoteVo.getOrder().setApiType(ptlAgreement.getApiType());
+        // add by lilpf 2026年6月1日09:03:34 为订单添加对接人和对接人联系方式
+        quoteVo.getOrder().setDockingPerson(ptlAgreement.getDockingPerson());
+        quoteVo.getOrder().setDockingPersonPhone(ptlAgreement.getDockingPhone());
         // 设置人员区划. （将投保人的地址信息，按照行政区域进行划分）
         insOrdersService.setUserAreaCode(quoteVo);
         log.debug("设置人员区域后信息是：quoteVo=[{}]", JSONUtil.toJsonStr(quoteVo));

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

@@ -57,8 +57,8 @@ public interface InsOrdersService extends IService<InsOrders> {
     /**
      * 根据报价参数生成订单  返回订单号
      *
-     * @param quoteVo
-     * @param companyName
+     * @param quoteVo 报价信息
+     * @param companyName 保险公司名称
      * @return String
      */
     String generateOrders(QuoteVo quoteVo, String companyName);

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

@@ -51,7 +51,6 @@ import com.jzg.quotation.commons.client.OrgClient;
 import com.jzg.quotation.commons.client.PartnerDistributionClient;
 import com.jzg.quotation.commons.client.PlatformClient;
 import com.jzg.quotation.commons.utils.BeanCopyUtil;
-import com.jzg.quotation.commons.utils.DateTimeUtil;
 import com.jzg.quotation.commons.utils.SnowFlakeUtil;
 import com.jzg.quotation.summary.consumer.template.OrderMessageTemplate;
 import com.jzg.quotation.summary.entity.bo.DataValueBo;
@@ -1027,6 +1026,9 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             insOrders.setId(IdGenerate.nextId());
         }
 
+        // add by lipf 2026年6月1日09:08:07 填充对接人信息
+        insOrders.setDockingPerson(quoteVo.getOrder().getDockingPerson());
+        insOrders.setDockingPersonPhone(quoteVo.getOrder().getDockingPersonPhone());
         insOrders.setQuoteNo(quoteVo.getOrder().getQuoteNo());
         insOrders.setAgreementId(quoteVo.getOrder().getAgreementId());
         insOrders.setOrderStatus(InsOrderStatusEnum.QUOTE_ING.getCode()); // 订单状态 报价中
@@ -1107,6 +1109,9 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         oldOrder.setProductId(insOrders.getProductId());
         oldOrder.setProductName(insOrders.getProductName());
 
+        // modify by lipf 2026年6月1日09:10:01 填充对接人信息
+        insOrders.setDockingPerson(quoteVo.getOrder().getDockingPerson());
+        insOrders.setDockingPersonPhone(quoteVo.getOrder().getDockingPersonPhone());
         insOrders.setQuoteNo(quoteVo.getOrder().getQuoteNo());
         insOrders.setAgreementId(quoteVo.getOrder().getAgreementId());
         insOrders.setOrderStatus(InsOrderStatusEnum.QUOTE_ING.getCode()); // 订单状态 报价中

tenant/insurance/quotation-summary/src/main/resources/mapper/InsFeeAuditMapper.xml

@@ -27,7 +27,7 @@
     </sql>
     <select id="queryPage" resultType="com.jzg.commons.entity.orders.vo.FeeAuditVo">
         SELECT
-                qsu.username ,    -- 业务员登录账号
+        qsu.username ,    -- 业务员登录账号
         ifa.order_no as orderNo,
         io.company_id,
         io.company_name as companyName,
@@ -80,14 +80,9 @@
                 LEFT JOIN ins_orders_costs ioc on ioc.order_no = io.id
                 LEFT JOIN ins_orders_external_policy ioep on ioep.order_no = io.id
         <where>
-            <choose>
-                <when test="param.receiveUser != null and param.receiveUser != ''">
-                    and ifa.receive_user = #{param.receiveUser}
-                </when>
-                <otherwise>
-                    and ifa.receive_user is NULL
-                </otherwise>
-            </choose>
+            <if test="param.receiveUser != null and param.receiveUser != ''">
+                and ifa.receive_user = #{param.receiveUser}
+            </if>
             <if test="param.auditType != null">
                 and ifa.audit_type = #{param.auditType}
             </if>

tenant/organization/src/main/java/com/jzg/organization/controller/AmountAuditingController.java

@@ -37,7 +37,7 @@ public class AmountAuditingController extends BaseController {
     @PostMapping("/auditList")
     @Operation(summary = "提现申请列表分页")
     public HttpResult<Page<AmountAuditVo>> auditList(@RequestBody AmountAuditParam param){
-        log.info("应付账款-体现申请-查询：param=[{}]", JSONUtil.toJsonStr(param));
+        log.info("应付账款-提现申请-查询：param=[{}]", JSONUtil.toJsonStr(param));
         Page<AmountAuditVo> result = sysAmountAuditingService.queryPage(param);
         return HttpResult.ok(result);
     }

tenant/organization/src/main/java/com/jzg/organization/controller/ReceivableController.java

@@ -2,6 +2,7 @@ package com.jzg.organization.controller;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jzg.commons.core.base.BaseController;
 import com.jzg.commons.core.page.HttpResult;
@@ -73,7 +74,8 @@ public class ReceivableController {
 
     @PostMapping("addReceivable")
     @Operation(summary = "添加应收记录")
-    public HttpResult addReceivable(@RequestBody AddReceivableVo addReceivableVo){
+    public HttpResult<String> addReceivable(@RequestBody AddReceivableVo addReceivableVo){
+        log.info("添加应收记录：addReceivableVo=[{}]", JSONUtil.toJsonStr(addReceivableVo));
         boolean result = receivableService.saveAuditedOrder(addReceivableVo);
         return result ? HttpResult.ok("添加成功") : HttpResult.error("添加失败");
     }

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

@@ -166,7 +166,9 @@
         io.product_name,
         io.pay_time,
         io.signing_time,
-        ifa.audit_status
+        ifa.audit_status,
+        io.docking_person as contact_person,
+        io.docking_person_phone as contact_person_phone
         FROM
         ins_orders io
         LEFT JOIN ins_orders_policy iop ON io.id = iop.order_no