diff --git a/src/com/amarsoft/app/alarm/DefaultScenarioContextLoader.java b/src/com/amarsoft/app/alarm/DefaultScenarioContextLoader.java index e71155b49..ec8264c9e 100644 --- a/src/com/amarsoft/app/alarm/DefaultScenarioContextLoader.java +++ b/src/com/amarsoft/app/alarm/DefaultScenarioContextLoader.java @@ -203,7 +203,8 @@ public class DefaultScenarioContextLoader extends ScenarioContextLoader{ assert engine != null; //javax.script.Bindings Bindings binding = engine.createBindings(); - binding.put("TreeView",productGroup); + binding.put("TreeView",productGroup); + cparam.put("gpsVendor", flowParams.get("gpsVendor")==null ? "null" : flowParams.get("gpsVendor") ); binding.put("fixedParam", cparam); //如果script文本来自文件,请首先获取文件内容 engine.eval("def setFlowCheckNode(){"+custCheckNode+"}",binding); diff --git a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/data/service/impl/BusinessDataServiceImpl.java b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/data/service/impl/BusinessDataServiceImpl.java index d234fa154..1d91a5aab 100644 --- a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/data/service/impl/BusinessDataServiceImpl.java +++ b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/data/service/impl/BusinessDataServiceImpl.java @@ -177,7 +177,9 @@ public class BusinessDataServiceImpl implements BusinessDataService { if(message==null){ lba.setAttributeValue("pengyuanresult", "Y"); }else{ - message="涉诉或司法被执行"; + if(message.indexOf("$$")<0){ + message="涉诉或司法被执行"; + } lba.setAttributeValue("pengyuanresult", "N"); lba.setAttributeValue("pengyuanreason", message); } diff --git a/src_app_fresh/apx/com/amarsoft/als/user/logon/service/impl/AppUserLoginServiceImpl.java b/src_app_fresh/apx/com/amarsoft/als/user/logon/service/impl/AppUserLoginServiceImpl.java index 457910af0..d1a7d7954 100644 --- a/src_app_fresh/apx/com/amarsoft/als/user/logon/service/impl/AppUserLoginServiceImpl.java +++ b/src_app_fresh/apx/com/amarsoft/als/user/logon/service/impl/AppUserLoginServiceImpl.java @@ -336,7 +336,7 @@ public class AppUserLoginServiceImpl implements AppUserLoginService { private void userLoginBefreBusiness(JBOTransaction tx, String sUserId) throws JBOException { // 强踢已登录设备同ID用户下线 - //SessionHelper.removerByUserId(tx, sUserId); + SessionHelper.removerByUserId(tx, sUserId); } private String getMD5Hex(byte[] buf) { diff --git a/src_sql/鎶曚骇SQL/v20201022/tft_20201022.sql b/src_sql/鎶曚骇SQL/v20201022/tft_20201022.sql index b6451f357..44c2289c3 100644 --- a/src_sql/鎶曚骇SQL/v20201022/tft_20201022.sql +++ b/src_sql/鎶曚骇SQL/v20201022/tft_20201022.sql @@ -10,6 +10,12 @@ delete from awe_do_library where dono='LCEbankTempList' and colindex='1065'; 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 ('LCEbankTempList','1065','1065','1','O','HAD_MONEY','HAD_MONEY','Number','','本次已核销金额','','2','Text','2','3','','','','0','0','0','0','1','1',1,'0','0010','','SYS_Designer','2018/08/26 17:49:22','SYS_Designer','2020/09/28 11:50:54','0','','1','','','',''); +-- 修改资金网银核销页面车架号取值 +delete from AWE_DO_CATALOG where dono='VILCFundPlanListtradition'; +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 ('VILCFundPlanListtradition','资金计划视图表（传统）',null,'30110',null,'1','1','default','jbo.app.tenwa.calc.VI_LC_FUND_PLAN','O left join jbo.com.tenwa.lease.comm.LB_EQUIPMENT_CAR lec on O.contract_id=lec.contract_id and lec.car_attribute=''head''','overmoney>0 and pay_type=''pay_type_in'' and contract_status>20 and contract_status<102 and O.businesstype=:businessType and O.subjectid=:subjectId','','','',null,'SYS_Designer','2018/09/30 11:57:00','SYS_Designer','2020/10/14 14:09:52','','1',''); +delete from awe_do_library where dono='VILCFundPlanListtradition' and colindex='1150'; +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 ('VILCFundPlanListtradition','1150','1150','1','lec','FRAME_NUMBER','FRAME_NUMBER','String','','车架号','','1','Text','1','1','','','',null,'1','0','0','1','1',0,'','','','SYS_Designer','2020/08/29 13:50:24','SYS_Designer','2020/10/14 14:09:52','','','1','','','','Like'); + -- 凯捷结清数据表、催收业务表、结清数据表、用户绑定信息表、归档信息表、档案归档报表新、入池资产报表、逾期租金代偿记录表 已更新 -- ---------------以上生产环境已执行--------------------------------------- @@ -19,7 +25,8 @@ Insert Into Code_Library (codeno,itemno,itemname,bankno,sortno,isinuse,itemdescr Insert Into Code_Library (codeno,itemno,itemname,bankno,sortno,isinuse,itemdescribe,itemattribute,relativecode,attribute1,attribute2,attribute3,attribute4,attribute5,attribute6,attribute7,attribute8,inputuser,inputorg,inputtime,updateuser,updatetime,remark,helptext) Values ('MsgType','Tl_ChangeBusiness','业务变更扣款卡变更通联签约','','0360','1','','','','','','','','','','','','SYS_Designer',null,'2020/09/18 17:49:20','SYS_Designer','2020/09/23 10:23:59','',''); Insert Into Code_Library (codeno,itemno,itemname,bankno,sortno,isinuse,itemdescribe,itemattribute,relativecode,attribute1,attribute2,attribute3,attribute4,attribute5,attribute6,attribute7,attribute8,inputuser,inputorg,inputtime,updateuser,updatetime,remark,helptext) Values ('MsgType','Tl_ChangeContract','合同变更修改扣款卡信息通联签约','','0380','1','','','','','','','','','','','','SYS_Designer',null,'2020/09/23 09:53:33','SYS_Designer','2020/09/23 09:53:33','',''); Insert Into Code_Library (codeno,itemno,itemname,bankno,sortno,isinuse,itemdescribe,itemattribute,relativecode,attribute1,attribute2,attribute3,attribute4,attribute5,attribute6,attribute7,attribute8,inputuser,inputorg,inputtime,updateuser,updatetime,remark,helptext) Values ('MsgType','Tl_MakeContract','合同制作修改扣款卡信息通联签约','','0370','1','','','','','','','','','','','','SYS_Designer',null,'2020/09/23 09:53:33','SYS_Designer','2020/09/23 09:53:33','',''); -Insert Into Code_Library (codeno,itemno,itemname,bankno,sortno,isinuse,itemdescribe,itemattribute,relativecode,attribute1,attribute2,attribute3,attribute4,attribute5,attribute6,attribute7,attribute8,inputuser,inputorg,inputtime,updateuser,updatetime,remark,helptext) Values ('MsgType','Tl_RentAfterChange','起租后扣款卡信息变更通联签约','','0400','1','','','','','','','','','','','','SYS_Designer',null,'2020/10/13 19:01:51','SYS_Designer','2020/10/13 19:01:51','',''); +Insert Into Code_Library (codeno,itemno,itemname,bankno,sortno,isinuse,itemdescribe,itemattribute,relativecode,attribute1,attribute2,attribute3,attribute4,attribute5,attribute6,attribute7,attribute8,inputuser,inputorg,inputtime,updateuser,updatetime,remark,helptext) Values ('MsgType','Tl_AfterRenting','起租后扣款卡信息变更通联签约','','0390','1','','','','','','','','','','','','SYS_Designer',null,'2020/09/23 09:53:33','SYS_Designer','2020/09/23 09:53:33','',''); + -- 创建通联卡扣签约状态历史表 CREATE TABLE `lb_card_sign_status_his` ( id varchar(32) NOT NULL COMMENT 'id', @@ -41,6 +48,30 @@ CREATE TABLE `lb_card_sign_status_his` ( updatetime varchar(32) DEFAULT NULL COMMENT '更新时间' ) ENGINE=InnoDB DEFAULT CHARSET=gbk; +-- app租赁物改成列表不显示 +delete from APP_BUSINESS_GROUP where GROUP_CODE='APP_EquipmentList_Cars'; +insert into `APP_BUSINESS_GROUP` (`GROUP_CODE`, `GROUP_NAME`, `ISLIST`, `GROUP_POSITION`, `GROUP_ENABLE`) values('APP_EquipmentList_Cars','APP租赁物件信息列表','Y','400000','Y'); + +-- 在app租赁物详情页面添加车辆属性字段 +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 ('APP_EquipmentInfo_Cars','1560','1560','1','O','car_attribute','car_attribute','String','','车辆属性','','1','Text','1','1','','','','30','0','0','0','1','0',0,'','','','SYS_Designer','2020/10/16 11:06:21','SYS_Designer','2020/10/16 11:20:38','0','','1','','','',''); +insert into `APP_BUSINESS_TEMPLATE` (`GROUP_CODE`, `DONO`, `COLINDEX`, `SORTNO`, `COLNAME`, `DATA_NAME`, `DATA_CODE`, `ISLIST`, `ISSHOW`, `DATA_POSITION`) values('APP_EquipmentInfo_Cars','APP_EquipmentInfo_Cars','1560','1560','car_attribute','车辆属性','car_attribute','N','Y','1560'); + +-- app业务申请草稿添加客户类型字段 +delete from AWE_DO_CATALOG where dono='AppFLowDefaultStartBusiness'; +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 ('AppFLowDefaultStartBusiness','流程默认发起模板',null,'30070',null,'1','1','default','jbo.sys.FLOW_OBJECT','O LEFT JOIN jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT bo ON O.ObjectNo = bo.flow_unid LEFT JOIN jbo.com.tenwa.lease.comm.LB_PROJECT_INFO_TEMP lpi ON bo.flow_unid = lpi.FLOWUNID LEFT JOIN jbo.com.tenwa.lease.comm.LB_UNION_LESSEE_TEMP cpt ON cpt.FLOWUNID = bo.flow_unid LEFT JOIN jbo.app.tenwa.customer.DISTRIBUTOR_INFO di ON lpi.distributor_id = di.distributor_no LEFT JOIN jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO_TEMP lci ON O.ObjectNo = lci.FLOWUNID LEFT JOIN jbo.sys.FLOW_TASK ft ON ft.objectno=O.objectno and ft.endtime is null LEFT JOIN jbo.prd.PRD_SPECIFIC_LIBRARY ps ON ps.productid=bo.productid LEFT JOIN jbo.app.tenwa.customer.CUSTOMER_INFO_TEMP cit on cit.flowunid=cpt.flowunid','O.applytype=''BusinessApplyApply'' AND O.phasetype=''1010'' AND O.USERID=:USERID','','bo.InputTime DESC','',null,'SYS_Designer','2020/07/16 10:14:49','SYS_Designer','2020/10/16 11:29:15','业务申请草稿','1',''); +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 ('AppFLowDefaultStartBusiness','1390','1390','1','cit','customertype','customertype','String','','客户类型','','1','Text','1','1','','','','20','1','0','0','1','0',0,'','','','SYS_Designer','2020/10/15 18:24:28','SYS_Designer','2020/10/16 11:29:15','','','1','','','',''); + +insert into `APP_BUSINESS_TEMPLATE` (`GROUP_CODE`, `DONO`, `COLINDEX`, `SORTNO`, `COLNAME`, `DATA_NAME`, `DATA_CODE`, `ISLIST`, `ISSHOW`, `DATA_POSITION`) values('AppFLowDefaultStartBusiness','AppFLowDefaultStartBusiness','1390','1390','customertype','客户类型','customertype','Y','Y','1390'); + +-- 修改app租赁物详情页面查询条件 +delete from AWE_DO_CATALOG where dono='APP_EquipmentInfo_Cars'; +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 ('APP_EquipmentInfo_Cars','APP租赁物件信息',null,'30030',null,'1','2','default','jbo.com.tenwa.lease.comm.LB_EQUIPMENT_CAR_TEMP','O','O.id=:id','','','com.amarsoft.awe.dw.handler.impl.CommonHandler',null,'SYS_Designer','2020/06/06 10:21:20','SYS_Designer','2020/10/16 15:40:01','','1',''); + + + + + + diff --git a/src_tenwa/com/tenwa/util/BeforeApplicationCheckUtil.java b/src_tenwa/com/tenwa/util/BeforeApplicationCheckUtil.java index aed1c37e8..029226e4a 100644 --- a/src_tenwa/com/tenwa/util/BeforeApplicationCheckUtil.java +++ b/src_tenwa/com/tenwa/util/BeforeApplicationCheckUtil.java @@ -4,6 +4,7 @@ import java.io.File; import java.sql.Connection; import java.sql.PreparedStatement; import java.util.HashMap; +import java.util.Iterator; import java.util.List; import java.util.Map; @@ -216,6 +217,15 @@ public class BeforeApplicationCheckUtil { System.out.println("==================pengyuan_af@" + type + "获取数据===================="); String xmlResult = getQueryReport(params, type,subjectId); + //String newxml = xmlResult.replaceAll("\\", ""); + Document doc = DocumentHelper.parseText(xmlResult); + Element root = doc.getRootElement();// 指向根节点 + String status = root.elementText("status"); //通过标签名,获取value值 + if("2".equals(status)){ + String message = root.elementText("errorMessage"); + System.out.println("鹏元数据接口调用错误："+message); + return message+"$$"; + } System.out.println("==================pengyuan_af@" + type + "获取数据===================="); String xmlPath = HttpClientUtil.queryReport(xmlResult, type, fileSavePath + "xml" + File.separator + applyId + File.separator);