master
zxf
parent
4908f1ab36
commit
09e0ba7431
Binary file not shown.
|
|
@ -1 +1 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE sqls SYSTEM "sql_definition.dtd">
<sqls>
<sql group="rushfee_record">
<i id="updateFeedback"><![CDATA[
update RUSH_RECORD set feedback_type={feedback_type},remark={remark} ,contacts_info={contacts_info} where id={id}
]]></i>
<i id="updateLog"><![CDATA[
update RUSH_Log set obj_id={obj_id},vital={vital} where $in(id,ids)
]]></i>
<i id="saveLog"><![CDATA[
insert into RUSH_LOG
(id,
operator,
operate_date,
ip,
action,
remark,
obj_id,
info,
operator_code,custtype,injf,ifmz
)
values
({id},
{operator},
{operate_date},
{ip},
{action},
{remark},
{obj_id},
{info},
{operator_code},{custtype},{injf},{ifmz})
]]></i>
</sql>
</sqls>
|
||||
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE sqls SYSTEM "sql_definition.dtd">
<sqls>
<sql group="rushfee_record">
<i id="updateFeedback"><![CDATA[
update RUSH_RECORD set feedback_type={feedback_type},remark={remark} ,contacts_info={contacts_info} where id={id}
]]></i>
<i id="updateLog"><![CDATA[
update RUSH_Log set obj_id={obj_id},vital={vital} where $in(id,ids)
]]></i>
<i id="saveLog"><![CDATA[
insert into RUSH_LOG
(id,
operator,
operate_date,
ip,
action,
remark,
obj_id,
info,
operator_code,custtype,injf,ifmz,source
)
values
({id},
{operator},
{operate_date},
{ip},
{action},
{remark},
{obj_id},
{info},
{operator_code},{custtype},{injf},{ifmz},{source})
]]></i>
</sql>
</sqls>
|
||||
|
|
@ -23,7 +23,7 @@
|
|||
|
||||
<i id="getGrid"><![CDATA[
|
||||
select t.id,t.customer_id,t.cust_name,r.info as feedback_type,t.revenuename,substr(r.remark,instr(r.remark,'备注信息:')+5) remark,t.org_name,r.operator,r.operate_date as create_date,
|
||||
t.contacts_info,t.cust_tax_code,t.address
|
||||
t.contacts_info,t.cust_tax_code,t.address ,decode(r.source,'1','代理会计进入','任务中心') source ,decode(custtype,'0','服务费','1','托管') as charge_status
|
||||
from RUSH_LOG r inner join RUSH_RECORD t on t.id=r.obj_id where r.action='rushfee'
|
||||
and $equal(r.custtype,chargetype)
|
||||
and $equal(r.injf,injf)
|
||||
|
|
|
|||
|
|
@ -31,7 +31,8 @@
|
|||
<input id="message" widget="hidden" />
|
||||
<input id="msglogid" widget="hidden" />
|
||||
<input id="areacode" widget="hidden" />
|
||||
<input widget="hidden" name="org_id" />
|
||||
<input name="sourcetype" widget="hidden" />
|
||||
<input name="org_id" widget="hidden" />
|
||||
<input widget="edit" name="cust_name" label="客户名称" readonly="true" />
|
||||
<input widget="edit" name="cust_type" label="客户类型" readonly="true" />
|
||||
<br/>
|
||||
|
|
@ -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");
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@
|
|||
<div field="cust_name" width="130" header="客户名称"></div>
|
||||
<div field="feedback_type" width="100" header="催缴结果"></div>
|
||||
<div field="charge_status" width="100" header="缴费状态"></div>
|
||||
<div field="source" width="100" header="来源"></div>
|
||||
<div field="remark" width="70" header="备注信息"></div>
|
||||
<div field="org_name" width="70" header="分公司"></div>
|
||||
<div field="revenuename" width="70" header="所属税局"></div>
|
||||
|
|
|
|||
|
|
@ -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="source" width="30" align="center" header="代理会计数量"></div>
|
||||
<div field="heji" width="30" align="center" header="合计"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -1 +1 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE sqls SYSTEM "sql_definition.dtd">
<sqls>
<sql group="rushfee_record">
<i id="updateFeedback"><![CDATA[
update RUSH_RECORD set feedback_type={feedback_type},remark={remark} ,contacts_info={contacts_info} where id={id}
]]></i>
<i id="updateLog"><![CDATA[
update RUSH_Log set obj_id={obj_id},vital={vital} where $in(id,ids)
]]></i>
<i id="saveLog"><![CDATA[
insert into RUSH_LOG
(id,
operator,
operate_date,
ip,
action,
remark,
obj_id,
info,
operator_code,custtype,injf,ifmz
)
values
({id},
{operator},
{operate_date},
{ip},
{action},
{remark},
{obj_id},
{info},
{operator_code},{custtype},{injf},{ifmz})
]]></i>
</sql>
</sqls>
|
||||
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE sqls SYSTEM "sql_definition.dtd">
<sqls>
<sql group="rushfee_record">
<i id="updateFeedback"><![CDATA[
update RUSH_RECORD set feedback_type={feedback_type},remark={remark} ,contacts_info={contacts_info} where id={id}
]]></i>
<i id="updateLog"><![CDATA[
update RUSH_Log set obj_id={obj_id},vital={vital} where $in(id,ids)
]]></i>
<i id="saveLog"><![CDATA[
insert into RUSH_LOG
(id,
operator,
operate_date,
ip,
action,
remark,
obj_id,
info,
operator_code,custtype,injf,ifmz,source
)
values
({id},
{operator},
{operate_date},
{ip},
{action},
{remark},
{obj_id},
{info},
{operator_code},{custtype},{injf},{ifmz},{source})
]]></i>
</sql>
</sqls>
|
||||
|
|
@ -23,7 +23,7 @@
|
|||
|
||||
<i id="getGrid"><![CDATA[
|
||||
select t.id,t.customer_id,t.cust_name,r.info as feedback_type,t.revenuename,substr(r.remark,instr(r.remark,'备注信息:')+5) remark,t.org_name,r.operator,r.operate_date as create_date,
|
||||
t.contacts_info,t.cust_tax_code,t.address
|
||||
t.contacts_info,t.cust_tax_code,t.address ,decode(r.source,'1','代理会计进入','任务中心') source ,decode(custtype,'0','服务费','1','托管') as charge_status
|
||||
from RUSH_LOG r inner join RUSH_RECORD t on t.id=r.obj_id where r.action='rushfee'
|
||||
and $equal(r.custtype,chargetype)
|
||||
and $equal(r.injf,injf)
|
||||
|
|
|
|||
|
|
@ -31,7 +31,8 @@
|
|||
<input id="message" widget="hidden" />
|
||||
<input id="msglogid" widget="hidden" />
|
||||
<input id="areacode" widget="hidden" />
|
||||
<input widget="hidden" name="org_id" />
|
||||
<input name="sourcetype" widget="hidden" />
|
||||
<input name="org_id" widget="hidden" />
|
||||
<input widget="edit" name="cust_name" label="客户名称" readonly="true" />
|
||||
<input widget="edit" name="cust_type" label="客户类型" readonly="true" />
|
||||
<br/>
|
||||
|
|
@ -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");
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@
|
|||
<div field="cust_name" width="130" header="客户名称"></div>
|
||||
<div field="feedback_type" width="100" header="催缴结果"></div>
|
||||
<div field="charge_status" width="100" header="缴费状态"></div>
|
||||
<div field="source" width="100" header="来源"></div>
|
||||
<div field="remark" width="70" header="备注信息"></div>
|
||||
<div field="org_name" width="70" header="分公司"></div>
|
||||
<div field="revenuename" width="70" header="所属税局"></div>
|
||||
|
|
|
|||
|
|
@ -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="source" width="30" align="center" header="代理会计数量"></div>
|
||||
<div field="heji" width="30" align="center" header="合计"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -1,3 +1,3 @@
|
|||
#save ini
|
||||
#Sat Jan 07 21:15:24 CST 2023
|
||||
#Wed Jan 18 20:08:06 CST 2023
|
||||
deploystamp=1612237236000
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE sqls SYSTEM "sql_definition.dtd">
<sqls>
<sql group="rushfee_record">
<i id="updateFeedback"><![CDATA[
update RUSH_RECORD set feedback_type={feedback_type},remark={remark} ,contacts_info={contacts_info} where id={id}
]]></i>
<i id="updateLog"><![CDATA[
update RUSH_Log set obj_id={obj_id},vital={vital} where $in(id,ids)
]]></i>
<i id="saveLog"><![CDATA[
insert into RUSH_LOG
(id,
operator,
operate_date,
ip,
action,
remark,
obj_id,
info,
operator_code,custtype,injf,ifmz
)
values
({id},
{operator},
{operate_date},
{ip},
{action},
{remark},
{obj_id},
{info},
{operator_code},{custtype},{injf},{ifmz})
]]></i>
</sql>
</sqls>
|
||||
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE sqls SYSTEM "sql_definition.dtd">
<sqls>
<sql group="rushfee_record">
<i id="updateFeedback"><![CDATA[
update RUSH_RECORD set feedback_type={feedback_type},remark={remark} ,contacts_info={contacts_info} where id={id}
]]></i>
<i id="updateLog"><![CDATA[
update RUSH_Log set obj_id={obj_id},vital={vital} where $in(id,ids)
]]></i>
<i id="saveLog"><![CDATA[
insert into RUSH_LOG
(id,
operator,
operate_date,
ip,
action,
remark,
obj_id,
info,
operator_code,custtype,injf,ifmz,source
)
values
({id},
{operator},
{operate_date},
{ip},
{action},
{remark},
{obj_id},
{info},
{operator_code},{custtype},{injf},{ifmz},{source})
]]></i>
</sql>
</sqls>
|
||||
|
|
@ -23,7 +23,7 @@
|
|||
|
||||
<i id="getGrid"><![CDATA[
|
||||
select t.id,t.customer_id,t.cust_name,r.info as feedback_type,t.revenuename,substr(r.remark,instr(r.remark,'备注信息:')+5) remark,t.org_name,r.operator,r.operate_date as create_date,
|
||||
t.contacts_info,t.cust_tax_code,t.address
|
||||
t.contacts_info,t.cust_tax_code,t.address ,decode(r.source,'1','代理会计进入','任务中心') source ,decode(custtype,'0','服务费','1','托管') as charge_status
|
||||
from RUSH_LOG r inner join RUSH_RECORD t on t.id=r.obj_id where r.action='rushfee'
|
||||
and $equal(r.custtype,chargetype)
|
||||
and $equal(r.injf,injf)
|
||||
|
|
|
|||
|
|
@ -31,7 +31,8 @@
|
|||
<input id="message" widget="hidden" />
|
||||
<input id="msglogid" widget="hidden" />
|
||||
<input id="areacode" widget="hidden" />
|
||||
<input widget="hidden" name="org_id" />
|
||||
<input name="sourcetype" widget="hidden" />
|
||||
<input name="org_id" widget="hidden" />
|
||||
<input widget="edit" name="cust_name" label="客户名称" readonly="true" />
|
||||
<input widget="edit" name="cust_type" label="客户类型" readonly="true" />
|
||||
<br/>
|
||||
|
|
@ -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");
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@
|
|||
<div field="cust_name" width="130" header="客户名称"></div>
|
||||
<div field="feedback_type" width="100" header="催缴结果"></div>
|
||||
<div field="charge_status" width="100" header="缴费状态"></div>
|
||||
<div field="source" width="100" header="来源"></div>
|
||||
<div field="remark" width="70" header="备注信息"></div>
|
||||
<div field="org_name" width="70" header="分公司"></div>
|
||||
<div field="revenuename" width="70" header="所属税局"></div>
|
||||
|
|
|
|||
|
|
@ -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="source" width="30" align="center" header="代理会计数量"></div>
|
||||
<div field="heji" width="30" align="center" header="合计"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,103 @@
|
|||
<html login="false">
|
||||
<head>
|
||||
<title>当日缴费量</title>
|
||||
</head>
|
||||
<body>
|
||||
<div widget="toolbar" style="padding:10px;border:0;">
|
||||
<input name="searchbegindate" widget=datechooser allowinput="f" label="开始日期">
|
||||
<input name="searchenddate" widget=datechooser allowinput="f" label="结束日期" >
|
||||
<input name="custtype" widget=combox allowinput="f" style="width: 150px;" showNullItem="true"
|
||||
data="[{id:1,text:'托管'},{id:0,text:'服务费'}]" label="客户类型">
|
||||
<input name="injf" widget=combox allowinput="f" style="width: 150px;" showNullItem="true"
|
||||
data="[{id:1,text:'是'},{id:0,text:'否'}]" label="是否在机柜">
|
||||
<input name="ifmz" widget=combox allowinput="f" style="width: 150px;" showNullItem="true"
|
||||
data="[{id:1,text:'是'},{id:0,text:'否'}]" label="是否免征">
|
||||
|
||||
<a widget="button" iconCls="icon-search" onclick="search()">查询</a>
|
||||
</div>
|
||||
<div widget="autosize">
|
||||
<div widget="datagrid" name="grid" style="width: 100%; height: 100%;" url="tick/TickList/shijinumnew" allowalternating="true" onrowdblclick="taskInfo()">
|
||||
<div type="indexcolumn" width="10" header="序号"></div>
|
||||
<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="source" width="30" align="center" header="代理会计数量"></div>
|
||||
<div field="heji" width="30" align="center" header="合计"></div>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
<script type="text/javascript">
|
||||
var grid = aos.get('grid');
|
||||
var begintime =aos.formatDate(new Date(),"yyyy-MM-dd");
|
||||
var endtime =aos.formatDate(new Date(),"yyyy-MM-dd");
|
||||
aos.get('searchbegindate').setValue(begintime);
|
||||
aos.get('searchenddate').setValue(endtime);
|
||||
|
||||
|
||||
function search(){
|
||||
|
||||
var begindate=aos.get('searchbegindate').getValue();
|
||||
var enddate=aos.get('searchenddate').getValue();
|
||||
if (begindate!="")
|
||||
{
|
||||
if (enddate=="")
|
||||
{aos.alert('请选择结束时间！');
|
||||
return ;
|
||||
}
|
||||
else{
|
||||
if (begindate>enddate)
|
||||
{
|
||||
aos.alert('开始日期必须早于结束日期！');
|
||||
}else{
|
||||
var begindate=begindate+" "+"00:00:00";
|
||||
var enddate=enddate+" "+"23:59:59";
|
||||
var params={
|
||||
searchbegindate:begindate,
|
||||
injf:aos.get('injf').getValue(),
|
||||
custtype:aos.get('custtype').getValue(),
|
||||
ifmz:aos.get('ifmz').getValue(),
|
||||
searchenddate:enddate
|
||||
|
||||
}
|
||||
grid.load(params);
|
||||
}
|
||||
}
|
||||
}else if(enddate!="")
|
||||
{
|
||||
aos.alert('请选择开始时间！');
|
||||
return ;
|
||||
}else{
|
||||
var begindate=aos.get('searchbegindate').getValue();
|
||||
var enddate=aos.get('searchenddate').getValue();
|
||||
var params = {searchbegindate:begindate,
|
||||
injf:aos.get('injf').getValue(),
|
||||
custtype:aos.get('custtype').getValue(),
|
||||
ifmz:aos.get('ifmz').getValue(),
|
||||
searchenddate:enddate
|
||||
}
|
||||
grid.load(params);
|
||||
}
|
||||
|
||||
}
|
||||
function taskInfo(){
|
||||
var row=grid.getSelected();
|
||||
var date=aos.get('searchbegindate').getValue();
|
||||
var date1=aos.get('searchenddate').getValue();
|
||||
var begindate=date+" "+"00:00:00";
|
||||
var enddate=date1+" "+"23:59:59";
|
||||
var operator=row.operator;
|
||||
|
||||
|
||||
var param={};
|
||||
param['operator']=row.operator;
|
||||
param['searchbegindate']=begindate;
|
||||
param['searchenddate']=enddate;
|
||||
aos.showWindow('canvas/tick/shijidetail', param, '600px', '400px', '当日实际缴费企业明细', function(rtnValue){
|
||||
|
||||
});
|
||||
|
||||
|
||||
}
|
||||
|
||||
</script>
|
||||
</html>
|
||||
|
|
@ -0,0 +1,103 @@
|
|||
<html login="false">
|
||||
<head>
|
||||
<title>当日缴费量</title>
|
||||
</head>
|
||||
<body>
|
||||
<div widget="toolbar" style="padding:10px;border:0;">
|
||||
<input name="searchbegindate" widget=datechooser allowinput="f" label="开始日期">
|
||||
<input name="searchenddate" widget=datechooser allowinput="f" label="结束日期" >
|
||||
<input name="custtype" widget=combox allowinput="f" style="width: 150px;" showNullItem="true"
|
||||
data="[{id:1,text:'托管'},{id:0,text:'服务费'}]" label="客户类型">
|
||||
<input name="injf" widget=combox allowinput="f" style="width: 150px;" showNullItem="true"
|
||||
data="[{id:1,text:'是'},{id:0,text:'否'}]" label="是否在机柜">
|
||||
<input name="ifmz" widget=combox allowinput="f" style="width: 150px;" showNullItem="true"
|
||||
data="[{id:1,text:'是'},{id:0,text:'否'}]" label="是否免征">
|
||||
|
||||
<a widget="button" iconCls="icon-search" onclick="search()">查询</a>
|
||||
</div>
|
||||
<div widget="autosize">
|
||||
<div widget="datagrid" name="grid" style="width: 100%; height: 100%;" url="tick/TickList/shijinumnew" allowalternating="true" onrowdblclick="taskInfo()">
|
||||
<div type="indexcolumn" width="10" header="序号"></div>
|
||||
<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="source" width="30" align="center" header="代理会计数量"></div>
|
||||
<div field="heji" width="30" align="center" header="合计"></div>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
<script type="text/javascript">
|
||||
var grid = aos.get('grid');
|
||||
var begintime =aos.formatDate(new Date(),"yyyy-MM-dd");
|
||||
var endtime =aos.formatDate(new Date(),"yyyy-MM-dd");
|
||||
aos.get('searchbegindate').setValue(begintime);
|
||||
aos.get('searchenddate').setValue(endtime);
|
||||
|
||||
|
||||
function search(){
|
||||
|
||||
var begindate=aos.get('searchbegindate').getValue();
|
||||
var enddate=aos.get('searchenddate').getValue();
|
||||
if (begindate!="")
|
||||
{
|
||||
if (enddate=="")
|
||||
{aos.alert('请选择结束时间！');
|
||||
return ;
|
||||
}
|
||||
else{
|
||||
if (begindate>enddate)
|
||||
{
|
||||
aos.alert('开始日期必须早于结束日期！');
|
||||
}else{
|
||||
var begindate=begindate+" "+"00:00:00";
|
||||
var enddate=enddate+" "+"23:59:59";
|
||||
var params={
|
||||
searchbegindate:begindate,
|
||||
injf:aos.get('injf').getValue(),
|
||||
custtype:aos.get('custtype').getValue(),
|
||||
ifmz:aos.get('ifmz').getValue(),
|
||||
searchenddate:enddate
|
||||
|
||||
}
|
||||
grid.load(params);
|
||||
}
|
||||
}
|
||||
}else if(enddate!="")
|
||||
{
|
||||
aos.alert('请选择开始时间！');
|
||||
return ;
|
||||
}else{
|
||||
var begindate=aos.get('searchbegindate').getValue();
|
||||
var enddate=aos.get('searchenddate').getValue();
|
||||
var params = {searchbegindate:begindate,
|
||||
injf:aos.get('injf').getValue(),
|
||||
custtype:aos.get('custtype').getValue(),
|
||||
ifmz:aos.get('ifmz').getValue(),
|
||||
searchenddate:enddate
|
||||
}
|
||||
grid.load(params);
|
||||
}
|
||||
|
||||
}
|
||||
function taskInfo(){
|
||||
var row=grid.getSelected();
|
||||
var date=aos.get('searchbegindate').getValue();
|
||||
var date1=aos.get('searchenddate').getValue();
|
||||
var begindate=date+" "+"00:00:00";
|
||||
var enddate=date1+" "+"23:59:59";
|
||||
var operator=row.operator;
|
||||
|
||||
|
||||
var param={};
|
||||
param['operator']=row.operator;
|
||||
param['searchbegindate']=begindate;
|
||||
param['searchenddate']=enddate;
|
||||
aos.showWindow('canvas/tick/shijidetailnew', param, '1200px', '800px', '当日实际缴费企业明细', function(rtnValue){
|
||||
|
||||
});
|
||||
|
||||
|
||||
}
|
||||
|
||||
</script>
|
||||
</html>
|
||||
|
|
@ -0,0 +1,44 @@
|
|||
<html login="false">
|
||||
<head>
|
||||
<title>客户明细</title>
|
||||
</head>
|
||||
<body>
|
||||
|
||||
<div widget="autosize">
|
||||
<div widget="datagrid" name="grid" style="width: 100%; height: 100%;" url="tick/TickList/shijidetail" >
|
||||
<div type="indexcolumn" width="10" header="序号"></div>
|
||||
<div field="kpy" width="15" header="开票人"></div>
|
||||
<div field="custname" width="40" header="客户名称"></div>
|
||||
<div field="kprq" width="20" header="开票日期"></div>
|
||||
<div field="addtime" width="30" header="缴费日期"></div>
|
||||
<div field="rushtime" width="30" header="催缴日期"></div>
|
||||
<div field="isjisuan" width="30" header="是否参与计算"></div>
|
||||
<div field="custtype" width="30" header="类型"></div>
|
||||
<div field="kphjje" width="20" header="开票金额"></div>
|
||||
<div field="source" width="20" header="来源"></div>
|
||||
<div field="kpxm" width="20" header="开票姓名"></div>
|
||||
<div field="flag" width="15" header="开票方式"></div>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
<script type="text/javascript">
|
||||
|
||||
function init(param){
|
||||
|
||||
var grid = aos.get('grid');
|
||||
|
||||
|
||||
var operator=param['operator'];
|
||||
var searchbegindate=param['searchbegindate'];
|
||||
var searchenddate = param['searchenddate']
|
||||
var params={searchbegindate:searchbegindate,searchenddate:searchenddate,operator:operator};
|
||||
grid.load(params);
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
</script>
|
||||
</html>
|
||||
|
|
@ -230,7 +230,7 @@ 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,\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('"+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 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
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
Loading…
Reference in New Issue