chenrj-PC\chenrj 8 лет назад
Родитель
Сommit
4b751b74b9

+ 3 - 1
VisualInspection/js/other_check/other_check.js

@@ -114,7 +114,9 @@ var al_data = [];
         }
         var file_ids = (file_src.substring(file_src.length-1)==',')?file_src.substring(0,file_src.length-1):file_src;
 
-        var check_time_name = timeStamp2String(new Date(),"yyyy/MM");
+        // var check_time_name = timeStamp2String(new Date(),"yyyy/MM");
+        var check_time_name=timeStamp2String(new Date((check_time+":00").replace("-g-/", "")  ),"yyyy/MM");
+
         if(dept_id == null || dept_id == undefined ||dept_id == ""){
             layer.msg('请选择部门');
             return;

+ 1 - 0
VisualInspection_server/src/main/java/com/xintong/visualinspection/mapper/master/CheckOtherMapper.xml

@@ -47,6 +47,7 @@
         <if test="check_score != null">,check_score = #{check_score}</if>
         <if test="file_ids != null">,file_ids = #{file_ids}</if>
         <if test="check_time != null">,check_time = #{check_time}</if>
+        <if test="check_time_name !=  null">,check_time_name= #{check_time_name} </if>
         <if test="check_num != null">,check_num = #{check_num}</if>
         <if test="wrecker_check_type != null">,wrecker_check_type = #{wrecker_check_type}</if>
         WHERE