补录限制时间改为参数可配置

VisualInspection/js/statistics/personal_data_statistics.js

@@ -15,7 +15,7 @@ var array_points = new Array();
 var array_points2 = new Array();
 
 // 默认初始化日期一个月
-$(".div-start input").val(new Date().getFullYear() + "-" + (new Date().getMonth() > 10 ? new Date().getMonth() : "0" + new Date().getMonth()) + "-26");
+$(".div-start input").val(new Date().getFullYear() + "-" + (new Date().getMonth() >= 10 ? new Date().getMonth() : "0" + new Date().getMonth()) + "-26");
 $(".div-end input").val(new Date().getFullYear() + "-" + (new Date().getMonth() + 1 >= 10 ? new Date().getMonth() + 1 : "0" + (new Date().getMonth() + 1)) + "-25");
 
 var start_date = dateChange(moment($(".div-start input").val() + " 00:00:00"), 60 * 60 * 1000);

VisualInspection/js/teamClass/charge_team_schedule.js

@@ -238,109 +238,115 @@
       date_time();
       $("#save_user_class").click(function() {
 
-          var now_date = moment(nowStr).toDate(); //new Date();
-          now_date.setDate(now_date.getDate() - 1);
-          if(now_date.Format('yyyy-MM-dd') >= $("#save_user_class").data("work_date").trim()){
-              tip("不能生成过期的排班");
-              return ;
-          }
-
-          var dutyList = [];
-          var work_date = $("#save_user_class").data("work_date") + "00:00:00";
-
-
-          for (var j = 1; j < 4; j++) {
-              var cache = $(".tr-" + j).data("cache");
-
-              var zhiji_m_id = $(".c-" + j + "_0 select").val();
-              var station_m_id = $(".c-" + j + "_1 select").val();
-              var station_m_id1 = null;
-              if (user_dept_id == 35) {
-                  station_m_id1 = $(".c-" + j + "_2 select").val();
-                  if (station_m_id1 == "" || station_m_id1 == null || typeof(station_m_id1) == "undefined") {
-                      station_m_id1 = 0;
-                  }
-              }
-
-              if (zhiji_m_id == "" || zhiji_m_id == null || typeof(zhiji_m_id) == "undefined") {
-                  zhiji_m_id = 0;
+          getCodeByFlagAndValue("record_class_days",1,function(data){
+              var days = 1;
+              if(data && data.code_name){
+                  days = data.code_name;
               }
-              if (station_m_id == "" || station_m_id == null || typeof(station_m_id) == "undefined") {
-                  station_m_id = 0;
+              var now_date = moment(nowStr).toDate(); //new Date();
+              now_date.setDate(now_date.getDate() - days);
+              if(now_date.Format('yyyy-MM-dd') >= $("#save_user_class").data("work_date").trim()){
+                  tip("不能生成过期的排班");
+                  return ;
               }
-
-              if (user_dept_id == 35) {
-                  station_m_id1 = parseInt(station_m_id1)
-              }
-
-              zhiji_m_id = parseInt(zhiji_m_id)
-              station_m_id = parseInt(station_m_id)
-
-              if (cache) {
-                  var n_c = 2;
+    
+              var dutyList = [];
+              var work_date = $("#save_user_class").data("work_date") + "00:00:00";
+    
+    
+              for (var j = 1; j < 4; j++) {
+                  var cache = $(".tr-" + j).data("cache");
+    
+                  var zhiji_m_id = $(".c-" + j + "_0 select").val();
+                  var station_m_id = $(".c-" + j + "_1 select").val();
+                  var station_m_id1 = null;
                   if (user_dept_id == 35) {
-                      n_c = 3;
+                      station_m_id1 = $(".c-" + j + "_2 select").val();
+                      if (station_m_id1 == "" || station_m_id1 == null || typeof(station_m_id1) == "undefined") {
+                          station_m_id1 = 0;
+                      }
                   }
-                  for (var i = 2; i < lans + 1 + n_c; i++) {
-                      if ($(".tr-" + j + " td select").eq(i).val() != '' && $(".tr-" + j + " td select").eq(i).val() != null) {
-                          var start_time = $("#save_user_class").data("work_date") + classCode[j].start_time + ":00";
-                          if (j == 3) {
-                              var date = new Date($("#save_user_class").data("work_date").replace(/-/, "/"));
-                              date.setDate(date.getDate() - 1);
-                              start_time = date.Format("yyyy-MM-dd") + " " + classCode[j].start_time + ":00";
-                          }
-                          var end_time = $("#save_user_class").data("work_date") + classCode[j].end_time + ":00";
-
-                          var lane_id = $(".tr-" + j + " td select").eq(i).parent().attr('tag');
-                          if (lane_id == null || typeof(lane_id) == "undefined") {
-                              continue;
-                          }
-                          var m_id = station_m_id
-                          if (lane_id == 0) {
-                              m_id = zhiji_m_id;
-                          } else {
-                              if (user_dept_id == 35) {
-                                  if (Math.abs(lane_id) <= 2) {
-                                      m_id = station_m_id;
-                                  } else {
-                                      m_id = station_m_id1;
+    
+                  if (zhiji_m_id == "" || zhiji_m_id == null || typeof(zhiji_m_id) == "undefined") {
+                      zhiji_m_id = 0;
+                  }
+                  if (station_m_id == "" || station_m_id == null || typeof(station_m_id) == "undefined") {
+                      station_m_id = 0;
+                  }
+    
+                  if (user_dept_id == 35) {
+                      station_m_id1 = parseInt(station_m_id1)
+                  }
+    
+                  zhiji_m_id = parseInt(zhiji_m_id)
+                  station_m_id = parseInt(station_m_id)
+    
+                  if (cache) {
+                      var n_c = 2;
+                      if (user_dept_id == 35) {
+                          n_c = 3;
+                      }
+                      for (var i = 2; i < lans + 1 + n_c; i++) {
+                          if ($(".tr-" + j + " td select").eq(i).val() != '' && $(".tr-" + j + " td select").eq(i).val() != null) {
+                              var start_time = $("#save_user_class").data("work_date") + classCode[j].start_time + ":00";
+                              if (j == 3) {
+                                  var date = new Date($("#save_user_class").data("work_date").replace(/-/, "/"));
+                                  date.setDate(date.getDate() - 1);
+                                  start_time = date.Format("yyyy-MM-dd") + " " + classCode[j].start_time + ":00";
+                              }
+                              var end_time = $("#save_user_class").data("work_date") + classCode[j].end_time + ":00";
+    
+                              var lane_id = $(".tr-" + j + " td select").eq(i).parent().attr('tag');
+                              if (lane_id == null || typeof(lane_id) == "undefined") {
+                                  continue;
+                              }
+                              var m_id = station_m_id
+                              if (lane_id == 0) {
+                                  m_id = zhiji_m_id;
+                              } else {
+                                  if (user_dept_id == 35) {
+                                      if (Math.abs(lane_id) <= 2) {
+                                          m_id = station_m_id;
+                                      } else {
+                                          m_id = station_m_id1;
+                                      }
                                   }
                               }
+    
+    
+    
+                              var list = $(".tr-" + j + " td select").eq(i).data("data");
+                              var obj = { "list": list, "work_date": work_date, "dept_id": cache.dept_id, "user_id": $(".tr-" + j + " td select").eq(i).val(), "class_type": j, "team_id": cache.team_id, "start_time": start_time, "end_time": end_time, "lane": lane_id, "monitor_user_id": m_id };
+                              console.log(obj)
+    
+                              dutyList.push(obj);
+    
                           }
-
-
-
-                          var list = $(".tr-" + j + " td select").eq(i).data("data");
-                          var obj = { "list": list, "work_date": work_date, "dept_id": cache.dept_id, "user_id": $(".tr-" + j + " td select").eq(i).val(), "class_type": j, "team_id": cache.team_id, "start_time": start_time, "end_time": end_time, "lane": lane_id, "monitor_user_id": m_id };
-                          console.log(obj)
-
-                          dutyList.push(obj);
-
                       }
                   }
               }
-          }
-
-          $("#save_user_class").attr("disabled", "disabled");
-
-          if ($("#save_user_class").data("modify_flag")) {
-              $("#save_user_class").data("modify_flag", false);
-              post_common_service("userClass/updateList", dutyList, function(data) {
-                  tip("修改成功");
+    
+              $("#save_user_class").attr("disabled", "disabled");
+    
+              if ($("#save_user_class").data("modify_flag")) {
+                  $("#save_user_class").data("modify_flag", false);
+                  post_common_service("userClass/updateList", dutyList, function(data) {
+                      tip("修改成功");
+                      $('#add_fee_station').modal('hide');
+                      $("#save_user_class").attr("disabled", false);
+                  }, function(error) {
+                      return "";
+                  })
+                  return;
+              }
+    
+              post_common_service("userClass/addList", dutyList, function(data) {
+                  tip("添加成功");
                   $('#add_fee_station').modal('hide');
                   $("#save_user_class").attr("disabled", false);
               }, function(error) {
                   return "";
               })
-              return;
-          }
-
-          post_common_service("userClass/addList", dutyList, function(data) {
-              tip("添加成功");
-              $('#add_fee_station').modal('hide');
-              $("#save_user_class").attr("disabled", false);
-          }, function(error) {
-              return "";
           })
       })
 
@@ -721,9 +727,15 @@
       });
 
       $("#save_term_class").click(function() {
-          // 判断当前时间和待添加班组时间判断
+         getCodeByFlagAndValue("record_class_days",1,function(data){
+          var days = 1;
+          if(data && data.code_name){
+             days = data.code_name;
+          }
           var now_date = moment(nowStr).toDate(); //new Date();
-          now_date.setDate(now_date.getDate() - 1);
+          now_date.setDate(now_date.getDate() - days);
+          // 判断当前时间和待添加班组时间判断
+        //   now_date.setDate(now_date.getDate() - 1);
           if(now_date.Format('yyyy-MM-dd') >= $("#save_term_class").data("date").trim()){
               tip("不能生成过期的排班");
               return ;
@@ -782,6 +794,7 @@
                   $('#myModal').modal('hide');
               })
           }
+        })
       })
 
       $(".close_btn").click(function() {

VisualInspection/js/util/util.js

@@ -710,4 +710,10 @@ function getJob() {
     post_common_service("/job/getList", {}, function(data) {
         job_array = data;
     }, function(error) {});
+}
+
+function getCodeByFlagAndValue(code_flag, code_value, callback) {
+    post_common_service("/constant/getConstantByFlagAndValue", {code_flag:code_flag,code_value:code_value}, function(data) {
+        callback(data);
+    }, function(error) {});
 }

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/ConstantController.java

@@ -109,7 +109,7 @@ public class ConstantController extends BaseController {
     	if(StringUtils.isNullOrEmpty(constant.getCode_flag())){
     		throw new BusinessException(20101);
     	}
-    	if(StringUtils.isNullOrEmpty(constant.getCode_flag())){
+    	if(constant.getCode_value()==null){
     		throw new BusinessException(20102);
     	}
     	Constant con = constantService.getByFlagAndValue(constant);

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

@@ -25,6 +25,7 @@
 		LEFT JOIN t_sys_organ t ON o.dept_id = t.id
 		LEFT JOIN t_sys_users u ON o.user_id = u.id
 		LEFT JOIN check_item c ON o.check_item_id = c.id
+		ORDER BY o.check_time desc
     </select>
     <select id="getCheckById" parameterType="java.lang.Long" resultType="com.xintong.visualinspection.bean.CheckOther" >
         SELECT o.id,o.dept_id,o.user_id,o.check_person_id,o.check_score,o.check_item_id,o.remark,o.check_type,o.file_ids,o.check_num,o.check_time,

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/impl/RoleServiceImpl.java

@@ -60,7 +60,7 @@ public class RoleServiceImpl extends BaseService implements RoleService {
 		
 		List<Role> roletemp = new ArrayList<Role>();
 		for(Role r:roles){
-			if(r.getLevel()>=level){
+			if(r.getLevel()!=null && r.getLevel()>=level){
 				boolean hasrole1 = false;
 				for(String s:names){
 					if(s.contains(r.getName())){