MSI\liwei 7 年 前
コミット
ca5d1616ef

+ 1 - 1
VisualInspection/fwq/view/task/chooseCheckman.html

@@ -1,5 +1,5 @@
 <div class="container-fluid ">
-    <div class="cards" id="user_container" style="height:200px;overflow:auto;">
+    <div class="cards" id="user_container" style="height:400px;overflow:auto;">
         <label for="exampleInputAccount1" class="col-sm-4">考核部门</label>
         <div class="col-sm-8">
             <select class="form-control" id="choseCheckmanList">

+ 26 - 3
VisualInspection/js/new.js

@@ -402,10 +402,33 @@ function menusuccess(data) {
 }
 
 function opennew(a,id){
-    var furl = ['','fwq/','qzd/','cd/']
+    var furl = ['','fwq/','qzd/','cd/'];
     $.zui.store.set("openid",id);
-   window.location.href = base_ui_url+ furl[a]+"view/main.html?";
-         //alert(url);
+    var user = $.zui.store.get("user");
+    if(user.roles[0].level > 2){
+        console.log(user);
+        if(a == 0){
+            if(user.position_name.indexOf('收费站') === 0 || user.position_name.indexOf('稽查') === 0){
+                window.location.href = base_ui_url+ furl[a]+"view/main.html?";
+            }else{
+                alert("权限不足");
+            }
+         }else if(a == 1){
+             if(user.position_name.indexOf('服务区') === 0 || user.position_name.indexOf('稽查') === 0){
+                 window.location.href = base_ui_url+ furl[a]+"view/main.html?";
+             }else{
+                 alert("权限不足");
+             }
+         }else if(a == 2){
+             if(user.position_name.indexOf('清障队') === 0 || user.position_name.indexOf('稽查') === 0 || user.position_name.indexOf('调度') === 0 || user.position_name.indexOf('内勤') === 0 || user.position_name.indexOf('队长') === 0){
+                 window.location.href = base_ui_url+ furl[a]+"view/main.html?";
+             }else{
+                 alert("权限不足");
+             }
+         }
+    }else{
+        window.location.href = base_ui_url+ furl[a]+"view/main.html?";
+    }
 
 }
 

+ 3 - 4
VisualInspection/qzd/js/task/add.js

@@ -72,7 +72,8 @@ function inittAreaable(time, dept) {
     var endtime = moment(t + "-25T23:00:00", "YYYY-MM-DD HH:mm:ss");
     var starttime = moment(moment(t + "-25T23:00:00", "YYYY-MM-DD HH:mm:ss").subtract(1, 'month'));
 
-    var param1 = { "startTime": getMomentTimeFormat(starttime), "endTime": getMomentTimeFormat(endtime), "checked_dept": dept }
+    var param1 = { "startTime": getMomentTimeFormat(starttime), "endTime": getMomentTimeFormat(endtime), "checked_dept": dept,"isComplete":1 }
+    console.log(param1);
 
 
 
@@ -85,6 +86,7 @@ function inittAreaable(time, dept) {
         //获取任务情况
         post_common_service("/q/task/getall/0/0", param1, function(taskdata) {
             taskMap = new HashMap();
+            console.log(recodedata);
             recodedata.forEach(r => {
                 taskdata.forEach(t => {
                     if (r.id == t.record_id) {
@@ -107,7 +109,6 @@ function inittAreaable(time, dept) {
                 }
             });
         });
-
         checkuserlist = redatatemp.checkusers;
 
 
@@ -417,7 +418,6 @@ function reloadtableData() {
     var tbhtml = "";
     var thhtml = "<thead><tr>";
     var tbodyhtml = "<tbody>";
-
     thhtml += "<th>" + "<button class='datatime' onclick='selectedall(this)' id='datatimebtn_" + i + "' style='width:100px;height:100%;background:rgba(0,0,0,0)'></button>" + "</th>";
 
     for (var i = 1; i <= days; i++) {
@@ -451,7 +451,6 @@ function reloadtableData() {
             if (taskMap.get(key) != null) {
                 //存在稽查记录
                 var list = taskMap.get(key);
-
                 list.forEach(r => {
                     var t = r.task;
                     //未生成任务

+ 28 - 9
VisualInspection/qzd/js/task/new.js

@@ -217,34 +217,53 @@ function checkUpdate(id) {
         $('#addModal').modal('show');
         $("#type").val(redata.type);
         $("#carinfo").val(redata.car_info);
-        var time = moment(redata.arrive_time).format("YYYY-MM-DD HH:mm:ss");
-        $("#arrive_time").val(time);
+        if(redata.arrive_time != null){
+            var time = moment(redata.arrive_time).format("YYYY-MM-DD HH:mm:ss");
+            $("#arrive_time").val(time);
+        }
+        if(redata.arrive_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();
-        $("#carUserSatisfaction").val(redata.car_user_satisfaction);
         var userids = redata.users.split(",");
-        setTimeout(function() {
-            for (var i in userids) {
-                $('span[data-id="' + userids[i] + '"] input').click();
-            }
-        }, 500);
+        setRecordUserID(userids);
+        $("#carUserSatisfaction").val(redata.car_user_satisfaction);
+      //  var userids = redata.users.split(",");
+        // setTimeout(function() {
+        //     for (var i in userids) {
+        //         $('span[data-id="' + userids[i] + '"] input').click();
+        //     }
+        // }, 500);
         $("#recordUser").val(redata.userNames);
         $("#addr").val(redata.addr);
     })

+ 35 - 2
VisualInspection/qzd/view/task/addtask.html

@@ -248,6 +248,39 @@
         });
     }
 
+function setRecordUserID(usersid) {
+        var dept = $("#dept").val();
+        var userData = {
+            "organid": dept
+        }
+        UserGetList(userData, function(data) {
+            console.log(data);
+            for (var index in data) {
+                var p = data[index];
+                p.title = p.truename;
+            }
+            if (selectRecord != null) {
+                $("#recordUser").val("");
+                selectRecord.unbind();
+                selectRecord.options = {
+                    source: data,
+                    isMultiple: true
+                };
+                selectRecord.closeDropDownMenu();
+                selectRecord.init();
+                $(".ComboTreeItemChlid").find("input").prop('checked', false);
+            } else {
+                selectRecord = $('#recordUser').comboTree({
+                    source: data,
+                    isMultiple: true
+                });
+            }
+            for (var i in usersid) {
+                $('span[data-id="' + usersid[i] + '"] input').click();
+            }
+        });
+    }
+
     function save() {
         var arriveIntime;
         var unimpededInTime;
@@ -305,8 +338,8 @@
         }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");
+        if($("#startTime").val() != null && $("#startTime").val() !=''){
+                data.start_time =moment($("#startTime").val()).format("YYYY-MM-DD HH:mm:ss");
         }else{
                 data.isComplete = 0;
         }

+ 109 - 0
VisualInspection_server/src/main/java/com/xintong/ConfirmTask.java

@@ -0,0 +1,109 @@
+package com.xintong;
+
+import com.alibaba.dubbo.config.annotation.Reference;
+
+import com.xintong.visualinspection.bean.Constant;
+import com.xintong.visualinspection.bean.FwqCheckTask;
+import com.xintong.visualinspection.bean.TaskStatus;
+import com.xintong.visualinspection.service.CommonService;
+import com.xintong.visualinspection.service.TaskService_F;
+import com.xintong.visualinspection.util.CacheUtil;
+import com.xintong.visualinspection.util.Constants;
+import org.junit.Test;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import org.thymeleaf.util.DateUtils;
+
+import java.lang.reflect.Array;
+import java.util.*;
+
+//@RunWith(SpringJUnit4ClassRunner.class)
+//@SpringBootTest(classes = TaskAutoGenApplication.class)
+@Component
+//@Configurable
+//@WebAppConfiguration
+public class ConfirmTask {
+	@Reference(version = "1.0.0",
+			application = "${dubbo.application.id}",
+			registry = "${dubbo.registry.address}")
+	private TaskService_F taskService;
+
+	@Reference(version = "1.0.0",
+			application = "${dubbo.application.id}",
+			registry = "${dubbo.registry.address}")
+	private CommonService commonService;
+
+
+	private static final org.slf4j.Logger logger = LoggerFactory.getLogger(ConfirmTask.class);
+
+	@Scheduled(cron = "0 0 0/1 * * ?")
+	@Test
+	public void confirmTasks() {
+		logger.info("任务确认检测开始---------");
+		checkConfirmTask();
+		checkConfirmAppealTask();
+		logger.info("任务确认检测结束---------");
+	}
+
+	@Test
+	public void checkConfirmTask() {
+		logger.info("开始检查未被确认任务----------");
+		FwqCheckTask task = new FwqCheckTask();
+		task.setCheck_status(Constants.STATUS_CHECK_DISPATCH);
+		Object unConfirmedTaskList = taskService.getAllTask(0, 0, task);
+		int taskConfirmDays = 4;
+		List<FwqCheckTask> list = (ArrayList<FwqCheckTask>) unConfirmedTaskList;
+		Map<String, Constant> codeMap = commonService.getCodeMap();
+		Date now = new Date();
+		int count = 0;
+		for (FwqCheckTask t : list) {
+			List<TaskStatus> taskStatusList = taskService.getTaskStatusList((long) t.getId());
+			if (taskStatusList != null && taskStatusList.size() > 0) {
+				TaskStatus taskStatus = taskStatusList.get(0);
+				long days = (now.getTime() - taskStatus.getUpdate_time().getTime()) / (1000 * 60 * 60 * 24);
+				if (days >= taskConfirmDays) {
+					t.setCheck_status(Constants.STATUS_CHECK_END);
+					taskService.updateStatus(t);
+					count++;
+				}
+			}
+			logger.info("结束检查未被确认任务----------,默认确认任务条数:" + count);
+		}
+	}
+
+	public void checkConfirmAppealTask() {
+		logger.info("开始检查未被确认申诉任务----------");
+		FwqCheckTask task = new FwqCheckTask();
+		task.setCheck_status(Constants.STATUS_APPEAL_CHECK_DISPATCH);
+		List<FwqCheckTask> unConfirmedTaskList = (ArrayList<FwqCheckTask>)taskService.getAllTask(0,0,task);
+		int taskConfirmDays = 3;
+		Constant constant = CacheUtil.codeMap.get("appeal_task_confirmed_days_1");
+		if(constant!=null)
+			taskConfirmDays = Integer.parseInt(constant.getCode_name());
+
+		Date now = new Date();
+		int count=0;
+		for(FwqCheckTask t:unConfirmedTaskList) {
+			List<TaskStatus> taskStatusList = taskService.getTaskStatusList((long) t.getId());
+			if(taskStatusList!=null && taskStatusList.size()>0) {
+				TaskStatus taskStatus = taskStatusList.get(0);
+				long days = (now.getTime()-taskStatus.getUpdate_time().getTime())/(1000*60*60*24);
+				if(days>=taskConfirmDays){
+					t.setCheck_status(Constants.STATUS_APPEAL_CHECK_CONFIRMED);
+					taskService.updateStatus(t);
+					count++;
+				}
+			}
+		}
+		logger.info("结束检查未被确认申诉任务----------,默认确认任务条数:"+count);
+	}
+
+	public static void main(String[] args) {
+		Calendar cal = Calendar.getInstance();
+		cal.add(Calendar.DAY_OF_MONTH, -1);
+		cal.set(Calendar.MINUTE, 120);
+		System.out.println(DateUtils.format(cal, Locale.CHINA));
+	}
+}

+ 2 - 0
Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/util/Constants.java

@@ -12,6 +12,8 @@ public class Constants {
 	public static int STATUS_APPEALING = 11;
 	public static int STATUS_APPEAL_SUCCEED = 12;
 	public static int STATUS_APPEAL_FAILED = 13;
+	public static int STATUS_APPEAL_CHECK_DISPATCH = 15;
+	public static int STATUS_APPEAL_CHECK_CONFIRMED = 16;
 	public static int STATUS_APPLYING = 21;
 	public static int STATUS_APPLY_SUCCEED = 22;
 	public static int STATUS_APPLY_FAILED = 23;