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

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

@@ -217,6 +217,12 @@ public class InsOrders implements Serializable {
     @TableField(value = "is_external")
     private Integer isExternal;
 
+    /**
+     * 承保时间
+     */
+    @TableField(value = "insure_time")
+    private LocalDateTime insureTime;
+
     @TableField(exist = false)
     private List<InsAreaCompany> insAreaCompanyList; //子级集合
 

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

@@ -515,13 +515,17 @@ public class InsAreaCompanyServiceImpl extends ServiceImpl<InsAreaCompanyMapper,
         }else{
             //设置为已承保状态
             insOrders.setOrderstatus(InsOrderStatusEnum.ACCEPT_INSURANCE.getCode());
+            insOrders.setInsureTime(quoteVo.getSignDate());
         }
+
         PtlAgreement byAgreementIdNew = ptlAgreementService.getByAgreementIdNew(quoteVo.getAgreementId());
         quoteVo = checkQuoteVo(quoteVo);
 
         //通过协议id 查询费用
         PtlAgreement ptlAgreement = ptlAgreementService.getById(quoteVo.getAgreementId());
 
+        insOrders.setInsCompany(ptlAgreement.getInsuranceCompany());
+        insOrdersService.updateById(insOrders);
         //查找协议的费用
         AgreementProductQueryVo agreementProductQueryVo = new AgreementProductQueryVo();
         List<String> productId = new ArrayList<>();
@@ -592,6 +596,7 @@ public class InsAreaCompanyServiceImpl extends ServiceImpl<InsAreaCompanyMapper,
         insAreaCompany.setOperatorTime(new Date());
 
         insAreaCompany.setSigningTime(quoteVo.getSignDate());
+        insAreaCompany.setPayDate(quoteVo.getSignDate());
         insAreaCompany.setCreatetime(LocalDateTime.now());
 
         //保存子订单
@@ -760,6 +765,7 @@ public class InsAreaCompanyServiceImpl extends ServiceImpl<InsAreaCompanyMapper,
         }else{
             //设置为已承保状态
             insOrders.setOrderstatus(InsOrderStatusEnum.ACCEPT_INSURANCE.getCode());
+            insOrders.setInsureTime(insOrdersEditingVo.getSignDate());
         }
         insOrdersService.updateById(insOrders);
         String subOrderNo = insOrdersEditingVo.getInsAreaCompanyList().get(0).getId();

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

@@ -223,6 +223,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         } else {
             insOrders.setCompanyId(insAreaCompany.getCompanyId());
             insOrders.setInsCompany(insAreaCompany.getInscompany());
+            insOrders.setInsureTime(insAreaCompany.getPayDate());
         }
 
         if (InsOrderStatusEnum.ACCEPT_INSURANCE.getCode().equals(insOrders.getOrderstatus())) {

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

@@ -266,13 +266,6 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
         return m;
     }
 
-    public static void main(String[] args) {
-        String message = "交易失败:当前日志所在服务器地址:[1]!交强险重复投保提示：重复投保提示：该车辆已经存在有效保单，保单号：114B7032620230066270保险起期是：2023-07-28 11:00:00保险止期是：2024-07-28 11:00:00产品名称：机动车交通事故强制险（2008款） 商业险重复投保提示：该车辆已经存在有效保单，保单号：114B7036420230062667保险起期是：2023-07-29 00:00:00保险止期是：2024-07-28 23:59:59产品名称：机动车综合商业保险（2020版）";
-        String endDate = GuorenDuplicateInsuranceComponent.getEndDate(message, JQ_REGEX);
-        System.out.println(endDate);
-    }
-
-
     /**
      * 递归获取报价请求结果
      *

src/main/resources/mapper/modules/admin/SysDeptMapper.xml

@@ -55,6 +55,9 @@
             sys_dept dept
         WHERE
             dept.del_flag = 0
+          <if test="level == 0">
+              AND dept.parent_id = #{parentId}
+          </if>
         <if test='level == "1"'>
             AND dept.province IN ( SELECT area_code FROM sys_area WHERE LEVEL = 1 )
             AND LENGTH(

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

@@ -339,13 +339,14 @@
 
     <select id="queryPageOrder" resultMap="BaseResultMap">
         select
-            io.*,
-            iac.signing_time
+            io.*
         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}
@@ -397,36 +398,7 @@
             </choose>
         </where>
         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
+        orderno
         order by io.createtime desc
     </select>