feat: 接口添加创建人(create_by)逻辑

entity/src/main/java/com/onsiteservice/entity/order/ServiceOrder.java

@@ -125,5 +125,14 @@ public class ServiceOrder implements Serializable {
     @ApiModelProperty("修改时间")
     private Date modifyTime;
 
+    @Column(name = "create_by")
+    @ApiModelProperty("创建人")
+    private Long createBy;
+
+    @Column(name = "modify_by")
+    @ApiModelProperty("修改人")
+    private Long modifyBy;
+
+
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file

entity/src/main/java/com/onsiteservice/entity/service/ServiceValuatorAssign.java

@@ -58,14 +58,13 @@ public class ServiceValuatorAssign implements Serializable {
 
     @Column(name = "create_by")
     @ApiModelProperty("创建人")
-    private String createBy;
+    private Long createBy;
 
     @Column(name = "modify_by")
     @ApiModelProperty("修改人")
-    private String modifyBy;
+    private Long modifyBy;
 
     @ApiModelProperty("删除标记")
-    @LogicDelete
     private Boolean deleted;
 
     private static final long serialVersionUID = 1L;

entity/src/main/java/com/onsiteservice/entity/service/ServiceWorkerAssign.java

@@ -58,15 +58,14 @@ public class ServiceWorkerAssign implements Serializable {
 
     @Column(name = "create_by")
     @ApiModelProperty("创建人")
-    private String createBy;
+    private Long createBy;
 
     @Column(name = "modify_by")
     @ApiModelProperty("修改人")
-    private String modifyBy;
+    private Long modifyBy;
 
     @ApiModelProperty("删除标记")
-    @LogicDelete
-    private Byte deleted;
+    private Boolean deleted;
 
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file

mini-app/src/main/java/com/onsiteservice/miniapp/service/worker/ServiceValuatorService.java

@@ -63,7 +63,11 @@ public class ServiceValuatorService extends AbstractMapper<ServiceValuator> {
         // 已被指派的时间
         List<ServiceValuatorAssign> serviceValuatorAssignList = serviceValuatorAssignMapper.selectByIdList(valuatorIds);
         Map<Long, List<ServiceValuatorAssign>> serviceValuatorAssignMap =
-                serviceValuatorAssignList.parallelStream().collect(Collectors.groupingBy(ServiceValuatorAssign::getValuatorId));
+                serviceValuatorAssignList.parallelStream()
+                        // 未过期的指派时间
+                        .filter(e -> e.getAssignTime().getTime() >= System.currentTimeMillis())
+                        .filter(e -> !e.getDeleted())
+                        .collect(Collectors.groupingBy(ServiceValuatorAssign::getValuatorId));
 
         return serviceValuatorList.parallelStream().map(e1 -> {
             ServiceValuatorVO serviceValuatorVO = AttrCopyUtils.copy(e1, new ServiceValuatorVO());

mini-app/src/main/java/com/onsiteservice/miniapp/service/worker/ServiceWorkerService.java

@@ -59,7 +59,10 @@ public class ServiceWorkerService extends AbstractMapper<ServiceWorker> {
         // 已被指派的时间
         List<ServiceWorkerAssign> serviceWorkerAssignList = serviceWorkerAssignMapper.selectByIdList(workerIds);
         Map<Long, List<ServiceWorkerAssign>> serviceWorkerAssignMap =
-                serviceWorkerAssignList.parallelStream().collect(Collectors.groupingBy(ServiceWorkerAssign::getWorkerId));
+                serviceWorkerAssignList.parallelStream()
+                        .filter(e -> e.getAssignTime().getTime() >= System.currentTimeMillis())
+                        .filter(e -> !e.getDeleted())
+                        .collect(Collectors.groupingBy(ServiceWorkerAssign::getWorkerId));
 
         return serviceWorkerList.parallelStream().map(e1 -> {
             ServiceWorkerVO serviceWorkerVO = AttrCopyUtils.copy(e1, new ServiceWorkerVO());