anpeng/apzl_leasing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of http://git2.tenwa.com.cn/ApzlDev/apzl_leasing.git into guojiayi1

Browse Source
This commit is contained in:
G 2018-12-11 19:44:18 +08:00
commit ec9464d34f
2 changed files with 43 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
WebContent/WEB-INF/etc/jbo/jbo_calc.xml
View File

@ -3920,5 +3920,45 @@
</managerProperties>
</manager>
</class>
<class name="VI_LC_RENT_COLLECTION_SORTING" label="租金通知书排序" keyAttributes="">
<attributes>
<attribute name="id" label="id" type="STRING"/>
<attribute name="orgid" label="orgid" type="STRING"/>
<attribute name="userid" label="userid" type="STRING"/>
<attribute name="project_id" label="project_id" type="STRING"/>
<attribute name="contract_id" label="contract_id" type="STRING"/>
<attribute name="contract_status" label="contract_status" type="STRING"/>
<attribute name="contract_number" label="contract_number" type="STRING"/>
<attribute name="payment_number" label="payment_number" type="STRING"/>
<attribute name="customername" label="customername" type="STRING"/>
<attribute name="project_name" label="project_name" type="STRING"/>
<attribute name="plan_list" label="plan_list" type="STRING"/>
<attribute name="plan_date" label="plan_date" type="STRING"/>
<attribute name="rent" label="rent" type="STRING"/>
<attribute name="corpus" label="corpus" type="STRING"/>
<attribute name="interest" label="interest" type="STRING"/>
<attribute name="penalty" label="penalty" type="STRING"/>
<attribute name="fact_rent" label="fact_rent" type="STRING"/>
<attribute name="fact_corpus" label="fact_corpus" type="STRING"/>
<attribute name="fact_interest" label="fact_interest" type="STRING"/>
<attribute name="fact_penalty" label="fact_penalty" type="STRING"/>
<attribute name="corpus_adjust" label="corpus_adjust" type="STRING"/>
<attribute name="interest_adjust" label="interest_adjust" type="STRING"/>
<attribute name="penalty_adjust" label="penalty_adjust" type="STRING"/>
<attribute name="rent_over" label="rent_over" type="STRING"/>
<attribute name="corpus_over" label="corpus_over" type="STRING"/>
<attribute name="interest_over" label="interest_over" type="STRING"/>
<attribute name="penalty_over" label="penalty_over" type="STRING"/>
<attribute name="planstatus" label="planstatus" type="STRING"/>
<attribute name="businesstype" label="businesstype" type="STRING"/>
<attribute name="start_date" label="start_date" type="STRING"/>
<attribute name="fileInputTime" label="fileInputTime" type="STRING"/>
</attributes>
<manager>
<managerProperties>
<property name="table" value="vi_lc_rent_collection_sorting" />
</managerProperties>
</manager>
</class>
</package>
</jbo>

4
src_tenwa/com/tenwa/lease/util/SendMessageUtil.java
View File

@ -44,8 +44,10 @@ public class SendMessageUtil{
List<BizObject> messageConfigList = JBOFactory.getBizObjectManager(LB_MESSAGE_CONFIG.CLASS_NAME).createQuery("1=1").getResultList(false);
BizObject messageConfig = messageConfigList.get(0);
String allowSendIps = messageConfig.getAttribute("ALLOW_SEND_IPS").getString();
//添加从服务器ip
String slaveSendIp="{172.28.1.63}";
//判断本机电脑所有配置好的IP是否与短信配置中的符合
if("N".equals(messageConfig.getAttribute("IS_SEND").getString()) || !getServerIsAllowSendMsg(allowSendIps)){
if("N".equals(messageConfig.getAttribute("IS_SEND").getString()) || !getServerIsAllowSendMsg(allowSendIps) || !getServerIsAllowSendMsg(slaveSendIp)){
System.out.println("短信设置为不发送短信或本机IP未在[允许发送短信的主机IP]之中!");
return "当前系统IP不在允许发送的IP地址之中";
}