Merge remote-tracking branch 'origin/master'

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/enterpriseinspections/vo/EnterpriseInspectionsPageReqVO.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.system.controller.admin.enterpriseinspections.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.*;
 import java.util.*;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -51,5 +52,14 @@ public class EnterpriseInspectionsPageReqVO extends PageParam {
     @Schema(description = "任务ids")
     private List<Long> taskIds;
 
+    //任务开始时间
+    @Schema(description = "任务开始时间", example = "27002")
+    private LocalDateTime TaskStartTime;
+
+    //任务结束时间
+    @Schema(description = "任务结束时间", example = "27002")
+    private LocalDateTime TaskEndTime;
+
+
 
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/enterpriseinspections/vo/EnterpriseInspectionsRespVO.java

@@ -24,10 +24,19 @@ public class EnterpriseInspectionsRespVO {
     @ExcelProperty("任务名称")
     private String taskName;
 
+
+    @Schema(description = "任务开始时间", example = "27002")
+    private LocalDateTime TaskStartTime;
+
+
+    @Schema(description = "任务结束时间", example = "27002")
+    private LocalDateTime TaskEndTime;
+
     @Schema(description = "任务编码", example = "29150")
     @ExcelProperty("任务编码")
     private String taskNumber;
 
+
     @Schema(description = "企业ID", example = "27002")
     @ExcelProperty("企业ID")
     private Long enterpriseId;

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/enterpriseinspections/EnterpriseInspectionsDO.java

@@ -86,4 +86,13 @@ public class EnterpriseInspectionsDO extends BaseDO {
     @TableField(exist = false)
     private LocalDateTime execTime;
 
+    //任务开始时间
+    @TableField(exist = false)
+    private LocalDateTime TaskStartTime;
+
+    //任务结束时间
+    @TableField(exist = false)
+    private LocalDateTime TaskEndTime;
+
+
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/enterpriseinspections/EnterpriseInspectionsServiceImpl.java

@@ -246,7 +246,10 @@ public class EnterpriseInspectionsServiceImpl implements EnterpriseInspectionsSe
                     throw exception(TASK_INFO_NOT_EXISTS);
                 }
                 item.setTaskName(taskInfoDO.getTitle());
-
+                //任务开始时间
+                item.setTaskStartTime(taskInfoDO.getStartDate());
+                //结束时间
+                item.setTaskEndTime(taskInfoDO.getEndDate());
                 //查询企业
                 final EnterpriseDO enterpriseDO = enterpriseMapper.selectById(item.getEnterpriseId());
                 if (enterpriseDO == null) {
@@ -258,8 +261,6 @@ public class EnterpriseInspectionsServiceImpl implements EnterpriseInspectionsSe
                 if (tagLibraryDOS != null) {
                     item.setTagList(tagLibraryDOS.stream().map(TagLibraryDO::getTagName).collect(Collectors.toList()));
                 }
-
-
                 item.setEnterpriseName(enterpriseDO.getEnterprisesName());
                 item.setEnterpriseAddress(enterpriseDO.getAddress());