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 jianghd

Browse Source
This commit is contained in:
jianghongdong 2018-08-02 09:48:21 +08:00
commit 9a65d7172e
24 changed files with 438 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp
View File

@ -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;

1
WebContent/Tenwa/Lease/Flow/Comm/LBContractEnd/LBContractDevolutionInfo.jsp
View File

@ -109,7 +109,6 @@
/*~[Describe=±£´æ;InputParam=ÎÞ;OutPutParam=ÎÞ;]~*/
function saveRecord()
{
debugger;
var param={};
var tempParam={};
var sparam="";

1
WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/LBContractTerminateInfo.jsp
View File

@ -110,7 +110,6 @@
/*~[Describe=±£´æ;InputParam=ÎÞ;OutPutParam=ÎÞ;]~*/
function saveRecord()
{
debugger;
var param={};
var tempParam={};
var sparam="";

5
WebContent/Tenwa/Lease/Flow/RentNotify/RentNotifyList.jsp
View File

@ -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";

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

@ -1079,7 +1079,7 @@
<Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="方案信息" PARAMETERID="planinformation" PARAMETERNAME="方案信息" PRIGHTTYPE="Required"/></Parameters></Component>
<Component FORMAT="1" ID="EQUIP_AMT" NAME="设备款" STATUS="2" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收取方向" PARAMETERID="CostType01" PARAMETERNAME="收取方向" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付节点" PARAMETERID="CostType02" PARAMETERNAME="收付节点" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付对象" PARAMETERID="CostType03" PARAMETERNAME="收付对象" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="科目编码" PARAMETERID="CostType04" PARAMETERNAME="科目编码" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否显示比例" PARAMETERID="CostType05" PARAMETERNAME="是否显示比例" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="输入方式" PARAMETERID="CostType06" PARAMETERNAME="输入方式" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="比例参照费用" PARAMETERID="CostType07" PARAMETERNAME="比例参照费用" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="金额限定" PARAMETERID="CostType08" PARAMETERNAME="金额限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="比例限定" PARAMETERID="CostType09" PARAMETERNAME="比例限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否参与IRR/XIRR核算" PARAMETERID="CostType10" PARAMETERNAME="是否参与IRR/XIRR核算" PRIGHTTYPE="Required"/></Parameters></Component>
<Component FORMAT="1" ID="FIRST_PAYMENT" NAME="首付款" STATUS="1" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收取方向" PARAMETERID="CostType01" PARAMETERNAME="收取方向" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="收付节点" PARAMETERID="CostType02" PARAMETERNAME="收付节点" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付对象" PARAMETERID="CostType03" PARAMETERNAME="收付对象" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="科目编码" PARAMETERID="CostType04" PARAMETERNAME="科目编码" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否显示比例" PARAMETERID="CostType05" PARAMETERNAME="是否显示比例" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="输入方式" PARAMETERID="CostType06" PARAMETERNAME="输入方式" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="比例参照费用" PARAMETERID="CostType07" PARAMETERNAME="比例参照费用" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="金额限定" PARAMETERID="CostType08" PARAMETERNAME="金额限定" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="比例限定" PARAMETERID="CostType09" PARAMETERNAME="比例限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="是否参与IRR/XIRR核算" PARAMETERID="CostType10" PARAMETERNAME="是否参与IRR/XIRR核算" PRIGHTTYPE="Hide"/></Parameters></Component>
<Component FORMAT="1" ID="HANDLING_CHARGE_MONEY" NAME="手续费" STATUS="1" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收取方向" PARAMETERID="CostType01" PARAMETERNAME="收取方向" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付节点" PARAMETERID="CostType02" PARAMETERNAME="收付节点" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付对象" PARAMETERID="CostType03" PARAMETERNAME="收付对象" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="科目编码" PARAMETERID="CostType04" PARAMETERNAME="科目编码" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="是否显示比例" PARAMETERID="CostType05" PARAMETERNAME="是否显示比例" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="输入方式" PARAMETERID="CostType06" PARAMETERNAME="输入方式" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="比例参照费用" PARAMETERID="CostType07" PARAMETERNAME="比例参照费用" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="金额限定" PARAMETERID="CostType08" PARAMETERNAME="金额限定" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="比例限定" PARAMETERID="CostType09" PARAMETERNAME="比例限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="是否参与IRR/XIRR核算" PARAMETERID="CostType10" PARAMETERNAME="是否参与IRR/XIRR核算" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="收取方式" PARAMETERID="PoundageStyle" PARAMETERNAME="手续费计算方式" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="是否参与融资" PARAMETERID="FINAN" PARAMETERNAME="是否参与融资" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否差额放款" PARAMETERID="isBalance" PARAMETERNAME="是否差额放款" PRIGHTTYPE="Required"/></Parameters></Component>
<Component FORMAT="1" ID="HANDLING_CHARGE_MONEY" NAME="手续费" STATUS="1" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收取方向" PARAMETERID="CostType01" PARAMETERNAME="收取方向" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付节点" PARAMETERID="CostType02" PARAMETERNAME="收付节点" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付对象" PARAMETERID="CostType03" PARAMETERNAME="收付对象" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="科目编码" PARAMETERID="CostType04" PARAMETERNAME="科目编码" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="是否显示比例" PARAMETERID="CostType05" PARAMETERNAME="是否显示比例" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="输入方式" PARAMETERID="CostType06" PARAMETERNAME="输入方式" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="比例参照费用" PARAMETERID="CostType07" PARAMETERNAME="比例参照费用" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="金额限定" PARAMETERID="CostType08" PARAMETERNAME="金额限定" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="比例限定" PARAMETERID="CostType09" PARAMETERNAME="比例限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="是否参与IRR/XIRR核算" PARAMETERID="CostType10" PARAMETERNAME="是否参与IRR/XIRR核算" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="收取方式" PARAMETERID="PoundageStyle" PARAMETERNAME="手续费计算方式" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="是否参与融资" PARAMETERID="FINAN" PARAMETERNAME="是否参与融资" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否差额放款" PARAMETERID="isBalance" PARAMETERNAME="是否差额放款" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="分摊方式" PARAMETERID="oneOrMore" PARAMETERNAME="分摊方式" PRIGHTTYPE="Required"/></Parameters></Component>
<Component FORMAT="1" ID="CAUTION_MONEY" NAME="保证金" STATUS="1" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收取方向" PARAMETERID="CostType01" PARAMETERNAME="收取方向" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付节点" PARAMETERID="CostType02" PARAMETERNAME="收付节点" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付对象" PARAMETERID="CostType03" PARAMETERNAME="收付对象" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="科目编码" PARAMETERID="CostType04" PARAMETERNAME="科目编码" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="是否显示比例" PARAMETERID="CostType05" PARAMETERNAME="是否显示比例" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="输入方式" PARAMETERID="CostType06" PARAMETERNAME="输入方式" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="比例参照费用" PARAMETERID="CostType07" PARAMETERNAME="比例参照费用" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="金额限定" PARAMETERID="CostType08" PARAMETERNAME="金额限定" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="比例限定" PARAMETERID="CostType09" PARAMETERNAME="比例限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="是否参与IRR/XIRR核算" PARAMETERID="CostType10" PARAMETERNAME="是否参与IRR/XIRR核算" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="显示次序" PARAMETERID="DISPLAY_ORDER" PARAMETERNAME="显示次序" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="保证金计算方式" PARAMETERID="DepositStyle" PARAMETERNAME="保证金计算方式" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否差额放款" PARAMETERID="isBalance" PARAMETERNAME="是否差额放款" PRIGHTTYPE="Required"/></Parameters></Component>
<Component FORMAT="1" ID="MANAGEMENT_MONEY" NAME="咨询顾问费" STATUS="2" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收取方向" PARAMETERID="CostType01" PARAMETERNAME="收取方向" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付节点" PARAMETERID="CostType02" PARAMETERNAME="收付节点" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付对象" PARAMETERID="CostType03" PARAMETERNAME="收付对象" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="科目编码" PARAMETERID="CostType04" PARAMETERNAME="科目编码" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="是否显示比例" PARAMETERID="CostType05" PARAMETERNAME="是否显示比例" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="输入方式" PARAMETERID="CostType06" PARAMETERNAME="输入方式" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="比例参照费用" PARAMETERID="CostType07" PARAMETERNAME="比例参照费用" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="金额限定" PARAMETERID="CostType08" PARAMETERNAME="金额限定" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="比例限定" PARAMETERID="CostType09" PARAMETERNAME="比例限定" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="是否参与IRR/XIRR核算" PARAMETERID="CostType10" PARAMETERNAME="是否参与IRR/XIRR核算" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="显示次序" PARAMETERID="DISPLAY_ORDER" PARAMETERNAME="显示次序" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否参与融资" PARAMETERID="FINAN" PARAMETERNAME="是否参与融资" PRIGHTTYPE="Required"/></Parameters></Component>

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

@ -196,4 +196,4 @@
<Parameter CODESCRIPT="caution_money_method" CODESOURCE="Code" COMPONENTTYPE="PRD0315" DATATYPE="4" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="DepositStyle" PARAMETERNAME="保证金计算方式" SELECTTYPE="05" STATUS="1"/>
<Parameter COMPONENTTYPE="PRD0315" DATATYPE="6" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="FINAL_PAYMENT_RATIO" PARAMETERNAME="尾款比例" STATUS="1"/>
<Parameter COMPONENTTYPE="PRD0315" DATATYPE="6" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="FIRST_PAYMENT_RATIO" PARAMETERNAME="首付款比例" STATUS="1"/>
<Parameter COMPONENTTYPE="PRD0315" DATATYPE="2" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="DISCOUNT_ALL" PARAMETERNAME="悧季口쏜띨" STATUS="1" UNIT="&lt;font&gt;禱&lt;/font&gt;"/><Parameter CODESCRIPT="period_type" CODESOURCE="Code" COMPONENTTYPE="PRD0350" DATATYPE="4" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="begin_end" PARAMETERNAME="邱마/빈마" SELECTTYPE="05" STATUS="1"/></Parameters>
<Parameter COMPONENTTYPE="PRD0315" DATATYPE="2" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="DISCOUNT_ALL" PARAMETERNAME="总贴息金额" STATUS="1" UNIT="&lt;font&gt;元&lt;/font&gt;"/><Parameter CODESCRIPT="period_type" CODESOURCE="Code" COMPONENTTYPE="PRD0350" DATATYPE="4" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="begin_end" PARAMETERNAME="先付/后付" SELECTTYPE="05" STATUS="1"/><Parameter CODESCRIPT="oneOrMore" CODESOURCE="Code" COMPONENTTYPE="PRD0315" DATATYPE="4" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="oneOrMore" PARAMETERNAME="分摊方式" SELECTTYPE="04" STATUS="1"/></Parameters>

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

@ -3102,34 +3102,34 @@
<class name="VI_LC_RENT_COLLECTION" 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="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"/>
</attributes>
<manager>
<managerProperties>

2
calc/com/tenwa/reckon/product/ProductCondition.java
View File

@ -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+"}";
}

12
src/com/tenwa/channelportal/action/ContractSignAction.java
View File

@ -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);

27
src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/doc/detail/service/impl/BusinessDocDetailServiceImpl.java
View File

@ -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")

17
src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/loan/controller/LoanSimulationBasicInfoController.java
View File

@ -53,6 +53,23 @@ public class LoanSimulationBasicInfoController {
}
}
@Path("/rent")
@POST
public Map<String, Object> 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<String, Object> saveInfo(@Context HttpServletRequest request, @Context HttpServletResponse response,

46
src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/loan/manage/LCRentPlanTempDoQueryManage.java Normal file
View File

@ -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<String, Object> fieldMap;
public void setFieldMap(Map<String, Object> 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<String, Object> queryDefaultDo(HttpServletRequest request,
Transaction sqlca, JBOTransaction tx, ReturnMapUtil ReturnMapUtil)
throws Exception {
setParamMap(fieldMap);
return getData(request, sqlca, tx, ReturnMapUtil);
}
}

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

@ -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<String, Object> checkSource(Map<String, Object> 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<Map<String, Object>> libarary = (List<Map<String, Object>>) (donoTemp.get("library"));
String source = "";
String sourceType = "";
app.put("coldefaultitemno", value);
for (Map<String, Object> 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<Map<String, Object>>();
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);

6
src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/loan/service/LoanSimulationBasicService.java
View File

@ -20,6 +20,12 @@ public interface LoanSimulationBasicService {
@Context HttpServletResponse response, @Context JBOTransaction tx,
@Context Transaction sqlca, ReturnMapUtil ReturnMapUtil)
throws Exception;
Map<String, Object> rent(@Context HttpServletRequest request,
@Context HttpServletResponse response, @Context JBOTransaction tx,
@Context Transaction sqlca, ReturnMapUtil ReturnMapUtil)
throws Exception;
Map<String, Object> saveInfo(@Context HttpServletRequest request,
@Context HttpServletResponse response, @Context JBOTransaction tx,

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

@ -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<String, Object> baseMap = ProductBaseLoanTools.deadWork(null, null,
null, null, null, flowunid, tx);
// ·ÑÓùæÔò
List<Map<String, Object>> appList = new ArrayList<Map<String,Object>>();
String calcRules = ProductBaseLoanTools
.getProductFundRules(appList, baseMap.get("productId").toString());
List<Map<String, Object>> appList = new ArrayList<Map<String, Object>>();
String calcRules = ProductBaseLoanTools.getProductFundRules(appList,
baseMap.get("productId").toString());
Map<String, Object> calcRulesMap = JsonUtil.str2JSONObject(calcRules);
Map<String, Object> body = new HashMap<String, Object>();
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<String, Object> 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<String, Object> rent(HttpServletRequest request,
HttpServletResponse response, JBOTransaction tx, Transaction sqlca,
ReturnMapUtil ReturnMapUtil) throws Exception {
Map<String, Object> testMap = (Map<String, Object>) MultipartDataUtil
.readRequestParam(request, "UTF-8");
fieldMap = (Map<String, Object>) 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);
}
}

6
src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/query/controller/ApplyListQueryController.java
View File

@ -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);
}
}
}

138
src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/bo/BusinessBO.java
View File

@ -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<String, String> params;
public void setParam(Map<String, Object> 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<String, Object> 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<String, Object> map = new HashMap<String, Object>();
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<BizObject> 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() {

23
src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/controller/BusinessApplyStartController.java
View File

@ -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<String, Object> 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);
}
}
}

6
src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/controller/ContractInformationSupplementController.java
View File

@ -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);
}
}
}

4
src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/service/BusinessApplyStartService.java
View File

@ -14,4 +14,8 @@ public interface BusinessApplyStartService {
Map<String, Object> applyStart(@Context HttpServletRequest request,
@Context HttpServletResponse response, @Context JBOTransaction tx,
@Context Transaction sqlca, ReturnMapUtil ReturnMapUtil) throws Exception;
Map<String, Object> riskWarning(@Context HttpServletRequest request,
@Context HttpServletResponse response, @Context JBOTransaction tx,
@Context Transaction sqlca, ReturnMapUtil ReturnMapUtil) throws Exception;
}

31
src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/service/impl/BusinessApplyStartServiceImpl.java
View File

@ -34,6 +34,7 @@ public class BusinessApplyStartServiceImpl implements BusinessApplyStartService
fieldMap = (Map<String, Object>) testMap.get("fieldMap");
fileList = (List<Map<String, Object>>) 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<String, Object> body = new HashMap<String, Object>();
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<String, Object> riskWarning(HttpServletRequest request,
HttpServletResponse response, JBOTransaction tx, Transaction sqlca,
ReturnMapUtil ReturnMapUtil) throws Exception {
Map<String, Object> testMap = (Map<String, Object>) MultipartDataUtil
.readRequestParam(request, "UTF-8");
fieldMap = (Map<String, Object>) testMap.get("fieldMap");
fileList = (List<Map<String, Object>>) 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();
}
}

2
src_app_fresh/apx/com/amarsoft/als/base/awe/AbstractAweDoQueryManage.java
View File

@ -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);

5
src_tenwa/com/tenwa/flow/fund/flowpayment/CopyFundPaymentToTemp.java
View File

@ -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();

13
src_tenwa/com/tenwa/handler/LCFundPaymentTempInfoHandler.java
View File

@ -20,7 +20,7 @@ public class LCFundPaymentTempInfoHandler extends CommonHandler {
String productId = this.asPage.getParameter("ProductId");
//»ñÈ¡×ø¿ÛÏî
Map<String, Map<String, String>> params = ProductParamUtil.getProductComponentType(productId, "PRD0315");
Map<String, Map<String, String>> params = ProductParamUtil.getProductComponentType(productId, "PRD0315");
List<String> deductFeeType = new ArrayList<String>();
for(Entry<String, Map<String, String>> 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;*/
}
}