跟进记录筛选/排序无效

src/custom/restcontroller/crm/agent/stock/skudbapply.java

@@ -96,8 +96,7 @@ public class skudbapply extends Controller {
 
 
     @API(title = "企业序列号调拨申请_删除", apiversion = R.ID2026041315375201.v1.class, params = {
-            @Param(paramname = "sys_enterprise_sku_dbapplyid", fieldtype = FieldType.BigInt, remarks = "数据ID", isrequired = true)
-    })
+            @Param(paramname = "sys_enterprise_sku_dbapplyid", fieldtype = FieldType.BigInt, remarks = "数据ID", isrequired = true)})
     public String sys_enterprise_sku_dbapply_delete() throws YosException {
         long sys_enterprise_sku_dbapplyid = content.getLongValue("sys_enterprise_sku_dbapplyid");
         Row dbapplyRow = SQLFactory.getRow(this, "sys_enterprise_sku_dbapply", sys_enterprise_sku_dbapplyid);

src/custom/restcontroller/webmanage/saletool/orderclue/publicclue/PublicClue.java

@@ -25,10 +25,7 @@ public class PublicClue extends Controller {
 
     @API(title = "公海线索-线索列表", apiversion = R.ID20221101094402.v1.class)
     public String selectList() throws YosException, IOException {
-        QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sat_orderclue",
-                "sat_orderclueid", "name", "phonenumber", "province", "city",
-                "county", "address", "notes", "cluesource",
-                "status", "cluetype", "createdate", "changedate").setTableAlias("t1");
+        QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sat_orderclue", "sat_orderclueid", "name", "phonenumber", "province", "city", "county", "address", "notes", "cluesource", "status", "cluetype", "createdate", "changedate").setTableAlias("t1");
         querySQL.addJoinTable(JOINTYPE.left, "sat_orderclue_auth", "t2", "t1.sat_orderclueid=t2.sat_orderclueid ");
         querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t3", "t2.sys_enterpriseid=t3.sys_enterpriseid", "enterprisename");
         querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise_hr", "t4", "t2.hrid=t4.sys_enterprise_hrid");
@@ -72,10 +69,7 @@ public class PublicClue extends Controller {
     public String selectDetail() throws YosException {
         Long sat_orderclueid = content.getLong("sat_orderclueid");
 
-        QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sat_orderclue",
-                "sat_orderclueid", "name", "phonenumber", "province", "city",
-                "county", "address", "notes", "cluesource",
-                "status", "cluetype").setTableAlias("t1");
+        QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sat_orderclue", "sat_orderclueid", "name", "phonenumber", "province", "city", "county", "address", "notes", "cluesource", "status", "cluetype").setTableAlias("t1");
         querySQL.addJoinTable(JOINTYPE.left, "sat_orderclue_auth", "t2", "t1.sat_orderclueid=t2.sat_orderclueid");
         querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t3", "t2.sys_enterpriseid=t3.sys_enterpriseid", "enterprisename");
         querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise_hr", "t4", "t2.hrid=t4.sys_enterprise_hrid");
@@ -136,10 +130,19 @@ public class PublicClue extends Controller {
     @API(title = "公海线索-跟进列表", apiversion = R.ID2026020914480101.v1.class)
     public String getFollowList() throws YosException {
         Long sat_orderclueid = content.getLong("sat_orderclueid");
+        String start = content_where.getStringValue("start");
+        String end = content_where.getStringValue("end");
+        boolean isdesc = content_where.getBooleanValue("isdesc");
         QuerySQL ordercluefollowuplogQuery = SQLFactory.createQuerySQL(this, "sat_ordercluefollowuplog", "createby", "createdate", "content", "followupmode", "logtype", "competitor").setTableAlias("t1");
         ordercluefollowuplogQuery.addJoinTable(JOINTYPE.inner, "sat_orderclue_auth", "t2", "sat_orderclue_authid=:sat_orderclue_authid");
         ordercluefollowuplogQuery.setWhere("t2.sat_orderclueid", sat_orderclueid);
-        ordercluefollowuplogQuery.setOrderBy("t1.createdate");
+        if (!start.isBlank()) {
+            ordercluefollowuplogQuery.setWhere("createdate", Op.GTE, start);
+        }
+        if (!end.isBlank()) {
+            ordercluefollowuplogQuery.setWhere("createdate", Op.LTE, end);
+        }
+        ordercluefollowuplogQuery.setOrderBy("t1.createdate " + (isdesc ? "desc" : "asc"));
         Rows rows = ordercluefollowuplogQuery.query();
         return getSucReturnObject().setData(rows).toString();
     }