ifx

.idea/jpa-buddy.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JpaBuddyIdeaProjectConfig">
+    <option name="renamerInitialized" value="true" />
+  </component>
+</project>

src/main/java/com/hr/repository/domain/IpOrderPO.java

@@ -152,4 +152,5 @@ public class IpOrderPO {
     @Column(name = "order_status", length = 255)
     private String orderStatus;
 
+
 }

src/main/java/com/hr/service/impl/IpAccountServiceImpl.java

@@ -66,7 +66,12 @@ public class IpAccountServiceImpl implements IpAccountService {
             if (ipAccountParam.getAccNo() != null) {
                 predicates.add(cb.like(root.get("accNo"), "%" + ipAccountParam.getAccNo() + "%"));
             }
-            predicates.add(cb.notEqual(root.get("status"), "delete"));
+            if(ipAccountParam.getStatus() != null){
+                predicates.add(cb.equal(root.get("status"), ipAccountParam.getStatus()));
+            }else{
+                predicates.add(cb.notLike(root.get("status"), "delete"));
+            }
+
             return cb.and(predicates.toArray(new Predicate[0]));
         };
 

src/main/resources/mapper/IpLogMapper.xml

@@ -16,6 +16,6 @@
             log.add_time
         from ip_log log
         left join ip_order ord on ord.id = log.oid
-        where 1 =1 and ref_id = 0 and  log.id =:id and ord.acc_no = :accountNo and  ord.interface_name like '%'||:interfaceName||'%'
+        where 1 =1 and ref_id = 0 and  ord.id =:id and ord.acc_no = :accountNo and  ord.interface_name like '%'||:interfaceName||'%'
     </select>
 </mapper>