diff --git a/WebContent/Tenwa/Comm/Document/DocImageShow.jsp b/WebContent/Tenwa/Comm/Document/DocImageShow.jsp index 33d956a36..53846a16d 100644 --- a/WebContent/Tenwa/Comm/Document/DocImageShow.jsp +++ b/WebContent/Tenwa/Comm/Document/DocImageShow.jsp @@ -29,8 +29,15 @@ border-bottom:1px solid #BCBCBC;} String otherWhere=""; if(type==""){ - BizObject flow=GetFlowAction.getFlowBussinessObject(flowunid);//流程对象 - otherWhere=DocListInitAction.getFlowWhere(flow,"","rela"); + if("BusinessChangeFlow".equals(sObjectType)){ + String ProjectId = Sqlca.getString("SELECT proj_id FROM flow_bussiness_object WHERE flow_unid='"+flowunid+"'"); + otherWhere = " and rela.proj_id='"+ProjectId+"' and (O.objecttype='"+sObjectType+"' or O.objecttype='BusinessApplyFlow')"; + }else{ + BizObject flow=GetFlowAction.getFlowBussinessObject(flowunid);//流程对象 + otherWhere=DocListInitAction.getFlowWhere(flow,"","rela"); + } + //BizObject flow=GetFlowAction.getFlowBussinessObject(flowunid);//流程对象 + //otherWhere=DocListInitAction.getFlowWhere(flow,"","rela"); }else if("proj".equals(type)){ otherWhere=" and rela.proj_id='"+CurPage.getParameter("proj_id")+"'"; }else if("contract".equals(type)){ @@ -39,7 +46,9 @@ border-bottom:1px solid #BCBCBC;} if("query".equals(query)){ otherWhere = otherWhere+" and rela.objecttype in ('BusinessApplyFlow','FundPaymentCarFlow','MortgageFileFlow') "; }else{ - otherWhere = otherWhere+" and rela.objecttype='"+sObjectType+"' "; + if(!"BusinessChangeFlow".equals(sObjectType)){ + otherWhere = otherWhere+" and rela.objecttype='"+sObjectType+"' "; + } } String compClientID = request.getParameter("CompClientID"); String sql="select O.id,lib.doc_name,filename from O left join jbo.app.tenwa.doc.LB_DOCLIBRARY lib on o.library_id=lib.id left join jbo.app.tenwa.doc.LB_DOCRELATIVE rela on lib.relative_id=rela.id"; diff --git a/WebContent/Tenwa/Comm/Document/LBDocumentListInfo.jsp b/WebContent/Tenwa/Comm/Document/LBDocumentListInfo.jsp index c822cf633..9e155ffbc 100644 --- a/WebContent/Tenwa/Comm/Document/LBDocumentListInfo.jsp +++ b/WebContent/Tenwa/Comm/Document/LBDocumentListInfo.jsp @@ -34,8 +34,14 @@ otherWhere = " and O.OBJECTTYPE in ('BusinessApplyFlow','FundPaymentCarFlow','MortgageFileFlow') "; } if(type==""){ - BizObject flow=GetFlowAction.getFlowBussinessObject(flowunid);//流程对象 - otherWhere= otherWhere+DocListInitAction.getFlowWhere(flow,"","O"); + if("BusinessChangeFlow".equals(sObjectType)){ + sTempletNo="ChangeFlowLBDocumentList"; + String ProjectId = Sqlca.getString("SELECT proj_id FROM flow_bussiness_object WHERE flow_unid='"+flowunid+"'"); + otherWhere = " and O.proj_id='"+ProjectId+"' and (O.objecttype='"+sObjectType+"' or O.objecttype='BusinessApplyFlow')"; + }else{ + BizObject flow=GetFlowAction.getFlowBussinessObject(flowunid);//流程对象 + otherWhere= otherWhere+DocListInitAction.getFlowWhere(flow,"","O"); + } //otherWhere=" and O.proj_id='"+proj_id+"' order by O.INPUTTIME DESC"; }else if("proj".equals(type)){ otherWhere= otherWhere+" and O.proj_id='"+proj_id+"' order by O.INPUTTIME DESC"; diff --git a/src_sql/鎶曚骇SQL/V20200206/tft_20200206.sql b/src_sql/鎶曚骇SQL/V20200206/tft_20200206.sql new file mode 100644 index 000000000..c6a14a2cd --- /dev/null +++ b/src_sql/鎶曚骇SQL/V20200206/tft_20200206.sql @@ -0,0 +1,23 @@ +-- 扣款卡信息流程，生成直接扣款委托书添加主体ID和主体名称，已更新生成环境 +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 ('ChangeDebitCardList','1500','1500','1','lci','SUBJECTID','SUBJECTID','String','','主体id','','1','Text','1','1','','','','20','0','0','0','1','0',0,'','','','SYS_Designer','2020/01/19 16:47:07','SYS_Designer','2020/01/19 16:47:07','0','','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 ('ChangeDebitCardList','1570','1570','1','lci','SUBJECTNAME','SUBJECTNAME','String','','主体名称','','1','Text','1','1','','','','100','0','0','0','1','0',0,'','','','SYS_Designer','2020/01/19 16:47:07','SYS_Designer','2020/01/19 16:47:07','0','','1','','','',''); + +-- 业务变更附件一览不显示 +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 ('ChangeFlowLBDocumentList','附件列表',NULL,'30060',NULL,'1','1','default','jbo.app.tenwa.doc.LB_DOCRELATIVE','O,jbo.app.tenwa.doc.LB_DOCLIBRARY lib','O.id=lib.relative_Id and lib.id in (select attr.library_id from jbo.app.tenwa.doc.LB_DOCATTRIBUTE attr ) ','','O.INPUTTIME','',NULL,'SYS_Designer','2020/01/20 09:39:49','SYS_Designer','2020/01/20 09:42:38','','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 ('ChangeFlowLBDocumentList','1000','1000','1','lib','Id','Id','String','','主键','','1','Text','1','1','','','','32','0','0','0','0','0',1,'0','','','SYS_Designer','2020/01/20 09:39:49','SYS_Designer','2020/01/20 09:42:38','0','','0','','','',''); +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 ('ChangeFlowLBDocumentList','1010','1010','1','lib','Doc_Type','Doc_Type','String','','一级分类','','1','Select','1','1','Code','DocList','','32','1','0','0','0','0',0,'','','','SYS_Designer','2020/01/20 09:39:49','SYS_Designer','2020/01/20 09:42:38','0','','0','','','',''); +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 ('ChangeFlowLBDocumentList','1020','1020','1','lib','One_Classify','One_Classify','String','','二级分类','','1','Text','1','1','','','','150','0','0','0','0','0',0,'','','','SYS_Designer','2020/01/20 09:39:49','SYS_Designer','2020/01/20 09:42:38','0','','0','','','',''); +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 ('ChangeFlowLBDocumentList','1030','1030','1','lib','DOC_NAME','DOC_NAME','String','','名称','','1','Text','1','1','','','','100','1','0','0','0','0',0,'','','','SYS_Designer','2020/01/20 09:39:49','SYS_Designer','2020/01/20 09:42:38','0','','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 ('ChangeFlowLBDocumentList','1040','1040','1','lib','REMARK','REMARK','String','','备注','','1','Text','1','1','','','','200','1','0','0','0','0',0,'','','','SYS_Designer','2020/01/20 09:39:49','SYS_Designer','2020/01/20 09:42:38','','','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 ('ChangeFlowLBDocumentList','1050','1050','1','','com.tenwa.doc.cache.DocListCache.getFile(Id)','filelist','String','','附件清单','','1','Text','1','1','','','style={width:600px;}',NULL,'1','0','0','0','0',0,'','','','SYS_Designer','2020/01/20 09:39:49','SYS_Designer','2020/01/20 09:42:38','0','','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 ('ChangeFlowLBDocumentList','1060','1060','1','O','Flow_Unid','Flow_Unid','String','','流程号','','1','Text','1','1','','','','32','0','0','0','0','0',0,'','','','SYS_Designer','2020/01/20 09:39:49','SYS_Designer','2020/01/20 09:42:38','0','','0','','','',''); +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 ('ChangeFlowLBDocumentList','1070','1011','0','','NameManager.getItemName(''DocList'',Doc_Type)','docTypeNmae','String','','一级分类','','1','Select','1','1','Code','getannex','','32','0','0','0','1','1',0,'','','','SYS_Designer','2020/01/20 09:39:49','SYS_Designer','2020/01/20 09:42:38','0','','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 ('ChangeFlowLBDocumentList','1071','1070','1','lib','IS_FILE_LIST','IS_FILE_LIST','String','','是否文件清单','','1','Text','1','1','','','','32','0','0','0','0','0',0,'','','','SYS_Designer','2020/01/20 09:39:49','SYS_Designer','2020/01/20 09:42:38','0','','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 ('ChangeFlowLBDocumentList','1080','1021','1','','NameManager.getItemName(''DocList'',One_Classify)','OneClassifyName','String','','二级分类','','1','Text','1','1','','','','32','1','0','0','0','0',0,'','','','SYS_Designer','2020/01/20 09:39:49','SYS_Designer','2020/01/20 09:42:38','','','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 ('ChangeFlowLBDocumentList','1090','1090','1','O','INPUTORGID','INPUTORGID','String','','创建人所属部门','','1','Text','1','1','','','','32','0','0','0','1','0',0,'','','','SYS_Designer','2020/01/20 09:39:49','SYS_Designer','2020/01/20 09:42:38','0','','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 ('ChangeFlowLBDocumentList','1100','1100','1','O','INPUTTIME','INPUTTIME','String','','创建时间','','1','Text','1','1','','','','32','0','0','0','1','0',0,'','','','SYS_Designer','2020/01/20 09:39:49','SYS_Designer','2020/01/20 09:42:38','0','','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 ('ChangeFlowLBDocumentList','1110','1110','1','O','INPUTUSERID','INPUTUSERID','String','','创建人','','1','Text','1','1','','','','32','0','0','0','1','0',0,'','','','SYS_Designer','2020/01/20 09:39:49','SYS_Designer','2020/01/20 09:42:38','0','','1','','','',''); + + + + diff --git a/src_sql/棰勪骇SQL/v20200206/tft_20200206.sql b/src_sql/棰勪骇SQL/v20200206/tft_20200206.sql deleted file mode 100644 index f06a88c06..000000000 --- a/src_sql/棰勪骇SQL/v20200206/tft_20200206.sql +++ /dev/null @@ -1,3 +0,0 @@ --- 扣款卡信息流程，生成直接扣款委托书添加主体ID和主体名称，已更新生成环境 -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 ('ChangeDebitCardList','1500','1500','1','lci','SUBJECTID','SUBJECTID','String','','主体id','','1','Text','1','1','','','','20','0','0','0','1','0',0,'','','','SYS_Designer','2020/01/19 16:47:07','SYS_Designer','2020/01/19 16:47:07','0','','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 ('ChangeDebitCardList','1570','1570','1','lci','SUBJECTNAME','SUBJECTNAME','String','','主体名称','','1','Text','1','1','','','','100','0','0','0','1','0',0,'','','','SYS_Designer','2020/01/19 16:47:07','SYS_Designer','2020/01/19 16:47:07','0','','1','','','','');