执法记录的转发和创建子任务

yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java

@@ -187,4 +187,8 @@ public interface ErrorCodeConstants {
     ErrorCode ENTERPRISE_INSPECTIONS_NOT_EXISTS = new ErrorCode(1-003-001-005, "任务记录不存在");
 
     ErrorCode INSPECTIONS_LOG_NOT_EXISTS = new ErrorCode(1-003-001-006, "执法日志不存在");
+    ErrorCode INSPECTIONS_SUCCESS = new ErrorCode(1-003-001-007, "已经完成执法, 不能进行其他操作");
+
+    ErrorCode ENTERPRISE_INSPECTIONS_STATUS_ERROR = new ErrorCode(1-003-002-000, "此状态下，不能转发执法任务");
+
 }

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

@@ -45,6 +45,13 @@ public class EnterpriseInspectionsController {
         return success(enterpriseInspectionsService.createEnterpriseInspections(createReqVO));
     }
 
+    @PostMapping("/passOn")
+    @Operation(summary = "执法记录转交")
+    @PreAuthorize("@ss.hasPermission('system:enterprise-inspections:create')")
+    public CommonResult<Long> passOn(@Valid @RequestBody PassOnSaveVO passOnSaveVO) {
+        return success(enterpriseInspectionsService.passOn(passOnSaveVO));
+    }
+
     @PutMapping("/update")
     @Operation(summary = "更新企业检查记录表，用于记录与企业相关的环保检查信息。")
     @PreAuthorize("@ss.hasPermission('system:enterprise-inspections:update')")

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

@@ -0,0 +1,13 @@
+package cn.iocoder.yudao.module.system.controller.admin.enterpriseinspections.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class PassOnSaveVO {
+    //转交的执法记录id  转交是否需要审核
+    private List<Long> inspectionsId;
+    //转给的专管员id
+    private Long userId;
+}

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/inspectionslog/InspectionsLogController.java

@@ -46,6 +46,15 @@ public class InspectionsLogController {
         return success(inspectionsLogService.createInspectionsLog(createReqVO));
     }
 
+    @PutMapping("/cooperateWithSignIn")
+    @Operation(summary = "协同人员打开")
+    @PreAuthorize("@ss.hasPermission('system:inspections-log:update')")
+    public CommonResult<Boolean> cooperateWithSignIn(Long inspectionsLogId) {
+        inspectionsLogService.cooperateWithSignIn(inspectionsLogId);
+        return success(true);
+    }
+
+
     @PutMapping("/update")
     @Operation(summary = "更新检查结果日志")
     @PreAuthorize("@ss.hasPermission('system:inspections-log:update')")

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/inspectionslog/vo/InspectionsLogSaveReqVO.java

@@ -32,4 +32,13 @@ public class InspectionsLogSaveReqVO {
     @Schema(description = "执法人员姓名", example = "李四")
     private String inspectName;
 
+    //协同人员的id 还是要加上  会有同名的情况
+    @Schema(description = "协同人员id", example = "1")
+    private String cooperateWithIds;
+
+    //协同人员的id 还是要加上  会有同名的情况
+    @Schema(description = "执法人ID", example = "1")
+    private Long inspectId;
+
+    //协同人员是否可以看到任务记录
 }

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

@@ -36,6 +36,16 @@ public class EnterpriseInspectionsDO extends BaseDO {
      * 企业ID
      */
     private Long enterpriseId;
+
+    /**
+     * 专管员id  如果只能在企业内修改专管员，这个userid 用来记录， 如果想修改企业的专管员，需要在任务里面
+     * 任务里面重新选择企业
+     */
+    private Long userId;
+
+    //状态  1.任务未启动  2. 任务已启动 3.已转交，未执行不展示 4.已转交，整改中，留痕
+    private Integer status;
+
     //任务名称
     @TableField(exist = false)
     private String taskName;

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/inspectionslog/InspectionsLogDO.java

@@ -55,4 +55,8 @@ public class InspectionsLogDO extends BaseDO {
      */
     private String inspectName;
 
+    //协同人员的id 还是要加上  会有同名的情况
+    private String cooperateWithIds;
+    //协同人员是否可以看到任务记录
+
 }

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

@@ -53,4 +53,5 @@ public interface EnterpriseInspectionsService {
      */
     PageResult<EnterpriseInspectionsDO> getEnterpriseInspectionsPage(EnterpriseInspectionsPageReqVO pageReqVO);
 
+    void passOn(PassOnSaveVO passOnSaveVO);
 }

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

@@ -70,6 +70,8 @@ public class EnterpriseInspectionsServiceImpl implements EnterpriseInspectionsSe
         return enterpriseInspections.getId();
     }
 
+
+
     @Override
     public void updateEnterpriseInspections(EnterpriseInspectionsSaveReqVO updateReqVO) {
         // 校验存在
@@ -102,7 +104,7 @@ public class EnterpriseInspectionsServiceImpl implements EnterpriseInspectionsSe
     public PageResult<EnterpriseInspectionsDO> getEnterpriseInspectionsPage(EnterpriseInspectionsPageReqVO pageReqVO) {
 
         final PageResult<EnterpriseInspectionsDO> enterpriseInspectionsDOPageResult = enterpriseInspectionsMapper.selectPage(pageReqVO);
-        if (enterpriseInspectionsDOPageResult.getList().size() > 0 ) {
+        if ( enterpriseInspectionsDOPageResult.getList() != null && enterpriseInspectionsDOPageResult.getList().size() > 0 ) {
             enterpriseInspectionsDOPageResult.getList().forEach(item->{
 
                 //查询任务相关
@@ -118,7 +120,7 @@ public class EnterpriseInspectionsServiceImpl implements EnterpriseInspectionsSe
                 final List<TaskTagDO> taskTagDOS = taskTagMapper.selectList(wrapper);
 
                 List<String> tagList = new ArrayList<>();
-                if (!taskTagDOS.isEmpty() && taskTagDOS.size() > 0) {
+                if (taskTagDOS != null && taskTagDOS.size() > 0) {
                     taskTagDOS.forEach(taskTagItem->{
                         final TagLibraryDO tagLibraryDO = tagLibraryMapper.selectById(taskTagItem.getTagId());
                         if (tagLibraryDO != null) {
@@ -141,7 +143,7 @@ public class EnterpriseInspectionsServiceImpl implements EnterpriseInspectionsSe
                 inspectionsLogWrapper.eq("inspections_id", item.getId());
                 inspectionsLogWrapper.orderByDesc("create_time");
                 final List<InspectionsLogDO> inspectionsLogDOS = inspectionsLogMapper.selectList(inspectionsLogWrapper);
-                if (!inspectionsLogDOS.isEmpty() && inspectionsLogDOS.size() > 0) {
+                if (inspectionsLogDOS != null && inspectionsLogDOS.size() > 0) {
                     item.setInspectionStatus(inspectionsLogDOS.get(0).getStatus());
                     item.setInspectName(inspectionsLogDOS.get(0).getInspectName());
                     item.setCooperateWithName(inspectionsLogDOS.get(0).getCooperateWithName());
@@ -159,9 +161,67 @@ public class EnterpriseInspectionsServiceImpl implements EnterpriseInspectionsSe
             });
         }
 
-        log.info("enterpriseInspectionsDOPageResult:{}", enterpriseInspectionsDOPageResult);
-
         return enterpriseInspectionsDOPageResult;
     }
 
+    @Override
+    public void passOn(PassOnSaveVO passOnSaveVO) {
+        //查看任务状态，未签到， 整改
+
+        if (passOnSaveVO.getInspectionsId() == null || passOnSaveVO.getInspectionsId().size() == 0) {
+            throw exception(ENTERPRISE_INSPECTIONS_NOT_EXISTS);  //请选择要转交的检查记录
+        }
+        //循环记录id列表
+        passOnSaveVO.getInspectionsId().forEach(item->{
+            final EnterpriseInspectionsDO enterpriseInspectionsDO = enterpriseInspectionsMapper.selectById(item);
+            if (enterpriseInspectionsDO == null) {
+                throw exception(ENTERPRISE_INSPECTIONS_NOT_EXISTS);
+            }
+
+            //未签到和整改状态可以转， 其他状态不能转
+            if (enterpriseInspectionsDO.getStatus() == 1 || enterpriseInspectionsDO.getStatus() == 2) {
+
+                InspectionsLogDO inspectionsLogNew = this.getInspectionsLogNew(item);
+                if (inspectionsLogNew != null && inspectionsLogNew.getStatus() == 3) {
+                    //已经开始 就要判断是否是整改状态 整改状态才能转
+                    enterpriseInspectionsDO.setStatus(4);
+                } else {
+                    enterpriseInspectionsDO.setStatus(3);
+                }
+
+                enterpriseInspectionsMapper.updateById(enterpriseInspectionsDO);
+
+                AdminUserDO user = adminUserService.getUser(passOnSaveVO.getUserId());
+                if (user == null) {
+                    throw exception(USER_NOT_EXISTS);
+                }
+                EnterpriseInspectionsDO inspectionsDO = new EnterpriseInspectionsDO();
+                inspectionsDO.setEnterpriseId(enterpriseInspectionsDO.getEnterpriseId());
+                inspectionsDO.setTaskId(enterpriseInspectionsDO.getTaskId());
+
+                inspectionsDO.setUserId(passOnSaveVO.getUserId());
+                inspectionsDO.setInspectName(user.getRealName());
+                enterpriseInspectionsMapper.insert(inspectionsDO);
+            } else {
+                throw exception(ENTERPRISE_INSPECTIONS_STATUS_ERROR);
+            }
+
+        });
+
+
+    }
+
+    //获得检测记录最新一条
+    public InspectionsLogDO getInspectionsLogNew(Long inspectionsId) {
+        QueryWrapper<InspectionsLogDO> wrapper = new QueryWrapper<>();
+        wrapper.eq("inspections_id", inspectionsId);
+        wrapper.orderByDesc("create_time");
+        List<InspectionsLogDO> inspectionsLogDOS = inspectionsLogMapper.selectList(wrapper);
+        if (inspectionsLogDOS == null || inspectionsLogDOS.size() == 0) {
+            return null;
+        }
+        return inspectionsLogDOS.get(0);
+
+    }
+
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/inspectionslog/InspectionsLogService.java

@@ -55,4 +55,6 @@ public interface InspectionsLogService {
     PageResult<InspectionsLogDO> getInspectionsLogPage(InspectionsLogPageReqVO pageReqVO);
 
     List<InspectionsLogDO> list(InspectionsLogPageReqVO pageReqVO);
+
+    void cooperateWithSignIn(Long inspectionsLogId);
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/inspectionslog/InspectionsLogServiceImpl.java

@@ -1,5 +1,12 @@
 package cn.iocoder.yudao.module.system.service.inspectionslog;
 
+import cn.iocoder.yudao.module.system.dal.dataobject.enterpriseinspections.EnterpriseInspectionsDO;
+import cn.iocoder.yudao.module.system.dal.dataobject.taskinfo.TaskInfoDO;
+import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
+import cn.iocoder.yudao.module.system.dal.mysql.enterpriseinspections.EnterpriseInspectionsMapper;
+import cn.iocoder.yudao.module.system.dal.mysql.taskinfo.TaskInfoMapper;
+import cn.iocoder.yudao.module.system.service.user.AdminUserService;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
@@ -17,6 +24,8 @@ import cn.iocoder.yudao.module.system.dal.mysql.inspectionslog.InspectionsLogMap
 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.getLoginUser;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
 import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*;
 
 /**
@@ -30,12 +39,69 @@ public class InspectionsLogServiceImpl implements InspectionsLogService {
 
     @Resource
     private InspectionsLogMapper inspectionsLogMapper;
+    @Resource
+    private AdminUserService adminUserService;
+    @Resource
+    private EnterpriseInspectionsMapper enterpriseInspectionsMapper;
+    @Resource
+    private TaskInfoMapper taskInfoMapper;
 
     @Override
     public Long createInspectionsLog(InspectionsLogSaveReqVO createReqVO) {
+        //当前用户id
+        Long loginUserId = getLoginUserId();
+        AdminUserDO user = adminUserService.getUser(loginUserId);
+        //根据查询出的列表判断执行到哪一步
+        LambdaQueryWrapper<InspectionsLogDO> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(InspectionsLogDO::getInspectionsId, createReqVO.getInspectionsId());
+        wrapper.orderByDesc(InspectionsLogDO::getCreateTime);
+        List<InspectionsLogDO> list = inspectionsLogMapper.selectList(wrapper);
+
+        if (list == null || list.size() == 0) {
+            //签到
+            createReqVO.setStatus(1);
+            createReqVO.setInspectId(loginUserId);
+            createReqVO.setInspectName(user.getRealName());
+        }
+
+        if (list != null && createReqVO.getStatus() != null && createReqVO.getStatus() == 1) {
+            //请不要重复签到
+            throw exception(INSPECTIONS_SUCCESS);
+        }
+
+        if (list != null && list.get(0).getStatus() == 2) {
+            throw exception(INSPECTIONS_SUCCESS);
+        }
+
         // 插入
         InspectionsLogDO inspectionsLog = BeanUtils.toBean(createReqVO, InspectionsLogDO.class);
         inspectionsLogMapper.insert(inspectionsLog);
+
+        //整改需要重新创建子任务
+        if (list != null && createReqVO.getStatus() != null && createReqVO.getStatus() == 3) {
+
+            //查询父任务，和执法记录
+            EnterpriseInspectionsDO enterpriseInspectionsDO = enterpriseInspectionsMapper.selectById(createReqVO.getInspectionsId());
+            if (enterpriseInspectionsDO == null) {
+                throw exception(ENTERPRISE_INSPECTIONS_NOT_EXISTS);
+            }
+
+            //添加子任务
+            TaskInfoDO taskInfo = new TaskInfoDO();
+            taskInfo.setTitle(enterpriseInspectionsDO.getEnterpriseId() + "-" + "整改任务");
+            taskInfo.setTaskType(1);  //整改默认是普通专项任务类型
+            taskInfo.setParentId(enterpriseInspectionsDO.getTaskId());
+            taskInfo.setParentType(21); //父子任务类型
+            taskInfoMapper.insert(taskInfo);
+            //添加执法记录
+            EnterpriseInspectionsDO enterpriseInspectionsDO1 = new EnterpriseInspectionsDO();
+            enterpriseInspectionsDO1.setUserId(getLoginUserId());
+            enterpriseInspectionsDO1.setEnterpriseId(enterpriseInspectionsDO.getEnterpriseId());
+            enterpriseInspectionsDO1.setTaskId(taskInfo.getId());
+            enterpriseInspectionsDO1.setStatus(2);  //整改任务默认是启动的状态
+            enterpriseInspectionsMapper.insert(enterpriseInspectionsDO1);
+        }
+
         // 返回
         return inspectionsLog.getId();
     }
@@ -80,4 +146,34 @@ public class InspectionsLogServiceImpl implements InspectionsLogService {
         return inspectionsLogMapper.selectList(wrapper);
     }
 
+    /**
+     * 协作人员签到
+     * @param inspectionsLogId
+     */
+    @Override
+    public void cooperateWithSignIn(Long inspectionsLogId) {
+        // 校验存在
+        InspectionsLogDO inspectionsLogDO = inspectionsLogMapper.selectById(inspectionsLogId);
+        if (inspectionsLogDO == null) {
+            throw exception(INSPECTIONS_LOG_NOT_EXISTS);
+        }
+
+        //查询真实名称并插入
+        AdminUserDO user = adminUserService.getUser(getLoginUserId());
+        if (user == null) {
+            throw exception(USER_NOT_EXISTS);
+        }
+
+        // 更新
+        if (inspectionsLogDO.getCooperateWithIds() == null ) {
+            inspectionsLogDO.setCooperateWithIds(getLoginUserId().toString());
+            inspectionsLogDO.setCooperateWithName(user.getRealName());
+        } else {
+            inspectionsLogDO.setCooperateWithIds(inspectionsLogDO.getCooperateWithIds() + "," + getLoginUserId());
+            inspectionsLogDO.setCooperateWithName(inspectionsLogDO.getCooperateWithName() + "," + user.getRealName());
+        }
+
+        inspectionsLogMapper.updateById(inspectionsLogDO);
+    }
+
 }

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

@@ -88,7 +88,8 @@ 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);
             });
 

yudao-server/src/main/resources/application-local.yaml

@@ -46,7 +46,7 @@ spring:
       primary: master
       datasource:
         master:
-          url: jdbc:mysql://192.168.2.5:3306/hb-yudao?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例
+          url: jdbc:mysql://127.0.0.1:3306/hb-yudao?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例
           #          url: jdbc:mysql://127.0.0.1:3306/ruoyi-vue-pro?useSSL=true&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true # MySQL Connector/J 5.X 连接的示例
           #          url: jdbc:postgresql://127.0.0.1:5432/ruoyi-vue-pro # PostgreSQL 连接的示例
           #          url: jdbc:oracle:thin:@127.0.0.1:1521:xe # Oracle 连接的示例
@@ -55,7 +55,7 @@ spring:
           #          url: jdbc:kingbase8://127.0.0.1:54321/test  # 人大金仓 KingbaseES 连接的示例
           #          url: jdbc:postgresql://127.0.0.1:5432/postgres # OpenGauss 连接的示例
           username: root
-          password: jingke@123
+          password: 123123
           #          username: sa # SQL Server 连接的示例
           #          password: Yudao@2024 # SQL Server 连接的示例
           #          username: SYSDBA # DM 连接的示例