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

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

@@ -22,7 +22,7 @@ public class OrderQueryVo {
 
 
     @ApiModelProperty(value = "订单号")
-    private String orderNo;
+    private String subOrderId;
 
 
 

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

@@ -144,10 +144,11 @@ public class InsAreaCompanyServiceImpl extends ServiceImpl<InsAreaCompanyMapper,
 
     @Override
     public Page<InsOrders> getAuditOrders(Page page, OrderQueryVo orderQueryVo) {
-        if(orderQueryVo.getStartDate() != null && orderQueryVo.getEndDate() != null){
-            orderQueryVo.setStartDateStr(orderQueryVo.getStartDate().toString());
-            orderQueryVo.setEndDateStr(orderQueryVo.getEndDate().toString());
+        if(orderQueryVo.getQuoteStartDateStr() != null && orderQueryVo.getQuoteEndDateStr() != null){
+            orderQueryVo.setQuoteStartDateStr(orderQueryVo.getQuoteStartDateStr().toString() + " 00:00:00");
+            orderQueryVo.setQuoteEndDateStr(orderQueryVo.getQuoteEndDateStr().toString() + " 23:59:59");
         }
+
         Page<InsOrders> pendingAuditOrders = baseMapper.getAuditOrders(page, orderQueryVo);
         pendingAuditOrders.getRecords().forEach(item->{
             if(item.getAuditStatus() == null){

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

@@ -160,8 +160,8 @@
         <if test="params.taskNo != null and params.taskNo != ''">
             AND io.orderno = #{params.taskNo}
         </if>
-        <if test="params.orderNo != null and params.orderNo != ''">
-            AND iac.id = #{params.orderNo}
+        <if test="params.subOrderId != null and params.subOrderId != ''">
+            AND iac.id = #{params.subOrderId}
         </if>
         <if test="params.licenseNo != null and params.licenseNo != ''">
             AND io.licenseno = #{params.licenseNo}
@@ -187,9 +187,6 @@
         <if test="params.attachStartDateStr != null and params.attachStartDateStr != ''">
             AND iac.signing_time BETWEEN #{params.attachStartDateStr} and #{params.attachEndDateStr}
         </if>
-        <if test="params.startDateStr != null and params.startDateStr != ''">
-            AND createtime BETWEEN #{params.startDateStr} and #{params.endDateStr}
-        </if>
         <if test="params.provinceId != null and params.provinceId != ''">
             and io.deptid like "${params.provinceId}%"
         </if>