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

RMS/src/main/java/cn/cslg/report/controller/InvalidReReport/ProofGroupController.java

@@ -55,7 +55,8 @@ public class ProofGroupController {
 
     @Operation(summary = "查询证据组合")
     @PostMapping("/query")
-    public String query(@RequestBody ShareReportDTO shareReportDTO) throws IOException {
+    public String query(int id) throws IOException {
+        proofGroupService.queryProofGroupDetail(id);
         return Response.success();
     }
 }

RMS/src/main/java/cn/cslg/report/entity/invalidReReport/AssoProofGroup.java

@@ -14,7 +14,7 @@ import java.util.Date;
  * @Date 2023/6/28
  */
 @Data
-@TableName
+@TableName(value="ASSO_PROOF_GROUP")
 public class AssoProofGroup extends BaseEntity<AssoProofGroup> {
     /**
      * 组合id

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

@@ -0,0 +1,16 @@
+package cn.cslg.report.mapper.InvalidReReport;
+
+import cn.cslg.report.entity.invalidReReport.AssoProofGroup;
+import cn.cslg.report.entity.invalidReReport.OralExam;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ *
+ *证据和证据组合关联Mapper层
+ * @Author 李仁杰
+ * @Date 2023/6/29
+ */
+@Repository
+public interface AssoProofGroupMapper extends BaseMapper<AssoProofGroup> {
+}

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

@@ -0,0 +1,23 @@
+package cn.cslg.report.service.business.InvalidReReport;
+
+import cn.cslg.report.common.model.dto.invalidReReport.ProofDetailDTO;
+import cn.cslg.report.common.utils.Response;
+import cn.cslg.report.entity.invalidReReport.AssoProofGroup;
+import cn.cslg.report.entity.invalidReReport.ProofDetail;
+import cn.cslg.report.mapper.InvalidReReport.AssoProofGroupMapper;
+import cn.cslg.report.mapper.InvalidReReport.ProofDetailMapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+
+@Service
+@Slf4j
+@RequiredArgsConstructor(onConstructor_ = {@Lazy})
+public class AssoProofGroupService extends ServiceImpl<AssoProofGroupMapper, AssoProofGroup> {
+
+}

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

@@ -54,12 +54,27 @@ public class ProofGroupService extends ServiceImpl<ProofGroupMapper,ProofGroup>
 
     }
 
-    //查询证据组合
+    /**
+     * 查询证据组合详情
+     * @param id 证据组合id
+     * @return
+     */
     public String queryProofGroupDetail(int id) {
         //若proofId 为null 或<=0,返回
     //根据证据组合id查询证据组合并装载到ProofGroupVO类里
-        //从
-        //
+
+        return Response.success();
+
+    }
+
+    /**
+     * 查询证据组合
+     * @param invalidId 无效理由Id
+     * @return
+     */
+    public String queryProofGroup(int invalidId) {
+     //根据无效理由Id查询证据组合列表，并返回
+
         return Response.success();
 
     }