Merge remote-tracking branch 'origin/master' into master

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/dispatchRecord/DispatchExceptionController.java

@@ -12,6 +12,9 @@ import com.github.zuihou.business.dispatchRecord.entity.DispatchException;
 import com.github.zuihou.business.dispatchRecord.entity.DispatchRecord;
 import com.github.zuihou.business.dispatchRecord.service.DispatchExceptionService;
 import com.github.zuihou.business.dispatchRecord.service.DispatchRecordService;
+import com.github.zuihou.business.operationManagementCenter.entity.Order;
+import com.github.zuihou.business.productionReadyCenter.entity.AAutoNodeLog;
+import com.github.zuihou.common.util.DateUtil;
 import com.github.zuihou.database.mybatis.conditions.Wraps;
 import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
 import com.github.zuihou.database.mybatis.conditions.query.QueryWrap;
@@ -28,6 +31,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.lang.reflect.Field;
+import java.time.LocalDateTime;
+import java.util.Date;
 import java.util.Iterator;
 import java.util.Map;
 
@@ -46,6 +51,10 @@ public class DispatchExceptionController extends SuperSimpleController<DispatchE
         QueryWrap<DispatchException> wrap = handlerWrapper(null, params);
         LbqWrapper<DispatchException> wrapper = wrap.lambda();
         wrapper.like(DispatchException::getName, params.getModel().getName())
+                //.geHeader(DispatchException::getOperationTime, StrUtil.isEmpty(params.getModel().getOperationTime_st())?null: LocalDateTime.parse(params.getModel().getOperationTime_st()))
+                .ge(DispatchException::getOperationTime, DateUtil.stringToDate3(params.getModel().getOperationTime_st()))
+                .le(DispatchException::getOperationTime, DateUtil.stringToDate3(params.getModel().getOperationTime_ed()))
+//                .leFooter(DispatchException::getOperationTime, StrUtil.isEmpty(params.getModel().getOperationTime_ed())?null:LocalDateTime.parse(params.getModel().getOperationTime_ed()))
                 .orderByDesc(DispatchException::getCreateTime);
         baseService.page(page, wrapper);
         return this.success(page);

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/dispatchRecord/DispatchRecordController.java

@@ -8,9 +8,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.zuihou.base.R;
 import com.github.zuihou.base.controller.SuperSimpleController;
 import com.github.zuihou.base.request.PageParams;
+import com.github.zuihou.business.dispatchRecord.entity.DispatchException;
 import com.github.zuihou.business.dispatchRecord.entity.DispatchRecord;
 import com.github.zuihou.business.dispatchRecord.service.DispatchRecordService;
 import com.github.zuihou.business.productionResourceCenter.entity.Tool;
+import com.github.zuihou.common.util.DateUtil;
 import com.github.zuihou.database.mybatis.conditions.Wraps;
 import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
 import com.github.zuihou.database.mybatis.conditions.query.QueryWrap;
@@ -27,6 +29,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.lang.reflect.Field;
+import java.time.LocalDateTime;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -46,6 +49,8 @@ public class DispatchRecordController extends SuperSimpleController<DispatchReco
         QueryWrap<DispatchRecord> wrap = handlerWrapper(null, params);
         LbqWrapper<DispatchRecord> wrapper = wrap.lambda();
         wrapper.like(DispatchRecord::getName, params.getModel().getName())
+                .ge(DispatchRecord::getDistributeTime, StrUtil.isEmpty(params.getModel().getDistributeTime_st())?null: DateUtil.stringToDate3(params.getModel().getDistributeTime_st()))
+                .le(DispatchRecord::getDistributeTime, StrUtil.isEmpty(params.getModel().getDistributeTime_ed())?null:DateUtil.stringToDate3(params.getModel().getDistributeTime_ed()))
                 .orderByDesc(DispatchRecord::getCreateTime);
         baseService.page(page, wrapper);
         return this.success(page);

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/dispatchRecord/entity/DispatchException.java

@@ -48,6 +48,12 @@ public class DispatchException  extends Entity<Long> {
     @Excel(name = "状态(1-运行中2-执行失败3-发送失败)")
     private String status;
 
+    @TableField(exist = false)
+    private String operationTime_st;
+    @TableField(exist = false)
+    private String operationTime_ed;
+
+
     @Builder
     public DispatchException(LocalDateTime createTime, Long createUser, LocalDateTime updateTime, Long updateUser, String name, String device, LocalDateTime operationTime, String status) {
         this.name = name;

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/dispatchRecord/entity/DispatchRecord.java

@@ -41,6 +41,12 @@ public class DispatchRecord extends Entity<Long> {
     private LocalDateTime distributeTime;
 
 
+    @TableField(exist = false)
+    private String distributeTime_st;
+    @TableField(exist = false)
+    private String distributeTime_ed;
+
+
     @Builder
     public DispatchRecord(Long id, LocalDateTime createTime, Long updateUser, Long createUser, LocalDateTime updateTime,
                   LocalDateTime distributeTime, String name) {