11

youxiw2000
1 parent c8ebd547
Showing 7 changed files with 44 additions and 44 deletions
trash-ui/src/views/business/threeHistory/index.vue
trash-workFlow/src/main/java/com/trash/business/controller/SupervisionThreestepController.java
trash-workFlow/src/main/java/com/trash/business/service/impl/SupervisionThreestepServiceImpl.java
trash-workFlow/src/main/java/com/trash/business/service/impl/ThreestepHistoryServiceImpl.java
trash-workFlow/src/main/java/com/trash/business/service/impl/TruckActivateServiceImpl.java
trash-workFlow/src/main/resources/mapper/TruckActivateMapper.xml
trash-workFlow/src/main/resources/mapper/casefile/ViolationWarningInformationMapper.xml
@@ -271,8 +271,8 @@ export default {
       if(date.getHours() < 8){
           d -= 1;
       }
-      let start = date.getFullYear() + "-" +  (date.getMonth()+1) + "-" + d + " 08:00:00"
-      let end = date.getFullYear() + "-" +  (date.getMonth()+1) + "-" + (d+1) + " 08:00:00"
+      let start = date.getFullYear() + "-" +  (date.getMonth()+1) + "-" + d + " 06:00:00"
+      let end = date.getFullYear() + "-" +  (date.getMonth()+1) + "-" + (d+1) + " 06:00:00"
       this.workQuery.name = null;
       this.workQuery.workStartTime = start;
@@ -96,7 +96,7 @@ public class SupervisionThreestepController extends BaseController {
 			SimpleDateFormat dateTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 			Date date = new Date();
-			if (new Date().getHours() < 8) {
+			if (new Date().getHours() < 6) {
 				end = yearFomat.format(date);
 				date.setDate(date.getDate() - 1);
 				start = yearFomat.format(date);
@@ -106,8 +106,8 @@ public class SupervisionThreestepController extends BaseController {
 				end = yearFomat.format(date);
 			}
-			end += " 8:00:00";
-			start += " 8:00:00";
+			end += " 6:00:00";
+			start += " 6:00:00";
 			try {
 				supervisionThreestep.setWorkStartTime(dateTime.parse(start));
@@ -90,7 +90,7 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 			SimpleDateFormat dateTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 			Date date = new Date();
-			if (new Date().getHours() < 8) {
+			if (new Date().getHours() < 6) {
 				end = yearFomat.format(date);
 				date.setDate(date.getDate() - 1);
 				start = yearFomat.format(date);
@@ -100,8 +100,8 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 				end = yearFomat.format(date);
 			}
-			end += " 8:00:00";
-			start += " 8:00:00";
+			end += " 6:00:00";
+			start += " 6:00:00";
 			try {
 				supervisionThreestep.setWorkStartTime(dateTime.parse(start));
@@ -237,7 +237,7 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 			SimpleDateFormat dateTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 			Date date = new Date();
-			if (new Date().getHours() < 8) {
+			if (new Date().getHours() < 6) {
 				end = yearFomat.format(date);
 				date.setDate(date.getDate() - 1);
 				start = yearFomat.format(date);
@@ -247,8 +247,8 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 				end = yearFomat.format(date);
 			}
-			end += " 8:00:00";
-			start += " 8:00:00";
+			end += " 6:00:00";
+			start += " 6:00:00";
 			try {
 				supervisionThreestep.setWorkStartTime(dateTime.parse(start));
@@ -290,7 +290,7 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 			Date date = new Date();
-			if (new Date().getHours() < 8) {
+			if (new Date().getHours() < 6) {
 				end = yearFomat.format(date);
 				date.setDate(date.getDate() - 1);
 				start = yearFomat.format(date);
@@ -300,8 +300,8 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 				end = yearFomat.format(date);
 			}
-			end += " 8:00:00";
-			start += " 8:00:00";
+			end += " 6:00:00";
+			start += " 6:00:00";
 			try {
 				supervisionThreestep.setWorkStartTime(dateTime.parse(start));
@@ -580,7 +580,7 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 		if (supervisionThreestep.getWorkStartTime() == null) {
 			String start, end;
-			if (new Date().getHours() < 8) {
+			if (new Date().getHours() < 6) {
 				end = yearFomat.format(date);
 				date.setDate(date.getDate() - 1);
 				start = yearFomat.format(date);
@@ -591,7 +591,7 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 			}
 			end += " 4:00:00";
-			start += " 8:00:00";
+			start += " 6:00:00";
 			try {
 				supervisionThreestep.setWorkStartTime(dateTime.parse(start));
@@ -643,7 +643,7 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 			Date date = new Date();
-			if (new Date().getHours() < 8) {
+			if (new Date().getHours() < 6) {
 				end = yearFomat.format(date);
 				date.setDate(date.getDate() - 1);
 				start = yearFomat.format(date);
@@ -654,7 +654,7 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 			}
 			end += " 4:00:00";
-			start += " 8:00:00";
+			start += " 6:00:00";
 			try {
 				supervisionThreestep.setWorkStartTime(dateTime.parse(start));
@@ -727,7 +727,7 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 	@Transactional
 	public int insertSupervisionThreestep(SupervisionThreestep supervisionThreestep) {
-		if (new Date().getHours() > -1 && new Date().getHours() < 8) {
+		if (new Date().getHours() > -1 && new Date().getHours() < 6) {
 			return -2;
 		}
@@ -741,7 +741,7 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 			Date date = new Date();
-			if (new Date().getHours() < 8) {
+			if (new Date().getHours() < 6) {
 				end = yearFomat.format(date);
 				date.setDate(date.getDate() - 1);
 				start = yearFomat.format(date);
@@ -751,8 +751,8 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 				end = yearFomat.format(date);
 			}
-			end += " 8:00:00";
-			start += " 8:00:00";
+			end += " 6:00:00";
+			start += " 6:00:00";
 			try {
 				supervisionThreestep.setWorkStartTime(dateTime.parse(start));
@@ -908,7 +908,7 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 					Date date = new Date();
-					if (new Date().getHours() < 8) {
+					if (new Date().getHours() < 6) {
 						end = yearFomat.format(date);
 						date.setDate(date.getDate() - 1);
 						start = yearFomat.format(date);
@@ -918,8 +918,8 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 						end = yearFomat.format(date);
 					}
-					end += " 8:00:00";
-					start += " 8:00:00";
+					end += " 6:00:00";
+					start += " 6:00:00";
 					try {
 						sp.setWorkStartTime(dateTime.parse(start));
@@ -1088,8 +1088,8 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 		date.setDate(date.getDate() - 1);
 		start = yearFomat.format(date);
-		end += " 8:00:00";
-		start += " 8:00:00";
+		end += " 6:00:00";
+		start += " 6:00:00";
 		try {
 			supervisionThreestep.setWorkStartTime(dateTime.parse(start));
@@ -1165,7 +1165,7 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 			Date date = new Date();
-			if (new Date().getHours() < 8) {
+			if (new Date().getHours() < 6) {
 				end = yearFomat.format(date);
 				date.setDate(date.getDate() - 1);
 				start = yearFomat.format(date);
@@ -1175,8 +1175,8 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 				end = yearFomat.format(date);
 			}
-			end += " 08:00:00";
-			start += " 08:00:00";
+			end += " 06:00:00";
+			start += " 06:00:00";
 			try {
 				supervisionThreestep.setWorkStartTime(dateTime.parse(start));
@@ -139,7 +139,7 @@ public class ThreestepHistoryServiceImpl implements IThreestepHistoryService
 		SimpleDateFormat yearFomat = new SimpleDateFormat("yyyy-MM-dd");
 		Date date = new Date();
-		if (new Date().getHours() < 8) {
+		if (new Date().getHours() < 6) {
 			end = yearFomat.format(date);
 			date.setDate(date.getDate() - 1);
 			start = yearFomat.format(date);
@@ -149,8 +149,8 @@ public class ThreestepHistoryServiceImpl implements IThreestepHistoryService
 			end = yearFomat.format(date);
 		}
-		end += " 8:00:00";
-		start += " 8:00:00";
+		end += " 6:00:00";
+		start += " 6:00:00";
 		try {
 			threestep.setWorkStartTime(yearFomat.parse(start));
@@ -199,7 +199,7 @@ public class TruckActivateServiceImpl implements ITruckActivateService {
 		SimpleDateFormat dateTimeFomat = new SimpleDateFormat("yyyy-MM-dd HH:mm:SS");
 		Date date = new Date();
-		if (new Date().getHours() < 8) {
+		if (new Date().getHours() < 6) {
 			end = yearFomat.format(date);
 			date.setDate(date.getDate() - 1);
 			start = yearFomat.format(date);
@@ -209,8 +209,8 @@ public class TruckActivateServiceImpl implements ITruckActivateService {
 			end = yearFomat.format(date);
 		}
-		end += " 08:00:00";
-		start += " 08:00:00";
+		end += " 06:00:00";
+		start += " 06:00:00";
 		String[] objs = truckActivate.getObjectId().split(",");
 		String[] nos = truckActivate.getLicensePlate().split(",");
@@ -468,7 +468,7 @@ public class TruckActivateServiceImpl implements ITruckActivateService {
 			Date date = new Date();
-			if (new Date().getHours() < 8) {
+			if (new Date().getHours() < 6) {
 				end = yearFomat.format(date);
 				date.setDate(date.getDate() - 1);
 				start = yearFomat.format(date);
@@ -478,8 +478,8 @@ public class TruckActivateServiceImpl implements ITruckActivateService {
 				end = yearFomat.format(date);
 			}
-			end += " 08:00:00";
-			start += " 08:00:00";
+			end += " 06:00:00";
+			start += " 06:00:00";
 			try {
 				turck.setStartTime(start);
@@ -575,7 +575,7 @@ public class TruckActivateServiceImpl implements ITruckActivateService {
 			Date date = new Date();
-			if (new Date().getHours() < 8) {
+			if (new Date().getHours() < 6) {
 				end = yearFomat.format(date);
 				date.setDate(date.getDate() - 1);
 				start = yearFomat.format(date);
@@ -585,8 +585,8 @@ public class TruckActivateServiceImpl implements ITruckActivateService {
 				end = yearFomat.format(date);
 			}
-			end += " 08:00:00";
-			start += " 08:00:00";
+			end += " 06:00:00";
+			start += " 06:00:00";
 			try {
 				truckActivate.setStartTime(start);
@@ -224,7 +224,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
     </update>
     <update id="endAllTurckUnActive" parameterType="TruckActivate">
-        update truck_activate set status = 1 where create_time &lt; DATE_FORMAT(NOW(),"%y-%m-%d 08:00:00")
+        update truck_activate set status = 1 where create_time &lt; DATE_FORMAT(NOW(),"%y-%m-%d 06:00:00")
     </update>
@@ -80,7 +80,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
         <where>
             <if test="projectName!=null">project_name = #{projectName}</if>
             <if test="companyName!=null">company_name = #{companyName}</if>
-            and violation_type = #{type} and create_time between CONCAT(#{nowDate},' 08:00:00') and CONCAT(#{tomorrowDate},' 07:59:59')
+            and violation_type = #{type} and create_time between CONCAT(#{nowDate},' 06:00:00') and CONCAT(#{tomorrowDate},' 05:59:59')
         </where>
     </select>