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

src/main/java/com/ydtech/modules/fnc/service/impl/InsFeeAuditServiceImpl.java

@@ -126,6 +126,8 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
         InsOrders order = insOrdersMapper.selectById(orderNo);
         InsAreaCompany insAreaCompany = insAreaCompanyMapper.selectById(insFeeAudit.getInsOrderNo());
 
+
+
         //获取该订单的费用
         InsFeeOrderNew insFeeOrderNew = insFeeOrderNewService.getOne(new LambdaQueryWrapper<InsFeeOrderNew>()
                 .eq(InsFeeOrderNew::getInsOrderNo, insFeeAudit.getInsOrderNo()));
@@ -740,7 +742,9 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
     public InsFeeAudit saveInsFeeAuditAndHistory(String orderNo, String insOrderNo, boolean isAutoAudit, String auditstatus) {
         //查询费用审核表
         InsFeeAudit insFeeAudit = getOne(new LambdaQueryWrapper<InsFeeAudit>().eq(InsFeeAudit::getOrderno, orderNo));
-
+        if(insFeeAudit != null && insFeeAudit.getAuditstatus().equals("1")){
+            throw new SystemException("该订单费用已审核,请刷新页面");
+        }
         String userId;
         // 填充审核人
         if (isAutoAudit) {

src/main/java/com/ydtech/modules/order/entity/InsOrders.java

@@ -257,6 +257,14 @@ public class InsOrders implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime payDate;   //支付时间
 
+    @TableField(exist = false)
+    private String jqpremium;
+    @TableField(exist = false)
+    private String sypremium;
+    @TableField(exist = false)
+    private String jypremium;
+    @TableField(exist = false)
+    private String taxamount;
 
     public InsOrders(SysUser user, SysDept dept, BaseQuoteInfoVo quoteInfoVo) {
         // 2. 组装订单

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

@@ -107,8 +107,10 @@ public class OrderQueryVo {
     private String auditId;
 
     @ApiModelProperty(value = "投保险种")
-    private String productId;
+    private String productid;
 
+    @ApiModelProperty(value = "险种")
+    private String product;
 
 
     @ApiModelProperty(value = "投保人姓名")

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

@@ -34,6 +34,10 @@
         <result property="jqenddate" column="jqenddate" jdbcType="VARCHAR"/>
         <result property="systartdate" column="systartdate" jdbcType="VARCHAR"/>
         <result property="syenddate" column="syenddate" jdbcType="VARCHAR"/>
+        <result property="jqpremium" column="jqpremium" jdbcType="VARCHAR"/>
+        <result property="sypremium" column="sypremium" jdbcType="VARCHAR"/>
+        <result property="jypremium" column="jypremium" jdbcType="VARCHAR"/>
+        <result property="taxamount" column="taxamount" jdbcType="VARCHAR"/>
         <result property="risk" column="risk" javaType="com.alibaba.fastjson.JSONArray"
                 typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler" jdbcType="VARCHAR"/>
         <result property="king" column="king" javaType="com.alibaba.fastjson.JSONArray"
@@ -330,10 +334,8 @@
         from
             ins_orders io
         <!--如果存在 公司查询则进行连表 -->
-        <if test="orderQueryVo.companyId != null and orderQueryVo.companyId != ''">
             left JOIN
             ins_area_company iac on iac.orderno = io.orderno
-        </if>
         <where>
             <if test="orderQueryVo.orderNo != null and orderQueryVo.orderNo != ''">
                 and io.orderno = #{orderQueryVo.orderNo}
@@ -359,6 +361,13 @@
             <if test="orderQueryVo.companyId != null and orderQueryVo.companyId != ''">
                 and iac.company_id = #{orderQueryVo.companyId}
             </if>
+            <if test="orderQueryVo.product != null and orderQueryVo.product != ''">
+                and io.product = #{orderQueryVo.product}
+            </if>
+            <if test="orderQueryVo.productid != null and orderQueryVo.productid != ''">
+                and io.productid = #{orderQueryVo.productid}
+            </if>
+
              <!--
             <if test="orderQueryVo.userId != null and orderQueryVo.userId != '' and isCdy">
                 and io.operatorid = #{orderQueryVo.userId}
@@ -823,6 +832,10 @@
         iac.jq_end_date as jqenddate,
         iac.sy_start_date as systartdate,
         iac.sy_end_date as syenddate,
+        iac.jqpremium as jqpremium,
+        iac.sypremium as sypremium,
+        iac.jypremium as jypremium,
+        iac.taxamount as taxamount,
         io.risk as risk,
         io.king as king,
         io.vehicle_and_vessel_tax as vehicleAndVesselTax,