1111

src/main/resources/mappings/modules/leaveapply/LeaveApplyDao.xml

@@ -290,7 +290,7 @@
 		<include refid="leaveApplyJoins"/>
 		WHERE a.company_id=#{companyId} and a.del_flag = '0' and a.status in('5','8','6','7','9')
 		<if test="basicInfo != null and basicInfo.name != null and basicInfo.name != ''">
-			AND w.name  LIKE
+			AND w.name LIKE
 			<if test="dbName == 'oracle'">'%'||#{basicInfo.name}||'%'</if>
 			<if test="dbName == 'mssql'">'%'+#{basicInfo.name}+'%'</if>
 			<if test="dbName == 'mysql'">concat('%',#{basicInfo.name},'%')</if>
@@ -298,12 +298,13 @@
 		<if test="basicInfo != null and basicInfo.office != null  and basicInfo.office.id != null and basicInfo.office.id != ''">
 			AND a.office_id = #{basicInfo.office.id}
 		</if>
-		group by a.staff_id order by w.no ASC
+<!--		有异常-->
+<!--		group by a.staff_id order by w.no ASC-->
 	</select>
 
 	<select id="getSumDays" resultType="LeaveApply" parameterType="java.lang.String">
 		SELECT
-		ifnull(sum(a.sums),0) as "sumDays"
+	ifnull(sum(a.sums),0) as "sumDays"
 		FROM leave_count a
 		where
 			a.del_flag = '0'

src/main/webapp/webpage/modules/leaveapply/leaveApplyForm.jsp

@@ -9,7 +9,7 @@
         var validateForm;
         var count1 = 0;
         $(document).ready(function() {
-
+        	$("#no").val(setNo());
             checkContentKeyUp('reason',128);
             if($("#applyTime").val()==null || $("#applyTime").val()==''){
                 $("#applyTime").val(getNowFormatDate());
@@ -53,12 +53,18 @@
 
         });
 
+        //设置请假编号
         function setNo(){
         	var date = new Date();
         	var Y = date.getFullYear();
         	var M = date.getMonth()+1;
         	var D = date.getDate();
-        	var ran = (Math.random()*10)
+			var rr = "";
+			for (var i = 0; i < 4; i++) {
+				var ran = Math.floor(Math.random() * 10);
+				rr = rr+ran;
+			}
+			return Y+""+M+""+D+""+rr;
 		}
 
         function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。

src/main/webapp/webpage/modules/leaveapply/leaveMangeList.jsp

@@ -29,7 +29,7 @@
 	<div class="layui-row">
 		<div class="full-width fl">
 			<div class="contentShadow layui-row" id="queryDiv">
-				<form:form id="searchForm" modelAttribute="leaveApply" action="${ctx}/leaveapply/leaveManage" method="post" class="form-inline">
+				<form:form id="searchForm" modelAttribute="page" action="${ctx}/leaveapply/leaveManage" method="post" class="form-inline">
 					<%--以下三行照抄--%>
 					<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 					<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>

src/main/webapp/webpage/modules/workfield/workFieldForm.jsp

@@ -48,6 +48,8 @@
             return false;
         }
         $(document).ready(function() {
+        	$("#num").val(setNo());
+
             validateForm = $("#inputForm").validate({
                 submitHandler: function(form){
                     loading('正在提交，请稍等...');
@@ -150,6 +152,20 @@
                 }
             });
         });
+
+		//设置编号
+		function setNo(){
+			var date = new Date();
+			var Y = date.getFullYear();
+			var M = date.getMonth()+1;
+			var D = date.getDate();
+			var rr = "";
+			for (var i = 0; i < 4; i++) {
+				var ran = Math.floor(Math.random() * 10);
+				rr = rr+ran;
+			}
+			return Y+""+M+""+D+""+rr;
+		}
         function insertTitle(tValue){
             var list = "${workField.workAttachments}";
             var size = (list.split('url')).length-1;

src/main/webapp/webpage/modules/workout/workOutForm.jsp

@@ -49,6 +49,8 @@
             return false;
         }
         $(document).ready(function() {
+        	$("#num").val(setNo());
+
             validateForm = $("#inputForm").validate({
                 submitHandler: function(form){
                     loading('正在提交，请稍等...');
@@ -151,6 +153,19 @@
                 }
             });
         });
+		//设置编号
+		function setNo(){
+			var date = new Date();
+			var Y = date.getFullYear();
+			var M = date.getMonth()+1;
+			var D = date.getDate();
+			var rr = "";
+			for (var i = 0; i < 4; i++) {
+				var ran = Math.floor(Math.random() * 10);
+				rr = rr+ran;
+			}
+			return Y+""+M+""+D+""+rr;
+		}
         function insertTitle(tValue){
             var list = "${workOut.workAttachments}";
             var size = (list.split('url')).length-1;

src/main/webapp/webpage/modules/workovertime/workOvertimeForm.jsp

@@ -47,7 +47,22 @@
             }
             return false;
         }
+		//设置编号
+		function setNo(){
+			var date = new Date();
+			var Y = date.getFullYear();
+			var M = date.getMonth()+1;
+			var D = date.getDate();
+			var rr = "";
+			for (var i = 0; i < 4; i++) {
+				var ran = Math.floor(Math.random() * 10);
+				rr = rr+ran;
+			}
+			return Y+""+M+""+D+""+rr;
+		}
         $(document).ready(function() {
+        	$("#num").val(setNo());
+
             validateForm = $("#inputForm").validate({
                 submitHandler: function(form){
                     loading('正在提交，请稍等...');