From 12d9bd7b510828e9ffa8122b6997914133b687b8 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Tue, 22 Jun 2021 18:07:08 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=A0=87=E5=87=86=E5=85=A5=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../da/workFlow/service/ActSarItemsEOService.java  | 14 ++++++++------
 .../service/impl/SarStandardsInfoServiceImpl.java  | 14 +++++++-------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java
index a8f91968..64b63253 100644
--- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java
+++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java
@@ -102,7 +102,7 @@ public class ActSarItemsEOService {
             String prcNum = String.valueOf(standMap.get("prcNum"));
             String prcName = String.valueOf(standMap.get("prcName"));
             String standType = String.valueOf(standMap.get("standType"));
-            String isJudge = String.valueOf(standMap.get("ifIn")); //是否经过技术评估
+//            String isJudge = String.valueOf(standMap.get("ifIn")); //是否经过技术评估
             SarStandardsInfo sarStandardsInfoEO = new SarStandardsInfo();
 //            if(standMap.containsKey("standId")) {
 //                if (standMap.get("standId") != null && !standMap.get("standId").toString().equals("")) {
@@ -244,12 +244,13 @@ public class ActSarItemsEOService {
             List<SarStandItems> allItems = new ArrayList<>();
             //开始处理条款数据，从去重后的结果中直接处理即可
             if(itemData!=null && !itemData.isEmpty()){
-                allItems = saveStandItemsData(itemData, sarStandardsInfoEO);
+                // allItems =
+                saveStandItemsData(itemData, sarStandardsInfoEO);
             }
             //技术评估结果入库  重构技术评估结果入库内容
-            if ("0".equals(isJudge)) {
-                saveCompStatusInfo(sarStandardsInfoEO,breakVal,allItems,prcNum);
-            }
+//            if ("0".equals(isJudge)) {
+//                saveCompStatusInfo(sarStandardsInfoEO,breakVal,allItems,prcNum);
+//            }
         }
     }
 
@@ -1089,7 +1090,8 @@ public class ActSarItemsEOService {
                 if (StringUtils.isNotBlank(sarStandardsInfoEO.getFileIds()) && StringUtils.isNotBlank(valueStr)) {
                     valueStr = sarStandardsInfoEO.getFileIds() + "," + valueStr;
                 }
-                sarStandardsInfoEO.setFileIds(valueStr); break;
+                sarStandardsInfoEO.setFileIds(valueStr);
+                break;
             default:  break;
         }
     }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
index 9b742bfd..58ac6b8f 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
@@ -352,9 +352,9 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
             sarStandAttrInfoEODao.deleteStandAttrByStandId(sarStandardsInfoEO.getId());
             //编写预警信息
 //            writeWarnings(sarStandardsInfoEO);
-            updateCiteStand(sarStandardsInfoEO,null,"DTBJH","BDTBZBH");
-            updateCiteStand(sarStandardsInfoEO,null,"YYBJ","BYYBJ");
-            updateRelateStand(sarStandardsInfoEO,"CBBH");
+//            updateCiteStand(sarStandardsInfoEO,null,"DTBJH","BDTBZBH");
+//            updateCiteStand(sarStandardsInfoEO,null,"YYBJ","BYYBJ");
+//            updateRelateStand(sarStandardsInfoEO,"CBBH");
             // 根据代替标准号修改被代替的标准的状态  修改为已修订状态
             replaseStandState(sarStandardsInfoEO);
             // 处理属性表信息
@@ -366,7 +366,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
             if (StringUtils.isNotBlank(sarStandardsInfoEO.getStandYear())) {
                 number += "-" + sarStandardsInfoEO.getStandYear();
             }
-            String content = "新增" + number + " 《" + sarStandardsInfoEO.getStandName() + "》";
+            String content = "新增" + number + "  《" + sarStandardsInfoEO.getStandName() + "》";
             sarUpdLogEOService.createBaseLog(sarStandardsInfoEO.getId(),sarStandardsInfoEO.getStandType()+"_STAND",content);
 //            if(elasflag) {
 //                // 消息队列
@@ -913,10 +913,10 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         //修改标准过程中，重新修改代替标准号对应的标准的被代替标准号
 //        updateReplacedNumber(sarStandardsInfoEO,beforeSarStandardsInfo);
         // 根据引用标准修改其他被引用标准
-        updateCiteStand(sarStandardsInfoEO,beforeSarStandardsInfo,"DTBJH","BDTBZBH");
-        updateCiteStand(sarStandardsInfoEO,beforeSarStandardsInfo,"YYBJ","BYYBJ");
+//        updateCiteStand(sarStandardsInfoEO,beforeSarStandardsInfo,"DTBJH","BDTBZBH");
+//        updateCiteStand(sarStandardsInfoEO,beforeSarStandardsInfo,"YYBJ","BYYBJ");
         // 根据对应其他标准修改其他对应其他标准
-        updateRelateStand(sarStandardsInfoEO,"CBBH");
+//        updateRelateStand(sarStandardsInfoEO,"CBBH");
         // 根据代替标准号修改被代替的标准的状态  修改为已修订状态
         replaseStandState(sarStandardsInfoEO);
         // 记录修改日志