m

youxiw2000
1 parent 420016c1
Showing 6 changed files with 32 additions and 16 deletions
trash-admin/src/main/resources/application-dev.yml
trash-quartz/src/main/java/com/trash/quartz/task/DriverTask.java
trash-ui/src/api/dayWorkReport.js
trash-ui/src/views/business/dayWorkReport/index.vue
trash-workFlow/src/main/java/com/trash/business/domain/SupervisionThreestep.java
trash-workFlow/src/main/java/com/trash/business/service/impl/SupervisionThreestepServiceImpl.java
@@ -29,7 +29,7 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://192.168.168.141:3306/trash?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
+                url: jdbc:mysql://localhost:3306/trash?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
                 username: root
                 password: root
             # 从库数据源
@@ -87,7 +87,8 @@ public class DriverTask
     @SuppressWarnings("deprecation")
 	private void checkTruckActive() {
     	int hour = new Date().getHours();
-    	if(hour > 4 && hour < 8){
+    	int minute = new Date().getMinutes();
+    	if(hour > 4 && hour < 8 && (hour>3 && minute>55)){
     		return;
     	}
@@ -68,6 +68,7 @@ export default {
         earthsitesName: null,
         place: null,
         subReason: null,
+        timeRange:null,
       },
       // 表单参数
       form: {},
@@ -145,6 +146,11 @@ export default {
       this.queryParams.page = 1;
       this.queryParams.pageSize = 9999;
+      if(this.queryParams.timeRange){
+        this.queryParams.workStartTime = this.queryParams.timeRange[0];
+        this.queryParams.workEndTime =  this.queryParams.timeRange[1];
+        this.queryParams.timeRange = null;
+      }
       dayWorkList(this.queryParams).then(response => {
@@ -219,7 +225,7 @@ export default {
     },
     /** 查询开工报表列表 */
     getList(tabIdx) {
-
+      debugger;
       this.loading = this.$loading({
                 lock: true,
                 text: 'Loading',
@@ -238,6 +244,12 @@ export default {
         this.queryParams.his = tabIdx;
       }
+      if(this.queryParams.timeRange){
+        this.queryParams.workStartTime = this.queryParams.timeRange[0];
+        this.queryParams.workEndTime =  this.queryParams.timeRange[1];
+        this.queryParams.timeRange = null;
+      }
+
       dayWorkList(this.queryParams).then(response => {
           this.threestepList = response.rows;
@@ -295,6 +307,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams.timeRange = null;
       this.queryParams.workEndTime = null;
       this.queryParams.workStartTime = null;
       this.queryParams.subReason = null;
@@ -40,17 +40,16 @@
       <el-row>
         <el-col :span="6">
       <el-form-item label="开始时间" v-if="this.queryParams.his==1">
-        <el-date-picker  size="small" style="width: 200px" v-model="queryParams.workStartTime" type="date"
-          value-format="yyyy-MM-dd" placeholder="开始时间" >
-        </el-date-picker>
-      </el-form-item>
- </el-col>
-        <el-col :span="6">
-      <el-form-item label="结束时间"  v-if="this.queryParams.his==1">
-        <el-date-picker  size="small" style="width: 200px" v-model="queryParams.workEndTime" type="date"
-          value-format="yyyy-MM-dd" placeholder="结束时间">
-        </el-date-picker>
+            <el-date-picker
+              v-model="queryParams.timeRange"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              type="datetimerange"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期">
+            </el-date-picker>
       </el-form-item>
+        </el-col>
       </el-col>
       </el-row>
@@ -134,7 +134,8 @@ public class SupervisionThreestep extends BaseEntity
     private Date workStartTime;
     private Date workEndTime;
-    private String his;
+
+	private String his;
 	public String getHis() {
@@ -204,8 +204,8 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 			start += " 8:00:00";
 			try {
-				supervisionThreestep.setWorkStartTime(yearFomat.parse(start));
-				supervisionThreestep.setWorkEndTime(yearFomat.parse(end));
+				supervisionThreestep.setWorkStartTime(dateTime.parse(start));
+				supervisionThreestep.setWorkEndTime(dateTime.parse(end));
 			} catch (Exception e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
@@ -219,6 +219,8 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 					e.printStackTrace();
 				}
 			}
+		}else{
+			
 		}