t

dev-library/src/main/java/com/tykj/dev/device/library/subject/Dto/DeviceLogDto.java

@@ -45,6 +45,13 @@ public class DeviceLogDto {
     @ApiModelProperty(value = "操作时间")
     private Date createTime;
 
+    public DeviceLogDto(Integer deviceId, String remark, List<FileVo> fileVoList, Integer createUserId) {
+        this.deviceId = deviceId;
+        this.remark = remark;
+        this.fileVoList = fileVoList;
+        this.createUserId = createUserId;
+    }
+
     public DeviceLogDto(Integer deviceId, String remark, List<FileVo> fileVoList) {
         this.deviceId = deviceId;
         this.remark = remark;
@@ -66,6 +73,9 @@ public class DeviceLogDto {
         deviceLog.setType(this.type);
         deviceLog.setDeviceId(this.deviceId);
         deviceLog.setRemark(this.remark);
+        if (this.createUserId!=null){
+            deviceLog.setCreateUserId(createUserId);
+        }
         StringBuffer stringBuffer = new StringBuffer();
         stringBuffer.append("Ǵ");
         if (this.fileVoList != null && this.fileVoList.size() > 0) {

dev-task/src/main/java/com/tykj/dev/device/task/subject/bto/TaskBto.java

@@ -11,6 +11,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.modelmapper.ModelMapper;
 
 import java.util.ArrayList;
@@ -23,6 +24,7 @@ import java.util.List;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
+@Slf4j
 public class TaskBto {
 
     @ApiModelProperty(value = "主键id")
@@ -134,6 +136,7 @@ public class TaskBto {
         if (userPublicService != null && this.createUserId != null) {
             taskUserVo.setStartUnit(userPublicService.findUnitsNameByUserId(this.createUserId));
         }
+        log.info("----{}",this.billStatus);
         taskUserVo.setStatus(GlobalMap.getStatusEnumMap().get(this.billStatus).name);
         return taskUserVo;
     }