1

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
 				<i id="save"><![CDATA[
 		    insert into RUSH_USER_AGENT
 			  (user_id,
-			   agent_id)
+			   agent_id,mobile1,mobile2)
 			values
 			  (
 			   {accountname},
-			   {account})
+			   {account},{mobile1},{mobile2})
 			   
 		]]></i>
+
+		<i id="update"><![CDATA[
+        update RUSH_USER_AGENT set mobile1={mobile1},mobile2={mobile2}  where USER_ID={accountname}
+		]]></i>
+
 		<i id="savetel"><![CDATA[
 		    insert into RUSH_TEL_ACCOUNT
 			  (id,

build/classes/html/rush/accountadd.html

@@ -19,6 +19,8 @@
 			emptyText="请选择"  textField="cname" valueField="cguid"  allowInput="false" 
 			showNullItem="true"  onvaluechanged="getRevenue" />
 		<br/>
+		<input widget="num"  name="mobile1" label="测试电话1" required="true"  style="margin-top:5px" />
+		<input widget="num"  name="mobile2" label="测试电话2" required="true"  style="margin-top:5px" />
 		
 			
 		
@@ -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,

build/classes/html/rush/rushtasklistdetail.html

@@ -390,6 +390,17 @@
 					aos.alert('选中的联系人没有联系电话请更改，谢谢~');
 					return;
 				}
+				var one = {};
+				one['mobile']=mobile;
+				aos.post({
+					url:"rush/telaccount/check",
+					data:one,
+					success:function(rtnData){
+					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();
@@ -433,7 +444,15 @@
 
 								}
 							}
-				});
+						});}
+
+
+
+					}})
+
+
+
+
 			}
 			
 		}

build/classes/html/rush/telaccount.html

@@ -8,14 +8,17 @@
 			<input widget="edit" name="acc" label="电话"/>
 			<a widget="button" iconCls="icon-search" onclick="search()">查询</a>
 			<a widget="button" iconCls="icon-add" onclick="add()">新增</a>
+			<a widget="button" iconCls="icon-add" onclick="update()">修改</a>
 			<a widget="button" iconCls="icon-delete" onclick="remove()">删除</a>
 		</div>
 		<div widget="autosize">
 			<div widget="datagrid" name="grid" style="width: 100%; height: 100%;" url="rush/telaccount/getList"  allowalternating="true">
-				<div type="indexcolumn" width="15" header="序号"></div>
+				<div type="indexcolumn" width="50" header="序号"></div>
-				<div field="cname"  width="15" header="姓名">></div>
+				<div field="cname"  width="50" header="姓名">></div>
 				<div field="id"    visible="false"></div>
-				<div field="account" width="70"  header="鸿联电话"></div>
+				<div field="account" width="50"  header="鸿联电话"></div>
+				<div field="mobile1" width="50"  header="测试电话1"></div>
+				<div field="mobile2" width="50"  header="测试电话2"></div>
 			</div>
 			
 				
@@ -65,7 +68,24 @@
 			});
 		}
 
+		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();
 
+			});
+		}
 		
 		
 		

build/classes/html/tick/shijidetail.html

@@ -10,6 +10,7 @@
 				<div field="kpy" width="15"  header="开票人"></div>
 				<div field="custname" width="40" header="客户名称"></div>
 				<div field="kprq" width="20" header="开票日期"></div>
+				<div field="kpxm" width="20" header="开票姓名"></div>
 				<div field="flag" width="15" header="开票方式"></div>
 			</div>	
 		</div>

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
 				<i id="save"><![CDATA[
 		    insert into RUSH_USER_AGENT
 			  (user_id,
-			   agent_id)
+			   agent_id,mobile1,mobile2)
 			values
 			  (
 			   {accountname},
-			   {account})
+			   {account},{mobile1},{mobile2})
 			   
 		]]></i>
+
+		<i id="update"><![CDATA[
+        update RUSH_USER_AGENT set mobile1={mobile1},mobile2={mobile2}  where USER_ID={accountname}
+		]]></i>
+
 		<i id="savetel"><![CDATA[
 		    insert into RUSH_TEL_ACCOUNT
 			  (id,

classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/rush/accountadd.html

@@ -19,6 +19,8 @@
 			emptyText="请选择"  textField="cname" valueField="cguid"  allowInput="false" 
 			showNullItem="true"  onvaluechanged="getRevenue" />
 		<br/>
+		<input widget="num"  name="mobile1" label="测试电话1" required="true"  style="margin-top:5px" />
+		<input widget="num"  name="mobile2" label="测试电话2" required="true"  style="margin-top:5px" />
 		
 			
 		
@@ -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,

classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/rush/rushtasklistdetail.html

@@ -390,6 +390,17 @@
 					aos.alert('选中的联系人没有联系电话请更改，谢谢~');
 					return;
 				}
+				var one = {};
+				one['mobile']=mobile;
+				aos.post({
+					url:"rush/telaccount/check",
+					data:one,
+					success:function(rtnData){
+					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();
@@ -433,7 +444,15 @@
 
 								}
 							}
-				});
+						});}
+
+
+
+					}})
+
+
+
+
 			}
 			
 		}

classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/rush/telaccount.html

@@ -8,14 +8,17 @@
 			<input widget="edit" name="acc" label="电话"/>
 			<a widget="button" iconCls="icon-search" onclick="search()">查询</a>
 			<a widget="button" iconCls="icon-add" onclick="add()">新增</a>
+			<a widget="button" iconCls="icon-add" onclick="update()">修改</a>
 			<a widget="button" iconCls="icon-delete" onclick="remove()">删除</a>
 		</div>
 		<div widget="autosize">
 			<div widget="datagrid" name="grid" style="width: 100%; height: 100%;" url="rush/telaccount/getList"  allowalternating="true">
-				<div type="indexcolumn" width="15" header="序号"></div>
+				<div type="indexcolumn" width="50" header="序号"></div>
-				<div field="cname"  width="15" header="姓名">></div>
+				<div field="cname"  width="50" header="姓名">></div>
 				<div field="id"    visible="false"></div>
-				<div field="account" width="70"  header="鸿联电话"></div>
+				<div field="account" width="50"  header="鸿联电话"></div>
+				<div field="mobile1" width="50"  header="测试电话1"></div>
+				<div field="mobile2" width="50"  header="测试电话2"></div>
 			</div>
 			
 				
@@ -65,7 +68,24 @@
 			});
 		}
 
+		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();
 
+			});
+		}
 		
 		
 		

classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/shijidetail.html

@@ -10,6 +10,7 @@
 				<div field="kpy" width="15"  header="开票人"></div>
 				<div field="custname" width="40" header="客户名称"></div>
 				<div field="kprq" width="20" header="开票日期"></div>
+				<div field="kpxm" width="20" header="开票姓名"></div>
 				<div field="flag" width="15" header="开票方式"></div>
 			</div>	
 		</div>

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

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
 				<i id="save"><![CDATA[
 		    insert into RUSH_USER_AGENT
 			  (user_id,
-			   agent_id)
+			   agent_id,mobile1,mobile2)
 			values
 			  (
 			   {accountname},
-			   {account})
+			   {account},{mobile1},{mobile2})
 			   
 		]]></i>
+
+		<i id="update"><![CDATA[
+        update RUSH_USER_AGENT set mobile1={mobile1},mobile2={mobile2}  where USER_ID={accountname}
+		]]></i>
+
 		<i id="savetel"><![CDATA[
 		    insert into RUSH_TEL_ACCOUNT
 			  (id,

resource/html/rush/accountadd.html

@@ -19,6 +19,8 @@
 			emptyText="请选择"  textField="cname" valueField="cguid"  allowInput="false" 
 			showNullItem="true"  onvaluechanged="getRevenue" />
 		<br/>
+		<input widget="num"  name="mobile1" label="测试电话1" required="true"  style="margin-top:5px" />
+		<input widget="num"  name="mobile2" label="测试电话2" required="true"  style="margin-top:5px" />
 		
 			
 		
@@ -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,

resource/html/rush/accountupdate.html

@@ -0,0 +1,55 @@
+<html   login="false">
+	<head>
+		<title>反馈资料</title>
+	</head>
+	<body>
+		<div widget="toolbar">
+			
+			
+			<a widget="button" iconCls="icon-save" onclick="save" linkToState="editold,editnew">保存</a>
+			
+			<a widget="button" iconCls="icon-exit" onclick="CloseWindow()">退出</a>
+		</div>
+		
+		
+		<input widget="hidden" name="id" label="id"  readonly="true" style="margin-top:5px"/>	<br/>
+		<input widget="num"  name="account" label="鸿联电话" required="true"  allowInput="false" style="margin-top:5px" />
+		<input widget="edit"  name="accountname" label="员工姓名" required="true"  allowInput="false" style="margin-top:5px" />
+		<input widget="num"  name="mobile1" label="测试电话1" required="true"  style="margin-top:5px" />
+		<input widget="num"  name="mobile2" label="测试电话2" required="true"  style="margin-top:5px" />
+		
+			
+		
+		
+		
+	</body>
+	<script type="text/javascript">
+ 	var grid = aos.get('grid');
+	grid.load();
+	 function init(param){
+		 aos.get("account").setValue(param['account']);
+		 aos.get("accountname").setValue(param['cname']);
+		 aos.get("mobile1").setValue(param['mobile1']);
+		 aos.get("mobile2").setValue(param['mobile2']);
+		 aos.get("id").setValue(param['id']);
+         } 
+		
+		function save(){
+			var one = {};
+			one['accountname']=aos.get('id').getValue();
+			one['mobile1']=aos.get('mobile1').getValue();
+			one['mobile2']=aos.get('mobile2').getValue();
+			aos.post({
+				url:"rush/telaccount/update",
+				data:one,
+
+				success:function(){
+					 aos.tip('保存成功');
+					 CloseWindow();
+				}
+			
+			});
+		}
+		
+	</script>	
+</html>

resource/html/rush/rushtasklistdetail.html

@@ -390,6 +390,17 @@
 					aos.alert('选中的联系人没有联系电话请更改，谢谢~');
 					return;
 				}
+				var one = {};
+				one['mobile']=mobile;
+				aos.post({
+					url:"rush/telaccount/check",
+					data:one,
+					success:function(rtnData){
+					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();
@@ -433,7 +444,15 @@
 
 								}
 							}
-				});
+						});}
+
+
+
+					}})
+
+
+
+
 			}
 			
 		}

resource/html/rush/telaccount.html

@@ -8,14 +8,17 @@
 			<input widget="edit" name="acc" label="电话"/>
 			<a widget="button" iconCls="icon-search" onclick="search()">查询</a>
 			<a widget="button" iconCls="icon-add" onclick="add()">新增</a>
+			<a widget="button" iconCls="icon-add" onclick="update()">修改</a>
 			<a widget="button" iconCls="icon-delete" onclick="remove()">删除</a>
 		</div>
 		<div widget="autosize">
 			<div widget="datagrid" name="grid" style="width: 100%; height: 100%;" url="rush/telaccount/getList"  allowalternating="true">
-				<div type="indexcolumn" width="15" header="序号"></div>
+				<div type="indexcolumn" width="50" header="序号"></div>
-				<div field="cname"  width="15" header="姓名">></div>
+				<div field="cname"  width="50" header="姓名">></div>
 				<div field="id"    visible="false"></div>
-				<div field="account" width="70"  header="鸿联电话"></div>
+				<div field="account" width="50"  header="鸿联电话"></div>
+				<div field="mobile1" width="50"  header="测试电话1"></div>
+				<div field="mobile2" width="50"  header="测试电话2"></div>
 			</div>
 			
 				
@@ -65,7 +68,24 @@
 			});
 		}
 
+		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();
 
+			});
+		}
 		
 		
 		

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{
 
 

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<Map> 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";
+	}
+
+
 }