变更

1 year ago · e11f2495ce
parent 58ad298999
commit e11f2495ce
160 changed files with 3046 additions and 349 deletions
--- a/out/artifacts/zhyw_war_exploded/images/img_1.png
+++ b/out/artifacts/zhyw_war_exploded/images/img_1.png
--- a/out/artifacts/zhyw_war_exploded/test.html
+++ b/out/artifacts/zhyw_war_exploded/test.html
@ -1,29 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>日期选择器</title>
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.css">
-    <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js"></script>
-</head>
-<body>
-<input type="text" id="trainingEndDate" readonly>
-
-</body>
-<script>
-    $(function() {
-        $("#trainingEndDate").datepicker({
-            dateFormat: "yy-mm-dd",
-            minDate: 0,
-            maxDate: '+1Y',
-            changeMonth: true,
-            numberOfMonths: 1,
-            onSelect: function(dateText) {
-                $(this).change();
-            }
-        });
-    });
-</script>
-</html>
--- a/src/main/java/com/zky/zhyw/smwj/FileProvideManageServlet.java
+++ b/src/main/java/com/zky/zhyw/smwj/FileProvideManageServlet.java
@ -104,8 +104,8 @@ StudentPullulate p=new StudentPullulate();
 			conn.commit();
 			Operate oper=new Operate();
 			oper.operatesmwjxjLog(request);
-			queryFileProvide(request, response);
-			request.getRequestDispatcher("/zhyw/smwj/wjff/fileProvideManage.jsp").forward(request, response);
+			queryFileProvideADD(request, response);
+			//request.getRequestDispatcher("/zhyw/smwj/wjff/fileProvideManage.jsp").forward(request, response);
 		} catch (Exception e) {
 			String errorinfo="";
 			  if (e.getMessage().startsWith("ORA-00001")) {
@ -128,6 +128,40 @@ StudentPullulate p=new StudentPullulate();
 			}
 		}
 	}
+
+	/**
+	 * 查询最新操作的文件发放文件信息
+	 * @param request
+	 * @param response
+	 * @throws SQLException
+	 */
+	public void queryFileProvideADD(HttpServletRequest request,HttpServletResponse response) throws SQLException
+	{
+		StringBuffer sql=new StringBuffer("select  p.provide_departid," +
+				"p.provide_staffid,p.areaid,p.frameworkid, date_format(p.provide_date,'%Y-%m-%d') as provide_date,p.file_id,p.target_departid,p.file_name,p.file_num," +
+				"d.departname,e.empname from tm_dtl_file_provide p " +
+				"left join tab_department d on p.provide_departid=d.departid left join tab_employee e on p.provide_staffid=e.empname where 1=1");
+		try {
+			conn=DbConn.getConn();
+			PageQuery pageQuery = new PageQuery(conn,sql.toString(),new HashFmlBufResultSetHandler(),request);
+			HashFmlBuf provideBuf=(HashFmlBuf)pageQuery.query(20);
+			request.setAttribute("provideBuf",provideBuf);
+			Operate oper=new Operate();
+			oper.operatesmwjcxLog(request);
+			request.getRequestDispatcher("/zhyw/smwj/wjff/fileProvideManage.jsp").forward(request, response);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		finally
+		{
+			if(conn!=null)
+			{
+				conn.close();
+			}
+		}
+	}
+
+
 	/**
 	 * 查询最新操作的文件发放文件信息
 	 * @param request
@ -161,8 +195,8 @@ StudentPullulate p=new StudentPullulate();
 		    PageQuery pageQuery = new PageQuery(conn,sql.toString(),new HashFmlBufResultSetHandler(),request);
 		    HashFmlBuf provideBuf=(HashFmlBuf)pageQuery.query(20);			
 			request.setAttribute("provideBuf",provideBuf);
-//			Operate oper=new Operate();
-//			oper.operatesmwjcxLog(request);
+			Operate oper=new Operate();
+			oper.operatesmwjcxLog(request);
 			request.getRequestDispatcher("/zhyw/smwj/wjff/fileProvideManage.jsp").forward(request, response);
 		} catch (Exception e) {
 			e.printStackTrace();
--- a/target/classes/com/zky/bjca/FileEnDe.class
+++ b/target/classes/com/zky/bjca/FileEnDe.class
--- a/target/classes/com/zky/bjca/SM2.class
+++ b/target/classes/com/zky/bjca/SM2.class
--- a/target/classes/com/zky/bjca/SM3.class
+++ b/target/classes/com/zky/bjca/SM3.class
--- a/target/classes/com/zky/bjca/SM4.class
+++ b/target/classes/com/zky/bjca/SM4.class
--- a/target/classes/com/zky/bjca/Sign.class
+++ b/target/classes/com/zky/bjca/Sign.class
--- a/target/classes/com/zky/bjca/cert/controller/TdBjcaController.class
+++ b/target/classes/com/zky/bjca/cert/controller/TdBjcaController.class
--- a/target/classes/com/zky/bjca/cert/controller/loginController$LoginController.class
+++ b/target/classes/com/zky/bjca/cert/controller/loginController$LoginController.class
--- a/target/classes/com/zky/bjca/cert/controller/loginController.class
+++ b/target/classes/com/zky/bjca/cert/controller/loginController.class
--- a/target/classes/com/zky/bjca/cert/mapper/TdBjcaMapper.class
+++ b/target/classes/com/zky/bjca/cert/mapper/TdBjcaMapper.class
--- a/target/classes/com/zky/bjca/cert/service/ITdBjcaService.class
+++ b/target/classes/com/zky/bjca/cert/service/ITdBjcaService.class
--- a/target/classes/com/zky/bjca/cert/service/impl/TdBjcaServiceImpl.class
+++ b/target/classes/com/zky/bjca/cert/service/impl/TdBjcaServiceImpl.class
--- a/target/classes/com/zky/bjca/demo/sm4demo.class
+++ b/target/classes/com/zky/bjca/demo/sm4demo.class
--- a/target/classes/com/zky/certlogin/KeyLoginServlet.class
+++ b/target/classes/com/zky/certlogin/KeyLoginServlet.class
--- a/target/classes/com/zky/manager/CreateExcelUtils.class
+++ b/target/classes/com/zky/manager/CreateExcelUtils.class
--- a/target/classes/com/zky/manager/CreateStudentIdUtils.class
+++ b/target/classes/com/zky/manager/CreateStudentIdUtils.class
--- a/target/classes/com/zky/manager/DeptManageServlet.class
+++ b/target/classes/com/zky/manager/DeptManageServlet.class
--- a/target/classes/com/zky/manager/EmpDeptRelationServlet.class
+++ b/target/classes/com/zky/manager/EmpDeptRelationServlet.class
--- a/target/classes/com/zky/manager/EmpManageServlet.class
+++ b/target/classes/com/zky/manager/EmpManageServlet.class
--- a/target/classes/com/zky/manager/EmpMenuAdjustServlet.class
+++ b/target/classes/com/zky/manager/EmpMenuAdjustServlet.class
--- a/target/classes/com/zky/manager/ExamineServlet.class
+++ b/target/classes/com/zky/manager/ExamineServlet.class
--- a/target/classes/com/zky/manager/FilterAuthor.class
+++ b/target/classes/com/zky/manager/FilterAuthor.class
--- a/target/classes/com/zky/manager/FrameworkServlet.class
+++ b/target/classes/com/zky/manager/FrameworkServlet.class
--- a/target/classes/com/zky/manager/Global.class
+++ b/target/classes/com/zky/manager/Global.class
--- a/target/classes/com/zky/manager/ImportExcelServlet.class
+++ b/target/classes/com/zky/manager/ImportExcelServlet.class
--- a/target/classes/com/zky/manager/ImportPropertyExcelServlet.class
+++ b/target/classes/com/zky/manager/ImportPropertyExcelServlet.class
--- a/target/classes/com/zky/manager/ImportPropertyNetExcelServlet.class
+++ b/target/classes/com/zky/manager/ImportPropertyNetExcelServlet.class
--- a/target/classes/com/zky/manager/ImportPropertyQuestionExcelServlet.class
+++ b/target/classes/com/zky/manager/ImportPropertyQuestionExcelServlet.class
--- a/target/classes/com/zky/manager/ImportPropertywlExcelServlet.class
+++ b/target/classes/com/zky/manager/ImportPropertywlExcelServlet.class
--- a/target/classes/com/zky/manager/JobManageServlet.class
+++ b/target/classes/com/zky/manager/JobManageServlet.class
--- a/target/classes/com/zky/manager/Login.class
+++ b/target/classes/com/zky/manager/Login.class
--- a/target/classes/com/zky/manager/LoginServlet.class
+++ b/target/classes/com/zky/manager/LoginServlet.class
--- a/target/classes/com/zky/manager/LogonLogServlet.class
+++ b/target/classes/com/zky/manager/LogonLogServlet.class
--- a/target/classes/com/zky/manager/ManagerServlet.class
+++ b/target/classes/com/zky/manager/ManagerServlet.class
--- a/target/classes/com/zky/manager/MenuBean.class
+++ b/target/classes/com/zky/manager/MenuBean.class
--- a/target/classes/com/zky/manager/MenuManageServlet.class
+++ b/target/classes/com/zky/manager/MenuManageServlet.class
--- a/target/classes/com/zky/manager/MenuTree.class
+++ b/target/classes/com/zky/manager/MenuTree.class
--- a/target/classes/com/zky/manager/MenuTreeUtils.class
+++ b/target/classes/com/zky/manager/MenuTreeUtils.class
--- a/target/classes/com/zky/manager/NavigatorGenerator.class
+++ b/target/classes/com/zky/manager/NavigatorGenerator.class
--- a/target/classes/com/zky/manager/Operate.class
+++ b/target/classes/com/zky/manager/Operate.class
--- a/target/classes/com/zky/manager/PopupMsg.class
+++ b/target/classes/com/zky/manager/PopupMsg.class
--- a/target/classes/com/zky/manager/RandomCode.class
+++ b/target/classes/com/zky/manager/RandomCode.class
--- a/target/classes/com/zky/manager/SelectParaServlet.class
+++ b/target/classes/com/zky/manager/SelectParaServlet.class
--- a/target/classes/com/zky/manager/StudentPullulate.class
+++ b/target/classes/com/zky/manager/StudentPullulate.class
--- a/target/classes/com/zky/manager/Util.class
+++ b/target/classes/com/zky/manager/Util.class
--- a/target/classes/com/zky/manager/ValidateCode.class
+++ b/target/classes/com/zky/manager/ValidateCode.class
--- a/target/classes/com/zky/para/Para.class
+++ b/target/classes/com/zky/para/Para.class
--- a/target/classes/com/zky/para/ParaTable.class
+++ b/target/classes/com/zky/para/ParaTable.class
--- a/target/classes/com/zky/para/Row.class
+++ b/target/classes/com/zky/para/Row.class
--- a/target/classes/com/zky/para/SyncPara.class
+++ b/target/classes/com/zky/para/SyncPara.class
--- a/target/classes/com/zky/pojo/Areadef.class
+++ b/target/classes/com/zky/pojo/Areadef.class
--- a/target/classes/com/zky/pojo/Check.class
+++ b/target/classes/com/zky/pojo/Check.class
--- a/target/classes/com/zky/pojo/ClassInfo.class
+++ b/target/classes/com/zky/pojo/ClassInfo.class
--- a/target/classes/com/zky/pojo/Department.class
+++ b/target/classes/com/zky/pojo/Department.class
--- a/target/classes/com/zky/pojo/Employee.class
+++ b/target/classes/com/zky/pojo/Employee.class
--- a/target/classes/com/zky/pojo/FileInfo.class
+++ b/target/classes/com/zky/pojo/FileInfo.class
--- a/target/classes/com/zky/pojo/Framework.class
+++ b/target/classes/com/zky/pojo/Framework.class
--- a/target/classes/com/zky/pojo/MyUtils.class
+++ b/target/classes/com/zky/pojo/MyUtils.class
--- a/target/classes/com/zky/pojo/PropertyInfo.class
+++ b/target/classes/com/zky/pojo/PropertyInfo.class
--- a/target/classes/com/zky/pojo/Questionexam.class
+++ b/target/classes/com/zky/pojo/Questionexam.class
--- a/target/classes/com/zky/pojo/TdBjca.class
+++ b/target/classes/com/zky/pojo/TdBjca.class
--- a/target/classes/com/zky/pojo/Train.class
+++ b/target/classes/com/zky/pojo/Train.class
--- a/target/classes/com/zky/pub/BeanUtil.class
+++ b/target/classes/com/zky/pub/BeanUtil.class
--- a/target/classes/com/zky/pub/Common.class
+++ b/target/classes/com/zky/pub/Common.class
--- a/target/classes/com/zky/pub/DateTime.class
+++ b/target/classes/com/zky/pub/DateTime.class
--- a/target/classes/com/zky/pub/DbConn.class
+++ b/target/classes/com/zky/pub/DbConn.class
--- a/target/classes/com/zky/pub/DispatchServlet.class
+++ b/target/classes/com/zky/pub/DispatchServlet.class
--- a/target/classes/com/zky/pub/FileImport.class
+++ b/target/classes/com/zky/pub/FileImport.class
--- a/target/classes/com/zky/pub/HashFmlBuf.class
+++ b/target/classes/com/zky/pub/HashFmlBuf.class
--- a/target/classes/com/zky/pub/ProcedureCall.class
+++ b/target/classes/com/zky/pub/ProcedureCall.class
--- a/target/classes/com/zky/pub/SetCharacterEncodingFilter.class
+++ b/target/classes/com/zky/pub/SetCharacterEncodingFilter.class
--- a/target/classes/com/zky/util/CharFilter.class
+++ b/target/classes/com/zky/util/CharFilter.class
--- a/target/classes/com/zky/util/CheckCoderTool.class
+++ b/target/classes/com/zky/util/CheckCoderTool.class
--- a/target/classes/com/zky/util/OptionBean.class
+++ b/target/classes/com/zky/util/OptionBean.class
--- a/target/classes/com/zky/util/OptionsBean.class
+++ b/target/classes/com/zky/util/OptionsBean.class
--- a/target/classes/com/zky/util/PageBean.class
+++ b/target/classes/com/zky/util/PageBean.class
--- a/target/classes/com/zky/util/PageLinkTag.class
+++ b/target/classes/com/zky/util/PageLinkTag.class
--- a/target/classes/com/zky/util/PageQuery.class
+++ b/target/classes/com/zky/util/PageQuery.class
--- a/target/classes/com/zky/util/Pageable.class
+++ b/target/classes/com/zky/util/Pageable.class
--- a/target/classes/com/zky/util/Test.class
+++ b/target/classes/com/zky/util/Test.class
--- a/target/classes/com/zky/util/jdbc/BatchParam.class
+++ b/target/classes/com/zky/util/jdbc/BatchParam.class
--- a/target/classes/com/zky/util/jdbc/HashFmlBufResultSetHandler.class
+++ b/target/classes/com/zky/util/jdbc/HashFmlBufResultSetHandler.class
--- a/target/classes/com/zky/util/jdbc/JDBCPageQuery.class
+++ b/target/classes/com/zky/util/jdbc/JDBCPageQuery.class
--- a/target/classes/com/zky/util/jdbc/JDBCUtils.class
+++ b/target/classes/com/zky/util/jdbc/JDBCUtils.class
--- a/target/classes/com/zky/util/jdbc/JDBCUtilsExample$1.class
+++ b/target/classes/com/zky/util/jdbc/JDBCUtilsExample$1.class
--- a/target/classes/com/zky/util/jdbc/JDBCUtilsExample.class
+++ b/target/classes/com/zky/util/jdbc/JDBCUtilsExample.class
--- a/target/classes/com/zky/util/jdbc/ListResultSetHandler.class
+++ b/target/classes/com/zky/util/jdbc/ListResultSetHandler.class
--- a/target/classes/com/zky/util/jdbc/OptionsResultSetHandler.class
+++ b/target/classes/com/zky/util/jdbc/OptionsResultSetHandler.class
--- a/target/classes/com/zky/util/jdbc/ResultSetHandler.class
+++ b/target/classes/com/zky/util/jdbc/ResultSetHandler.class
--- a/target/classes/com/zky/util/jdbc/SingleStringRSHandler.class
+++ b/target/classes/com/zky/util/jdbc/SingleStringRSHandler.class
--- a/target/classes/com/zky/util/jdbc/SqlBuf.class
+++ b/target/classes/com/zky/util/jdbc/SqlBuf.class
--- a/target/classes/com/zky/zhyw/smhd/ActivitiesApplyServlet.class
+++ b/target/classes/com/zky/zhyw/smhd/ActivitiesApplyServlet.class
--- a/target/classes/com/zky/zhyw/smhd/ActivitiesNoteServlet.class
+++ b/target/classes/com/zky/zhyw/smhd/ActivitiesNoteServlet.class
--- a/target/classes/com/zky/zhyw/smhd/QueryUtils.class
+++ b/target/classes/com/zky/zhyw/smhd/QueryUtils.class
--- a/target/classes/com/zky/zhyw/smjc/CheckManageServlet.class
+++ b/target/classes/com/zky/zhyw/smjc/CheckManageServlet.class
--- a/target/classes/com/zky/zhyw/smpx/TrainManageServlet.class
+++ b/target/classes/com/zky/zhyw/smpx/TrainManageServlet.class
--- a/target/classes/com/zky/zhyw/smry/EmpManageServlet.class
+++ b/target/classes/com/zky/zhyw/smry/EmpManageServlet.class
--- a/target/classes/com/zky/zhyw/smry/ExamineManageServlet.class
+++ b/target/classes/com/zky/zhyw/smry/ExamineManageServlet.class
--- a/Show More
+++ b/Show More