From 4712b1386c60dce1a97c92c523c100512aa52d6e Mon Sep 17 00:00:00 2001
From: zxf <zxf123456>
Date: Tue, 26 Sep 2023 08:20:25 +0800
Subject: [PATCH] =?UTF-8?q?=E7=83=AD=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build/classes/db/org_sql.xml                  |   2 +-
 build/classes/html/bureau/hotupdate.html      |  77 +++++++++++++
 build/classes/html/bureau/hotwireclass.html   |  11 ++
 build/classes/html/bureau/weihu.html          | 103 ++++++++++++++++++
 build/classes/html/bureau/yulan.html          |  57 ++++++++++
 build/classes/rush/HotWireClass.class         | Bin 5679 -> 6481 bytes
 .../WEB-INF/classes/db/org_sql.xml            |   2 +-
 .../classes/html/bureau/hotupdate.html        |  77 +++++++++++++
 .../classes/html/bureau/hotwireclass.html     |  11 ++
 .../WEB-INF/classes/html/bureau/weihu.html    | 103 ++++++++++++++++++
 .../WEB-INF/classes/html/bureau/yulan.html    |  57 ++++++++++
 .../WEB-INF/classes/rush/HotWireClass.class   | Bin 5679 -> 6481 bytes
 .../artifacts/rushfee_Web_exploded/ptrun.ini  |   2 +-
 resource/db/org_sql.xml                       |   2 +-
 resource/html/bureau/hotupdate.html           |   4 +-
 resource/html/bureau/hotwireclass.html        |  11 ++
 src/rush/HotWireClass.java                    |  40 ++++++-
 17 files changed, 551 insertions(+), 8 deletions(-)
 create mode 100644 build/classes/html/bureau/hotupdate.html
 create mode 100644 build/classes/html/bureau/weihu.html
 create mode 100644 build/classes/html/bureau/yulan.html
 create mode 100644 classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/bureau/hotupdate.html
 create mode 100644 classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/bureau/weihu.html
 create mode 100644 classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/bureau/yulan.html

diff --git a/build/classes/db/org_sql.xml b/build/classes/db/org_sql.xml
index d2d4dac..8e14aff 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="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
+<?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="getmprice"><![CDATA[
		    select DISTINCT MPRICE text  from  T_CALLCENTER_MEMBER  order by  MPRICE
		]]></i>

		<i id="getmlevel"><![CDATA[
		    select DISTINCT mlevel text  from  T_CALLCENTER_MEMBER  order by  mlevel
		]]></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/hotupdate.html b/build/classes/html/bureau/hotupdate.html
new file mode 100644
index 0000000..10f547f
--- /dev/null
+++ b/build/classes/html/bureau/hotupdate.html
@@ -0,0 +1,77 @@
+<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 name="id" widget="hidden"  />
+<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="edit"  name="mlevel" label="等级"  maxValue="100"  minValue="-9999" style="width:400px;margin-top:5px"/>
+<br/>
+<input widget="num"  name="mprice" label="金额"  maxValue="100000" style="width:400px;margin-top:5px"/>
+
+
+</body>
+<script type="text/javascript">
+    var grid = aos.get('grid');
+
+    function init(params) {
+        aos.getForm().setData(params);
+        aos.get('mlevel').setValue(params.mlevel);
+    }
+
+
+
+
+
+
+
+
+    function save(){
+        var data = aos.getForm().getData();
+        data['id']=aos.get('id').getValue();
+        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['mlevel']=aos.get('mlevel').getValue();
+        data['mprice']=aos.get('mprice').getValue();
+        aos.post({
+            url:"rush/hot/update",
+            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
index 4b8163e..6091924 100644
--- a/build/classes/html/bureau/hotwireclass.html
+++ b/build/classes/html/bureau/hotwireclass.html
@@ -15,6 +15,15 @@
     <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="状态">
+
+    <input widget="combox" name="mprice" label="价格" url="rush/hot/getmprice" multiSelect="true"
+           emptyText="请选择" textField="text" valueField="text" allowInput="false"
+           showNullItem="true"/>
+
+    <input widget="combox" name="mlevel" label="等级" url="rush/hot/getmlevel" multiSelect="true"
+           emptyText="请选择" textField="text" valueField="text" allowInput="false"
+           showNullItem="true"/>
+
     <a widget="button" iconCls="icon-search" onclick="search()">查询</a>
 	<a widget="button" iconCls="icon-add" onclick="add">新增</a>
     <a widget="button" iconCls="icon-save" onclick="weihu">维护</a>
@@ -48,6 +57,8 @@
             custname: aos.get('custname').getValue(),
             custtaxno: aos.get('custtaxno').getValue(),
             orgname: aos.get('orgname').getValue(),
+            mlevel: aos.get('mlevel').getValue(),
+            mprice: aos.get('mprice').getValue(),
             state: aos.get('state').getValue()
         };
         grid.load(params);
diff --git a/build/classes/html/bureau/weihu.html b/build/classes/html/bureau/weihu.html
new file mode 100644
index 0000000..602838d
--- /dev/null
+++ b/build/classes/html/bureau/weihu.html
@@ -0,0 +1,103 @@
+<html login="false">
+<head>
+    <meta charset="UTF-8">
+    <title>CRM流向不一致处理</title>
+</head>
+<body>
+    <div widget="toolbar">
+           </div>
+
+    <p style ="color:red;text-align:center;">注意：以下为批量维护等级，输入条件 更新等级 可以预览！确认无误执行！</p>
+
+    <p style ="color:#2a20ff;text-align:center;">-------------------------------查询选项-------------------------------</p>
+    <input widget="edit" name="mobile" label="电话" required="false" style="margin-top:5px"/>
+    <br/>
+    <input widget="edit" name="mprice" label="金额" required="false" style="margin-top:5px"/>
+    <br/>
+    <input widget="edit" name="mlevel" label="等级" required="false" style="margin-top:5px"/>
+    <a widget="button" iconCls="icon-search" onclick="yulan" linkToState="editold,editnew">预览</a>
+    <p style ="color:#2a20ff;text-align:center;">-------------------------------更新选项-------------------------------</p>
+    <input widget="edit" name="updatemlevel" label="等级" required="true" style="margin-top:5px"/>
+    <a widget="button" iconCls="icon-save" onclick="save" linkToState="editold,editnew">执行</a>
+
+    <br/>
+    <br/>
+    <br/>
+    <br/>
+    <br/>
+
+
+
+
+    <p style ="color:red;text-align:center;">注意：以下为批量更新电话，按照模板进行导入！(开发中)</p>
+
+    <br/>
+    <input id="fileupload1" widget="fileupload" limitType="*.xlsx" label="批量导入"
+           flashUrl="www/lib/uploader/swfupload/swfupload.swf"
+           uploadUrl="crm_sku/importExlfile" buttonText="浏览" width="120px"
+           uploadOnSelect="false" onuploadsuccess="onUploadSuccess"
+           onuploaderror="onUploadError" onfileselect="onFileSelect" />
+    <a widget="button" iconCls="icon-import" onclick="startUpload()">批量执行</a>
+    <script type="text/javascript">
+        var isSaving = false;
+        function save(){
+            if(isSaving){
+                aos.tip('正在处理中...');
+                return;
+            }else{
+                isSaving=true;
+            }
+            if(!FORM.validate())
+            {
+                isSaving = false;
+                return;
+            }
+            aos.post({
+                url:"rush/hot/updatedengji",
+                data:aos.getForm().getData(),
+                success:function(data, textStatus, jqXHR){
+                    if(data == 1){
+                        aos.get("updatemlevel").setValue("");
+                        aos.tip("已按照条件维护成功！");
+                        isSaving=false;
+                    }
+                    else{
+                        aos.tip("维护失败！");
+                        isSaving=false;
+                    }
+                }
+            });
+        }
+
+        function startUpload() {
+
+            var fileupload = aos.get("fileupload1");
+            var param = {state:aos.get("state2").getValue()};
+            fileupload.setPostParam(param);
+            fileupload.startUpload();
+        }
+        function onFileSelect(e) {//file,sender,source,type[fileselect]
+            var file=e.file;//size,modificationdate,creationdate,post,type[.txt],id,name,filestatus,index[0]
+            //alert(file.name);
+        }
+        function onUploadSuccess(e) {
+            var result=aos.decode(e.serverData);
+            aos.alert(result.data.info);
+            this.setText("");
+        }
+
+
+        function  yulan() {
+            var params = {
+                mobile: aos.get('mobile').getValue(),
+                mlevel: aos.get('mlevel').getValue(),
+                mprice: aos.get('mprice').getValue()
+            };
+            aos.showWindow('canvas/bureau/yulan', params, '1000px', '800px', '维护预览', function(rtnValue){
+
+            });
+        }
+
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/build/classes/html/bureau/yulan.html b/build/classes/html/bureau/yulan.html
new file mode 100644
index 0000000..45e8c02
--- /dev/null
+++ b/build/classes/html/bureau/yulan.html
@@ -0,0 +1,57 @@
+<html login="false" auth="false">
+<head>
+    <meta charset="UTF-8">
+    <title>热线等级</title>
+</head>
+<body>
+<div widget="toolbar" style="padding:5px;border:0;">
+
+</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>
+</div>
+</body>
+
+<script type="text/javascript">
+
+    var grid = aos.get('grid');
+    function init(params) {
+        var grid = aos.get('grid');
+
+        grid.load(params);
+    }
+
+
+
+
+    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;
+        }
+    }
+
+
+
+</script>
+</html>
\ No newline at end of file
diff --git a/build/classes/rush/HotWireClass.class b/build/classes/rush/HotWireClass.class
index ce6ec8d3d832e7b45ded75d5bbad6b1458c53c5c..2c75cee06fe1a7ce9d77c40ce6a10802f33d12e0 100644
GIT binary patch
literal 6481
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
O!m6!AhU-Xe<$nPtlT6qE

delta 2221
zcmbVNX>3$g6#njP@4naRKwrziv~+AKZJ{$jK?+!b0+yWuQnVHX1OWk2y0|YqP*7Pd
zTopIm5fNmo4iyB~pz()<Aj%)335h0}=ug8B#qYjZIx$U5Oy=Et=ALu!JLfy!ci;ID
zN8--cf1f-9U?je<5XA!$^%fq)LlRRYrb<kcm@Y9xVy1zIEm%6@5j{UDv0l%P#0H6t
z5|2qdF0n~sv&0h;Pg-~iTO_vXpluemV~4~diJb<X*8e&rb}^&@yCsxfct+w`JwIn)
zk3_4)^AayeyeRRKi5k2tvDd;Ycva#xiPt6Gka$z#EuF1nV4wEAz3cK<>NoMdwa>tQ
z1Me_pb<PtN?{@y~*(=0BwcS^zF8daXJ!+DFcg}UFWn2)4@Sgh7Uz2+nM+7|Ol|dZE
zF;yB^s79IPsw*%!a6E`kysv%<jL12R4-6!NIDszJY7A1di~-&@d`Nq=w-YDTL8Hif
z3LmK}#;;sIt$vnG`RkUgUb~{CWL!z5fZ*|?F-EnT6@fEBe2h=jUh};7Q+%dctvd0!
zI%fUV`BTn0k5j{b0D|x_o|Z|QDRaD@|AuiEoc&cNAdb=SU@XUgyO@h{w1de2j7J^+
z2~5C5Msc&J9bV*cX<p3sB;aj`**;FQW451DtuJN=5>P{XU2uvc<|$asCy-+oB#;|1
zI3&=EV^c()MV7mdcFQccX@_-~-M0(<(q}|;keNUs&xj>ZRBJ`7qs-0g=DrdU+BOX2
zBZLBkp+b3Mox%76Rl-DEgfK)5!Z1;dYB2}H-6C6(g`|pPNtlEiSgavtq8^i3a7ff+
z3N0_fVl1Z8@*yflVj3+!DnuO9X$3G;48#mt21begm`O{bPUJh7g$9^>p%=3;hwYfl
zEQi3jilwj&+-P8)fySPG^MTT`XjwFho46&1SvB)n(9TW>EX1wJZt$1@&jyNOc7NRs
z7c#rpcN)=VZ`^52;F_lH4u{;>(M)p;3P}jv>5}CBGzch4gFqA)u@KL{6IjRu7XL>A
zCCLPwc#jE;V*=xuK;8dKU@;R|g4>w4CbOP30>Lhn+5^apvW9q?7Y+!yht7J=le69y
z%#<5Um8;{HVj0KV^<jKPa%DMJR&d3Gl^Gyb)5}gQ;j{*K(xvloQhDUt1Cw2d#}W?8
zn|y~FyoVSG^g?e`FiLAJO!|P_@RAiFvZ6N{k%#$iid7_;7r9vLqMyg}@50?2L2f7Y
zsI4SbHJ_;4xdzs`=@l?8MU*vIotI2>4X2i5qUwh}11D5!rTSCCstrT}X^joi8l#Rg
zIt|!^wGiWH(Z4&YKuru6i#}>exY((pdk7z!z^8Y)9E|W9&^j$|I*xeyd>!dJ(!oQ!
z(fJk^Gw95ql0o(vBwC0#huP&Q+f&H~O=N?nV>z)~ft3#KU|p-QnT^;&Yd@h%5UdM?
z<09Jd9ok(;=TVOazHv25RpZOFs(FcOwNll*m0M}~`I5t~Yy;fg4gIAI^p~=rcdFsL
zN@f^6X_*p^mR_aYJxMP_4_#_OicKwSQd^o$!ozemt2^vrDK_;sT}{XAYId)&nHMdu
zUv;H#KQUa{{VE(Se^+f;c#j~?aX$979N3JJJ>brdYX<j1atT<^H#;n91GZr!y_>L;
z0PDLV$;_=OX70>_r^CtM(~*Ubg!mIXdMLXsU3MEg)1LV<mAXRV_sXv6!l+Kf_1z`1
pzE1iEyN7EY+?$c(eT-O8)Q<ac3q3Y{H{$@BDom2&09I9){{W#2WHtZ*

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 d2d4dac..8e14aff 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="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
+<?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="getmprice"><![CDATA[
		    select DISTINCT MPRICE text  from  T_CALLCENTER_MEMBER  order by  MPRICE
		]]></i>

		<i id="getmlevel"><![CDATA[
		    select DISTINCT mlevel text  from  T_CALLCENTER_MEMBER  order by  mlevel
		]]></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/hotupdate.html b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/bureau/hotupdate.html
new file mode 100644
index 0000000..10f547f
--- /dev/null
+++ b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/bureau/hotupdate.html
@@ -0,0 +1,77 @@
+<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 name="id" widget="hidden"  />
+<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="edit"  name="mlevel" label="等级"  maxValue="100"  minValue="-9999" style="width:400px;margin-top:5px"/>
+<br/>
+<input widget="num"  name="mprice" label="金额"  maxValue="100000" style="width:400px;margin-top:5px"/>
+
+
+</body>
+<script type="text/javascript">
+    var grid = aos.get('grid');
+
+    function init(params) {
+        aos.getForm().setData(params);
+        aos.get('mlevel').setValue(params.mlevel);
+    }
+
+
+
+
+
+
+
+
+    function save(){
+        var data = aos.getForm().getData();
+        data['id']=aos.get('id').getValue();
+        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['mlevel']=aos.get('mlevel').getValue();
+        data['mprice']=aos.get('mprice').getValue();
+        aos.post({
+            url:"rush/hot/update",
+            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
index 4b8163e..6091924 100644
--- 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
@@ -15,6 +15,15 @@
     <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="状态">
+
+    <input widget="combox" name="mprice" label="价格" url="rush/hot/getmprice" multiSelect="true"
+           emptyText="请选择" textField="text" valueField="text" allowInput="false"
+           showNullItem="true"/>
+
+    <input widget="combox" name="mlevel" label="等级" url="rush/hot/getmlevel" multiSelect="true"
+           emptyText="请选择" textField="text" valueField="text" allowInput="false"
+           showNullItem="true"/>
+
     <a widget="button" iconCls="icon-search" onclick="search()">查询</a>
 	<a widget="button" iconCls="icon-add" onclick="add">新增</a>
     <a widget="button" iconCls="icon-save" onclick="weihu">维护</a>
@@ -48,6 +57,8 @@
             custname: aos.get('custname').getValue(),
             custtaxno: aos.get('custtaxno').getValue(),
             orgname: aos.get('orgname').getValue(),
+            mlevel: aos.get('mlevel').getValue(),
+            mprice: aos.get('mprice').getValue(),
             state: aos.get('state').getValue()
         };
         grid.load(params);
diff --git a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/bureau/weihu.html b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/bureau/weihu.html
new file mode 100644
index 0000000..602838d
--- /dev/null
+++ b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/bureau/weihu.html
@@ -0,0 +1,103 @@
+<html login="false">
+<head>
+    <meta charset="UTF-8">
+    <title>CRM流向不一致处理</title>
+</head>
+<body>
+    <div widget="toolbar">
+           </div>
+
+    <p style ="color:red;text-align:center;">注意：以下为批量维护等级，输入条件 更新等级 可以预览！确认无误执行！</p>
+
+    <p style ="color:#2a20ff;text-align:center;">-------------------------------查询选项-------------------------------</p>
+    <input widget="edit" name="mobile" label="电话" required="false" style="margin-top:5px"/>
+    <br/>
+    <input widget="edit" name="mprice" label="金额" required="false" style="margin-top:5px"/>
+    <br/>
+    <input widget="edit" name="mlevel" label="等级" required="false" style="margin-top:5px"/>
+    <a widget="button" iconCls="icon-search" onclick="yulan" linkToState="editold,editnew">预览</a>
+    <p style ="color:#2a20ff;text-align:center;">-------------------------------更新选项-------------------------------</p>
+    <input widget="edit" name="updatemlevel" label="等级" required="true" style="margin-top:5px"/>
+    <a widget="button" iconCls="icon-save" onclick="save" linkToState="editold,editnew">执行</a>
+
+    <br/>
+    <br/>
+    <br/>
+    <br/>
+    <br/>
+
+
+
+
+    <p style ="color:red;text-align:center;">注意：以下为批量更新电话，按照模板进行导入！(开发中)</p>
+
+    <br/>
+    <input id="fileupload1" widget="fileupload" limitType="*.xlsx" label="批量导入"
+           flashUrl="www/lib/uploader/swfupload/swfupload.swf"
+           uploadUrl="crm_sku/importExlfile" buttonText="浏览" width="120px"
+           uploadOnSelect="false" onuploadsuccess="onUploadSuccess"
+           onuploaderror="onUploadError" onfileselect="onFileSelect" />
+    <a widget="button" iconCls="icon-import" onclick="startUpload()">批量执行</a>
+    <script type="text/javascript">
+        var isSaving = false;
+        function save(){
+            if(isSaving){
+                aos.tip('正在处理中...');
+                return;
+            }else{
+                isSaving=true;
+            }
+            if(!FORM.validate())
+            {
+                isSaving = false;
+                return;
+            }
+            aos.post({
+                url:"rush/hot/updatedengji",
+                data:aos.getForm().getData(),
+                success:function(data, textStatus, jqXHR){
+                    if(data == 1){
+                        aos.get("updatemlevel").setValue("");
+                        aos.tip("已按照条件维护成功！");
+                        isSaving=false;
+                    }
+                    else{
+                        aos.tip("维护失败！");
+                        isSaving=false;
+                    }
+                }
+            });
+        }
+
+        function startUpload() {
+
+            var fileupload = aos.get("fileupload1");
+            var param = {state:aos.get("state2").getValue()};
+            fileupload.setPostParam(param);
+            fileupload.startUpload();
+        }
+        function onFileSelect(e) {//file,sender,source,type[fileselect]
+            var file=e.file;//size,modificationdate,creationdate,post,type[.txt],id,name,filestatus,index[0]
+            //alert(file.name);
+        }
+        function onUploadSuccess(e) {
+            var result=aos.decode(e.serverData);
+            aos.alert(result.data.info);
+            this.setText("");
+        }
+
+
+        function  yulan() {
+            var params = {
+                mobile: aos.get('mobile').getValue(),
+                mlevel: aos.get('mlevel').getValue(),
+                mprice: aos.get('mprice').getValue()
+            };
+            aos.showWindow('canvas/bureau/yulan', params, '1000px', '800px', '维护预览', function(rtnValue){
+
+            });
+        }
+
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/bureau/yulan.html b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/bureau/yulan.html
new file mode 100644
index 0000000..45e8c02
--- /dev/null
+++ b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/bureau/yulan.html
@@ -0,0 +1,57 @@
+<html login="false" auth="false">
+<head>
+    <meta charset="UTF-8">
+    <title>热线等级</title>
+</head>
+<body>
+<div widget="toolbar" style="padding:5px;border:0;">
+
+</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>
+</div>
+</body>
+
+<script type="text/javascript">
+
+    var grid = aos.get('grid');
+    function init(params) {
+        var grid = aos.get('grid');
+
+        grid.load(params);
+    }
+
+
+
+
+    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;
+        }
+    }
+
+
+
+</script>
+</html>
\ No newline at end of file
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
index ce6ec8d3d832e7b45ded75d5bbad6b1458c53c5c..2c75cee06fe1a7ce9d77c40ce6a10802f33d12e0 100644
GIT binary patch
literal 6481
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
O!m6!AhU-Xe<$nPtlT6qE

delta 2221
zcmbVNX>3$g6#njP@4naRKwrziv~+AKZJ{$jK?+!b0+yWuQnVHX1OWk2y0|YqP*7Pd
zTopIm5fNmo4iyB~pz()<Aj%)335h0}=ug8B#qYjZIx$U5Oy=Et=ALu!JLfy!ci;ID
zN8--cf1f-9U?je<5XA!$^%fq)LlRRYrb<kcm@Y9xVy1zIEm%6@5j{UDv0l%P#0H6t
z5|2qdF0n~sv&0h;Pg-~iTO_vXpluemV~4~diJb<X*8e&rb}^&@yCsxfct+w`JwIn)
zk3_4)^AayeyeRRKi5k2tvDd;Ycva#xiPt6Gka$z#EuF1nV4wEAz3cK<>NoMdwa>tQ
z1Me_pb<PtN?{@y~*(=0BwcS^zF8daXJ!+DFcg}UFWn2)4@Sgh7Uz2+nM+7|Ol|dZE
zF;yB^s79IPsw*%!a6E`kysv%<jL12R4-6!NIDszJY7A1di~-&@d`Nq=w-YDTL8Hif
z3LmK}#;;sIt$vnG`RkUgUb~{CWL!z5fZ*|?F-EnT6@fEBe2h=jUh};7Q+%dctvd0!
zI%fUV`BTn0k5j{b0D|x_o|Z|QDRaD@|AuiEoc&cNAdb=SU@XUgyO@h{w1de2j7J^+
z2~5C5Msc&J9bV*cX<p3sB;aj`**;FQW451DtuJN=5>P{XU2uvc<|$asCy-+oB#;|1
zI3&=EV^c()MV7mdcFQccX@_-~-M0(<(q}|;keNUs&xj>ZRBJ`7qs-0g=DrdU+BOX2
zBZLBkp+b3Mox%76Rl-DEgfK)5!Z1;dYB2}H-6C6(g`|pPNtlEiSgavtq8^i3a7ff+
z3N0_fVl1Z8@*yflVj3+!DnuO9X$3G;48#mt21begm`O{bPUJh7g$9^>p%=3;hwYfl
zEQi3jilwj&+-P8)fySPG^MTT`XjwFho46&1SvB)n(9TW>EX1wJZt$1@&jyNOc7NRs
z7c#rpcN)=VZ`^52;F_lH4u{;>(M)p;3P}jv>5}CBGzch4gFqA)u@KL{6IjRu7XL>A
zCCLPwc#jE;V*=xuK;8dKU@;R|g4>w4CbOP30>Lhn+5^apvW9q?7Y+!yht7J=le69y
z%#<5Um8;{HVj0KV^<jKPa%DMJR&d3Gl^Gyb)5}gQ;j{*K(xvloQhDUt1Cw2d#}W?8
zn|y~FyoVSG^g?e`FiLAJO!|P_@RAiFvZ6N{k%#$iid7_;7r9vLqMyg}@50?2L2f7Y
zsI4SbHJ_;4xdzs`=@l?8MU*vIotI2>4X2i5qUwh}11D5!rTSCCstrT}X^joi8l#Rg
zIt|!^wGiWH(Z4&YKuru6i#}>exY((pdk7z!z^8Y)9E|W9&^j$|I*xeyd>!dJ(!oQ!
z(fJk^Gw95ql0o(vBwC0#huP&Q+f&H~O=N?nV>z)~ft3#KU|p-QnT^;&Yd@h%5UdM?
z<09Jd9ok(;=TVOazHv25RpZOFs(FcOwNll*m0M}~`I5t~Yy;fg4gIAI^p~=rcdFsL
zN@f^6X_*p^mR_aYJxMP_4_#_OicKwSQd^o$!ozemt2^vrDK_;sT}{XAYId)&nHMdu
zUv;H#KQUa{{VE(Se^+f;c#j~?aX$979N3JJJ>brdYX<j1atT<^H#;n91GZr!y_>L;
z0PDLV$;_=OX70>_r^CtM(~*Ubg!mIXdMLXsU3MEg)1LV<mAXRV_sXv6!l+Kf_1z`1
pzE1iEyN7EY+?$c(eT-O8)Q<ac3q3Y{H{$@BDom2&09I9){{W#2WHtZ*

diff --git a/classes/artifacts/rushfee_Web_exploded/ptrun.ini b/classes/artifacts/rushfee_Web_exploded/ptrun.ini
index 85e5d1b..5c82100 100644
--- a/classes/artifacts/rushfee_Web_exploded/ptrun.ini
+++ b/classes/artifacts/rushfee_Web_exploded/ptrun.ini
@@ -1,3 +1,3 @@
 #save ini
-#Mon Sep 25 00:19:40 CST 2023
+#Mon Sep 25 23:35:49 CST 2023
 deploystamp=1612237236000
diff --git a/resource/db/org_sql.xml b/resource/db/org_sql.xml
index d2d4dac..8e14aff 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="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
+<?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="getmprice"><![CDATA[
		    select DISTINCT MPRICE text  from  T_CALLCENTER_MEMBER  order by  MPRICE
		]]></i>

		<i id="getmlevel"><![CDATA[
		    select DISTINCT mlevel text  from  T_CALLCENTER_MEMBER  order by  mlevel
		]]></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/hotupdate.html b/resource/html/bureau/hotupdate.html
index cb0a37e..10f547f 100644
--- a/resource/html/bureau/hotupdate.html
+++ b/resource/html/bureau/hotupdate.html
@@ -25,7 +25,7 @@
      data="[{id:0,text:'无效'},{id:1,text:'有效'}]" style="width:400px;margin-top:5px">
 </div>
 <br/>
-<input widget="num"  name="mlevel" label="等级"  maxValue="100"  minValue="0" style="width:400px;margin-top:5px"/>
+<input widget="edit"  name="mlevel" label="等级"  maxValue="100"  minValue="-9999" style="width:400px;margin-top:5px"/>
 <br/>
 <input widget="num"  name="mprice" label="金额"  maxValue="100000" style="width:400px;margin-top:5px"/>
 
@@ -36,7 +36,7 @@
 
     function init(params) {
         aos.getForm().setData(params);
-        grid.load(params);
+        aos.get('mlevel').setValue(params.mlevel);
     }
 
 
diff --git a/resource/html/bureau/hotwireclass.html b/resource/html/bureau/hotwireclass.html
index 4b8163e..6091924 100644
--- a/resource/html/bureau/hotwireclass.html
+++ b/resource/html/bureau/hotwireclass.html
@@ -15,6 +15,15 @@
     <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="状态">
+
+    <input widget="combox" name="mprice" label="价格" url="rush/hot/getmprice" multiSelect="true"
+           emptyText="请选择" textField="text" valueField="text" allowInput="false"
+           showNullItem="true"/>
+
+    <input widget="combox" name="mlevel" label="等级" url="rush/hot/getmlevel" multiSelect="true"
+           emptyText="请选择" textField="text" valueField="text" allowInput="false"
+           showNullItem="true"/>
+
     <a widget="button" iconCls="icon-search" onclick="search()">查询</a>
 	<a widget="button" iconCls="icon-add" onclick="add">新增</a>
     <a widget="button" iconCls="icon-save" onclick="weihu">维护</a>
@@ -48,6 +57,8 @@
             custname: aos.get('custname').getValue(),
             custtaxno: aos.get('custtaxno').getValue(),
             orgname: aos.get('orgname').getValue(),
+            mlevel: aos.get('mlevel').getValue(),
+            mprice: aos.get('mprice').getValue(),
             state: aos.get('state').getValue()
         };
         grid.load(params);
diff --git a/src/rush/HotWireClass.java b/src/rush/HotWireClass.java
index b6633ed..e9e369a 100644
--- a/src/rush/HotWireClass.java
+++ b/src/rush/HotWireClass.java
@@ -38,11 +38,35 @@ public class HotWireClass {
         if(custtaxno!=null){
             sb.append(" and custtaxno  like '%" + custtaxno + "%'");
         }
+
+
         if(mlevel!=null){
-            sb.append(" and mlevel   = "+mlevel);
+            String[] mlevelArrray = mlevel.split(",");
+            sb.append(" and mlevel in ( ");
+            for (int i=0;i<mlevelArrray.length;i++){
+                sb.append("'"+mlevelArrray[i]+"'");
+                if(i!=mlevelArrray.length-1){
+                    sb.append(",");
+                }
+                else{
+                    sb.append(")");
+                }
+            }
+
+
         }
         if(mprice!=null){
-            sb.append(" and mprice  = "+mprice);
+            String[] mpriceArrray = mprice.split(",");
+            sb.append(" and mprice in ( ");
+            for (int b=0;b<mpriceArrray.length;b++){
+                sb.append("'"+mpriceArrray[b]+"'");
+                if(b!=mpriceArrray.length-1){
+                    sb.append(",");
+                }
+                else{
+                    sb.append(")");
+                }
+            }
         }
         sb.append("order by createdate desc");
         Map map = DbHelper.getDbService("call_center").queryPageMapList("select * from T_CALLCENTER_MEMBER where 1=1  "+sb ,params);
@@ -70,6 +94,18 @@ public class HotWireClass {
     }
 
 
+    @Request.Get("getmprice")
+    public List<Map> getmprice(Params params){
+        List<Map> returns = DbHelper.getDbService("call_center").queryMapListById("rushfee_org.getmprice", params);
+        return  returns;
+    }
+
+    @Request.Get("getmlevel")
+    public List<Map> getmlevel(Params params){
+        List<Map> returns = DbHelper.getDbService("call_center").queryMapListById("rushfee_org.getmlevel", params);
+        return  returns;
+    }
+
     @Request.Post("save")
     @Request.Get("save")
     public int save(Params params){