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

maven

6 天以前 7a4a00136ff933197318de096b0d318b6331484f

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

 src/main/java/com/ruoyi/inspectiontask/pojo/InspectionTask.java

@@ -89,4 +89,6 @@
    @TableField(fill = FieldFill.INSERT)
    private Long tenantId;

    @TableField(exist = false)
    private String dateStr;
}

 src/main/java/com/ruoyi/inspectiontask/service/impl/InspectionTaskServiceImpl.java

@@ -25,6 +25,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
@@ -151,6 +152,8 @@
                dto.setInspector(inspectorNames);
            }

            dto.setDateStr(inspectionTask.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));

            // 初始化三个附件列表
            dto.setBeforeProduction(new ArrayList<>());
            dto.setAfterProduction(new ArrayList<>());