diff --git a/build/classes/com/hangxin/web/TickingAction.class b/build/classes/com/hangxin/web/TickingAction.class index 3360b8f..5663fb6 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/db/record_sql.xml b/build/classes/db/record_sql.xml index 8362980..9f22ea2 100644 --- a/build/classes/db/record_sql.xml +++ b/build/classes/db/record_sql.xml @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/build/classes/db/search_sql.xml b/build/classes/db/search_sql.xml index 35bf5f8..9b1aa97 100644 --- a/build/classes/db/search_sql.xml +++ b/build/classes/db/search_sql.xml @@ -23,7 +23,7 @@ - + +
@@ -135,6 +136,7 @@ * 否则禁用完成按钮 */ aos.get("org_id").setValue(rtnData.org_id); + aos.get("sourcetype").setValue(rtnData.sourcetype); aos.getForm().setData(rtnData); if(rtnData.unequal==1){ /* if(aos.get('is_need_again').getValue()=='N'){ @@ -351,6 +353,7 @@ data['task_id']=aos.get('task_id').getValue(); data['detail_id']=aos.get('detail_id').getValue(); data['task_user_id']=aos.get('task_user_id').getValue(); + data['sourcetype']=aos.get('sourcetype').getValue(); data['callLogs']=aos.get('logid').getValue(); data['added']=getChangeData("added"); data['modified']=getChangeData("modified"); diff --git a/build/classes/html/rush/search.html b/build/classes/html/rush/search.html index 278941b..add2edb 100644 --- a/build/classes/html/rush/search.html +++ b/build/classes/html/rush/search.html @@ -30,6 +30,7 @@
+
diff --git a/build/classes/html/tick/shijiday.html b/build/classes/html/tick/shijiday.html index 22d8250..515d4e6 100644 --- a/build/classes/html/tick/shijiday.html +++ b/build/classes/html/tick/shijiday.html @@ -21,6 +21,7 @@
+
diff --git a/build/classes/rush/AccountAction.class b/build/classes/rush/AccountAction.class index 9971120..de351ab 100644 Binary files a/build/classes/rush/AccountAction.class and b/build/classes/rush/AccountAction.class differ diff --git a/build/classes/rush/PaiGongAction.class b/build/classes/rush/PaiGongAction.class index 39b665c..e02b0ab 100644 Binary files a/build/classes/rush/PaiGongAction.class and b/build/classes/rush/PaiGongAction.class differ diff --git a/build/classes/rush/RushTaskCenterAction.class b/build/classes/rush/RushTaskCenterAction.class index 27f32c1..b2e3f9c 100644 Binary files a/build/classes/rush/RushTaskCenterAction.class and b/build/classes/rush/RushTaskCenterAction.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 3360b8f..5663fb6 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/db/record_sql.xml b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/db/record_sql.xml index 8362980..9f22ea2 100644 --- a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/db/record_sql.xml +++ b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/db/record_sql.xml @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/db/search_sql.xml b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/db/search_sql.xml index 35bf5f8..9b1aa97 100644 --- a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/db/search_sql.xml +++ b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/db/search_sql.xml @@ -23,7 +23,7 @@ - + +
@@ -135,6 +136,7 @@ * 否则禁用完成按钮 */ aos.get("org_id").setValue(rtnData.org_id); + aos.get("sourcetype").setValue(rtnData.sourcetype); aos.getForm().setData(rtnData); if(rtnData.unequal==1){ /* if(aos.get('is_need_again').getValue()=='N'){ @@ -351,6 +353,7 @@ data['task_id']=aos.get('task_id').getValue(); data['detail_id']=aos.get('detail_id').getValue(); data['task_user_id']=aos.get('task_user_id').getValue(); + data['sourcetype']=aos.get('sourcetype').getValue(); data['callLogs']=aos.get('logid').getValue(); data['added']=getChangeData("added"); data['modified']=getChangeData("modified"); diff --git a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/rush/search.html b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/rush/search.html index 278941b..add2edb 100644 --- a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/rush/search.html +++ b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/rush/search.html @@ -30,6 +30,7 @@
+
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 22d8250..515d4e6 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 @@
+
diff --git a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/rush/AccountAction.class b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/rush/AccountAction.class index 9971120..de351ab 100644 Binary files a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/rush/AccountAction.class and b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/rush/AccountAction.class differ diff --git a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/rush/PaiGongAction.class b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/rush/PaiGongAction.class index 39b665c..e02b0ab 100644 Binary files a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/rush/PaiGongAction.class and b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/rush/PaiGongAction.class differ diff --git a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/rush/RushTaskCenterAction.class b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/rush/RushTaskCenterAction.class index 27f32c1..b2e3f9c 100644 Binary files a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/rush/RushTaskCenterAction.class and b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/rush/RushTaskCenterAction.class differ diff --git a/classes/artifacts/rushfee_Web_exploded/ptrun.ini b/classes/artifacts/rushfee_Web_exploded/ptrun.ini index 5b9ada8..efb0157 100644 --- a/classes/artifacts/rushfee_Web_exploded/ptrun.ini +++ b/classes/artifacts/rushfee_Web_exploded/ptrun.ini @@ -1,3 +1,3 @@ #save ini -#Sat Jan 07 21:15:24 CST 2023 +#Wed Jan 18 20:08:06 CST 2023 deploystamp=1612237236000 diff --git a/resource/db/record_sql.xml b/resource/db/record_sql.xml index 8362980..9f22ea2 100644 --- a/resource/db/record_sql.xml +++ b/resource/db/record_sql.xml @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resource/db/search_sql.xml b/resource/db/search_sql.xml index 35bf5f8..9b1aa97 100644 --- a/resource/db/search_sql.xml +++ b/resource/db/search_sql.xml @@ -23,7 +23,7 @@ - + +
@@ -135,6 +136,7 @@ * 否则禁用完成按钮 */ aos.get("org_id").setValue(rtnData.org_id); + aos.get("sourcetype").setValue(rtnData.sourcetype); aos.getForm().setData(rtnData); if(rtnData.unequal==1){ /* if(aos.get('is_need_again').getValue()=='N'){ @@ -351,6 +353,7 @@ data['task_id']=aos.get('task_id').getValue(); data['detail_id']=aos.get('detail_id').getValue(); data['task_user_id']=aos.get('task_user_id').getValue(); + data['sourcetype']=aos.get('sourcetype').getValue(); data['callLogs']=aos.get('logid').getValue(); data['added']=getChangeData("added"); data['modified']=getChangeData("modified"); diff --git a/resource/html/rush/search.html b/resource/html/rush/search.html index 278941b..add2edb 100644 --- a/resource/html/rush/search.html +++ b/resource/html/rush/search.html @@ -30,6 +30,7 @@
+
diff --git a/resource/html/tick/shijiday.html b/resource/html/tick/shijiday.html index 22d8250..515d4e6 100644 --- a/resource/html/tick/shijiday.html +++ b/resource/html/tick/shijiday.html @@ -21,6 +21,7 @@
+
diff --git a/resource/html/tick/shijidayhlnew.html b/resource/html/tick/shijidayhlnew.html new file mode 100644 index 0000000..a62bcb2 --- /dev/null +++ b/resource/html/tick/shijidayhlnew.html @@ -0,0 +1,103 @@ + + + 当日缴费量 + + +
+ + + + + + + 查询 +
+
+
+
+
+
+
+
+
+
+
+ + + \ No newline at end of file diff --git a/resource/html/tick/shijidaynew.html b/resource/html/tick/shijidaynew.html new file mode 100644 index 0000000..ea8c945 --- /dev/null +++ b/resource/html/tick/shijidaynew.html @@ -0,0 +1,103 @@ + + + 当日缴费量 + + +
+ + + + + + + 查询 +
+
+
+
+
+
+
+
+
+
+
+ + + \ No newline at end of file diff --git a/resource/html/tick/shijidetailnew.html b/resource/html/tick/shijidetailnew.html new file mode 100644 index 0000000..4f1ba07 --- /dev/null +++ b/resource/html/tick/shijidetailnew.html @@ -0,0 +1,44 @@ + + + 客户明细 + + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + + \ No newline at end of file diff --git a/src/com/hangxin/web/TickingAction.java b/src/com/hangxin/web/TickingAction.java index 344ee21..1982dee 100644 --- a/src/com/hangxin/web/TickingAction.java +++ b/src/com/hangxin/web/TickingAction.java @@ -230,7 +230,7 @@ public class TickingAction { "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,\n" + + 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" + @@ -253,6 +253,63 @@ public class TickingAction { } + + + + + @Request.Post("shijinumnew") + public Map shijinumnew(Params params){ + String userid=SessionHelper.getCurrentUserId(); + Object searchbegindate=params.get("searchbegindate"); + Object searchenddate=params.get("searchenddate"); + Object injf =params.get("injf"); + Object ifmz =params.get("ifmz"); + Object custtype =params.get("custtype"); + String custtypesql=""; + String injfsql=""; + String ifmzsql=""; + if(injf!=null){ + injfsql=" and a.injf="+injf; + } + if(ifmz!=null){ + ifmzsql=" and a.ifmz="+ifmz; + } + if(custtype!=null){ + custtypesql=" and a.custtype="+custtype; + } + String addString=" and operator in (SELECT c.cname FROM " + +" RUSH_USER_QUERYAUTH a " + +" LEFT JOIN AOS_RMS_USER b ON a.USER_ID = b.cguid " + +" LEFT JOIN AOS_RMS_USER c ON a.userauth_id = c.cguid " + +" 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" + + "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" + + " 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('"+searchbegindate+"','YYYY-MM-DD HH24:MI:SS') \n" + + "group by rollup (a.operator) order by heji "; + System.out.println("-------------"+sqlString); + return DbHelper.getDbService().queryPageMapList(sqlString, params); + + } + else{ + return null; + } + + + + } + + @Request.Post("shijidetail") public Map shijidetail(Params params){ String userid=SessionHelper.getCurrentUserId(); @@ -277,8 +334,19 @@ public class TickingAction { if(null!=searchbegindate){ String sqlString=" select b.operator, " +" c.kpy, " - +" c.ghfmc custname, " - +" c.kprq, c.kpxm , " + +" c.ghfmc custname, b.OPERATE_DATE rushtime,\n" + + " to_char(c.addtime, 'yyyy-MM-dd hh24:mi:ss') addtime,\n" + + " case\n" + + " when ceil(((c.addtime -\n" + + " To_date(b.operate_date, 'yyyy-mm-dd hh24-mi-ss'))) * 24 * 60) < -30 then\n" + + " '交费时间' ||\n" + + " to_char(ceil(((To_date(b.operate_date, 'yyyy-mm-dd hh24-mi-ss') -\n" + + " c.addtime)) * 24 * 60)) || '分钟后才保存单据，不参与统计！'\n" + + " else\n" + + " to_char(ceil(((c.addtime -\n" + + " To_date(b.operate_date, 'yyyy-mm-dd hh24-mi-ss'))) * 24 * 60))\n" + + " end isjisuan, decode(b.source,'1','代理会计进入','任务中心') source,decode(b.custtype,'0','服务费','1','托管') custtype," + +" c.kprq, c.kpxm , c.kphjje, " +" DECODE(c.kpmode, " +" '0', " +" '手机', " @@ -290,14 +358,14 @@ public class TickingAction { +" '官网', " +" '4', " +" '商城') flag " - +" from (select distinct t.obj_id, t.operator " + +" from (select distinct t.obj_id, t.operator ,t.OPERATE_DATE ,t.custtype,t.source " +" from RUSH_LOG t " +" where t.action = 'rushfee' "+operatorsql +" and t.OPERATE_DATE > '"+searchbegindate+"' " +" and t.OPERATE_DATE < '"+searchenddate+"' ) b " +" inner join rush_record a " +" on a.id = b.obj_id " - +" inner join (select ghf_custid, kpy, kprq, kpmode, ghfmc,kpxm " + +" inner join (select ghf_custid, kpy, kprq, kpmode, ghfmc,kpxm,addtime,kphjje " +" from EINVOICE_FPKJXX_FPTXX t " +" where " // t.invoicetype = '2' and diff --git a/src/rush/AccountAction.java b/src/rush/AccountAction.java index 1e2dc4c..2ff8b55 100644 --- a/src/rush/AccountAction.java +++ b/src/rush/AccountAction.java @@ -857,6 +857,7 @@ public class AccountAction { param_log.put("obj_id", obj_id); param_log.put("OPERATOR_CODE", operator); param_log.put("info", feedback_type);//反馈结果记录到info中 + param_log.put("source", "1"); DbHelper.getDbService().updateById("rushfee_record.saveLog", param_log); //修改任务完成进度，2018-02-26新添加保存逻辑_zyc // finishTaskById(params); @@ -1009,11 +1010,12 @@ public class AccountAction { String AGREE_VISIT_DATE=agree_visit_date; String TASK_CREATOR_NAME=creator_name; String CUSTOMER_ID=customer_id; + String SOURCE="1"; List insert_log_params = new ArrayList(); - Object[] insertLogParams = new Object[]{TASK_ID,DETAIL_ID,TASK_USER_ID,user_id, USER_NAME,CUST_TAX_CODE, CUSTOMER_NAME,REVENUEID,EXPECT_BEGIN_DATE,IS_NEED_AGAIN,AGREE_VISIT_DATE,TASK_CREATOR_NAME,org_name,ORG_ID,end_date,CUSTOMER_ID}; + Object[] insertLogParams = new Object[]{TASK_ID,DETAIL_ID,TASK_USER_ID,user_id, USER_NAME,CUST_TAX_CODE, CUSTOMER_NAME,REVENUEID,EXPECT_BEGIN_DATE,IS_NEED_AGAIN,AGREE_VISIT_DATE,TASK_CREATOR_NAME,org_name,ORG_ID,end_date,CUSTOMER_ID,SOURCE}; insert_log_params.add(insertLogParams); - DbHelper.getDbService().batchUpdate("insert into rush_task_center (ID,TASK_ID,DETAIL_ID,TASK_USER_ID,USER_ID, USER_NAME,CUST_TAX_CODE, CUSTOMER_NAME,REVENUEID,EXPECT_BEGIN_DATE,IS_NEED_AGAIN,AGREE_VISIT_DATE,TASK_CREATOR_NAME,ORG_NAME,ORG_ID,END_DATE,CUSTOMER_ID) values (SEQ_TASK_CENTER.nextval,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)" , insert_log_params); + DbHelper.getDbService().batchUpdate("insert into rush_task_center (ID,TASK_ID,DETAIL_ID,TASK_USER_ID,USER_ID, USER_NAME,CUST_TAX_CODE, CUSTOMER_NAME,REVENUEID,EXPECT_BEGIN_DATE,IS_NEED_AGAIN,AGREE_VISIT_DATE,TASK_CREATOR_NAME,ORG_NAME,ORG_ID,END_DATE,CUSTOMER_ID,SOURCE) values (SEQ_TASK_CENTER.nextval,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)" , insert_log_params); } diff --git a/src/rush/PaiGongAction.java b/src/rush/PaiGongAction.java index 7b4ab6a..2caec57 100644 --- a/src/rush/PaiGongAction.java +++ b/src/rush/PaiGongAction.java @@ -88,7 +88,7 @@ public class PaiGongAction { @Request.Post("getpaylist") public Map getList(Params params){ Object ghf_custid=params.get("customer_id"); - return DbHelper.getDbService().queryPageMapList("select kpxm,to_char(addtime,'yyyy-mm-dd HH24:MI:SS') addtime,kphjje from einvoice_fpkjxx_fptxx where ghf_custid='"+ghf_custid+"'" + return DbHelper.getDbService().queryPageMapList("select kpxm,to_char(addtime,'yyyy-mm-dd') addtime,kphjje from einvoice_fpkjxx_fptxx where ghf_custid='"+ghf_custid+"'" +" order by addtime desc",params); } diff --git a/src/rush/RushTaskCenterAction.java b/src/rush/RushTaskCenterAction.java index 04e5e31..e460d1e 100644 --- a/src/rush/RushTaskCenterAction.java +++ b/src/rush/RushTaskCenterAction.java @@ -253,7 +253,7 @@ public class RushTaskCenterAction { e.printStackTrace(); } Map map = DbHelper.getDbService().queryMap("select * from VIEW_RUSHFEE_LIST t where customerid = ?", params.getString("customer_id")); - Map map_center = DbHelper.getDbService().queryMap("select c.is_need_again,c.agree_visit_date,c.cust_tax_code cust_tax_code,c.customer_name cust_name from RUSH_TASK_CENTER c where id = ?", params.getString("center_id")); + Map map_center = DbHelper.getDbService().queryMap("select c.is_need_again,c.agree_visit_date,c.cust_tax_code cust_tax_code,c.customer_name cust_name ,source sourcetype from RUSH_TASK_CENTER c where id = ?", params.getString("center_id")); if(null==map){ @@ -284,6 +284,7 @@ public class RushTaskCenterAction { } } } + map.put("sourcetype",map_center.get("sourcetype").toString()); return map; } @@ -416,6 +417,7 @@ public class RushTaskCenterAction { String end_date = params.getString("end_date"); String address = params.getString("invoice_addr"); String feedback_type= params.getString("feedback"); + String sourcetype= params.getString("sourcetype"); String remark= params.getString("remark"); String creator = SessionHelper.getCurrentUserName(); //登录人姓名 @@ -829,6 +831,7 @@ public class RushTaskCenterAction { param_log.put("custtype", custtype); param_log.put("injf", injf); param_log.put("ifmz", ifmz); + param_log.put("source", sourcetype); DbHelper.getDbService().updateById("rushfee_record.saveLog", param_log); //修改任务完成进度，2018-02-26新添加保存逻辑_zyc finishTaskById(params);