订单根据签发时间查询 导出功能

eladmin-system/src/main/java/me/zhengjie/application/admin/service/impl/AdminOrderServiceImpl.java

@@ -166,8 +166,6 @@ public class AdminOrderServiceImpl implements AdminOrderService {
         // 清楚
         order.setStartDate("");
         order.setEndDate("");
-        order.setIssuedStartDate("");
-        order.setIssuedEndDate("");
         QueryWrapper<ContractOrderEntity> qw = QueryWrapperUtil.convertQuery(order, json);
         SysUserEntity user = userDao.selectById(contextUtil.getCurrentUserId());
         String maxRole = userDomain.getUserMaxRole();
@@ -183,6 +181,13 @@ public class AdminOrderServiceImpl implements AdminOrderService {
         } else {
             return null;
         }
+        if (org.apache.commons.lang3.StringUtils.isNotBlank(req.getIssuedStartDate())){
+            qw.ge("issued_time",req.getIssuedStartDate());
+        }else if(org.apache.commons.lang3.StringUtils.isNotBlank(req.getIssuedEndDate())){
+            qw.le("issued_time",req.getIssuedEndDate());
+        }else {
+            return null;
+        }
 
         return qw;
     }

eladmin-system/src/main/java/me/zhengjie/dao/mybatis/entity/ContractOrderEntity.java

@@ -185,13 +185,6 @@ public class ContractOrderEntity implements Serializable {
     @TableField("contract_term")
     private String contractTerm;
 
-    @TableField("issued_start_date")
-    private String issuedStartDate;
-
-    @TableField("issued_end_date")
-    private String issuedEndDate;
-
-    @QueryWapper(value = {QueryKeyword.RANGE,QueryKeyword.DESC},attribute = {"issuedStartDate","issuedEndDate"})
     @TableField(value = "issued_time", fill = FieldFill.UPDATE)
     private Date issuedTime;