diff --git a/build/classes/com/hangxin/web/TickingAction.class b/build/classes/com/hangxin/web/TickingAction.class index 4e46db4..3360b8f 100644 Binary files a/build/classes/com/hangxin/web/TickingAction.class and b/build/classes/com/hangxin/web/TickingAction.class differ diff --git a/build/classes/db/telaccount_sql.xml b/build/classes/db/telaccount_sql.xml index eae30c4..c70583f 100644 --- a/build/classes/db/telaccount_sql.xml +++ b/build/classes/db/telaccount_sql.xml @@ -6,7 +6,7 @@ SELECT y.USER_ID as id, z.CNAME , - y.AGENT_ID as account + y.AGENT_ID as account,y.mobile1,y.mobile2 FROM RUSH_USER_AGENT y LEFT JOIN AOS_RMS_USER z ON y.USER_ID = z.CGUID @@ -52,13 +52,18 @@ FROM + + +
+ + @@ -61,6 +63,8 @@ var one = {}; one['accountname']=aos.get('accountname').getValue(); one['account']=aos.get('account').getValue(); + one['mobile1']=aos.get('mobile1').getValue(); + one['mobile2']=aos.get('mobile2').getValue(); aos.post({ url:"rush/telaccount/save", data:one, diff --git a/build/classes/html/rush/rushtasklistdetail.html b/build/classes/html/rush/rushtasklistdetail.html index 8854390..0fd3475 100644 --- a/build/classes/html/rush/rushtasklistdetail.html +++ b/build/classes/html/rush/rushtasklistdetail.html @@ -390,50 +390,69 @@ aos.alert('选中的联系人没有联系电话请更改，谢谢~'); return; } - var calldata = aos.getForm().getData(); - calldata['customer_id']=aos.get('customer_id').getValue(); - calldata['end_date']=aos.get('end_date').getValue(); - mb+=mobile+','; - + var one = {}; + one['mobile']=mobile; aos.post({ - url:"rush/search/isCall", - data:calldata, + url:"rush/telaccount/check", + data:one, success:function(rtnData){ - // 2018.1.31 暂时去掉正在联系的判断 - if(rtnData.called=="A"){ - aos.alert('客户正在联系中'); - return; - }else{ - aos.get("is_call").setValue("Y"); - aos.get("customername").setValue(data.contact); - parent.document.getElementById('info').value="联系"+data.contact+"("+mobile+");"+"客户名称："+aos.get("cust_name").getValue()+";"+"到期时间："+aos.get("end_date").getValue(); - parent.document.getElementById('end_date').value=aos.get("end_date").getValue(); - parent.document.getElementById('customer_id').value=aos.get('customer_id').getValue(); - if(parent.document.getElementById('CallJS').value==1){ - if(mobile.substr(0,1)=='0'){ - - }else{ - if((/^1(3|4|5|7|8)\d{9}$/.test(mobile))){ - mobile = areacode+mobile; - }else{ - if(null==areacode||areacode==""){ - mobile = zz+mobile; - } - } - } - if(parent.document.getElementById("newnewbarInit").value==1){ - window.parent.phoneBar.agentApi.makeCall(data.mobile,-1,3); - }else{ - window.parent.application.oJVccBar.MakeCall(mobile); - } - }else{ - aos.alert('请在主页面初始化电话条！'); - return ; - } - - } + if(rtnData=="1"){ + aos.alert('所选电话不是本人测试电话电话，不允许拨打！'); + return; } - }); + else{ + var calldata = aos.getForm().getData(); + calldata['customer_id']=aos.get('customer_id').getValue(); + calldata['end_date']=aos.get('end_date').getValue(); + mb+=mobile+','; + + aos.post({ + url:"rush/search/isCall", + data:calldata, + success:function(rtnData){ + // 2018.1.31 暂时去掉正在联系的判断 + if(rtnData.called=="A"){ + aos.alert('客户正在联系中'); + return; + }else{ + aos.get("is_call").setValue("Y"); + aos.get("customername").setValue(data.contact); + parent.document.getElementById('info').value="联系"+data.contact+"("+mobile+");"+"客户名称："+aos.get("cust_name").getValue()+";"+"到期时间："+aos.get("end_date").getValue(); + parent.document.getElementById('end_date').value=aos.get("end_date").getValue(); + parent.document.getElementById('customer_id').value=aos.get('customer_id').getValue(); + if(parent.document.getElementById('CallJS').value==1){ + if(mobile.substr(0,1)=='0'){ + + }else{ + if((/^1(3|4|5|7|8)\d{9}$/.test(mobile))){ + mobile = areacode+mobile; + }else{ + if(null==areacode||areacode==""){ + mobile = zz+mobile; + } + } + } + if(parent.document.getElementById("newnewbarInit").value==1){ + window.parent.phoneBar.agentApi.makeCall(data.mobile,-1,3); + }else{ + window.parent.application.oJVccBar.MakeCall(mobile); + } + }else{ + aos.alert('请在主页面初始化电话条！'); + return ; + } + + } + } + });} + + + + }}) + + + + } } diff --git a/build/classes/html/rush/telaccount.html b/build/classes/html/rush/telaccount.html index 74d221d..4c2a366 100644 --- a/build/classes/html/rush/telaccount.html +++ b/build/classes/html/rush/telaccount.html @@ -8,14 +8,17 @@ 查询 新增 + 修改 删除
-
-
>
+
+
>
-
+
+
+
@@ -64,8 +67,25 @@ }); } - - + + function update(){ + var data = grid.getSelected(); + if(!data){ + aos.alert('请选择一条数据。'); + return; + } + var param = {} + param['id'] = data.id; + param['account'] = data.account; + param['mobile1'] = data.mobile1; + param['mobile2'] = data.mobile2; + param['cname'] = data.cname; + param['pageState'] = 'editnew'; + aos.showWindow('canvas/rush/accountupdate', param, '300px', '300px', '鸿联账号修改', function(rtnValue){ + grid.reload(); + + }); + } diff --git a/build/classes/html/tick/shijidetail.html b/build/classes/html/tick/shijidetail.html index bf77a03..2fe491a 100644 --- a/build/classes/html/tick/shijidetail.html +++ b/build/classes/html/tick/shijidetail.html @@ -10,6 +10,7 @@
+
diff --git a/build/classes/rush/TaskAuthJob.class b/build/classes/rush/TaskAuthJob.class index bf0d598..6ace3e6 100644 Binary files a/build/classes/rush/TaskAuthJob.class and b/build/classes/rush/TaskAuthJob.class differ diff --git a/build/classes/rush/TelAccountAction.class b/build/classes/rush/TelAccountAction.class index 90575fd..a4d7c9b 100644 Binary files a/build/classes/rush/TelAccountAction.class and b/build/classes/rush/TelAccountAction.class differ diff --git a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/db/telaccount_sql.xml b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/db/telaccount_sql.xml index eae30c4..c70583f 100644 --- a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/db/telaccount_sql.xml +++ b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/db/telaccount_sql.xml @@ -6,7 +6,7 @@ SELECT y.USER_ID as id, z.CNAME , - y.AGENT_ID as account + y.AGENT_ID as account,y.mobile1,y.mobile2 FROM RUSH_USER_AGENT y LEFT JOIN AOS_RMS_USER z ON y.USER_ID = z.CGUID @@ -52,13 +52,18 @@ FROM + + +
+ + @@ -61,6 +63,8 @@ var one = {}; one['accountname']=aos.get('accountname').getValue(); one['account']=aos.get('account').getValue(); + one['mobile1']=aos.get('mobile1').getValue(); + one['mobile2']=aos.get('mobile2').getValue(); aos.post({ url:"rush/telaccount/save", data:one, diff --git a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/rush/rushtasklistdetail.html b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/rush/rushtasklistdetail.html index 8854390..0fd3475 100644 --- a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/rush/rushtasklistdetail.html +++ b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/rush/rushtasklistdetail.html @@ -390,50 +390,69 @@ aos.alert('选中的联系人没有联系电话请更改，谢谢~'); return; } - var calldata = aos.getForm().getData(); - calldata['customer_id']=aos.get('customer_id').getValue(); - calldata['end_date']=aos.get('end_date').getValue(); - mb+=mobile+','; - + var one = {}; + one['mobile']=mobile; aos.post({ - url:"rush/search/isCall", - data:calldata, + url:"rush/telaccount/check", + data:one, success:function(rtnData){ - // 2018.1.31 暂时去掉正在联系的判断 - if(rtnData.called=="A"){ - aos.alert('客户正在联系中'); - return; - }else{ - aos.get("is_call").setValue("Y"); - aos.get("customername").setValue(data.contact); - parent.document.getElementById('info').value="联系"+data.contact+"("+mobile+");"+"客户名称："+aos.get("cust_name").getValue()+";"+"到期时间："+aos.get("end_date").getValue(); - parent.document.getElementById('end_date').value=aos.get("end_date").getValue(); - parent.document.getElementById('customer_id').value=aos.get('customer_id').getValue(); - if(parent.document.getElementById('CallJS').value==1){ - if(mobile.substr(0,1)=='0'){ - - }else{ - if((/^1(3|4|5|7|8)\d{9}$/.test(mobile))){ - mobile = areacode+mobile; - }else{ - if(null==areacode||areacode==""){ - mobile = zz+mobile; - } - } - } - if(parent.document.getElementById("newnewbarInit").value==1){ - window.parent.phoneBar.agentApi.makeCall(data.mobile,-1,3); - }else{ - window.parent.application.oJVccBar.MakeCall(mobile); - } - }else{ - aos.alert('请在主页面初始化电话条！'); - return ; - } - - } + if(rtnData=="1"){ + aos.alert('所选电话不是本人测试电话电话，不允许拨打！'); + return; } - }); + else{ + var calldata = aos.getForm().getData(); + calldata['customer_id']=aos.get('customer_id').getValue(); + calldata['end_date']=aos.get('end_date').getValue(); + mb+=mobile+','; + + aos.post({ + url:"rush/search/isCall", + data:calldata, + success:function(rtnData){ + // 2018.1.31 暂时去掉正在联系的判断 + if(rtnData.called=="A"){ + aos.alert('客户正在联系中'); + return; + }else{ + aos.get("is_call").setValue("Y"); + aos.get("customername").setValue(data.contact); + parent.document.getElementById('info').value="联系"+data.contact+"("+mobile+");"+"客户名称："+aos.get("cust_name").getValue()+";"+"到期时间："+aos.get("end_date").getValue(); + parent.document.getElementById('end_date').value=aos.get("end_date").getValue(); + parent.document.getElementById('customer_id').value=aos.get('customer_id').getValue(); + if(parent.document.getElementById('CallJS').value==1){ + if(mobile.substr(0,1)=='0'){ + + }else{ + if((/^1(3|4|5|7|8)\d{9}$/.test(mobile))){ + mobile = areacode+mobile; + }else{ + if(null==areacode||areacode==""){ + mobile = zz+mobile; + } + } + } + if(parent.document.getElementById("newnewbarInit").value==1){ + window.parent.phoneBar.agentApi.makeCall(data.mobile,-1,3); + }else{ + window.parent.application.oJVccBar.MakeCall(mobile); + } + }else{ + aos.alert('请在主页面初始化电话条！'); + return ; + } + + } + } + });} + + + + }}) + + + + } } diff --git a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/rush/telaccount.html b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/rush/telaccount.html index 74d221d..4c2a366 100644 --- a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/rush/telaccount.html +++ b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/rush/telaccount.html @@ -8,14 +8,17 @@ 查询 新增 + 修改 删除
-
-
>
+
+
>
-
+
+
+
@@ -64,8 +67,25 @@ }); } - - + + function update(){ + var data = grid.getSelected(); + if(!data){ + aos.alert('请选择一条数据。'); + return; + } + var param = {} + param['id'] = data.id; + param['account'] = data.account; + param['mobile1'] = data.mobile1; + param['mobile2'] = data.mobile2; + param['cname'] = data.cname; + param['pageState'] = 'editnew'; + aos.showWindow('canvas/rush/accountupdate', param, '300px', '300px', '鸿联账号修改', function(rtnValue){ + grid.reload(); + + }); + } diff --git a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/shijidetail.html b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/shijidetail.html index bf77a03..2fe491a 100644 --- a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/shijidetail.html +++ b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/shijidetail.html @@ -10,6 +10,7 @@
+
diff --git a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/rush/TaskAuthJob.class b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/rush/TaskAuthJob.class index bf0d598..6ace3e6 100644 Binary files a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/rush/TaskAuthJob.class and b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/rush/TaskAuthJob.class differ diff --git a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/rush/TelAccountAction.class b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/rush/TelAccountAction.class index 90575fd..a4d7c9b 100644 Binary files a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/rush/TelAccountAction.class and b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/rush/TelAccountAction.class differ diff --git a/classes/artifacts/rushfee_Web_exploded/ptrun.ini b/classes/artifacts/rushfee_Web_exploded/ptrun.ini index 38ee9af..c46f4bc 100644 --- a/classes/artifacts/rushfee_Web_exploded/ptrun.ini +++ b/classes/artifacts/rushfee_Web_exploded/ptrun.ini @@ -1,3 +1,3 @@ #save ini -#Sun Oct 09 19:00:38 CST 2022 +#Sun Oct 30 20:11:05 CST 2022 deploystamp=1612237236000 diff --git a/resource/db/telaccount_sql.xml b/resource/db/telaccount_sql.xml index eae30c4..c70583f 100644 --- a/resource/db/telaccount_sql.xml +++ b/resource/db/telaccount_sql.xml @@ -6,7 +6,7 @@ SELECT y.USER_ID as id, z.CNAME , - y.AGENT_ID as account + y.AGENT_ID as account,y.mobile1,y.mobile2 FROM RUSH_USER_AGENT y LEFT JOIN AOS_RMS_USER z ON y.USER_ID = z.CGUID @@ -52,13 +52,18 @@ FROM + + +
+ + @@ -61,6 +63,8 @@ var one = {}; one['accountname']=aos.get('accountname').getValue(); one['account']=aos.get('account').getValue(); + one['mobile1']=aos.get('mobile1').getValue(); + one['mobile2']=aos.get('mobile2').getValue(); aos.post({ url:"rush/telaccount/save", data:one, diff --git a/resource/html/rush/accountupdate.html b/resource/html/rush/accountupdate.html new file mode 100644 index 0000000..38776b0 --- /dev/null +++ b/resource/html/rush/accountupdate.html @@ -0,0 +1,55 @@ + + + 反馈资料 + + +
+ + + 保存 + + 退出 +
+ + +
+ + + + + + + + + + + + \ No newline at end of file diff --git a/resource/html/rush/rushtasklistdetail.html b/resource/html/rush/rushtasklistdetail.html index 8854390..0fd3475 100644 --- a/resource/html/rush/rushtasklistdetail.html +++ b/resource/html/rush/rushtasklistdetail.html @@ -390,50 +390,69 @@ aos.alert('选中的联系人没有联系电话请更改，谢谢~'); return; } - var calldata = aos.getForm().getData(); - calldata['customer_id']=aos.get('customer_id').getValue(); - calldata['end_date']=aos.get('end_date').getValue(); - mb+=mobile+','; - + var one = {}; + one['mobile']=mobile; aos.post({ - url:"rush/search/isCall", - data:calldata, + url:"rush/telaccount/check", + data:one, success:function(rtnData){ - // 2018.1.31 暂时去掉正在联系的判断 - if(rtnData.called=="A"){ - aos.alert('客户正在联系中'); - return; - }else{ - aos.get("is_call").setValue("Y"); - aos.get("customername").setValue(data.contact); - parent.document.getElementById('info').value="联系"+data.contact+"("+mobile+");"+"客户名称："+aos.get("cust_name").getValue()+";"+"到期时间："+aos.get("end_date").getValue(); - parent.document.getElementById('end_date').value=aos.get("end_date").getValue(); - parent.document.getElementById('customer_id').value=aos.get('customer_id').getValue(); - if(parent.document.getElementById('CallJS').value==1){ - if(mobile.substr(0,1)=='0'){ - - }else{ - if((/^1(3|4|5|7|8)\d{9}$/.test(mobile))){ - mobile = areacode+mobile; - }else{ - if(null==areacode||areacode==""){ - mobile = zz+mobile; - } - } - } - if(parent.document.getElementById("newnewbarInit").value==1){ - window.parent.phoneBar.agentApi.makeCall(data.mobile,-1,3); - }else{ - window.parent.application.oJVccBar.MakeCall(mobile); - } - }else{ - aos.alert('请在主页面初始化电话条！'); - return ; - } - - } + if(rtnData=="1"){ + aos.alert('所选电话不是本人测试电话电话，不允许拨打！'); + return; } - }); + else{ + var calldata = aos.getForm().getData(); + calldata['customer_id']=aos.get('customer_id').getValue(); + calldata['end_date']=aos.get('end_date').getValue(); + mb+=mobile+','; + + aos.post({ + url:"rush/search/isCall", + data:calldata, + success:function(rtnData){ + // 2018.1.31 暂时去掉正在联系的判断 + if(rtnData.called=="A"){ + aos.alert('客户正在联系中'); + return; + }else{ + aos.get("is_call").setValue("Y"); + aos.get("customername").setValue(data.contact); + parent.document.getElementById('info').value="联系"+data.contact+"("+mobile+");"+"客户名称："+aos.get("cust_name").getValue()+";"+"到期时间："+aos.get("end_date").getValue(); + parent.document.getElementById('end_date').value=aos.get("end_date").getValue(); + parent.document.getElementById('customer_id').value=aos.get('customer_id').getValue(); + if(parent.document.getElementById('CallJS').value==1){ + if(mobile.substr(0,1)=='0'){ + + }else{ + if((/^1(3|4|5|7|8)\d{9}$/.test(mobile))){ + mobile = areacode+mobile; + }else{ + if(null==areacode||areacode==""){ + mobile = zz+mobile; + } + } + } + if(parent.document.getElementById("newnewbarInit").value==1){ + window.parent.phoneBar.agentApi.makeCall(data.mobile,-1,3); + }else{ + window.parent.application.oJVccBar.MakeCall(mobile); + } + }else{ + aos.alert('请在主页面初始化电话条！'); + return ; + } + + } + } + });} + + + + }}) + + + + } } diff --git a/resource/html/rush/telaccount.html b/resource/html/rush/telaccount.html index 74d221d..4c2a366 100644 --- a/resource/html/rush/telaccount.html +++ b/resource/html/rush/telaccount.html @@ -8,14 +8,17 @@ 查询 新增 + 修改 删除
-
-
>
+
+
>
-
+
+
+
@@ -64,8 +67,25 @@ }); } - - + + function update(){ + var data = grid.getSelected(); + if(!data){ + aos.alert('请选择一条数据。'); + return; + } + var param = {} + param['id'] = data.id; + param['account'] = data.account; + param['mobile1'] = data.mobile1; + param['mobile2'] = data.mobile2; + param['cname'] = data.cname; + param['pageState'] = 'editnew'; + aos.showWindow('canvas/rush/accountupdate', param, '300px', '300px', '鸿联账号修改', function(rtnValue){ + grid.reload(); + + }); + } diff --git a/src/rush/TaskAuthJob.java b/src/rush/TaskAuthJob.java index f9ccc1a..391ff4c 100644 --- a/src/rush/TaskAuthJob.java +++ b/src/rush/TaskAuthJob.java @@ -17,7 +17,7 @@ import java.util.Map.Entry; * * 2018年11月26日 新 */ -@Job("0 16 09 * * ?") +@Job("0 21 16 * * ?") public class TaskAuthJob extends BaseJob{ diff --git a/src/rush/TelAccountAction.java b/src/rush/TelAccountAction.java index 43a52ff..63d5f46 100644 --- a/src/rush/TelAccountAction.java +++ b/src/rush/TelAccountAction.java @@ -112,6 +112,13 @@ public class TelAccountAction { } } + @Request.Get("update") + @Request.Post("update") + public void update(Params params){ + DbHelper.getDbService().updateById("telaccount.update", params); + } + + // 删除操作 @Request.Get("delete") @Request.Post("delete") @@ -128,6 +135,27 @@ public class TelAccountAction { params.put("create_date", create_date); DbHelper.getDbService().updateById("telaccount.savetel", params); } + + + + //打电话之前会进行判断 + @Request.Get("check") + @Request.Post("check") + public String check (Params params){ + String mobile=params.getString("mobile").replaceAll("\\s*|\r|\n|\t",""); + List phons=DbHelper.getDbService().queryMapList("select USER_ID from RUSH_USER_AGENT where (mobile1=? or mobile2=? )",mobile,mobile); + String userid=SessionHelper.getCurrentUserId(); + if(phons.size()==0){ + return "0"; + } + Map userphone=DbHelper.getDbService().queryMap("select USER_ID from RUSH_USER_AGENT where ( mobile1=? or mobile2=?) and user_id=?",mobile,mobile,userid); + if(userphone!=null){ + return "0"; + } + return "1"; + } + + }