MSI\liwei 7 лет назад
Родитель
Сommit
9be6f6a6bd

+ 8 - 3
VisualInspection/qzd/js/task/task_list.js

@@ -100,7 +100,8 @@ function queryTask() {
         "start_time": (start_time),
         "end_time": (end_time),
         "checked_dept": $("#qzd").val(),
-        "check_status": cur_status
+        "check_status": cur_status,
+        "hasScore": $("#hasScoreList").val(),
     };
     console.log(data);
     var hide = false;
@@ -224,13 +225,17 @@ function dispatchTaskById(id) {
 }
 
 function dispatchAllNoScoreTask() {
+    var start_time = "";
+    if ($("#start_time").val()) start_time = (moment($("#start_time").val()).subtract(1, "d")).format("YYYY-MM-DD") + " 23:00:00";
+    var end_time = "";
+    if ($("#end_time").val()) end_time = $("#end_time").val() + " 23:00:00";
     layer.confirm('确定下发选择时间内所有无扣分任务?', {
         btn: ['确定', '取消'] //按钮
     }, function() {
         var t = getTimeByMonth(GV("#start_time"));
         var param = {
-            "start_time": getMomentTimeFormat(t.starttime),
-            "end_time": getMomentTimeFormat(t.endtime),
+            "start_time": (start_time),
+            "end_time": (end_time),
         };
         no_return_common_service('/q/task/dispatchAllNoScoreTask', param, function(data) {
             queryTask();

+ 8 - 4
Visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/service/impl/CheckOtherService_FImpl.java

@@ -207,19 +207,23 @@ public class CheckOtherService_FImpl implements CheckOtherService_Q {
         String title = fwqCheckOther.getCheck_time_name();
         int checkType = fwqCheckOther.getCheck_type();
         fwqCheckOther.setCheck_period(title);
+       // String tableName = "fwq_other_check_info_anfang";
         if (checkType == 11 || checkType == 12 || checkType == 13 || checkType == 14) {
             Long id = 25L;
             if (checkType == 11) {
-                title += "月份服务区第三方暗访情况";
+                title += "月份清障队现场稽查";
+               // tableName = "fwq_other_check_info_onsite";
             }
             if (checkType == 12) {
-                title += "月份服务区第三方暗访情况";
+                title += "月份清障队第三方暗访情况";
+               // tableName = "fwq_other_check_info_anfang";
             }
             if (checkType == 13) {
-                title += "月份服务区第三方暗访情况";
+                title += "月份清障队96777";
+                //tableName = "fwq_other_check_info_anfang";
             }
             if (checkType == 14) {
-                title += "月份服务区第三方暗访情况";
+                title += "月份清障队其它稽查情况";
             }
             Map<String, Object> m = getCheckOtherStatistics(fwqCheckOther);
             Map<String, Object> map = new HashMap<>();