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

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

@@ -195,11 +195,11 @@ public class ContractOrderRepository {
                 "o.business_no=f.business_no and f.code=10 ";
 
         if (!TextUtils.isEmpty(req.getStartDate())) {
-            sql += "and o.issued_time>= ? ";
+            sql += "and o.create_time>= ? ";
             mList.add(req.getStartDate());
         }
         if (!TextUtils.isEmpty(req.getEndDate())) {
-            sql += "and o.issued_time <=? ";
+            sql += "and o.create_time <=? ";
             mList.add(req.getEndDate());
         }
         if (!TextUtils.isEmpty(req.getIdCard())) {
@@ -234,6 +234,14 @@ public class ContractOrderRepository {
             sql += "and o.prod_id =? ";
             mList.add(req.getProdId());
         }
+        if (!TextUtils.isEmpty(req.getIssuedStartDate())) {
+            sql += "and o.issued_time>= ? ";
+            mList.add(req.getIssuedStartDate());
+        }
+        if (!TextUtils.isEmpty(req.getIssuedEndDate())) {
+            sql += "and o.issued_time <=? ";
+            mList.add(req.getIssuedEndDate());
+        }
         sql += "ORDER BY o.issued_time desc";
         Object[] arr = mList.toArray();
         List<Map<String, String>> query = jdbcTemplate.query(sql, arr, new RowMapper<Map<String, String>>() {
@@ -283,13 +291,21 @@ public class ContractOrderRepository {
                 "from contract_order o,order_file f  where o.status=3 and " +
                 "o.business_no=f.business_no and f.code=10 ";
         if (!TextUtils.isEmpty(req.getStartDate())) {
-            sql += "and o.issued_time>= ? ";
+            sql += "and o.create_time>= ? ";
             mList.add(req.getStartDate());
         }
         if (!TextUtils.isEmpty(req.getEndDate())) {
-            sql += "and o.issued_time <=?";
+            sql += "and o.create_time <=?";
             mList.add(req.getEndDate());
         }
+        if (!TextUtils.isEmpty(req.getIssuedStartDate())) {
+            sql += "and o.issued_time>= ? ";
+            mList.add(req.getIssuedStartDate());
+        }
+        if (!TextUtils.isEmpty(req.getIssuedEndDate())) {
+            sql += "and o.issued_time <=?";
+            mList.add(req.getIssuedEndDate());
+        }
         if (!TextUtils.isEmpty(req.getIdCard())) {
             sql += "and o.id_card LIKE ? ";
             mList.add("%"+req.getIdCard()+"%");