diff --git a/WebContent/Frame/page/js/as_debug.js b/WebContent/Frame/page/js/as_debug.js
index a2c64a04e..d8c271a25 100644
--- a/WebContent/Frame/page/js/as_debug.js
+++ b/WebContent/Frame/page/js/as_debug.js
@@ -11,7 +11,7 @@ var AsDebug = {
showWindow:function() {
var d = top.dialog({
id: 'as-debug-dialog',
- title: '���Թ�����['+AsDebug.getURL()+"]",
+ title: 'µ÷ÊÔ¹¤¾ßÀ¸['+AsDebug.getURL()+"]",
onclose: function () {
AsDebug.removeWindow();
},
@@ -27,8 +27,8 @@ var AsDebug = {
html+="| ";
//html+=""+AsDebug.getPage()+" ";
html+=""+AsDebug.getPage()+" ";
- //html+="��"+AsDebug.getURL()+"��";
- html+="��"+AsDebug.getURL()+"��";
+ //html+="¡¾"+AsDebug.getURL()+"¡¿";
+ html+="¡¾"+AsDebug.getURL()+"¡¿";
html+=" |
";
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?"��ʾ":title,
- okValue: 'ȷ��',
+ 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?"��ʾ":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")); // ����ARE����ɹ���
- else alert(getMessageText("AWES0018")); // ����ARE����ʧ�ܣ�
+ 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")); // ���ز����ɹ���
- else alert(getMessageText("AWES0016")); // ���ز����ʧ�ܣ�
+ 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")); // ˢ�²����ɹ���
- else alert(getMessageText("AWES0020")); // ˢ�²����ʧ�ܣ�
+ 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")); // ���ض���Ƥ���ɹ���
- else alert(getMessageText("AWES0022")); // ���ض���Ƥ��ʧ�ܣ�
+ 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")); // ���������ļ��ɹ���
- else alert(getMessageText("AWES0024")); // ���������ļ�ʧ�ܣ�
+ 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: 'ҳ�����д���['+AsDebug.getURL()+"]",
+ title: 'Ò³ÃæÔËÐдúÂë['+AsDebug.getURL()+"]",
content: '',
onshow: function () {
$("#testSource").text(oBody.ownerDocument.documentElement.innerHTML);
@@ -197,7 +197,7 @@ var AsDebug = {
/**
*
* @param event
- * @returns {Boolean} true ������ijЩ�¼� false û�����¼�
+ * @returns {Boolean} true ´¥·¢ÁËijЩʼþ 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����excel
- as_defaultExport("F2����");
+ }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);
- // ����ȡ��ֵ��Ϊ�ɱà¼ï¿½Ä±?����Ϊ��ť/����ѡ��/��ѡ/ֻ��������ʹ��backspace��
+ // ¿ÉÒÔÈ¡µ½Öµ¡¢Îª¿É±à¼µÄ±íµ¥¡¢²»Îª°´Å¥/ÏÂÀÑ¡Ôñ/¹´Ñ¡/Ö»¶ÁµÈÔÊÐíʹÓÃbackspace¼ü
return !!target.val() && target.is(":input:enabled") && !target.is(":button,:selected,:checked,[readonly]");
}
}
diff --git a/WebContent/WEB-INF/etc/app/component/component-config.xml b/WebContent/WEB-INF/etc/app/component/component-config.xml
index fb13942f2..503b75bf6 100644
--- a/WebContent/WEB-INF/etc/app/component/component-config.xml
+++ b/WebContent/WEB-INF/etc/app/component/component-config.xml
@@ -1095,7 +1095,7 @@
-
+
diff --git a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/loan/product/ProductBaseLoanTools.java b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/loan/product/ProductBaseLoanTools.java
index cda00d82f..36c64200e 100644
--- a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/loan/product/ProductBaseLoanTools.java
+++ b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/loan/product/ProductBaseLoanTools.java
@@ -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 vali = new Vector();
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 deadWork(String productId,
String calType, String planCName, String plannumber, String tb,
String flowunid, String userId, JBOTransaction tx) throws Exception {
Map map = new HashMap();
-
+
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> 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));
+ }
}
diff --git a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/loan/service/impl/LoanSimulationBasicServiceImpl.java b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/loan/service/impl/LoanSimulationBasicServiceImpl.java
index 115591f0d..05e593169 100644
--- a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/loan/service/impl/LoanSimulationBasicServiceImpl.java
+++ b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/loan/service/impl/LoanSimulationBasicServiceImpl.java
@@ -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);
diff --git a/src_core/com/tenwa/voucher/serviceImp/VoucherToV8Impl.java b/src_core/com/tenwa/voucher/serviceImp/VoucherToV8Impl.java
index 6fc3c7bbd..8af85abba 100644
--- a/src_core/com/tenwa/voucher/serviceImp/VoucherToV8Impl.java
+++ b/src_core/com/tenwa/voucher/serviceImp/VoucherToV8Impl.java
@@ -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 "";
}
-
}