标准解读流程入库+ 合并分支

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java

@@ -68,4 +68,11 @@ public class SarStandItemsController extends BaseController<SarStandItems> {
         return sarItems;
     }
 
+
+    @ApiOperation(value = "标准查询")
+    @PostMapping("/saveBatch")
+    public String saveBatch(@RequestBody List<SarStandItems> findStandDto){
+        return  ServiceImpl.sarStandItemsaveBatch(findStandDto);
+    }
+
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/ISarStandItemsService.java

@@ -24,4 +24,5 @@ public interface ISarStandItemsService extends IService<SarStandItems> {
     List<ActSarItemsEO> queryItemsByList(SarStandItemsEOPage page, String resType);
     List<SarItemsTime> findItemsTime(String type,String ids);
     IPage<LawsDto> selectLawDto(FindStandDto findStandDto);
+    String sarStandItemsaveBatch(List<SarStandItems> sarStandItems);
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java

@@ -176,6 +176,16 @@ public class SarStandItemsServiceImpl extends ServiceImpl<SarStandItemsDao, SarS
         return page1;
     }
 
+    @Override
+    public String sarStandItemsaveBatch(List<SarStandItems> sarStandItems) {
+        boolean flag=this.saveBatch(sarStandItems,sarStandItems.size());
+        if (flag){
+            return "0";
+        }else {
+            return "1";
+        }
+    }
+
     public List<SarStandItemsDto> findAllItems(String type,String[] ids){
         return dao.selectAllItemsByIds(type,ids);
     }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarInterpretationNationalStandardController.java

@@ -1,12 +1,20 @@
 package com.adc.da.slrs.sarStandardComplianceAssessResult.controller;
 
 
+import com.adc.da.slrs.sarStandItems.entity.SarStandItems;
+import com.adc.da.slrs.sarStandardComplianceAssessResult.service.impl.SarInterpretationNationalStandardServiceImpl;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarInterpretationNationalStandard;
 import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RestController;
 import com.adc.da.base.web.BaseController;
 
+import java.util.List;
+
 /**
 * <p>
     *  前端控制器
@@ -17,7 +25,16 @@ import com.adc.da.base.web.BaseController;
 */
 @RestController
 @Api(description = "|SarInterpretationNationalStandard|")
-@RequestMapping("/sarStandardComplianceAssessResult/sar-interpretation-national-standard")
+@RequestMapping("/${restPath}/sarStandardComplianceAssessResult/sar-interpretation-national-standard")
 public class SarInterpretationNationalStandardController extends BaseController<SarInterpretationNationalStandard> {
 
+    @Autowired
+    SarInterpretationNationalStandardServiceImpl sarInterpretationNationalStandardService;
+
+    @ApiOperation(value = "标准查询")
+    @PostMapping("/saveBatch")
+    public String saveBatch(@RequestBody List<SarInterpretationNationalStandard> findStandDto){
+        return  sarInterpretationNationalStandardService.saveBath(findStandDto);
+    }
+
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/ISarInterpretationNationalStandardService.java

@@ -3,6 +3,8 @@ package com.adc.da.slrs.sarStandardComplianceAssessResult.service;
 import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarInterpretationNationalStandard;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务类
@@ -13,4 +15,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ISarInterpretationNationalStandardService extends IService<SarInterpretationNationalStandard> {
 
+    String saveBath(List<SarInterpretationNationalStandard> sarInterpretationNationalStandards);
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarInterpretationNationalStandardServiceImpl.java

@@ -1,11 +1,18 @@
 package com.adc.da.slrs.sarStandardComplianceAssessResult.service.impl;
 
+import com.adc.da.slrs.sarStandardComplianceAssessResult.dao.SarStandardComplianceProductAssessDao;
 import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarInterpretationNationalStandard;
 import com.adc.da.slrs.sarStandardComplianceAssessResult.dao.SarInterpretationNationalStandardDao;
+import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarStandardComplianceProductAssess;
 import com.adc.da.slrs.sarStandardComplianceAssessResult.service.ISarInterpretationNationalStandardService;
+import com.adc.da.sys.util.UUIDUtils;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务实现类
@@ -17,4 +24,27 @@ import org.springframework.stereotype.Service;
 @Service
 public class SarInterpretationNationalStandardServiceImpl extends ServiceImpl<SarInterpretationNationalStandardDao, SarInterpretationNationalStandard> implements ISarInterpretationNationalStandardService {
 
+    @Autowired
+    SarStandardComplianceProductAssessDao sarStandardComplianceProductAssessDao;
+
+    @Override
+    public String saveBath(List<SarInterpretationNationalStandard> sarInterpretationNationalStandards) {
+        boolean flag = this.saveBatch(sarInterpretationNationalStandards,sarInterpretationNationalStandards.size());
+        sarInterpretationNationalStandards.forEach(sarInterpretationNationalStandard -> {
+            QueryWrapper<SarStandardComplianceProductAssess> queryWrapper=new QueryWrapper<>();
+            queryWrapper.eq("stand_id",sarInterpretationNationalStandard.getStandId());
+            List<SarStandardComplianceProductAssess> assessList = sarStandardComplianceProductAssessDao.selectList(queryWrapper);
+            if (assessList.isEmpty()){
+                SarStandardComplianceProductAssess sar=new SarStandardComplianceProductAssess();
+                sar.setId(UUIDUtils.randomUUID(32));
+                sar.setStandId(sarInterpretationNationalStandard.getStandId());
+                sar.setStandName(sarInterpretationNationalStandard.getStandName());
+                sar.setStandType(sarInterpretationNationalStandard.getStandType());
+                sar.setInterpretationTime(sarInterpretationNationalStandard.getInterpretationTime());
+                sarStandardComplianceProductAssessDao.insert(sar);
+            }
+        });
+        String res = flag ? "1":"0";
+        return res;
+    }
 }