diff --git a/build/classes/com/hangxin/web/SatisfacTion.class b/build/classes/com/hangxin/web/SatisfacTion.class
index d51211e..9a1ad48 100644
Binary files a/build/classes/com/hangxin/web/SatisfacTion.class and b/build/classes/com/hangxin/web/SatisfacTion.class differ
diff --git a/build/classes/com/hangxin/web/TickingAction.class b/build/classes/com/hangxin/web/TickingAction.class
index 5663fb6..455d0a5 100644
Binary files a/build/classes/com/hangxin/web/TickingAction.class and b/build/classes/com/hangxin/web/TickingAction.class differ
diff --git a/build/classes/html/tick/anzhuangdan.html b/build/classes/html/tick/anzhuangdan.html
index 23ab652..60d5b88 100644
--- a/build/classes/html/tick/anzhuangdan.html
+++ b/build/classes/html/tick/anzhuangdan.html
@@ -8,7 +8,7 @@
 		<div widget="toolbar" style="padding:4px;border:0;">
 
 			<input widget="combox" name="nianfen" label="年份"
-				   data="[{id:'2019',text:'2019'},{id:'2020',text:'2020'},{id:'2021',text:'2021'},{id:'2022',text:'2022'}]"
+				   data="[{id:'2019',text:'2019'},{id:'2020',text:'2020'},{id:'2021',text:'2021'},{id:'2022',text:'2022'},{id:'2023',text:'2023'}]"
 				   textField="text" valueField="id" value="2020" />
 		    
 		    <input name="searchbegindate" widget=datechooser  allowinput="f"   label="安装单创建日期">
diff --git a/build/classes/html/tick/cancel.html b/build/classes/html/tick/cancel.html
index d723153..6c21480 100644
--- a/build/classes/html/tick/cancel.html
+++ b/build/classes/html/tick/cancel.html
@@ -16,7 +16,7 @@
 -->
 
 			<input widget="combox" name="nianfen" label="年份"
-				   data="[{id:'2019',text:'2019'},{id:'2020',text:'2020'},{id:'2021',text:'2021'},{id:'2022',text:'2022'}]"
+				   data="[{id:'2019',text:'2019'},{id:'2020',text:'2020'},{id:'2021',text:'2021'},{id:'2022',text:'2022'},{id:'2023',text:'2023'}]"
 				   textField="text" valueField="id" value="2020" />
 			<input name="yuefen" widget=combox  allowinput="f"  showNullItem="true" multiSelect="true"
 				   data="[{id:'01',text:'01'},{id:'02',text:'02'},{id:'03',text:'03'},{id:'04',text:'04'},{id:'05',text:'05'},{id:'06',text:'06'},{id:'07',text:'07'},{id:'08',text:'08'},{id:'09',text:'09'},{id:'10',text:'10'},{id:'11',text:'11'},{id:'12',text:'12'}]" label="月份">
diff --git a/build/classes/html/tick/cancellist.html b/build/classes/html/tick/cancellist.html
index 5029785..ee0de98 100644
--- a/build/classes/html/tick/cancellist.html
+++ b/build/classes/html/tick/cancellist.html
@@ -8,7 +8,7 @@
 		<div widget="toolbar" style="padding:4px;border:0;">
 
 			<input widget="combox" name="nianfen" label="年份"
-				   data="[{id:'2019',text:'2019'},{id:'2020',text:'2020'},{id:'2021',text:'2021'},{id:'2022',text:'2022'}]"
+				   data="[{id:'2019',text:'2019'},{id:'2020',text:'2020'},{id:'2021',text:'2021'},{id:'2022',text:'2022'},{id:'2023',text:'2023'}]"
 				   textField="text" valueField="id" value="2020" />
 			<input name="yuefen" widget=combox  allowinput="f"  showNullItem="true" multiSelect="true"
 				   data="[{id:'01',text:'01'},{id:'02',text:'02'},{id:'03',text:'03'},{id:'04',text:'04'},{id:'05',text:'05'},{id:'06',text:'06'},{id:'07',text:'07'},{id:'08',text:'08'},{id:'09',text:'09'},{id:'10',text:'10'},{id:'11',text:'11'},{id:'12',text:'12'}]" label="月份">
@@ -78,6 +78,16 @@
 					return (2-0.2*value).toFixed(2);
 				}
 			}
+
+			if(nianfen=='2023'){
+				var row = e.row;
+				var value = row.noready;
+				if(value>=10){
+					return 0;
+				}else{
+					return (2-0.2*value).toFixed(2);
+				}
+			}
 			/* if(parseFloat(value)>=parseFloat("90")){
 				return 3 ;
 			}else if(parseFloat("80")<=parseFloat(value)<parseFloat("90")){
diff --git a/build/classes/html/tick/kaohezongbiao.html b/build/classes/html/tick/kaohezongbiao.html
index f5da766..4df124a 100644
--- a/build/classes/html/tick/kaohezongbiao.html
+++ b/build/classes/html/tick/kaohezongbiao.html
@@ -43,7 +43,7 @@
 			<input name="chuku2" widget=datechooser  allowinput="f"   >
 
 			<input widget="combox" name="nianfen" label="年份"
-				   data="[{id:'2019',text:'2019'},{id:'2020',text:'2020'},{id:'2021',text:'2021'},{id:'2022',text:'2022'}]"
+				   data="[{id:'2019',text:'2019'},{id:'2020',text:'2020'},{id:'2021',text:'2021'},{id:'2022',text:'2022'},{id:'2023',text:'2023'}]"
 				   textField="text" valueField="id" value="2020" />
 			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
             <a widget="button" iconCls="icon-search"   onclick="search()">查询</a>&nbsp;&nbsp;&nbsp;
diff --git a/build/classes/html/tick/paigongdan.html b/build/classes/html/tick/paigongdan.html
index 15bd41e..65aea03 100644
--- a/build/classes/html/tick/paigongdan.html
+++ b/build/classes/html/tick/paigongdan.html
@@ -8,7 +8,7 @@
 		<div widget="toolbar" style="padding:4px;border:0;">
 
 			<input widget="combox" name="nianfen" label="年份"
-				   data="[{id:'2019',text:'2019'},{id:'2020',text:'2020'},{id:'2021',text:'2021'},{id:'2022',text:'2022'}]"
+				   data="[{id:'2019',text:'2019'},{id:'2020',text:'2020'},{id:'2021',text:'2021'},{id:'2022',text:'2022'},{id:'2023',text:'2023'}]"
 				   textField="text" valueField="id" value="2020" />
 
 
diff --git a/build/classes/html/tick/satisfac.html b/build/classes/html/tick/satisfac.html
index cdcca48..750909e 100644
--- a/build/classes/html/tick/satisfac.html
+++ b/build/classes/html/tick/satisfac.html
@@ -9,7 +9,7 @@
 		<!-- style="width:300px;" -->
 
 			<input widget="combox" name="nianfen" label="年份"
-				   data="[{id:'2019',text:'2019'},{id:'2020',text:'2020'},{id:'2021',text:'2021'},{id:'2022',text:'2022'}]"
+				   data="[{id:'2019',text:'2019'},{id:'2020',text:'2020'},{id:'2021',text:'2021'},{id:'2022',text:'2022'},{id:'2023',text:'2023'}]"
 				   textField="text" valueField="id" value="2021" />
 			<input name="yuefen" widget=combox  allowinput="f"  showNullItem="true" multiSelect="true"
 				   data="[{id:'01',text:'01'},{id:'02',text:'02'},{id:'03',text:'03'},{id:'04',text:'04'},{id:'05',text:'05'},{id:'06',text:'06'},{id:'07',text:'07'},{id:'08',text:'08'},{id:'09',text:'09'},{id:'10',text:'10'},{id:'11',text:'11'},{id:'12',text:'12'}]" label="月份">
diff --git a/build/classes/html/tick/satisfaccount.html b/build/classes/html/tick/satisfaccount.html
index a954c2d..d1a9fb6 100644
--- a/build/classes/html/tick/satisfaccount.html
+++ b/build/classes/html/tick/satisfaccount.html
@@ -8,7 +8,7 @@
 		<div widget="toolbar" style="padding:4px;border:0;">
 		<!-- style="width:300px;" -->
 		<input widget="combox" name="nianfen" label="年份"
-				   data="[{id:'2019',text:'2019'},{id:'2020',text:'2020'},{id:'2021',text:'2021'},{id:'2022',text:'2022'}]"
+				   data="[{id:'2019',text:'2019'},{id:'2020',text:'2020'},{id:'2021',text:'2021'},{id:'2022',text:'2022'},{id:'2023',text:'2023'}]"
 				   textField="text" valueField="id" value="2020" />
 		<input name="yuefen" widget=combox  allowinput="f"  showNullItem="true" multiSelect="true"
 			data="[{id:'01',text:'01'},{id:'02',text:'02'},{id:'03',text:'03'},{id:'04',text:'04'},{id:'05',text:'05'},{id:'06',text:'06'},{id:'07',text:'07'},{id:'08',text:'08'},{id:'09',text:'09'},{id:'10',text:'10'},{id:'11',text:'11'},{id:'12',text:'12'}]" label="月份">
diff --git a/build/classes/html/tick/shijiday.html b/build/classes/html/tick/shijiday.html
index 515d4e6..c239001 100644
--- a/build/classes/html/tick/shijiday.html
+++ b/build/classes/html/tick/shijiday.html
@@ -21,6 +21,7 @@
 				<div field="operator" width="20"   align="center" header="催缴人"></div>
 				<div field="totalnum" width="30"   align="center" header="服务费"></div>
 				<div field="xinxiang" width="30"   align="center" header="托管"></div>
+				<div field="peixun" width="30"   align="center" header="财税会员"></div>
 				<div field="source" width="30"   align="center" header="代理会计数量"></div>
 				<div field="heji" width="30"   align="center" header="合计"></div>
 			</div>	
diff --git a/build/classes/html/tick/zhunquelvbaobiao.html b/build/classes/html/tick/zhunquelvbaobiao.html
index 5edf342..c64107d 100644
--- a/build/classes/html/tick/zhunquelvbaobiao.html
+++ b/build/classes/html/tick/zhunquelvbaobiao.html
@@ -10,7 +10,7 @@
 		<div widget="toolbar" style="padding:4px;border:0;">
 
 			<input widget="combox" name="nianfen" label="年份"
-				   data="[{id:'2019',text:'2019'},{id:'2020',text:'2020'},{id:'2021',text:'2021'},{id:'2022',text:'2022'}]"
+				   data="[{id:'2019',text:'2019'},{id:'2020',text:'2020'},{id:'2021',text:'2021'},{id:'2022',text:'2022'},{id:'2023',text:'2023'}]"
 				   textField="text" valueField="id" value="2020" />
 		    
 		    <input name="searchbegindate" widget=datechooser  allowinput="f"   label="创建日期">
diff --git a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/com/hangxin/web/SatisfacTion.class b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/com/hangxin/web/SatisfacTion.class
index d51211e..9a1ad48 100644
Binary files a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/com/hangxin/web/SatisfacTion.class and b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/com/hangxin/web/SatisfacTion.class differ
diff --git a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/com/hangxin/web/TickingAction.class b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/com/hangxin/web/TickingAction.class
index 5663fb6..455d0a5 100644
Binary files a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/com/hangxin/web/TickingAction.class and b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/com/hangxin/web/TickingAction.class differ
diff --git a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/anzhuangdan.html b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/anzhuangdan.html
index 23ab652..60d5b88 100644
--- a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/anzhuangdan.html
+++ b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/anzhuangdan.html
@@ -8,7 +8,7 @@
 		<div widget="toolbar" style="padding:4px;border:0;">
 
 			<input widget="combox" name="nianfen" label="年份"
-				   data="[{id:'2019',text:'2019'},{id:'2020',text:'2020'},{id:'2021',text:'2021'},{id:'2022',text:'2022'}]"
+				   data="[{id:'2019',text:'2019'},{id:'2020',text:'2020'},{id:'2021',text:'2021'},{id:'2022',text:'2022'},{id:'2023',text:'2023'}]"
 				   textField="text" valueField="id" value="2020" />
 		    
 		    <input name="searchbegindate" widget=datechooser  allowinput="f"   label="安装单创建日期">
diff --git a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/cancel.html b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/cancel.html
index d723153..6c21480 100644
--- a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/cancel.html
+++ b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/cancel.html
@@ -16,7 +16,7 @@
 -->
 
 			<input widget="combox" name="nianfen" label="年份"
-				   data="[{id:'2019',text:'2019'},{id:'2020',text:'2020'},{id:'2021',text:'2021'},{id:'2022',text:'2022'}]"
+				   data="[{id:'2019',text:'2019'},{id:'2020',text:'2020'},{id:'2021',text:'2021'},{id:'2022',text:'2022'},{id:'2023',text:'2023'}]"
 				   textField="text" valueField="id" value="2020" />
 			<input name="yuefen" widget=combox  allowinput="f"  showNullItem="true" multiSelect="true"
 				   data="[{id:'01',text:'01'},{id:'02',text:'02'},{id:'03',text:'03'},{id:'04',text:'04'},{id:'05',text:'05'},{id:'06',text:'06'},{id:'07',text:'07'},{id:'08',text:'08'},{id:'09',text:'09'},{id:'10',text:'10'},{id:'11',text:'11'},{id:'12',text:'12'}]" label="月份">
diff --git a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/cancellist.html b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/cancellist.html
index 5029785..ee0de98 100644
--- a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/cancellist.html
+++ b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/cancellist.html
@@ -8,7 +8,7 @@
 		<div widget="toolbar" style="padding:4px;border:0;">
 
 			<input widget="combox" name="nianfen" label="年份"
-				   data="[{id:'2019',text:'2019'},{id:'2020',text:'2020'},{id:'2021',text:'2021'},{id:'2022',text:'2022'}]"
+				   data="[{id:'2019',text:'2019'},{id:'2020',text:'2020'},{id:'2021',text:'2021'},{id:'2022',text:'2022'},{id:'2023',text:'2023'}]"
 				   textField="text" valueField="id" value="2020" />
 			<input name="yuefen" widget=combox  allowinput="f"  showNullItem="true" multiSelect="true"
 				   data="[{id:'01',text:'01'},{id:'02',text:'02'},{id:'03',text:'03'},{id:'04',text:'04'},{id:'05',text:'05'},{id:'06',text:'06'},{id:'07',text:'07'},{id:'08',text:'08'},{id:'09',text:'09'},{id:'10',text:'10'},{id:'11',text:'11'},{id:'12',text:'12'}]" label="月份">
@@ -78,6 +78,16 @@
 					return (2-0.2*value).toFixed(2);
 				}
 			}
+
+			if(nianfen=='2023'){
+				var row = e.row;
+				var value = row.noready;
+				if(value>=10){
+					return 0;
+				}else{
+					return (2-0.2*value).toFixed(2);
+				}
+			}
 			/* if(parseFloat(value)>=parseFloat("90")){
 				return 3 ;
 			}else if(parseFloat("80")<=parseFloat(value)<parseFloat("90")){
diff --git a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/kaohezongbiao.html b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/kaohezongbiao.html
index f5da766..4df124a 100644
--- a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/kaohezongbiao.html
+++ b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/kaohezongbiao.html
@@ -43,7 +43,7 @@
 			<input name="chuku2" widget=datechooser  allowinput="f"   >
 
 			<input widget="combox" name="nianfen" label="年份"
-				   data="[{id:'2019',text:'2019'},{id:'2020',text:'2020'},{id:'2021',text:'2021'},{id:'2022',text:'2022'}]"
+				   data="[{id:'2019',text:'2019'},{id:'2020',text:'2020'},{id:'2021',text:'2021'},{id:'2022',text:'2022'},{id:'2023',text:'2023'}]"
 				   textField="text" valueField="id" value="2020" />
 			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
             <a widget="button" iconCls="icon-search"   onclick="search()">查询</a>&nbsp;&nbsp;&nbsp;
diff --git a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/paigongdan.html b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/paigongdan.html
index 15bd41e..65aea03 100644
--- a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/paigongdan.html
+++ b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/paigongdan.html
@@ -8,7 +8,7 @@
 		<div widget="toolbar" style="padding:4px;border:0;">
 
 			<input widget="combox" name="nianfen" label="年份"
-				   data="[{id:'2019',text:'2019'},{id:'2020',text:'2020'},{id:'2021',text:'2021'},{id:'2022',text:'2022'}]"
+				   data="[{id:'2019',text:'2019'},{id:'2020',text:'2020'},{id:'2021',text:'2021'},{id:'2022',text:'2022'},{id:'2023',text:'2023'}]"
 				   textField="text" valueField="id" value="2020" />
 
 
diff --git a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/satisfac.html b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/satisfac.html
index cdcca48..750909e 100644
--- a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/satisfac.html
+++ b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/satisfac.html
@@ -9,7 +9,7 @@
 		<!-- style="width:300px;" -->
 
 			<input widget="combox" name="nianfen" label="年份"
-				   data="[{id:'2019',text:'2019'},{id:'2020',text:'2020'},{id:'2021',text:'2021'},{id:'2022',text:'2022'}]"
+				   data="[{id:'2019',text:'2019'},{id:'2020',text:'2020'},{id:'2021',text:'2021'},{id:'2022',text:'2022'},{id:'2023',text:'2023'}]"
 				   textField="text" valueField="id" value="2021" />
 			<input name="yuefen" widget=combox  allowinput="f"  showNullItem="true" multiSelect="true"
 				   data="[{id:'01',text:'01'},{id:'02',text:'02'},{id:'03',text:'03'},{id:'04',text:'04'},{id:'05',text:'05'},{id:'06',text:'06'},{id:'07',text:'07'},{id:'08',text:'08'},{id:'09',text:'09'},{id:'10',text:'10'},{id:'11',text:'11'},{id:'12',text:'12'}]" label="月份">
diff --git a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/satisfaccount.html b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/satisfaccount.html
index a954c2d..d1a9fb6 100644
--- a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/satisfaccount.html
+++ b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/satisfaccount.html
@@ -8,7 +8,7 @@
 		<div widget="toolbar" style="padding:4px;border:0;">
 		<!-- style="width:300px;" -->
 		<input widget="combox" name="nianfen" label="年份"
-				   data="[{id:'2019',text:'2019'},{id:'2020',text:'2020'},{id:'2021',text:'2021'},{id:'2022',text:'2022'}]"
+				   data="[{id:'2019',text:'2019'},{id:'2020',text:'2020'},{id:'2021',text:'2021'},{id:'2022',text:'2022'},{id:'2023',text:'2023'}]"
 				   textField="text" valueField="id" value="2020" />
 		<input name="yuefen" widget=combox  allowinput="f"  showNullItem="true" multiSelect="true"
 			data="[{id:'01',text:'01'},{id:'02',text:'02'},{id:'03',text:'03'},{id:'04',text:'04'},{id:'05',text:'05'},{id:'06',text:'06'},{id:'07',text:'07'},{id:'08',text:'08'},{id:'09',text:'09'},{id:'10',text:'10'},{id:'11',text:'11'},{id:'12',text:'12'}]" label="月份">
diff --git a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/shijiday.html b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/shijiday.html
index 515d4e6..c239001 100644
--- a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/shijiday.html
+++ b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/shijiday.html
@@ -21,6 +21,7 @@
 				<div field="operator" width="20"   align="center" header="催缴人"></div>
 				<div field="totalnum" width="30"   align="center" header="服务费"></div>
 				<div field="xinxiang" width="30"   align="center" header="托管"></div>
+				<div field="peixun" width="30"   align="center" header="财税会员"></div>
 				<div field="source" width="30"   align="center" header="代理会计数量"></div>
 				<div field="heji" width="30"   align="center" header="合计"></div>
 			</div>	
diff --git a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/zhunquelvbaobiao.html b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/zhunquelvbaobiao.html
index 5edf342..c64107d 100644
--- a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/zhunquelvbaobiao.html
+++ b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/zhunquelvbaobiao.html
@@ -10,7 +10,7 @@
 		<div widget="toolbar" style="padding:4px;border:0;">
 
 			<input widget="combox" name="nianfen" label="年份"
-				   data="[{id:'2019',text:'2019'},{id:'2020',text:'2020'},{id:'2021',text:'2021'},{id:'2022',text:'2022'}]"
+				   data="[{id:'2019',text:'2019'},{id:'2020',text:'2020'},{id:'2021',text:'2021'},{id:'2022',text:'2022'},{id:'2023',text:'2023'}]"
 				   textField="text" valueField="id" value="2020" />
 		    
 		    <input name="searchbegindate" widget=datechooser  allowinput="f"   label="创建日期">
diff --git a/classes/artifacts/rushfee_Web_exploded/ptrun.ini b/classes/artifacts/rushfee_Web_exploded/ptrun.ini
index efb0157..9a5751a 100644
--- a/classes/artifacts/rushfee_Web_exploded/ptrun.ini
+++ b/classes/artifacts/rushfee_Web_exploded/ptrun.ini
@@ -1,3 +1,3 @@
 #save ini
-#Wed Jan 18 20:08:06 CST 2023
+#Sun Mar 19 23:25:21 CST 2023
 deploystamp=1612237236000
diff --git a/resource/html/tick/anzhuangdan.html b/resource/html/tick/anzhuangdan.html
index 23ab652..60d5b88 100644
--- a/resource/html/tick/anzhuangdan.html
+++ b/resource/html/tick/anzhuangdan.html
@@ -8,7 +8,7 @@
 		<div widget="toolbar" style="padding:4px;border:0;">
 
 			<input widget="combox" name="nianfen" label="年份"
-				   data="[{id:'2019',text:'2019'},{id:'2020',text:'2020'},{id:'2021',text:'2021'},{id:'2022',text:'2022'}]"
+				   data="[{id:'2019',text:'2019'},{id:'2020',text:'2020'},{id:'2021',text:'2021'},{id:'2022',text:'2022'},{id:'2023',text:'2023'}]"
 				   textField="text" valueField="id" value="2020" />
 		    
 		    <input name="searchbegindate" widget=datechooser  allowinput="f"   label="安装单创建日期">
diff --git a/resource/html/tick/cancel.html b/resource/html/tick/cancel.html
index d723153..6c21480 100644
--- a/resource/html/tick/cancel.html
+++ b/resource/html/tick/cancel.html
@@ -16,7 +16,7 @@
 -->
 
 			<input widget="combox" name="nianfen" label="年份"
-				   data="[{id:'2019',text:'2019'},{id:'2020',text:'2020'},{id:'2021',text:'2021'},{id:'2022',text:'2022'}]"
+				   data="[{id:'2019',text:'2019'},{id:'2020',text:'2020'},{id:'2021',text:'2021'},{id:'2022',text:'2022'},{id:'2023',text:'2023'}]"
 				   textField="text" valueField="id" value="2020" />
 			<input name="yuefen" widget=combox  allowinput="f"  showNullItem="true" multiSelect="true"
 				   data="[{id:'01',text:'01'},{id:'02',text:'02'},{id:'03',text:'03'},{id:'04',text:'04'},{id:'05',text:'05'},{id:'06',text:'06'},{id:'07',text:'07'},{id:'08',text:'08'},{id:'09',text:'09'},{id:'10',text:'10'},{id:'11',text:'11'},{id:'12',text:'12'}]" label="月份">
diff --git a/resource/html/tick/cancellist.html b/resource/html/tick/cancellist.html
index 5029785..ee0de98 100644
--- a/resource/html/tick/cancellist.html
+++ b/resource/html/tick/cancellist.html
@@ -8,7 +8,7 @@
 		<div widget="toolbar" style="padding:4px;border:0;">
 
 			<input widget="combox" name="nianfen" label="年份"
-				   data="[{id:'2019',text:'2019'},{id:'2020',text:'2020'},{id:'2021',text:'2021'},{id:'2022',text:'2022'}]"
+				   data="[{id:'2019',text:'2019'},{id:'2020',text:'2020'},{id:'2021',text:'2021'},{id:'2022',text:'2022'},{id:'2023',text:'2023'}]"
 				   textField="text" valueField="id" value="2020" />
 			<input name="yuefen" widget=combox  allowinput="f"  showNullItem="true" multiSelect="true"
 				   data="[{id:'01',text:'01'},{id:'02',text:'02'},{id:'03',text:'03'},{id:'04',text:'04'},{id:'05',text:'05'},{id:'06',text:'06'},{id:'07',text:'07'},{id:'08',text:'08'},{id:'09',text:'09'},{id:'10',text:'10'},{id:'11',text:'11'},{id:'12',text:'12'}]" label="月份">
@@ -78,6 +78,16 @@
 					return (2-0.2*value).toFixed(2);
 				}
 			}
+
+			if(nianfen=='2023'){
+				var row = e.row;
+				var value = row.noready;
+				if(value>=10){
+					return 0;
+				}else{
+					return (2-0.2*value).toFixed(2);
+				}
+			}
 			/* if(parseFloat(value)>=parseFloat("90")){
 				return 3 ;
 			}else if(parseFloat("80")<=parseFloat(value)<parseFloat("90")){
diff --git a/resource/html/tick/kaohezongbiao.html b/resource/html/tick/kaohezongbiao.html
index f5da766..4df124a 100644
--- a/resource/html/tick/kaohezongbiao.html
+++ b/resource/html/tick/kaohezongbiao.html
@@ -43,7 +43,7 @@
 			<input name="chuku2" widget=datechooser  allowinput="f"   >
 
 			<input widget="combox" name="nianfen" label="年份"
-				   data="[{id:'2019',text:'2019'},{id:'2020',text:'2020'},{id:'2021',text:'2021'},{id:'2022',text:'2022'}]"
+				   data="[{id:'2019',text:'2019'},{id:'2020',text:'2020'},{id:'2021',text:'2021'},{id:'2022',text:'2022'},{id:'2023',text:'2023'}]"
 				   textField="text" valueField="id" value="2020" />
 			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
             <a widget="button" iconCls="icon-search"   onclick="search()">查询</a>&nbsp;&nbsp;&nbsp;
diff --git a/resource/html/tick/paigongdan.html b/resource/html/tick/paigongdan.html
index 15bd41e..65aea03 100644
--- a/resource/html/tick/paigongdan.html
+++ b/resource/html/tick/paigongdan.html
@@ -8,7 +8,7 @@
 		<div widget="toolbar" style="padding:4px;border:0;">
 
 			<input widget="combox" name="nianfen" label="年份"
-				   data="[{id:'2019',text:'2019'},{id:'2020',text:'2020'},{id:'2021',text:'2021'},{id:'2022',text:'2022'}]"
+				   data="[{id:'2019',text:'2019'},{id:'2020',text:'2020'},{id:'2021',text:'2021'},{id:'2022',text:'2022'},{id:'2023',text:'2023'}]"
 				   textField="text" valueField="id" value="2020" />
 
 
diff --git a/resource/html/tick/satisfac.html b/resource/html/tick/satisfac.html
index cdcca48..750909e 100644
--- a/resource/html/tick/satisfac.html
+++ b/resource/html/tick/satisfac.html
@@ -9,7 +9,7 @@
 		<!-- style="width:300px;" -->
 
 			<input widget="combox" name="nianfen" label="年份"
-				   data="[{id:'2019',text:'2019'},{id:'2020',text:'2020'},{id:'2021',text:'2021'},{id:'2022',text:'2022'}]"
+				   data="[{id:'2019',text:'2019'},{id:'2020',text:'2020'},{id:'2021',text:'2021'},{id:'2022',text:'2022'},{id:'2023',text:'2023'}]"
 				   textField="text" valueField="id" value="2021" />
 			<input name="yuefen" widget=combox  allowinput="f"  showNullItem="true" multiSelect="true"
 				   data="[{id:'01',text:'01'},{id:'02',text:'02'},{id:'03',text:'03'},{id:'04',text:'04'},{id:'05',text:'05'},{id:'06',text:'06'},{id:'07',text:'07'},{id:'08',text:'08'},{id:'09',text:'09'},{id:'10',text:'10'},{id:'11',text:'11'},{id:'12',text:'12'}]" label="月份">
diff --git a/resource/html/tick/satisfaccount.html b/resource/html/tick/satisfaccount.html
index a954c2d..d1a9fb6 100644
--- a/resource/html/tick/satisfaccount.html
+++ b/resource/html/tick/satisfaccount.html
@@ -8,7 +8,7 @@
 		<div widget="toolbar" style="padding:4px;border:0;">
 		<!-- style="width:300px;" -->
 		<input widget="combox" name="nianfen" label="年份"
-				   data="[{id:'2019',text:'2019'},{id:'2020',text:'2020'},{id:'2021',text:'2021'},{id:'2022',text:'2022'}]"
+				   data="[{id:'2019',text:'2019'},{id:'2020',text:'2020'},{id:'2021',text:'2021'},{id:'2022',text:'2022'},{id:'2023',text:'2023'}]"
 				   textField="text" valueField="id" value="2020" />
 		<input name="yuefen" widget=combox  allowinput="f"  showNullItem="true" multiSelect="true"
 			data="[{id:'01',text:'01'},{id:'02',text:'02'},{id:'03',text:'03'},{id:'04',text:'04'},{id:'05',text:'05'},{id:'06',text:'06'},{id:'07',text:'07'},{id:'08',text:'08'},{id:'09',text:'09'},{id:'10',text:'10'},{id:'11',text:'11'},{id:'12',text:'12'}]" label="月份">
diff --git a/resource/html/tick/shijiday.html b/resource/html/tick/shijiday.html
index 515d4e6..c239001 100644
--- a/resource/html/tick/shijiday.html
+++ b/resource/html/tick/shijiday.html
@@ -21,6 +21,7 @@
 				<div field="operator" width="20"   align="center" header="催缴人"></div>
 				<div field="totalnum" width="30"   align="center" header="服务费"></div>
 				<div field="xinxiang" width="30"   align="center" header="托管"></div>
+				<div field="peixun" width="30"   align="center" header="财税会员"></div>
 				<div field="source" width="30"   align="center" header="代理会计数量"></div>
 				<div field="heji" width="30"   align="center" header="合计"></div>
 			</div>	
diff --git a/resource/html/tick/shijidayhlnew.html b/resource/html/tick/shijidayhlnew.html
index a62bcb2..5dbe513 100644
--- a/resource/html/tick/shijidayhlnew.html
+++ b/resource/html/tick/shijidayhlnew.html
@@ -21,6 +21,7 @@
 				<div field="operator" width="20"   align="center" header="催缴人"></div>
 				<div field="totalnum" width="30"   align="center" header="服务费"></div>
 				<div field="xinxiang" width="30"   align="center" header="托管"></div>
+				<div field="peixun" width="30"   align="center" header="财税会员"></div>
 				<div field="source" width="30"   align="center" header="代理会计数量"></div>
 				<div field="heji" width="30"   align="center" header="合计"></div>
 			</div>	
diff --git a/resource/html/tick/shijidaynew.html b/resource/html/tick/shijidaynew.html
index ea8c945..c9c3967 100644
--- a/resource/html/tick/shijidaynew.html
+++ b/resource/html/tick/shijidaynew.html
@@ -21,6 +21,7 @@
 				<div field="operator" width="20"   align="center" header="催缴人"></div>
 				<div field="totalnum" width="30"   align="center" header="服务费"></div>
 				<div field="xinxiang" width="30"   align="center" header="托管"></div>
+				<div field="peixun" width="30"   align="center" header="财税会员"></div>
 				<div field="source" width="30"   align="center" header="代理会计数量"></div>
 				<div field="heji" width="30"   align="center" header="合计"></div>
 			</div>	
diff --git a/resource/html/tick/zhunquelvbaobiao.html b/resource/html/tick/zhunquelvbaobiao.html
index 5edf342..c64107d 100644
--- a/resource/html/tick/zhunquelvbaobiao.html
+++ b/resource/html/tick/zhunquelvbaobiao.html
@@ -10,7 +10,7 @@
 		<div widget="toolbar" style="padding:4px;border:0;">
 
 			<input widget="combox" name="nianfen" label="年份"
-				   data="[{id:'2019',text:'2019'},{id:'2020',text:'2020'},{id:'2021',text:'2021'},{id:'2022',text:'2022'}]"
+				   data="[{id:'2019',text:'2019'},{id:'2020',text:'2020'},{id:'2021',text:'2021'},{id:'2022',text:'2022'},{id:'2023',text:'2023'}]"
 				   textField="text" valueField="id" value="2020" />
 		    
 		    <input name="searchbegindate" widget=datechooser  allowinput="f"   label="创建日期">
diff --git a/src/com/hangxin/web/SatisfacTion.java b/src/com/hangxin/web/SatisfacTion.java
index 8012abe..1a4a3fd 100644
--- a/src/com/hangxin/web/SatisfacTion.java
+++ b/src/com/hangxin/web/SatisfacTion.java
@@ -1517,6 +1517,9 @@ public List<Map> zql(Params params) {
         if (nianfen != null && "2022".equals(nianfen)) {
             denfensql = "  case when paixu>pingjun then 3 when pingjun-paixu >10 then 0 else 3-(pingjun-paixu)*0.3 end as defen    ";
         }
+        if (nianfen != null && "2023".equals(nianfen)) {
+            denfensql = "  case when paixu>pingjun then 3 when pingjun-paixu >10 then 0 else 3-(pingjun-paixu)*0.3 end as defen    ";
+        }
         else {
             denfensql =  "  case when paixu>0.75 then 5 when paixu<0.65 then 0 else 5-(0.75-paixu)*5*10 end defen    ";
         }
@@ -1742,7 +1745,7 @@ public List<Map> zql(Params params) {
         if (nianfen != null && "2019".equals(nianfen)) {//注销户评分
             sqlString = sqlString + "case when paixu>=0.9 then 3 when paixu<0.8 then 0 else 3-(0.9-paixu)*20 end defen   ";
         }
-       if(nianfen != null && "2022".equals(nianfen)){
+       if(nianfen != null && "2022".equals(nianfen)&& "2023".equals(nianfen)){
             sqlString = sqlString + " case when noready>10 then 0 else 2-0.2*noready end defen ";
         }
         else {
@@ -2109,7 +2112,15 @@ public List<Map> zql(Params params) {
                 + "left join(select org_id ,";
         if (nianfen != null && "2019".equals(nianfen)) {//注销户评分
             sqlString = sqlString + "case when paixu>=0.9 then 3 when paixu<0.8 then 0 else 3-(0.9-paixu)*20 end defen   ";
-        } else {
+        }/* else {
+            sqlString = sqlString + " case when noready>10 then 0 else 5-0.5*noready end defen ";
+        }*/
+
+
+        if(nianfen != null && "2022".equals(nianfen)&& "2023".equals(nianfen)){
+            sqlString = sqlString + " case when noready>10 then 0 else 2-0.2*noready end defen ";
+        }
+        else {
             sqlString = sqlString + " case when noready>10 then 0 else 5-0.5*noready end defen ";
         }
         sqlString = sqlString + "from ( select l.org_id,"
diff --git a/src/com/hangxin/web/TickingAction.java b/src/com/hangxin/web/TickingAction.java
index 1982dee..b1c3786 100644
--- a/src/com/hangxin/web/TickingAction.java
+++ b/src/com/hangxin/web/TickingAction.java
@@ -230,10 +230,20 @@ public class TickingAction {
 					 "and t.addtime<TO_DATE('"+searchenddate+"','YYYY-MM-DD HH24:MI:SS') \n" +
 					 "and t.ADDTIME>=TO_DATE('"+searchbegindate+"','YYYY-MM-DD HH24:MI:SS')                             \n" +
 					 "group by rollup (a.operator) order by totalnum ";*/
-				 String sqlString=" select    nvl(a.operator,'合计') operator ,sum(case when kpxm='税控技术维护服务费' or kpxm='增值税税控系统技术维护费' "+injfsql+ifmzsql+custtypesql+" then 1 else 0 end ) as  totalnum,  sum(case when a.source=1   then 1 else 0 end) source," +
-						 "   sum(case when kphjje=300 "+injfsql+ifmzsql+custtypesql+" then 1 else 0 end ) as  xinxiang  ,sum(case when kpxm='税控技术维护服务费'  or kpxm='增值税税控系统技术维护费' "+injfsql+ifmzsql+custtypesql+" then 1 else 0 end)+ sum(case when kphjje=300 "+injfsql+ifmzsql+custtypesql+" then 1 else 0 end )  as heji " +
-						 "from einvoice_fpkjxx_fptxx t   \n" +
-						 "left join rush_log  a   \n" +
+				 String sqlString=" select    nvl(a.operator,'合计') operator ,sum(case when  kphjje=280 "+injfsql+ifmzsql+custtypesql+" then 1 else 0 end ) as  totalnum,  sum(case when a.source=1   then 1 else 0 end) source," +
+						 "   sum(case when kphjje=300 "+injfsql+ifmzsql+custtypesql+" then 1 else 0 end ) as  xinxiang    , sum(case " +
+						 "          when kphjje = 398  "+injfsql+ifmzsql+custtypesql+" then " +
+						 "        1" +
+						 "          else" +
+						 "            0" +
+						 "          end) as peixun,sum(case when  kphjje=280 "+injfsql+ifmzsql+custtypesql+" then 1 else 0 end)+ sum(case when kphjje=300 "+injfsql+ifmzsql+custtypesql+" then 1 else 0 end ) + sum(case" +
+						 "                      when kphjje = 398  "+injfsql+ifmzsql+custtypesql+" then " +
+						 "                      1" +
+						 "                     else "  +
+						 "                         0"  +
+						 "                     end)   as heji " +
+						 "from einvoice_fpkjxx_fptxx t   " +
+						 "left join rush_log  a   " +
 						 "on to_char(to_date(a.operate_date,'yyyy-mm-dd HH24:MI:SS'),'yyyy-mm-dd') = to_char(t.addtime,'yyyy-mm-dd') "+
 						 "left join  rush_record b on a.obj_id = b.id    \n" +
 						 "where a.action = 'rushfee' "+injfsql+ifmzsql+custtypesql +addString +"\n" +
@@ -284,18 +294,28 @@ public class TickingAction {
 				+"  where a.USER_ID='"+userid+"') " ;
 
 		if(null!=searchbegindate){
-			String sqlString=" select    nvl(a.operator,'合计') operator ,sum(case when kpxm='税控技术维护服务费' or kpxm='增值税税控系统技术维护费' "+injfsql+ifmzsql+custtypesql+" then 1 else 0 end ) as  totalnum,  sum(case when a.source=1   then 1 else 0 end) source," +
-					"   sum(case when kphjje=300 "+injfsql+ifmzsql+custtypesql+" then 1 else 0 end ) as  xinxiang  ,sum(case when kpxm='税控技术维护服务费'  or kpxm='增值税税控系统技术维护费' "+injfsql+ifmzsql+custtypesql+" then 1 else 0 end)+ sum(case when kphjje=300 "+injfsql+ifmzsql+custtypesql+" then 1 else 0 end )  as heji " +
-					"from einvoice_fpkjxx_fptxx t   \n" +
-					"left join rush_log  a   \n" +
+			String sqlString=" select    nvl(a.operator,'合计') operator ,sum(case when  kphjje=280 "+injfsql+ifmzsql+custtypesql+" then 1 else 0 end ) as  totalnum,  sum(case when a.source=1   then 1 else 0 end) source," +
+					"   sum(case when kphjje=300 "+injfsql+ifmzsql+custtypesql+" then 1 else 0 end ) as  xinxiang  , sum(case" +
+					"             when kphjje =398   "+injfsql+ifmzsql+custtypesql+" then" +
+					"              1" +
+					"             else" +
+					"              0" +
+					"           end) as peixun, sum(case when  kphjje=280 "+injfsql+ifmzsql+custtypesql+" then 1 else 0 end)+ sum(case when kphjje=300 "+injfsql+ifmzsql+custtypesql+" then 1 else 0 end ) + sum(case" +
+					"                        when kphjje =398  "+injfsql+ifmzsql+custtypesql+" then" +
+					"                         1" +
+					"                        else" +
+					"                         0" +
+					"                      end)  as heji " +
+					"from einvoice_fpkjxx_fptxx t   " +
+					"left join rush_log  a   " +
 					"on to_char(to_date(a.operate_date,'yyyy-mm-dd HH24:MI:SS'),'yyyy-mm-dd') = to_char(t.addtime,'yyyy-mm-dd') "+
-					"left join  rush_record b on a.obj_id = b.id    \n" +
-					"where a.action = 'rushfee' "+injfsql+ifmzsql+custtypesql +addString +"\n" +
+					"left join  rush_record b on a.obj_id = b.id    " +
+					"where a.action = 'rushfee' "+injfsql+ifmzsql+custtypesql +addString +" " +
 					" and  ceil(((t.addtime  - To_date(a.operate_date , 'yyyy-mm-dd hh24-mi-ss'))) * 24 * 60)  >=-30 "+
-					"and t.kplx = 0 \n" +
-					"and t.ghf_custid = b.customer_id   \n" +
-					"and t.addtime<TO_DATE('"+searchenddate+"','YYYY-MM-DD HH24:MI:SS') \n" +
-					"and t.ADDTIME>=TO_DATE('"+searchbegindate+"','YYYY-MM-DD HH24:MI:SS')                             \n" +
+					"and t.kplx = 0 " +
+					"and t.ghf_custid = b.customer_id   " +
+					"and t.addtime<TO_DATE('"+searchenddate+"','YYYY-MM-DD HH24:MI:SS') " +
+					"and t.ADDTIME>=TO_DATE('"+searchbegindate+"','YYYY-MM-DD HH24:MI:SS')                        " +
 					"group by rollup (a.operator) order by heji ";
 			System.out.println("-------------"+sqlString);
 			return DbHelper.getDbService().queryPageMapList(sqlString, params);
diff --git a/src/rush/UpdateExcustomerTime.java b/src/rush/UpdateExcustomerTime.java
new file mode 100644
index 0000000..9f6b3e3
--- /dev/null
+++ b/src/rush/UpdateExcustomerTime.java
@@ -0,0 +1,48 @@
+package rush;
+
+import com.aisino.aosplus.core.dao.DbHelper;
+import com.aisino.aosplus.plugin.job.BaseJob;
+import com.aisino.aosplus.plugin.job.Job;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+
+
+@Job("0 26 23 * * ?")
+public class UpdateExcustomerTime  extends BaseJob {
+    @Override
+    public void execute() {
+        System.out.println("定时更新时间----");
+        String  sql=" select rn , to_char(to_date(operate_date,'yyyy-mm-dd hh24:mi:ss'),'yyyy/mm/dd hh24:mi:ss') operate_date,obj_id  " +
+                "  from (select ROW_NUMBER() OVER(PARTITION BY obj_id ORDER BY operate_date  ) rn,operate_date,obj_id " +
+                "              from rush_log  where  operate_date >'2023-01-01 00:00:00' and action='rushfee'   and info in  ('联系方式为空','联系方式异常','客户不在本单位')  )  " +
+                " where rn = 1 ";
+        List<Map> list= DbHelper.getDbService().queryMapList(sql);
+        for(int i=0;i<list.size();i++){
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
+             Map m= DbHelper.getDbService().queryMap("select * from rush_record where id=?",list.get(0).get("obj_id"));
+             Map  ex = DbHelper.getDbService().queryMap(" select * from excustomer_info where customer_id=? and (to_char(create_time,'yyyy-mm-dd') <='2023-01-01' or  create_time is null) ",m.get("customer_id"));
+             if(ex!=null){
+
+                 Date zxfk = null;
+                 try {
+                     zxfk = sdf.parse(list.get(i).get("operate_date").toString());
+                     DbHelper.getDbService().update("update  excustomer_info set create_time =to_date(?,'yyyy/mm/dd hh24:mi:ss') where customer_id=? ",list.get(i).get("operate_date").toString(),m.get("customer_id"));
+                     System.out.println("yigong"+list.size()+"-----更新到"+i+"条");
+                 } catch (ParseException e) {
+                     e.printStackTrace();
+                 }
+
+
+
+             }
+
+        }
+
+
+    }
+}