1

build/classes/html/rush/rushtasklistdetail.html

@@ -497,10 +497,29 @@
 				 if(action == 'cancel')
 				 {return;}
 			else{
-					 aos.showWindow('canvas/rush/message', messageparam, '550px', '350px', '短信发送', function(rtnValue){
+
-					 
+					 var one = {};
-					 aos.get("msglogid").setValue(rtnValue);
+					 one['mobile']=mobile;
-					 });
+					 aos.post({
+						 url:"rush/telaccount/check",
+						 data:one,
+						 success:function(rtnData){
+							 if(rtnData=="1"){
+								 aos.alert('所选电话不是本人测试电话电话，不允许发送短信！');
+								 return;
+							 }
+							 else{
+								 aos.showWindow('canvas/rush/message', messageparam, '550px', '350px', '短信发送', function(rtnValue){
+
+									 aos.get("msglogid").setValue(rtnValue);
+								 });
+							 }
+						 }
+					 })
+
+
+
+
 				 }
 			  });
                    return ;			

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

@@ -497,10 +497,29 @@
 				 if(action == 'cancel')
 				 {return;}
 			else{
-					 aos.showWindow('canvas/rush/message', messageparam, '550px', '350px', '短信发送', function(rtnValue){
+
-					 
+					 var one = {};
-					 aos.get("msglogid").setValue(rtnValue);
+					 one['mobile']=mobile;
-					 });
+					 aos.post({
+						 url:"rush/telaccount/check",
+						 data:one,
+						 success:function(rtnData){
+							 if(rtnData=="1"){
+								 aos.alert('所选电话不是本人测试电话电话，不允许发送短信！');
+								 return;
+							 }
+							 else{
+								 aos.showWindow('canvas/rush/message', messageparam, '550px', '350px', '短信发送', function(rtnValue){
+
+									 aos.get("msglogid").setValue(rtnValue);
+								 });
+							 }
+						 }
+					 })
+
+
+
+
 				 }
 			  });
                    return ;			

classes/artifacts/rushfee_Web_exploded/ptrun.ini

@@ -1,3 +1,3 @@
 #save ini
-#Wed Apr 19 22:20:25 CST 2023
+#Mon Jun 12 00:24:44 CST 2023
 deploystamp=1612237236000

resource/html/rush/rushtasklistdetail.html

@@ -497,10 +497,29 @@
 				 if(action == 'cancel')
 				 {return;}
 			else{
-					 aos.showWindow('canvas/rush/message', messageparam, '550px', '350px', '短信发送', function(rtnValue){
+
-					 
+					 var one = {};
-					 aos.get("msglogid").setValue(rtnValue);
+					 one['mobile']=mobile;
-					 });
+					 aos.post({
+						 url:"rush/telaccount/check",
+						 data:one,
+						 success:function(rtnData){
+							 if(rtnData=="1"){
+								 aos.alert('所选电话不是本人测试电话电话，不允许发送短信！');
+								 return;
+							 }
+							 else{
+								 aos.showWindow('canvas/rush/message', messageparam, '550px', '350px', '短信发送', function(rtnValue){
+
+									 aos.get("msglogid").setValue(rtnValue);
+								 });
+							 }
+						 }
+					 })
+
+
+
+
 				 }
 			  });
                    return ;			

src/com/hangxin/web/TickingAction.java

@@ -230,13 +230,13 @@ 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  kphjje=280 "+injfsql+ifmzsql+custtypesql+" then 1 else 0 end ) as  totalnum,  sum(case when a.source=1   then 1 else 0 end) source," +
+				 String sqlString=" select    nvl(a.operator,'合计') operator ,sum(case when ( kphjje=280 or kphjje=420) "+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" +
+						 "          end) as peixun,sum(case when ( kphjje=280 or kphjje=420)  "+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 "  +
@@ -294,13 +294,13 @@ public class TickingAction {
 				+"  where a.USER_ID='"+userid+"') " ;
 
 		if(null!=searchbegindate){
-			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," +
+			String sqlString=" select    nvl(a.operator,'合计') operator ,sum(case when ( kphjje=280 or kphjje=420) "+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" +
+					"           end) as peixun, sum(case when ( kphjje=280 or kphjje=420) "+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" +

src/rush/TaskAssignmentJob.java

@@ -18,7 +18,7 @@ import java.util.*;
  *
  * 2018年11月27日
  */
-@Job("0 30 09 * * ?")
+//@Job("0 30 09 * * ?")
 public class TaskAssignmentJob  extends BaseJob{
 
 	

src/rush/TaskDeleteJob.java

@@ -8,7 +8,7 @@ import com.aisino.aosplus.plugin.job.Job;
 	 *  这个方法定时回收这个任务中心的任务
 	 * 2018年11月26日
 	 */
-//@Job("0 05 18 * * ?")
+@Job("0 20 18 * * ?")
 public class TaskDeleteJob extends BaseJob{
 	@Override
 	public void execute() {

src/rush/TaskUserJob.java

@@ -12,7 +12,7 @@ import java.util.*;
  *
  * 2018年11月26日
  */
-//@Job("0 57 08 * * ?")
+//@Job("0 27 18 * * ?")
 public class TaskUserJob extends BaseJob{
 	    @Override
         public void execute() {
@@ -57,14 +57,14 @@ public class TaskUserJob extends BaseJob{
 				DbHelper.getDbService().commit();
 
 			}
-			/*List<Map> taskrule= DbHelper.getDbService().queryMapList(" select id,  bl"
+			List<Map> taskrule= DbHelper.getDbService().queryMapList(" select id,  bl"
 					+"   from  rush_task_rule       "
 					+"   where to_char(sysdate,'yyyy-mm-dd') between startdate and enddate order by rule_level");
 			if (taskrule!=null){
 				for (int i=0;i<taskrule.size();i++) {
 					updatebfnum(taskrule.get(i).get("id").toString(), Integer.parseInt(taskrule.get(i).get("bl").toString()));
 				}
-			}*/
+			}
 
 
 

src/rush/UpdateCrmEnddate.java

@@ -9,7 +9,7 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
-@Job("0 16 21 * * ?")
+//@Job("0 16 21 * * ?")
 public class UpdateCrmEnddate extends BaseJob {
     @Override
     public void execute() {

src/rush/UpdateEnddateJobByZxf.java

@@ -11,7 +11,7 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
-@Job("0 0 23 * * ?")
+//@Job("0 0 23 * * ?")
 public class UpdateEnddateJobByZxf   extends BaseJob {
 
     /* 该方法定每半个小时 查询分公司对异常客户如果已缴费自动更新为已完成状态*/

src/rush/UpdateExcustomerTime.java

@@ -12,7 +12,7 @@ import java.util.Map;
 
 
 
-@Job("0 26 23 * * ?")
+//@Job("0 26 23 * * ?")
 public class UpdateExcustomerTime  extends BaseJob {
     @Override
     public void execute() {

src/rush/updatecompanyex.java

@@ -10,7 +10,7 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
-@Job("0 10 03 * * ?")
+//@Job("0 10 03 * * ?")
 public class updatecompanyex  extends BaseJob {
 
     @Override

src/rush/zqlTaskCustom.java

@@ -0,0 +1,32 @@
+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.util.List;
+import java.util.Map;
+
+/**
+ * @Author: 张学富
+ * @Date： 2021-10-2021/10/8  15:44
+ */
+
+@Job("0 30 13 * * ?")
+public class zqlTaskCustom extends BaseJob {
+    @Override
+    public void execute() {
+        DbHelper.getDbService().beginTransaction();
+        DbHelper.getDbService().update("delete from rush_to_assinged_cus where  rule_id in ('294067442524640038','294072363109710045')");
+        DbHelper.getDbService().commit();
+
+        DbHelper.getDbService().update("insert into rush_to_assinged_cus (rule_id,customer_id,org_id,org_name,end_date,revenueid,customer_name, cust_tax_code, createdate ,injf,ifmz) \n" +
+                "select '294067442524640038',customerid,org_id,org_name,end_datechr,revenueid,cust_name, cust_tax_code,'2022-04-20',injf,ifmz from (\n" +
+                "select customer_id from excustomer_info where zxhfremark is null and to_char(create_time,'yyyy-mm-dd')>='2023-01-01' and fistback in ('联系方式为空','联系方式异常','客户不在本单位')\n" +
+                "and state=1 ) a left join view_info b on a.customer_id =b.customerid where b.customerid is not null and isservice=0 and id is not null");
+
+        DbHelper.getDbService().update("insert into rush_to_assinged_cus (rule_id,customer_id,org_id,org_name,end_date,revenueid,customer_name, cust_tax_code, createdate ,injf,ifmz) \n" +
+                "select '294072363109710045',customerid,org_id,org_name,end_datechr,revenueid,cust_name, cust_tax_code,'2022-04-20',injf,ifmz from (\n" +
+                "select customer_id from excustomer_info where zxhfremark is null and to_char(create_time,'yyyy-mm-dd')>='2023-01-01' and fistback in ('联系方式为空','联系方式异常','客户不在本单位')\n" +
+                "and state=1 ) a left join view_info b on a.customer_id =b.customerid where b.customerid is not null and isservice=1 and id is not null");
+    }
+}