feature 代码提交

qhse-common/src/main/java/com/rongwei/bscommon/sys/dao/QhseRohhEventMapper.java

@@ -0,0 +1,19 @@
+package com.rongwei.bscommon.sys.dao;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rongwei.bsentity.domain.QhseRohhEventDo;
+
+/**
+* @author libai
+* @description 针对表【qhse_rohh_event(隐患任务信息-事件信息)】的数据库操作Mapper
+* @createDate 2025-08-20 10:58:59
+* @Entity generator.domain.QhseRohhEvent
+*/
+public interface QhseRohhEventMapper extends BaseMapper<QhseRohhEventDo> {
+
+}
+
+
+
+

qhse-common/src/main/java/com/rongwei/bscommon/sys/dao/QhseRohhMapper.java

@@ -0,0 +1,18 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.rongwei.bsentity.domain.QhseRohhDo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author libai
+* @description 针对表【qhse_rohh(隐患任务信息)】的数据库操作Mapper
+* @createDate 2025-08-18 17:05:53
+* @Entity generator.domain.QhseRohh
+*/
+public interface QhseRohhMapper extends BaseMapper<QhseRohhDo> {
+
+}
+
+
+
+

qhse-common/src/main/java/com/rongwei/bscommon/sys/dao/QhseRohhRectificationMapper.java

@@ -0,0 +1,18 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.rongwei.bsentity.domain.QhseRohhRectificationDo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author libai
+* @description 针对表【qhse_rohh_rectification(隐患任务-整改详情)】的数据库操作Mapper
+* @createDate 2025-08-18 17:05:53
+* @Entity generator.domain.QhseRohhRectification
+*/
+public interface QhseRohhRectificationMapper extends BaseMapper<QhseRohhRectificationDo> {
+
+}
+
+
+
+

qhse-common/src/main/java/com/rongwei/bscommon/sys/dao/QhseRohhRpMapper.java

@@ -0,0 +1,18 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.rongwei.bsentity.domain.QhseRohhRpDo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author libai
+* @description 针对表【qhse_rohh_rp(隐患任务信息-奖惩)】的数据库操作Mapper
+* @createDate 2025-08-18 17:05:53
+* @Entity generator.domain.QhseRohhRp
+*/
+public interface QhseRohhRpMapper extends BaseMapper<QhseRohhRpDo> {
+
+}
+
+
+
+

qhse-common/src/main/java/com/rongwei/bscommon/sys/dao/QhseRohhValidateMapper.java

@@ -0,0 +1,18 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.rongwei.bsentity.domain.QhseRohhValidateDo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author libai
+* @description 针对表【qhse_rohh_validate(隐患任务-验证详情)】的数据库操作Mapper
+* @createDate 2025-08-18 17:05:53
+* @Entity generator.domain.QhseRohhValidate
+*/
+public interface QhseRohhValidateMapper extends BaseMapper<QhseRohhValidateDo> {
+
+}
+
+
+
+

qhse-common/src/main/java/com/rongwei/bscommon/sys/common/fegin/AdminFeginService.java

@@ -1,12 +1,9 @@
-package com.rongwei.bscommon.sys.common.fegin;
+package com.rongwei.bscommon.sys.fegin;
 
-import com.rongwei.rwcommon.base.R;
 import com.rongwei.rwcommon.vo.generalsql.MasterSlaveInsertVo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 
-import java.util.List;
-
 @FeignClient(value = "rw-admin",fallback = AdminFeginServiceImpl.class)
 public interface AdminFeginService {
 

qhse-common/src/main/java/com/rongwei/bscommon/sys/common/fegin/AdminFeginServiceImpl.java

@@ -1,12 +1,9 @@
-package com.rongwei.bscommon.sys.common.fegin;
+package com.rongwei.bscommon.sys.fegin;
 
 
 import com.rongwei.rwcommon.vo.generalsql.MasterSlaveInsertVo;
 import org.springframework.stereotype.Component;
 
-
-import java.util.List;
-
 @Component
 public class AdminFeginServiceImpl implements AdminFeginService {
 

qhse-common/src/main/java/com/rongwei/bscommon/sys/service/QhseRohhEventService.java

@@ -0,0 +1,13 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.rongwei.bsentity.domain.QhseRohhEventDo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+* @author libai
+* @description 针对表【qhse_rohh_event(隐患任务信息-事件信息)】的数据库操作Service
+* @createDate 2025-08-20 10:58:59
+*/
+public interface QhseRohhEventService extends IService<QhseRohhEventDo> {
+
+}

qhse-common/src/main/java/com/rongwei/bscommon/sys/service/QhseRohhRectificationService.java

@@ -0,0 +1,13 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.rongwei.bsentity.domain.QhseRohhRectificationDo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+* @author libai
+* @description 针对表【qhse_rohh_rectification(隐患任务-整改详情)】的数据库操作Service
+* @createDate 2025-08-18 17:05:53
+*/
+public interface QhseRohhRectificationService extends IService<QhseRohhRectificationDo> {
+
+}

qhse-common/src/main/java/com/rongwei/bscommon/sys/service/QhseRohhRpService.java

@@ -0,0 +1,13 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.rongwei.bsentity.domain.QhseRohhRpDo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+* @author libai
+* @description 针对表【qhse_rohh_rp(隐患任务信息-奖惩)】的数据库操作Service
+* @createDate 2025-08-18 17:05:53
+*/
+public interface QhseRohhRpService extends IService<QhseRohhRpDo> {
+
+}

qhse-common/src/main/java/com/rongwei/bscommon/sys/service/QhseRohhService.java

@@ -0,0 +1,13 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwei.bsentity.domain.QhseRohhDo;
+
+/**
+ * @author libai
+ * @description 针对表【qhse_rohh(隐患任务信息)】的数据库操作Service
+ * @createDate 2025-08-18 17:05:53
+ */
+public interface QhseRohhService extends IService<QhseRohhDo> {
+
+}

qhse-common/src/main/java/com/rongwei/bscommon/sys/service/QhseRohhValidateService.java

@@ -0,0 +1,13 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.rongwei.bsentity.domain.QhseRohhValidateDo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+* @author libai
+* @description 针对表【qhse_rohh_validate(隐患任务-验证详情)】的数据库操作Service
+* @createDate 2025-08-18 17:05:53
+*/
+public interface QhseRohhValidateService extends IService<QhseRohhValidateDo> {
+
+}

qhse-common/src/main/java/com/rongwei/bscommon/sys/service/RohhService.java

@@ -0,0 +1,22 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.rongwei.bsentity.vo.ROHHEventVo;
+import com.rongwei.bsentity.vo.TaskTransferVo;
+
+/**
+ * RohhService class
+ *
+ * @author XH
+ * @date 2025/08/18
+ */
+public interface RohhService {
+    void createRectification(String id);
+
+    void createValidate(String id);
+
+    void createRP(String id);
+
+    void createRPEvent(ROHHEventVo rohhEventVo);
+
+    void taskTransfer(TaskTransferVo taskTransferVo);
+}

qhse-common/src/main/java/com/rongwei/bscommon/sys/service/impl/QhseRohhEventServiceImpl.java

@@ -0,0 +1,23 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import com.rongwei.bscommon.sys.dao.QhseRohhEventMapper;
+import com.rongwei.bscommon.sys.service.QhseRohhEventService;
+import com.rongwei.bsentity.domain.QhseRohhEventDo;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author libai
+ * @description 针对表【qhse_rohh_event(隐患任务信息-事件信息)】的数据库操作Service实现
+ * @createDate 2025-08-20 10:58:59
+ */
+@Service
+public class QhseRohhEventServiceImpl extends ServiceImpl<QhseRohhEventMapper, QhseRohhEventDo>
+        implements QhseRohhEventService {
+
+}
+
+
+
+

qhse-common/src/main/java/com/rongwei/bscommon/sys/service/impl/QhseRohhRectificationServiceImpl.java

@@ -0,0 +1,23 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import com.rongwei.bscommon.sys.dao.QhseRohhRectificationMapper;
+import com.rongwei.bscommon.sys.service.QhseRohhRectificationService;
+import com.rongwei.bsentity.domain.QhseRohhRectificationDo;
+import org.springframework.stereotype.Service;
+
+/**
+* @author libai
+* @description 针对表【qhse_rohh_rectification(隐患任务-整改详情)】的数据库操作Service实现
+* @createDate 2025-08-18 17:05:53
+*/
+@Service
+public class QhseRohhRectificationServiceImpl extends ServiceImpl<QhseRohhRectificationMapper, QhseRohhRectificationDo>
+    implements QhseRohhRectificationService {
+
+}
+
+
+
+

qhse-common/src/main/java/com/rongwei/bscommon/sys/service/impl/QhseRohhRpServiceImpl.java

@@ -0,0 +1,23 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import com.rongwei.bscommon.sys.dao.QhseRohhRpMapper;
+import com.rongwei.bscommon.sys.service.QhseRohhRpService;
+import com.rongwei.bsentity.domain.QhseRohhRpDo;
+import org.springframework.stereotype.Service;
+
+/**
+* @author libai
+* @description 针对表【qhse_rohh_rp(隐患任务信息-奖惩)】的数据库操作Service实现
+* @createDate 2025-08-18 17:05:53
+*/
+@Service
+public class QhseRohhRpServiceImpl extends ServiceImpl<QhseRohhRpMapper, QhseRohhRpDo>
+    implements QhseRohhRpService{
+
+}
+
+
+
+

qhse-common/src/main/java/com/rongwei/bscommon/sys/service/impl/QhseRohhServiceImpl.java

@@ -0,0 +1,21 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwei.bscommon.sys.dao.QhseRohhMapper;
+import com.rongwei.bscommon.sys.service.QhseRohhService;
+import com.rongwei.bsentity.domain.QhseRohhDo;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author libai
+ * @description 针对表【qhse_rohh(隐患任务信息)】的数据库操作Service实现
+ * @createDate 2025-08-18 17:05:53
+ */
+@Service
+public class QhseRohhServiceImpl extends ServiceImpl<QhseRohhMapper, QhseRohhDo> implements QhseRohhService {
+
+}
+
+
+
+

qhse-common/src/main/java/com/rongwei/bscommon/sys/service/impl/QhseRohhValidateServiceImpl.java

@@ -0,0 +1,23 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwei.bscommon.sys.dao.QhseRohhValidateMapper;
+import com.rongwei.bscommon.sys.service.QhseRohhValidateService;
+import com.rongwei.bsentity.domain.QhseRohhValidateDo;
+
+import org.springframework.stereotype.Service;
+
+/**
+* @author libai
+* @description 针对表【qhse_rohh_validate(隐患任务-验证详情)】的数据库操作Service实现
+* @createDate 2025-08-18 17:05:53
+*/
+@Service
+public class QhseRohhValidateServiceImpl extends ServiceImpl<QhseRohhValidateMapper, QhseRohhValidateDo>
+    implements QhseRohhValidateService {
+
+}
+
+
+
+

qhse-common/src/main/java/com/rongwei/bscommon/sys/service/impl/QhseVisitorManagementServiceImpl.java

@@ -5,7 +5,7 @@ import com.aspose.cells.PdfSaveOptions;
 import com.aspose.words.Document;
 import com.aspose.words.SaveFormat;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.rongwei.bscommon.sys.common.fegin.AdminFeginService;
+import com.rongwei.bscommon.sys.fegin.AdminFeginService;
 import com.rongwei.bscommon.sys.dao.QhseVisitorManagementDao;
 import com.rongwei.bscommon.sys.service.QhseVisitorManagementService;
 import com.rongwei.bscommon.sys.utils.WordMergeHandler;

qhse-common/src/main/java/com/rongwei/bscommon/sys/service/impl/RohhServiceImpl.java

@@ -0,0 +1,180 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.rongwei.bscommon.sys.service.RohhService;
+import com.rongwei.bscommon.sys.utils.QHSEUtils;
+import com.rongwei.bsentity.domain.*;
+import com.rongwei.bsentity.vo.ROHHEventVo;
+import com.rongwei.bsentity.vo.TaskTransferVo;
+import com.rongwei.rwadmincommon.system.vo.SysUserVo;
+import com.rongwei.rwcommon.base.exception.CustomException;
+import com.rongwei.rwcommon.utils.SecurityUtil;
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * RohhServiceImpl class
+ *
+ * @author XH
+ * @date 2025/08/18
+ */
+@Service
+public class RohhServiceImpl implements RohhService {
+    private static final Logger log = LoggerFactory.getLogger(RohhServiceImpl.class);
+
+    @Autowired
+    private QhseRohhServiceImpl qhseRohhService;
+    @Autowired
+    private QhseRohhRectificationServiceImpl qhseRohhRectificationService;
+    @Autowired
+    private QhseRohhValidateServiceImpl qhseRohhValidateService;
+    @Autowired
+    private QhseRohhRpServiceImpl qhseRohhRpService;
+    @Autowired
+    private QhseRohhEventServiceImpl qhseRohhEventService;
+
+    @Override
+    public void createRectification(String id) {
+        QhseRohhDo qhseRohhDo = rohhCheck(id);
+        SysUserVo currentUser = QHSEUtils.getCurrentUser();
+        QhseRohhRectificationDo qhseRohhRectificationDo = new QhseRohhRectificationDo();
+        qhseRohhRectificationDo.setId(SecurityUtil.getUUID());
+        QHSEUtils.initModelGeneralParameters(qhseRohhRectificationDo, currentUser);
+        qhseRohhRectificationDo.setRectificationplan(qhseRohhDo.getRectificationplan());
+        qhseRohhRectificationDo.setPlanatt(qhseRohhDo.getPlanatt());
+        qhseRohhRectificationDo.setRectificationphoto(qhseRohhDo.getRectificationphoto());
+        qhseRohhRectificationDo.setRectificationtime(qhseRohhDo.getRectificationtime());
+        qhseRohhRectificationDo.setRohhid(id);
+        qhseRohhRectificationDo.setUserid(currentUser.getId());
+        qhseRohhRectificationDo.setUsername(currentUser.getName());
+        qhseRohhRectificationService.save(qhseRohhRectificationDo);
+        // 增加事件
+        ROHHEventVo rohhEventVo = new ROHHEventVo();
+        rohhEventVo.setRohhid(id);
+        rohhEventVo.setEventname("分配");
+        rohhEventVo.setEventtype("任务分配");
+        rohhEventVo.setDescribe("当前任务已交由" + qhseRohhDo.getRectificationuser() + "整改");
+        createRPEvent(rohhEventVo);
+    }
+
+    @Override
+    public void createValidate(String id) {
+        QhseRohhDo qhseRohhDo = rohhCheck(id);
+        SysUserVo currentUser = QHSEUtils.getCurrentUser();
+        QhseRohhValidateDo qhseRohhValidateDo = new QhseRohhValidateDo();
+        qhseRohhValidateDo.setId(SecurityUtil.getUUID());
+        QHSEUtils.initModelGeneralParameters(qhseRohhValidateDo, currentUser);
+        qhseRohhValidateDo.setRohhid(id);
+        qhseRohhValidateDo.setVerifier(qhseRohhDo.getVerifier());
+        qhseRohhValidateDo.setVerifierid(qhseRohhDo.getVerifierid());
+        qhseRohhValidateDo.setHdtype(qhseRohhDo.getHdtype());
+        qhseRohhValidateDo.setVerifierdesc(qhseRohhDo.getVerifierdesc());
+        qhseRohhValidateDo.setVerifierphoto(qhseRohhDo.getVerifierphoto());
+        qhseRohhValidateDo.setVerifierresult(qhseRohhDo.getVerifierresult());
+        qhseRohhValidateService.save(qhseRohhValidateDo);
+    }
+
+    @Override
+    public void createRP(String id) {
+        QhseRohhDo qhseRohhDo = rohhCheck(id);
+        SysUserVo currentUser = QHSEUtils.getCurrentUser();
+        QhseRohhRpDo qhseRohhRpDo = new QhseRohhRpDo();
+        QHSEUtils.initModelGeneralParameters(qhseRohhRpDo, currentUser);
+        qhseRohhRpDo.setId(id);
+        qhseRohhRpDo.setRohhid(qhseRohhDo.getId());
+        qhseRohhRpDo.setRptype("1");
+        qhseRohhRpDo.setUsername(qhseRohhDo.getInspectuser());
+        qhseRohhRpDo.setUserid(qhseRohhDo.getInspectuserid());
+        qhseRohhRpDo.setDeptid(qhseRohhDo.getInspectuserdeptid());
+        qhseRohhRpDo.setDeptname(qhseRohhDo.getInspectuserdept());
+        qhseRohhRpService.save(qhseRohhRpDo);
+    }
+
+    @Override
+    public void createRPEvent(ROHHEventVo rohhEventVo) {
+        QhseRohhEventDo qhseRohhEventDo = new QhseRohhEventDo();
+        SysUserVo currentUser = QHSEUtils.getCurrentUser();
+        QHSEUtils.initModelGeneralParameters(qhseRohhEventDo, currentUser);
+        qhseRohhEventDo.setId(SecurityUtil.getUUID());
+        qhseRohhEventDo.setRohhid(rohhEventVo.getRohhid());
+        qhseRohhEventDo.setEventname(rohhEventVo.getEventname());
+        qhseRohhEventDo.setEventtype(rohhEventVo.getEventtype());
+        qhseRohhEventDo.setDescribe(rohhEventVo.getDescribe());
+        qhseRohhEventService.save(qhseRohhEventDo);
+    }
+
+    @Override
+    public void taskTransfer(TaskTransferVo taskTransferVo) {
+        List<String> ids = taskTransferVo.getIds();
+        if (ids == null || ids.isEmpty()) {
+            throw new CustomException("参数异常");
+        }
+        String userId = taskTransferVo.getUserId();
+        String userName = taskTransferVo.getUserName();
+        if (StringUtils.isBlank(userId) || StringUtils.isBlank(userName)) {
+            throw new CustomException("重新选择的整改人为空");
+        }
+        QhseRohhDo qhseRohhDo;
+        QhseRohhEventDo qhseRohhEventDo;
+        List<QhseRohhDo> savaList = new ArrayList<>();
+        List<QhseRohhEventDo> eventSavaList = new ArrayList<>();
+        SysUserVo currentUser = QHSEUtils.getCurrentUser();
+        for (String id : ids) {
+            if (StringUtils.isBlank(id)) {
+                continue;
+            }
+            qhseRohhDo = new QhseRohhDo();
+
+            qhseRohhDo.setId(id);
+            qhseRohhDo.setModifydate(new Date());
+            qhseRohhDo.setModifyuserid(currentUser.getId());
+            qhseRohhDo.setModifyusername(currentUser.getName());
+            qhseRohhDo.setState("2");
+            qhseRohhDo.setRectificationuser(userName);
+            qhseRohhDo.setRectificationuserid(userId);
+            savaList.add(qhseRohhDo);
+
+
+            qhseRohhEventDo = new QhseRohhEventDo();
+            qhseRohhEventDo.setRohhid(id);
+            qhseRohhEventDo.setId(SecurityUtil.getUUID());
+            qhseRohhEventDo.setEventname("整改");
+            qhseRohhEventDo.setEventtype("任务转派");
+            qhseRohhEventDo.setDescribe("当前任务已交由" + userName + "处理");
+            QHSEUtils.initModelGeneralParameters(qhseRohhEventDo, currentUser);
+            eventSavaList.add(qhseRohhEventDo);
+
+        }
+
+        if (!savaList.isEmpty()) {
+            qhseRohhService.updateBatchById(savaList);
+        }
+        if (!eventSavaList.isEmpty()) {
+            qhseRohhEventService.saveBatch(eventSavaList);
+        }
+    }
+
+    /**
+     * 参数校验
+     *
+     * @param id
+     * @return
+     */
+    public QhseRohhDo rohhCheck(String id) {
+        if (StringUtils.isBlank(id)) {
+            throw new CustomException("参数异常");
+        }
+        QhseRohhDo qhseRohhDo = qhseRohhService.getById(id);
+        if (qhseRohhDo == null) {
+            throw new CustomException("无法获取到隐患任务信息");
+        }
+
+        return qhseRohhDo;
+    }
+}

qhse-common/src/main/java/com/rongwei/bscommon/sys/service/impl/SysPagePartServiceImpl.java

@@ -1,12 +1,9 @@
 package com.rongwei.bscommon.sys.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.rongwei.bscommon.sys.common.fegin.AdminFeginService;
 import com.rongwei.bscommon.sys.dao.SysPagePartDao;
 import com.rongwei.bscommon.sys.service.SysPagePartService;
 import com.rongwei.bsentity.domain.SysPagePartDo;
-import com.rongwei.rwcommon.vo.generalsql.MasterSlaveInsertVo;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**

qhse-entity/src/main/java/com/rongwei/bsentity/domain/QhseRohhDo.java

@@ -0,0 +1,246 @@
+package com.rongwei.bsentity.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.util.Date;
+
+import com.rongwei.rwcommon.base.BaseDo;
+import lombok.Data;
+
+/**
+ * 隐患任务信息
+ * @TableName qhse_rohh
+ */
+@TableName(value ="qhse_rohh")
+@Data
+public class QhseRohhDo extends BaseDo {
+    /**
+     * 主键ID
+     */
+    @TableId
+    private String id;
+
+    /**
+     * 租户ID
+     */
+    private String tenantid;
+
+    /**
+     * 扩展json格式配置
+     */
+    private String roption;
+
+    /**
+     * 状态
+     */
+    private String state;
+
+    /**
+     * 编号
+     */
+    private String serialnumber;
+
+    /**
+     * 检查类型
+     */
+    private String inspecttype;
+
+    /**
+     * 隐患时间
+     */
+    private Date registertime;
+
+    /**
+     * 检查人
+     */
+    private String inspectuser;
+
+    /**
+     * 检查人ID
+     */
+    private String inspectuserid;
+
+    /**
+     * 检查人所属部门
+     */
+    private String inspectuserdept;
+
+    /**
+     * 检查人所属部门ID
+     */
+    private String inspectuserdeptid;
+
+    /**
+     * 隐患大类
+     */
+    private String hdmc;
+
+    /**
+     * 隐患小类
+     */
+    private String hdsc;
+
+    /**
+     * 隐患等级
+     */
+    private String hdlevel;
+
+    /**
+     * 期限整改天数
+     */
+    private Integer rectificationdays;
+
+    /**
+     * 期限整改日期
+     */
+    private Date rectificationdate;
+
+    /**
+     * 整改建议
+     */
+    private String rectificationproposal;
+
+    /**
+     * 隐患描述
+     */
+    private String hddesc;
+
+    /**
+     * 隐患照片
+     */
+    private String hdphoto;
+
+    /**
+     * 整改部门
+     */
+    private String rectificationdept;
+
+    /**
+     * 整改部门ID
+     */
+    private String rectificationdeptid;
+
+    /**
+     * 整改车间
+     */
+    private String rectificationworkshop;
+
+    /**
+     * 整改车间ID
+     */
+    private String rectificationworkshopid;
+
+    /**
+     * 整改分包商
+     */
+    private String rectificationworksubcontractor;
+
+    /**
+     * 整改分包商ID
+     */
+    private String rectificationworksubcontractorid;
+
+    /**
+     * 网格ID
+     */
+    private String gridid;
+
+    /**
+     * 责任网格
+     */
+    private String grid;
+
+    /**
+     * 网格责任人
+     */
+    private String gridmanager;
+
+    /**
+     * 网格责任人ID
+     */
+    private String gridmanagerid;
+
+    /**
+     * 整改责任人
+     */
+    private String rectificationuser;
+
+    /**
+     * 整改责任人ID
+     */
+    private String rectificationuserid;
+
+    /**
+     * 详细位置
+     */
+    private String location;
+
+    /**
+     * 退回原因
+     */
+    private String returnreason;
+
+    /**
+     * 取消原因
+     */
+    private String cancelreason;
+
+    /**
+     * 整改方案
+     */
+    private String rectificationplan;
+
+    /**
+     * 方案附件
+     */
+    private String planatt;
+
+    /**
+     * 整改图片
+     */
+    private String rectificationphoto;
+
+    /**
+     * 整改时间
+     */
+    private Date rectificationtime;
+
+    /**
+     * 验证人
+     */
+    private String verifier;
+
+    /**
+     * 验证人ID
+     */
+    private String verifierid;
+
+    /**
+     * 隐患类型（安全/环保/文明生产/治安/消防/交通）
+     */
+    private String hdtype;
+
+    /**
+     * 验证说明
+     */
+    private String verifierdesc;
+
+    /**
+     * 验证图片
+     */
+    private String verifierphoto;
+
+    /**
+     * 验证结果（通过/继续整改/取消）
+     */
+    private String verifierresult;
+
+    /**
+     * 同步状态
+     */
+    private String syncstate;
+    /**
+     * 整改退回次数
+      */
+    private int rectificationreturncount;
+}

qhse-entity/src/main/java/com/rongwei/bsentity/domain/QhseRohhEventDo.java

@@ -0,0 +1,51 @@
+package com.rongwei.bsentity.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.rongwei.rwcommon.base.BaseDo;
+import lombok.Data;
+
+/**
+ * 隐患任务信息-事件信息
+ * @TableName qhse_rohh_event
+ */
+@TableName(value ="qhse_rohh_event")
+@Data
+public class QhseRohhEventDo extends BaseDo {
+    /**
+     * 主键
+     */
+    @TableId
+    private String id;
+
+    /**
+     * 租户ID
+     */
+    private String tenantid;
+
+    /**
+     * 扩展json格式配置
+     */
+    private String roption;
+
+    /**
+     * 隐患任务ID
+     */
+    private String rohhid;
+
+    /**
+     * 事件名称
+     */
+    private String eventname;
+
+    /**
+     * 事件类型
+     */
+    private String eventtype;
+
+    /**
+     * 说明
+     */
+    private String describe;
+}

qhse-entity/src/main/java/com/rongwei/bsentity/domain/QhseRohhRectificationDo.java

@@ -0,0 +1,69 @@
+package com.rongwei.bsentity.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.rongwei.rwcommon.base.BaseDo;
+import lombok.Data;
+
+/**
+ * 隐患任务-整改详情
+ * @TableName qhse_rohh_rectification
+ */
+@TableName(value ="qhse_rohh_rectification")
+@Data
+public class QhseRohhRectificationDo extends BaseDo {
+    /**
+     * 主键
+     */
+    @TableId
+    private String id;
+
+    /**
+     * 租户ID
+     */
+    private String tenantid;
+
+    /**
+     * 扩展json格式配置
+     */
+    private String roption;
+
+
+    /**
+     * 整改方案
+     */
+    private String rectificationplan;
+
+    /**
+     * 方案附件
+     */
+    private String planatt;
+
+    /**
+     * 整改图片
+     */
+    private String rectificationphoto;
+
+    /**
+     * 整改时间
+     */
+    private Date rectificationtime;
+
+    /**
+     * 隐患任务ID
+     */
+    private String rohhid;
+
+    /**
+     * 整改人
+     */
+    private String userid;
+
+    /**
+     * 整改人名称
+     */
+    private String username;
+}

qhse-entity/src/main/java/com/rongwei/bsentity/domain/QhseRohhRpDo.java

@@ -0,0 +1,88 @@
+package com.rongwei.bsentity.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.rongwei.rwcommon.base.BaseDo;
+import lombok.Data;
+
+/**
+ * 隐患任务信息-奖惩
+ * @TableName qhse_rohh_rp
+ */
+@TableName(value ="qhse_rohh_rp")
+@Data
+public class QhseRohhRpDo  extends BaseDo {
+    /**
+     * 主键
+     */
+    @TableId
+    private String id;
+
+    /**
+     * 租户ID
+     */
+    private String tenantid;
+
+    /**
+     * 扩展json格式配置
+     */
+    private String roption;
+
+    /**
+     * 奖惩类型
+     */
+    private String rptype;
+
+    /**
+     * 分数
+     */
+    private BigDecimal point;
+
+    /**
+     * 金额
+     */
+    private BigDecimal money;
+
+    /**
+     * 奖惩人员
+     */
+    private String username;
+
+    /**
+     * 用户ID
+     */
+    private String userid;
+
+    /**
+     * 生效时间
+     */
+    private Date effectivetime;
+
+    /**
+     * 隐患任务ID
+     */
+    private String rohhid;
+
+    /**
+     * 奖励ID
+     */
+    private String rewardid;
+
+    /**
+     * 奖励标注
+     */
+    private String rewardannotation;
+
+    /**
+     * 部门ID
+     */
+    private String deptid;
+
+    /**
+     * 部门名称
+     */
+    private String deptname;
+}

qhse-entity/src/main/java/com/rongwei/bsentity/domain/QhseRohhValidateDo.java

@@ -0,0 +1,67 @@
+package com.rongwei.bsentity.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.util.Date;
+
+import com.rongwei.rwcommon.base.BaseDo;
+import lombok.Data;
+
+/**
+ * 隐患任务-验证详情
+ * @TableName qhse_rohh_validate
+ */
+@TableName(value ="qhse_rohh_validate")
+@Data
+public class QhseRohhValidateDo  extends BaseDo {
+    /**
+     * 主键
+     */
+    @TableId
+    private String id;
+
+    /**
+     * 租户ID
+     */
+    private String tenantid;
+
+    /**
+     * 扩展json格式配置
+     */
+    private String roption;
+
+    /**
+     * 隐患任务ID
+     */
+    private String rohhid;
+
+    /**
+     * 验证人
+     */
+    private String verifier;
+
+    /**
+     * 验证人ID
+     */
+    private String verifierid;
+
+    /**
+     * 隐患类型（安全/环保/文明生产/治安/消防/交通）
+     */
+    private String hdtype;
+
+    /**
+     * 验证说明
+     */
+    private String verifierdesc;
+
+    /**
+     * 验证图片
+     */
+    private String verifierphoto;
+
+    /**
+     * 验证结果（通过/继续整改/取消）
+     */
+    private String verifierresult;
+}

qhse-entity/src/main/java/com/rongwei/bsentity/vo/ROHHEventVo.java

@@ -0,0 +1,21 @@
+package com.rongwei.bsentity.vo;
+
+import lombok.Data;
+
+/**
+ * ROHHEventVo class
+ *
+ * @author XH
+ * @date 2025/08/20
+ */
+@Data
+public class ROHHEventVo {
+    private String eventname;
+    private String eventtype;
+    private String describe;
+    private String rohhid;
+}
+
+
+
+

qhse-entity/src/main/java/com/rongwei/bsentity/vo/TaskTransferVo.java

@@ -0,0 +1,18 @@
+package com.rongwei.bsentity.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * TaskTransferVo class
+ *
+ * @author XH
+ * @date 2025/08/20
+ */
+@Data
+public class TaskTransferVo {
+    private List<String> ids;
+    private String userId;
+    private String userName;
+}

qhse-server/src/main/java/com/rongwei/controller/QhseVisitorManagementController.java

@@ -124,6 +124,4 @@ public class QhseVisitorManagementController  {
         qhseVisitorManagementService.previewForAttachmentWithSignature(signature,fileId, response);
     }
 
-
 }
-

qhse-server/src/main/java/com/rongwei/controller/RohhController.java

@@ -0,0 +1,90 @@
+package com.rongwei.controller;
+
+import com.rongwei.bscommon.sys.service.impl.RohhServiceImpl;
+import com.rongwei.bsentity.vo.ROHHEventVo;
+import com.rongwei.bsentity.vo.TaskTransferVo;
+import com.rongwei.rwcommon.base.R;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * RohhController class
+ *
+ * @author XH
+ * @date 2025/08/18
+ */
+
+@RestController
+@RequestMapping("/rohh")
+public class RohhController {
+    private static final Logger log = LoggerFactory.getLogger(RohhController.class);
+
+    @Autowired
+    private RohhServiceImpl rohhService;
+
+    /**
+     * 新增整改信息
+     *
+     * @param id
+     * @return
+     */
+    @PostMapping("/create/rectification/{id}")
+    public R createRectification(@PathVariable String id) {
+        log.info("开始创建隐患整改记录: {}", id);
+        rohhService.createRectification(id);
+        return R.ok();
+    }
+
+    /**
+     * 新增整改信息
+     *
+     * @param id
+     * @return
+     */
+    @PostMapping("/create/validate/{id}")
+    public R createValidate(@PathVariable String id) {
+        log.info("开始创建隐患验证记录: {}", id);
+        rohhService.createValidate(id);
+        return R.ok();
+    }
+
+    /**
+     * 创建奖惩人员信息
+     *
+     * @param id
+     * @return
+     */
+    @PostMapping("/create/rp/{id}")
+    public R createRP(@PathVariable String id) {
+        log.info("开始创建奖惩人员信息: {}", id);
+        rohhService.createRP(id);
+        return R.ok();
+    }
+
+    /**
+     * 创建整改任务事件信息
+     *
+     * @param id
+     * @return
+     */
+    @PostMapping("/create/event")
+    public R createRPEvent(@RequestBody ROHHEventVo rohhEventVo) {
+        log.info("创建整改任务事件信息: {}", rohhEventVo);
+        rohhService.createRPEvent(rohhEventVo);
+        return R.ok();
+    }
+    /**
+     * 任务转派
+     *
+     * @param id
+     * @return
+     */
+    @PostMapping("/task/transfer")
+    public R taskTransfer(@RequestBody TaskTransferVo taskTransferVo) {
+        log.info("开始任务转派: {}", taskTransferVo);
+        rohhService.taskTransfer(taskTransferVo);
+        return R.ok();
+    }
+}