代码合并

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

@@ -61,7 +61,7 @@ public class ArgumentsDTO  {
     /**
      * 划词颜色
      */
-    private String scratchColor ;
+    private String color ;
 
     /**
      * 划词栏位

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

@@ -15,7 +15,7 @@ public class ArgumentsScenarioDTO {
     /**
      * 权要id
      */
-    private Integer rightId;
+    private Integer rightSort;
 
     /**
      * 修改方案/理由

RMS/src/main/java/cn/cslg/report/common/model/vo/invalidReReport/ArgumentsDetailsVO.java

@@ -75,6 +75,6 @@ public class ArgumentsDetailsVO {
      * 无效证据
      */
     private Integer proofStrId;
-
+    private String sortStr;
 
 }

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

@@ -35,8 +35,7 @@ public class ArgumentsScenarioController {
     @Operation(summary = "添加陈述意见方案")
     @PostMapping("/add")
     public String add(@RequestBody ArgumentsScenarioDTO argumentsScenarioDTO) {
-        argumentsScenarioService.addArgumentsScenario(argumentsScenarioDTO);
-        return Response.success();
+        return argumentsScenarioService.addArgumentsScenario(argumentsScenarioDTO);
     }
 
     @Operation(summary = "删除陈述意见方案")

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

@@ -27,8 +27,8 @@ public class ArgumentsScenarios extends BaseEntity<ArgumentsScenarios> {
     /**
      * 权要id
      */
-    @TableField("RIGHT_ID")
-    private Integer rightId;
+    @TableField("RIGHT_SORT")
+    private Integer rightSort;
 
     /**
      * 修改方案/理由

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

@@ -2,9 +2,11 @@ package cn.cslg.report.service.business.InvalidReReport;
 
 import cn.cslg.report.common.model.dto.invalidReReport.ArgumentsScenarioDTO;
 import cn.cslg.report.common.utils.Response;
+import cn.cslg.report.common.utils.SecurityUtils.LoginUtils;
 import cn.cslg.report.entity.Template;
 import cn.cslg.report.entity.invalidReReport.Arguments;
 import cn.cslg.report.entity.invalidReReport.ArgumentsScenarios;
+import cn.cslg.report.entity.invalidReReport.AssoArguments;
 import cn.cslg.report.mapper.InvalidReReport.ArgumentsScenarioMapper;
 import cn.cslg.report.mapper.TemplateMapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -13,6 +15,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
@@ -25,19 +28,40 @@ import java.util.List;
 @Slf4j
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
 public class ArgumentsScenarioService extends ServiceImpl<ArgumentsScenarioMapper, ArgumentsScenarios> {
+    private final LoginUtils loginUtils;
+    private final AssoArgumentsService assoArgumentsService;
     //添加陈述意见方案
     public String addArgumentsScenario(ArgumentsScenarioDTO argumentsScenarioDTO) {
-         //判断argumentIds是否为空或者size=0
-         //判断报告id和权要id是否传入
-        //添加陈述意见方案
+        Integer loginId = loginUtils.getId();
+        List<Integer> argumentIds =argumentsScenarioDTO.getArgumentIds();
+        Integer reportId =argumentsScenarioDTO.getReportId();
+        Integer rightSort =argumentsScenarioDTO.getRightSort();
+        if(argumentIds==null||argumentIds.size()==0||reportId==null||rightSort==null){
+            return Response.error("请按要求输入参数");
+        }
+        ArgumentsScenarios argumentsScenarios =new ArgumentsScenarios();
+        BeanUtils.copyProperties(argumentsScenarioDTO,argumentsScenarios);
+        argumentsScenarios.setCreateId(loginId);
+        argumentsScenarios.insert();
         //添加陈述意见方案和陈述意见关联关系
-
-return "";
+        List<AssoArguments> assoArguments=new ArrayList<>();
+        argumentIds.forEach(item->{
+            AssoArguments assoArgument =new AssoArguments();
+            assoArgument.setArgumentId(item);
+            assoArgument.setCreateId(loginId);
+            assoArgument.setScenarioId(argumentsScenarios.getId());
+            assoArguments.add(assoArgument);
+        });
+        assoArgumentsService.saveBatch(assoArguments);
+return Response.success();
     }
 
     //删除陈述意见方案
     public String deleteArgumentsScenario(List<Integer> scenarioIds) {
         //若ids为空或者size=0则返回请至少选择一个方案进行删除
+        if(scenarioIds==null||scenarioIds.size()==0){
+            Response.error("请至少选择一个方案");
+        }
         //根据陈述意见方案id批量删除陈述意见方案
         //根据陈述意见方案id批量删除陈述意见方案和陈述意见关联关系
           return  "";

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

@@ -109,6 +109,7 @@ public class ArgumentsService extends ServiceImpl<ArgumentsMapper, Arguments> {
             scratch.setCreateId(loginId);
             scratch.setArgumentId(arguments.getId());
             scratch.setReportId(argumentsDTO.getReportId());
+            scratch.setScratchColor(argumentsDTO.getColor());
             scratch.insert();
         }
         return Response.success("添加成功");
@@ -193,12 +194,13 @@ public class ArgumentsService extends ServiceImpl<ArgumentsMapper, Arguments> {
         for (Scratch item : scratchList) {
             ArgumentsDetailsVO argumentsDetailsVO = new ArgumentsDetailsVO();
             argumentsDetailsVO.setColor(item.getScratchColor());
-            BeanUtils.copyProperties(item, argumentsDetailsVO);
+            argumentsDetailsVO.setSortStr("D"+(compareFiles.getSysOrder()));
             Arguments argument = arguments.stream().filter(tem -> tem.getId().equals(item.getArgumentId())).findFirst().orElse(null);
             BeanUtils.copyProperties(argument,argumentsDetailsVO);
+            BeanUtils.copyProperties(item, argumentsDetailsVO);
        AssoFeatureProof assoFeatureProof=     assoFeatureProofs.stream().filter(tem->tem.getFeatureId().equals(argument.getFeatureId())).findFirst().orElse(null);
             if(assoFeatureProof!=null) {
-                argumentsDetailsVO.setArgumentStr(assoFeatureProof.getProofStr());
+                argumentsDetailsVO.setProofStr(assoFeatureProof.getProofStr());
                 argumentsDetailsVO.setProofStrId(assoFeatureProof.getId());
             }
             argumentsDetailsVOS.add(argumentsDetailsVO);