修改bug

VisualInspection/js/mytask/check.js

@@ -46,10 +46,7 @@ function initCheck() {
         getUserCheckCount();
         initCheckAppealBtns();
         setFeSelect("#fsList", $.checkTask.checked_dept);
-        // setFeeUserSelect("#check_checked_person_select", $.checkTask.checked_person);
-        // $("#fsList").on("change",function(){
-        //     $.checkTask.checked_dept = this.value;
-        // })
+      
         $("#lane").val($.checkTask.checked_location);
         // setLaneSelect("#lane", $.checkTask.checked_location);
         get_common_service('user/getUserById/' + $.checkTask.checked_person, null, function(data) {
@@ -223,32 +220,51 @@ function initCheckAppealBtns() {
         $("#appeal_reason").html($.checkTask.appeal.appeal_reason);
         $("#appeal_file_list").html(genAppeaFiles($.checkTask.appeal.file_src));
         $("#recheck_result").html($.checkTask.appeal.recheck_result);
+        showAppealLayer();
+    } else {
+        $("#appeal_div").hide();
+        $("#btn_appeal_task").hide();
+        $("#btn_task").show();
+    }
+}
 
-
-        layer.open({
+function showAppealLayer(){
+    layer.open({
             type: 1,
             title: "申诉详情",
-            closeBtn: 0,
+            closeBtn: 1,
             shade: false,
             maxmin: false,
             shadeClose: true,
             offset: 'rb',
             content: $('#appeal_div'), //捕获的元素，注意：最好该指定的元素要存放在body最外层，否则可能被其它的相对元素所影响
-            // min: function (index) {
-            //     // layer.close(index);
-            //     layer.style(index,{width: 50,height:50}); 
-            //     return false;
-            // },
-            // cancel:function(index){
-            //      layer.style(index,{width: 50,height:50,offset:'r'});
-            //      return false; 
-            // }
+            cancel:function(index){
+                // layer.msg('', {
+                //     time: 0, //不自动关闭
+                //     offset: 'rb',
+                //     btn: ['申诉详情'],
+                //     yes: function(index){
+                //         layer.close(index);
+                //         showAppealLayer();
+                //     }
+                // });
+                layer.open({
+                    type: 1,
+                    title: "",
+                    closeBtn: 0,
+                    shade: false,
+                    maxmin: false,
+                    shadeClose: true,
+                    content:$('#hide_div'),
+                    offset: 'rb',
+                    btn: ['申诉详情'],
+                    yes:function(index){                        
+                        layer.close(index);
+                        showAppealLayer();
+                    }
+                });
+            }
         });
-    } else {
-        $("#appeal_div").hide();
-        $("#btn_appeal_task").hide();
-        $("#btn_task").show();
-    }
 }
 // 使用data参数更新数据：
 function queryCheckScores() {

VisualInspection/js/teamClass/charge_team_schedule.js

@@ -221,7 +221,7 @@
         $("#save_user_class").click(function(){
 
             var now_date = new Date();
-            now_date.setDate(now_date.getDate()-1);
+            now_date.setDate(now_date.getDate()-100);
             if(now_date.Format('yyyy-MM-dd') > $("#save_user_class").data("work_date") ){
                 tip("不能生成过期的排班");
                 return ;
@@ -597,6 +597,7 @@
         $("#save_term_class").click(function(){
             // 判断当前时间和待添加班组时间判断
             var now_date = new Date();
+            now_date.setDate(now_date.getDate()-100);
             if(now_date.Format('yyyy-MM-dd') > $("#save_term_class").data("date") ){
                 tip("不能生成过期的排班");
                 return ;

VisualInspection/view/mytask/check.html

@@ -198,6 +198,9 @@
         </div>
     </div>
 </div>
+<!-- 对话框HTML -->
+<div id="hide_div" style="display:none;text-align:center;">
+</div>
 <img id="userBigImg" style="display:none;margin-right:20px;" />
 <script>
     var curVideo;

VisualInspection_server/src/main/java/com/xintong/visualinspection/mapper/master/StatisticsMapper.xml

@@ -9,7 +9,7 @@
 			LEFT JOIN check_task ct ON ct.id = t.task_id
 			WHERE 1=1 and ct.check_status!=22
 			<if test="start_date!=null and end_date != null">
-		        AND	 ct.start_time &gt;= #{start_date} AND ct.end_time &lt;= #{end_date} AND ct.check_status != 23
+		        AND	 ct.start_time &gt;= #{start_date} AND ct.end_time &lt;= #{end_date}
 			</if>
 			<if test="dept_id!=null">
 				AND t.checked_dept =#{dept_id}			
@@ -22,7 +22,7 @@
     	SELECT COUNT(1) AS checked_num , t.checked_person AS user_id FROM check_task t 
     	WHERE 1=1 and t.check_status!=22
 			<if test="start_date!=null and end_date != null">
-		        AND	 t.start_time &gt;= #{start_date} AND t.end_time &lt;= #{end_date}   AND t.check_status != 23
+		        AND	 t.start_time &gt;= #{start_date} AND t.end_time &lt;= #{end_date} 
 			</if>
 			<if test="dept_id!=null">
 				AND t.checked_dept =#{dept_id}			
@@ -34,7 +34,7 @@
     	SELECT COUNT(DISTINCT( t.checked_person )) AS checked_people_num , COUNT(t.checked_person) AS checked_num  ,t.checked_dept AS dept_id FROM check_task  t
     	WHERE 1=1 and t.check_status!=22
     		<if test="start_date!=null and end_date != null">
-		        AND	 t.start_time &gt;= #{start_date} AND t.end_time &lt;= #{end_date}   AND t.check_status != 23
+		        AND	 t.start_time &gt;= #{start_date} AND t.end_time &lt;= #{end_date}
 			</if>
     	 GROUP BY t.checked_dept
     </select>
@@ -46,7 +46,7 @@
     		LEFT JOIN check_task ct ON ct.id = t.task_id
     		WHERE 1=1 and ct.check_status!=22
     		<if test="start_date!=null and end_date != null">
-		        AND	 ct.start_time &gt;= #{start_date} AND ct.end_time &lt;= #{end_date}  AND ct.check_status != 23
+		        AND	 ct.start_time &gt;= #{start_date} AND ct.end_time &lt;= #{end_date}
 			</if>
     		GROUP BY t.checked_dept,t.checked_person
     </select>
@@ -58,7 +58,7 @@
 			LEFT JOIN check_task ct ON ct.id = t.task_id
 			WHERE 1=1  and ct.check_status!=22
 			<if test="start_date!=null and end_date != null">
-		        AND	 ct.start_time &gt;= #{start_date} AND ct.end_time &lt;= #{end_date}  AND ct.check_status != 23
+		        AND	 ct.start_time &gt;= #{start_date} AND ct.end_time &lt;= #{end_date}
 			</if> )
 			u LEFT JOIN check_item s ON u.parent_id = s.id GROUP  BY dept_id,item_id
     </select>
@@ -77,7 +77,7 @@
 					check_score m
 				WHERE
 					t.id = m.task_id
-				AND t.check_status != 23
+				AND t.check_status != 22
 				AND t.checked_person IS NOT NULL
 				<if test="start_date !=null">
 					AND t.start_time >= #{start_date}
@@ -102,7 +102,7 @@
 				check_task t
 			WHERE
 				t.checked_person IS NOT NULL
-			AND t.check_status != 23
+			AND t.check_status != 22
 			<if test="start_date !=null">
 				AND t.start_time >= #{start_date}
 			</if>
@@ -183,7 +183,7 @@
 			 ) t 
 			LEFT JOIN check_item ci ON t.parent_id = ci.id
 			) m ON t.id = m.task_id
-			where t.check_status !=23
+			where t.check_status !=22
 			AND monthfunc( t.start_time ) = #{mth}
 		GROUP BY m.parent_id
      </select>