diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/AccountChangeFlowDebitCardInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/AccountChangeFlowDebitCardInfo.jsp index 1ca2ef0fe..a813b0168 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/AccountChangeFlowDebitCardInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/AccountChangeFlowDebitCardInfo.jsp @@ -102,7 +102,7 @@ setErrorTips("acc_number",""); setItemValue(0,0,"acc_type","Debit"); var sparams = "account="+getItemValue(0,getRow(),"ACCOUNT")+",acc_number="+getItemValue(0,getRow(),"ACC_NUMBER")+",bank_name="+getItemValue(0,getRow(),"BANK_NAME")+",mobile="+getItemValue(0,getRow(),"MOBILE")+",projectid=<%=projectId%>,FlowUnid=<%=FlowUnid%>,contractid=<%=contractId%>"; - var meassge = RunJavaMethodTrans("com.tenwa.comm.customerfilterlist.DebitCardAction", "IsSignStatus", sparams); + var meassge = RunJavaMethodTrans("com.tenwa.comm.customerfilterlist.DebitCardAction", "checkSign", sparams); if("Y"==meassge){ setItemValue(0,0,"sign_status","Y"); }else if("N"==meassge){ diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp index abc51cfdc..8d0bfd3ac 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp @@ -165,8 +165,8 @@ setItemValue(0,0,"contract_id",contractid); } } - if("BusinessChangeApply"=="<%=ApplyType%>"||"BContractApproveApply"=="<%=ApplyType%>"||"BContractChangeApply"=="<%=ApplyType%>"){ - var sparams = "account="+getItemValue(0,getRow(),"ACCOUNT")+",acc_number="+getItemValue(0,getRow(),"ACC_NUMBER")+",bank_name="+getItemValue(0,getRow(),"BANK_NAME")+",mobile="+getItemValue(0,getRow(),"MOBILE")+",projectid=<%=projectId%>,FlowUnid=<%=FlowUnid%>,contractid=<%=contractId%>"; + if("BusinessApplyApply"=="<%=ApplyType%>"||"BusinessChangeApply"=="<%=ApplyType%>"||"BContractApproveApply"=="<%=ApplyType%>"||"BContractChangeApply"=="<%=ApplyType%>"){ + var sparams = "account="+getItemValue(0,getRow(),"ACCOUNT")+",acc_number="+getItemValue(0,getRow(),"ACC_NUMBER")+",bank_name="+getItemValue(0,getRow(),"BANK_NAME")+",mobile="+getItemValue(0,getRow(),"MOBILE")+",projectid=<%=projectId%>,FlowUnid=<%=FlowUnid%>,contractid=<%=contractId%>,certId="+getItemValue(0,getRow(),"CERTID"); var meassge = RunJavaMethodTrans("com.tenwa.comm.customerfilterlist.DebitCardAction", "checkSign", sparams); if("false"==meassge){ alert("合同已生成，请先删除合同再修改扣款卡信息！"); diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp index 43d2a81b0..c5e2903ac 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp @@ -83,7 +83,9 @@ CurPage.getCurComp().setAttribute("RightType", null); doTemp.setHtmlEvent("FRAME_NUMBER", "onChange", "checkFrameNumber");//校验车架号格式 doTemp.setHtmlEvent("FRAME_NUMBER2", "onChange", "checkFrameNumber2");//校验车架号格式 - + doTemp.setColInnerBtEvent("BRAND", "SelectCardataBrand()"); + doTemp.setColInnerBtEvent("car_series", "SelectCardataSeries()"); + doTemp.setColInnerBtEvent("MODEL", "SelectCardataModel()"); /* doTemp.setHtmlEvent("BRAND", "onChange", "selectCarType"); if((null!=RightType&& !RightType.equals("ReadOnly"))||(null!=ishistory&& !ishistory.equals("true"))){ doTemp.setColumnAttribute(doTemp.getColumnIndex("BRAND"), "COLUNIT", ""); diff --git a/WebContent/WEB-INF/etc/jbo/jbo_app.xml b/WebContent/WEB-INF/etc/jbo/jbo_app.xml index a9b1682d8..972340ccd 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_app.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_app.xml @@ -4510,6 +4510,7 @@ + @@ -4626,6 +4627,7 @@ + diff --git a/src_core/com/tenwa/comm/customerfilterlist/DebitCardAction.java b/src_core/com/tenwa/comm/customerfilterlist/DebitCardAction.java index 29711e939..5b48ff9ea 100644 --- a/src_core/com/tenwa/comm/customerfilterlist/DebitCardAction.java +++ b/src_core/com/tenwa/comm/customerfilterlist/DebitCardAction.java @@ -49,6 +49,7 @@ public class DebitCardAction { private String pay_money; private String mobile; private String sign_status; + private String certId; public String getCustIdByFlowunid(JBOTransaction tx) throws JBOException{ String s=this.getFlowUnid(); @@ -266,12 +267,16 @@ public class DebitCardAction { return "false"; } BizObjectManager cahManage = JBOFactory.getFactory().getManager(CUSTOMER_ACCOUNT_HIS.CLASS_NAME); - List cahs = cahManage.createQuery(" account=:account and acc_number=:acc_number and bank_name=:bank_name and mobile=:mobile ") - .setParameter("account", account).setParameter("acc_number", acc_number).setParameter("bank_name", bank_name).setParameter("mobile", mobile).getResultList(false); - for (BizObject cah : cahs) { - if("Y".equals(cah.getAttribute("sign_status").toString())){ - return "Y"; - } + List cahs = cahManage.createQuery(" sign_status='Y' and account=:account and acc_number=:acc_number and certid=:certid ") + .setParameter("account", account).setParameter("acc_number", acc_number).setParameter("certid", certId).getResultList(false); + if(cahs != null && cahs.size() > 0){ + return "Y"; + } + BizObjectManager caManage = JBOFactory.getFactory().getManager(CUSTOMER_ACCOUNT.CLASS_NAME); + List cas = caManage.createQuery(" sign_status='Y' and account=:account and acc_number=:acc_number and certid=:certid ") + .setParameter("account", account).setParameter("acc_number", acc_number).setParameter("certid", certId).getResultList(false); + if(cas != null && cas.size() > 0){ + return "Y"; } return "N"; } @@ -482,4 +487,13 @@ public class DebitCardAction { public void setSign_status(String sign_status) { this.sign_status = sign_status; } + + public String getCertId() { + return certId; + } + + public void setCertId(String certId) { + this.certId = certId; + } + } diff --git a/src_core/com/tenwa/flow/service/FlowUserManageServieImp.java b/src_core/com/tenwa/flow/service/FlowUserManageServieImp.java index a289f9f20..147614a55 100644 --- a/src_core/com/tenwa/flow/service/FlowUserManageServieImp.java +++ b/src_core/com/tenwa/flow/service/FlowUserManageServieImp.java @@ -122,7 +122,7 @@ public class FlowUserManageServieImp implements FlowUserManageServie { curOrgId=curOrgId.substring(0,13); } curOrgId=curOrgId.substring(0,curOrgId.length()-4); - String HSQL="select userid,username from O,jbo.sys.USER_ROLE ur where O.userid=ur.userid and ur.roleid in("+roles+") and O.belongorg like '"+curOrgId+"%' "; + String HSQL="select userid,username from O,jbo.sys.USER_ROLE ur where O.userid=ur.userid and O.STATUS='1' and ur.roleid in("+roles+") and O.belongorg like '"+curOrgId+"%' "; List list = JBOFactory.createBizObjectQuery("jbo.sys.USER_INFO",HSQL).getResultList(false); for(int i=0;i */ public static final String frame_guided_price = "frame_guided_price"; + /** + * 狮桥车辆标识 STRING(50)
+ */ + public static final String identify_code = "identify_code"; } \ No newline at end of file diff --git a/src_jbo/jbo/app/LB_EQUIPMENT_CAR_TEMP.java b/src_jbo/jbo/app/LB_EQUIPMENT_CAR_TEMP.java index 47e934aac..087ee8730 100644 --- a/src_jbo/jbo/app/LB_EQUIPMENT_CAR_TEMP.java +++ b/src_jbo/jbo/app/LB_EQUIPMENT_CAR_TEMP.java @@ -429,4 +429,8 @@ public interface LB_EQUIPMENT_CAR_TEMP{ * 挂车指导价 STRING(32)
*/ public static final String frame_guided_price = "frame_guided_price"; + /** + * 狮桥车辆标识 STRING(50)
+ */ + public static final String identify_code = "identify_code"; } \ No newline at end of file diff --git a/src_sql/鎶曚骇SQL/v20200915/tft_20200915.sql b/src_sql/鎶曚骇SQL/v20200915/tft_20200915.sql index 38bdc7c3d..f5c028e0a 100644 --- a/src_sql/鎶曚骇SQL/v20200915/tft_20200915.sql +++ b/src_sql/鎶曚骇SQL/v20200915/tft_20200915.sql @@ -122,9 +122,19 @@ INSERT INTO CODE_LIBRARY (CODENO, ITEMNO, ITEMNAME, BANKNO, SORTNO, ISINUSE, ITE delete from PRD_NODEINFO where nodeid='11291' and nodename='租赁车辆基本信息'; insert into `PRD_NODEINFO` (`nodeid`, `nodename`, `sortno`, `isinuse`, `itemdescribe`, `inputuserid`, `inputorgid`, `inputtime`, `updateuserid`, `updatetime`, `initscript`, `exportscript`, `phasescript`, `deletescript`, `remark`, `formalClass`, `querycondition`) values('11291','租赁车辆基本信息','11291','1','/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentList.jsp','admin','80009000200010001','2018/01/31','administrator','2020/08/31',NULL,NULL,NULL,NULL,NULL,NULL,NULL); - - - +DELETE FROM awe_do_library WHERE dono='LBEquipmentListTemp_Cars' AND colindex='0040'; +INSERT INTO awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) VALUES ('LBEquipmentListTemp_Cars','0040','0040','1','O','DEVICE_TYPE','DEVICE_TYPE','String','','车辆类型','','1','Text','1','1','Code','equipType_Car','','30','0','0','0','1','0',0,'','','','SYS_Designer','2018/06/11 19:57:55','SYS_Designer','2020/08/31 21:56:21','0','','1','','','',''); + + +DELETE FROM AWE_DO_CATALOG WHERE dono='LBEquipmentInfoTemp_Cars' AND doname='租赁物件临时表信息'; +Insert Into AWE_DO_CATALOG (dono,doname,dodescribe,dotype,doclass,isinuse,colcount,modeid,jboclass,jbofrom,jbowhere,jbogroup,jboorder,businessprocess,exportflag,inputuser,inputtime,updateuser,updatetime,remark,isvalidate,parent) Values ('LBEquipmentInfoTemp_Cars','租赁物件临时表信息',null,'30030',null,'1','2','default','jbo.com.tenwa.lease.comm.LB_EQUIPMENT_CAR_TEMP','O','ID=:id','','','com.amarsoft.awe.dw.handler.impl.CommonHandler',null,'SYS_Designer','2017/05/23 09:23:48','SYS_Designer','2020/08/31 21:44:47','','1',''); + +DELETE FROM awe_do_library WHERE dono='LBEquipmentInfoTemp_Cars' AND colindex='1022'; +INSERT INTO awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) VALUES ('LBEquipmentInfoTemp_Cars','1022','1022','1','O','BRAND','BRAND','String','','品牌','','1','Text','1','1','','','','30','1','1','1','1','0',0,'0','0010','','SYS_DESIGNER','2017/10/19 12:04:17','SYS_Designer','2020/09/03 10:23:42','0','','1','','','',''); +DELETE FROM awe_do_library WHERE dono='LBEquipmentInfoTemp_Cars' AND colindex='1023'; +INSERT INTO awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) VALUES ('LBEquipmentInfoTemp_Cars','1023','1023','1','O','car_series','car_series','String','','车系','','1','Text','1','1','','','','80','1','1','1','1','0',0,'','0010','','SYS_Designer','2018/03/12 14:50:55','SYS_Designer','2020/09/03 10:35:10','0','','1','','','',''); +DELETE FROM awe_do_library WHERE dono='LBEquipmentInfoTemp_Cars' AND colindex='1024'; +INSERT INTO awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) VALUES ('LBEquipmentInfoTemp_Cars','1024','1024','1','O','MODEL','MODEL','String','','型号','','1','Text','1','1','','','','200','1','1','1','1','0',1,'0','0010','','SYS_Designer','2017/05/23 09:23:48','SYS_Designer','2020/09/03 10:35:26','0','','1','','','',''); diff --git a/src_tenwa/com/tenwa/util/BeforeApplicationCheckUtil.java b/src_tenwa/com/tenwa/util/BeforeApplicationCheckUtil.java index 81b1ee0da..aed1c37e8 100644 --- a/src_tenwa/com/tenwa/util/BeforeApplicationCheckUtil.java +++ b/src_tenwa/com/tenwa/util/BeforeApplicationCheckUtil.java @@ -29,6 +29,7 @@ import com.tenwa.comm.exception.BusinessException; import com.tenwa.httpclient.HttpClientUtil; import com.tenwa.httpclient.PyUtils; import com.tenwa.httpclient.controller.BigDataController; +import com.tenwa.httpclient.pypafhtml.PyHtmlCreate; import com.tenwa.httpclient.resources.BigDataPropertiesUtil; import com.tenwa.lease.flow.project.validate.NciicClient; import com.tenwa.lease.flow.project.validate.SoapRequest; @@ -123,7 +124,7 @@ public class BeforeApplicationCheckUtil { params.put("queryReasonID","101"); params.put("subreportIDs","96100"); params.put("refID",""); - String type = "html"; + String type = "xml"; String htmlFile = ""; System.out.println("------------------鹏元(pengyuan_af)拉取时间----------------------"); System.out.println(""); @@ -132,8 +133,13 @@ public class BeforeApplicationCheckUtil { System.out.println(""); System.out.println(""); System.out.println("------------------鹏元(pengyuan_af)拉取时间----------------------"); - - System.out.println("==================pengyuan_af@" + type + "获取数据===================="); + String queryCondition = HttpClientUtil.getQueryCondition(params); + Connection conn = Sqlca.getConnection(Sqlca); + @SuppressWarnings("deprecation") + Configure configure = Configure.getInstance(); + String fileSavePath = configure.getParameter("FileSavePath") + "/" + "pengyuan" + "/"; + String fullcardNo="default"; + /*System.out.println("==================pengyuan_af@" + type + "获取数据===================="); String result = getQueryReport(params, type,subjectId); System.err.println(result); System.out.println("==================pengyuan_af@" + type + "获取数据===================="); @@ -175,7 +181,7 @@ public class BeforeApplicationCheckUtil { } String html_data = Sqlca.getString(new SqlObject("select html_data from bigdata_pengyuan_af where id = '" + applyId + "'")); PreparedStatement ps1 = null; - /*if("ExceedTimLlimitApply".equals(FlowNo)&&html_data != null){//如果超期案件再次调用鹏元大数据，并且是save状态 + if("ExceedTimLlimitApply".equals(FlowNo)&&html_data != null){//如果超期案件再次调用鹏元大数据，并且是save状态 ps1 = conn.prepareStatement("update bigdata_pengyuan_af set keyword3 = '"+FlowNo+"' where keyword1 = ? and keyword2 = ?"); ps1.setString(1, CurPage.getParameter("ProjectId")); ps1.setString(2, CurPage.getParameter("CustId")); @@ -183,7 +189,7 @@ public class BeforeApplicationCheckUtil { htmlFile = html_data; if(ps != null) ps1.close(); return htmlFile; - }*/ + } if(html_data != null) { htmlFile = html_data; return htmlFile; @@ -193,7 +199,7 @@ public class BeforeApplicationCheckUtil { e.printStackTrace(); throw new BusinessException(e.getMessage()); } - type = "xml"; + type = "xml";*/ PreparedStatement ps = null; try { ps = conn.prepareStatement("update bigdata_pengyuan_af_log set " + type + "_url = ?, " + type + "_param = ? where apply_id = ?"); @@ -214,29 +220,10 @@ public class BeforeApplicationCheckUtil { String xmlPath = HttpClientUtil.queryReport(xmlResult, type, fileSavePath + "xml" + File.separator + applyId + File.separator); BigDataController.savePengyuanData(applyId, xmlPath, "pengyuan_af", conn); - StringBuffer keyword = new StringBuffer(); - StringBuffer keywordValue = new StringBuffer(); - - /*for(int i = 1; i <= 5; i ++) { - String key = BigDataPropertiesUtil.get("keyword" + i); - String keyValue = CurPage.getParameter(key); - if(key == null || keyValue == null) { - continue; - } - if(keyword.length() != 0) { - keyword.append(","); - keywordValue.append(","); - } - keyword.append("keyword").append(i); - keywordValue.append("'").append(keyValue).append("'"); - } - if("ExceedTimLlimitApply".equals(FlowNo)&&keyword.length() != 0){ - keyword.append(",keyword3"); - keywordValue.append(",'"+FlowNo+"'"); - }*/ + htmlFile = PyHtmlCreate.createHtmlFile(xmlPath, fileSavePath); SqlObject sql = new SqlObject(("insert into bigdata_pengyuan_af (id,keyword1,xml_data,html_data," + "inputuserid,inputorgid,inputtime,fullName,fullcertId,fullphone,fullcardNo) values('" + applyId + "','','" - + xmlResult + "','" + htmlFile.split("@")[1] + "','" +asUser.getUserID() + "','" + asUser.getOrgID()+ "','" + StringFunction.getTodayNow() +"','" + + xmlResult + "','" + htmlFile + "','" +asUser.getUserID() + "','" + asUser.getOrgID()+ "','" + StringFunction.getTodayNow() +"','" +fullname+"','"+fullcertid+"','"+fullPhone+"','"+fullcardNo+"')").replaceAll(":", "△")); sql.setDebugSql(sql.getDebugSql().replaceAll("△", ":")); sql.setOriginalSql(sql.getOriginalSql().replaceAll("△", ":")); @@ -248,6 +235,7 @@ public class BeforeApplicationCheckUtil { System.err.println(insertsql); System.err.println("****************************鹏元大数据************************"); Sqlca.executeSQL(sql); + return checkPengYuanValue(xmlPath); }