diff --git a/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp b/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp
index 63b3587e0..5b53386b1 100644
--- a/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp
+++ b/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp
@@ -134,19 +134,16 @@
v.add(p);
/*ÉèÖÃÒ³ÃæÊôÐÔ*/
if(CurUser.hasRole("401")){
- doTemp.setVisible("RENT_RATIO",false);
doTemp.setVisible("CAUTION_MONEY_METHOD",false);
- }else{
- doTemp.setVisible("RENT_RATIO",false);
}
-
if(CurUser.hasRole("401")){
doTemp.setVisible("DISCOUNT", false);
// doTemp.setColumnAttribute("DISCOUNT","colvisible","0");
}
if(CurUser.hasRole("800R00000013")||CurUser.hasRole("800R00000014")||CurUser.hasRole("800R00000015")){
doTemp.setVisible("YEAR_RATE", true);
+ doTemp.setVisible("RENT_RATIO",true);
}
ASObjectWindowCalc dwTemp = new ASObjectWindowCalc(CurPage, doTemp,request);
@@ -154,7 +151,7 @@
dwTemp.Style = "2";//freeform
if((null!=RightType&&RightType.equals("ReadOnly"))||(null!=ishistory&&ishistory.equals("true"))){
- dwTemp.ReadOnly = "-2";//Ö»¶Áģʽ
+ dwTemp.ReadOnly = "1";//Ö»¶Áģʽ
isShowButton=false;
}else{
isShowButton=true;
diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBContractEnd/LBContractDevolutionInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBContractEnd/LBContractDevolutionInfo.jsp
index 0479bd7e2..53e1541d7 100644
--- a/WebContent/Tenwa/Lease/Flow/Comm/LBContractEnd/LBContractDevolutionInfo.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContractEnd/LBContractDevolutionInfo.jsp
@@ -109,7 +109,6 @@
/*~[Describe=±£´æ;InputParam=ÎÞ;OutPutParam=ÎÞ;]~*/
function saveRecord()
{
- debugger;
var param={};
var tempParam={};
var sparam="";
diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/LBContractTerminateInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/LBContractTerminateInfo.jsp
index 7a6ebe7d7..b60dd8b63 100644
--- a/WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/LBContractTerminateInfo.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/LBContractTerminateInfo.jsp
@@ -110,7 +110,6 @@
/*~[Describe=±£´æ;InputParam=ÎÞ;OutPutParam=ÎÞ;]~*/
function saveRecord()
{
- debugger;
var param={};
var tempParam={};
var sparam="";
diff --git a/WebContent/Tenwa/Lease/Flow/RentNotify/RentNotifyList.jsp b/WebContent/Tenwa/Lease/Flow/RentNotify/RentNotifyList.jsp
index e7835ca2a..694af494e 100644
--- a/WebContent/Tenwa/Lease/Flow/RentNotify/RentNotifyList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/RentNotify/RentNotifyList.jsp
@@ -13,12 +13,17 @@
*/
String userId = CurUser.getUserID();
+ String orgId =CurUser.getOrgID();
+ System.out.print(orgId);
String falg = "true";
if(userId.indexOf("8006")>-1){
falg = "false";
}
String compClientID = request.getParameter("CompClientID");
ASObjectModel doTemp = new ASObjectModel("RentNotify");
+ if(userId.indexOf("8006")>-1){
+ doTemp.appendJboWhere(" O.orgid="+CurUser.getOrgID()+"");
+ }
ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
dwTemp.Style="1"; //--ÉèÖÃΪGrid·ç¸ñ--
dwTemp.ReadOnly = "1";
diff --git a/WebContent/WEB-INF/etc/app/component/component-config.xml b/WebContent/WEB-INF/etc/app/component/component-config.xml
index c8e360f21..fb13942f2 100644
--- a/WebContent/WEB-INF/etc/app/component/component-config.xml
+++ b/WebContent/WEB-INF/etc/app/component/component-config.xml
@@ -1079,7 +1079,7 @@
-
+
diff --git a/WebContent/WEB-INF/etc/app/component/component-parameter-config.xml b/WebContent/WEB-INF/etc/app/component/component-parameter-config.xml
index 14701ab64..5589ae27a 100644
--- a/WebContent/WEB-INF/etc/app/component/component-parameter-config.xml
+++ b/WebContent/WEB-INF/etc/app/component/component-parameter-config.xml
@@ -196,4 +196,4 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
index 20b4c9aab..0fe035083 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
@@ -3102,34 +3102,34 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/calc/com/tenwa/reckon/product/ProductCondition.java b/calc/com/tenwa/reckon/product/ProductCondition.java
index 6e83baa2d..ed4e35086 100644
--- a/calc/com/tenwa/reckon/product/ProductCondition.java
+++ b/calc/com/tenwa/reckon/product/ProductCondition.java
@@ -776,7 +776,7 @@ public class ProductCondition {
}
ProductBaseLoanTools.addAppList(appList, "SETTLE_METHOD", "colreadonly", "1");
ProductBaseLoanTools.addAppList(appList, "SETTLE_METHOD", "coleditsource", "jbo.sys.CODE_LIBRARY,itemno,itemname,codeno='settle_method' and itemno in ("+s+") order by sortno");
- ProductBaseLoanTools.addAppList(appList, "coldefaultvalue", "colreadonly", s.replaceAll("'", ""));
+ ProductBaseLoanTools.addAppList(appList, "SETTLE_METHOD", "coldefaultvalue", s.replaceAll("'", ""));
return "{"+sJson+"}";
}
diff --git a/src/com/tenwa/channelportal/action/ContractSignAction.java b/src/com/tenwa/channelportal/action/ContractSignAction.java
index 69cc2a0ce..5d9cdd23f 100644
--- a/src/com/tenwa/channelportal/action/ContractSignAction.java
+++ b/src/com/tenwa/channelportal/action/ContractSignAction.java
@@ -1384,9 +1384,15 @@ public void wordToPdfJar(JBOTransaction tx){
BizObjectManager customer = JBOFactory.getBizObjectManager(CUSTOMER_PERSON_TEMP.CLASS_NAME);
BizObject lults = lult.createQuery("flowunid=:flowUnid").setParameter("flowUnid", FlowUnid).getSingleResult(false);
BizObject cust = customer.createQuery("flowunid=:flowUnid and customerid=:customerid").setParameter("flowUnid", FlowUnid).setParameter("customerid", lults.getAttribute("customer_id").toString()).getSingleResult(false);
- String customername = cust.getAttribute("FULLNAME").toString();
- String telephone = cust.getAttribute("mobile").toString();
- String ids = cust.getAttribute("CUSTOMERID").toString();
+ String customername = null;
+ String telephone = null;
+ String ids =null;
+
+ if(cust!=null){
+ customername = cust.getAttribute("FULLNAME").toString();
+ telephone = cust.getAttribute("mobile").toString();
+ ids = cust.getAttribute("CUSTOMERID").toString();
+ }
BizObjectManager contBom = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME, tx);
BizObjectManager attrBom = JBOFactory.getBizObjectManager(LB_DOCATTRIBUTE.CLASS_NAME, tx);
diff --git a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/doc/detail/service/impl/BusinessDocDetailServiceImpl.java b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/doc/detail/service/impl/BusinessDocDetailServiceImpl.java
index fce58c1f9..7b5611b0b 100644
--- a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/doc/detail/service/impl/BusinessDocDetailServiceImpl.java
+++ b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/doc/detail/service/impl/BusinessDocDetailServiceImpl.java
@@ -14,6 +14,7 @@ import jbo.app.tenwa.doc.LB_DOCRELATIVE;
import jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT;
import net.sf.json.JSONObject;
import apx.com.amarsoft.als.apzl.apply.business.doc.detail.service.BusinessDocDetailService;
+import apx.com.amarsoft.als.apzl.apply.business.start.init.InitDocListTools;
import com.amarsoft.are.ARE;
import com.amarsoft.are.jbo.BizObject;
@@ -85,7 +86,31 @@ public class BusinessDocDetailServiceImpl implements BusinessDocDetailService {
if (StringX.isSpace(flowUnid)) { // »ñÈ¡ËùÓÐÅäÖÃdocName
return docDetail(ReturnMapUtil);
}
-
+ BizObjectManager fboM = JBOFactory
+ .getBizObjectManager(FLOW_BUSSINESS_OBJECT.CLASS_NAME);
+ BizObject fbo = fboM.createQuery("flow_unid=:flow_unid")
+ .setParameter("flow_unid", flowUnid).getSingleResult(false);
+ if (null == fbo) {
+ ReturnMapUtil.setReturnMap(null, RestfullConstant.baseProperty.get("fail").toString(), "δÕÒµ½Á÷³ÌʵÀý!");
+ return ReturnMapUtil.getReturnMap();
+ }
+ String carAttributes = "";
+ try {
+ String flowPara = fbo.getAttribute("FixedFlowParam") == null ? ""
+ : fbo.getAttribute("FixedFlowParam").toString();
+ JSONObject jo = JsonUtil.str2JSONObject(flowPara.trim());
+ carAttributes = jo.get("carAttributes") == null ? "" : jo
+ .getString("carAttributes");
+ } catch (Exception e) {
+ ARE.getLog().error(e);
+ ReturnMapUtil.setReturnMap(null, RestfullConstant.baseProperty.get("fail").toString(), "»ñÈ¡³µÁ¾ÊôÐÔÐÅϢʧ°Ü!");
+ return ReturnMapUtil.getReturnMap();
+ }
+ // ¼ÓÔظ½¼þ
+
+ // carAttributes
+ boolean flag = InitDocListTools.initDocList(flowUnid, fieldMap.get("userid").toString(), carAttributes);
+
BizObjectManager businessManage = JBOFactory
.getBizObjectManager(FLOW_BUSSINESS_OBJECT.CLASS_NAME);
BizObject business = businessManage.createQuery("flow_unid=:flow_unid")
diff --git a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/loan/controller/LoanSimulationBasicInfoController.java b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/loan/controller/LoanSimulationBasicInfoController.java
index 1bd1d5b23..81f21902b 100644
--- a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/loan/controller/LoanSimulationBasicInfoController.java
+++ b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/loan/controller/LoanSimulationBasicInfoController.java
@@ -53,6 +53,23 @@ public class LoanSimulationBasicInfoController {
}
}
+ @Path("/rent")
+ @POST
+ public Map rent(@Context HttpServletRequest request, @Context HttpServletResponse response,
+ @Context JBOTransaction tx, @Context Transaction sqlca) throws Exception {
+ ReturnMapUtil ReturnMapUtil = new ReturnMapUtil(tx, sqlca);
+ ARE.getLog().info(
+ "[CONTROLLER] LoanSimulationBasicInfo run .................");
+ ARE.getLog().info("[Path] /loan/simulation/basic/rent" + " run .................");
+
+ LoanSimulationBasicService service = new LoanSimulationBasicServiceImpl();
+ try {
+ return service.rent(request, response, tx, sqlca, ReturnMapUtil);
+ } catch (Exception e) {
+ return ReturnMapUtil.rollback(e);
+ }
+ }
+
@Path("/save")
@POST
public Map saveInfo(@Context HttpServletRequest request, @Context HttpServletResponse response,
diff --git a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/loan/manage/LCRentPlanTempDoQueryManage.java b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/loan/manage/LCRentPlanTempDoQueryManage.java
new file mode 100644
index 000000000..8235460f3
--- /dev/null
+++ b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/loan/manage/LCRentPlanTempDoQueryManage.java
@@ -0,0 +1,46 @@
+package apx.com.amarsoft.als.apzl.apply.business.loan.manage;
+
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+
+import apx.com.amarsoft.als.base.awe.AbstractAweDoQueryManage;
+
+import com.amarsoft.are.jbo.JBOTransaction;
+import com.amarsoft.are.lang.StringX;
+import com.amarsoft.awe.util.Transaction;
+import com.base.util.ReturnMapUtil;
+
+public class LCRentPlanTempDoQueryManage extends AbstractAweDoQueryManage {
+ private String sAddWhere;
+ private String dono;
+ private Map fieldMap;
+
+ public void setFieldMap(Map fieldMap) {
+ this.fieldMap = fieldMap;
+ }
+
+ public void setDono(String dono) {
+ this.dono = dono;
+ }
+
+ public void getGroupId() {
+ sGroupId = this.dono;
+ }
+
+ public void getOtherWhere() {
+ super.sOtherWhere = StringX.isSpace(sAddWhere) ? ""
+ : this.sAddWhere;
+ }
+
+ public void setsAddWhere(String sAddWhere) {
+ this.sAddWhere = sAddWhere;
+ }
+
+ public Map queryDefaultDo(HttpServletRequest request,
+ Transaction sqlca, JBOTransaction tx, ReturnMapUtil ReturnMapUtil)
+ throws Exception {
+ setParamMap(fieldMap);
+ return getData(request, sqlca, tx, ReturnMapUtil);
+ }
+}
\ No newline at end of file
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 1054fe517..cc9791940 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,7 @@ import java.util.List;
import java.util.Map;
import java.util.Vector;
+import jbo.prd.BUSINESS_TYPE;
import jbo.sys.CODE_LIBRARY;
import apx.com.amarsoft.als.base.cache.instance.AppAweDoCache;
@@ -28,11 +29,6 @@ public class ProductBaseLoanTools {
@SuppressWarnings("unchecked")
public static Map checkSource(Map app,
String colName, String operation, Object value) {
-
- if ("finatype01".equals(value)) {
- ARE.getLog().info("finatype01");
- }
-
if (operation.contains("defaultValue")) {
app.put("coldefaultvalue", value);
} else {
@@ -45,7 +41,7 @@ public class ProductBaseLoanTools {
List> libarary = (List>) (donoTemp.get("library"));
String source = "";
String sourceType = "";
-
+ app.put("coldefaultitemno", value);
for (Map col : libarary) {
String sColName = col.get("colname") == null ? "" : col.get("colname").toString();
if (sColName.equals(colName)) {
@@ -57,12 +53,10 @@ public class ProductBaseLoanTools {
source = app.get("coleditsource") == null ? source : app.get("coleditsource").toString();
sourceType = app.get("coleditsourcetype") == null ? sourceType : app.get("coleditsourcetype").toString();
if (StringX.isSpace(source)) {
- app.put("coldefaultitemno", value);
return app;
}
if (StringX.isSpace(sourceType)) {
- app.put("coldefaultitemno", value);
return app;
}
@@ -74,14 +68,12 @@ public class ProductBaseLoanTools {
.setParameter("CODENO", source).setParameter("itemno", itemno)
.getSingleResult(false);
if (null == bo) {
- app.put("coldefaultitemno", value);
return app;
}
- app.put("coldefaultitemno", bo.getAttribute("itemname").getValue());
+ app.put("coldefaultvalue", bo.getAttribute("itemname").getValue());
return app;
} catch (JBOException e) {
ARE.getLog().error(e);
- app.put("coldefaultitemno", value);
return app;
}
@@ -95,22 +87,17 @@ public class ProductBaseLoanTools {
if (i!=0 && i + 1 > size) break;
String itemno2 = array[i];
if (itemno2.equalsIgnoreCase(itemno)) {
- app.put("coldefaultitemno", array[i+1]);
+ app.put("coldefaultvalue", array[i+1]);
break;
}
i++;
}
- if (null == app.get("coldefaultitemno")) {
- app.put("coldefaultitemno", value);
- return app;
- }
} else {
- app.put("coldefaultitemno", value);
return app;
}
} catch (Exception e) {
ARE.getLog().error(e);
- app.put("coldefaultitemno", value);
+ app.put("coldefaultvalue", value);
return app;
}
} else if ("JBO".equals(sourceType)) { // jbo.app.tenwa.customer.DISTRIBUTOR_INFO,ID,DISTRIBUTOR_NAME,1=1
@@ -139,20 +126,15 @@ public class ProductBaseLoanTools {
// sDefult
if (itemno.equals(bo.getAttribute(sKey)
.getValue())) {
- app.put("coldefaultitemno", bo.getAttribute(sValue)
+ app.put("coldefaultvalue", bo.getAttribute(sValue)
.getValue());
return app;
}
}
- if (null == app.get("coldefaultitemno")) {
- app.put("coldefaultitemno", value);
- return app;
- }
}
}
} catch (JBOException e) {
ARE.getLog().error(e);
- app.put("coldefaultitemno", value);
return app;
}
@@ -169,23 +151,20 @@ public class ProductBaseLoanTools {
int iin = Integer.valueOf(itemno);
if(min <= iin && iin <= max) {
- app.put("coldefaultitemno", iin);
+ app.put("coldefaultvalue", iin);
return app;
} else {
- app.put("coldefaultitemno", value);
+ app.put("coldefaultvalue", value);
return app;
}
} else {
- app.put("coldefaultitemno", value);
return app;
}
} catch (NumberFormatException e) {
ARE.getLog().error(e);
- app.put("coldefaultitemno", value);
return app;
}
}
-
return app;
}
@@ -225,6 +204,14 @@ public class ProductBaseLoanTools {
appList = new ArrayList>();
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);
diff --git a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/loan/service/LoanSimulationBasicService.java b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/loan/service/LoanSimulationBasicService.java
index 35a647414..2a909404b 100644
--- a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/loan/service/LoanSimulationBasicService.java
+++ b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/loan/service/LoanSimulationBasicService.java
@@ -20,6 +20,12 @@ public interface LoanSimulationBasicService {
@Context HttpServletResponse response, @Context JBOTransaction tx,
@Context Transaction sqlca, ReturnMapUtil ReturnMapUtil)
throws Exception;
+
+ Map rent(@Context HttpServletRequest request,
+ @Context HttpServletResponse response, @Context JBOTransaction tx,
+ @Context Transaction sqlca, ReturnMapUtil ReturnMapUtil)
+ throws Exception;
+
Map saveInfo(@Context HttpServletRequest request,
@Context HttpServletResponse response, @Context JBOTransaction tx,
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 f8ca86e36..cdbd59e35 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
@@ -8,6 +8,8 @@ import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import jbo.prd.BUSINESS_TYPE;
+import apx.com.amarsoft.als.apzl.apply.business.loan.manage.LCRentPlanTempDoQueryManage;
import apx.com.amarsoft.als.apzl.apply.business.loan.manage.LoanSimulationBasicInfoAppInfoDoManage;
import apx.com.amarsoft.als.apzl.apply.business.loan.manage.LoanSimulationBasicInfoAppInfoSaveDoManage;
import apx.com.amarsoft.als.apzl.apply.business.loan.product.ProductBaseLoanTools;
@@ -15,6 +17,7 @@ import apx.com.amarsoft.als.apzl.apply.business.loan.service.LoanSimulationBasic
import com.amarsoft.app.lc.workflow.action.GetFlowAction;
import com.amarsoft.are.jbo.BizObject;
+import com.amarsoft.are.jbo.JBOFactory;
import com.amarsoft.are.jbo.JBOTransaction;
import com.amarsoft.awe.util.Transaction;
import com.amarsoft.context.ASUser;
@@ -49,23 +52,31 @@ public class LoanSimulationBasicServiceImpl implements
Map baseMap = ProductBaseLoanTools.deadWork(null, null,
null, null, null, flowunid, tx);
// ·ÑÓùæÔò
- List> appList = new ArrayList>();
-
- String calcRules = ProductBaseLoanTools
- .getProductFundRules(appList, baseMap.get("productId").toString());
+ List> appList = new ArrayList>();
+
+ String calcRules = ProductBaseLoanTools.getProductFundRules(appList,
+ baseMap.get("productId").toString());
Map calcRulesMap = JsonUtil.str2JSONObject(calcRules);
-
+
Map body = new HashMap();
body.put("planCName", baseMap.get("planCName"));
body.put("plannumber", baseMap.get("plannumber"));
body.put("tb", baseMap.get("tb"));
body.put("calType", baseMap.get("calType"));
-
+
body.put("productId", baseMap.get("productId"));
body.put("productDatas", appList);
body.put("productFundRules", calcRulesMap);
-
+ // »ñÈ¡²úÆ·Ãû³Æ
+ BizObject bo = JBOFactory
+ .createBizObjectQuery(BUSINESS_TYPE.CLASS_NAME,
+ "typeno=:productID")
+ .setParameter("productID", baseMap.get("productId").toString())
+ .getSingleResult(false);
+ String productName = bo.getAttribute("typename").getString();
+ body.put("productName", productName);
+
ReturnMapUtil.setReturnMap(body,
RestfullConstant.baseProperty.get("success").toString(), "");
return ReturnMapUtil.getReturnMap();
@@ -123,6 +134,9 @@ public class LoanSimulationBasicServiceImpl implements
fieldMap.put("flow_unid".toLowerCase(), flowunid);
fieldMap.put("flow_unid".toUpperCase(), flowunid);
+ fieldMap.put(planCName.toLowerCase(), plannumber);
+ fieldMap.put(planCName.toUpperCase(), plannumber);
+
LoanSimulationBasicInfoAppInfoSaveDoManage manage = new LoanSimulationBasicInfoAppInfoSaveDoManage();
manage.setDono("LoanSimulationBasicInfoApp2");
manage.setAddWhere(" and " + planCName + "='" + plannumber + "'");
@@ -165,16 +179,56 @@ public class LoanSimulationBasicServiceImpl implements
calType = "proj_process";
}
- CreateTransactionExecutor cte = new CreateTransactionExecutor();
- cte.setCalType(calType);
- cte.setFlowunid(flowunid);
- cte.setPlannumber(plannumber);
- cte.setProductId(productId);
- String result = cte.run();
- ReturnMapUtil
- .setReturnMap(null, RestfullConstant.baseProperty
- .get("success").toString(), result);
- return ReturnMapUtil.getReturnMap();
+ try {
+ CreateTransactionExecutor cte = new CreateTransactionExecutor();
+ cte.setCalType(calType);
+ cte.setFlowunid(flowunid);
+ cte.setPlannumber(plannumber);
+ cte.setProductId(productId);
+ String result = cte.run();
+
+ Map body = JsonUtil.str2JSONObject(result);
+
+ ReturnMapUtil
+ .setReturnMap(body,
+ RestfullConstant.baseProperty.get("success")
+ .toString(), "");
+ return ReturnMapUtil.getReturnMap();
+ } catch (Exception e) {
+ ReturnMapUtil.setReturnMap(null,
+ RestfullConstant.baseProperty.get("fail").toString(),
+ "ºǫ́Òì³££¬ÇëÁªÏµ¹ÜÀíÔ±£¡");
+ return ReturnMapUtil.getReturnMap();
+ }
+ }
+
+ @SuppressWarnings("unchecked")
+ public Map rent(HttpServletRequest request,
+ HttpServletResponse response, JBOTransaction tx, Transaction sqlca,
+ ReturnMapUtil ReturnMapUtil) throws Exception {
+
+ Map testMap = (Map) MultipartDataUtil
+ .readRequestParam(request, "UTF-8");
+ fieldMap = (Map) testMap.get("fieldMap");
+
+ String flowunid = fieldMap.get("objectNo".toLowerCase()) == null ? ""
+ : fieldMap.get("objectNo".toLowerCase()).toString();
+ String planCName = fieldMap.get("planCName".toLowerCase()) == null ? null
+ : fieldMap.get("planCName".toLowerCase()).toString(); // ·½°¸±àºÅ
+ String plannumber = fieldMap.get("plannumber".toLowerCase()) == null ? null
+ : fieldMap.get("plannumber".toLowerCase()).toString(); // ·½°¸±àºÅ
+
+ fieldMap.put("flowunid".toLowerCase(), flowunid);
+ fieldMap.put("flowunid".toUpperCase(), flowunid);
+ fieldMap.put("flow_unid".toLowerCase(), flowunid);
+ fieldMap.put("flow_unid".toUpperCase(), flowunid);
+
+ LCRentPlanTempDoQueryManage manage = new LCRentPlanTempDoQueryManage();
+ manage.setDono("LCRentPlanTempApp2");
+ manage.setsAddWhere(" and " + planCName + "='" + plannumber + "'");
+ // manage.setsJboClass(conditionTB);
+ manage.setFieldMap(fieldMap);
+ return manage.queryDefaultDo(request, sqlca, tx, ReturnMapUtil);
}
}
diff --git a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/query/controller/ApplyListQueryController.java b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/query/controller/ApplyListQueryController.java
index 483d99659..d0d84ebf2 100644
--- a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/query/controller/ApplyListQueryController.java
+++ b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/query/controller/ApplyListQueryController.java
@@ -30,6 +30,10 @@ public class ApplyListQueryController {
ARE.getLog().info("[Path] /apply/list" + " run .................");
ApplyListQueryService service = new ApplyListQueryServiceImpl();
- return service.queryList(request, response, tx, sqlca, ReturnMapUtil);
+ try {
+ return service.queryList(request, response, tx, sqlca, ReturnMapUtil);
+ } catch (Exception e) {
+ return ReturnMapUtil.rollback(e);
+ }
}
}
diff --git a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/bo/BusinessBO.java b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/bo/BusinessBO.java
index 686ab70b9..6ae2dbccf 100644
--- a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/bo/BusinessBO.java
+++ b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/bo/BusinessBO.java
@@ -2,13 +2,28 @@ package apx.com.amarsoft.als.apzl.apply.business.start.bo;
import java.io.Serializable;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
+import jbo.app.LB_DOCLIBRARY;
+import jbo.app.tenwa.calc.LC_CALC_CONDITION_TEMP;
+import jbo.app.tenwa.calc.LC_RENT_PLAN_TEMP;
+import jbo.app.tenwa.doc.LB_DOCATTRIBUTE;
+import jbo.app.tenwa.doc.LB_DOCRELATIVE;
+import jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT;
+import net.sf.json.JSON;
import net.sf.json.JSONObject;
+import com.amarsoft.are.ARE;
+import com.amarsoft.are.jbo.BizObject;
+import com.amarsoft.are.jbo.BizObjectManager;
+import com.amarsoft.are.jbo.BizObjectQuery;
+import com.amarsoft.are.jbo.JBOException;
+import com.amarsoft.are.jbo.JBOFactory;
import com.amarsoft.are.jbo.JBOTransaction;
import com.amarsoft.are.lang.StringX;
import com.base.constant.RestfullConstant;
+import com.base.util.JsonUtil;
import com.tenwa.lease.flow.project.projectapproval.BusinessApprovalStartAction;
public class BusinessBO implements Serializable {
@@ -39,8 +54,13 @@ public class BusinessBO implements Serializable {
private String fixedFlowParam;
+ private String serialNo;
+ private String objectNo;
+ private String projectId;
+
private String msg;
private Map params;
+
public void setParam(Map fieldMap, String param, Object obj) {
obj = fieldMap.get(param.toLowerCase()) == null ? null : fieldMap.get(
param.toLowerCase()).toString();
@@ -91,6 +111,13 @@ public class BusinessBO implements Serializable {
public BusinessBO(Map fieldMap, JBOTransaction tx)
throws Exception {
+ this.objectNo = fieldMap.get("objectNo".toLowerCase()) == null ? ""
+ : fieldMap.get("objectNo".toLowerCase()).toString(); // Á÷³ÌʵÀýºÅ
+ this.projectId = fieldMap.get("projectId".toLowerCase()) == null ? ""
+ : fieldMap.get("projectId".toLowerCase()).toString(); // ÏîÄ¿±àºÅ
+ this.serialNo = fieldMap.get("serialNo".toLowerCase()) == null ? ""
+ : fieldMap.get("serialNo".toLowerCase()).toString(); // Á÷³ÌʵÀýÁ÷Ë®ºÅ
+
this.carAttributes = fieldMap.get("carAttributes".toLowerCase()) == null ? ""
: fieldMap.get("carAttributes".toLowerCase()).toString(); // ³µÁ¾ÊôÐÔ
// 1,гµ,2,¶þÊÖ³µ
@@ -139,9 +166,12 @@ public class BusinessBO implements Serializable {
this.geartype = fieldMap.get("geartype".toLowerCase()) == null ? ""
: fieldMap.get("geartype".toLowerCase()).toString(); // µµÎ»
+ }
+
+ public void businessAppStart(JBOTransaction tx) throws Exception {
if (!checkKeyField()) // УÑé·Ç¿Õ×Ö¶Î
return;
-
+
Map map = new HashMap();
BusinessApprovalStartAction action = new BusinessApprovalStartAction();
@@ -191,6 +221,112 @@ public class BusinessBO implements Serializable {
action.setFixedFlowParam(fixedFlowParam);
msg = action.initFLow(tx); // ¶¨ÒåÁ÷³ÌÖÐÐèÒªµÄ²ÎÊý
params = action.getFlowParam();
+
+ objectNo = params.get("FlowUnid");
+ projectId = params.get("ProjectId");
+ if (msg.startsWith("success")) {
+ serialNo = msg.split("@")[1];
+ }
+ }
+
+ public String getSerialNo() {
+ return serialNo;
+ }
+
+ public void setSerialNo(String serialNo) {
+ this.serialNo = serialNo;
+ }
+
+ public String getObjectNo() {
+ return objectNo;
+ }
+
+ public void setObjectNo(String objectNo) {
+ this.objectNo = objectNo;
+ }
+
+ public String getProjectId() {
+ return projectId;
+ }
+
+ public void setProjectId(String projectId) {
+ this.projectId = projectId;
+ }
+
+ @SuppressWarnings("unchecked")
+ public boolean checkDoc() throws JBOException {
+ BizObjectManager fboM = JBOFactory
+ .getBizObjectManager(FLOW_BUSSINESS_OBJECT.CLASS_NAME);
+
+ BizObject fbo = fboM.createQuery("flow_unid=:flow_unid")
+ .setParameter("flow_unid", objectNo).getSingleResult(false);
+ if (null == fbo) {
+ msg = "δÕÒµ½Á÷³ÌʵÀý!";
+ return false;
+ }
+ try {
+ String flowPara = fbo.getAttribute("FixedFlowParam") == null ? ""
+ : fbo.getAttribute("FixedFlowParam").toString();
+ JSONObject jo = JsonUtil.str2JSONObject(flowPara.trim());
+ customerType = jo.get("CustomerType") == null ? "" : jo
+ .getString("CustomerType");
+ } catch (Exception e) {
+ ARE.getLog().error(e);
+ msg = "»ñÈ¡¿Í»§ÐÅϢʧ°Ü!";
+ return false;
+ }
+
+ String sql = "";
+ sql = "SELECT DISTINCT O.ID, O.DOC_NAME,r.id " + "FROM O, "
+ + LB_DOCRELATIVE.CLASS_NAME + " R "
+ + "WHERE O.RELATIVE_ID = R.ID "
+ + "AND O.ID NOT IN (SELECT A.LIBRARY_ID FROM "
+ + LB_DOCATTRIBUTE.CLASS_NAME + " A) "
+ + "AND R.FLOW_UNID=:FLOW_UNID " + "AND o.DOC_NATURE='01' "
+ + "ORDER BY SERIAL_NUM";
+
+ BizObjectManager libraryManage = JBOFactory
+ .getBizObjectManager(LB_DOCLIBRARY.CLASS_NAME);
+ BizObjectQuery query = libraryManage.createQuery(sql).setParameter(
+ "FLOW_UNID", objectNo);
+ List librarys = query.getResultList(false);
+
+ String docNameConfig = "01".equals(customerType) ? RestfullConstant.baseProperty
+ .get("COMPANY_DOC_NAME").toString()
+ : "03".equals(customerType) ? RestfullConstant.baseProperty
+ .get("PERSON_DOC_NAME").toString() : "";
+ String[] array = docNameConfig.trim().split(",");
+ String docName = "";
+ for (String str : array) {
+ String[] array2 = str.trim().split("@");
+ docName += array2[0].trim() + ",";
+ }
+ String[] docArr = docName.split(",");
+ msg = "";
+ for (String doc : docArr) {
+ for (BizObject library : librarys) {
+ if (doc.trim().equals(
+ library.getAttribute("DOC_NAME").toString().trim())) {
+ msg += " [" + doc + "] ±Ø±¸ δÉÏ´«×ÊÁÏÕÕƬ!\r\n";
+ }
+ }
+ }
+
+ BizObjectManager conditionM = JBOFactory.getBizObjectManager(LC_CALC_CONDITION_TEMP.CLASS_NAME);
+ BizObjectManager rentM = JBOFactory.getBizObjectManager(LC_RENT_PLAN_TEMP.CLASS_NAME);
+ BizObject condition = conditionM.createQuery("FLOWUNID=:FLOWUNID").setParameter("FLOWUNID", objectNo).getSingleResult(false);
+ BizObject rent = rentM.createQuery("FLOWUNID=:FLOWUNID").setParameter("FLOWUNID", objectNo).getSingleResult(false);
+
+ if (null == condition || null == rent) {
+ msg += " [ÉÌÎñÌõ¼þ] ûÓÐÕÒµ½ÒµÎñ²âËãÐÅÏ¢!\r\n";
+ }
+
+
+ if (msg.equals("")) {
+ return true;
+ }
+// msg += "ÒµÎñÉêÇë Ìá½»·çÏÕÔ¤¾¯±¨¸æ";
+ return false;
}
public String getCarAttributes() {
diff --git a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/controller/BusinessApplyStartController.java b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/controller/BusinessApplyStartController.java
index ef55db66d..c220fde75 100644
--- a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/controller/BusinessApplyStartController.java
+++ b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/controller/BusinessApplyStartController.java
@@ -29,6 +29,27 @@ public class BusinessApplyStartController {
ARE.getLog().info("[Path] /apply/business/start" + " run .................");
BusinessApplyStartService service = new BusinessApplyStartServiceImpl();
- return service.applyStart(request, response, tx, sqlca, ReturnMapUtil);
+ try {
+ return service.applyStart(request, response, tx, sqlca, ReturnMapUtil);
+ } catch (Exception e) {
+ return ReturnMapUtil.rollback(e);
+ }
+ }
+
+ @Path("/action/submit/risk/warning")
+ @POST
+ public Map riskWarning(@Context HttpServletRequest request,
+ @Context HttpServletResponse response, @Context JBOTransaction tx,
+ @Context Transaction sqlca) throws Exception {
+ ReturnMapUtil ReturnMapUtil = new ReturnMapUtil(tx, sqlca);
+ ARE.getLog().info(
+ "[CONTROLLER] BusinessApplyStartController run .................");
+ ARE.getLog().info("[Path] /apply/action/submit/risk/warning" + " run .................");
+ BusinessApplyStartService service = new BusinessApplyStartServiceImpl();
+ try {
+ return service.riskWarning(request, response, tx, sqlca, ReturnMapUtil);
+ } catch (Exception e) {
+ return ReturnMapUtil.rollback(e);
+ }
}
}
diff --git a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/controller/ContractInformationSupplementController.java b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/controller/ContractInformationSupplementController.java
index a0467a55f..06e69f90e 100644
--- a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/controller/ContractInformationSupplementController.java
+++ b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/controller/ContractInformationSupplementController.java
@@ -31,6 +31,10 @@ public class ContractInformationSupplementController {
+ " run .................");
ContractInformationSupplementService service = new ContractInformationSupplementServiceImpl();
- return service.applyStart(request, response, tx, sqlca, ReturnMapUtil);
+ try {
+ return service.applyStart(request, response, tx, sqlca, ReturnMapUtil);
+ } catch (Exception e) {
+ return ReturnMapUtil.rollback(e);
+ }
}
}
diff --git a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/service/BusinessApplyStartService.java b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/service/BusinessApplyStartService.java
index c10c0d0b7..c93957719 100644
--- a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/service/BusinessApplyStartService.java
+++ b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/service/BusinessApplyStartService.java
@@ -14,4 +14,8 @@ public interface BusinessApplyStartService {
Map applyStart(@Context HttpServletRequest request,
@Context HttpServletResponse response, @Context JBOTransaction tx,
@Context Transaction sqlca, ReturnMapUtil ReturnMapUtil) throws Exception;
+
+ Map riskWarning(@Context HttpServletRequest request,
+ @Context HttpServletResponse response, @Context JBOTransaction tx,
+ @Context Transaction sqlca, ReturnMapUtil ReturnMapUtil) throws Exception;
}
diff --git a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/service/impl/BusinessApplyStartServiceImpl.java b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/service/impl/BusinessApplyStartServiceImpl.java
index ff8dbd752..4c2645650 100644
--- a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/service/impl/BusinessApplyStartServiceImpl.java
+++ b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/service/impl/BusinessApplyStartServiceImpl.java
@@ -34,6 +34,7 @@ public class BusinessApplyStartServiceImpl implements BusinessApplyStartService
fieldMap = (Map) testMap.get("fieldMap");
fileList = (List>) testMap.get("fileList");
BusinessBO bo = new BusinessBO(fieldMap, tx);
+ bo.businessAppStart(tx);
tx.commit();
String sReturnInfo = bo.getMsg();
if (sReturnInfo.startsWith("success")) {
@@ -65,11 +66,11 @@ public class BusinessApplyStartServiceImpl implements BusinessApplyStartService
}
// ·µ»Øǰ̨µÄÊý¾Ý
Map body = new HashMap();
- body.put("flowUnid", params.get("FlowUnid"));
- body.put("objectNo", params.get("FlowUnid"));
- body.put("projectId", params.get("ProjectId"));
- body.put("taskNo", serialNo);
- body.put("serialNo", serialNo);
+ body.put("flowUnid", bo.getObjectNo());
+ body.put("objectNo", bo.getObjectNo());
+ body.put("projectId", bo.getProjectId());
+ body.put("taskNo", bo.getSerialNo());
+ body.put("serialNo", bo.getSerialNo());
ReturnMapUtil.setReturnMap(body,
RestfullConstant.baseProperty.get("success").toString(),
"·¢Æð³É¹¦");
@@ -85,4 +86,24 @@ public class BusinessApplyStartServiceImpl implements BusinessApplyStartService
return ReturnMapUtil.getReturnMap();
}
+ @SuppressWarnings("unchecked")
+ public Map riskWarning(HttpServletRequest request,
+ HttpServletResponse response, JBOTransaction tx, Transaction sqlca,
+ ReturnMapUtil ReturnMapUtil) throws Exception {
+ Map testMap = (Map) MultipartDataUtil
+ .readRequestParam(request, "UTF-8");
+ fieldMap = (Map) testMap.get("fieldMap");
+ fileList = (List>) testMap.get("fileList");
+ BusinessBO bo = new BusinessBO(fieldMap, tx);
+ boolean flag = bo.checkDoc();
+
+ if(flag) {
+ ReturnMapUtil.setReturnMap(null, RestfullConstant.baseProperty.get("success").toString(), "");
+ } else {
+ String msg = bo.getMsg();
+ ReturnMapUtil.setReturnMap(null, RestfullConstant.baseProperty.get("fail").toString(), msg);
+ }
+ return ReturnMapUtil.getReturnMap();
+ }
+
}
diff --git a/src_app_fresh/apx/com/amarsoft/als/base/awe/AbstractAweDoQueryManage.java b/src_app_fresh/apx/com/amarsoft/als/base/awe/AbstractAweDoQueryManage.java
index cb3e1c5aa..60d5f9d2e 100644
--- a/src_app_fresh/apx/com/amarsoft/als/base/awe/AbstractAweDoQueryManage.java
+++ b/src_app_fresh/apx/com/amarsoft/als/base/awe/AbstractAweDoQueryManage.java
@@ -847,7 +847,7 @@ public abstract class AbstractAweDoQueryManage extends AbstractAweDoHandler {
if (sPageIndex == null)
sPageIndex = "1";
if (sLimit == null)
- sLimit = "10";
+ sLimit = "1000";
int iPageIndex, iLimit;
iPageIndex = Integer.valueOf(sPageIndex);
iLimit = Integer.valueOf(sLimit);
diff --git a/src_tenwa/com/tenwa/flow/fund/flowpayment/CopyFundPaymentToTemp.java b/src_tenwa/com/tenwa/flow/fund/flowpayment/CopyFundPaymentToTemp.java
index 19814cf24..83d6fb40b 100644
--- a/src_tenwa/com/tenwa/flow/fund/flowpayment/CopyFundPaymentToTemp.java
+++ b/src_tenwa/com/tenwa/flow/fund/flowpayment/CopyFundPaymentToTemp.java
@@ -50,11 +50,12 @@ public class CopyFundPaymentToTemp extends BaseBussiness{
}
}
}
- if(fundList.length() > 0) {
+ //°²ÅôÌùÏ¢²»µÖ¿Û
+ /*if(fundList.length() > 0) {
fundList += ",";
}
- fundList += "'feetype27'";
+ fundList += "'feetype27'";*/
ASUser user = ASUser.getUser(userId, Sqlca);
FundPaymentCar fp = new FundPaymentCar();
diff --git a/src_tenwa/com/tenwa/handler/LCFundPaymentTempInfoHandler.java b/src_tenwa/com/tenwa/handler/LCFundPaymentTempInfoHandler.java
index d045a2ac5..4ea1fcc3f 100644
--- a/src_tenwa/com/tenwa/handler/LCFundPaymentTempInfoHandler.java
+++ b/src_tenwa/com/tenwa/handler/LCFundPaymentTempInfoHandler.java
@@ -20,7 +20,7 @@ public class LCFundPaymentTempInfoHandler extends CommonHandler {
String productId = this.asPage.getParameter("ProductId");
//»ñÈ¡×ø¿ÛÏî
- Map> params = ProductParamUtil.getProductComponentType(productId, "PRD0315");
+ Map> params = ProductParamUtil.getProductComponentType(productId, "PRD0315");
List deductFeeType = new ArrayList();
for(Entry> feeTypes : params.entrySet()) {
if(!feeTypes.getValue().containsKey("isBalance")) {
@@ -45,12 +45,11 @@ public class LCFundPaymentTempInfoHandler extends CommonHandler {
}
}
}
-
- if(fundList.length() > 0) {
+ //°²ÅôÌùÏ¢²»µÖ¿Û
+ /*if(fundList.length() > 0) {
fundList += ",";
}
-
- fundList += "'feetype27'";
+ fundList += "'feetype27'";*/
String flowunid = this.asPage.getParameter("ObjectNo");
@SuppressWarnings("unchecked")
@@ -73,11 +72,11 @@ public class LCFundPaymentTempInfoHandler extends CommonHandler {
bo.setAttributeValue("CAUTION_MONEY", factMoney);
this.asDataObject.setVisible("CAUTION_MONEY", true);
break;
- case "feetype27":
+ /*case "feetype27":
cleanLeaseMoney = cleanLeaseMoney.add(factMoney);
bo.setAttributeValue("DEALER_DISCOUNT", factMoney);
this.asDataObject.setVisible("DEALER_DISCOUNT", true);
- break;
+ break;*/
}
}