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

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

Browse Source
This commit is contained in:
admin 2018-08-06 18:32:22 +08:00
commit 6893cc3efd
5 changed files with 76 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
WebContent/Frame/page/js/as_debug.js
View File

@ -11,7 +11,7 @@ var AsDebug = {
showWindow:function() {
var d = top.dialog({
id: 'as-debug-dialog',
title: '<EFBFBD><EFBFBD><EFBFBD>Թ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>['+AsDebug.getURL()+"]",
title: '调试工具栏['+AsDebug.getURL()+"]",
onclose: function () {
AsDebug.removeWindow();
},
@ -27,8 +27,8 @@ var AsDebug = {
html+="</td></tr><tr><td>";
//html+="<span class='pageversion' ondblclick='javascript:AsDebug.displayPageName();'>"+AsDebug.getPage()+" </span>";
html+="<span class='pageversion'>"+AsDebug.getPage()+" </span>";
//html+="<span class='pageversion' ondblclick='javascript:AsDebug.displayURL();'><EFBFBD><EFBFBD>"+AsDebug.getURL()+"<22><></span>";
html+="<span class='pageversion'><EFBFBD><EFBFBD>"+AsDebug.getURL()+"<22><></span>";
//html+="<span class='pageversion' ondblclick='javascript:AsDebug.displayURL();'>【"+AsDebug.getURL()+"】</span>";
html+="<span class='pageversion'>【"+AsDebug.getURL()+"】</span>";
html+="</td></tr></table>";
d.content(html);
d.showModal();
@ -46,8 +46,8 @@ var AsDebug = {
width:width?width:"350px",
height:height?height:"50px",
skin:"ui-popup-show",
title: "" == title?"<EFBFBD><EFBFBD>ʾ":title,
okValue: 'ȷ<EFBFBD><EFBFBD>',
title: "" == title?"提示":title,
okValue: '确定',
ok:function(){
AsDebug.removeMessage();
},
@ -65,7 +65,7 @@ var AsDebug = {
width:width?width:"350px",
height:height?height:"40px",
skin:"ui-popup-show",
title: "" == title?"<EFBFBD><EFBFBD>ʾ":title,
title: "" == title?"提示":title,
onclose: function(){
AsDebug.removeMessage();
},
@ -105,8 +105,8 @@ var AsDebug = {
reloadAREService:function(serviceId){
if (typeof(serviceId) == "undefined" || serviceId.length == 0) serviceId = "JBO";
var sReturn = RunJavaMethod("com.amarsoft.app.util.ReloadServiceAction","reloadService","ServiceId="+serviceId);
if(sReturn=="SUCCESS") alert(getMessageText("AWES0017")); // <EFBFBD><EFBFBD><EFBFBD><EFBFBD>ARE<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɹ<EFBFBD><EFBFBD><EFBFBD>
else alert(getMessageText("AWES0018")); // <EFBFBD><EFBFBD><EFBFBD><EFBFBD>ARE<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʧ<EFBFBD>ܣ<EFBFBD>
if(sReturn=="SUCCESS") alert(getMessageText("AWES0017")); // 重载ARE服务成功！
else alert(getMessageText("AWES0018")); // 重载ARE服务失败！
},
reloadAppCalculation:function(){
if (typeof(serviceId) == "undefined" || serviceId.length == 0) serviceId = "JBO";
@ -116,23 +116,23 @@ var AsDebug = {
},
reloadCacheAll:function(){
var sReturn = RunJavaMethod("com.amarsoft.app.util.ReloadCacheConfigAction","reloadCacheAll","");
if(sReturn=="SUCCESS") alert(getMessageText("AWES0015")); // <EFBFBD><EFBFBD><EFBFBD>ز<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɹ<EFBFBD><EFBFBD><EFBFBD>
else alert(getMessageText("AWES0016")); // <EFBFBD><EFBFBD><EFBFBD>ز<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʧ<EFBFBD>ܣ<EFBFBD>
if(sReturn=="SUCCESS") alert(getMessageText("AWES0015")); // 重载参数缓存成功！
else alert(getMessageText("AWES0016")); // 重载参数缓存失败！
},
reloadCache:function(CacheType){
var sReturn = RunJavaMethod("com.amarsoft.app.util.ReloadCacheConfigAction","reloadCache","ConfigName="+CacheType);
if(sReturn=="SUCCESS") alert(getMessageText("AWES0019")); // ˢ<EFBFBD>²<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɹ<EFBFBD><EFBFBD><EFBFBD>
else alert(getMessageText("AWES0020")); // ˢ<EFBFBD>²<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʧ<EFBFBD>ܣ<EFBFBD>
if(sReturn=="SUCCESS") alert(getMessageText("AWES0019")); // 刷新参数缓存成功！
else alert(getMessageText("AWES0020")); // 刷新参数缓存失败！
},
reloadFixSkins:function(){
var sReturn = AsControl.RunJsp("/AppConfig/ControlCenter/ReloadSkin.jsp","ReloadType=FixSkins");
if(sReturn=="SUCCESS") alert(getMessageText("AWES0021")); // <EFBFBD><EFBFBD><EFBFBD>ض<EFBFBD><EFBFBD><EFBFBD>Ƥ<EFBFBD><EFBFBD><EFBFBD>ɹ<EFBFBD><EFBFBD><EFBFBD>
else alert(getMessageText("AWES0022")); // <EFBFBD><EFBFBD><EFBFBD>ض<EFBFBD><EFBFBD><EFBFBD>Ƥ<EFBFBD><EFBFBD>ʧ<EFBFBD>ܣ<EFBFBD>
if(sReturn=="SUCCESS") alert(getMessageText("AWES0021")); // 重载定制皮肤成功！
else alert(getMessageText("AWES0022")); // 重载定制皮肤失败！
},
reloadConfigFile:function(){
var sReturn = AsControl.RunJsp("/AppConfig/ControlCenter/ClearConfigFileCache.jsp","","");
if(sReturn=="SUCCESS") alert(getMessageText("AWES0023")); // <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD><EFBFBD>ɹ<EFBFBD><EFBFBD><EFBFBD>
else alert(getMessageText("AWES0024")); // <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD>ʧ<EFBFBD>ܣ<EFBFBD>
if(sReturn=="SUCCESS") alert(getMessageText("AWES0023")); // 重载配置文件成功！
else alert(getMessageText("AWES0024")); // 重载配置文件失败！
},
openControlCenter:function() {
this.removeWindow();
@ -142,7 +142,7 @@ var AsDebug = {
var d = dialog({
height:400,
width:800,
title: 'ҳ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>д<EFBFBD><EFBFBD><EFBFBD>['+AsDebug.getURL()+"]",
title: '页面运行代码['+AsDebug.getURL()+"]",
content: '<textarea id=\"testSource\" style=\"width: 100%; height: 100%;\"></textarea>',
onshow: function () {
$("#testSource").text(oBody.ownerDocument.documentElement.innerHTML);
@ -197,7 +197,7 @@ var AsDebug = {
/**
*
* @param event
* @returns {Boolean} true <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ijЩ<EFBFBD>¼<EFBFBD> false û<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>¼<EFBFBD>
* @returns {Boolean} true 触发了某些事件 false 没触发事件
*/
function keydownAction(event){
if(event.altKey && event.keyCode == 49){ //alt+1
@ -219,12 +219,12 @@ function keydownAction(event){
}else if(event.keyCode == "27"){ //esc
AsDebug.removeWindow();
return true;
}else if(event.keyCode==113 && window.as_defaultExport){//F2<EFBFBD><EFBFBD><EFBFBD><EFBFBD>excel
as_defaultExport("F2<EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
}else if(event.keyCode==113 && window.as_defaultExport){//F2导出excel
as_defaultExport("F2导出");
return true;
}else if(event.keyCode==8){ // backspace
var target = $(event.target);
// <EFBFBD><EFBFBD><EFBFBD><EFBFBD>ȡ<EFBFBD><EFBFBD>ֵ<EFBFBD><EFBFBD>Ϊ<EFBFBD>ɱ༭<EFBFBD>ı?<3F><><EFBFBD><EFBFBD>Ϊ<EFBFBD><CEAA>ť/<2F><><EFBFBD><EFBFBD>ѡ<EFBFBD><D1A1>/<2F><>ѡ/ֻ<><D6BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʹ<EFBFBD><CAB9>backspace<63><65>
// 可以取到值、为可编辑的表单、不为按钮/下拉选择/勾选/只读等允许使用backspace键
return !!target.val() && target.is(":input:enabled") && !target.is(":button,:selected,:checked,[readonly]");
}
}

2
WebContent/WEB-INF/etc/app/component/component-config.xml
View File

File diff suppressed because one or more lines are too long

61
src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/loan/product/ProductBaseLoanTools.java
View File

@ -6,6 +6,8 @@ import java.util.List;
import java.util.Map;
import java.util.Vector;
import jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT;
import jbo.com.tenwa.lease.comm.LB_EQUIPMENT_CAR_TEMP;
import jbo.prd.BUSINESS_TYPE;
import jbo.sys.CODE_LIBRARY;
import apx.com.amarsoft.als.base.cache.instance.AppAweDoCache;
@ -216,15 +218,6 @@ public class ProductBaseLoanTools {
ProductCondition pc = new ProductCondition();
pc.getProductFundRulesApp(appList, productId);
// »ñÈ¡²úÆ·Ãû³Æ
BizObject bo = JBOFactory
.createBizObjectQuery(BUSINESS_TYPE.CLASS_NAME,
"typeno=:productID")
.setParameter("productID", productId).getSingleResult(false);
String productName = bo.getAttribute("typename").getString();
ProductBaseLoanTools.addAppList(appList, "PRODUCT_NAME",
"coldefaultvalue", productName);
/* 设置模板属性 */
Vector<ValidateRule> vali = new Vector<ValidateRule>();
String calcRules = pc.getProductRulesApp(appList, productId, vali);
@ -232,7 +225,7 @@ public class ProductBaseLoanTools {
}
// end
@SuppressWarnings("unused")
public static String getProdouctName(String productId) throws JBOException {
String productName = "";
@ -240,17 +233,39 @@ public class ProductBaseLoanTools {
.createBizObjectQuery(BUSINESS_TYPE.CLASS_NAME,
"typeno=:productID")
.setParameter("productID", productId).getSingleResult(false);
if (null == bo)
return productName;
productName = bo.getAttribute("typename").getString();
if (null == bo) return productName;
return productName;
}
public static String getNowTotal(String productId) throws JBOException {
String nowTotal = "";
BizObject bo = JBOFactory
.createBizObjectQuery(FLOW_BUSSINESS_OBJECT.CLASS_NAME,
"typeno=:productID")
.setParameter("productID", productId).getSingleResult(false);
if (null == bo)
return nowTotal;
String projectId = bo.getAttribute("proj_id") == null ? "" : bo
.getAttribute("proj_id").getString();
BizObject bo1 = JBOFactory
.createBizObjectQuery(LB_EQUIPMENT_CAR_TEMP.CLASS_NAME,
"PROJECT_ID=:projectId")
.setParameter("projectId", projectId).getSingleResult(false);
nowTotal = (bo1 == null) ? ""
: bo1.getAttribute("NOW_TOTAL") == null ? "" : bo1
.getAttribute("NOW_TOTAL").getString();
return nowTotal;
}
// begin 获取 测算基础值及流水号
public static Map<String, Object> deadWork(String productId,
String calType, String planCName, String plannumber, String tb,
String flowunid, String userId, JBOTransaction tx) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
if (calType == null) {
calType = "proj_process";
}
@ -267,6 +282,7 @@ public class ProductBaseLoanTools {
productId = flow.getAttribute("productId").getString();
map.put("productId", productId);
map.put("productName", getProdouctName(productId));
map.put("nowTotal", getNowTotal(productId));
map.put("objectNo", flowunid);
} else {
String ts = DateUtil.timeStamp();
@ -278,6 +294,7 @@ public class ProductBaseLoanTools {
map.put("objectNo", flowunid);
map.put("productId", productId); // 产品id
map.put("productName", getProdouctName(productId));
map.put("nowTotal", getNowTotal(productId));
return map;
}
@ -334,5 +351,25 @@ public class ProductBaseLoanTools {
map.put("plannumber", plannumber);
return map;
}
// end
public static void configAppDisplay(List<Map<String, Object>> appList,
String productId) throws JBOException {
// 2. app租金测算页面，融租比经销商不能看到
// 3. app租金测算页面，“GPS安装服务费”显示在“附加融资信息”中，“是否参与融资”去掉
ProductBaseLoanTools.addAppList(appList, "RENT_RATIO",
"colvisible".toLowerCase(), "0");
ProductBaseLoanTools.addAppList(appList, "GPS_FEE",
"groupid".toLowerCase(), "0070");
ProductBaseLoanTools.addAppList(appList, "GPS_FEE_FINA",
"colvisible".toLowerCase(), "0");
ProductBaseLoanTools.addAppList(appList, "GPS_FEE_FINA",
"colvisible".toLowerCase(), "0");
// 产品名称 车辆指导价
ProductBaseLoanTools.addAppList(appList, "PRODUCT_NAME",
"coldefaultvalue", getProdouctName(productId));
ProductBaseLoanTools.addAppList(appList, "NOW_TOTAL",
"coldefaultvalue", getNowTotal(productId));
}
}

7
src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/loan/service/impl/LoanSimulationBasicServiceImpl.java
View File

@ -76,9 +76,10 @@ public class LoanSimulationBasicServiceImpl implements
body.put("objectNo", baseMap.get("objectNo"));
body.put("productId", baseMap.get("productId"));
body.put("productName", baseMap.get("productName"));
body.put("nowTotal", baseMap.get("nowTotal"));
body.put("productDatas", appList);
body.put("productFundRules", calcRulesMap);
ProductBaseLoanTools.configAppDisplay(appList, productId);
ReturnMapUtil.setReturnMap(body,
RestfullConstant.baseProperty.get("success").toString(), "");
return ReturnMapUtil.getReturnMap();
@ -107,7 +108,7 @@ public class LoanSimulationBasicServiceImpl implements
fieldMap.put("flow_unid".toUpperCase(), flowunid);
LoanSimulationBasicInfoAppInfoDoManage manage = new LoanSimulationBasicInfoAppInfoDoManage();
manage.setDono("LoanSimulationBasicInfoApp2");
manage.setDono("LoanSimulationBasicInfoApp3");
manage.setsAddWhere(" and " + planCName + "='" + plannumber + "'");
manage.setsJboClass(conditionTB);
manage.setFieldMap(fieldMap);
@ -140,7 +141,7 @@ public class LoanSimulationBasicServiceImpl implements
fieldMap.put(planCName.toUpperCase(), plannumber);
LoanSimulationBasicInfoAppInfoSaveDoManage manage = new LoanSimulationBasicInfoAppInfoSaveDoManage();
manage.setDono("LoanSimulationBasicInfoApp2");
manage.setDono("LoanSimulationBasicInfoApp3");
manage.setAddWhere(" and " + planCName + "='" + plannumber + "'");
manage.setsJboClass(conditionTB);
manage.setFieldMap(fieldMap);

3
src_core/com/tenwa/voucher/serviceImp/VoucherToV8Impl.java
View File

@ -151,7 +151,7 @@ public class VoucherToV8Impl implements VoucherService {
F7Co=new BigDecimal( list.get(i).get("F7"));
F8Co=new BigDecimal( list.get(i).get("F8"));
if(F7Co != BigDecimal.ZERO || F8Co != BigDecimal.ZERO){
if(!F7Co.equals(BigDecimal.ZERO) || !F8Co.equals(BigDecimal.ZERO)){
v8Vouchers.add(v8);
}
}
@ -169,5 +169,4 @@ public class VoucherToV8Impl implements VoucherService {
return "";
}
}