youxiw2000 / trash · Commits

Commit 1d38768e6f4235b842616395ba99afe750b8952a

Authored by youxiw2000
1 parent c8ebd547

11

Inline Side-by-side
Showing 7 changed files with 44 additions and 44 deletions
trash-ui/src/views/business/threeHistory/index.vue
  View file @1d38768
... ... @@ -271,8 +271,8 @@ export default {
271 271 if(date.getHours() < 8){
272 272 d -= 1;
273 273 }
274   - let start = date.getFullYear() + "-" + (date.getMonth()+1) + "-" + d + " 08:00:00"
275   - let end = date.getFullYear() + "-" + (date.getMonth()+1) + "-" + (d+1) + " 08:00:00"
  274 + let start = date.getFullYear() + "-" + (date.getMonth()+1) + "-" + d + " 06:00:00"
  275 + let end = date.getFullYear() + "-" + (date.getMonth()+1) + "-" + (d+1) + " 06:00:00"
276 276  
277 277 this.workQuery.name = null;
278 278 this.workQuery.workStartTime = start;
... ...
trash-workFlow/src/main/java/com/trash/business/controller/SupervisionThreestepController.java
  View file @1d38768
... ... @@ -96,7 +96,7 @@ public class SupervisionThreestepController extends BaseController {
96 96 SimpleDateFormat dateTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
97 97 Date date = new Date();
98 98  
99   - if (new Date().getHours() < 8) {
  99 + if (new Date().getHours() < 6) {
100 100 end = yearFomat.format(date);
101 101 date.setDate(date.getDate() - 1);
102 102 start = yearFomat.format(date);
... ... @@ -106,8 +106,8 @@ public class SupervisionThreestepController extends BaseController {
106 106 end = yearFomat.format(date);
107 107 }
108 108  
109   - end += " 8:00:00";
110   - start += " 8:00:00";
  109 + end += " 6:00:00";
  110 + start += " 6:00:00";
111 111  
112 112 try {
113 113 supervisionThreestep.setWorkStartTime(dateTime.parse(start));
... ...
trash-workFlow/src/main/java/com/trash/business/service/impl/SupervisionThreestepServiceImpl.java
  View file @1d38768
... ... @@ -90,7 +90,7 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
90 90 SimpleDateFormat dateTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
91 91 Date date = new Date();
92 92  
93   - if (new Date().getHours() < 8) {
  93 + if (new Date().getHours() < 6) {
94 94 end = yearFomat.format(date);
95 95 date.setDate(date.getDate() - 1);
96 96 start = yearFomat.format(date);
... ... @@ -100,8 +100,8 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
100 100 end = yearFomat.format(date);
101 101 }
102 102  
103   - end += " 8:00:00";
104   - start += " 8:00:00";
  103 + end += " 6:00:00";
  104 + start += " 6:00:00";
105 105  
106 106 try {
107 107 supervisionThreestep.setWorkStartTime(dateTime.parse(start));
... ... @@ -237,7 +237,7 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
237 237 SimpleDateFormat dateTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
238 238 Date date = new Date();
239 239  
240   - if (new Date().getHours() < 8) {
  240 + if (new Date().getHours() < 6) {
241 241 end = yearFomat.format(date);
242 242 date.setDate(date.getDate() - 1);
243 243 start = yearFomat.format(date);
... ... @@ -247,8 +247,8 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
247 247 end = yearFomat.format(date);
248 248 }
249 249  
250   - end += " 8:00:00";
251   - start += " 8:00:00";
  250 + end += " 6:00:00";
  251 + start += " 6:00:00";
252 252  
253 253 try {
254 254 supervisionThreestep.setWorkStartTime(dateTime.parse(start));
... ... @@ -290,7 +290,7 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
290 290  
291 291 Date date = new Date();
292 292  
293   - if (new Date().getHours() < 8) {
  293 + if (new Date().getHours() < 6) {
294 294 end = yearFomat.format(date);
295 295 date.setDate(date.getDate() - 1);
296 296 start = yearFomat.format(date);
... ... @@ -300,8 +300,8 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
300 300 end = yearFomat.format(date);
301 301 }
302 302  
303   - end += " 8:00:00";
304   - start += " 8:00:00";
  303 + end += " 6:00:00";
  304 + start += " 6:00:00";
305 305  
306 306 try {
307 307 supervisionThreestep.setWorkStartTime(dateTime.parse(start));
... ... @@ -580,7 +580,7 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
580 580 if (supervisionThreestep.getWorkStartTime() == null) {
581 581 String start, end;
582 582  
583   - if (new Date().getHours() < 8) {
  583 + if (new Date().getHours() < 6) {
584 584 end = yearFomat.format(date);
585 585 date.setDate(date.getDate() - 1);
586 586 start = yearFomat.format(date);
... ... @@ -591,7 +591,7 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
591 591 }
592 592  
593 593 end += " 4:00:00";
594   - start += " 8:00:00";
  594 + start += " 6:00:00";
595 595  
596 596 try {
597 597 supervisionThreestep.setWorkStartTime(dateTime.parse(start));
... ... @@ -643,7 +643,7 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
643 643  
644 644 Date date = new Date();
645 645  
646   - if (new Date().getHours() < 8) {
  646 + if (new Date().getHours() < 6) {
647 647 end = yearFomat.format(date);
648 648 date.setDate(date.getDate() - 1);
649 649 start = yearFomat.format(date);
... ... @@ -654,7 +654,7 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
654 654 }
655 655  
656 656 end += " 4:00:00";
657   - start += " 8:00:00";
  657 + start += " 6:00:00";
658 658  
659 659 try {
660 660 supervisionThreestep.setWorkStartTime(dateTime.parse(start));
... ... @@ -727,7 +727,7 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
727 727 @Transactional
728 728 public int insertSupervisionThreestep(SupervisionThreestep supervisionThreestep) {
729 729  
730   - if (new Date().getHours() > -1 && new Date().getHours() < 8) {
  730 + if (new Date().getHours() > -1 && new Date().getHours() < 6) {
731 731 return -2;
732 732 }
733 733  
... ... @@ -741,7 +741,7 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
741 741  
742 742 Date date = new Date();
743 743  
744   - if (new Date().getHours() < 8) {
  744 + if (new Date().getHours() < 6) {
745 745 end = yearFomat.format(date);
746 746 date.setDate(date.getDate() - 1);
747 747 start = yearFomat.format(date);
... ... @@ -751,8 +751,8 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
751 751 end = yearFomat.format(date);
752 752 }
753 753  
754   - end += " 8:00:00";
755   - start += " 8:00:00";
  754 + end += " 6:00:00";
  755 + start += " 6:00:00";
756 756  
757 757 try {
758 758 supervisionThreestep.setWorkStartTime(dateTime.parse(start));
... ... @@ -908,7 +908,7 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
908 908  
909 909 Date date = new Date();
910 910  
911   - if (new Date().getHours() < 8) {
  911 + if (new Date().getHours() < 6) {
912 912 end = yearFomat.format(date);
913 913 date.setDate(date.getDate() - 1);
914 914 start = yearFomat.format(date);
... ... @@ -918,8 +918,8 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
918 918 end = yearFomat.format(date);
919 919 }
920 920  
921   - end += " 8:00:00";
922   - start += " 8:00:00";
  921 + end += " 6:00:00";
  922 + start += " 6:00:00";
923 923  
924 924 try {
925 925 sp.setWorkStartTime(dateTime.parse(start));
... ... @@ -1088,8 +1088,8 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
1088 1088 date.setDate(date.getDate() - 1);
1089 1089 start = yearFomat.format(date);
1090 1090  
1091   - end += " 8:00:00";
1092   - start += " 8:00:00";
  1091 + end += " 6:00:00";
  1092 + start += " 6:00:00";
1093 1093  
1094 1094 try {
1095 1095 supervisionThreestep.setWorkStartTime(dateTime.parse(start));
... ... @@ -1165,7 +1165,7 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
1165 1165  
1166 1166 Date date = new Date();
1167 1167  
1168   - if (new Date().getHours() < 8) {
  1168 + if (new Date().getHours() < 6) {
1169 1169 end = yearFomat.format(date);
1170 1170 date.setDate(date.getDate() - 1);
1171 1171 start = yearFomat.format(date);
... ... @@ -1175,8 +1175,8 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
1175 1175 end = yearFomat.format(date);
1176 1176 }
1177 1177  
1178   - end += " 08:00:00";
1179   - start += " 08:00:00";
  1178 + end += " 06:00:00";
  1179 + start += " 06:00:00";
1180 1180  
1181 1181 try {
1182 1182 supervisionThreestep.setWorkStartTime(dateTime.parse(start));
... ...
trash-workFlow/src/main/java/com/trash/business/service/impl/ThreestepHistoryServiceImpl.java
  View file @1d38768
... ... @@ -139,7 +139,7 @@ public class ThreestepHistoryServiceImpl implements IThreestepHistoryService
139 139 SimpleDateFormat yearFomat = new SimpleDateFormat("yyyy-MM-dd");
140 140 Date date = new Date();
141 141  
142   - if (new Date().getHours() < 8) {
  142 + if (new Date().getHours() < 6) {
143 143 end = yearFomat.format(date);
144 144 date.setDate(date.getDate() - 1);
145 145 start = yearFomat.format(date);
... ... @@ -149,8 +149,8 @@ public class ThreestepHistoryServiceImpl implements IThreestepHistoryService
149 149 end = yearFomat.format(date);
150 150 }
151 151  
152   - end += " 8:00:00";
153   - start += " 8:00:00";
  152 + end += " 6:00:00";
  153 + start += " 6:00:00";
154 154  
155 155 try {
156 156 threestep.setWorkStartTime(yearFomat.parse(start));
... ...
trash-workFlow/src/main/java/com/trash/business/service/impl/TruckActivateServiceImpl.java
  View file @1d38768
... ... @@ -199,7 +199,7 @@ public class TruckActivateServiceImpl implements ITruckActivateService {
199 199 SimpleDateFormat dateTimeFomat = new SimpleDateFormat("yyyy-MM-dd HH:mm:SS");
200 200 Date date = new Date();
201 201  
202   - if (new Date().getHours() < 8) {
  202 + if (new Date().getHours() < 6) {
203 203 end = yearFomat.format(date);
204 204 date.setDate(date.getDate() - 1);
205 205 start = yearFomat.format(date);
... ... @@ -209,8 +209,8 @@ public class TruckActivateServiceImpl implements ITruckActivateService {
209 209 end = yearFomat.format(date);
210 210 }
211 211  
212   - end += " 08:00:00";
213   - start += " 08:00:00";
  212 + end += " 06:00:00";
  213 + start += " 06:00:00";
214 214  
215 215 String[] objs = truckActivate.getObjectId().split(",");
216 216 String[] nos = truckActivate.getLicensePlate().split(",");
... ... @@ -468,7 +468,7 @@ public class TruckActivateServiceImpl implements ITruckActivateService {
468 468  
469 469 Date date = new Date();
470 470  
471   - if (new Date().getHours() < 8) {
  471 + if (new Date().getHours() < 6) {
472 472 end = yearFomat.format(date);
473 473 date.setDate(date.getDate() - 1);
474 474 start = yearFomat.format(date);
... ... @@ -478,8 +478,8 @@ public class TruckActivateServiceImpl implements ITruckActivateService {
478 478 end = yearFomat.format(date);
479 479 }
480 480  
481   - end += " 08:00:00";
482   - start += " 08:00:00";
  481 + end += " 06:00:00";
  482 + start += " 06:00:00";
483 483  
484 484 try {
485 485 turck.setStartTime(start);
... ... @@ -575,7 +575,7 @@ public class TruckActivateServiceImpl implements ITruckActivateService {
575 575  
576 576 Date date = new Date();
577 577  
578   - if (new Date().getHours() < 8) {
  578 + if (new Date().getHours() < 6) {
579 579 end = yearFomat.format(date);
580 580 date.setDate(date.getDate() - 1);
581 581 start = yearFomat.format(date);
... ... @@ -585,8 +585,8 @@ public class TruckActivateServiceImpl implements ITruckActivateService {
585 585 end = yearFomat.format(date);
586 586 }
587 587  
588   - end += " 08:00:00";
589   - start += " 08:00:00";
  588 + end += " 06:00:00";
  589 + start += " 06:00:00";
590 590  
591 591 try {
592 592 truckActivate.setStartTime(start);
... ...
trash-workFlow/src/main/resources/mapper/TruckActivateMapper.xml
  View file @1d38768
... ... @@ -224,7 +224,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
224 224 </update>
225 225  
226 226 <update id="endAllTurckUnActive" parameterType="TruckActivate">
227   - update truck_activate set status = 1 where create_time &lt; DATE_FORMAT(NOW(),"%y-%m-%d 08:00:00")
  227 + update truck_activate set status = 1 where create_time &lt; DATE_FORMAT(NOW(),"%y-%m-%d 06:00:00")
228 228 </update>
229 229  
230 230  
... ...
trash-workFlow/src/main/resources/mapper/casefile/ViolationWarningInformationMapper.xml
  View file @1d38768
... ... @@ -80,7 +80,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
80 80 <where>
81 81 <if test="projectName!=null">project_name = #{projectName}</if>
82 82 <if test="companyName!=null">company_name = #{companyName}</if>
83   - and violation_type = #{type} and create_time between CONCAT(#{nowDate},' 08:00:00') and CONCAT(#{tomorrowDate},' 07:59:59')
  83 + and violation_type = #{type} and create_time between CONCAT(#{nowDate},' 06:00:00') and CONCAT(#{tomorrowDate},' 05:59:59')
84 84 </where>
85 85 </select>
86 86  
... ...