yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/enterprise/EnterpriseController.java

@@ -139,6 +139,7 @@ public class EnterpriseController {
         pageResult.getList().forEach(item->{
             item.setInviterName(adminUserService.getUser(Long.valueOf(item.getUserId())).getNickname());
         });
+
         return success(BeanUtils.toBean(pageResult, EnterpriseRespVO.class));
     }
 

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/enterprise/vo/EnterprisePageReqVO.java

@@ -17,10 +17,6 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
 @ToString(callSuper = true)
 public class EnterprisePageReqVO extends PageParam {
 
-
-    @Schema(description = "ID", example = "10990")
-    private Long Id;
-
     @Schema(description = "所属部门ID", example = "10990")
     private Long departmentId;
 
@@ -68,14 +64,11 @@ public class EnterprisePageReqVO extends PageParam {
     @Schema(description = "修改人")
     private String updater;
 
-//    @Schema(description = "管理部门", example = "26433")
-//    private Long deptId;
-
     @Schema(description = "邀请人")
     private String inviterName;
 
-    @Schema(description = "邀请人")
+    @Schema(description = "根据标签类型过滤")
-    private List<Long> ids;
+    private List<Long> tagList;
 
 
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/taskinfo/TaskInfoController.java

@@ -1,23 +1,11 @@
 package cn.iocoder.yudao.module.system.controller.admin.taskinfo;
 
-import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
 import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
 import cn.iocoder.yudao.module.infra.api.job.JobApi;
-import cn.iocoder.yudao.module.system.controller.admin.enterprise.vo.EnterprisePageReqVO;
-import cn.iocoder.yudao.module.system.controller.admin.enterpriseinspections.vo.EnterpriseInspectionsPageReqVO;
-import cn.iocoder.yudao.module.system.controller.admin.enterpriseinspections.vo.EnterpriseInspectionsSaveReqVO;
-import cn.iocoder.yudao.module.system.controller.admin.tasktag.vo.TaskTagPageReqVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO;
-import cn.iocoder.yudao.module.system.dal.dataobject.enterprise.EnterpriseDO;
-import cn.iocoder.yudao.module.system.dal.dataobject.enterpriseinspections.EnterpriseInspectionsDO;
-import cn.iocoder.yudao.module.system.dal.dataobject.tasktag.TaskTagDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
 import cn.iocoder.yudao.module.system.service.dept.DeptService;
-import cn.iocoder.yudao.module.system.service.enterprise.EnterpriseService;
-import cn.iocoder.yudao.module.system.service.enterpriseinspections.EnterpriseInspectionsService;
-import cn.iocoder.yudao.module.system.service.tasktag.TaskTagService;
 import cn.iocoder.yudao.module.system.service.user.AdminUserService;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -59,12 +47,6 @@ public class TaskInfoController {
     private AdminUserService adminUserService;
     @Resource
     private DeptService deptService;
-    @Resource
-    private  EnterpriseInspectionsService enterpriseInspectionsService;
-    @Resource
-    private TaskTagService taskTagService;
-    @Resource
-    private EnterpriseService enterpriseService;
 
 
     @PostMapping("/create")
@@ -78,19 +60,6 @@ public class TaskInfoController {
     @Operation(summary = "更新任务表，用于存储所有的任务信息，任务可由不同用户创建并管理。")
     @PreAuthorize("@ss.hasPermission('system:task-info:update')")
     public CommonResult<Boolean> updateTaskInfo(@Valid @RequestBody TaskInfoSaveReqVO updateReqVO) {
-        List<Long> eid=updateReqVO.getEnterpriseIds();
-        if (eid == null || eid.isEmpty()) {
-            return success(false);
-        }
-        int del=enterpriseInspectionsService.deleteEnterpriseInspectionsTaskId(updateReqVO.getId());
-        EnterpriseInspectionsSaveReqVO enterpriseInspectionsSaveReqVO=new EnterpriseInspectionsSaveReqVO();
-        for(Long enterprise:eid) {
-            enterpriseInspectionsSaveReqVO.setTaskId(updateReqVO.getId());
-            enterpriseInspectionsSaveReqVO.setEnterpriseId(enterprise);
-            if(del>0){
-                enterpriseInspectionsService.createEnterpriseInspections(enterpriseInspectionsSaveReqVO);
-            }
-        }
         taskInfoService.updateTaskInfo(updateReqVO);
         return success(true);
     }
@@ -110,29 +79,7 @@ public class TaskInfoController {
     @PreAuthorize("@ss.hasPermission('system:task-info:query')")
     public CommonResult<TaskInfoRespVO> getTaskInfo(@RequestParam("id") Long id) {
         TaskInfoDO taskInfo = taskInfoService.getTaskInfo(id);
-        //获取任务包含企业
+        return success(BeanUtils.toBean(taskInfo, TaskInfoRespVO.class));
-        EnterpriseInspectionsPageReqVO enterpriseInspectionsPageReqVO=new EnterpriseInspectionsPageReqVO();
-        enterpriseInspectionsPageReqVO.setTaskId(taskInfo.getId());
-        List<EnterpriseInspectionsDO> enterpriseInspectionsides=enterpriseInspectionsService.getEnterpriseInspectionsList(enterpriseInspectionsPageReqVO);
-        EnterprisePageReqVO enterprisePageReqVO=new EnterprisePageReqVO();
-        List<Long> longs = CollectionUtils.convertList(enterpriseInspectionsides, EnterpriseInspectionsDO::getEnterpriseId);
-        enterprisePageReqVO.setIds(longs);
-        List<EnterpriseDO> enterpriseIdes=enterpriseService.getEnterpriseList(enterprisePageReqVO);
-        TaskInfoRespVO bean = BeanUtils.toBean(taskInfo, TaskInfoRespVO.class);
-        bean.setEnterpriseIdes(enterpriseIdes);
-
-        //获取任务标签
-        TaskTagPageReqVO taskTagPageReqVO=new TaskTagPageReqVO();
-        taskTagPageReqVO.setTaskId(taskInfo.getId());
-        List<TaskTagDO> taskTagides=taskTagService.getTaskTagList(taskTagPageReqVO);
-
-        List<Long> taglongs = CollectionUtils.convertList(enterpriseInspectionsides, EnterpriseInspectionsDO::getEnterpriseId);
-
-
-        bean.setTaskTagIdes(taskTagides);
-
-        return success(bean);
-
     }
 
     @GetMapping("/page")
@@ -142,19 +89,9 @@ public class TaskInfoController {
         PageResult<TaskInfoDO> pageResult = taskInfoService.getTaskInfoPage(pageReqVO);
         AdminUserDO user = adminUserService.getUser(SecurityFrameworkUtils.getLoginUserId());
         DeptDO dep= deptService.getDept( user.getDeptId());
-        EnterpriseInspectionsPageReqVO enterpriseInspectionsPageReqVO=new EnterpriseInspectionsPageReqVO();
-
         pageResult.getList().forEach(item->{
             item.setPublishDep(dep.getName());
             item.setCreateName(adminUserService.getUser(Long.valueOf(item.getCreator())).getRealName());
-            enterpriseInspectionsPageReqVO.setTaskId(item.getId());
-            List<EnterpriseInspectionsDO> enterpriseInspectionsides=enterpriseInspectionsService.getEnterpriseInspectionsList(enterpriseInspectionsPageReqVO);
-            EnterprisePageReqVO enterprisePageReqVO=new EnterprisePageReqVO();
-            List<Long> longs = CollectionUtils.convertList(enterpriseInspectionsides, EnterpriseInspectionsDO::getEnterpriseId);
-            enterprisePageReqVO.setIds(longs);
-            List<EnterpriseDO> enterpriseIdes=enterpriseService.getEnterpriseList(enterprisePageReqVO);
-            item.setEnterpriseIdes(enterpriseIdes);
-
         });
         return success(BeanUtils.toBean(pageResult, TaskInfoRespVO.class));
     }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/taskinfo/vo/TaskInfoPageReqVO.java

@@ -1,6 +1,5 @@
 package cn.iocoder.yudao.module.system.controller.admin.taskinfo.vo;
 
-import cn.iocoder.yudao.module.system.dal.dataobject.enterpriseinspections.EnterpriseInspectionsDO;
 import lombok.*;
 
 import java.time.LocalDate;
@@ -64,10 +63,4 @@ public class TaskInfoPageReqVO extends PageParam {
     @Schema(description = "总共几步")
     private Integer taskTotal;
 
-
-    @Schema(description = "企业集合", example = "1")
-    private List<Long> enterpriseInspectionsIdes;
-
-
-
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/taskinfo/vo/TaskInfoRespVO.java

@@ -1,9 +1,5 @@
 package cn.iocoder.yudao.module.system.controller.admin.taskinfo.vo;
 
-import cn.iocoder.yudao.module.system.dal.dataobject.enterprise.EnterpriseDO;
-import cn.iocoder.yudao.module.system.dal.dataobject.enterpriseinspections.EnterpriseInspectionsDO;
-import cn.iocoder.yudao.module.system.dal.dataobject.taglibrary.TagLibraryDO;
-import cn.iocoder.yudao.module.system.dal.dataobject.tasktag.TaskTagDO;
 import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
@@ -99,26 +95,6 @@ public class TaskInfoRespVO {
     @ExcelProperty("发布部门")
     private String publishDep;
 
-    @Schema(description = "企业集合")
-    @ExcelProperty("企业集合")
-    private  List<EnterpriseDO> enterpriseIdes;
-
-    @Schema(description = "标签集合")
-    @ExcelProperty("标签集合")
-    private  List<TaskTagDO> taskTagIdes;
-
-    @Schema(description = "标签集合")
-    @ExcelProperty("标签集合")
-    private  List<TagLibraryDO> tagLibraryIds;
-
-
-
-
-
-
-
-
-
 
 
 

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/taskinfo/vo/TaskInfoSaveReqVO.java

@@ -16,9 +16,6 @@ public class TaskInfoSaveReqVO {
     @Schema(description = "任务ID，主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "4541")
     private Long id;
 
-    @Schema(description = "任务编号", requiredMode = Schema.RequiredMode.REQUIRED)
-    private String taskNumber;
-
     @Schema(description = "任务标题", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotEmpty(message = "任务标题不能为空")
     private String title;

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/enterprise/EnterpriseDO.java

@@ -80,11 +80,6 @@ public class EnterpriseDO extends BaseDO {
      */
     private String gpsLocation;
 
-//    /**
-//     * 管理部门
-//     */
-//    private Long deptId;
-
     @TableField(exist = false)
     private Integer audit;
 

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/taskinfo/TaskInfoDO.java

@@ -1,16 +1,10 @@
 package cn.iocoder.yudao.module.system.dal.dataobject.taskinfo;
 
-import cn.iocoder.yudao.framework.mybatis.core.type.LongListTypeHandler;
-import cn.iocoder.yudao.module.system.dal.dataobject.enterprise.EnterpriseDO;
-import cn.iocoder.yudao.module.system.dal.dataobject.enterpriseinspections.EnterpriseInspectionsDO;
-import com.alibaba.excel.annotation.ExcelProperty;
 import com.sun.xml.bind.v2.TODO;
-import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.util.List;
 
 import com.baomidou.mybatisplus.annotation.*;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
@@ -36,9 +30,8 @@ public class TaskInfoDO extends BaseDO {
     @TableId
     private Long id;
 
-
     //任务编号
-//    @TableField(exist = false)
+    @TableField(exist = false)
     private String taskNumber;
     /**
      * 任务标题
@@ -101,9 +94,10 @@ public class TaskInfoDO extends BaseDO {
     @TableField(exist = false)
     private String publishDep;
 
-    //企业集合
+
-    @TableField(exist = false)
+
-    private  List<EnterpriseDO> enterpriseIdes;
+
+
 
 
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/enterpriseinspections/EnterpriseInspectionsMapper.java

@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.system.dal.mysql.enterpriseinspections;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
@@ -22,18 +23,16 @@ public interface EnterpriseInspectionsMapper extends BaseMapperX<EnterpriseInspe
                 .eqIfPresent(EnterpriseInspectionsDO::getTaskId, reqVO.getTaskId())
                 .eqIfPresent(EnterpriseInspectionsDO::getEnterpriseId, reqVO.getEnterpriseId())
                 .betweenIfPresent(EnterpriseInspectionsDO::getCreateTime, reqVO.getCreateTime())
-                .orderByDesc(EnterpriseInspectionsDO::getId));
+                .orderByDesc(EnterpriseInspectionsDO::getCreateTime));
     }
 
-
+    default PageResult<EnterpriseInspectionsDO> selectPageGroup(EnterpriseInspectionsPageReqVO reqVO) {
-
+        return selectPage(reqVO, new LambdaQueryWrapperX<EnterpriseInspectionsDO>()
-        default List<EnterpriseInspectionsDO> selectList(EnterpriseInspectionsPageReqVO reqVO) {
+            .eqIfPresent(EnterpriseInspectionsDO::getTaskId, reqVO.getTaskId())
-            return selectList(new LambdaQueryWrapperX<EnterpriseInspectionsDO>()
+            .eqIfPresent(EnterpriseInspectionsDO::getEnterpriseId, reqVO.getEnterpriseId())
-                .eqIfPresent(EnterpriseInspectionsDO::getTaskId, reqVO.getTaskId())
+            .betweenIfPresent(EnterpriseInspectionsDO::getCreateTime, reqVO.getCreateTime())
-                .eqIfPresent(EnterpriseInspectionsDO::getEnterpriseId, reqVO.getEnterpriseId())
+            .orderByDesc(EnterpriseInspectionsDO::getId).groupBy(EnterpriseInspectionsDO::getTaskId)
-                .betweenIfPresent(EnterpriseInspectionsDO::getCreateTime, reqVO.getCreateTime())
+        );
-                .orderByDesc(EnterpriseInspectionsDO::getId));
     }
 
-
+}
-}

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/taskinfo/TaskInfoMapper.java

@@ -20,7 +20,6 @@ public interface TaskInfoMapper extends BaseMapperX<TaskInfoDO> {
     default PageResult<TaskInfoDO> selectPage(TaskInfoPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<TaskInfoDO>()
                 .eqIfPresent(TaskInfoDO::getTitle, reqVO.getTitle())
-                .eqIfPresent(TaskInfoDO::getTaskNumber, reqVO.getTaskNumber())
                 .eqIfPresent(TaskInfoDO::getDescription, reqVO.getDescription())
                 .eqIfPresent(TaskInfoDO::getExecCycle, reqVO.getExecCycle())
                 .eqIfPresent(TaskInfoDO::getTaskType, reqVO.getTaskType())
@@ -36,7 +35,4 @@ public interface TaskInfoMapper extends BaseMapperX<TaskInfoDO> {
                 .orderByDesc(TaskInfoDO::getId));
     }
 
-
-
-
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/tasktag/TaskTagMapper.java

@@ -5,8 +5,6 @@ import java.util.*;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.module.system.controller.admin.enterpriseinspections.vo.EnterpriseInspectionsPageReqVO;
-import cn.iocoder.yudao.module.system.dal.dataobject.enterpriseinspections.EnterpriseInspectionsDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.tasktag.TaskTagDO;
 import org.apache.ibatis.annotations.Mapper;
 import cn.iocoder.yudao.module.system.controller.admin.tasktag.vo.*;
@@ -27,16 +25,4 @@ public interface TaskTagMapper extends BaseMapperX<TaskTagDO> {
                 .orderByDesc(TaskTagDO::getId));
     }
 
-
-
-
-    default List<TaskTagDO> selectList(TaskTagPageReqVO reqVO) {
-        return selectList(new LambdaQueryWrapperX<TaskTagDO>()
-                .eqIfPresent(TaskTagDO::getTaskId, reqVO.getTaskId())
-                .eqIfPresent(TaskTagDO::getTagId, reqVO.getTagId())
-                .betweenIfPresent(TaskTagDO::getCreateTime, reqVO.getCreateTime())
-                .orderByDesc(TaskTagDO::getId));
-    }
-
-
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/enterprise/EnterpriseService.java

@@ -53,8 +53,5 @@ public interface EnterpriseService {
      */
     PageResult<EnterpriseDO> getEnterprisePage(EnterprisePageReqVO pageReqVO);
 
-
-    List<EnterpriseDO> getEnterpriseList(EnterprisePageReqVO pageReqVO);
-
     PageResult<EnterpriseDO> getEnterpriseByUserId(EnterprisePageReqVO pageReqVO);
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/enterprise/EnterpriseServiceImpl.java

@@ -155,13 +155,6 @@ public class EnterpriseServiceImpl implements EnterpriseService {
         return enterpriseDOPageResult;
     }
 
-
-    @Override
-    public List<EnterpriseDO> getEnterpriseList(EnterprisePageReqVO pageReqVO) {
-        return enterpriseMapper.selectList(pageReqVO);
-    }
-
-
     @Override
     public PageResult<EnterpriseDO> getEnterpriseByUserId(EnterprisePageReqVO pageReqVO) {
         //根据不同身份查询企业

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

@@ -4,6 +4,7 @@ import java.util.*;
 import cn.iocoder.yudao.module.system.controller.admin.enterpriseinspections.vo.*;
 import cn.iocoder.yudao.module.system.dal.dataobject.enterpriseinspections.EnterpriseInspectionsDO;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
 
 import javax.validation.Valid;
 
@@ -44,10 +45,6 @@ public interface EnterpriseInspectionsService {
      */
     EnterpriseInspectionsDO getEnterpriseInspections(Long id);
 
-
-
-     int deleteEnterpriseInspectionsTaskId(Long taskId);
-
     /**
      * 获得企业检查记录表，用于记录与企业相关的环保检查信息。分页
      *
@@ -56,10 +53,7 @@ public interface EnterpriseInspectionsService {
      */
     PageResult<EnterpriseInspectionsDO> getEnterpriseInspectionsPage(EnterpriseInspectionsPageReqVO pageReqVO);
 
+    void passOn(PassOnSaveVO passOnSaveVO);
 
-    List<EnterpriseInspectionsDO> getEnterpriseInspectionsList(EnterpriseInspectionsPageReqVO pageReqVO);
+    List<EnterpriseInspectionsDO> getListByUserIdAndTaskName(Long userId, String taskName);
-
-
-
-
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/taskinfo/TaskInfoService.java

@@ -53,8 +53,6 @@ public interface TaskInfoService {
      */
     PageResult<TaskInfoDO> getTaskInfoPage(TaskInfoPageReqVO pageReqVO);
 
-//    List<TaskInfoDO> getTaskInfoList(TaskInfoPageReqVO pageReqVO);
-
     //定时执行任务
     void sendTask(Long taskId);
 

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/taskinfo/TaskInfoServiceImpl.java

@@ -1,14 +1,16 @@
 package cn.iocoder.yudao.module.system.service.taskinfo;
 
-import cn.hutool.core.convert.Convert;
+import cn.iocoder.yudao.framework.security.core.LoginUser;
-import cn.hutool.core.date.DateUtil;
 import cn.iocoder.yudao.module.infra.api.job.JobApi;
 import cn.iocoder.yudao.module.system.dal.dataobject.enterprise.EnterpriseDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.enterpriseinspections.EnterpriseInspectionsDO;
+import cn.iocoder.yudao.module.system.dal.dataobject.inspectionslog.InspectionsLogDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.tasktag.TaskTagDO;
 import cn.iocoder.yudao.module.system.dal.mysql.enterprise.EnterpriseMapper;
 import cn.iocoder.yudao.module.system.dal.mysql.enterpriseinspections.EnterpriseInspectionsMapper;
+import cn.iocoder.yudao.module.system.dal.mysql.inspectionslog.InspectionsLogMapper;
 import cn.iocoder.yudao.module.system.dal.mysql.tasktag.TaskTagMapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.transaction.annotation.Transactional;
@@ -27,6 +29,7 @@ import cn.iocoder.yudao.module.system.dal.mysql.taskinfo.TaskInfoMapper;
 import javax.annotation.Resource;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
 import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*;
 
 /**
@@ -48,19 +51,14 @@ public class TaskInfoServiceImpl implements TaskInfoService {
     private EnterpriseMapper enterpriseMapper;
     @Resource
     private EnterpriseInspectionsMapper enterpriseInspectionsMapper;
+    @Resource
+    private InspectionsLogMapper inspectionsLogMapper;
 
     @Override
     @Transactional
     public Long createTaskInfo(TaskInfoSaveReqVO createReqVO) {
         // 插入
-
         TaskInfoDO taskInfo = BeanUtils.toBean(createReqVO, TaskInfoDO.class);
-        String serialNumber = "";
-        String time = "";
-        time = DateUtil.format(new Date(), "yyyyMMddHHmm");
-        serialNumber = "HB" + time;
-        taskInfo.setTaskNumber(serialNumber);
-
         taskInfoMapper.insert(taskInfo);
 
         //添加任务标签
@@ -70,7 +68,14 @@ public class TaskInfoServiceImpl implements TaskInfoService {
             });
         }
 
-
+//
+//        //添加定时任务
+//        JobSaveReqVO jobSaveReqVO = new JobSaveReqVO();
+//        try {
+//            jobApi.createJob(jobSaveReqVO);
+//        } catch (Throwable e) {
+//            throw new RuntimeException(e);
+//        }
         //添加企业范围
         if (!createReqVO.getEnterpriseIds().isEmpty() && createReqVO.getEnterpriseIds().size() > 0) {
             List<EnterpriseInspectionsDO> list = new ArrayList<>();
@@ -83,22 +88,13 @@ public class TaskInfoServiceImpl implements TaskInfoService {
                 EnterpriseInspectionsDO inspection = new EnterpriseInspectionsDO();
                 inspection.setTaskId(taskInfo.getId());
                 inspection.setEnterpriseId(item);
-                inspection.setCreator(enterpriseDO.getUserId().toString());
+                //专管员
+                inspection.setUserId(enterpriseDO.getUserId());
                 list.add(inspection);
             });
 
             enterpriseInspectionsMapper.insertBatch(list);
         }
-        if(taskInfo.getId()>0){
-//        //添加定时任务
-//        JobSaveReqVO jobSaveReqVO = new JobSaveReqVO();
-//        try {
-//            jobApi.createJob(jobSaveReqVO);
-//        } catch (Throwable e) {
-//            throw new RuntimeException(e);
-//        }
-
-        }
 
         // 返回
         return taskInfo.getId();
@@ -152,15 +148,24 @@ public class TaskInfoServiceImpl implements TaskInfoService {
 
     @Override
     public PageResult<TaskInfoDO> getTaskInfoPage(TaskInfoPageReqVO pageReqVO) {
-        return taskInfoMapper.selectPage(pageReqVO);
+//        final Long loginUserId = getLoginUserId();
-    }
+        //根据分配表反查任务表
-
+        LambdaQueryWrapper<EnterpriseInspectionsDO> wrapper = new LambdaQueryWrapper<>();
-
+        wrapper.eq(EnterpriseInspectionsDO::getCreator, getLoginUserId());
-
+        List<EnterpriseInspectionsDO> list = enterpriseInspectionsMapper.selectList(wrapper);
-
+        if (!list.isEmpty() && list.size() > 0) {
-
+            final List<Map<String, String>> data = new ArrayList<>();
+            list.forEach(item->{
+//                Map<String, String> map = new HashMap<>();
+//                map.put("id", item.getTaskId().toString());
+//                map.put("name", item.get)
+//                taskIds.add(item.getTaskId());
+            });
+        }
 
 
+        return taskInfoMapper.selectPage(pageReqVO);
+    }
 
     @Override
     public void sendTask(Long taskId) {

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/tasktag/TaskTagService.java

@@ -53,14 +53,4 @@ public interface TaskTagService {
      */
     PageResult<TaskTagDO> getTaskTagPage(TaskTagPageReqVO pageReqVO);
 
-
-
-    /**
-     * 获得任务标签关联分页
-     *
-     * @param pageReqVO 分页查询
-     * @return 任务标签关联分页
-     */
-    List<TaskTagDO> getTaskTagList(TaskTagPageReqVO pageReqVO);
-
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/tasktag/TaskTagServiceImpl.java

@@ -72,10 +72,4 @@ public class TaskTagServiceImpl implements TaskTagService {
         return taskTagMapper.selectPage(pageReqVO);
     }
 
-    @Override
-    public List<TaskTagDO> getTaskTagList(TaskTagPageReqVO pageReqVO) {
-        return taskTagMapper.selectList(pageReqVO);
-    }
-
-
 }