Merge branch 'dev_jzg_lipf_v20260518'

commons/src/main/java/com/jzg/commons/entity/dto/FeeAuditParam.java

@@ -42,11 +42,11 @@ public class FeeAuditParam extends PageRequest {
 
     @Schema(description = "报价时间开始")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private LocalDateTime quotationTimeStart;
+    private LocalDate quotationTimeStart;
 
     @Schema(description = "报价时间结束")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private LocalDateTime quotationTimeEnd;
+    private LocalDate quotationTimeEnd;
 
     @Schema(description = "签单时间开始")
     @JsonFormat(pattern = "yyyy-MM-dd")
@@ -96,6 +96,21 @@ public class FeeAuditParam extends PageRequest {
     @Schema(description = "领取人")
     private String receiveUser;
 
+    /**
+     * 在订单审核-任务中心&我的审核，两个页面，调用的都是同一个接口 feeAudit/auditList
+     * 但是实际业务邀请中，
+     *      任务中心要求查看的是该租户下的所有的数据。
+     *      我的审核要求查看的是，指定用户领取后的数据。
+     *      ---
+     *      在任务中心，待领取tab页，需要查询所有未被领取的数据， 在我的审核tab页中，需要查询所有本人已经领取，但是未处理的数据
+     *      现在两个待领取的tab页，一个需要查询出所有未领取的数据，一个需要查询本人领取过的数据。 同时还不能对其他tab页的数据造成影响。
+     *      ---
+     *      allToReceive 表示 查询全部待领取，默认是false，查询的时候，不对receiveUser进行判断，
+     *      只有在任务中心-待审核 tab页面，会给他赋值 true， 此时，会要求专门查询 recieve_user 和 recieve_time 为空的
+     */
+    @Schema(description = "是否要查询全部待领取")
+    private boolean allTodoReceive;
+
     @Schema(description = "审核方式 1 人工审核 2 自动审核")
     private Integer auditType;
 

platform/src/main/resources/application.yml

@@ -69,6 +69,7 @@ tenant:
   ignoreFunction:
     - /userInfo/getUser
     - /menu/getSystemMenu
+    - /esmInsCompany/getChildCompanyId
 
 data-scope:
   tables:

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

@@ -38,11 +38,14 @@ public class InsFeeAuditController {
 
     /**
      * 订单列表分页
+     *
+     * 支持查询租户下的所有数据，或者租户下，指定业务员领取后的数据。
      * @return HttpResult<Page<FeeAuditVo>>
      */
     @PostMapping("/auditList")
     @Operation(summary = "订单审核列表分页")
     public HttpResult<Page<FeeAuditVo>> auditList(@RequestBody FeeAuditParam param){
+        log.info("订单审核列表分页=[{}]", JSONUtil.toJsonStr(param));
         param.setSystemCode(baseController.getUserSystemCode());
         Page<FeeAuditVo> result = insFeeAuditService.queryPage(param);
         return HttpResult.ok(result);
@@ -77,7 +80,9 @@ public class InsFeeAuditController {
     @GetMapping("/isLock")
     @Operation(summary = "判断领取按钮是否锁定")
     public HttpResult<Boolean> isLock(String orderNo){
-        return HttpResult.ok(insFeeAuditService.isLock(orderNo));
+        Boolean lock = insFeeAuditService.isLock(orderNo);
+        String msg = lock ? "订单已被领取":"";
+        return HttpResult.ok(msg, lock);
     }
 
     /**

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

@@ -236,11 +236,11 @@ public class UnifyOrderManager {
     @PostMapping("/quote")
     @QuoteVerification
     public HttpResult<QuoteResultsVo> quote(@RequestBody QuoteVo quoteVo) throws Exception {
-        log.info("进行车险报价：quoteVo=[{}]", JSONUtil.toJsonStr(quoteVo));
+        String systemCode = getSystemCode();
+        log.info("进行车险报价：systemCode=[{}],quoteVo=[{}]",systemCode, JSONUtil.toJsonStr(quoteVo));
         HttpResult<EsmInsCompany> esmInsCompanyHttpResult = platformClient.findById(quoteVo.getOrder().getInsuranceCompanyCode());
         log.info("车险报价：esmInsCompanyHttpResult=[{}]", JSONUtil.toJsonStr(esmInsCompanyHttpResult));
         AssertionUtils.isFail(esmInsCompanyHttpResult.getCode() != 200, esmInsCompanyHttpResult.getMsg());
-        String systemCode = getSystemCode();
         String companyName = CompanyConstants.getCompanyNameByCode(esmInsCompanyHttpResult.getData().getCompanyCode());
 
         log.info("查询保司配置的协议：systemCode=[{}],companyId=[{}]", systemCode, esmInsCompanyHttpResult.getData().getId());
@@ -267,7 +267,7 @@ public class UnifyOrderManager {
                 .getApiType(), sysQuoteConfigService, sysQuoteRedisService, platformClient, baseController);
 
         // 生成主订单及子订单  返回子订单id
-        String ordersNo = insOrdersService.generateOrders(quoteVo, companyName);
+        String ordersNo = insOrdersService.generateOrders(quoteVo, companyName,systemCode);
 
         // 添加车辆没有的参数: 车辆明细、
         QuoteInfoParameterFilling.setParameterSettings(quoteVo, esmInsCompanyHttpResult.getData().getCompanyCode());

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

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

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

@@ -387,7 +387,8 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
 
     @Override
     public void verifyOrder(VerifyOrderParam param) {
-        log.info("审核订单. param=[{}]", JSONUtil.toJsonStr(param));
+        String systemCode = baseController.getSystemCode();
+        log.info("审核订单.systemCode=[{}], param=[{}]",systemCode, JSONUtil.toJsonStr(param));
         InsFeeAudit audit = this.getById(param.getOrderNo());
         if(audit == null){
             throw new ServiceException("要审核的订单不存在");
@@ -537,6 +538,7 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
                 userAccount.setUserId(sysUserResult.getData().getId());
                 userAccount.setSumAmount(feeOrders.getTotalReceivablePremium());
                 userAccount.setSumAmountUnpaid(feeOrders.getTotalReceivablePremium());
+                userAccount.setSystemCode(systemCode);
             }else{
                 userAccount.setSumAmount(feeOrders.getTotalReceivablePremium().add(userAccount.getSumAmount()));
                 userAccount.setSumAmountUnpaid(feeOrders.getTotalReceivablePremium().add(userAccount.getSumAmount()));

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

@@ -978,11 +978,11 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
      */
     @Override
     @Transactional
-    public String generateOrders(QuoteVo quoteVo, String companyName) {
+    public String generateOrders(QuoteVo quoteVo, String companyName, String systemCode) {
         // 生成订单的条件
         // 1个保险公司只有一个主订单   不区分险种
         // 唯一性的判定标准：保险公司编号+ 车牌号 + 车架号
-        log.info("生成一个主订单和多个子订单：quoteVo=[{}],companyName=[{}]", JSONUtil.toJsonStr(quoteVo), companyName);
+        log.info("生成一个主订单和多个子订单：systemCode=[{}], quoteVo=[{}],companyName=[{}]",systemCode, JSONUtil.toJsonStr(quoteVo), companyName);
         InsOrders mainOrders = this.getMainOrders(
                 quoteVo.getOrder().getInsuranceCompanyCode(),
                 quoteVo.getCarInfoVo().getLicenseNo(),
@@ -995,13 +995,13 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         // 如果订单号为0 则生成主订单
         if (!isExistsMainOrder) {
             // 生成主订单
-            mainOrderNo = this.saveBaseOrderorSubOrder(quoteVo, companyName, "0");
+            mainOrderNo = this.saveBaseOrderorSubOrder(quoteVo, companyName, "0",systemCode);
         } else {
             // 更新主订单
             mainOrderNo = this.updateMainOrders(quoteVo, mainOrders.getId(), companyName);
         }
         // 生成子订单
-        return this.saveBaseOrderorSubOrder(quoteVo, companyName, mainOrderNo);
+        return this.saveBaseOrderorSubOrder(quoteVo, companyName, mainOrderNo,systemCode );
     }
 
 
@@ -1011,11 +1011,13 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
      * @param quoteVo
      * @param companyName
      * @param mainOrderNo 主订单号
+     * @param systemCode
      * @return
      */
-    private String saveBaseOrderorSubOrder(QuoteVo quoteVo, String companyName, String mainOrderNo) {
+    private String saveBaseOrderorSubOrder(QuoteVo quoteVo, String companyName, String mainOrderNo, String systemCode) {
         // 保存主订单信息
         InsOrders insOrders = new InsOrders();
+        insOrders.setSystemCode(systemCode);
         // 生成主订单编号
         if ("0".equals(mainOrderNo)) {
             insOrders.setParentId("0");

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

@@ -80,17 +80,12 @@
         LEFT JOIN ins_orders_external_policy ioep on ioep.order_no = io.id AND ioep.is_delete=0
         <where>
             and ifa.is_delete=0 and ifa.system_code = #{param.systemCode}
-            <choose>
-                <when test="param.receiveUser != null and param.receiveUser != ''">
-                    and ifa.receive_user = #{param.receiveUser}
-                </when>
-                <when test="param.isProblem != null and param.isProblem == 1">
-                    and ifa.receive_user is NOT NULL
-                </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.allTodoReceive != null and param.allTodoReceive == true">
+                and ifa.receive_user is null
+            </if>
             <if test="param.auditType != null">
                 and ifa.audit_type = #{param.auditType}
             </if>
@@ -215,17 +210,9 @@
         LEFT JOIN ins_orders_external_policy ioep on ioep.order_no = io.id AND ioep.is_delete=0
         <where>
             and ifa.is_delete=0
-            <choose>
-                <when test="param.receiveUser != null and param.receiveUser != ''">
-                    and ifa.receive_user = #{param.receiveUser}
-                </when>
-                <when test="param.isProblem != null and param.isProblem == 1">
-                    and ifa.receive_user is NOT NULL
-                </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/resources/mapper/SysUserJzgInfoBankCardMapper.xml

@@ -63,7 +63,7 @@
         <if test="sysUserJzgInfoBankCardVo.applyTimeStart != null and sysUserJzgInfoBankCardVo.applyTimeEnd != null">
             and DATE_FORMAT(sujibc.apply_time, '%Y-%m-%d') between #{sysUserJzgInfoBankCardVo.applyTimeStart} AND #{sysUserJzgInfoBankCardVo.applyTimeEnd}
         </if>
-        <if test="sysUserJzgInfoBankCardVo.auditTimeStart != null and sysUserJzgInfoBankCardVo.auditTimeEnd == null">
+        <if test="sysUserJzgInfoBankCardVo.auditTimeStart != null and sysUserJzgInfoBankCardVo.auditTimeEnd != null">
             and DATE_FORMAT(sujibc.audit_time, '%Y-%m-%d') between #{sysUserJzgInfoBankCardVo.auditTimeStart} AND #{sysUserJzgInfoBankCardVo.auditTimeEnd}
         </if>
         <if test="sysUserJzgInfoBankCardVo.auditBy != null and sysUserJzgInfoBankCardVo.auditBy != ''">