Browse Source

问题修改

leiyunzhuo 2 days ago
parent
commit
3902813fc2

BIN
libs/sinobestfwcore-0.0.1-SNAPSHOT-upgraded.jar


BIN
libs/sinobestfwcore-0.0.1-SNAPSHOT.jar


BIN
libs/sinobestfwcore-upgraded.jar


+ 20 - 18
pom.xml

@@ -90,24 +90,21 @@
             <artifactId>spring-context-support</artifactId>
         </dependency>
 
-        <!-- 内嵌 Tomcat(WAR 部署时 provided,mvn spring-boot:run 时仍可用)-->
-<!--        <dependency>-->
-<!--            <groupId>org.springframework.boot</groupId>-->
-<!--            <artifactId>spring-boot-starter-tomcat</artifactId>-->
-<!--            <scope>provided</scope>-->
-<!--        </dependency>-->
+        <!-- 内嵌 Tomcat -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-tomcat</artifactId>
+        </dependency>
 
         <!-- JSP 支持 -->
         <dependency>
             <groupId>org.apache.tomcat.embed</groupId>
             <artifactId>tomcat-embed-jasper</artifactId>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
             <version>4.0.1</version>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>javax.servlet.jsp</groupId>
@@ -459,21 +456,21 @@
         </dependency>
 
         <!-- ==================== ASM (Struts2 依赖) ==================== -->
-
+        <!-- 升级到 9.x 以支持 Java 17 -->
         <dependency>
-            <groupId>asm</groupId>
+            <groupId>org.ow2.asm</groupId>
             <artifactId>asm</artifactId>
-            <version>3.3</version>
+            <version>9.7</version>
         </dependency>
         <dependency>
-            <groupId>asm</groupId>
+            <groupId>org.ow2.asm</groupId>
             <artifactId>asm-commons</artifactId>
-            <version>3.3</version>
+            <version>9.7</version>
         </dependency>
         <dependency>
-            <groupId>asm</groupId>
+            <groupId>org.ow2.asm</groupId>
             <artifactId>asm-tree</artifactId>
-            <version>3.3</version>
+            <version>9.7</version>
         </dependency>
 
         <!-- ==================== 其他 ==================== -->
@@ -822,14 +819,19 @@
                 <artifactId>maven-war-plugin</artifactId>
                 <configuration>
                     <failOnMissingWebXml>false</failOnMissingWebXml>
-                    <!-- 将 libs/ 目录下的本地 JAR 复制到 WEB-INF/lib,
-                         因为 system scope 的依赖默认不会被 war 插件打包 -->
                     <webResources>
                         <resource>
                             <directory>${project.basedir}/libs</directory>
                             <targetPath>WEB-INF/lib</targetPath>
                             <includes>
-                                <include>*.jar</include>
+                                <!-- 只复制未声明为 Maven 依赖的 JAR -->
+                                <!-- 其余 system-scope JAR 由 spring-boot-maven-plugin 处理 -->
+                                <include>javax.annotation.jar</include>
+                                <include>javax.ejb.jar</include>
+                                <include>javax.jms.jar</include>
+                                <include>javax.resource.jar</include>
+                                <include>javax.servlet.jar</include>
+                                <include>javax.servlet.jsp.jar</include>
                             </includes>
                         </resource>
                     </webResources>

+ 4 - 1
src/main/java/com/sinobest/boot/ParentClassLoaderStrutsFilter.java

@@ -16,7 +16,10 @@ public class ParentClassLoaderStrutsFilter extends StrutsPrepareAndExecuteFilter
         System.out.println("[StrutsFilter] parent ClassLoader: "
                 + (parentCL != null ? parentCL.getClass().getName() : "null"));
 
-        if (parentCL != null && parentCL instanceof java.net.URLClassLoader) {
+        // Java 17 的 AppClassLoader 不再是 URLClassLoader,
+        // 但仍需要使用它来初始化 Struts2,以便 Convention 插件
+        // 能扫描到 system-scope JAR 中的 Action 类(如 RoleAction)
+        if (parentCL != null) {
             Thread.currentThread().setContextClassLoader(parentCL);
             try {
                 super.init(filterConfig);

+ 1 - 1
src/main/java/com/sinobest/boot/config/YmlDataSourceConfig.java

@@ -55,7 +55,7 @@ public class YmlDataSourceConfig {
         // Quartz 配置
         props.setProperty("org.quartz.jobStore.driverDelegateClass", 
             env.getProperty("org.quartz.jobStore.driverDelegateClass", "org.quartz.impl.jdbcjobstore.StdJDBCDelegate"));
-        
+            
         return props;
     }
 }

+ 3 - 3
src/main/resources/application.yml

@@ -58,12 +58,12 @@ hibernate:
   format_sql: false
   use_sql_comments: false
 
-# 框架方言
+# 框架方言(达梦数据库使用 DmDialect,修复分页 SQL 整数溢出)
 ds:
-  dialect: cn.sinobest.framework.comm.dialect.OracleDialect
+  dialect: cn.sinobest.framework.comm.dialect.DmDialect
 
 ds2:
-  dialect: cn.sinobest.framework.comm.dialect.OracleDialect
+  dialect: cn.sinobest.framework.comm.dialect.DmDialect
 
 # Quartz 配置
 org:

+ 80 - 0
src/main/resources/structs-addon.xml

@@ -101,4 +101,84 @@
             <result name="q">/jsp/sysmngr/web/wf/wf_q.jsp</result>
         </action>
     </package>
+    
+    <!-- 事业单位管理 - 通用查询 -->
+    <package name="sydwgl_comm_cx" extends="default" namespace="/sydwgl/web/comm/cx">
+        <action name="cx" class="cn.sinobest.sydwgl.web.comm.cx.CxAction">
+            <result name="q">/jsp/sydwgl/web/comm/cx/cx_q.jsp</result>
+            <result name="fjsc_m">/jsp/sydwgl/web/comm/fjsc/fjsc_m.jsp</result>
+        </action>
+    </package>
+    
+    <!-- 事业单位管理 - 单位人员管理查询 -->
+    <package name="sydwgl_dwrygl_cx" extends="default" namespace="/sydwgl/web/dwrygl/cx">
+        <action name="cx" class="cn.sinobest.sydwgl.web.dwrygl.cx.CxAction">
+            <result name="dwrygl_sy">/jsp/sydwgl/web/dwrygl/cx/sydwxx_m.jsp</result>
+        </action>
+    </package>
+    
+    <!-- 事业单位管理 - 岗位聘用结果认定 -->
+    <package name="sydwgl_gwpyjgrd" extends="default" namespace="/sydwgl/web/gwpyjgrd">
+        <action name="gwpyjgrd" class="cn.sinobest.sydwgl.web.gwpyjgrd.GwpyjgrdAction">
+            <result name="m">/jsp/sydwgl/web/gwpyjgrd/gwpyjgrd_m.jsp</result>
+            <result name="i">/jsp/sydwgl/web/gwpyjgrd/gwpyjgrd_i.jsp</result>
+            <result name="gwpyjgrd_dr">/jsp/sydwgl/web/gwpyjgrd/gwpyjgrd_ryxxdr.jsp</result>
+            <result name="gwpyjgrd_swap">/jsp/sydwgl/web/gwpyjgrd/gwpyjgrd_swap.jsp</result>
+        </action>
+    </package>
+    
+    <!-- 事业单位管理 - 岗位设置方案汇总 -->
+    <package name="sydwgl_gwszfahz" extends="default" namespace="/sydwgl/web/gwszfahz">
+        <action name="gwszfahz" class="cn.sinobest.sydwgl.web.gwszfahz.GwszfahzAction">
+            <result name="m">/jsp/sydwgl/web/gwszfahz/gwszfahz_m.jsp</result>
+        </action>
+    </package>
+    
+    <!-- 事业单位管理 - 事业单位人员调动 -->
+    <package name="sydwgl_sydwrydd" extends="default" namespace="/sydwgl/web/sydwrydd">
+        <action name="sydwrydd" class="cn.sinobest.sydwgl.web.sydwrydd.SydwryddAction">
+            <result name="m">/jsp/sydwgl/web/sydwrydd/sydwrydd_m.jsp</result>
+            <result name="i">/jsp/sydwgl/web/sydwrydd/sydwrydd_i.jsp</result>
+        </action>
+    </package>
+    
+    <!-- 事业单位管理 - 政策性安置人员聘用 -->
+    <package name="sydwgl_zcxazryyp" extends="default" namespace="/sydwgl/web/zcxazryyp">
+        <action name="zcxazryyp" class="cn.sinobest.sydwgl.web.zcxazryyp.ZcxazryypAction">
+            <result name="m">/jsp/sydwgl/web/zcxazryyp/zcxazryyp_m.jsp</result>
+            <result name="i">/jsp/sydwgl/web/zcxazryyp/zcxazryyp_i.jsp</result>
+        </action>
+    </package>
+    
+    <!-- 工作日管理模块 -->
+    <package name="appcomm_gzrgl" extends="default" namespace="/appcomm/web/gzrgl">
+        <action name="gzrgl" class="cn.sinobest.appcomm.web.gzrgl.GzrglAction">
+            <result name="q">/jsp/appcomm/web/gzrgl/gzrgl_q.jsp</result>
+            <result name="toQuery">/jsp/appcomm/web/gzrgl/gzrgl_q.jsp</result>
+        </action>
+    </package>
+
+    <!-- 常见问题管理模块 -->
+    <package name="appcomm_cjwt" extends="default" namespace="/appcomm/web/cjwt">
+        <action name="cjwtwh" class="cn.sinobest.appcomm.web.cjwt.CjwtwhAction">
+            <result name="q">/jsp/appcomm/web/cjwt/cjwtwh_q.jsp</result>
+            <result name="toQuery">/jsp/appcomm/web/cjwt/cjwtwh_q.jsp</result>
+            <result name="m">/jsp/appcomm/web/cjwt/cjwtwh_m.jsp</result>
+            <result name="sy">/jsp/appcomm/web/cjwt/cjwtwh_sy.jsp</result>
+        </action>
+    </package>
+
+    <!-- 常用批注管理模块 -->
+    <package name="appcomm_cypz" extends="default" namespace="/appcomm/web/cypz">
+        <action name="cypzwh" class="cn.sinobest.appcomm.web.cypz.CypzwhAction">
+            <result name="m">/jsp/appcomm/web/cypz/cypzwh_m.jsp</result>
+            <result name="fdj">/jsp/appcomm/web/cypz/cypzwh_fdj.jsp</result>
+        </action>
+    </package>
+
+    <!-- 附件上传模块 -->
+    <package name="appcomm_attachmentupload" extends="default" namespace="/appcomm/web/attachmentupload">
+        <action name="attachmentUpload" class="cn.sinobest.appcomm.web.attachmentupload.AttachmentUploadAction">
+        </action>
+    </package>
 </struts>

File diff suppressed because it is too large
+ 6 - 5
src/main/resources/struts.xml


+ 3 - 3
src/main/resources/sysconfig.properties

@@ -23,9 +23,9 @@ hibernate.jdbc.batch_size=20
 hibernate.order_inserts=true
 hibernate.order_updates=true
 
-# 框架方言
-ds.dialect=cn.sinobest.framework.comm.dialect.OracleDialect
-ds2.dialect=cn.sinobest.framework.comm.dialect.OracleDialect
+# 框架方言(达梦数据库使用 DmDialect,修复分页 SQL 整数溢出)
+ds.dialect=cn.sinobest.framework.comm.dialect.DmDialect
+ds2.dialect=cn.sinobest.framework.comm.dialect.DmDialect
 
 # quartz 设置
 org.quartz.jobStore.driverDelegateClass=org.quartz.impl.jdbcjobstore.StdJDBCDelegate

BIN
src/main/webapp/FileUploadApplet.class


+ 0 - 13
src/main/webapp/V5.0.257766(new)_Alpha_P01.txt

@@ -1,13 +0,0 @@
-解决问题:
-【优化】CFW.oComm.fnUploadAttach(ywbh,ywlb,uploadType,uploadService,uploadPath)增加一个附件个数入参,限制只能上传N个附件或者不限制附件个数,默认不限制。
-【优化】使用的是BEA007作为主键删除,而不是ZLID。导致下载和删除功能报错。点击“关闭”按钮,无响应。
-【优化】4474 框架会拦截只让显示200条。 现申请将框架拦截设置为最大显示500条,请审核。
-【优化】日期控件s,t,m 分支没有定义compValue 报错。
-【新增】新增多记录标签jqglt,整合了JQGRID;具体使用方法见wiki:http://gs-wiki.hnisi.com.cn/pages/viewpage.action?pageId=155813614
-
-
-【更新步骤】
-1、先备份好整个web目录
-2、然后再覆盖web目录
-3、执行batch脚本
-4、重启服务器

+ 0 - 12
src/main/webapp/V5.0.257766_Alpha_P02.txt

@@ -1,12 +0,0 @@
-解决问题:
-【优化】websphere下部署时,需要修改axis2.XML的属性,放在这里,无法读到axis2.XML。现迁移到WEB-INF/conf下
-【优化】BUG #5095 单记录表格标签字典项配置在app.dictMode=localstorage模式下不支持subcode配置进行字典项过滤 
-【优化】必录项里面有值,还是会提示不能为空
-
-
-
-【更新步骤】
-1、先备份好整个web目录
-2、然后再覆盖web目录
-3、执行batch脚本
-4、重启服务器

+ 0 - 16
src/main/webapp/V5.0.257766_Alpha_P03.txt

@@ -1,16 +0,0 @@
-解决问题:
-【优化】15570 弹出页面样式优化 $('').fwwindow根据页面居中,导致当页面过长时需要拖滚动条到中间才能看到,希望能改到根据窗口居中
-【优化】16565 JS文件调整后,由于客户端使用缓存的JS文件导致功能异常,希望框架层面解决版本更新后客户端缓存问题。
-         sysconfig.xml中配置属性:
-#是否让浏览器缓存。为false时,浏览器不缓存,每次都从服务器获取最新文件
-CacheFilter.Enabled=true
-前端引入JS时,增加版本号参数v=${deployVersion}
-例:<script  src="${ctx}/js/comm/lib/jquery.js?v=${deployVersion}" language="JavaScript" type="text/javascript"></script>
-
-
-【更新步骤】
-1、先备份好整个web目录
-2、然后再覆盖web目录
-3.删除lib下jar:xmlParserAPIs-2.6.0.jar 
-4、执行batch脚本
-5、重启服务器

+ 0 - 12
src/main/webapp/V5.0.257766_Alpha_P04.txt

@@ -1,12 +0,0 @@
-解决问题:
-【优化】16824 谷歌浏览器界面会显示多余的滚动条 
-【优化】16815 单记录表内部的组件宽度逐渐自动变长 
-【优化】16975 某些项目是把页面嵌入在门户的iframe里面,iframe的名字不是workspace,而是不确定的,导致调用CFW.oWin.fnAlertStyle时报错 
-【优化】17016 优化框架多记录列表的分页实现方式,提高列表的性能;
-       多记录表改成先展示数据,在发请求查询总数;多记录表fw_genlist_conf attr增加属性配置:isAsycCount=true (是否异步加载总数)默认保持原状
-
-【更新步骤】
-1、先备份好整个web目录
-2、然后再覆盖web目录
-3、执行batch脚本
-4、重启服务器

+ 0 - 17
src/main/webapp/V5.0.257766_Alpha_P05.txt

@@ -1,17 +0,0 @@
-解决问题:
-【优化】bug[7198]当同一JSP页面显示两个多记录表单,并且两个都配置跨页全选的时候,第二个多记录表无法获取到全选的ID值;
-【优化】bug[7434]多记录表配置设置宽度后,前台页面展示未按设置的宽度生效;
-【优化】TOKEN_CACHE MAP增加num配置 ,SYSCONFIG.PROPERTIES 增加配置项:MAX_TOKEN_CACHE_NUM=5 默认是5
-【优化】SecurityInfo.java数据转换异常,AAB001 为08003会自动转换为8003,导致异常修改
-【优化】17679 工具类Util使用maptobean方法,如果bean中含非字符串类型的:如boolean
-【优化】17694 核三框架执行存储过程SbywPubService.doProcedure,没有正确抛出后台异常信息
-【优化】17786 日志输出异常处理;XSS拦截异常处理;
-
-【更新步骤】
-1、先备份好整个web目录
-2、然后再覆盖web目录
-3.本补丁中包含部分系统管理修改内容,因此更新时请注意
-如果是使用源码维护系统管理模块,请先将src文件夹下的java文件编译到classes目录下,然后删除web/WEB-INF/lib中的sinobestfwsys-0.0.1-SNAPSHOT.jar包。
-如果使用框架jar包维护系统管理模块无需更改直接覆盖web文件夹
-4、执行batch脚本
-5、重启服务器

+ 0 - 8
src/main/webapp/V5.0.257766_Alpha_P06.txt

@@ -1,8 +0,0 @@
-解决问题:
-【优化】在基于jsp配置多记录表配置dataService查询时,对应的Service中getCount(IDTO dto)方法获取不到WHERECLS
-
-【更新步骤】
-1、先备份好整个web目录
-2、然后再覆盖web目录
-3、执行batch脚本
-4、重启服务器

+ 0 - 8
src/main/webapp/V5.0.257766_Alpha_P07.txt

@@ -1,8 +0,0 @@
-解决问题:
-【优化】4262 对字典项下拉框控件使用.fwcombox('filter',rows)过滤字典项不生效
-
-【更新步骤】
-1、先备份好整个web目录
-2、然后再覆盖web目录
-3、执行batch脚本
-4、重启服务器

+ 0 - 8
src/main/webapp/V5.0.257766_Alpha_P08.txt

@@ -1,8 +0,0 @@
-解决问题:
-【优化】文件下载压缩时文件名乱码修改
-
-【更新步骤】
-1、先备份好整个web目录
-2、然后再覆盖web目录
-3、执行batch脚本
-4、重启服务器

+ 0 - 8
src/main/webapp/V5.0.257766_Alpha_P09.txt

@@ -1,8 +0,0 @@
-解决问题:
-【新增】EXCEL导出增加属性自定义导出最大长度。
-
-【更新步骤】
-1、先备份好整个web目录
-2、然后再覆盖web目录
-3、执行batch脚本
-4、重启服务器

BIN
src/main/webapp/WEB-INF/cn/sinobest/framework/service/tags/GtService.class


BIN
src/main/webapp/fastjson-1.2.22.jar


+ 1 - 1
src/main/webapp/jsp/sydwgl/web/sydwrydd/sydwrydd_m.jsp

@@ -95,7 +95,7 @@ response.flushBuffer();%>
 		<input type="hidden" name="hashWhereCls" value="" id="hashWhereCls7">
 		<input type="hidden" name="hashWhereCls" value="" id="hashWhereCls8">
 	</form>
-<script src="${ctx}/jsp/sydwgl/web/zcxazryyp/zcxazryyp_m.js"></script> 
+<script src="${ctx}/static/sydwgl/zcxazryyp_m.js"></script> 
 <script src="${ctx}/jsp/appcomm/txmPrint/LodopFuncs.js"></script>
 <script type="text/javascript">
 	//声明全局变量

+ 0 - 388
src/main/webapp/jsp/sydwgl/web/zcxazryyp/zcxazryyp_m.js

@@ -1,388 +0,0 @@
-
-//打印
-function doPrint(RSDDID,YWLSH,flag){	
-	var mParams={
-		RSDDID:RSDDID,
-		YWLSH:YWLSH
-	};
-
-	CFW.oAJax.doService("sydwglZcxazryypService.zcxazryypPrintGetData", mParams, '正在处理中...',
-        function(mData) {
-
-			if(flag == "0"){
-				printRsdd(mData[0],0);
-			}else if(flag == "1"){
-				printRsdd(mData[0],1);
-			}else if(flag == "2"){
-				printFirstTimeCE(mData[0]);
-			}else if(flag == "3"){
-				printFirstTimeQE(mData[0]);
-			}
-								
-        }
-    );
-
-
-}
-
-//打印调动差额全额
-function printRsdd(data,flag){
-	
-	var KYYJ = data.KYYJ==null?"":data.KYYJ;
-	var KYNAME="";
-	var KYTIME="";
-	if(!CFW.oValid.fnIsNull(KYYJ)){
-		KYNAME="  审核人:"+data.KYNAME;
-		var sj=data.KYTIME==null?"":data.KYTIME;
-		KYTIME="经办时间:"+sj;
-	}
-	
-	var KZYJ = data.KZYJ==null?"":data.KZYJ;
-	var KZNAME="";
-	var KZTIME="";
-	if(!CFW.oValid.fnIsNull(KZYJ)){
-		KZNAME="  审核人:"+data.KZNAME;
-		var sj=data.KZTIME==null?"":data.KZTIME;
-		KZTIME="经办时间:"+sj;
-	}
-	
-	var FGLDYJ = data.FGLDYJ==null?"":data.FGLDYJ;
-	var FGLDNAME="";
-	var FGLDTIME="";
-	if(!CFW.oValid.fnIsNull(FGLDYJ)){
-		FGLDNAME="  审核人:"+data.FGLDNAME;		
-		var sj=data.FGLDTIME==null?"":data.FGLDTIME;
-		FGLDTIME="经办时间:"+sj;
-	}
-	
-	var JZYJ = data.JZYJ==null?"":data.JZYJ;
-	var JZNAME="";
-	var JZTIME="";
-	if(!CFW.oValid.fnIsNull(JZYJ)){
-		JZNAME="  审核人:"+data.JZNAME;
-		var sj=data.JZTIME==null?"":data.JZTIME;
-		JZTIME="经办时间:"+sj;
-	}
-
-	LODOP=getLodop(); 
-	//未安装或启动打印控件
-	if (!LODOP) {
-		CFW.oWin.fnAlert("LODOP打印控件未安装或未启动,请检查!");
-		return;
-	}
-	LODOP.PRINT_INIT("");
-
-	LODOP.PRINT_INITA(0,0,794,1122,"");
-	if(flag == 0){
-		LODOP.ADD_PRINT_SETUP_BKIMG("<img border='0' src='"+ryxxForm.ctx.value+"/template/sydwgl/44/sydwgl_sydwryddgl_sydwrydd_cedc.jpg'>");//背景图
-	}else{
-		LODOP.ADD_PRINT_SETUP_BKIMG("<img border='0' src='"+ryxxForm.ctx.value+"/template/sydwgl/44/sydwgl_sydwryddgl_sydwrydd_qedc.jpg'>");//背景图
-	}
-
-	LODOP.ADD_PRINT_TEXT(117,69,212,23,data.DZH);
-	LODOP.SET_PRINT_STYLEA(0,"FontName","黑体");
-	LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-	LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
-	LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-	
-	
-	LODOP.ADD_PRINT_TEXT(146,176,100,26,data.DDXM);
-	LODOP.SET_PRINT_STYLEA(0,"FontSize",11);
-	LODOP.ADD_PRINT_TEXT(146,349,64,29,data.XB);
-	LODOP.SET_PRINT_STYLEA(0,"FontSize",11);
-	LODOP.ADD_PRINT_TEXT(146,492,95,30,data.CSRQ);
-	LODOP.SET_PRINT_STYLEA(0,"FontSize",11);
-	LODOP.ADD_PRINT_TEXT(146,656,116,30,data.ZZSF);
-	LODOP.SET_PRINT_STYLEA(0,"FontSize",11);
-	LODOP.ADD_PRINT_TEXT(179,250,161,55,data.JYXLJZY);
-	LODOP.SET_PRINT_STYLEA(0,"FontSize",11);
-	LODOP.ADD_PRINT_TEXT(179,572,163,52,data.JYBYYXJSJ);
-	LODOP.SET_PRINT_STYLEA(0,"FontSize",11);
-	LODOP.ADD_PRINT_TEXT(235,250,163,61,data.ZGXLJZY);
-	LODOP.SET_PRINT_STYLEA(0,"FontSize",11);
-	LODOP.ADD_PRINT_TEXT(235,572,163,61,data.ZGBYYXJSJ);
-	LODOP.SET_PRINT_STYLEA(0,"FontSize",11);
-	LODOP.ADD_PRINT_TEXT(296,250,100,25,data.CJGZSJ);
-	LODOP.SET_PRINT_STYLEA(0,"FontSize",11);
-	LODOP.ADD_PRINT_TEXT(296,410,100,20,data.ZZSJ);
-	LODOP.SET_PRINT_STYLEA(0,"FontSize",11);
-	LODOP.ADD_PRINT_TEXT(296,575,202,30,data.JSZC);
-	LODOP.SET_PRINT_STYLEA(0,"FontSize",11);
-	LODOP.ADD_PRINT_TEXT(322,250,250,36,data.YGZDW);
-	LODOP.SET_PRINT_STYLEA(0,"FontSize",11);
-	LODOP.ADD_PRINT_TEXT(329,575,161,27,data.YGWDJ);
-	LODOP.SET_PRINT_STYLEA(0,"FontSize",11);
-	LODOP.ADD_PRINT_TEXT(361,250,253,29,data.NPYDW);
-	LODOP.SET_PRINT_STYLEA(0,"FontSize",11);
-	LODOP.ADD_PRINT_TEXT(365,575,164,26,data.NGWDJ);
-	LODOP.SET_PRINT_STYLEA(0,"FontSize",11);
-	LODOP.ADD_PRINT_TEXT(403,252,480,45,data.DDLY);
-	LODOP.SET_PRINT_STYLEA(0,"FontSize",11);	
-	
-	if(flag == 0){
-		LODOP.ADD_PRINT_TEXT(443,122,601,200,KYYJ);
-		LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
-		LODOP.SET_PRINT_STYLEA(0,"LineSpacing",5);
-		LODOP.ADD_PRINT_TEXT(669,447,269,28,KYNAME);
-		LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
-		LODOP.ADD_PRINT_TEXT(694,447,269,28,KYTIME);
-		LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
-	}else{
-		LODOP.ADD_PRINT_TEXT(443,122,601,180,KYYJ);
-		LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
-		LODOP.SET_PRINT_STYLEA(0,"LineSpacing",5);
-		LODOP.ADD_PRINT_TEXT(640,447,269,28,KYNAME);
-		LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
-		LODOP.ADD_PRINT_TEXT(660,447,269,28,KYTIME);
-		LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
-	}
-
-	if(flag == 0){
-		LODOP.ADD_PRINT_TEXT(760,80,642,42,KZYJ);
-		LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
-		LODOP.SET_PRINT_STYLEA(0,"LineSpacing",5);
-		LODOP.ADD_PRINT_TEXT(786,449,269,28,KZNAME);
-		LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
-		LODOP.ADD_PRINT_TEXT(806,449,269,28,KZTIME);
-		LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
-		
-	}else{
-		LODOP.ADD_PRINT_TEXT(687,220,642,42,KZYJ);
-		LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
-		LODOP.SET_PRINT_STYLEA(0,"LineSpacing",5);
-		LODOP.ADD_PRINT_TEXT(726,449,269,28,KZNAME);
-		LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
-		LODOP.ADD_PRINT_TEXT(746,449,269,28,KZTIME);
-		LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
-	}
-		
-
-	
-	if(flag == 0){
-		LODOP.ADD_PRINT_TEXT(868,81,639,83,FGLDYJ);
-		LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
-		LODOP.SET_PRINT_STYLEA(0,"LineSpacing",5);
-		LODOP.ADD_PRINT_TEXT(940,451,269,28,FGLDNAME);
-		LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
-		LODOP.ADD_PRINT_TEXT(965,451,269,28,FGLDTIME);
-		LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
-	}else{
-		LODOP.ADD_PRINT_TEXT(770,220,639,83,FGLDYJ);
-		LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
-		LODOP.SET_PRINT_STYLEA(0,"LineSpacing",5);
-		LODOP.ADD_PRINT_TEXT(825,451,269,28,FGLDNAME);
-		LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
-		LODOP.ADD_PRINT_TEXT(845,451,269,28,FGLDTIME);
-		LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
-	}
-
-	
-	if(flag != 0){
-		LODOP.ADD_PRINT_TEXT(875,220,639,83,JZYJ);
-		LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
-		LODOP.SET_PRINT_STYLEA(0,"LineSpacing",5);
-		LODOP.ADD_PRINT_TEXT(960,451,269,28,JZNAME);
-		LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
-		LODOP.ADD_PRINT_TEXT(980,451,269,28,JZTIME);
-		LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
-	}
-
- 	LODOP.SET_SHOW_MODE("BKIMG_PRINT",1);//打印包含背景图 
- 	//LODOP.PRINT_DESIGN();
- 	LODOP.PREVIEW();
-}
-
-//打印首次差额
-function printFirstTimeCE(data){
-	
-	var bt1="关于免于公开招聘聘用"+data.XM+"同志";
-	var bt2="为"+data.DW+"工作人员的请示";
-	
-	var KYYJ = data.KYYJ==null?"":data.KYYJ;
-	var KYNAME="";
-	var KYTIME="";
-	if(!CFW.oValid.fnIsNull(KYYJ)){
-		KYNAME="  审核人:"+data.KYNAME;
-		var sj=data.KYTIME==null?"":data.KYTIME;
-		KYTIME="经办时间:"+sj;
-	}
-	
-	var KZYJ = data.KZYJ==null?"":data.KZYJ;
-	var KZNAME="";
-	var KZTIME="";
-	if(!CFW.oValid.fnIsNull(KZYJ)){
-		KZNAME="  审核人:"+data.KZNAME;
-		var sj=data.KZTIME==null?"":data.KZTIME;
-		KZTIME="经办时间:"+sj;
-	}
-	
-	var FGLDYJ = data.FGLDYJ==null?"":data.FGLDYJ;
-	var FGLDNAME="";
-	var FGLDTIME="";
-	if(!CFW.oValid.fnIsNull(FGLDYJ)){
-		FGLDNAME="  审核人:"+data.FGLDNAME;
-		var sj=data.FGLDTIME==null?"":data.FGLDTIME;
-		FGLDTIME="经办时间:"+sj;
-	}
-	
-	var JZYJ = data.JZYJ==null?"":data.JZYJ;
-	var JZNAME="";
-	var JZTIME="";
-	if(!CFW.oValid.fnIsNull(JZYJ)){
-		JZNAME="  审核人:"+data.JZNAME;
-		var sj=data.JZTIME==null?"":data.JZTIME;
-		JZTIME="经办时间:"+sj;
-	}
-
-	LODOP=getLodop(); 
-	//未安装或启动打印控件
-	if (!LODOP) {
-		CFW.oWin.fnAlert("LODOP打印控件未安装或未启动,请检查!");
-		return;
-	}
-	LODOP.PRINT_INIT("");
-
-	LODOP.PRINT_INITA(0,0,794,1122,"");
-	
-	LODOP.ADD_PRINT_SETUP_BKIMG("<img border='0' src='"+ryxxForm.ctx.value+"/template/sydwgl/44/sydwgl_zcxazryypgl_zcxazryyp_cesc.jpg'>");//背景图
-
-	LODOP.ADD_PRINT_TEXT(170,155,561,35,bt1);
-	LODOP.SET_PRINT_STYLEA(0,"FontName","黑体");
-	LODOP.SET_PRINT_STYLEA(0,"FontSize",16);
-	LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
-	LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-	LODOP.ADD_PRINT_TEXT(200,155,561,35,bt2);
-	LODOP.SET_PRINT_STYLEA(0,"FontName","黑体");
-	LODOP.SET_PRINT_STYLEA(0,"FontSize",16);
-	LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
-	LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-	
-	LODOP.ADD_PRINT_TEXT(255,166,537,321,KYYJ);
-	LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
-	LODOP.SET_PRINT_STYLEA(0,"LineSpacing",5);
-	LODOP.ADD_PRINT_TEXT(575,451,269,28,KYNAME);
-	LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
-	LODOP.ADD_PRINT_TEXT(605,451,269,28,KYTIME);
-	LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
-	
-	LODOP.ADD_PRINT_TEXT(655,166,537,71,KZYJ);
-	LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
-	LODOP.SET_PRINT_STYLEA(0,"LineSpacing",5);
-	LODOP.ADD_PRINT_TEXT(725,451,269,28,KZNAME);
-	LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
-	LODOP.ADD_PRINT_TEXT(755,451,269,28,KZTIME);
-	LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
-	
-	LODOP.ADD_PRINT_TEXT(805,166,537,163,FGLDYJ);
-	LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
-	LODOP.SET_PRINT_STYLEA(0,"LineSpacing",5);
-	LODOP.ADD_PRINT_TEXT(965,451,269,28,FGLDNAME);
-	LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
-	LODOP.ADD_PRINT_TEXT(995,451,269,28,FGLDTIME);
-	LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
-
- 	LODOP.SET_SHOW_MODE("BKIMG_PRINT",1);//打印包含背景图 
- 	//LODOP.PRINT_DESIGN();
-	LODOP.PREVIEW();
-}
-//打印首次全额
-function printFirstTimeQE(data){
-	
-	var bt1="关于免于公开招聘聘用"+data.XM+"同志";
-	var bt2="为"+data.DW+"工作人员的请示";
-	
-	var KYYJ = data.KYYJ==null?"":data.KYYJ;
-	var KYNAME="";
-	var KYTIME="";
-	if(!CFW.oValid.fnIsNull(KYYJ)){
-		KYNAME="  审核人:"+data.KYNAME;
-		var sj=data.KYTIME==null?"":data.KYTIME;
-		KYTIME="经办时间:"+sj;
-	}
-	
-	var KZYJ = data.KZYJ==null?"":data.KZYJ;
-	var KZNAME="";
-	var KZTIME="";
-	if(!CFW.oValid.fnIsNull(KZYJ)){
-		KZNAME="  审核人:"+data.KZNAME;
-		var sj=data.KZTIME==null?"":data.KZTIME;
-		KZTIME="经办时间:"+sj;
-	}
-	
-	var FGLDYJ = data.FGLDYJ==null?"":data.FGLDYJ;
-	var FGLDNAME="";
-	var FGLDTIME="";
-	if(!CFW.oValid.fnIsNull(FGLDYJ)){
-		FGLDNAME="  审核人:"+data.FGLDNAME;
-		var sj=data.FGLDTIME==null?"":data.FGLDTIME;
-		FGLDTIME="经办时间:"+sj;
-	}
-	
-	var JZYJ = data.JZYJ==null?"":data.JZYJ;
-	var JZNAME="";
-	var JZTIME="";
-	if(!CFW.oValid.fnIsNull(JZYJ)){
-		JZNAME="  审核人:"+data.JZNAME;
-		var sj=data.JZTIME==null?"":data.JZTIME;
-		JZTIME="经办时间:"+sj;
-	}
-
-	LODOP=getLodop(); 
-	//未安装或启动打印控件
-	if (!LODOP) {
-		CFW.oWin.fnAlert("LODOP打印控件未安装或未启动,请检查!");
-		return;
-	}
-	LODOP.PRINT_INIT("");
-
-	LODOP.PRINT_INITA(0,0,794,1122,"");
-	
-	LODOP.ADD_PRINT_SETUP_BKIMG("<img border='0' src='"+ryxxForm.ctx.value+"/template/sydwgl/44/sydwgl_zcxazryypgl_zcxazryyp_qesc.jpg'>");//背景图
-
-	LODOP.ADD_PRINT_TEXT(170,155,561,35,bt1);
-	LODOP.SET_PRINT_STYLEA(0,"FontName","黑体");
-	LODOP.SET_PRINT_STYLEA(0,"FontSize",16);
-	LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
-	LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-	LODOP.ADD_PRINT_TEXT(200,155,561,35,bt2);
-	LODOP.SET_PRINT_STYLEA(0,"FontName","黑体");
-	LODOP.SET_PRINT_STYLEA(0,"FontSize",16);
-	LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
-	LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-	
-	LODOP.ADD_PRINT_TEXT(255,166,537,206,KYYJ);
-	LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
-	LODOP.SET_PRINT_STYLEA(0,"LineSpacing",5);
-	LODOP.ADD_PRINT_TEXT(475,451,269,28,KYNAME);
-	LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
-	LODOP.ADD_PRINT_TEXT(500,451,269,28,KYTIME);
-	LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
-	
-	LODOP.ADD_PRINT_TEXT(530,166,537,74,KZYJ);
-	LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
-	LODOP.SET_PRINT_STYLEA(0,"LineSpacing",5);
-	LODOP.ADD_PRINT_TEXT(605,451,269,28,KZNAME);
-	LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
-	LODOP.ADD_PRINT_TEXT(630,451,269,28,KZTIME);
-	LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
-	
-	LODOP.ADD_PRINT_TEXT(665,166,537,74,FGLDYJ);
-	LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
-	LODOP.SET_PRINT_STYLEA(0,"LineSpacing",5);
-	LODOP.ADD_PRINT_TEXT(735,451,269,28,FGLDNAME);
-	LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
-	LODOP.ADD_PRINT_TEXT(760,451,269,28,FGLDTIME);
-	LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
-	
-	LODOP.ADD_PRINT_TEXT(800,166,537,139,JZYJ);
-	LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
-	LODOP.SET_PRINT_STYLEA(0,"LineSpacing",5);
-	LODOP.ADD_PRINT_TEXT(935,451,269,28,JZNAME);
-	LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
-	LODOP.ADD_PRINT_TEXT(960,451,269,28,JZTIME);
-	LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
-
- 	LODOP.SET_SHOW_MODE("BKIMG_PRINT",1);//打印包含背景图 
- 	//LODOP.PRINT_DESIGN();
-	LODOP.PREVIEW();
-}

+ 1 - 1
src/main/webapp/jsp/sydwgl/web/zcxazryyp/zcxazryyp_m.jsp

@@ -83,7 +83,7 @@ response.flushBuffer();%>
 		<input type="hidden" name="hashWhereCls" value="" id="hashWhereCls2">
 		<input type="hidden" name="hashWhereCls" value="" id="hashWhereCls3">
 	</form>
-<script src="${ctx}/jsp/sydwgl/web/zcxazryyp/zcxazryyp_m.js"></script> 
+<script src="${ctx}/static/sydwgl/zcxazryyp_m.js"></script> 
 <script src="${ctx}/jsp/appcomm/txmPrint/LodopFuncs.js"></script>
 <script type="text/javascript">