12chenyi

RMS/src/main/java/cn/cslg/report/service/business/AssoScenarIOSService.java

@@ -23,9 +23,9 @@ public class AssoScenarIOSService extends ServiceImpl<AssoScenarIOSMapper, AssoS
      * @param scenariosID 对比方案id
      * @return 对比方案与对比记录关联表 对应实体 AssoScenarIOS
      */
-    public List<AssoScenarIOS> select(int scenariosID){
+    public List<AssoScenarIOS> select(List<Integer> scenariosIDs){
         LambdaQueryWrapper<AssoScenarIOS> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(AssoScenarIOS::getScenariosID,scenariosID);
+        wrapper.in(AssoScenarIOS::getScenariosID,scenariosIDs);
         List<AssoScenarIOS> assoScenarIOS=this.list(wrapper);
         return assoScenarIOS;
     }

RMS/src/main/java/cn/cslg/report/service/business/CompareScenariosService.java

@@ -87,13 +87,16 @@ public class CompareScenariosService extends ServiceImpl<CompareScenariosMapper,
        //根据报告ID查询对比方案
         LambdaQueryWrapper<CompareScenarios> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(CompareScenarios::getReportId, reportID);
-        List<CompareScenarios> CompareScenarios = this.list(wrapper);
+        List<CompareScenarios> compareScenarios = this.list(wrapper);
         //根据报告ID和权要id获得特征
         LambdaQueryWrapper<Features> featuresWrapper =new LambdaQueryWrapper<>();
         featuresWrapper.eq(Features::getReportId,reportID);
         List<Features> allFeatures =featureService.list(featuresWrapper);
+        //获得所有对比方案id进而获得所有对比方案和特征-对比记录关联id
+        List<Integer> scenarioIds =compareScenarios.stream().map(CompareScenarios::getId).collect(Collectors.toList());
+        List<AssoScenarIOS> selects = assoScenarIOSService.select(scenarioIds);
         //遍历对比方案
-        for (CompareScenarios a:CompareScenarios){
+        for (CompareScenarios a:compareScenarios){
             CompareScenariosVO compareScenariosVO=new CompareScenariosVO();
             compareScenariosVO.setRightId(a.getRightId());
             compareScenariosVO.setContrastResult( a.getContrastResult());
@@ -103,9 +106,8 @@ public class CompareScenariosService extends ServiceImpl<CompareScenariosMapper,
             compareScenariosVO.setId(a.getId());
             //获得对比方案的特征列表
             List<Features> featuresLists =allFeatures.stream().filter(item->item.getRightId().equals(a.getRightId())).collect(Collectors.toList());
-
             //根据对比方案ID获得所有对比方案和对比记录关联信息
-            List<AssoScenarIOS> select = assoScenarIOSService.select(a.getId());
+            List<AssoScenarIOS> select = selects.stream().filter(item->item.getScenariosID()==a.getId()).collect(Collectors.toList());
             //获得Id不为0的对比记录和特征关联Id
             List<Integer> featureRecordIds = select.stream().filter(item->item.getFeatureRecordID()!=0).map(AssoScenarIOS::getFeatureRecordID).collect(Collectors.toList());
             //根据关联Id获得特征Id和对比记录ID
@@ -115,20 +117,19 @@ public class CompareScenariosService extends ServiceImpl<CompareScenariosMapper,
                 LambdaQueryWrapper<AssoRecordsFeature> wrapper1 = new LambdaQueryWrapper<>();
                 wrapper1.in(AssoRecordsFeature::getId, featureRecordIds);
                 assoRecordsFeatures = assoRecordsFeatureService.list(wrapper1);
-
+            }
             //获取特征Id
             List<Integer> featureIds= assoRecordsFeatures.stream().map(AssoRecordsFeature::getFeatureId).collect(Collectors.toList());
             //对比记录Id
             List<Integer> recordId  =assoRecordsFeatures.stream().map(AssoRecordsFeature::getRecordsId).collect(Collectors.toList());
             //根据特征Id查询特征
-            LambdaQueryWrapper<Features> wrapper2 =new LambdaQueryWrapper<>();
-            wrapper2.in(Features::getId,featureIds);
-            List<Features> features =featureService.list(wrapper2);
-            //根据记录ID查询记录
-            LambdaQueryWrapper<CompareRecords> wrapper3 =new LambdaQueryWrapper<>();
-            wrapper3.in(CompareRecords::getId,recordId);
-            List<CompareRecords> compareRecords =compareRecordsService.list(wrapper3);
-
+            List<Features> features = allFeatures.stream().filter(item->featureIds.contains(item.getId())).collect(Collectors.toList());
+            List<CompareRecords> compareRecords =new ArrayList<>();
+            if(recordId!=null&&recordId.size()>0) {
+                LambdaQueryWrapper<CompareRecords> wrapper3 = new LambdaQueryWrapper<>();
+                wrapper3.in(CompareRecords::getId, recordId);
+                compareRecords = compareRecordsService.list(wrapper3);
+            }
             for(Features item : featuresLists) {
                 AssoRecordsFeature assoRecordsFeature = assoRecordsFeatures.stream().filter(te->te.getFeatureId().equals(item.getId())).findFirst().orElse(new AssoRecordsFeature());
                 //筛选对比文件
@@ -137,15 +138,12 @@ public class CompareScenariosService extends ServiceImpl<CompareScenariosMapper,
                     assoRecordsFeature.setFeatures(item);
                     assoRecordsFeatures1.add(assoRecordsFeature);
             }
-            }
             //过滤拿到特征id
            List<Integer> featuresIds =select.stream().filter(item->item.getFeatureRecordID().equals(0)).map(AssoScenarIOS::getFeaturesID).collect(Collectors.toList());
             //根据特征Id查询特征
             List<Features> featuresList =new ArrayList<>();
             if(featuresIds!=null&&featuresIds.size()>0) {
-                LambdaQueryWrapper<Features> wrapper4 = new LambdaQueryWrapper<>();
-                wrapper4.in(Features::getId,featuresIds);
-                featuresList=featureService.list(wrapper4);
+                featuresList= allFeatures.stream().filter(item->featuresIds.contains(item.getId())).collect(Collectors.toList());
             }
             compareScenariosVO.setFeaturesList(featuresList);
             compareScenariosVO.setFeaturesIDList(featuresIds);

RMS/src/main/java/cn/cslg/report/service/business/ReportDocumentService.java

@@ -886,7 +886,7 @@ public class ReportDocumentService extends ServiceImpl<ReportDocumentMapper, Rep
         List<Integer> creativeIds = new ArrayList<Integer>();
         for (Map<String, Object> right : rights) {
             String text ="";
-            if (!right.get("parentSort").equals("-1")) {
+            if (right.get("parentSort")!=null&&!right.get("parentSort").equals("-1")) {
                 String parentSort ="";
                 List<String> sorts =new ArrayList<>(Arrays.asList(right.get("parentSort").toString().split(",")));
                 List<Integer> sortIds =new ArrayList<>();

RMS/src/main/java/cn/cslg/report/service/business/ReportService.java

@@ -142,11 +142,18 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
         Report report = this.loadReport(reportDto);
         report.insert();
         if (files != null && files.size() != 0) {
-            //将文档上传并返回文件入库的Id
-            List<Integer> fileIds = reportFileService.uploadFiles(files);
-            assoReportFileService.addAsso(report.getId(), fileIds);
+            //当
+            if(report.getStatus()!=3){
+                //将文档上传并返回文件入库的Id
+                List<Integer> fileIds = reportFileService.uploadFiles(files);
+                assoReportFileService.addAsso(report.getId(), fileIds);
+            }
+            else{
+                ReportReferences reportReferences =new ReportReferences();
+                reportReferences.setReportID(report.getId());
+                reportReferencesService.add(reportReferences,files);
+            }
         }
-        //当报告是已完成时
         if (reportDto.getTrack() != null && reportDto.getTrack()) {
             //复制父报告自定义栏位
             LambdaQueryWrapper<ReportField> fieldWrapper = new LambdaQueryWrapper<>();

RMS/src/main/java/cn/cslg/report/service/business/TaskService.java

@@ -61,7 +61,7 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
     public final CompareRecordsService compareRecordsService;
     public final CompareMessageService compareMessageService;
     public final SyneryCodeService syneryCodeService;
-    @Value("${PASUrl}")
+    @Value("${RMSUrl}")
     private String url;
 
     /**
@@ -269,7 +269,7 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
                     map.put("value2", tem.getCreateName());
                     map.put("value3", "审核任务");
                     map.put("value4", tem.getEndTime());
-                    map.put("value5", "http://139.224.24.90:8086/");
+                    map.put("value5", url);
                     mailUtils.sendEmailMessage(map);
 
                 }
@@ -865,7 +865,7 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
             map.put("value1", personnels.get(0).getPersonnelName());
             name = personnels.get(0).getPersonnelName();
             map.put("email", personnels.get(0).getPersonnelEmail());
-            map.put("img", "\\src\\main\\resources\\mail\\logo.png");
+            map.put("img", "/logo.png");
             map.put("value2", url + "/Incomplete?taskId=" + task.getId() + "&reportId=" + task.getReportId() + "&type=1" + "&reportType=" + report.getType());
             mailUtils.sendEmailMessage(map);
         } else {
@@ -882,7 +882,7 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
                 map.put("value1", personName);
                 name = personName;
                 map.put("email", email);
-                map.put("img", "\\src\\main\\resources\\mail\\logo.png");
+                map.put("img", "/logo.png");
                 map.put("value2", syneryCode.getCode());
                 map.put("value3", url + "/identificationCode");
                 mailUtils.sendEmailMessage(map);
@@ -904,13 +904,13 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
                     List<Personnel> personnels = JSON.parseArray(jsonObject.getString("data"), Personnel.class);
                     map.put("value1", personnel.getName());
                     map.put("email", personnels.get(0).getPersonnelEmail());
-                    map.put("img", "\\src\\main\\resources\\mail\\logo.png");
+                    map.put("img", "/logo.png");
                     map.put("value2", name);
                     mailUtils.sendEmailMessage(map);
                 } else {
                     map.put("value1", personnel.getName());
                     map.put("email", item.getCcEmail());
-                    map.put("img", "\\src\\main\\resources\\mail\\logo.png");
+                    map.put("img", "/logo.png");
                     map.put("value2", item.getCcName());
                     mailUtils.sendEmailMessage(map);
 

RMS/src/main/resources/application-prodNetIn.yml

@@ -49,5 +49,6 @@ RMSFile:  http://139.224.24.90:8084
 PASFile: http://139.224.24.90:8011
 PCSUrl: http://localhost:8871
 PASUrl: http://localhost:8877
+RMSUrl: http://139.224.24.90:82
 PCS: http://139.224.24.90:81
 PAS: http://139.224.24.90:80

RMS/src/main/resources/application-prodNetOut.yml

@@ -49,5 +49,6 @@ RMSFile:  http://139.224.24.90:8084
 PASFile: http://139.224.24.90:8011
 PCSUrl: http://localhost:8871
 PASUrl: http://localhost:8877
+RMSUrl: http://139.224.24.90:82
 PCS: http://139.224.24.90:81
 PAS: http://139.224.24.90:80