shenjingwei пре 3 месеци
родитељ
комит
75b49108a3

+ 4 - 5
src/custom/restcontroller/saletool/orderclue/web/orderclue.java

@@ -301,12 +301,11 @@ public class orderclue extends Controller {
         //先转移操作
         content.put("sys_enterprise_hrid", getEnterpriseHr(userid).getLong("sys_enterprise_hrid"));
         content.put("sat_orderclueid", new Long[]{sat_orderclueid});
-        changeClue();
 
-        String contentTxt = content.getString("content");
-        String followupmode = content.getStringValue("followupmode");
-        String logtype = content.getString("logtype");
-        String competitor = content.getString("competitor");
+        String followupmode = content.getStringValue("followupmode");//跟进方式
+        String competitor = content.getStringValue("competitor");//竟品
+        String contentTxt = content.getStringValue("content");//跟进内容
+        String logtype = content.getString("logtype");//记录类型
 
         long sat_orderclue_authid = 0L;
         Rows authRows = dbConnect.runSqlQuery(" SELECT sat_orderclue_authid FROM sat_orderclue_auth WHERE isused=1 AND  sat_orderclueid = " + sat_orderclueid);

+ 3 - 4
src/custom/restcontroller/webmanage/saletool/orderclue/publicclue/PublicClue.java

@@ -28,7 +28,7 @@ public class PublicClue extends Controller {
                 "sat_orderclueid", "name", "phonenumber", "province", "city",
                 "county", "address", "notes", "cluesource",
                 "status", "cluetype", "createdate", "changedate").setTableAlias("t1");
-        querySQL.addJoinTable(JOINTYPE.right, "sat_orderclue_auth", "t2", "t1.sat_orderclueid=t2.sat_orderclueid and t2.isused=1");
+        querySQL.addJoinTable(JOINTYPE.left, "sat_orderclue_auth", "t2", "t1.sat_orderclueid=t2.sat_orderclueid and t2.isused=1 ");
         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");
         querySQL.addQueryFields("leadername", "ifnull(t4.name, '')");
@@ -71,12 +71,11 @@ 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.addJoinTable(JOINTYPE.right, "sat_orderclue_auth", "t2", "t1.sat_orderclueid=t2.sat_orderclueid and t2.isused=1");
+        querySQL.addJoinTable(JOINTYPE.left, "sat_orderclue_auth", "t2", "t1.sat_orderclueid=t2.sat_orderclueid and t2.isused=1 ");
         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");
         querySQL.addQueryFields("leadername", "ifnull(t4.name, '')");
@@ -172,7 +171,7 @@ public class PublicClue extends Controller {
         }
         SQLDump sqlDump = new SQLDump();
         sqlDump.add("UPDATE sat_orderclue SET status='待分配' WHERE sat_orderclueid = '" + sat_orderclueid + "'");
-        sqlDump.add("UPDATE sat_orderclue_auth SET isused=0 WHERE sat_orderclueid = '" + sat_orderclueid + "' AND isused=1");
+        sqlDump.add("delete from sat_orderclue_auth WHERE sat_orderclueid = '" + sat_orderclueid + "'");
         sqlDump.commit(this);
         return getSucReturnObject().toString();
     }