12chenyi

RMS/src/main/java/cn/cslg/report/common/model/dto/invalidReReport/QueryInvalidReasonDTO.java

@@ -0,0 +1,14 @@
+package cn.cslg.report.common.model.dto.invalidReReport;
+
+import lombok.Data;
+
+/**
+ * @Author xiexiang
+ * @Date 2023/7/7
+ */
+@Data
+public class QueryInvalidReasonDTO {
+    private Integer reportId;
+    private Integer current;
+    private Integer size;
+}

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

@@ -1,14 +1,14 @@
 package cn.cslg.report.controller.InvalidReReport;
 
 import cn.cslg.report.common.core.base.Constants;
-import cn.cslg.report.common.model.dto.ShareReportDTO;
 import cn.cslg.report.common.model.dto.invalidReReport.CheckReFeaturesDTO;
 import cn.cslg.report.common.model.dto.invalidReReport.InvalidReasonDTO;
+import cn.cslg.report.common.model.dto.invalidReReport.QueryInvalidReasonDTO;
+import cn.cslg.report.common.model.vo.invalidReReport.PagingVO;
 import cn.cslg.report.common.model.vo.invalidReReport.QueryInvalidReasonVO;
 import cn.cslg.report.common.utils.Response;
 import cn.cslg.report.entity.invalidReReport.InvalidReason;
 import cn.cslg.report.service.business.InvalidReReport.InvalidReasonService;
-import cn.cslg.report.service.business.InvalidReReport.ProofService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
@@ -72,6 +72,7 @@ public class InvalidReasonController {
         }
     }
 
+
     @Operation(summary = "查询无效理由和证据详情")
     @PostMapping("/queryInvalidReasonDetail")
     public String queryInvalidReasonDetail(@RequestBody InvalidReasonDTO InvalidReasonDTO) throws IOException {

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

@@ -1,6 +1,5 @@
 package cn.cslg.report.mapper.InvalidReReport;
 
-import cn.cslg.report.entity.invalidReReport.ProofDetail;
 import cn.cslg.report.entity.invalidReReport.ProofGroup;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.springframework.stereotype.Repository;
@@ -14,6 +13,5 @@ import org.springframework.stereotype.Repository;
 @Repository
 public interface ProofGroupMapper extends BaseMapper<ProofGroup> {
 
-
 }
 

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

@@ -1,14 +1,15 @@
 package cn.cslg.report.service.business.InvalidReReport;
 
-import cn.cslg.report.common.model.dto.ShareReportDTO;
 import cn.cslg.report.common.model.dto.invalidReReport.CheckReFeaturesDTO;
 import cn.cslg.report.common.model.dto.invalidReReport.InvalidReasonDTO;
 import cn.cslg.report.common.model.dto.invalidReReport.ProofGroupDTO;
+import cn.cslg.report.common.model.dto.invalidReReport.QueryInvalidReasonDTO;
 import cn.cslg.report.common.model.vo.PersonnelVO;
-import cn.cslg.report.common.model.vo.invalidReReport.ProofGroupVO;
+import cn.cslg.report.common.model.vo.invalidReReport.PagingVO;
 import cn.cslg.report.common.model.vo.invalidReReport.QueryAllFeaturesVO;
 import cn.cslg.report.common.model.vo.invalidReReport.QueryInvalidReasonVO;
 import cn.cslg.report.common.utils.CacheUtils;
+import cn.cslg.report.common.utils.DataUtils;
 import cn.cslg.report.common.utils.Response;
 import cn.cslg.report.common.utils.SecurityUtils.LoginUtils;
 import cn.cslg.report.entity.Features;
@@ -17,12 +18,14 @@ import cn.cslg.report.entity.invalidReReport.AssoPositionFeatures;
 import cn.cslg.report.entity.invalidReReport.AssoProofGroup;
 import cn.cslg.report.entity.invalidReReport.InvalidReason;
 import cn.cslg.report.entity.invalidReReport.ProofGroup;
-import cn.cslg.report.exception.XiaoShiException;
 import cn.cslg.report.mapper.FeatureMapper;
 import cn.cslg.report.mapper.InvalidReReport.InvalidReasonMapper;
 import cn.cslg.report.service.business.ReportService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.PageHelper;
+import io.swagger.v3.oas.models.security.SecurityScheme;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
@@ -266,16 +269,22 @@ public class InvalidReasonService extends ServiceImpl<InvalidReasonMapper, Inval
     public List<QueryInvalidReasonVO> queryInvalidReason(Integer reportId) {
         List<QueryInvalidReasonVO> queryInvalidReasonVOS = new ArrayList<>();
         //根据报告id查询无效理由
-        LambdaQueryWrapper<InvalidReason> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(InvalidReason::getReportId,reportId);
-        List<InvalidReason> invalidReasons = this.list(queryWrapper);
+        List<InvalidReason> invalidReasons = new ArrayList<>();
+        if(reportId != null) {
+            LambdaQueryWrapper<InvalidReason> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(InvalidReason::getReportId, reportId);
+            invalidReasons = this.list(queryWrapper);
+        }
         for(InvalidReason invalidReason:invalidReasons) {
             QueryInvalidReasonVO queryInvalidReasonVO = new QueryInvalidReasonVO();
             BeanUtils.copyProperties(invalidReason,queryInvalidReasonVO);
             queryInvalidReasonVOS.add(queryInvalidReasonVO);
         }
-        List<QueryInvalidReasonVO> queryInvalidReasonVOs = this.loadInvalidReason(queryInvalidReasonVOS);
-        return queryInvalidReasonVOs;
+        if(queryInvalidReasonVOS.size()>0) {
+            List<QueryInvalidReasonVO> queryInvalidReasonVOs = this.loadInvalidReason(queryInvalidReasonVOS);
+            return queryInvalidReasonVOs;
+        }
+        return null;
     }
 
                     /**查找无效理由和证据列表
@@ -290,20 +299,22 @@ public class InvalidReasonService extends ServiceImpl<InvalidReasonMapper, Inval
                                 .filter(item -> item.getInvalidName() == 2 || item.getInvalidName() == 3)
                                 .map(QueryInvalidReasonVO::getId)
                                 .collect(Collectors.toList());
-                        //根据无效理由ids查询出所有的证据组合
-                        LambdaQueryWrapper<ProofGroup> queryWrapper1 = new LambdaQueryWrapper<>();
-                        queryWrapper1.in(ProofGroup::getInvalidReasonId, invalidReasonsIds);
-                        List<ProofGroup> proofGroups = proofGroupService.list(queryWrapper1);
+                        //根据无效理由ids查询出所有的证据组合c
+                        List<ProofGroup> proofGroups  =new ArrayList<>();
+                        if(invalidReasonsIds.size() > 0) {
+                            LambdaQueryWrapper<ProofGroup> queryWrapper1 = new LambdaQueryWrapper<>();
+                            queryWrapper1.in(ProofGroup::getInvalidReasonId, invalidReasonsIds);
+                            proofGroups = proofGroupService.list(queryWrapper1);
+                        }
                         //由于查出来的proofGroups中没有proofIds这个字段，于是采用下面的方法装载成proofGroupVOS
                         List<QueryInvalidReasonVO.proofGroupIn> proofGroupIns = this.loadProofGroupVO(proofGroups);
-                        for(QueryInvalidReasonVO queryInvalidReasonVO:queryInvalidReasonVOS){
-                            //比对无效理由id，把能匹配上的进行装载
-                            List<QueryInvalidReasonVO.proofGroupIn> proofGroupIn= proofGroupIns.stream()
-                                    .filter(item -> item.getInvalidReasonId().equals(queryInvalidReasonVO.getId()))
-                                    .collect(Collectors.toList());
-                            queryInvalidReasonVO.setProofGroups(proofGroupIn);
-                            queryInvalidReasonVOS.add(queryInvalidReasonVO);
-                        }
+                            for(QueryInvalidReasonVO queryInvalidReasonVO:queryInvalidReasonVOS) {
+                                //比对无效理由id，把能匹配上的进行装载
+                                List<QueryInvalidReasonVO.proofGroupIn> proofGroupIn = proofGroupIns.stream()
+                                        .filter(item -> item.getInvalidReasonId().equals(queryInvalidReasonVO.getId()))
+                                        .collect(Collectors.toList());
+                                queryInvalidReasonVO.setProofGroups(proofGroupIn);
+                            }
                         return queryInvalidReasonVOS;
                     }
 
@@ -320,9 +331,12 @@ public class InvalidReasonService extends ServiceImpl<InvalidReasonMapper, Inval
                                 .collect(Collectors.toList());
                         //根据组合ids查询出每一个groupId对应的proofIds
                         //首先批量查出来所有的证据和证据组合关联对象
-                        LambdaQueryWrapper<AssoProofGroup> queryWrapper = new LambdaQueryWrapper<>();
-                        queryWrapper.in(AssoProofGroup::getGroupId, proofGroupIds);
-                        List<AssoProofGroup> assoProofGroups = assoProofGroupService.list(queryWrapper);
+                        List<AssoProofGroup> assoProofGroups = new ArrayList<>();
+                        if(proofGroupIds.size() > 0) {
+                            LambdaQueryWrapper<AssoProofGroup> queryWrapper = new LambdaQueryWrapper<>();
+                            queryWrapper.in(AssoProofGroup::getGroupId, proofGroupIds);
+                            assoProofGroups = assoProofGroupService.list(queryWrapper);
+                        }
                         //证据组合的装载
                         for (ProofGroup proofGroup : proofGroups) {
                             QueryInvalidReasonVO.proofGroupIn proofGroupIn = new QueryInvalidReasonVO.proofGroupIn();

RMS/src/main/resources/mapper/FeatureMapper.xml

@@ -14,7 +14,7 @@
         </where>
     </select>
     <select id="find" resultType="cn.cslg.report.entity.Features">
-        select * from FEATURES where ID=#{id}
+        select * from FEATURES where ID = #{id}
     </select>
 
     <resultMap id="queryAllFeaturesResultMap" type="cn.cslg.report.common.model.vo.invalidReReport.QueryAllFeaturesVO">
@@ -23,6 +23,6 @@
     </resultMap>
 
     <select id="queryAllFeatures" resultMap="queryAllFeaturesResultMap">
-        SELECT a.CONTENT, b.POSITION FROM FEATURES a LEFT JOIN ASSO_POSITION_FEATURES b ON a.ID = b.FEATURES_ID WHERE REPORT_ID = #{reportId} AND RIGHT_ID = #{rightSort};
+        SELECT a.CONTENT, b.POSITION FROM FEATURES a LEFT JOIN ASSO_POSITION_FEATURES b ON a.ID = b.FEATURES_ID WHERE REPORT_ID = #{reportId} AND RIGHT_ID = #{rightSort}
     </select>
 </mapper>