费用审核订单 bug调整

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

@@ -62,6 +62,9 @@ public class OrderQueryVo {
     @Min(value = 1, message = "页数最小为1")
     private int pageNum;
 
+    private String startDateStr;
+    private String endDateStr;
+
 
     public LocalDate getEndDatePlusOneDay() {
         if(ObjectUtils.isEmpty(endDate)){
@@ -76,4 +79,5 @@ public class OrderQueryVo {
         pageRequest.setPageSize(pageSize);
         return pageRequest;
     }
+
 }

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

@@ -104,11 +104,19 @@ public class InsAreaCompanyServiceImpl extends ServiceImpl<InsAreaCompanyMapper,
 
     @Override
     public Page<InsOrders> getPendingAuditOrders(Page page, OrderQueryVo orderQueryVo) {
+        if(orderQueryVo.getStartDate() != null && orderQueryVo.getEndDate() != null){
+            orderQueryVo.setStartDateStr(orderQueryVo.getStartDate().toString());
+            orderQueryVo.setEndDateStr(orderQueryVo.getEndDate().toString());
+        }
         return baseMapper.getPendingAuditOrders(page,orderQueryVo);
     }
 
     @Override
     public Page<InsOrders> getAlreadyAuditOrders(Page page, OrderQueryVo orderQueryVo) {
+        if(orderQueryVo.getStartDate() != null && orderQueryVo.getEndDate() != null){
+            orderQueryVo.setStartDateStr(orderQueryVo.getStartDate().toString());
+            orderQueryVo.setEndDateStr(orderQueryVo.getEndDate().toString());
+        }
         return baseMapper.getAlreadyAuditOrders(page,orderQueryVo);
     }
 

src/main/java/com/ydtech/modules/protocol/entity/po/PtlAgreement.java

@@ -199,7 +199,7 @@ public class PtlAgreement implements Serializable {
     /**
      * 审核类型
      */
-    @TableField(value = "audit_type1")
+    @TableField(value = "audit_type")
     private Integer auditType;
 
     @TableField(exist = false)

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

@@ -161,8 +161,8 @@
         <if test="params.insuredname != null and params.insuredname != ''">
             AND insuredname = #{params.insuredname}
         </if>
-        <if test="params.startDate != null and params.startDate != ''">
-            AND createtime BETWEEN ${params.startDate.toString()} and ${params.endDate.toString()}
+        <if test="params.startDateStr != null and params.startDateStr != ''">
+            AND createtime BETWEEN ${params.startDateStr} and ${params.endDateStr}
         </if>
     </select>