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

RMS/src/main/java/cn/cslg/report/mapper/InvalidReReport/InvalidProcessMapper.java

@@ -0,0 +1,16 @@
+package cn.cslg.report.mapper.InvalidReReport;
+
+import cn.cslg.report.entity.asso.AssoEventReport;
+import cn.cslg.report.entity.invalidReReport.InvalidProcess;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ *
+ *无效事务Mapper层
+ * @Author 李仁杰
+ * @Date 2023/6/28
+ */
+@Repository
+public interface InvalidProcessMapper extends BaseMapper<InvalidProcess> {
+}

RMS/src/main/java/cn/cslg/report/service/business/InvalidReReport/InvalidProcessService.java

@@ -3,6 +3,8 @@ package cn.cslg.report.service.business.InvalidReReport;
 import cn.cslg.report.common.model.dto.invalidReReport.InvalidProcessDTO;
 import cn.cslg.report.common.utils.Response;
 import cn.cslg.report.entity.Template;
+import cn.cslg.report.entity.invalidReReport.InvalidProcess;
+import cn.cslg.report.mapper.InvalidReReport.InvalidProcessMapper;
 import cn.cslg.report.mapper.TemplateMapper;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -18,7 +20,7 @@ import java.util.List;
 @Service
 @Slf4j
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
-public class InvalidProcessService extends ServiceImpl<TemplateMapper, Template> {
+public class InvalidProcessService extends ServiceImpl<InvalidProcessMapper, InvalidProcess> {
     //无效事务添加
     public Integer addInvalidProcess(String invalidProcessStr, List<MultipartFile> files) {
         InvalidProcessDTO invalidProcessDTO = JSONObject.parseObject(invalidProcessStr, InvalidProcessDTO.class);