bug

VisualInspection/fwq/js/task/add.js

@@ -195,18 +195,18 @@ function inittAreaable(time, dept) {
                                 var temphtml = "";
                                 var list = taskMap.get(key);
                                 //console.log(list);
-
+                       
                                 list.forEach(t => {
-                                    var startus = "";
-                                    if (t.check_status == 4 || t.check_status == 16 || t.check_status == 6) {
-                                        startus = "已完成";
-                                    } else
-                                    if (t.check_status == 22) {
-                                        startus = "无效";
-                                    } else {
-                                        startus = "进行中";
-                                    }
-                                    temphtml += '<tr><td>' + moment(t.start_time).format("HH:mm:ss") + '</td><td>' + moment(t.end_time).format("HH:mm:ss") + '</td><td>' + startus + '</td></tr>';
+                                    // var startus = "";
+                                    // if (t.check_status == 4 || t.check_status == 16 || t.check_status == 6) {
+                                    //     startus = "已完成";
+                                    // } else
+                                    // if (t.check_status == 22) {
+                                    //     startus = "无效";
+                                    // } else {
+                                    //     startus = "进行中";
+                                    // }
+                                    temphtml += '<tr><td>' + moment(t.start_time).format("HH:mm:ss") + '</td><td>' + moment(t.end_time).format("HH:mm:ss") + '</td><td>' + t.status_name + '</td></tr>';
                                 });
 
                                 var thtml = '<table border=1 style="border:solid 1px;width:180px;"><tr><th>开始时间</th><th>结束时间</th><th>状态</th></tr>' + temphtml + '</table>';
@@ -498,8 +498,8 @@ function reloadtableData() {
                 var hasc = 0;
                 var invc = 0;
                 list.forEach(t => {
-                    if (t.check_status == 4 || t.check_status == 16 || t.check_status == 6) {
-                        //完成稽查
+                    if (t.check_status == 2 || t.check_status == 7) {
+                        //稽查中
                         hasc++;
                     }
                     if (t.check_status == 22) {
@@ -517,14 +517,14 @@ function reloadtableData() {
                 //已完成
                 if (hasc + invc == list.length) {
                     temphtml = '<div class="btn-group btn_c" data-toggle="buttons"  id="div_' + area.id + '_' + i + '">' +
-                        '<label class="btn btn-info5 " >' +
-                        '<input type="checkbox" name="options" onchange="selectedTask(this)" id="' + area.id + '_' + i + '"> 已稽查' +
+                        '<label class="btn btn-info3 " >' +
+                        '<input type="checkbox" name="options" onchange="selectedTask(this)" id="' + area.id + '_' + i + '"> 稽查中' +
                         '</label></div>';
                 } else {
                     //进行中
                     temphtml = '<div class="btn-group btn_c" data-toggle="buttons" id="div_' + area.id + '_' + i + '" >' +
-                        '<label class="btn btn-info3" >' +
-                        '<input type="checkbox" name="options" onchange="selectedTask(this)" id="' + area.id + '_' + i + '"> 稽查中' +
+                        '<label class="btn btn-info5" >' +
+                        '<input type="checkbox" name="options" onchange="selectedTask(this)" id="' + area.id + '_' + i + '"> 已稽查' +
                         '</label></div>';
                 }
 

VisualInspection/qzd/js/task/new.js

@@ -80,6 +80,7 @@ function queryTask() {
         "startTime": getMomentTimeFormat(t.starttime),
         "endTime": getMomentTimeFormat(t.endtime),
         "dept": $("#deptlist").val(),
+        "isComplete":$("#isComplete").val()
         // "check_status": cur_status
     };
     var hide = false;
@@ -93,9 +94,11 @@ function queryTask() {
         { width: 80, text: '车牌号', type: 'string', flex: true, hide: hide, colClass: 'text-center', field: 'car_info' },
         { width: 80, text: '客户信息', type: 'string', flex: true, sort: 'down', colClass: 'text-center', field: 'car_user_info' },
         { width: 120, text: '接警时间', type: 'string', flex: true, sort: 'down', colClass: 'text-center', field: 'received_time' },
-        { width: 160, text: '出勤人员', type: 'string', flex: true, sort: 'down', colClass: 'text-center', field: 'userNames' },
+        { width: 160, text: '最后时间', type: 'string', flex: true, sort: 'down', colClass: 'text-center', field: 'last_time' },
+        { width: 120, text: '出勤人员', type: 'string', flex: true, sort: 'down', colClass: 'text-center', field: 'userNames' },
         // {width: 120, text: '状态', type: 'string', flex: true, colClass: '',field: 'check_status_name'}
     ];
+    user.roles[0].id = 20;
     if (user.roles[0].id == 20 || user.roles[0].id == 21) {
         var colFunc = { width: 160, text: '操作', type: 'string', flex: true, field: 'id', colClass: 'text-center' };
         colFunc.oper = $.zui.store.get("task_table_btn_1");
@@ -171,6 +174,7 @@ function queryTask() {
 
 
 function addTask() {
+    $('#modalTitle').html("新增清障记录");
     is_save = 0;
     resert();
     // var contenthtml =  base_ui_url+'qzd/view/task/addtask.html';
@@ -189,28 +193,48 @@ function checkUpdate(id) {
     var data = {
         "id": id
     };
+  
+    $('#modalTitle').html("修改清障记录");
     post_common_service('q/record/one', data, function(redata) {
         $('#addModal').modal('show');
         $("#type").val(redata.type);
         $("#carinfo").val(redata.car_info);
+        if(redata.arrive_time != null){
         var time = moment(redata.arrive_time).format("YYYY-MM-DD HH:mm:ss");
         $("#arrive_time").val(time);
+        }
+        if(redata.received_time != null){
         time = moment(redata.received_time).format("YYYY-MM-DD HH:mm:ss");
         $("#received_time").val(time);
+         }
+        if(redata.start_time != null){
         time = moment(redata.start_time).format("YYYY-MM-DD HH:mm:ss");
         $("#startTime").val(time);
+        }
+        if(redata.back_time != null){
         time = moment(redata.back_time).format("YYYY-MM-DD HH:mm:ss");
         $("#back_time").val(time);
+        }
+        if(redata.backfield_time != null){
         time = moment(redata.backfield_time).format("YYYY-MM-DD HH:mm:ss");
         $("#backfield_time").val(time);
+        }
+        if(redata.delivery_time != null){
         time = moment(redata.delivery_time).format("YYYY-MM-DD HH:mm:ss");
         $("#delivery_time").val(time);
+        }
+        if(redata.accept_time != null){
         time = moment(redata.accept_time).format("YYYY-MM-DD HH:mm:ss");
         $("#accept_time").val(time);
+        }
+        if(redata.rescue_time != null){
         time = moment(redata.rescue_time).format("YYYY-MM-DD HH:mm:ss");
         $("#rescue_time").val(time);
+        }
+        if(redata.relief_time != null){
         time = moment(redata.relief_time).format("YYYY-MM-DD HH:mm:ss");
         $("#relief_time").val(time);
+        }
         $("#carUserinfo").val(redata.car_user_info);
         $("#dept").val(redata.dept);
         setRecordUser();
@@ -242,6 +266,7 @@ function resert() {
     $("#arrive_time").val('');
     $("#received_time").val('');
     $("#startTime").val('');
+    $("#relief_time").val('');
     $("#back_time").val('');
     $("#backfield_time").val('');
     $("#delivery_time").val('');

VisualInspection/qzd/view/record/record_list.html

@@ -22,7 +22,15 @@
                         </select>
                     </div>
                 </div>
-
+                <div class="form-group col-sm-3">
+                    <label for="exampleInputAccount1" class="col-sm-4">是否完成</label>
+                    <div class="col-sm-8">
+                        <select class="form-control" id="isComplete">
+                            <option value="0">未完成</option>
+                            <option value="1">已完成</option>
+                        </select>
+                    </div>
+                </div>
 
                 <div class="form-group col-sm-2">
                     <button class="btn btn-info2 col-sm-1" style="width:80px;" type="button" onclick="queryTask()" style="">查询</button>
@@ -48,7 +56,7 @@
         <div class="modal-content">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span><span class="sr-only">关闭</span></button>
-                <h4 class="modal-title">新增清障记录</h4>
+                <h4 class="modal-title"><span id="modalTitle">新增清障记录<span></h4>
             </div>
             <div class="modal-body">
                 <link id="addrecord" rel="import" href="/qzd/view/task/addtask.html?__inline">

VisualInspection/qzd/view/task/addtask.html

@@ -263,41 +263,100 @@
         } else {
             unimpededInTime = 1;
         }
-        var userids = new Array();
-        userids = selectRecord.getSelectedItemsId();
-        console.log(userids);
-        var userid = userids.join(',');
+        // var userids = new Array();
+        // userids = selectRecord.getSelectedItemsId();
+        // var userid = userids.join(',');
 
         var data = {
-            'type': $("#type").val(),
-            'car_info': $("#carinfo").val(),
-            'received_time': moment($("#received_time").val()).format("YYYY-MM-DD HH:mm:ss"),
-            'car_user_info': $("#carUserinfo").val(),
-            'dept': $("#dept").val(),
-            'car_user_satisfaction': $("#carUserSatisfaction").val(),
-            'users': userid,
-            'arrive_time': moment($("#arrive_time").val()).format("YYYY-MM-DD HH:mm:ss"),
-            'back_time': moment($("#back_time").val()).format("YYYY-MM-DD HH:mm:ss"),
-            'delivery_time': moment($("#delivery_time").val()).format("YYYY-MM-DD HH:mm:ss"),
-            'accept_time': moment($("#accept_time").val()).format("YYYY-MM-DD HH:mm:ss"),
-            'rescue_time': moment($("#rescue_time").val()).format("YYYY-MM-DD HH:mm:ss"),
-            'relief_time': moment($("#relief_time").val()).format("YYYY-MM-DD HH:mm:ss"),
-            'backfield_time': moment($("#backfield_time").val()).format("YYYY-MM-DD HH:mm:ss"),
-            'start_time': moment($("#startTime").val()).format("YYYY-MM-DD HH:mm:ss"),
-            'arrive_in_time': arriveIntime,
-            'unimpeded_in_time': unimpededInTime,
-            'addr': $("#addr").val()
+            "isComplete":1
+        }  
+        if($("#backfield_time").val() != null && $("#backfield_time").val() !=''){
+                data.backfield_time =moment($("#backfield_time").val()).format("YYYY-MM-DD HH:mm:ss");
+        }else{
+                data.isComplete = 0;
         }
-        if (is_save == 0) {
-            post_common_service('q/record/add', data, function(redata) {
-                window.parent.location.reload();
-            });
-        } else {
-            data.id = is_save.split("_")[1];
-            console.log(data);
-            post_common_service('q/record/update', data, function(redata) {
-                window.parent.location.reload();
-            });
+        if($("#relief_time").val() != null && $("#relief_time").val() !=''){
+                data.relief_time =moment($("#relief_time").val()).format("YYYY-MM-DD HH:mm:ss");
+        }else{
+                data.isComplete = 0;
+        }
+        if($("#rescue_time").val() != null && $("#rescue_time").val() !=''){
+                data.rescue_time =moment($("#rescue_time").val()).format("YYYY-MM-DD HH:mm:ss");
+        }else{
+                data.isComplete = 0;
+        }
+        if($("#accept_time").val() != null && $("#accept_time").val() !=''){
+                data.accept_time =moment($("#accept_time").val()).format("YYYY-MM-DD HH:mm:ss");
+        }else{
+                data.isComplete = 0;
+        }
+        if($("#delivery_time").val() != null && $("#delivery_time").val() !=''){
+                data.delivery_time =moment($("#delivery_time").val()).format("YYYY-MM-DD HH:mm:ss");
+        }else{
+                data.isComplete = 0;
+        }
+        if($("#back_time").val() != null && $("#back_time").val() !=''){
+                data.back_time =moment($("#back_time").val()).format("YYYY-MM-DD HH:mm:ss");
+        }else{
+                data.isComplete = 0;
+        }
+        if($("#arrive_time").val() != null && $("#arrive_time").val() !=''){
+                data.arrive_time =moment($("#arrive_time").val()).format("YYYY-MM-DD HH:mm:ss");
+        }else{
+                data.isComplete = 0;
+        }
+        if($("#start_time").val() != null && $("#start_time").val() !=''){
+                data.start_time =moment($("#start_time").val()).format("YYYY-MM-DD HH:mm:ss");
+        }else{
+                data.isComplete = 0;
+        }
+        if($("#carinfo").val() != null && $("#carinfo").val() != ''){
+            data.car_info = $("#carinfo").val();
+            if($("#received_time").val() != null && $("#received_time").val() !=''){
+                data.received_time =moment($("#received_time").val()).format("YYYY-MM-DD HH:mm:ss");
+                if($("#carUserinfo").val() != null && $("#carUserinfo").val() !=''){
+                data.car_user_info =$("#carUserinfo").val();
+                if($("#dept").val() != null && $("#dept").val() !=''){
+                  data.dept =$("#dept").val();
+                  if($("#carUserSatisfaction").val() != null && $("#carUserSatisfaction").val() !=''){
+                        data.car_user_satisfaction =$("#carUserSatisfaction").val();
+                        if($("#addr").val() != null && $("#addr").val() !=''){
+                            data.addr =$("#addr").val();
+                            var userids = new Array();
+                            userids = selectRecord.getSelectedItemsId();
+                            if(userids != null && userids != ''){
+                                data.users  = userids.join(',');
+                                if (is_save == 0) {
+                                    post_common_service('q/record/add', data, function(redata) {
+                                        window.parent.location.reload();
+                                    });
+                                } else {
+                                    data.id = is_save.split("_")[1];
+                                    console.log(data);
+                                    post_common_service('q/record/update', data, function(redata) {
+                                        window.parent.location.reload();
+                                    });
+                                }
+                            }else{
+                                alert("请选择清障队员");
+                            }
+                        }else{
+                            alert("请输入桩号");
+                        }
+                    }else{
+                alert("请选择客户满意度");
+            }
+                }else{
+                alert("请选择清障队");
+            }
+                }else{
+                alert("请输入客户信息");
+            } 
+            }else{
+                alert("请输入接警时间");
+            }
+        }else{
+            alert("请输入车牌号");
         }
     }
 </script>

Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/FwqCheckTask.java

@@ -62,6 +62,8 @@ public class FwqCheckTask implements Serializable {
     private String appeal_result_name;
     //申诉id
     private Long appeal_id;
+    //状态
+    private String  status_name;
 
 
 //            `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '编号',

Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/QzdCheckTask.java

@@ -70,4 +70,6 @@ public class QzdCheckTask implements Serializable {
     private String videos;
     //清障记录图片
     private String pics;
+    //状态
+    private String  status_name;
 }

Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/QzdRecord.java

@@ -74,5 +74,8 @@ public class QzdRecord implements Serializable {
 
     private String rname;
 
+    private String last_time;
+
+    private  int isComplete;
 
 }

Visuallnspection_fjq/visuallnspectioninteface/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Thu Aug 16 09:45:08 CST 2018
+#Tue Aug 21 15:10:16 GMT+08:00 2018
 version=1.0-SNAPSHOT
 groupId=com.xintong.visuallnspection.inteface
 artifactId=visuallnspectioninteface

Visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/mapper/master/RecordMapper.xml

@@ -30,10 +30,10 @@
             parameterType="com.xintong.visualinspection.bean.QzdRecord">
         INSERT INTO record_info
         (type,users,dept,addr,received_time,car_info,car_user_info,start_time,arrive_time,back_time,record_user,arrive_in_time,unimpeded_in_time,car_user_satisfaction,videos
-        ,pics,zxt_is_standard,is_explain,record_no_come,take_photo_upload,arrive_do_work,remarks,delivery_time,accept_time,rescue_time,relief_time,backfield_time)
+        ,pics,zxt_is_standard,is_explain,record_no_come,take_photo_upload,arrive_do_work,remarks,delivery_time,accept_time,rescue_time,relief_time,backfield_time,isComplete)
         VALUES
         (#{type},#{users},#{dept},#{addr},#{received_time},#{car_info},#{car_user_info},#{start_time},#{arrive_time},#{back_time},#{record_user},#{arrive_in_time},#{unimpeded_in_time},#{car_user_satisfaction},#{videos}
-        ,#{pics},#{zxt_is_standard},#{is_explain},#{record_no_come},#{take_photo_upload},#{arrive_do_work},#{remarks},#{delivery_time},#{accept_time},#{rescue_time},#{relief_time},#{backfield_time}
+        ,#{pics},#{zxt_is_standard},#{is_explain},#{record_no_come},#{take_photo_upload},#{arrive_do_work},#{remarks},#{delivery_time},#{accept_time},#{rescue_time},#{relief_time},#{backfield_time},#{isComplete}
         )
     </insert>
 
@@ -68,6 +68,7 @@
         <if test="rescue_time != null">rescue_time = #{rescue_time},</if>
         <if test="relief_time != null">relief_time = #{relief_time},</if>
         <if test="backfield_time != null">backfield_time = #{backfield_time},</if>
+        <if test="isComplete != null">isComplete = #{isComplete},</if>
         id=#{id}
         WHERE
         id = #{id}
@@ -88,6 +89,7 @@
         where 1=1
   <if test="dept != null">and t.dept = #{dept}</if>
   <if test="startTime != null and endTime != null">and t.received_time between #{startTime} and #{endTime}</if>
+  <if test="isComplete != null">and t.isComplete = #{isComplete}</if>
         ORDER BY t.received_time DESC
     </select>
 

Visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/mapper/master/TaskMapper.xml

@@ -32,7 +32,7 @@
 
     <select id="getall" parameterType="com.xintong.visualinspection.bean.QzdCheckTask" resultType="com.xintong.visualinspection.bean.QzdCheckTask">
         select t.*,CONCAT(substr(t.start_time,1,16),'-',substr(t.end_time,12,5)) as check_period
-        ,ca.appeal_result as appeal_result,r.videos as recordVideos
+        ,ca.appeal_result as appeal_result,r.videos as recordVideos,r.pics as pics
         from check_task t
         left join record_info r on  t.record_id = r.id
         left join check_appeal ca on t.id=ca.task_id

Visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/service/impl/RecordServiceImpl.java

@@ -17,6 +17,7 @@ import com.xintong.visualinspection.service.RecordService_Q;
 import com.xintong.visualinspection.visuallnspection_qzd.dao.QzdRecordDao;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import java.text.SimpleDateFormat;
 
 import java.util.List;
 import java.util.Map;
@@ -49,7 +50,9 @@ public class RecordServiceImpl implements RecordService_Q {
         Map<Long, Organ> deptMap = commonService.getDeptMap();
         Map<Long, User> userMap = commonService.getUserMap();
         Map<String, Constant> codeMap = commonService.getCodeMap();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         for (QzdRecord qzdRecord1 : qzdRecordList) {
+            String lastTime = "";
             String users = qzdRecord1.getUsers();
             if (users != null && users != "") {
                 String[] usersdata = users.split(",");
@@ -66,6 +69,24 @@ public class RecordServiceImpl implements RecordService_Q {
                 }
                 qzdRecord1.setUserNames(names);
             }
+            if(qzdRecord1.getBackfield_time() != null){
+                     lastTime = "回场时间:"+sdf.format(qzdRecord1.getBackfield_time());
+            }else if(qzdRecord1.getRelief_time() != null){
+                lastTime = "解脱时间:"+sdf.format(qzdRecord1.getRelief_time());
+            }else if(qzdRecord1.getBack_time()!= null){
+                lastTime = "离场时间:"+sdf.format(qzdRecord1.getBack_time());
+            }else if(qzdRecord1.getRescue_time() != null){
+                lastTime = "施救时间:"+sdf.format(qzdRecord1.getRescue_time());
+            }else if(qzdRecord1.getArrive_time() != null){
+                lastTime = "到达时间:"+sdf.format(qzdRecord1.getArrive_time());
+            }else if(qzdRecord1.getStartTime() != null){
+                lastTime = "出发时间:"+sdf.format(qzdRecord1.getStartTime());
+            }else if(qzdRecord1.getAccept_time() != null){
+                lastTime = "接受时间:"+sdf.format(qzdRecord1.getAccept_time());
+            }else if(qzdRecord1.getDelivery_time() != null){
+                lastTime = "送达时间:"+sdf.format(qzdRecord1.getDelivery_time());
+            }
+            qzdRecord1.setLast_time(lastTime);
             if (qzdRecord1.getDept() != null) {
                 qzdRecord1.setDeptName(deptMap.get(Long.valueOf(qzdRecord1.getDept())).getOrganname());
             }
@@ -78,7 +99,6 @@ public class RecordServiceImpl implements RecordService_Q {
 
     @Override
     public void addRecord(QzdRecord qzdRecord) {
-
         qzdRecordDao.addRecord(qzdRecord);
     }