Просмотр исходного кода

联系人修改时,是否默认更新逻辑修复

shenjingwei 1 месяц назад
Родитель
Сommit
fa934f4329
1 измененных файлов с 8 добавлено и 18 удалено
  1. 8 18
      src/custom/restcontroller/webmanage/sale/agents/agents.java

+ 8 - 18
src/custom/restcontroller/webmanage/sale/agents/agents.java

@@ -4,7 +4,6 @@ import beans.accountbalance.Accountbalance;
 import beans.data.BatchDeleteErr;
 import beans.datacontrllog.DataContrlLog;
 import beans.dataextend.DataExtend;
-import beans.datatag.DataTag;
 import beans.salearea.SaleArea;
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
@@ -72,11 +71,9 @@ public class agents extends Controller {
 //        sqlFactory.addParameter_SQL("where", where);
 //        sqlFactory.addParameter("siteid", siteid);
 //        Rows rows = dbConnect.runSqlQuery(sqlFactory.getSQL());
-        QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_agents", "sys_enterpriseid", "isservice",
-                "sa_agentsid", "agentnum", "priceadjustment", "type", "signdate", "createby", "createdate", "islimitaccessories", "islimitorder", "signingstate", "delivery", "salearea", "paymans", "regiontype", "u8subject", "recommendedservice", "servicetype");
+        QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_agents", "sys_enterpriseid", "isservice", "sa_agentsid", "agentnum", "priceadjustment", "type", "signdate", "createby", "createdate", "islimitaccessories", "islimitorder", "signingstate", "delivery", "salearea", "paymans", "regiontype", "u8subject", "recommendedservice", "servicetype");
         querySQL.setTableAlias("t1");
-        querySQL.addJoinTable(JOINTYPE.inner, "sys_enterprise", "t2", "t1.siteid = t2.siteid and t1.sys_enterpriseid = t2.sys_enterpriseid", "enterprisename", "abbreviation"
-                , "contact", "address", "phonenumber", "province", "city", "county", "grade", "saleclassauth");
+        querySQL.addJoinTable(JOINTYPE.inner, "sys_enterprise", "t2", "t1.siteid = t2.siteid and t1.sys_enterpriseid = t2.sys_enterpriseid", "enterprisename", "abbreviation", "contact", "address", "phonenumber", "province", "city", "county", "grade", "saleclassauth");
         querySQL.addQueryFields("status", "case when t1.status='1' then '审核' else '新建' end");
         querySQL.setSiteid(siteid);
         querySQL.setWhere(where.toString());
@@ -175,18 +172,14 @@ public class agents extends Controller {
                 if (row.getString("sourceobject").equals("sa_warrantycard")) {
                     if (warrantycardrowsMap.containsKey(row.getString("sourceid"))) {
                         if (!warrantycardrowsMap.get(row.getString("sourceid")).get(0).getString("toagentnum").equals(agentsRows.get(0).getString("toagentnum"))) {
-                            throw new YosException("保修卡的授权经销商已变为"
-                                    + warrantycardrowsMap.get(row.getString("sourceid")).get(0).getString("toagentnum")
-                                    + "不可取消授权");
+                            throw new YosException("保修卡的授权经销商已变为" + warrantycardrowsMap.get(row.getString("sourceid")).get(0).getString("toagentnum") + "不可取消授权");
                         }
                     }
                 }
                 if (row.getString("sourceobject").equals("sa_customers")) {
                     if (customersrowsMap.containsKey(row.getString("sourceid"))) {
                         if (!customersrowsMap.get(row.getString("sourceid")).get(0).getString("toagentnum").equals(agentsRows.get(0).getString("toagentnum"))) {
-                            throw new YosException("客户档案的授权经销商已变为"
-                                    + customersrowsMap.get(row.getString("sourceid")).get(0).getString("toagentnum")
-                                    + "不可取消授权");
+                            throw new YosException("客户档案的授权经销商已变为" + customersrowsMap.get(row.getString("sourceid")).get(0).getString("toagentnum") + "不可取消授权");
                         }
                     }
                 }
@@ -447,8 +440,7 @@ public class agents extends Controller {
 
 
     @API(title = "经销商状态变更", apiversion = R.ID20230212101703.v1.class)
-    @CACHEING_CLEAN(cms = {@cm(clazz = agents.class, method = {"query_agentList", "query_agentMain"}),
-            @cm(clazz = EnterpriseSaleClass.class, method = {"queryList"})}, apiversions = {R.ID20221011144903.class, R.ID20221012164402.class})
+    @CACHEING_CLEAN(cms = {@cm(clazz = agents.class, method = {"query_agentList", "query_agentMain"}), @cm(clazz = EnterpriseSaleClass.class, method = {"queryList"})}, apiversions = {R.ID20221011144903.class, R.ID20221012164402.class})
     public String changeStatus() throws YosException {
         String status = content.getString("status");
         ArrayList<String> sqllist = new ArrayList<>();
@@ -670,7 +662,7 @@ public class agents extends Controller {
             if (workaddress == 1) {
                 sqlFactory.addParameter("isdefault", isdefault);
                 if (isdefault) {
-                    sqllist.add("update sys_enterprise_contacts set isdefault=0 where contactsid !=" + contactsid + " and sys_enterpriseid=" + sys_enterpriseid);
+                    sqllist.add("update sys_enterprise_contacts set isdefault=0 where contactsid !=" + contactsid + " and sys_enterpriseid=" + sys_enterpriseid + " and type='" + type + "'");
                 }
             } else {
                 sqlFactory.addParameter("isdefault", 0);
@@ -710,8 +702,7 @@ public class agents extends Controller {
 //        sqlFactory.addParameter("sys_enterpriseid", sys_enterpriseid);
 //        sqlFactory.addParameter("siteid", siteid);
 //        Rows rows = dbConnect.runSqlQuery(sqlFactory.getSQL());
-        QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sys_enterprise_contacts", "contactsid", "sys_enterpriseid",
-                "name", "sex", "depname", "position", "isleader", "birthday", "phonenumber", "email", "province", "city", "county", "remarks", "address", "workaddress", "isdefault", "type", "cardno");
+        QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sys_enterprise_contacts", "contactsid", "sys_enterpriseid", "name", "sex", "depname", "position", "isleader", "birthday", "phonenumber", "email", "province", "city", "county", "remarks", "address", "workaddress", "isdefault", "type", "cardno");
         querySQL.setTableAlias("t1");
         querySQL.setSiteid(siteid);
         querySQL.setWhere("ifnull(t1.deleted,0)=0");
@@ -1108,8 +1099,7 @@ public class agents extends Controller {
         return getSucReturnObject().toString();
     }
 
-    public XSSFSheet addSheet(ExcelFactory excelFactory, String sheetname, Rows datarows,
-                              HashMap<String, String> titlemap) {
+    public XSSFSheet addSheet(ExcelFactory excelFactory, String sheetname, Rows datarows, HashMap<String, String> titlemap) {
         ArrayList<String> keylist = datarows.getFieldList();
         XSSFSheet sheet = excelFactory.getXssfWorkbook().createSheet(sheetname);
         XSSFWorkbook xssfFWorkbook = excelFactory.getXssfWorkbook();