From 98680e7eb683603ab7d96696908bad0cfbb14f02 Mon Sep 17 00:00:00 2001 From: tangfutang Date: Mon, 9 Mar 2020 16:52:12 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=A4=84=E7=BD=AE=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E5=90=88=E5=90=8C=E7=BC=96=E5=8F=B7=E6=98=BE=E7=A4=BA?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Flow/CarManage/CarBid/LcCarBidGroup.jsp | 6 ++--- .../CarEvaluate/LcCarEvaluateGroup.jsp | 4 +-- src_sql/投产SQL/V20200305/tft_20200206.sql | 27 +++++++++++++++++++ 3 files changed, 32 insertions(+), 5 deletions(-) create mode 100644 src_sql/投产SQL/V20200305/tft_20200206.sql diff --git a/WebContent/Tenwa/Lease/Flow/CarManage/CarBid/LcCarBidGroup.jsp b/WebContent/Tenwa/Lease/Flow/CarManage/CarBid/LcCarBidGroup.jsp index 8ffe1f31a..afd489f2f 100644 --- a/WebContent/Tenwa/Lease/Flow/CarManage/CarBid/LcCarBidGroup.jsp +++ b/WebContent/Tenwa/Lease/Flow/CarManage/CarBid/LcCarBidGroup.jsp @@ -17,9 +17,9 @@ String sTempletNo = "LcCarBidGroup";//--Ä£°åºÅ-- ASObjectModel doTemp = new ASObjectModel(sTempletNo); doTemp.setDefaultValue("flowunid", flowunid); - if(null!=ishistory&&ishistory.equals("true") && "ReadOnly".equals(RightType)){ - doTemp.setDataQueryClass("com.tenwa.flow.flowHistory.FlowDataInfoHistory");//Èç¹ûÊÇÀúÊ·ÔòÐÂÏÔʾÀúÊ·Êý¾Ý - } + //if(null!=ishistory&& ishistory.equals("true") && "ReadOnly".equals(RightType)){ + // doTemp.setDataQueryClass("com.tenwa.flow.flowHistory.FlowDataInfoHistory");//Èç¹ûÊÇÀúÊ·ÔòÐÂÏÔʾÀúÊ·Êý¾Ý + // } ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request); dwTemp.Style = "2";//freeform dwTemp.ReadOnly = "1";//Ö»¶Áģʽ diff --git a/WebContent/Tenwa/Lease/Flow/CarManage/CarEvaluate/LcCarEvaluateGroup.jsp b/WebContent/Tenwa/Lease/Flow/CarManage/CarEvaluate/LcCarEvaluateGroup.jsp index 05292ec63..91d2f257c 100644 --- a/WebContent/Tenwa/Lease/Flow/CarManage/CarEvaluate/LcCarEvaluateGroup.jsp +++ b/WebContent/Tenwa/Lease/Flow/CarManage/CarEvaluate/LcCarEvaluateGroup.jsp @@ -17,9 +17,9 @@ String sTempletNo = "LcCarEvaluationGroup";//--Ä£°åºÅ-- ASObjectModel doTemp = new ASObjectModel(sTempletNo); doTemp.setDefaultValue("flowunid", flowunid); - if(null!=ishistory&&ishistory.equals("true") && "ReadOnly".equals(RightType)){ +/* if(null!=ishistory&&ishistory.equals("true") && "ReadOnly".equals(RightType)){ doTemp.setDataQueryClass("com.tenwa.flow.flowHistory.FlowDataInfoHistory");//Èç¹ûÊÇÀúÊ·ÔòÐÂÏÔʾÀúÊ·Êý¾Ý - } + } */ ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request); dwTemp.Style = "2";//freeform //dwTemp.ReadOnly = "-2";//Ö»¶Áģʽ diff --git a/src_sql/投产SQL/V20200305/tft_20200206.sql b/src_sql/投产SQL/V20200305/tft_20200206.sql new file mode 100644 index 000000000..ceae2707b --- /dev/null +++ b/src_sql/投产SQL/V20200305/tft_20200206.sql @@ -0,0 +1,27 @@ +-- ³µÁ¾½ø¼ÛÁ÷³ÌºÏͬ±àºÅÏÔʾ²»ÕýÈ· +DELETE FROM AWE_DO_CATALOG WHERE dono='LcCarBidGroup'; +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 ('LcCarBidGroup','³µÁ¾¾º¼ÛÁбí',null,'30030',null,'1','2','default','jbo.com.tenwa.lease.comm.LC_CAR_EVALUATION_TEMP','O LEFT JOIN jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO lci ON O.contract_id=lci.id','O.flowunid=:FlowUnid','','','',null,'SYS_Designer','2017/09/11 10:12:23','SYS_Designer','2020/03/09 10:26:26','','1',''); +DELETE FROM awe_do_library WHERE dono='LcCarBidGroup' AND colindex='1020'; +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 ('LcCarBidGroup','1020','1020','1','O','CONTRACT_ID','CONTRACT_ID','String','','ÒµÎñºÏͬ±à','','1','Text','1','1','','','','32','0','0','0','1','1',1,'0','0010','','SYS_Designer','2017/09/11 10:12:23','SYS_Designer','2020/03/09 10:28:20','0','','1','','','',''); +DELETE FROM awe_do_library WHERE dono='LcCarBidGroup' AND colindex='1025'; +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 ('LcCarBidGroup','1025','1025','1','lci','CONTRACT_NO','CONTRACT_NO','String','','ÒµÎñºÏͬ±àºÅ','','1','Text','1','1','','','','32','1','0','0','1','0',0,'','0010','','SYS_Designer','2020/03/06 17:53:51','SYS_Designer','2020/03/09 10:26:37','0','','1','','','',''); + + +--³µÁ¾ÆÀ¹ÀÁ÷³ÌºÏͬ±àºÅÏÔʾ²»ÕýÈ· +DELETE FROM AWE_DO_CATALOG WHERE dono='LcCarEvaluationGroup'; +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 ('LcCarEvaluationGroup','³µÁ¾ÆÀ¹ÀÏêÇé',null,'30030',null,'1','2','default','jbo.com.tenwa.lease.comm.LC_CAR_EVALUATION_TEMP','O LEFT JOIN jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO lci ON O.contract_id=lci.id','O.flowunid=:FlowUnid','','','',null,'SYS_Designer','2017/09/08 14:59:02','SYS_Designer','2020/03/09 12:16:24','','1',''); +DELETE FROM awe_do_library WHERE dono='LcCarEvaluationGroup' AND colindex='1020'; +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 ('LcCarEvaluationGroup','1020','1020','1','O','CONTRACT_ID','CONTRACT_ID','String','','ÒµÎñºÏͬ±à','','1','Text','1','1','','','','32','0','0','0','1','1',1,'0','0010','','SYS_Designer','2017/09/08 14:59:02','SYS_Designer','2020/03/09 12:19:46','0','','1','','','',''); +DELETE FROM awe_do_library WHERE dono='LcCarEvaluationGroup' AND colindex='1025'; +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 ('LcCarEvaluationGroup','1025','1025','1','lci','CONTRACT_NO','CONTRACT_NO','String','','ÒµÎñºÏͬ±àºÅ','','1','Text','1','1','','','','32','1','1','0','1','0',0,'','0010','','SYS_Designer','2020/03/09 12:16:39','SYS_Designer','2020/03/09 12:19:40','0','','1','','','',''); +DELETE FROM awe_do_library WHERE dono='LcCarEvaluationGroup' AND colindex='1110'; +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 ('LcCarEvaluationGroup','1110','1110','1','O','REMARKS','REMARKS','String','','±¸×¢','','1','Textarea','1','1','','','style={height:120px; width:780px}','2000','1','0','0','1','1',2,'0','0010','','SYS_Designer','2017/09/08 14:59:02','SYS_Designer','2020/03/09 12:16:24','0','','1','','','',''); + +DELETE FROM awe_do_library WHERE dono='LCCarBid' AND colindex='1160'; +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 ('LCCarBid','1160','1160','1','','com.tenwa.apzl.comm.GetBidPrice.getBidPrice(FRAME_NUMBER)','BID_PRICE','String','','¾º±ê¼Û¸ñ','','1','Text','2','1','','','',null,'1','0','0','1','0',0,'','','','SYS_Designer','2018/08/28 11:25:12','SYS_Designer','2020/03/09 13:31:49','0','','1','','','',''); + +-- ºÏͬ±ä¸üÈ¥µô¡°¸÷·½³ö×âÈË¡±Ò³Ç© +DELETE FROM FLOW_MODEL WHERE FlowNo='BContractApproveFlow' AND PhaseNo='0010'; +insert into `FLOW_MODEL` (`flowno`, `phaseno`, `phasetype`, `phasename`, `phasedescribe`, `phaseattribute`, `prescript`, `initscript`, `choicedescribe`, `choicescript`, `actiondescribe`, `actionscript`, `postscript`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `attribute9`, `attribute10`, `aaenabled`, `aapointinitscript`, `aapointcomp`, `aapointcompurl`, `standardtime1`, `standardtime2`, `costlob`, `strips`, `checklist`, `decisionscript`, `riskscanrule`, `buttonset2`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `distributerule`, `id`, `type`, `name`, `xcoordinate`, `ycoordinate`, `width`, `height`, `version`, `swimlane`, `nodetype`, `flowphasecontext`, `OPINIONSREQUIRED`, `isreadonly`, `flowpageconfig`, `flowprocessclass`, `flowpagecheck`, `backstepnexttype`, `backsteps`, `backscript`, `deletescript`, `phasescript`, `loadproductcheck`, `nextsteps`, `flowtiptype`, `remindnoticttype`, `flowoverdate`, `overnoticetype`, `overnoticeUser`) values('BContractApproveFlow','0010','1010','ºÏͬÖÆ×÷Ìá½»ÉêÇë',NULL,NULL,'!»ù´¡²Ù×÷.ÁªºÏ³Ð×âÈËÕýʽ±í¸´ÖƵ½ÁÙʱ±í(#ObjectNo)+!»ù´¡²Ù×÷.ÉÌÎñÌõ¼þÏîÄ¿²ãµ½ºÏͬÁÙʱ±í(#ObjectNo)+!»ù´¡²Ù×÷.×âÁÞÎï±í´ÓÕýʽµ½ÁÙʱ(#ObjectNo)+!»ù´¡²Ù×÷.Æû³µÒµÎñÏîÄ¿ÐÅÏ¢±íµÄÕýʽ±í¸´ÖƵ½ºÏͬÁÙʱ±í(#ObjectNo)+!»ù´¡²Ù×÷.¿Í»§Ïà¹ØÐÅÏ¢´ÓÏîÄ¿²ãµ½ºÏͬ²ãÕýʽ±íµ½ÁÙʱ±í(#ObjectNo)+!»ù´¡²Ù×÷.ÏîÄ¿»ù±¾ÐÅÏ¢±í´ÓÕýʽµ½ÁÙʱ(#ObjectNo)+!»ù´¡²Ù×÷.¿Û¿î¿¨ÐÅÏ¢´ÓÕýʽ±íµ½ÀúÊ·±í(#ObjectNo)','{#UserID}',NULL,'commroute',NULL,'[{usertype:\"Ö¸¶¨½ÇÉ«\",userinfo:\"401,¾­ÏúÉÌÒµÎñÈËÔ±\"}]','#PhaseOpinion1','closePage,doSubmit,signOpinion',NULL,'all_except','BContractApproveFlow',NULL,NULL,'01',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'449','221','100','50','1',NULL,'TASK',NULL,'Y','N',NULL,'Map paramMap=new HashMap();\r\nparamMap.put(\"calType\", \"cont_process\");\r\nTreeView.AddNodeUrlParamByNode(\"11050\", paramMap);\r\nTreeView.addChildrenNodeByCode(\"¹²Í¬ÉêÇëÈË\", \"11042\");\r\nTreeView.updateNodeName(\"×ÊÁÏÇåµ¥\",\"ÉóÅú×ÊÁÏÇåµ¥\");\r\nTreeView.moveTreeItemToLast(\"ºÏͬÉú³É\");\r\nif(\"03\".equals(fixedParam.get(\"customertype\"))&&\"Electronic\".equals(fixedParam.get(\"signType\"))){\r\nTreeView.addBeforeNodeByCode(\"ºÏͬÉú³É\", \"10990\");\r\nTreeView.moveTreeItemToLast(\"ºÏͬǩԼ\")};\r\nTreeView.updateNodeSetReadOnly(\"¸öÈË»ù±¾ÐÅÏ¢\", \"ReadOnly\");\r\nTreeView.updateNodeSetReadOnly(\"¹²Í¬ÉêÇëÈË\", \"ReadOnly\");\r\nTreeView.updateNodeSetReadOnly(\"ÉÌÎñÌõ¼þ\", \"ReadOnly\");\r\nif(\"0\".equals(fixedParam.get(\"gpsVendor\"))){\r\nTreeView.addLastNodeByCode(\"20190711\");\r\n}','TreeView.deleteCheckItemByCode(\"0016\");\r\nTreeView.deleteCheckItemByCode(\"0018\");\r\nTreeView.deleteCheckItemByCode(\"0020\");\r\nTreeView.deleteCheckItemByCode(\"0029\");\r\nTreeView.deleteCheckItemByCode(\"0031\");\r\nTreeView.deleteCheckItemByCode(\"0032\");\r\nTreeView.deleteCheckItemByCode(\"0039\");\r\nTreeView.deleteCheckItemByCode(\"0021\");\r\nif(!\"null\".equals(fixedParam.get(\"gpsVendor\"))){\r\nTreeView.addProductCheckByModelId(\"0283\");};','backnextstep',NULL,NULL,'TreeView.addDeleteCallBackSql(\"jbo.app.tenwa.doc.LB_DOC_CONTRACT_LIST\",\"delete from O where flow_unid=:FlowUnid and file_flag=\'yes\'\");',NULL,'Y','½áÊø(1000)',NULL,NULL,NULL,NULL,NULL); + +