c端回租放款凭证区分差额不差额，新增微信绑定信息表xml，部分多余jbo去除
This commit is contained in:
xiezhiwen
parent
972e475609
commit
b886ac8165
@ -740,8 +740,6 @@
|
||||
<attribute name="ACCOUNT_INFO" label="账户信息" type="STRING" length="32"/>
|
||||
<attribute name="ACCOUNT" label="账户名称" type="STRING" length="32"/>
|
||||
<attribute name="DISTRIBUTOR_ACCOUNT_TEMP" label="经销商名称" type="STRING" length="32"/>
|
||||
<attribute name="SUBJECTID" label="主体id" type="STRING" length="32"/>
|
||||
<attribute name="SUBJECTNAME" label="主体名称" type="STRING" length="200"/>
|
||||
</attributes>
|
||||
<manager>
|
||||
<managerProperties>
|
||||
@ -803,8 +801,6 @@
|
||||
<attribute name="LOCAL_BANK" label="本方银行" type="STRING" length="100"/>
|
||||
<attribute name="ACCOUNT_BALANCE" label="账户余额" type="DOUBLE" length="22" scale="2"/>
|
||||
<attribute name="refund_number" label="退款账号" type="STRING" length="32"/>
|
||||
<attribute name="SUBJECTID" label="主体id" type="STRING" length="32"/>
|
||||
<attribute name="SUBJECTNAME" label="主体名称" type="STRING" length="200"/>
|
||||
</attributes>
|
||||
<manager>
|
||||
<managerProperties>
|
||||
|
||||
@ -178,9 +178,9 @@ public class CreateVoucherLoanDistributor {
|
||||
String FINAN1 = ProductParamUtil.getProductParameterValue(PRODUCT_ID, "PRD0315", "PURCHASE_TAX","FINAN");
|
||||
// 判断保险费是否参融
|
||||
String FINAN2 = ProductParamUtil.getProductParameterValue(PRODUCT_ID, "PRD0315", "INSURANCE_PREMIUM","FINAN");
|
||||
// 判断保证金是否差额
|
||||
String isBalance1 = ProductParamUtil.getProductParameterValue(PRODUCT_ID, "PRD0315", "HANDLING_CHARGE_MONEY","isBalance");
|
||||
// 判断手续费是否差额
|
||||
String isBalance1 = ProductParamUtil.getProductParameterValue(PRODUCT_ID, "PRD0315", "HANDLING_CHARGE_MONEY","isBalance");
|
||||
// 判断保证金是否差额
|
||||
String isBalance2 = ProductParamUtil.getProductParameterValue(PRODUCT_ID, "PRD0315", "CAUTION_MONEY","isBalance");
|
||||
MONEY=dataList.get(i).get("MONEY");
|
||||
if("PZ2018070900000002".equals(VOUCHERNO) || "PZ2018071000000005".equals(VOUCHERNO) || "PZ2018071000000006".equals(VOUCHERNO)){
|
||||
@ -190,6 +190,11 @@ public class CreateVoucherLoanDistributor {
|
||||
if("no".equals(isBalance1)) {
|
||||
MONEY="0.00";
|
||||
}
|
||||
}else if("PZ2018071000000004".equals(VOUCHERNO)) {
|
||||
// 如果手续费是非差额放款， 购置融资租赁资产手续费取值为0，去除手续费
|
||||
if("no".equals(isBalance2)) {
|
||||
MONEY="0.00";
|
||||
}
|
||||
}
|
||||
if("".equals(MONEY)||MONEY==null) MONEY="0.00";
|
||||
double mon=Double.parseDouble(MONEY);
|
||||
|
||||
@ -93,12 +93,4 @@ public interface D_DEPOSITCHARGE_INFO_TEMP{
|
||||
* ¾ÏúÉÌÃû³Æ STRING(32)<br>
|
||||
*/
|
||||
public static final String DISTRIBUTOR_ACCOUNT_TEMP = "DISTRIBUTOR_ACCOUNT_TEMP";
|
||||
/**
|
||||
* Ö÷Ìåid STRING(32)<br>
|
||||
*/
|
||||
public static final String SUBJECTID = "SUBJECTID";
|
||||
/**
|
||||
* Ö÷ÌåÃû³Æ STRING(200)<br>
|
||||
*/
|
||||
public static final String SUBJECTNAME = "SUBJECTNAME";
|
||||
}
|
||||
@ -89,12 +89,4 @@ public interface D_DEPOSITRETURN_INFO_TEMP{
|
||||
* ÍË¿îÕ˺ŠSTRING(32)<br>
|
||||
*/
|
||||
public static final String refund_number = "refund_number";
|
||||
/**
|
||||
* Ö÷Ìåid STRING(32)<br>
|
||||
*/
|
||||
public static final String SUBJECTID = "SUBJECTID";
|
||||
/**
|
||||
* Ö÷ÌåÃû³Æ STRING(200)<br>
|
||||
*/
|
||||
public static final String SUBJECTNAME = "SUBJECTNAME";
|
||||
}
|
||||
@ -1,16 +1,16 @@
|
||||
-- 微信绑定表
|
||||
DROP TABLE wechat_user_info;
|
||||
CREATE TABLE `wechat_user_info` (
|
||||
`id` VARCHAR(32) COLLATE utf8_unicode_ci NOT NULL COMMENT '唯一标识',
|
||||
`openid` VARCHAR(32) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT '微信标识',
|
||||
`wechat_name` VARCHAR(100) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT '微信昵称',
|
||||
`name_` VARCHAR(64) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT '姓名',
|
||||
`mobile_` VARCHAR(64) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT '手机号',
|
||||
`certid_` VARCHAR(32) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT '身份证号',
|
||||
`binding_status` VARCHAR(12) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT '绑定状态,Y:已绑定,N:未绑定',
|
||||
`binding_time` VARCHAR(32) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT '绑定时间',
|
||||
`id` varchar(32) NOT NULL COMMENT '唯一标识',
|
||||
`openid` varchar(32) DEFAULT NULL COMMENT '微信标识',
|
||||
`wechat_name` varchar(100) DEFAULT NULL COMMENT '微信昵称',
|
||||
`name_` varchar(64) DEFAULT NULL COMMENT '姓名',
|
||||
`mobile_` varchar(64) DEFAULT NULL COMMENT '手机号',
|
||||
`certid_` varchar(32) DEFAULT NULL COMMENT '身份证号',
|
||||
`binding_status` varchar(12) DEFAULT NULL COMMENT '绑定状态,Y:已绑定,N:未绑定',
|
||||
`binding_time` varchar(32) DEFAULT NULL COMMENT '绑定时间',
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=INNODB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=gbk;
|
||||
|
||||
-- 消息推送表
|
||||
DROP TABLE wechat_message_record;
|
||||
|
||||
308
报表/微信公众号报表/用户绑定信息表.xml
Normal file
308
报表/微信公众号报表/用户绑定信息表.xml
Normal file
@ -0,0 +1,308 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
||||
<TenwaReport>
|
||||
<datasources>
|
||||
<datasource>
|
||||
<id>2c9023815726a036015726a496b00001</id>
|
||||
<dataSourceName>eleasing_mysql</dataSourceName>
|
||||
<dataSourceType>SPRING</dataSourceType>
|
||||
<jndi>dataSourceJDBC</jndi>
|
||||
<url></url>
|
||||
<username></username>
|
||||
<driverName></driverName>
|
||||
<password></password>
|
||||
<dialect>com.tenwa.report.query.dialect.MysqlDialect</dialect>
|
||||
<dialectName>Mysql</dialectName>
|
||||
</datasource>
|
||||
</datasources>
|
||||
<reports>
|
||||
<report>
|
||||
<id>2c9c81b66e5d8b8b016eacb3adb80196</id>
|
||||
<name>用户绑定信息表</name>
|
||||
<enname>Wechat_user_buinding_report</enname>
|
||||
<isActived>true</isActived>
|
||||
<position>0</position>
|
||||
<reportType>REPORT</reportType>
|
||||
<parentReport>2c9c81b66e5d8b8b016eacb10d170195</parentReport>
|
||||
<children/>
|
||||
<layouts>
|
||||
<layout>2c9c81b66f1cf0bd016f37f08b2f001d</layout>
|
||||
</layouts>
|
||||
</report>
|
||||
</reports>
|
||||
<tables>
|
||||
<table>
|
||||
<id>2c9c81b66e5d8b8b016eacb4b11f0197</id>
|
||||
<name>微信用户绑定信息表</name>
|
||||
<enname>Wechat_user_buinding_report</enname>
|
||||
<reportDataSource>2c9023815726a036015726a496b00001</reportDataSource>
|
||||
<queryType>COMPLEXSQL</queryType>
|
||||
<sql>SELECT
|
||||
CI.CUSTOMERNAME,
|
||||
WUI.MOBILE_,
|
||||
WUI.CERTID_,
|
||||
WUI.WECHAT_NAME,
|
||||
LCI.CONTRACT_NUMBER,
|
||||
LCS.STATUS_NAME,
|
||||
LPI.PRODUCT_NAME,
|
||||
DI.DISTRIBUTOR_NAME,
|
||||
LPI.AFFILIATEDNAME,
|
||||
LEC.FRAME_NUMBER
|
||||
FROM
|
||||
WECHAT_USER_INFO WUI
|
||||
LEFT JOIN
|
||||
CUSTOMER_INFO CI ON CI.CERTID=WUI.CERTID_
|
||||
LEFT JOIN
|
||||
LB_UNION_LESSEE LUL ON LUL.CUSTOMER_ID=CI.CUSTOMERID AND LUL.IS_MAIN='Y'
|
||||
LEFT JOIN
|
||||
LB_PROJECT_INFO LPI ON LPI.ID=LUL.PROJECT_ID
|
||||
LEFT JOIN
|
||||
LB_CONTRACT_INFO LCI ON LCI.ID=LUL.CONTRACT_ID
|
||||
LEFT JOIN
|
||||
LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID=LCI.ID
|
||||
LEFT JOIN
|
||||
LB_CONTRACT_STATUS LCS ON LCS.STATUS_CODE=LCI.CONTRACT_STATUS
|
||||
LEFT JOIN
|
||||
DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID
|
||||
WHERE WUI.BINDING_STATUS='Y' AND (LCI.CONTRACT_STATUS BETWEEN 31 AND 100 OR LCI.CONTRACT_STATUS=105)</sql>
|
||||
<sqlParamValue></sqlParamValue>
|
||||
<columns>
|
||||
<column>
|
||||
<id>2c9c81b66f1cf0bd016f37f08b320027</id>
|
||||
<name>CUSTOMERNAME</name>
|
||||
<columnDataType>STRING</columnDataType>
|
||||
<formater></formater>
|
||||
<label>客户名称</label>
|
||||
<enLabel>CUSTOMERNAME</enLabel>
|
||||
<width>100</width>
|
||||
<position>10</position>
|
||||
<isVisible>true</isVisible>
|
||||
<color></color>
|
||||
<isCountTotal>false</isCountTotal>
|
||||
<isCountSubTotal>false</isCountSubTotal>
|
||||
<isGroupby>false</isGroupby>
|
||||
<isMerge>false</isMerge>
|
||||
<action></action>
|
||||
<actionParamters></actionParamters>
|
||||
<actionCondition></actionCondition>
|
||||
</column>
|
||||
<column>
|
||||
<id>2c9c81b66f1cf0bd016f37f08b310021</id>
|
||||
<name>MOBILE_</name>
|
||||
<columnDataType>STRING</columnDataType>
|
||||
<formater></formater>
|
||||
<label>联系电话</label>
|
||||
<enLabel>MOBILE_</enLabel>
|
||||
<width>100</width>
|
||||
<position>11</position>
|
||||
<isVisible>true</isVisible>
|
||||
<color></color>
|
||||
<isCountTotal>false</isCountTotal>
|
||||
<isCountSubTotal>false</isCountSubTotal>
|
||||
<isGroupby>false</isGroupby>
|
||||
<isMerge>false</isMerge>
|
||||
<action></action>
|
||||
<actionParamters></actionParamters>
|
||||
<actionCondition></actionCondition>
|
||||
</column>
|
||||
<column>
|
||||
<id>2c9c81b66f1cf0bd016f37f08b320025</id>
|
||||
<name>CERTID_</name>
|
||||
<columnDataType>STRING</columnDataType>
|
||||
<formater></formater>
|
||||
<label>身份证号</label>
|
||||
<enLabel>CERTID_</enLabel>
|
||||
<width>150</width>
|
||||
<position>12</position>
|
||||
<isVisible>true</isVisible>
|
||||
<color></color>
|
||||
<isCountTotal>false</isCountTotal>
|
||||
<isCountSubTotal>false</isCountSubTotal>
|
||||
<isGroupby>false</isGroupby>
|
||||
<isMerge>false</isMerge>
|
||||
<action></action>
|
||||
<actionParamters></actionParamters>
|
||||
<actionCondition></actionCondition>
|
||||
</column>
|
||||
<column>
|
||||
<id>2c9c81b66f1cf0bd016f37f08b310023</id>
|
||||
<name>CONTRACT_NUMBER</name>
|
||||
<columnDataType>STRING</columnDataType>
|
||||
<formater></formater>
|
||||
<label>合同编号</label>
|
||||
<enLabel>CONTRACT_NUMBER</enLabel>
|
||||
<width>150</width>
|
||||
<position>13</position>
|
||||
<isVisible>true</isVisible>
|
||||
<color></color>
|
||||
<isCountTotal>false</isCountTotal>
|
||||
<isCountSubTotal>false</isCountSubTotal>
|
||||
<isGroupby>false</isGroupby>
|
||||
<isMerge>false</isMerge>
|
||||
<action></action>
|
||||
<actionParamters></actionParamters>
|
||||
<actionCondition></actionCondition>
|
||||
</column>
|
||||
<column>
|
||||
<id>2c9c81b66f1cf0bd016f37f08b310020</id>
|
||||
<name>STATUS_NAME</name>
|
||||
<columnDataType>STRING</columnDataType>
|
||||
<formater></formater>
|
||||
<label>合同状态</label>
|
||||
<enLabel>STATUS_NAME</enLabel>
|
||||
<width>100</width>
|
||||
<position>14</position>
|
||||
<isVisible>true</isVisible>
|
||||
<color></color>
|
||||
<isCountTotal>false</isCountTotal>
|
||||
<isCountSubTotal>false</isCountSubTotal>
|
||||
<isGroupby>false</isGroupby>
|
||||
<isMerge>false</isMerge>
|
||||
<alignType>CENTER</alignType>
|
||||
<action></action>
|
||||
<actionParamters></actionParamters>
|
||||
<actionCondition></actionCondition>
|
||||
</column>
|
||||
<column>
|
||||
<id>2c9c81b66f1cf0bd016f37f08b320026</id>
|
||||
<name>PRODUCT_NAME</name>
|
||||
<columnDataType>STRING</columnDataType>
|
||||
<formater></formater>
|
||||
<label>产品名称</label>
|
||||
<enLabel>PRODUCT_NAME</enLabel>
|
||||
<width>200</width>
|
||||
<position>15</position>
|
||||
<isVisible>true</isVisible>
|
||||
<color></color>
|
||||
<isCountTotal>false</isCountTotal>
|
||||
<isCountSubTotal>false</isCountSubTotal>
|
||||
<isGroupby>false</isGroupby>
|
||||
<isMerge>false</isMerge>
|
||||
<action></action>
|
||||
<actionParamters></actionParamters>
|
||||
<actionCondition></actionCondition>
|
||||
</column>
|
||||
<column>
|
||||
<id>2c9c81b66f1cf0bd016f37f08b31001f</id>
|
||||
<name>DISTRIBUTOR_NAME</name>
|
||||
<columnDataType>STRING</columnDataType>
|
||||
<formater></formater>
|
||||
<label>渠道商名称</label>
|
||||
<enLabel>DISTRIBUTOR_NAME</enLabel>
|
||||
<width>200</width>
|
||||
<position>16</position>
|
||||
<isVisible>true</isVisible>
|
||||
<color></color>
|
||||
<isCountTotal>false</isCountTotal>
|
||||
<isCountSubTotal>false</isCountSubTotal>
|
||||
<isGroupby>false</isGroupby>
|
||||
<isMerge>false</isMerge>
|
||||
<action></action>
|
||||
<actionParamters></actionParamters>
|
||||
<actionCondition></actionCondition>
|
||||
</column>
|
||||
<column>
|
||||
<id>2c9c81b66f1cf0bd016f37f08b31001e</id>
|
||||
<name>AFFILIATEDNAME</name>
|
||||
<columnDataType>STRING</columnDataType>
|
||||
<formater></formater>
|
||||
<label>挂靠公司</label>
|
||||
<enLabel>AFFILIATEDNAME</enLabel>
|
||||
<width>200</width>
|
||||
<position>17</position>
|
||||
<isVisible>true</isVisible>
|
||||
<color></color>
|
||||
<isCountTotal>false</isCountTotal>
|
||||
<isCountSubTotal>false</isCountSubTotal>
|
||||
<isGroupby>false</isGroupby>
|
||||
<isMerge>false</isMerge>
|
||||
<action></action>
|
||||
<actionParamters></actionParamters>
|
||||
<actionCondition></actionCondition>
|
||||
</column>
|
||||
<column>
|
||||
<id>2c9c81b66f1cf0bd016f37f08b310022</id>
|
||||
<name>FRAME_NUMBER</name>
|
||||
<columnDataType>STRING</columnDataType>
|
||||
<formater></formater>
|
||||
<label>车架号</label>
|
||||
<enLabel>FRAME_NUMBER</enLabel>
|
||||
<width>150</width>
|
||||
<position>18</position>
|
||||
<isVisible>true</isVisible>
|
||||
<color></color>
|
||||
<isCountTotal>false</isCountTotal>
|
||||
<isCountSubTotal>false</isCountSubTotal>
|
||||
<isGroupby>false</isGroupby>
|
||||
<isMerge>false</isMerge>
|
||||
<action></action>
|
||||
<actionParamters></actionParamters>
|
||||
<actionCondition></actionCondition>
|
||||
</column>
|
||||
<column>
|
||||
<id>2c9c81b66f1cf0bd016f37f08b310024</id>
|
||||
<name>WECHAT_NAME</name>
|
||||
<columnDataType>STRING</columnDataType>
|
||||
<formater></formater>
|
||||
<label>微信号</label>
|
||||
<enLabel>WECHAT_NAME</enLabel>
|
||||
<width>100</width>
|
||||
<position>19</position>
|
||||
<isVisible>true</isVisible>
|
||||
<color></color>
|
||||
<isCountTotal>false</isCountTotal>
|
||||
<isCountSubTotal>false</isCountSubTotal>
|
||||
<isGroupby>false</isGroupby>
|
||||
<isMerge>false</isMerge>
|
||||
<action></action>
|
||||
<actionParamters></actionParamters>
|
||||
<actionCondition></actionCondition>
|
||||
</column>
|
||||
</columns>
|
||||
<controls/>
|
||||
<searchs/>
|
||||
<searchExpress></searchExpress>
|
||||
<filters>
|
||||
<filter>
|
||||
<id>2c9c81b66f1cf0bd016f37f08b320028</id>
|
||||
<name>CUSTOMERNAME</name>
|
||||
<enname>CUSTOMERNAME</enname>
|
||||
<label>客户名称</label>
|
||||
<filterType>FILTER</filterType>
|
||||
<dbType>STRING</dbType>
|
||||
<htmlType>TEXT</htmlType>
|
||||
<position>0</position>
|
||||
</filter>
|
||||
<filter>
|
||||
<id>2c9c81b66f1cf0bd016f37f08b320029</id>
|
||||
<name>CERTID_</name>
|
||||
<enname>CERTID_</enname>
|
||||
<label>身份证号</label>
|
||||
<filterType>FILTER</filterType>
|
||||
<dbType>STRING</dbType>
|
||||
<htmlType>TEXT</htmlType>
|
||||
<position>1</position>
|
||||
</filter>
|
||||
</filters>
|
||||
<filterExpress></filterExpress>
|
||||
<pageSize>20</pageSize>
|
||||
<showRowNumber>true</showRowNumber>
|
||||
<showTotalTitle>false</showTotalTitle>
|
||||
<isScale>false</isScale>
|
||||
<isCache>false</isCache>
|
||||
<isExcel>false</isExcel>
|
||||
</table>
|
||||
</tables>
|
||||
<charts/>
|
||||
<pages/>
|
||||
<layouts>
|
||||
<layout>
|
||||
<id>2c9c81b66f1cf0bd016f37f08b2f001d</id>
|
||||
<divHeight>0</divHeight>
|
||||
<divWidth>0</divWidth>
|
||||
<position>0</position>
|
||||
<contentId>TABLE#2c9c81b66e5d8b8b016eacb4b11f0197</contentId>
|
||||
<report>2c9c81b66e5d8b8b016eacb3adb80196</report>
|
||||
<contentType>TABLE</contentType>
|
||||
</layout>
|
||||
</layouts>
|
||||
</TenwaReport>
|
||||
Loading…
x
Reference in New Issue
Block a user