From b886ac8165dafde8d6fc2723f02324fb13489be4 Mon Sep 17 00:00:00 2001 From: xiezhiwen Date: Wed, 25 Dec 2019 11:27:54 +0800 Subject: [PATCH] =?UTF-8?q?c=E7=AB=AF=E5=9B=9E=E7=A7=9F=E6=94=BE=E6=AC=BE?= =?UTF-8?q?=E5=87=AD=E8=AF=81=E5=8C=BA=E5=88=86=E5=B7=AE=E9=A2=9D=E4=B8=8D?= =?UTF-8?q?=E5=B7=AE=E9=A2=9D=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=E7=BB=91=E5=AE=9A=E4=BF=A1=E6=81=AF=E8=A1=A8xml=EF=BC=8C?= =?UTF-8?q?=E9=83=A8=E5=88=86=E5=A4=9A=E4=BD=99jbo=E5=8E=BB=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/WEB-INF/etc/jbo/jbo_comm.xml | 4 - config/META-INF/xfire/services.xml | 2 +- .../CreateVoucherLoanDistributor.java | 9 +- .../comm/flow/D_DEPOSITCHARGE_INFO_TEMP.java | 8 - .../comm/flow/D_DEPOSITRETURN_INFO_TEMP.java | 8 - src_sql/投产SQL/v20191228/xzw_20191228.sql | 18 +- 报表/微信公众号报表/用户绑定信息表.xml | 308 ++++++++++++++++++ 7 files changed, 325 insertions(+), 32 deletions(-) create mode 100644 报表/微信公众号报表/用户绑定信息表.xml diff --git a/WebContent/WEB-INF/etc/jbo/jbo_comm.xml b/WebContent/WEB-INF/etc/jbo/jbo_comm.xml index 3a0ba8c08..09b23061c 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_comm.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_comm.xml @@ -740,8 +740,6 @@ - - @@ -803,8 +801,6 @@ - - diff --git a/config/META-INF/xfire/services.xml b/config/META-INF/xfire/services.xml index 0db277469..305ed1257 100644 --- a/config/META-INF/xfire/services.xml +++ b/config/META-INF/xfire/services.xml @@ -1,7 +1,7 @@ - + McontractService com.tenwa.makeContract.McontractService diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoanDistributor.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoanDistributor.java index 0b0fbf3e9..09c8f4db9 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoanDistributor.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoanDistributor.java @@ -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)) { + // ǷDzſ ʲȡֵΪ0ȥ + if("no".equals(isBalance2)) { + MONEY="0.00"; + } } if("".equals(MONEY)||MONEY==null) MONEY="0.00"; double mon=Double.parseDouble(MONEY); diff --git a/src_jbo/jbo/com/tenwa/entity/comm/flow/D_DEPOSITCHARGE_INFO_TEMP.java b/src_jbo/jbo/com/tenwa/entity/comm/flow/D_DEPOSITCHARGE_INFO_TEMP.java index 315d03bf4..97c95ffd0 100644 --- a/src_jbo/jbo/com/tenwa/entity/comm/flow/D_DEPOSITCHARGE_INFO_TEMP.java +++ b/src_jbo/jbo/com/tenwa/entity/comm/flow/D_DEPOSITCHARGE_INFO_TEMP.java @@ -93,12 +93,4 @@ public interface D_DEPOSITCHARGE_INFO_TEMP{ * STRING(32)
*/ public static final String DISTRIBUTOR_ACCOUNT_TEMP = "DISTRIBUTOR_ACCOUNT_TEMP"; - /** - * id STRING(32)
- */ - public static final String SUBJECTID = "SUBJECTID"; - /** - * STRING(200)
- */ - public static final String SUBJECTNAME = "SUBJECTNAME"; } \ No newline at end of file diff --git a/src_jbo/jbo/com/tenwa/entity/comm/flow/D_DEPOSITRETURN_INFO_TEMP.java b/src_jbo/jbo/com/tenwa/entity/comm/flow/D_DEPOSITRETURN_INFO_TEMP.java index a2141ff11..398ce9157 100644 --- a/src_jbo/jbo/com/tenwa/entity/comm/flow/D_DEPOSITRETURN_INFO_TEMP.java +++ b/src_jbo/jbo/com/tenwa/entity/comm/flow/D_DEPOSITRETURN_INFO_TEMP.java @@ -89,12 +89,4 @@ public interface D_DEPOSITRETURN_INFO_TEMP{ * ˿˺ STRING(32)
*/ public static final String refund_number = "refund_number"; - /** - * id STRING(32)
- */ - public static final String SUBJECTID = "SUBJECTID"; - /** - * STRING(200)
- */ - public static final String SUBJECTNAME = "SUBJECTNAME"; } \ No newline at end of file diff --git a/src_sql/投产SQL/v20191228/xzw_20191228.sql b/src_sql/投产SQL/v20191228/xzw_20191228.sql index 31aaf84ce..add42bced 100644 --- a/src_sql/投产SQL/v20191228/xzw_20191228.sql +++ b/src_sql/投产SQL/v20191228/xzw_20191228.sql @@ -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 '΢dz', - `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 '΢dz', + `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; diff --git a/报表/微信公众号报表/用户绑定信息表.xml b/报表/微信公众号报表/用户绑定信息表.xml new file mode 100644 index 000000000..266e1b9b9 --- /dev/null +++ b/报表/微信公众号报表/用户绑定信息表.xml @@ -0,0 +1,308 @@ + + + + + 2c9023815726a036015726a496b00001 + eleasing_mysql + SPRING + dataSourceJDBC + + + + + com.tenwa.report.query.dialect.MysqlDialect + Mysql + + + + + 2c9c81b66e5d8b8b016eacb3adb80196 + 用户绑定信息表 + Wechat_user_buinding_report + true + 0 + REPORT + 2c9c81b66e5d8b8b016eacb10d170195 + + + 2c9c81b66f1cf0bd016f37f08b2f001d + + + + + + 2c9c81b66e5d8b8b016eacb4b11f0197 + 微信用户绑定信息表 + Wechat_user_buinding_report + 2c9023815726a036015726a496b00001 + COMPLEXSQL + 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) + + + + 2c9c81b66f1cf0bd016f37f08b320027 + CUSTOMERNAME + STRING + + + CUSTOMERNAME + 100 + 10 + true + + false + false + false + false + + + + + + 2c9c81b66f1cf0bd016f37f08b310021 + MOBILE_ + STRING + + + MOBILE_ + 100 + 11 + true + + false + false + false + false + + + + + + 2c9c81b66f1cf0bd016f37f08b320025 + CERTID_ + STRING + + + CERTID_ + 150 + 12 + true + + false + false + false + false + + + + + + 2c9c81b66f1cf0bd016f37f08b310023 + CONTRACT_NUMBER + STRING + + + CONTRACT_NUMBER + 150 + 13 + true + + false + false + false + false + + + + + + 2c9c81b66f1cf0bd016f37f08b310020 + STATUS_NAME + STRING + + + STATUS_NAME + 100 + 14 + true + + false + false + false + false + CENTER + + + + + + 2c9c81b66f1cf0bd016f37f08b320026 + PRODUCT_NAME + STRING + + + PRODUCT_NAME + 200 + 15 + true + + false + false + false + false + + + + + + 2c9c81b66f1cf0bd016f37f08b31001f + DISTRIBUTOR_NAME + STRING + + + DISTRIBUTOR_NAME + 200 + 16 + true + + false + false + false + false + + + + + + 2c9c81b66f1cf0bd016f37f08b31001e + AFFILIATEDNAME + STRING + + + AFFILIATEDNAME + 200 + 17 + true + + false + false + false + false + + + + + + 2c9c81b66f1cf0bd016f37f08b310022 + FRAME_NUMBER + STRING + + + FRAME_NUMBER + 150 + 18 + true + + false + false + false + false + + + + + + 2c9c81b66f1cf0bd016f37f08b310024 + WECHAT_NAME + STRING + + + WECHAT_NAME + 100 + 19 + true + + false + false + false + false + + + + + + + + + + + 2c9c81b66f1cf0bd016f37f08b320028 + CUSTOMERNAME + CUSTOMERNAME + + FILTER + STRING + TEXT + 0 + + + 2c9c81b66f1cf0bd016f37f08b320029 + CERTID_ + CERTID_ + + FILTER + STRING + TEXT + 1 + + + + 20 + true + false + false + false + false +
+ + + + + + 2c9c81b66f1cf0bd016f37f08b2f001d + 0 + 0 + 0 + TABLE#2c9c81b66e5d8b8b016eacb4b11f0197 + 2c9c81b66e5d8b8b016eacb3adb80196 + TABLE + + +