Просмотр исходного кода

提交待审核订单的报价时间和起保时间的检索bug修复

hxl13994548489 2 лет назад
Родитель
Сommit
5046ff5332

+ 2 - 1
src/main/java/com/ydtech/modules/order/service/impl/InsAreaCompanyServiceImpl.java

@@ -144,6 +144,7 @@ public class InsAreaCompanyServiceImpl extends ServiceImpl<InsAreaCompanyMapper,
 
     @Override
     public Page<InsOrders> getAuditOrders(Page page, OrderQueryVo orderQueryVo) {
+        /**
         if(orderQueryVo.getQuoteStartDateStr() != null && orderQueryVo.getQuoteEndDateStr() != null){
             orderQueryVo.setQuoteStartDateStr(orderQueryVo.getQuoteStartDateStr().toString() + " 00:00:00");
             orderQueryVo.setQuoteEndDateStr(orderQueryVo.getQuoteEndDateStr().toString() + " 23:59:59");
@@ -153,7 +154,7 @@ public class InsAreaCompanyServiceImpl extends ServiceImpl<InsAreaCompanyMapper,
             orderQueryVo.setAttachStartDateStr(orderQueryVo.getAttachStartDateStr().toString() + " 00:00:00");
             orderQueryVo.setAttachEndDateStr(orderQueryVo.getAttachEndDateStr().toString() + " 23:59:59");
         }
-
+        **/
         Page<InsOrders> pendingAuditOrders = baseMapper.getAuditOrders(page, orderQueryVo);
         pendingAuditOrders.getRecords().forEach(item->{
             if(item.getAuditStatus() == null){

+ 7 - 2
src/main/resources/mapper/modules/order/InsAreaCompanyMapper.xml

@@ -182,10 +182,15 @@
             and io.product = #{params.riskCode}
         </if>
         <if test="params.quoteStartDateStr != null and params.quoteStartDateStr != ''">
-            AND iac.createtime BETWEEN #{params.quoteStartDateStr} 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 != ''">
-            AND iac.signing_time BETWEEN #{params.attachStartDateStr} and #{params.attachEndDateStr}
+            and  ((
+            DATE_FORMAT(io.jqstartdate, '%Y-%m-%d') BETWEEN #{params.attachStartDateStr}
+            AND #{params.attachEndDateStr}
+            )
+            OR ( DATE_FORMAT(io.systartdate, '%Y-%m-%d')  BETWEEN #{params.attachStartDateStr} AND #{params.attachEndDateStr} )
+            )
         </if>
         <if test="params.provinceId != null and params.provinceId != ''">
             and io.deptid like "${params.provinceId}%"