Merge remote-tracking branch 'origin/dev_20230216'

# Conflicts:
#	adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java
#	adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java
#	adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java
#	adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java
#	adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java
#	adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java

adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java

@@ -475,4 +475,6 @@ public interface workFlowFeignClient {
     String getEsByWk(@RequestParam("prcId")String prcId);
     @RequestMapping(value = "/bat-wkflow/deleteOAByMandatory",method = RequestMethod.GET)
     String deleteOAByMandatory(@RequestParam("todoId") String todoId,@RequestParam("assignee") String assignee);
+    @RequestMapping(value = "/bat-wkflow/datas/bus-process-new/selectBusProcessNew",method = RequestMethod.GET)
+    String selectBusProcessNew(@RequestParam("taskId")String taskId);
 }

adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java

@@ -422,4 +422,8 @@ public class workFlowFeignClientImpl {
     public String deleteOAByMandatory(@RequestParam("todoId") String todoId,@RequestParam("assignee") String assignee) {
         return workFlowFeignClient.deleteOAByMandatory(todoId,assignee);
     }
+
+    public String selectBusProcessNew(@RequestParam("taskId")String taskId) {
+        return workFlowFeignClient.selectBusProcessNew(taskId);
+    }
 }

adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java

@@ -59,6 +59,10 @@ public class ActDefineStartMap {
         map.put("25","enterpriseStandardSystemRevisionPlan");
 
         map.put("26","qbzxdlxjh");
+        // 问答流程
+        map.put("27","wdzxlc");
+        // 标准需求（翻译）申请流程
+        map.put("28","bzxqfy");
 
         return map.get(type);
     }

adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java

@@ -953,6 +953,11 @@ public class WorkFlowController {
         return workFlowFeignClient.getEsByWk(prcId);
     }
 
+    @ApiOperation(value = "首页流程计划立项查询mesg")
+    @GetMapping("/selectBusProcessNew")
+    public String selectBusProcessNew(@RequestParam("taskId") String taskId) {
+        return workFlowFeignClient.selectBusProcessNew(taskId);
+    }
     @ApiOperation(value = "OA待办强制删除")
     @GetMapping("/deleteOAByMandatory")
     public String deleteOAByMandatory(@RequestParam("todoId") String todoId,@RequestParam("assignee") String assignee) {

adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java

@@ -5,6 +5,7 @@ import com.adc.da.common.BussEnum;
 import com.adc.da.common.SarConformStateEnum;
 import com.adc.da.common.SarStateColorEnum;
 import com.adc.da.common.SarTypeEnum;
+import com.adc.da.exception.AdcDaBaseException;
 import com.adc.da.http.ResponseMessage;
 import com.adc.da.login.util.UserUtils;
 import com.adc.da.slrs.SarCompResAssess.entity.SarCompResAssess;
@@ -385,7 +386,6 @@ public class ActSarItemsBussEOService {
 //            attInfoMap = saveFileMsg(attInfoMap,sarStandardsInfoEO.getFileIds(),sarStandardsInfoEO.getTextStatus());
             String resData = JSON.toJSONString(attInfoMap, SerializerFeature.WriteMapNullValue);
             sarBussionessStand.setSarStandAttrEOStr(resData);
-            // 根据标准号判断数据是否已存在
             //2021年4月9日 此处检查当前是否存在standId
             String standCode = "";
             if(StringUtils.isNotBlank(sarBussionessStand.getStandCode()) && !"null".equals(sarBussionessStand.getStandCode())){
@@ -464,6 +464,14 @@ public class ActSarItemsBussEOService {
             } else {//标准号、ID都不存在的情况
                 //  新增方法
                 sarBussionessStand.setPrcCreateUser(prcCreateUser);
+                // 根据标准号判断数据是否已存在
+                QueryWrapper<SarBussionessStand>queryWrapper = new QueryWrapper<>();
+                queryWrapper.eq(sarBussionessStand.getStandCode() != null,"STAND_CODE",sarBussionessStand.getStandCode())
+                        .eq(sarBussionessStand.getStandName() != null,"STAND_NAME",sarBussionessStand.getStandName());
+                Integer count = iSarBussionessStandService.count(queryWrapper);
+                if (count > 0){
+                    throw new AdcDaBaseException("当前企标标准号和企标名称已存在");
+                }
                 ResponseMessage<SarBussionessStand> responseMessage = iSarBussionessStandService.createSarBussionessStand(sarBussionessStand);
                 if(responseMessage.isOk()){
                     SarBussionessStand bussionessStand = responseMessage.getData();

adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java

@@ -4,6 +4,8 @@ import com.adc.da.common.PropertyTypeEnum;
 import com.adc.da.common.SarConformStateEnum;
 import com.adc.da.common.SarStateColorEnum;
 import com.adc.da.common.SarTypeEnum;
+import com.adc.da.exception.AdcDaBaseException;
+import com.adc.da.http.Result;
 import com.adc.da.login.util.UserUtils;
 import com.adc.da.person.entity.PersonMsgEO;
 import com.adc.da.slrs.SarCompResAssess.entity.SarCompResAssess;
@@ -34,6 +36,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -189,6 +192,14 @@ public class ActSarItemsEOService {
 //            attInfoMap = saveFileMsg(attInfoMap,sarStandardsInfoEO.getFileIds(),sarStandardsInfoEO.getTextStatus());
             String resData = JSON.toJSONString(attInfoMap, SerializerFeature.WriteMapNullValue);
             sarStandardsInfoEO.setSarStandAttrEOStr(resData);
+
+            QueryWrapper<SarStandardsInfo> wrapper=new QueryWrapper<>();
+            wrapper.eq(null!=sarStandardsInfoEO.getStandName(),"STAND_NAME",sarStandardsInfoEO.getStandName())
+                    .eq(null!=sarStandardsInfoEO.getStandNumber(),"STAND_NUMBER",sarStandardsInfoEO.getStandNumber());
+            Integer s=sarStandardsInfoEOService.count(wrapper);
+            if (s>0){
+                throw new AdcDaBaseException("当前标准编号和中文名称已存在");
+            }
             // 根据标准号判断数据是否已存在
             //2021年4月9日 此处检查当前是否存在standId
             String standnumber = "";