bug修改

src/main/java/com/ydtech/modules/order/controller/InsOrdersController.java

@@ -375,7 +375,17 @@ public class InsOrdersController extends BaseController {
             batchOrderQueryVo.setIsAudit(0);
         }
         return HttpResult.ok(batchOrderService.getBatchOrderList(page,batchOrderQueryVo));
+    }
 
+    @PostMapping("/getBtachOrderRejectList")
+    @ApiOperation(value = "获取批单驳回列表")
+    public HttpResult getBatchOrderRejectList(@RequestBody BatchOrderQueryVo batchOrderQueryVo){
+        Page page = buildPageRequest(batchOrderQueryVo.getPageDto());
+        batchOrderQueryVo.setUserId(getUserId());
+        if(batchOrderQueryVo.getIsAudit() == null){
+            batchOrderQueryVo.setIsAudit(2);
+        }
+        return HttpResult.ok(batchOrderService.getBatchOrderRejectList(page,batchOrderQueryVo));
     }
 
     @PostMapping("/auditBatchOrder")

src/main/java/com/ydtech/modules/order/dao/BatchOrderMapper.java

@@ -1,8 +1,11 @@
 package com.ydtech.modules.order.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ydtech.modules.order.entity.BatchOrder;
+import com.ydtech.modules.order.entity.vo.BatchOrderQueryVo;
 import com.ydtech.modules.order.entity.vo.dajia.InsAccidentalDrivingDajia;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * @author Administrator
@@ -12,4 +15,5 @@ import com.ydtech.modules.order.entity.vo.dajia.InsAccidentalDrivingDajia;
  */
 public interface BatchOrderMapper extends BaseMapper<BatchOrder> {
 
+    Page<BatchOrder> getBatchOrderRejectList(Page page, @Param("batchOrderQueryVo") BatchOrderQueryVo batchOrderQueryVo);
 }

src/main/java/com/ydtech/modules/order/entity/vo/BatchOrderQueryVo.java

@@ -25,5 +25,8 @@ public class BatchOrderQueryVo extends PageRequest {
     @ApiModelProperty("发动机号")
     private String engineNo;
 
+    @ApiModelProperty("用户id")
+    private String userId;
+
 
 }

src/main/java/com/ydtech/modules/order/service/BatchOrderService.java

@@ -40,4 +40,11 @@ public interface BatchOrderService {
      * @return
      */
     Page<BatchOrder> getBatchOrderList(Page page, BatchOrderQueryVo batchOrderQueryVo);
+
+    /**
+     * 获取批单驳回列表
+     * @param batchOrderQueryVo
+     * @return
+     */
+    Page<BatchOrder> getBatchOrderRejectList(Page page, BatchOrderQueryVo batchOrderQueryVo);
 }

src/main/java/com/ydtech/modules/order/service/impl/BatchOrderServiceImpl.java

@@ -40,9 +40,8 @@ public class BatchOrderServiceImpl extends ServiceImpl<BatchOrderMapper, BatchOr
     public boolean batchOrder(BatchOrderVo batchOrderVo){
         String subOrderNo = batchOrderVo.getSubOrderNo();
         BatchOrder batchOrderOne = baseMapper.selectOne(new LambdaQueryWrapper<>(BatchOrder.class)
-                .eq(BatchOrder::getSubOrderNo, subOrderNo)
-                .eq(BatchOrder::getIsAudit, 0));
-        if(batchOrderOne != null){
+                .eq(BatchOrder::getSubOrderNo, subOrderNo));
+        if(batchOrderOne != null && batchOrderOne.getIsAudit() == 0){
             throw new SystemException("该订单已经批单待审核，请勿重复操作");
         }
         InsAreaCompany insAreaCompany = insAreaCompanyService.getById(batchOrderVo.getSubOrderNo());
@@ -85,8 +84,12 @@ public class BatchOrderServiceImpl extends ServiceImpl<BatchOrderMapper, BatchOr
             }
         }
         BatchOrder  batchOrder = new BatchOrder(batchOrderVo);
+        if(batchOrderOne != null){
+            batchOrder.setId(batchOrderOne.getId());
+            batchOrder.setIsAudit(0);
+        }
         batchOrder.setModifyContent(modifyContent.toString());
-        return this.save(batchOrder);
+        return this.saveOrUpdate(batchOrder);
     }
 
     /**
@@ -122,6 +125,11 @@ public class BatchOrderServiceImpl extends ServiceImpl<BatchOrderMapper, BatchOr
         return batchOrderList;
     }
 
+    @Override
+    public Page<BatchOrder> getBatchOrderRejectList(Page page, BatchOrderQueryVo batchOrderQueryVo) {
+        return baseMapper.getBatchOrderRejectList(page, batchOrderQueryVo);
+    }
+
     /**
      * 批单审核
      * @param batchOrderAuditVo

src/main/java/com/ydtech/modules/order/service/impl/HuaTaiOrderApiServiceImpl.java

@@ -400,7 +400,8 @@ public class HuaTaiOrderApiServiceImpl implements HuaTaiOrderApiService {
             if (StringUtils.isNotEmpty(jqFailReason) || StringUtils.isNotEmpty(syFailReason)) {
                 return HttpResult.error("保单生成失败，原因为：" + jqFailReason + syFailReason);
             } else {
-                return HttpResult.error("保单生成失败，华泰返回异常，请联系管理员排查！");
+//                return HttpResult.error("保单生成失败，华泰返回异常，请联系管理员排查！");
+                return HttpResult.error("未查询到缴费记录");
             }
         }
     }

src/main/resources/mapper/modules/order/BatchOrder.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ydtech.modules.order.dao.BatchOrderMapper">
+
+    <select id="getBatchOrderRejectList" resultType="com.ydtech.modules.order.entity.BatchOrder">
+        select
+            iob.*
+        FROM
+            ins_orders_batch iob
+        LEFT JOIN
+            ins_area_company iac on iob.sub_order_no = iac.id
+        LEFT JOIN
+            ins_orders io on iac.orderno = io.orderno
+        WHERE
+            1=1
+        <if test="batchOrderQueryVo.licenseNo != null and batchOrderQueryVo.licenseNo != ''">
+            AND JSON_EXTRACT(carinfo, '$.licenseNo') = #{batchOrderQueryVo.licenseNo}
+        </if>
+        <if test="batchOrderQueryVo.frameNo != null and batchOrderQueryVo.frameNo != ''">
+            AND JSON_EXTRACT(carinfo, '$.frameNo') =  #{batchOrderQueryVo.frameNo}
+        </if>
+        <if test="batchOrderQueryVo.engineNo != null and batchOrderQueryVo.engineNo != ''">
+            AND JSON_EXTRACT(carinfo, '$.engineNo') = #{batchOrderQueryVo.engineNo}
+        </if>
+        <if test="batchOrderQueryVo.userId != null and batchOrderQueryVo.userId != ''">
+            AND io.userid = #{batchOrderQueryVo.userId}
+        </if>
+        <if test="batchOrderQueryVo.isAudit != null and batchOrderQueryVo.isAudit != ''">
+        AND is_audit = #{batchOrderQueryVo.isAudit}
+        </if>
+    </select>
+
+</mapper>

src/main/resources/mapper/modules/order/InsOrdersMapper.xml

@@ -339,14 +339,13 @@
 
     <select id="queryPageOrder" resultMap="BaseResultMap">
         select
-            io.*
+            io.*,
+            iac.signing_time
         from
             ins_orders io
         <!--如果存在 公司查询则进行连表 -->
-        <if test="orderQueryVo.companyId != null and orderQueryVo.companyId != ''">
-            left JOIN
-            ins_area_company iac on iac.orderno = io.orderno
-        </if>
+        left JOIN
+        ins_area_company iac on iac.orderno = io.orderno
         <where>
             <if test="orderQueryVo.orderNo != null and orderQueryVo.orderNo != ''">
                 and io.orderno = #{orderQueryVo.orderNo}
@@ -397,7 +396,37 @@
                 </otherwise>
             </choose>
         </where>
-        group by orderno
+        group by
+        orderno,
+        quoteno,
+        orderstatus,
+        company_id,
+        ins_company,
+        carinfo,
+        userid,
+        username,
+        deptid,
+        deptname,
+        ownerinfo,
+        applyinfo,
+        insureinfo,
+        agreeid,
+        productid,
+        product,
+        createtime,
+        frameno,
+        licenseno,
+        insuredname,
+        jqstartdate,
+        jqenddate,
+        systartdate,
+        syenddate,
+        risk,
+        king,
+        vehicle_and_vessel_tax,
+        operatorid,
+        is_external,
+        iac.signing_time
         order by io.createtime desc
     </select>
 
@@ -740,14 +769,16 @@
 
     <select id="queryPageHospitalityOrder" resultMap="BaseResultMap">
         select
-        io.*
+        io.*,
+        eic.namesimple as partnerCompaniesName
         from
          ins_orders io
-        <!--如果存在 公司查询则进行连表 -->
-        <if test="orderQueryVo.companyId != null and orderQueryVo.companyId != ''">
-            left JOIN
+        left JOIN
             ins_area_company iac on iac.orderno = io.orderno
-        </if>
+        LEFT JOIN
+             ptl_agreement pa on pa.id = iac.agreement_id
+        LEFT JOIN
+            esm_ins_company eic on eic.id = pa.partner_companies_id
         <where>
             <if test="orderQueryVo.orderNo != null and orderQueryVo.orderNo != ''">
                 and io.orderno = #{orderQueryVo.orderNo}
@@ -777,7 +808,36 @@
                 and io.userid = #{orderQueryVo.userId}
             </if>
         </where>
-        group by orderno
+        group by orderno,
+        quoteno,
+        orderstatus,
+        company_id,
+        ins_company,
+        carinfo,
+        userid,
+        username,
+        deptid,
+        deptname,
+        ownerinfo,
+        applyinfo,
+        insureinfo,
+        agreeid,
+        productid,
+        product,
+        createtime,
+        frameno,
+        licenseno,
+        insuredname,
+        jqstartdate,
+        jqenddate,
+        systartdate,
+        syenddate,
+        risk,
+        king,
+        vehicle_and_vessel_tax,
+        operatorid,
+        is_external,
+        eic.namesimple
         order by io.createtime desc
     </select>