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 zhangbb_apzl

Browse Source
This commit is contained in:
zhangbb 2019-05-27 18:42:04 +08:00
commit cd6629d804
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
WebContent/Tenwa/Lease/Flow/RentCollection/overduedunning/OverdueDunningList.jsp
View File

@ -9,6 +9,7 @@
History Log:
*/
String userid=CurUser.getUserID();
String belongorg=CurUser.getBelongOrg().getOrgID();
ASObjectModel doTemp = new ASObjectModel("OverdueDunningList");
//String sCondtion=DataRightManager.getRightCondition(CurUser,"O", "contract");
//doTemp.appendJboWhere(sCondtion);
@ -40,7 +41,7 @@
}else if(roleList.contains("800R00000048")){//800R00000048为凯捷催收角色==========8006014为凯捷经销商
String userid_kj="";
BizObjectManager userInfoBOM = JBOFactory.getBizObjectManager("jbo.awe.USER_INFO");
List<BizObject> userListObject = userInfoBOM.createQuery("belongorg=:belongorg").setParameter("belongorg", "8006014").getResultList(false);
List<BizObject> userListObject = userInfoBOM.createQuery("belongorg=:belongorg").setParameter("belongorg", "8006002").getResultList(false);
List<String> useridList_kj = new ArrayList<String>();
for(BizObject bo : userListObject){
userid_kj = bo.getAttribute("userid").toString();
@ -62,12 +63,17 @@
//dwTemp.setPageSize(10);
dwTemp.setPageSize(pageSize==null?10:Integer.parseInt(pageSize));
dwTemp.genHTMLObjectWindow("");
//凯捷催收自动分派暂时没有催款员，判断登录为凯捷催收时隐藏修改、批量修改按钮
String temp = "true";
if("8006002".equals(belongorg)){
temp = "false";
};
//0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格
String sButtons[][] = {
{"true","","Button","ÐÞ¸Ä","ÐÞ¸Ä","viewAndEdit()","","","","btn_icon_edit",""},
{temp,"","Button","修改","修改","viewAndEdit()","","","","btn_icon_edit",""},
//{"true","","Button","批量修改","批量修改","viewAndEditAll()","","","","btn_icon_edit",""},
{"true","","Button","ÅúÁ¿ÐÞ¸Ä","ÅúÁ¿ÐÞ¸Ä","selectPartDept()","","","","btn_icon_edit",""},
{temp,"","Button","批量修改","批量修改","selectPartDept()","","","","btn_icon_edit",""},
};
String orgCompany=CurUser.getOrgID();
if(orgCompany.length()>13){

4
calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java
View File

@ -1002,16 +1002,16 @@ public class CreateTransactionExecutor implements Transaction {
public String updateEbank(JBOTransaction tx)throws Exception{
BizObjectManager letManage = JBOFactory.getBizObjectManager(LC_EBANK_TEMP.CLASS_NAME, tx);
List<BizObject> lets = letManage.createQuery(" flowunid=:flowunid ").setParameter("flowunid",flowunid).getResultList(true);
Double advanceMoney = new Double(cleanLeasemoney);
for (BizObject let : lets) {
Double mayopeMoney = new Double(let.getAttribute("MAYOPE_MONEY").getString());
Double advanceMoney = new Double(cleanLeasemoney);
if(mayopeMoney>=advanceMoney){
let.setAttributeValue("HAD_MONEY", advanceMoney);
let.setAttributeValue("MAYOPE_MONEY", mayopeMoney-advanceMoney);
letManage.saveObject(let);
break;
}else{
let.setAttributeValue("HAD_MONEY", advanceMoney-mayopeMoney);
let.setAttributeValue("HAD_MONEY", mayopeMoney);
advanceMoney = advanceMoney-mayopeMoney;
let.setAttributeValue("MAYOPE_MONEY", 0);
letManage.saveObject(let);