费用审核待审核页面添加签单时间和支付之间检索，列表添加签单时间、支付时间、协议、审核人，详情添加合作公司、签单时间和支付时间

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

@@ -243,6 +243,17 @@ public class InsOrders implements Serializable {
     @TableField(exist = false)
     private String partnerCompaniesName;   //合作公司简称
 
+    @TableField(exist = false)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime signingTime;   //签单时间
+
+
+    @TableField(exist = false)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime payDate;   //支付时间
+
+
+
     public InsOrders(SysUser user, SysDept dept, BaseQuoteInfoVo quoteInfoVo) {
         // 2. 组装订单
         this.setQuoteno(String.valueOf(quoteInfoVo.getQuoteno()));

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

@@ -127,6 +127,16 @@ public class OrderQueryVo {
     @ApiModelProperty(value = "机构来源")
     private String managementSource;
 
+    @ApiModelProperty(value = "签单开始时间")
+    private String signStartDateStr;
+    @ApiModelProperty(value = "签单结束时间")
+    private String signEndDateStr;
+
+    @ApiModelProperty(value = "支付开始时间")
+    private String payStartDateStr;
+    @ApiModelProperty(value = "支付结束时间")
+    private String payEndDateStr;
+
 
     public LocalDate getEndDatePlusOneDay() {
         if(ObjectUtils.isEmpty(endDate)){

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

@@ -422,4 +422,17 @@ public class OrderVo implements Serializable {
      * 出单人性别
      */
     public String sex;
+
+    @TableField(exist = false)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime signingTime;   //签单时间
+
+
+    @TableField(exist = false)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime payDate;   //支付时间
+
+
+    @TableField(exist = false)
+    private String partnerCompaniesName;   //合作公司简称
 }

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

@@ -138,14 +138,18 @@
         ifa.audittime as auditTime,
         ifa.auditstatus as auditStatus,
         eic.namesimple as partnerCompaniesName,
-        iac.id as  subOrderId
+        iac.id as  subOrderId,
+        iac.signing_time as signingTime,
+        iac.pay_date  as payDate,
+        pa.agreement_code as agreementCode,
+        pa.agreement_name as agreementName
         FROM
         ins_orders io
-        LEFT JOIN ins_fee_audit ifa ON ifa.orderno = io.orderno
+        LEFT JOIN ins_area_company iac ON iac.orderno = io.orderno and iac.orderstatus = 3
+        LEFT JOIN ins_fee_audit ifa ON ifa.ins_order_no = iac.id
         LEFT JOIN sys_user su ON su.id = io.userid
         LEFT JOIN sys_dept sd ON sd.id = su.dept_id
         LEFT JOIN sys_user su2 ON ifa.audituser = su2.id
-        LEFT JOIN ins_area_company iac ON iac.orderno = io.orderno and iac.orderstatus = 3
         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
@@ -181,10 +185,10 @@
         <if test="params.riskCode != null and params.riskCode != ''">
             and io.product = #{params.riskCode}
         </if>
-        <if test="params.quoteStartDateStr != null and params.quoteStartDateStr != ''">
+        <if test="params.quoteStartDateStr != null and params.quoteStartDateStr != '' and params.quoteEndDateStr != null and params.quoteEndDateStr != ''">
             and  DATE_FORMAT(io.createtime, '%Y-%m-%d') between #{params.quoteStartDateStr} AND #{params.quoteEndDateStr}
         </if>
-        <if test="params.attachStartDateStr != null and params.attachStartDateStr != ''">
+        <if test="params.attachStartDateStr != null and params.attachStartDateStr != '' and params.attachStartDateStr != null and params.attachStartDateStr != '' ">
             and  ((
             DATE_FORMAT(io.jqstartdate, '%Y-%m-%d') BETWEEN #{params.attachStartDateStr}
             AND #{params.attachEndDateStr}
@@ -219,8 +223,12 @@
         <if test="params.managementSource != null and params.managementSource != ''">
             and sd.management_source = #{params.managementSource}
         </if>
-
-
+        <if test="params.signStartDateStr != null and params.signStartDateStr != '' and params.signEndDateStr != null and params.signEndDateStr != ''">
+            and  DATE_FORMAT(io.createtime, '%Y-%m-%d') between #{params.signStartDateStr} AND #{params.signEndDateStr}
+        </if>
+        <if test="params.payStartDateStr != null and params.payStartDateStr != '' and params.payEndDateStr != null and params.payEndDateStr != ''">
+            and  DATE_FORMAT(io.createtime, '%Y-%m-%d') between #{params.payStartDateStr} AND #{params.payEndDateStr}
+        </if>
     </select>
 
     <select id="getByUserId" resultType="com.ydtech.modules.order.entity.InsOrders">

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

@@ -115,6 +115,10 @@
         <result property="crossInsurance" column="cross_insurance" javaType="com.alibaba.fastjson.JSONArray"
                 typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler" jdbcType="VARCHAR"/>
         <result property="ubiPredictedInfoScore" column="ubi_predicted_info_score" jdbcType="VARCHAR"/>
+        <result property="signingTime" column="signingTime" jdbcType="TIMESTAMP"/>
+        <result property="payDate" column="payDate" jdbcType="TIMESTAMP"/>
+        <result property="partnerCompaniesName" column="partnerCompaniesName" jdbcType="VARCHAR"/>
+
     </resultMap>
 
 
@@ -221,9 +225,14 @@
                iac.accident_info,
                iac.tax_arrears,
                iac.cross_insurance,
-               iac.ubi_predicted_info_score
+               iac.ubi_predicted_info_score,
+               iac.signing_time as signingTime,
+               iac.pay_date  as payDate,
+               eic.namesimple as partnerCompaniesName
         from ins_orders as o
                  join ins_area_company iac on o.orderno = iac.orderno
+                 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 iac.id = #{companyId}
     </select>