fix:20201119升级

This commit is contained in:
maliang 2020-11-19 14:49:27 +08:00
parent 0b4611283e
commit 4971c8676e
2 changed files with 402 additions and 0 deletions

View File

@ -11,3 +11,12 @@ INSERT INTO `apzl`.`awe_do_library`(`dono`, `colindex`, `sortno`, `isinuse`, `co
INSERT INTO `apzl`.`awe_do_library`(`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('DealerUserList', '0050', '0050', '1', NULL, 'NameManager.getOrgName(BELONGORG)', 'BelongOrgName', 'String', NULL, '所属机构', NULL, '1', 'Text', '1', '1', NULL, NULL, NULL, '80', '1', '1', '0', '1', '0', 0, NULL, NULL, 'BelongOrg', 'SYS_Designer', '2014/06/03 11:29:52', 'administrator', '2020/11/05 15:33:03', '0', NULL, '0', NULL, NULL, NULL, NULL);
INSERT INTO `apzl`.`select_catalog`(`selname`, `seltype`, `seldescribe`, `seltablename`, `selprimarykey`, `selbrowsemode`, `selargs`, `selhidefield`, `selcode`, `selfieldname`, `selfielddisp`, `selreturnvalue`, `selfilterfield`, `isinuse`, `mutilorsingle`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `inputuser`, `inputorg`, `inputtime`, `updateuser`, `updatetime`, `remark`) VALUES ('SelectDealerUserList', 'Sql', '经销商管理人员列表', 'USER_INFO', 'userid', 'Grid', 'String orgid', '', 'select O.userid,O.loginid,O.username,OI.orgname from USER_INFO O,ORG_INFO OI where OI.relativeorgid=\'8006\' and O.BELONGORG=OI.ORGID and O.loginid not in ( select loginid from user_authority_check )', '用户编号,登录账号,用户姓名,所属机构', 'userid@style={width:220px;}@orgname@style={width:220px;}', 'userid@loginid@username@orgname', 'userid,loginid,username', '1', 'Single', '', 'plan_money@Number@afact_money@Number@allfact_money@Number@fee_adjust@Number@overmoney@Number', 'plan_money@2@afact_money@2@allfact_money@2@fee_adjust@2@overmoney@2', '', '', 'SYS_Designer', '', '2019/05/16 11:52:07', 'SYS_Designer', '2019/05/16 11:52:07', '');
ALTER TABLE `apzl`.`report_rent_month`
ADD COLUMN `sdhandling_charge` decimal(45, 2) NULL COMMENT '当月实收违约金' AFTER `contract_count`,
ADD COLUMN `sdnominal_price` decimal(45, 2) NULL COMMENT '实收留购价款' AFTER `sdhandling_charge`,
ADD COLUMN `fact_money` decimal(45, 2) NULL COMMENT '实际现金流入' AFTER `sdnominal_price`,
ADD COLUMN `data_flag` varchar(1) CHARACTER SET gbk COLLATE gbk_chinese_ci NULL DEFAULT NULL COMMENT '未来月份数据1' AFTER `fact_money`,
ADD COLUMN `agreed_datepenalty` decimal(45, 2) NULL DEFAULT NULL COMMENT '商定还款日息差' AFTER `sdnominal_price`,
ADD COLUMN `subjectname` varchar(255) NULL COMMENT '主体名称' AFTER `fact_money`;

View File

@ -0,0 +1,393 @@
<?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>2c9c81b9719762ea0173ec9a69a70307</id>
<name>月度资金流入表_汽车</name>
<enname>lc_rent_plan_month</enname>
<position>27</position>
<reportType>REPORT</reportType>
<parentReport>2c9c81b7685efbbc016931c675a50006</parentReport>
<children/>
<layouts>
<layout>2c9c81b9719762ea0173ec9a69a90314</layout>
</layouts>
</report>
</reports>
<tables>
<table>
<id>2c9c81b9719762ea0173ec9a69a00306</id>
<name>月度资金流入表_汽车</name>
<enname>lc_rent_plan_month</enname>
<reportDataSource>2c9023815726a036015726a496b00001</reportDataSource>
<queryType>COMPLEXSQL</queryType>
<sql>select * from report_rent_month rrm</sql>
<sqlParamValue></sqlParamValue>
<columns>
<column>
<id>2c9c81b9719762ea0173ec9a69a9030a</id>
<name>report_month</name>
<columnDataType>STRING</columnDataType>
<formater></formater>
<label>统计月份</label>
<enLabel>report_month</enLabel>
<width>100</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>2c9c81b9719762ea0173ec9a69a9030e</id>
<name>report_date</name>
<columnDataType>STRING</columnDataType>
<formater></formater>
<label>统计时间</label>
<enLabel>report_date</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>
<column>
<id>ff808081754abd160175d4d40c95000c</id>
<name>subjectname</name>
<columnDataType>STRING</columnDataType>
<formater></formater>
<label>主体名称</label>
<enLabel>subjectname</enLabel>
<width>200</width>
<position>20</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>2c9c81b9719762ea0173ec9a69a90311</id>
<name>rent</name>
<columnDataType>NUMBER</columnDataType>
<formater>#,##0.00</formater>
<label>当月应收租金</label>
<enLabel>rent</enLabel>
<width>100</width>
<position>21</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>2c9c81b9719762ea0173ec9a69a9030f</id>
<name>corpus</name>
<columnDataType>NUMBER</columnDataType>
<formater>#,##0.00</formater>
<label>当月应收本金</label>
<enLabel>corpus</enLabel>
<width>100</width>
<position>22</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>2c9c81b9719762ea0173ec9a69a9030d</id>
<name>interest</name>
<columnDataType>NUMBER</columnDataType>
<formater>#,##0.00</formater>
<label>当月应收利息</label>
<enLabel>interest</enLabel>
<width>100</width>
<position>23</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>2c9c81b9719762ea0173ec9a69a9030b</id>
<name>all_remain_corpus</name>
<columnDataType>NUMBER</columnDataType>
<formater>#,##0.00</formater>
<label>当月剩余本金</label>
<enLabel>all_remain_corpus</enLabel>
<width>100</width>
<position>24</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>2c9c81b9719762ea0173ec9a69a9030c</id>
<name>fact_rent</name>
<columnDataType>NUMBER</columnDataType>
<formater>#,##0.00</formater>
<label>实收租金</label>
<enLabel>fact_rent</enLabel>
<width>100</width>
<position>25</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>2c9c81b9719762ea0173ec9a69a90309</id>
<name>fact_corpus</name>
<columnDataType>NUMBER</columnDataType>
<formater>#,##0.00</formater>
<label>实收本金</label>
<enLabel>fact_corpus</enLabel>
<width>100</width>
<position>26</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>2c9c81b9719762ea0173ec9a69a90308</id>
<name>fact_interest</name>
<columnDataType>NUMBER</columnDataType>
<formater>#,##0.00</formater>
<label>实收利息</label>
<enLabel>fact_interest</enLabel>
<width>100</width>
<position>27</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>2c9c81b9719762ea0173ec9a69a90312</id>
<name>fact_penalty</name>
<columnDataType>NUMBER</columnDataType>
<formater>#,##0.00</formater>
<label>实收罚息</label>
<enLabel>fact_penalty</enLabel>
<width>100</width>
<position>28</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>ff808081754abd160175d3fb3c200009</id>
<name>sdhandling_charge</name>
<columnDataType>NUMBER</columnDataType>
<formater>#,##0.00</formater>
<label>当月实收违约金</label>
<enLabel>sdhandling_charge</enLabel>
<width>100</width>
<position>29</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>ff808081754abd160175d4d40c95000d</id>
<name>agreed_datepenalty</name>
<columnDataType>NUMBER</columnDataType>
<formater>#,##0.00</formater>
<label>商定还款日息差</label>
<enLabel>agreed_datepenalty</enLabel>
<width>100</width>
<position>30</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>ff808081754abd160175d3fb3c20000a</id>
<name>sdnominal_price</name>
<columnDataType>NUMBER</columnDataType>
<formater>#,##0.00</formater>
<label>实收留购价款</label>
<enLabel>sdnominal_price</enLabel>
<width>100</width>
<position>31</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>ff808081754abd160175d3fb3c200008</id>
<name>fact_money</name>
<columnDataType>NUMBER</columnDataType>
<formater>#,##0.00</formater>
<label>实际现金流入</label>
<enLabel>fact_money</enLabel>
<width>100</width>
<position>32</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>2c9c81b9719762ea0173ec9a69a90310</id>
<name>contract_count</name>
<columnDataType>NUMBER</columnDataType>
<formater></formater>
<label>合同个数</label>
<enLabel>contract_count</enLabel>
<width>100</width>
<position>33</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>2c9c81b9719762ea0173ec9a69a90313</id>
<name>report_month</name>
<enname>report_month</enname>
<label>统计月份</label>
<filterType>FILTER</filterType>
<dbType>STRING</dbType>
<htmlType>TEXT</htmlType>
<position>0</position>
</filter>
<filter>
<id>ff808081754abd160175d4e94800000e</id>
<name>subjectname</name>
<enname>subjectname</enname>
<label>主体名称</label>
<filterType>FILTER</filterType>
<dbType>STRING</dbType>
<htmlType>TEXT</htmlType>
<position>1</position>
</filter>
</filters>
<filterExpress></filterExpress>
<pageSize>20</pageSize>
<showRowNumber>false</showRowNumber>
<showTotalTitle>false</showTotalTitle>
<isScale>false</isScale>
<isCache>false</isCache>
<isExcel>false</isExcel>
</table>
</tables>
<charts/>
<pages/>
<layouts>
<layout>
<id>2c9c81b9719762ea0173ec9a69a90314</id>
<divHeight>0</divHeight>
<divWidth>0</divWidth>
<position>0</position>
<contentId>TABLE#2c9c81b9719762ea0173ec9a69a00306</contentId>
<report>2c9c81b9719762ea0173ec9a69a70307</report>
<contentType>TABLE</contentType>
</layout>
</layouts>
</TenwaReport>