From ebb02da88beb7df2630e6f5eca7d12cd951a8b41 Mon Sep 17 00:00:00 2001
From: zxf <zxf123456>
Date: Fri, 22 Sep 2023 02:46:30 +0800
Subject: [PATCH] =?UTF-8?q?=E7=83=AD=E7=BA=BF=E7=AD=89=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build/classes/config.xml                      |   9 ++
 build/classes/db/org_sql.xml                  |   2 +-
 build/classes/html/bureau/hotadd.html         |  73 +++++++++++
 build/classes/html/bureau/hotwireclass.html   | 113 ++++++++++++++++++
 build/classes/html/bureau/recording.html      |   6 +-
 build/classes/rush/HotWireClass.class         | Bin 0 -> 4275 bytes
 .../WEB-INF/classes/config.xml                |   9 ++
 .../WEB-INF/classes/db/org_sql.xml            |   2 +-
 .../WEB-INF/classes/html/bureau/hotadd.html   |  73 +++++++++++
 .../classes/html/bureau/hotwireclass.html     | 113 ++++++++++++++++++
 .../classes/html/bureau/recording.html        |   6 +-
 .../WEB-INF/classes/rush/HotWireClass.class   | Bin 0 -> 4275 bytes
 .../artifacts/rushfee_Web_exploded/ptrun.ini  |   2 +-
 resource/db/org_sql.xml                       |   2 +-
 resource/html/bureau/hotadd.html              |  73 +++++++++++
 resource/html/bureau/hotwireclass.html        | 113 ++++++++++++++++++
 resource/html/bureau/recording.html           |   6 +-
 resource_global/config.xml                    |   9 ++
 src/rush/HotWireClass.java                    |  86 +++++++++++++
 19 files changed, 684 insertions(+), 13 deletions(-)
 create mode 100644 build/classes/html/bureau/hotadd.html
 create mode 100644 build/classes/html/bureau/hotwireclass.html
 create mode 100644 build/classes/rush/HotWireClass.class
 create mode 100644 classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/bureau/hotadd.html
 create mode 100644 classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/bureau/hotwireclass.html
 create mode 100644 classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/rush/HotWireClass.class
 create mode 100644 resource/html/bureau/hotadd.html
 create mode 100644 resource/html/bureau/hotwireclass.html
 create mode 100644 src/rush/HotWireClass.java

diff --git a/build/classes/config.xml b/build/classes/config.xml
index 5437dbc..28508f6 100644
--- a/build/classes/config.xml
+++ b/build/classes/config.xml
@@ -116,6 +116,15 @@
 			<prop name="password">aisinocrm2014</prop>
 			<prop name="decrypt">false</prop>
 		</ds>
+		<ds id="call_center">
+			<prop name="desc">呼叫中心db</prop>
+			<prop name="type">oracle</prop>
+			<prop name="driver">oracle.jdbc.driver.OracleDriver</prop>
+			<prop name="url">jdbc:oracle:thin:@//10.2.2.30:1526/ipcc</prop><!--正式-->
+			<prop name="username">useraisino</prop>
+			<prop name="password">useraisino</prop>
+			<prop name="decrypt">false</prop>
+		</ds>
 		<!-- 
 		<ds id="oracle_crm">
             <prop name="desc">oracle_crm系统</prop>
diff --git a/build/classes/db/org_sql.xml b/build/classes/db/org_sql.xml
index 465cf1f..d2d4dac 100644
--- a/build/classes/db/org_sql.xml
+++ b/build/classes/db/org_sql.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE sqls SYSTEM "sql_definition.dtd">
<sqls>
	<sql group="rushfee_org">
		<i id="getOrgList"><![CDATA[
		     select 
		     	org_id id,
		     	org_short_name text,
		     	parent_org_id pid
		     from 
		     	COMPANY_ORGANIZE
		     where org_id !=3701 order by org_id
		]]></i>

		<i id="getOrgListByUser"><![CDATA[

    select distinct city_name id,city_name text,'0' pid from  tel_dic_city

WHERE city_name in(select org_name from  SHUIJU_QUYU_USER where  user_id ={userId})

		]]></i>



		<i id="getRecordList"><![CDATA[
		     select 
		     	*
		     from 
		     	RUSH_RECORD
		]]></i>
		<i id="getRevenueByOrgId"><![CDATA[
		     select 
		     	revenueid id,
		     	revenuename text
		     from 
		     	REVENUE_INFO_FORMAL
		     where companyid ={companyid}
		]]></i>
		
	</sql>
</sqls>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE sqls SYSTEM "sql_definition.dtd">
<sqls>
	<sql group="rushfee_org">
		<i id="getOrgList"><![CDATA[
		     select 
		     	org_id id,
		     	org_short_name text,
		     	parent_org_id pid
		     from 
		     	COMPANY_ORGANIZE
		     where org_id !=3701 order by org_id
		]]></i>


		<i id="getOrgListhotwire"><![CDATA[
		     select
		     	org_id id,
		     	org_short_name||'分公司' text,
		     	parent_org_id pid
		     from
		     	COMPANY_ORGANIZE
		     where org_id !=3701 order by org_id
		]]></i>

		<i id="getOrgListByUser"><![CDATA[

    select distinct city_name id,city_name text,'0' pid from  tel_dic_city

WHERE city_name in(select org_name from  SHUIJU_QUYU_USER where  user_id ={userId})

		]]></i>



		<i id="getRecordList"><![CDATA[
		     select 
		     	*
		     from 
		     	RUSH_RECORD
		]]></i>
		<i id="getRevenueByOrgId"><![CDATA[
		     select 
		     	revenueid id,
		     	revenuename text
		     from 
		     	REVENUE_INFO_FORMAL
		     where companyid ={companyid}
		]]></i>
		
	</sql>
</sqls>
\ No newline at end of file
diff --git a/build/classes/html/bureau/hotadd.html b/build/classes/html/bureau/hotadd.html
new file mode 100644
index 0000000..29f2a6e
--- /dev/null
+++ b/build/classes/html/bureau/hotadd.html
@@ -0,0 +1,73 @@
+<html   login="false">
+<head>
+    <title>客户信息明细</title>
+</head>
+<body >
+<div widget="toolbar" >
+    <a widget="button" iconCls="icon-admin" id="savebtn" onclick="save">保存</a>
+    <a widget="button" iconCls="icon-exit" onclick="CloseWindow()">退出</a>
+</div>
+
+<!--<input widget="autocomplete"  name="custname"  label="查询客户"  url="rush/search/gettaskpeople"
+       popupEmptyText="请选择"  textfield="cname" valuefield="cguid"
+
+       style="margin-left:-16px;width: 500px;" showClose="true" oncloseclick ="conCloseClick"/>-->
+<input widget="edit" name="khid" label="客户id"  style="width:400px;margin-top:5px"/>
+<br/>
+<input widget="edit" name="custname" label="客户名称"  style="width:400px;margin-top:5px"/>
+<br/>
+<input widget="edit" name="custtaxno" label="客户税号"  style="width:400px;margin-top:5px"/>
+<br/>
+<input widget="edit" name="mobile" label="联系电话"  style="width:400px;margin-top:5px"/>
+<br/>
+<input name="enddate" widget=datechooser  allowinput="ture"   label="到期日期" style="width:400px;margin-top:5px">
+<br/>
+
+<div name="state" required label="状态" widget="radiobuttonlist"
+     repeatitems="2" repeatlayout="table" textfield="text" valuefield="id"
+     data="[{id:0,text:'无效'},{id:1,text:'有效'}]" style="width:400px;margin-top:5px">
+</div>
+<br/>
+<input widget="combox" name="orgname" label="分公司" url="rush/hot/getOrgList" style="width:400px;margin-top:5px"
+       emptyText="请选择" textField="text" valueField="text" allowInput="false"
+       showNullItem="true"/>
+<br/>
+<input widget="int"  name="mlevel" label="等级"  maxValue="100"  style="width:400px;margin-top:5px"/>
+<br/>
+<input widget="int"  name="mprice" label="金额"  maxValue="100000" style="width:400px;margin-top:5px"/>
+
+
+</body>
+<script type="text/javascript">
+    var grid = aos.get('grid');
+    aos.get('state').setValue(1);
+
+    function save(){
+        var data = aos.getForm().getData();
+        data['khid']=aos.get('khid').getValue();
+        data['custname']=aos.get('custname').getValue();
+        data['custtaxno']=aos.get('custtaxno').getValue();
+        data['mobile']=aos.get('mobile').getValue();
+        data['enddate']=aos.get('enddate').getValue();
+        data['state']=aos.get('state').getValue();
+        data['orgname']=aos.get('orgname').getValue();
+        data['mlevel']=aos.get('mlevel').getValue();
+        data['mprice']=aos.get('mprice').getValue();
+        aos.post({
+            url:"rush/hot/save",
+            data:data,
+            success:function(data){
+                if(data=1){
+                CloseWindow();}
+                else{
+                    aos.tip('服务错误联系管理员！');
+                }
+            }
+        });
+    }
+
+
+
+
+</script>
+</html>
\ No newline at end of file
diff --git a/build/classes/html/bureau/hotwireclass.html b/build/classes/html/bureau/hotwireclass.html
new file mode 100644
index 0000000..e8ce59f
--- /dev/null
+++ b/build/classes/html/bureau/hotwireclass.html
@@ -0,0 +1,113 @@
+<html login="false" auth="false">
+<head>
+    <meta charset="UTF-8">
+    <title>热线等级</title>
+</head>
+<body>
+<div widget="toolbar" style="padding:5px;border:0;">
+
+
+    <input widget="combox" name="orgname" label="分公司" url="rush/hot/getOrgList"
+           emptyText="请选择" textField="text" valueField="text" allowInput="false"
+           showNullItem="true"/>
+    <input widget="edit" name="custname" label="客户名称"/>
+    <input widget="edit" name="custtaxno" label="客户税号"/>
+    <input widget="edit" name="mobile" label="联系电话"/>
+    <input name="state" widget=combox allowinput="f" style="width: 200px;" showNullItem="true"
+           data="[{id:'0',text:'无效'},{id:'1',text:'有效'}]" emptyText="请选择" label="状态">
+    <a widget="button" iconCls="icon-search" onclick="search()">查询</a>
+	<a widget="button" iconCls="icon-add" onclick="add">新增</a>
+</div>
+<div widget="autosize">
+    <div widget="datagrid" name="grid" style="width: 100%; height: 100%;" url="rush/hot/getlist">
+        <div type="indexcolumn" width="35" header="序号"></div>
+        <div field="id" visible="id"></div>
+        <div field="khid" visible="id"></div>
+        <div field="custname" width="60" header="客户名称" align="center"></div>
+        <div field="custtaxno" width="60" header="客户税号" align="center"></div>
+        <div field="createdate" width="60" header="创建日期" align="center"></div>
+        <div field="mobile" width="50" header="联系电话" align="center"></div>
+		<div field="enddate" width="35" header="到期日期" align="center"></div>
+        <div field="orgname" width="50" header="分公司" align="center"></div>
+        <div field="state" width="30" header="状态" renderer="statetype" align="center"></div>
+        <div field="mlevel" width="30" header="等级" align="center"></div>
+        <div field="mprice" width="40" header="金额" align="center"></div>
+        <div field="caozuo" width="45" align="center" renderer="onRenderer" header="操作"></div>
+    </div>
+</div>
+</body>
+
+<script type="text/javascript">
+
+    var grid = aos.get('grid');
+    function search() {
+        var grid = aos.get('grid');
+        var params = {
+            mobile: aos.get('mobile').getValue(),
+            custname: aos.get('custname').getValue(),
+            custtaxno: aos.get('custtaxno').getValue(),
+            orgname: aos.get('orgname').getValue(),
+            state: aos.get('state').getValue()
+        };
+        grid.load(params);
+    }
+
+
+    function onRenderer(e) {
+        if (e.row.state == '0') {
+            return "<a href='javascript:void(0)' style='text-decoration:none' onclick='huifu(\"" + e.row.id + "\")'>" + "恢复";
+        }
+        if (e.row.state=='1') {
+                return "<a href='javascript:void(0)' style='text-decoration:none' onclick='rekp(\"" + e.row.id + "\")'>" + "删除";
+            }
+            return "暂无操作";
+
+    }
+
+
+    function rekp(id) {
+        aos.post({
+            url: 'rush/hot/delete',
+            data: {id: id},
+            success: function () {
+                grid.reload();
+            }
+
+        });
+    }
+
+    function huifu(id) {
+        aos.post({
+            url: 'rush/hot/huifu',
+            data: {id: id},
+            success: function () {
+                grid.reload();
+            }
+
+        });
+    }
+
+
+    function statetype(e) {
+        var row = e.row;
+        var value = row.state;
+        if (value == '0') {
+            return '<p style="color:red;">无效</p>';
+        }
+        if (value == '1') {
+            return '<p style="color:green;">有效</p>';
+
+        } else {
+            return value;
+        }
+    }
+
+    function  add() {
+		var param = {};
+		aos.showWindow('canvas/bureau/hotadd', param, '600px', '500px', '热线数据新增', function(rtnValue){
+			grid.reload();
+		});
+	}
+
+</script>
+</html>
\ No newline at end of file
diff --git a/build/classes/html/bureau/recording.html b/build/classes/html/bureau/recording.html
index 063a3af..c8dc9fa 100644
--- a/build/classes/html/bureau/recording.html
+++ b/build/classes/html/bureau/recording.html
@@ -42,8 +42,8 @@
 				<div field="start_time" width="70" header="来电时间" align="center"></div>
 				<div field="end_time" width="70" header="结束时间" align="center"></div>
 				<div field="record_duration" width="40" header="录音时长(秒)"  align="center"></div>
-				<div field="call_type" width="35"  align="center"  header="呼叫类型" ></div>
-				<div field="callstate" width="35" renderer="callType" align="center"  header="呼入/呼出" ></div>
+<!--				<div field="call_type" width="35"  align="center"  header="呼叫类型" ></div>-->
+				<div field="call_type" width="35" renderer="callType" align="center"  header="呼入/呼出" ></div>
 				<!--<div field="down"  width="40" header="下载" renderer="downRender" align="center"></div>-->
 				<div field="play"  width="40" header="调听" renderer="playRender" align="center"></div>
 				<div field="caller_phone" width="50" header="来电号码" align="center" ></div>
@@ -136,7 +136,7 @@
 
 	   function callType(e){
 		   var row=e.row;
-		   var value=row.callstate;
+		   var value=row.call_type;
 		   if(value=='0'){
 			   return '<p style="color:red;">呼入</p>';
 		   }
diff --git a/build/classes/rush/HotWireClass.class b/build/classes/rush/HotWireClass.class
new file mode 100644
index 0000000000000000000000000000000000000000..37e724f810ab34f0f29a676ccb3363963df17e4a
GIT binary patch
literal 4275
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
P+nDTaL5Aba-j@FXzgSQ^

literal 0
HcmV?d00001

diff --git a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/config.xml b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/config.xml
index 5437dbc..28508f6 100644
--- a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/config.xml
+++ b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/config.xml
@@ -116,6 +116,15 @@
 			<prop name="password">aisinocrm2014</prop>
 			<prop name="decrypt">false</prop>
 		</ds>
+		<ds id="call_center">
+			<prop name="desc">呼叫中心db</prop>
+			<prop name="type">oracle</prop>
+			<prop name="driver">oracle.jdbc.driver.OracleDriver</prop>
+			<prop name="url">jdbc:oracle:thin:@//10.2.2.30:1526/ipcc</prop><!--正式-->
+			<prop name="username">useraisino</prop>
+			<prop name="password">useraisino</prop>
+			<prop name="decrypt">false</prop>
+		</ds>
 		<!-- 
 		<ds id="oracle_crm">
             <prop name="desc">oracle_crm系统</prop>
diff --git a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/db/org_sql.xml b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/db/org_sql.xml
index 465cf1f..d2d4dac 100644
--- a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/db/org_sql.xml
+++ b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/db/org_sql.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE sqls SYSTEM "sql_definition.dtd">
<sqls>
	<sql group="rushfee_org">
		<i id="getOrgList"><![CDATA[
		     select 
		     	org_id id,
		     	org_short_name text,
		     	parent_org_id pid
		     from 
		     	COMPANY_ORGANIZE
		     where org_id !=3701 order by org_id
		]]></i>

		<i id="getOrgListByUser"><![CDATA[

    select distinct city_name id,city_name text,'0' pid from  tel_dic_city

WHERE city_name in(select org_name from  SHUIJU_QUYU_USER where  user_id ={userId})

		]]></i>



		<i id="getRecordList"><![CDATA[
		     select 
		     	*
		     from 
		     	RUSH_RECORD
		]]></i>
		<i id="getRevenueByOrgId"><![CDATA[
		     select 
		     	revenueid id,
		     	revenuename text
		     from 
		     	REVENUE_INFO_FORMAL
		     where companyid ={companyid}
		]]></i>
		
	</sql>
</sqls>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE sqls SYSTEM "sql_definition.dtd">
<sqls>
	<sql group="rushfee_org">
		<i id="getOrgList"><![CDATA[
		     select 
		     	org_id id,
		     	org_short_name text,
		     	parent_org_id pid
		     from 
		     	COMPANY_ORGANIZE
		     where org_id !=3701 order by org_id
		]]></i>


		<i id="getOrgListhotwire"><![CDATA[
		     select
		     	org_id id,
		     	org_short_name||'分公司' text,
		     	parent_org_id pid
		     from
		     	COMPANY_ORGANIZE
		     where org_id !=3701 order by org_id
		]]></i>

		<i id="getOrgListByUser"><![CDATA[

    select distinct city_name id,city_name text,'0' pid from  tel_dic_city

WHERE city_name in(select org_name from  SHUIJU_QUYU_USER where  user_id ={userId})

		]]></i>



		<i id="getRecordList"><![CDATA[
		     select 
		     	*
		     from 
		     	RUSH_RECORD
		]]></i>
		<i id="getRevenueByOrgId"><![CDATA[
		     select 
		     	revenueid id,
		     	revenuename text
		     from 
		     	REVENUE_INFO_FORMAL
		     where companyid ={companyid}
		]]></i>
		
	</sql>
</sqls>
\ No newline at end of file
diff --git a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/bureau/hotadd.html b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/bureau/hotadd.html
new file mode 100644
index 0000000..29f2a6e
--- /dev/null
+++ b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/bureau/hotadd.html
@@ -0,0 +1,73 @@
+<html   login="false">
+<head>
+    <title>客户信息明细</title>
+</head>
+<body >
+<div widget="toolbar" >
+    <a widget="button" iconCls="icon-admin" id="savebtn" onclick="save">保存</a>
+    <a widget="button" iconCls="icon-exit" onclick="CloseWindow()">退出</a>
+</div>
+
+<!--<input widget="autocomplete"  name="custname"  label="查询客户"  url="rush/search/gettaskpeople"
+       popupEmptyText="请选择"  textfield="cname" valuefield="cguid"
+
+       style="margin-left:-16px;width: 500px;" showClose="true" oncloseclick ="conCloseClick"/>-->
+<input widget="edit" name="khid" label="客户id"  style="width:400px;margin-top:5px"/>
+<br/>
+<input widget="edit" name="custname" label="客户名称"  style="width:400px;margin-top:5px"/>
+<br/>
+<input widget="edit" name="custtaxno" label="客户税号"  style="width:400px;margin-top:5px"/>
+<br/>
+<input widget="edit" name="mobile" label="联系电话"  style="width:400px;margin-top:5px"/>
+<br/>
+<input name="enddate" widget=datechooser  allowinput="ture"   label="到期日期" style="width:400px;margin-top:5px">
+<br/>
+
+<div name="state" required label="状态" widget="radiobuttonlist"
+     repeatitems="2" repeatlayout="table" textfield="text" valuefield="id"
+     data="[{id:0,text:'无效'},{id:1,text:'有效'}]" style="width:400px;margin-top:5px">
+</div>
+<br/>
+<input widget="combox" name="orgname" label="分公司" url="rush/hot/getOrgList" style="width:400px;margin-top:5px"
+       emptyText="请选择" textField="text" valueField="text" allowInput="false"
+       showNullItem="true"/>
+<br/>
+<input widget="int"  name="mlevel" label="等级"  maxValue="100"  style="width:400px;margin-top:5px"/>
+<br/>
+<input widget="int"  name="mprice" label="金额"  maxValue="100000" style="width:400px;margin-top:5px"/>
+
+
+</body>
+<script type="text/javascript">
+    var grid = aos.get('grid');
+    aos.get('state').setValue(1);
+
+    function save(){
+        var data = aos.getForm().getData();
+        data['khid']=aos.get('khid').getValue();
+        data['custname']=aos.get('custname').getValue();
+        data['custtaxno']=aos.get('custtaxno').getValue();
+        data['mobile']=aos.get('mobile').getValue();
+        data['enddate']=aos.get('enddate').getValue();
+        data['state']=aos.get('state').getValue();
+        data['orgname']=aos.get('orgname').getValue();
+        data['mlevel']=aos.get('mlevel').getValue();
+        data['mprice']=aos.get('mprice').getValue();
+        aos.post({
+            url:"rush/hot/save",
+            data:data,
+            success:function(data){
+                if(data=1){
+                CloseWindow();}
+                else{
+                    aos.tip('服务错误联系管理员！');
+                }
+            }
+        });
+    }
+
+
+
+
+</script>
+</html>
\ No newline at end of file
diff --git a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/bureau/hotwireclass.html b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/bureau/hotwireclass.html
new file mode 100644
index 0000000..e8ce59f
--- /dev/null
+++ b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/bureau/hotwireclass.html
@@ -0,0 +1,113 @@
+<html login="false" auth="false">
+<head>
+    <meta charset="UTF-8">
+    <title>热线等级</title>
+</head>
+<body>
+<div widget="toolbar" style="padding:5px;border:0;">
+
+
+    <input widget="combox" name="orgname" label="分公司" url="rush/hot/getOrgList"
+           emptyText="请选择" textField="text" valueField="text" allowInput="false"
+           showNullItem="true"/>
+    <input widget="edit" name="custname" label="客户名称"/>
+    <input widget="edit" name="custtaxno" label="客户税号"/>
+    <input widget="edit" name="mobile" label="联系电话"/>
+    <input name="state" widget=combox allowinput="f" style="width: 200px;" showNullItem="true"
+           data="[{id:'0',text:'无效'},{id:'1',text:'有效'}]" emptyText="请选择" label="状态">
+    <a widget="button" iconCls="icon-search" onclick="search()">查询</a>
+	<a widget="button" iconCls="icon-add" onclick="add">新增</a>
+</div>
+<div widget="autosize">
+    <div widget="datagrid" name="grid" style="width: 100%; height: 100%;" url="rush/hot/getlist">
+        <div type="indexcolumn" width="35" header="序号"></div>
+        <div field="id" visible="id"></div>
+        <div field="khid" visible="id"></div>
+        <div field="custname" width="60" header="客户名称" align="center"></div>
+        <div field="custtaxno" width="60" header="客户税号" align="center"></div>
+        <div field="createdate" width="60" header="创建日期" align="center"></div>
+        <div field="mobile" width="50" header="联系电话" align="center"></div>
+		<div field="enddate" width="35" header="到期日期" align="center"></div>
+        <div field="orgname" width="50" header="分公司" align="center"></div>
+        <div field="state" width="30" header="状态" renderer="statetype" align="center"></div>
+        <div field="mlevel" width="30" header="等级" align="center"></div>
+        <div field="mprice" width="40" header="金额" align="center"></div>
+        <div field="caozuo" width="45" align="center" renderer="onRenderer" header="操作"></div>
+    </div>
+</div>
+</body>
+
+<script type="text/javascript">
+
+    var grid = aos.get('grid');
+    function search() {
+        var grid = aos.get('grid');
+        var params = {
+            mobile: aos.get('mobile').getValue(),
+            custname: aos.get('custname').getValue(),
+            custtaxno: aos.get('custtaxno').getValue(),
+            orgname: aos.get('orgname').getValue(),
+            state: aos.get('state').getValue()
+        };
+        grid.load(params);
+    }
+
+
+    function onRenderer(e) {
+        if (e.row.state == '0') {
+            return "<a href='javascript:void(0)' style='text-decoration:none' onclick='huifu(\"" + e.row.id + "\")'>" + "恢复";
+        }
+        if (e.row.state=='1') {
+                return "<a href='javascript:void(0)' style='text-decoration:none' onclick='rekp(\"" + e.row.id + "\")'>" + "删除";
+            }
+            return "暂无操作";
+
+    }
+
+
+    function rekp(id) {
+        aos.post({
+            url: 'rush/hot/delete',
+            data: {id: id},
+            success: function () {
+                grid.reload();
+            }
+
+        });
+    }
+
+    function huifu(id) {
+        aos.post({
+            url: 'rush/hot/huifu',
+            data: {id: id},
+            success: function () {
+                grid.reload();
+            }
+
+        });
+    }
+
+
+    function statetype(e) {
+        var row = e.row;
+        var value = row.state;
+        if (value == '0') {
+            return '<p style="color:red;">无效</p>';
+        }
+        if (value == '1') {
+            return '<p style="color:green;">有效</p>';
+
+        } else {
+            return value;
+        }
+    }
+
+    function  add() {
+		var param = {};
+		aos.showWindow('canvas/bureau/hotadd', param, '600px', '500px', '热线数据新增', function(rtnValue){
+			grid.reload();
+		});
+	}
+
+</script>
+</html>
\ No newline at end of file
diff --git a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/bureau/recording.html b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/bureau/recording.html
index 063a3af..c8dc9fa 100644
--- a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/bureau/recording.html
+++ b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/bureau/recording.html
@@ -42,8 +42,8 @@
 				<div field="start_time" width="70" header="来电时间" align="center"></div>
 				<div field="end_time" width="70" header="结束时间" align="center"></div>
 				<div field="record_duration" width="40" header="录音时长(秒)"  align="center"></div>
-				<div field="call_type" width="35"  align="center"  header="呼叫类型" ></div>
-				<div field="callstate" width="35" renderer="callType" align="center"  header="呼入/呼出" ></div>
+<!--				<div field="call_type" width="35"  align="center"  header="呼叫类型" ></div>-->
+				<div field="call_type" width="35" renderer="callType" align="center"  header="呼入/呼出" ></div>
 				<!--<div field="down"  width="40" header="下载" renderer="downRender" align="center"></div>-->
 				<div field="play"  width="40" header="调听" renderer="playRender" align="center"></div>
 				<div field="caller_phone" width="50" header="来电号码" align="center" ></div>
@@ -136,7 +136,7 @@
 
 	   function callType(e){
 		   var row=e.row;
-		   var value=row.callstate;
+		   var value=row.call_type;
 		   if(value=='0'){
 			   return '<p style="color:red;">呼入</p>';
 		   }
diff --git a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/rush/HotWireClass.class b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/rush/HotWireClass.class
new file mode 100644
index 0000000000000000000000000000000000000000..37e724f810ab34f0f29a676ccb3363963df17e4a
GIT binary patch
literal 4275
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
P+nDTaL5Aba-j@FXzgSQ^

literal 0
HcmV?d00001

diff --git a/classes/artifacts/rushfee_Web_exploded/ptrun.ini b/classes/artifacts/rushfee_Web_exploded/ptrun.ini
index 1db0fa0..3bc9460 100644
--- a/classes/artifacts/rushfee_Web_exploded/ptrun.ini
+++ b/classes/artifacts/rushfee_Web_exploded/ptrun.ini
@@ -1,3 +1,3 @@
 #save ini
-#Fri Sep 15 00:47:34 CST 2023
+#Fri Sep 22 02:24:51 CST 2023
 deploystamp=1612237236000
diff --git a/resource/db/org_sql.xml b/resource/db/org_sql.xml
index 465cf1f..d2d4dac 100644
--- a/resource/db/org_sql.xml
+++ b/resource/db/org_sql.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE sqls SYSTEM "sql_definition.dtd">
<sqls>
	<sql group="rushfee_org">
		<i id="getOrgList"><![CDATA[
		     select 
		     	org_id id,
		     	org_short_name text,
		     	parent_org_id pid
		     from 
		     	COMPANY_ORGANIZE
		     where org_id !=3701 order by org_id
		]]></i>

		<i id="getOrgListByUser"><![CDATA[

    select distinct city_name id,city_name text,'0' pid from  tel_dic_city

WHERE city_name in(select org_name from  SHUIJU_QUYU_USER where  user_id ={userId})

		]]></i>



		<i id="getRecordList"><![CDATA[
		     select 
		     	*
		     from 
		     	RUSH_RECORD
		]]></i>
		<i id="getRevenueByOrgId"><![CDATA[
		     select 
		     	revenueid id,
		     	revenuename text
		     from 
		     	REVENUE_INFO_FORMAL
		     where companyid ={companyid}
		]]></i>
		
	</sql>
</sqls>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE sqls SYSTEM "sql_definition.dtd">
<sqls>
	<sql group="rushfee_org">
		<i id="getOrgList"><![CDATA[
		     select 
		     	org_id id,
		     	org_short_name text,
		     	parent_org_id pid
		     from 
		     	COMPANY_ORGANIZE
		     where org_id !=3701 order by org_id
		]]></i>


		<i id="getOrgListhotwire"><![CDATA[
		     select
		     	org_id id,
		     	org_short_name||'分公司' text,
		     	parent_org_id pid
		     from
		     	COMPANY_ORGANIZE
		     where org_id !=3701 order by org_id
		]]></i>

		<i id="getOrgListByUser"><![CDATA[

    select distinct city_name id,city_name text,'0' pid from  tel_dic_city

WHERE city_name in(select org_name from  SHUIJU_QUYU_USER where  user_id ={userId})

		]]></i>



		<i id="getRecordList"><![CDATA[
		     select 
		     	*
		     from 
		     	RUSH_RECORD
		]]></i>
		<i id="getRevenueByOrgId"><![CDATA[
		     select 
		     	revenueid id,
		     	revenuename text
		     from 
		     	REVENUE_INFO_FORMAL
		     where companyid ={companyid}
		]]></i>
		
	</sql>
</sqls>
\ No newline at end of file
diff --git a/resource/html/bureau/hotadd.html b/resource/html/bureau/hotadd.html
new file mode 100644
index 0000000..29f2a6e
--- /dev/null
+++ b/resource/html/bureau/hotadd.html
@@ -0,0 +1,73 @@
+<html   login="false">
+<head>
+    <title>客户信息明细</title>
+</head>
+<body >
+<div widget="toolbar" >
+    <a widget="button" iconCls="icon-admin" id="savebtn" onclick="save">保存</a>
+    <a widget="button" iconCls="icon-exit" onclick="CloseWindow()">退出</a>
+</div>
+
+<!--<input widget="autocomplete"  name="custname"  label="查询客户"  url="rush/search/gettaskpeople"
+       popupEmptyText="请选择"  textfield="cname" valuefield="cguid"
+
+       style="margin-left:-16px;width: 500px;" showClose="true" oncloseclick ="conCloseClick"/>-->
+<input widget="edit" name="khid" label="客户id"  style="width:400px;margin-top:5px"/>
+<br/>
+<input widget="edit" name="custname" label="客户名称"  style="width:400px;margin-top:5px"/>
+<br/>
+<input widget="edit" name="custtaxno" label="客户税号"  style="width:400px;margin-top:5px"/>
+<br/>
+<input widget="edit" name="mobile" label="联系电话"  style="width:400px;margin-top:5px"/>
+<br/>
+<input name="enddate" widget=datechooser  allowinput="ture"   label="到期日期" style="width:400px;margin-top:5px">
+<br/>
+
+<div name="state" required label="状态" widget="radiobuttonlist"
+     repeatitems="2" repeatlayout="table" textfield="text" valuefield="id"
+     data="[{id:0,text:'无效'},{id:1,text:'有效'}]" style="width:400px;margin-top:5px">
+</div>
+<br/>
+<input widget="combox" name="orgname" label="分公司" url="rush/hot/getOrgList" style="width:400px;margin-top:5px"
+       emptyText="请选择" textField="text" valueField="text" allowInput="false"
+       showNullItem="true"/>
+<br/>
+<input widget="int"  name="mlevel" label="等级"  maxValue="100"  style="width:400px;margin-top:5px"/>
+<br/>
+<input widget="int"  name="mprice" label="金额"  maxValue="100000" style="width:400px;margin-top:5px"/>
+
+
+</body>
+<script type="text/javascript">
+    var grid = aos.get('grid');
+    aos.get('state').setValue(1);
+
+    function save(){
+        var data = aos.getForm().getData();
+        data['khid']=aos.get('khid').getValue();
+        data['custname']=aos.get('custname').getValue();
+        data['custtaxno']=aos.get('custtaxno').getValue();
+        data['mobile']=aos.get('mobile').getValue();
+        data['enddate']=aos.get('enddate').getValue();
+        data['state']=aos.get('state').getValue();
+        data['orgname']=aos.get('orgname').getValue();
+        data['mlevel']=aos.get('mlevel').getValue();
+        data['mprice']=aos.get('mprice').getValue();
+        aos.post({
+            url:"rush/hot/save",
+            data:data,
+            success:function(data){
+                if(data=1){
+                CloseWindow();}
+                else{
+                    aos.tip('服务错误联系管理员！');
+                }
+            }
+        });
+    }
+
+
+
+
+</script>
+</html>
\ No newline at end of file
diff --git a/resource/html/bureau/hotwireclass.html b/resource/html/bureau/hotwireclass.html
new file mode 100644
index 0000000..e8ce59f
--- /dev/null
+++ b/resource/html/bureau/hotwireclass.html
@@ -0,0 +1,113 @@
+<html login="false" auth="false">
+<head>
+    <meta charset="UTF-8">
+    <title>热线等级</title>
+</head>
+<body>
+<div widget="toolbar" style="padding:5px;border:0;">
+
+
+    <input widget="combox" name="orgname" label="分公司" url="rush/hot/getOrgList"
+           emptyText="请选择" textField="text" valueField="text" allowInput="false"
+           showNullItem="true"/>
+    <input widget="edit" name="custname" label="客户名称"/>
+    <input widget="edit" name="custtaxno" label="客户税号"/>
+    <input widget="edit" name="mobile" label="联系电话"/>
+    <input name="state" widget=combox allowinput="f" style="width: 200px;" showNullItem="true"
+           data="[{id:'0',text:'无效'},{id:'1',text:'有效'}]" emptyText="请选择" label="状态">
+    <a widget="button" iconCls="icon-search" onclick="search()">查询</a>
+	<a widget="button" iconCls="icon-add" onclick="add">新增</a>
+</div>
+<div widget="autosize">
+    <div widget="datagrid" name="grid" style="width: 100%; height: 100%;" url="rush/hot/getlist">
+        <div type="indexcolumn" width="35" header="序号"></div>
+        <div field="id" visible="id"></div>
+        <div field="khid" visible="id"></div>
+        <div field="custname" width="60" header="客户名称" align="center"></div>
+        <div field="custtaxno" width="60" header="客户税号" align="center"></div>
+        <div field="createdate" width="60" header="创建日期" align="center"></div>
+        <div field="mobile" width="50" header="联系电话" align="center"></div>
+		<div field="enddate" width="35" header="到期日期" align="center"></div>
+        <div field="orgname" width="50" header="分公司" align="center"></div>
+        <div field="state" width="30" header="状态" renderer="statetype" align="center"></div>
+        <div field="mlevel" width="30" header="等级" align="center"></div>
+        <div field="mprice" width="40" header="金额" align="center"></div>
+        <div field="caozuo" width="45" align="center" renderer="onRenderer" header="操作"></div>
+    </div>
+</div>
+</body>
+
+<script type="text/javascript">
+
+    var grid = aos.get('grid');
+    function search() {
+        var grid = aos.get('grid');
+        var params = {
+            mobile: aos.get('mobile').getValue(),
+            custname: aos.get('custname').getValue(),
+            custtaxno: aos.get('custtaxno').getValue(),
+            orgname: aos.get('orgname').getValue(),
+            state: aos.get('state').getValue()
+        };
+        grid.load(params);
+    }
+
+
+    function onRenderer(e) {
+        if (e.row.state == '0') {
+            return "<a href='javascript:void(0)' style='text-decoration:none' onclick='huifu(\"" + e.row.id + "\")'>" + "恢复";
+        }
+        if (e.row.state=='1') {
+                return "<a href='javascript:void(0)' style='text-decoration:none' onclick='rekp(\"" + e.row.id + "\")'>" + "删除";
+            }
+            return "暂无操作";
+
+    }
+
+
+    function rekp(id) {
+        aos.post({
+            url: 'rush/hot/delete',
+            data: {id: id},
+            success: function () {
+                grid.reload();
+            }
+
+        });
+    }
+
+    function huifu(id) {
+        aos.post({
+            url: 'rush/hot/huifu',
+            data: {id: id},
+            success: function () {
+                grid.reload();
+            }
+
+        });
+    }
+
+
+    function statetype(e) {
+        var row = e.row;
+        var value = row.state;
+        if (value == '0') {
+            return '<p style="color:red;">无效</p>';
+        }
+        if (value == '1') {
+            return '<p style="color:green;">有效</p>';
+
+        } else {
+            return value;
+        }
+    }
+
+    function  add() {
+		var param = {};
+		aos.showWindow('canvas/bureau/hotadd', param, '600px', '500px', '热线数据新增', function(rtnValue){
+			grid.reload();
+		});
+	}
+
+</script>
+</html>
\ No newline at end of file
diff --git a/resource/html/bureau/recording.html b/resource/html/bureau/recording.html
index 063a3af..c8dc9fa 100644
--- a/resource/html/bureau/recording.html
+++ b/resource/html/bureau/recording.html
@@ -42,8 +42,8 @@
 				<div field="start_time" width="70" header="来电时间" align="center"></div>
 				<div field="end_time" width="70" header="结束时间" align="center"></div>
 				<div field="record_duration" width="40" header="录音时长(秒)"  align="center"></div>
-				<div field="call_type" width="35"  align="center"  header="呼叫类型" ></div>
-				<div field="callstate" width="35" renderer="callType" align="center"  header="呼入/呼出" ></div>
+<!--				<div field="call_type" width="35"  align="center"  header="呼叫类型" ></div>-->
+				<div field="call_type" width="35" renderer="callType" align="center"  header="呼入/呼出" ></div>
 				<!--<div field="down"  width="40" header="下载" renderer="downRender" align="center"></div>-->
 				<div field="play"  width="40" header="调听" renderer="playRender" align="center"></div>
 				<div field="caller_phone" width="50" header="来电号码" align="center" ></div>
@@ -136,7 +136,7 @@
 
 	   function callType(e){
 		   var row=e.row;
-		   var value=row.callstate;
+		   var value=row.call_type;
 		   if(value=='0'){
 			   return '<p style="color:red;">呼入</p>';
 		   }
diff --git a/resource_global/config.xml b/resource_global/config.xml
index 5437dbc..28508f6 100644
--- a/resource_global/config.xml
+++ b/resource_global/config.xml
@@ -116,6 +116,15 @@
 			<prop name="password">aisinocrm2014</prop>
 			<prop name="decrypt">false</prop>
 		</ds>
+		<ds id="call_center">
+			<prop name="desc">呼叫中心db</prop>
+			<prop name="type">oracle</prop>
+			<prop name="driver">oracle.jdbc.driver.OracleDriver</prop>
+			<prop name="url">jdbc:oracle:thin:@//10.2.2.30:1526/ipcc</prop><!--正式-->
+			<prop name="username">useraisino</prop>
+			<prop name="password">useraisino</prop>
+			<prop name="decrypt">false</prop>
+		</ds>
 		<!-- 
 		<ds id="oracle_crm">
             <prop name="desc">oracle_crm系统</prop>
diff --git a/src/rush/HotWireClass.java b/src/rush/HotWireClass.java
new file mode 100644
index 0000000..9df4bc7
--- /dev/null
+++ b/src/rush/HotWireClass.java
@@ -0,0 +1,86 @@
+package rush;
+
+import com.aisino.aosplus.core.dao.DbHelper;
+import com.aisino.aosplus.core.mvc.annotation.Action;
+import com.aisino.aosplus.core.mvc.annotation.Request;
+import com.aisino.aosplus.core.mvc.bean.Params;
+import com.aisino.aosplus.core.util.Guid;
+import com.aisino.aosplus.session.SessionHelper;
+import org.apache.log4j.Logger;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+
+@Action("rush/hot")
+public class HotWireClass {
+    private static Logger logger = Logger.getLogger(HotWireClass.class);
+
+    @Request.Post("getlist")
+    public Map getlist(Params params) {
+        String custname=params.getString("custname");
+        String mobile=params.getString("mobile");
+        String custtaxno=params.getString("custtaxno");
+        String orgname=params.getString("orgname");
+        String state=params.getString("state");
+        StringBuilder sb = new StringBuilder();
+        if(custname!=null){
+            sb.append(" and custname  like '%" + custname + "%'");
+        }
+        if(mobile!=null){
+            sb.append(" and mobile  like '%" + mobile + "%'");
+        }
+        if(orgname!=null){
+            sb.append(" and orgname  like '%" + orgname + "%'");
+        }
+        if(state!=null){
+            sb.append(" and state = "+state);
+        }
+        if(custtaxno!=null){
+            sb.append(" and custtaxno  like '%" + custtaxno + "%'");
+        }
+        sb.append("order by createdate desc");
+        Map map = DbHelper.getDbService("call_center").queryPageMapList("select * from T_CALLCENTER_MEMBER where 1=1  "+sb ,params);
+        return map;
+    }
+
+
+    @Request.Post("delete")
+    public void delete(Params params) {
+        String id=params.getString("id");
+        DbHelper.getDbService("call_center").update("update T_CALLCENTER_MEMBER set state=0 where id =?",id);
+    }
+
+    @Request.Post("huifu")
+    public void huifu(Params params) {
+        String id=params.getString("id");
+        DbHelper.getDbService("call_center").update("update T_CALLCENTER_MEMBER set state=1 where id =?",id);
+    }
+
+
+    @Request.Get("getOrgList")
+    public List<Map> getOrgList(Params params){
+            List<Map> returns = DbHelper.getDbService().queryMapListById("rushfee_org.getOrgList", params);
+            return  returns;
+    }
+
+
+    @Request.Post("save")
+    @Request.Get("save")
+    public int save(Params params){
+        try{
+            String sqlString="INSERT INTO T_CALLCENTER_MEMBER(ID, KHID,CUSTNAME,CUSTTAXNO,MOBILE,ORGNAME,STATE,MLEVEL,ENDDATE,MPRICE) "+
+                    "  VALUES (seq_callcenter_member.nextval,{khid},{custname},{custtaxno},{mobile},{orgname},{state},{mlevel},{enddate},{mprice})";
+            DbHelper.getDbService("call_center").update(sqlString,params);
+            return 1;
+
+        }
+        catch(Exception e){
+            return 0;
+        }
+    }
+
+
+
+}