From f5e2d04d3010f6e1f7de23177b5dd3d8d9bc6197 Mon Sep 17 00:00:00 2001
From: yinglong zhang <1679309912@qq.com>
Date: Fri, 18 Jun 2021 15:32:47 +0800
Subject: [PATCH] =?UTF-8?q?feat=20=E4=BF=AE=E6=94=B9=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E5=90=88=E8=A7=84=E8=AF=84=E4=BC=B0=E7=BB=93=E6=9E=9C=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SarInterpretationForeignStandard.java     |  41 ------
 .../SarInterpretationNationalStandard.java    |  41 ------
 ...erpretationForeignStandardServiceImpl.java |  20 ---
 ...rpretationNationalStandardServiceImpl.java |  20 ---
 ...terpretationForeignStandardController.java |   8 +-
 ...erpretationNationalStandardController.java |   8 +-
 ...ndardComplianceAssessResultController.java | 133 +++++++++---------
 ...dardComplianceProductAssessController.java |   8 +-
 .../SarInterpretationForeignStandardDao.java  |   6 +-
 .../SarInterpretationNationalStandardDao.java |   6 +-
 .../SarStandardComplianceAssessResultDao.java |  12 --
 ...SarStandardComplianceProductAssessDao.java |   6 +-
 .../entity/InterpretationEO.java              |  39 +++++
 .../entity/SarBaseStandardInfo.java           |  16 +++
 .../SarInterpretationForeignStandard.java     | 102 ++++++++++++++
 .../SarInterpretationForeignStandardEO.java   |  20 ---
 .../SarInterpretationNationalStandard.java    |  90 ++++++++++++
 .../SarInterpretationNationalStandardEO.java  |  20 ---
 .../SarStandardComplianceProductAssess.java   | 112 +++++++++++++++
 .../SarStandardComplianceProductAssessEO.java |  18 ++-
 .../entity/SarStandardsInfoEO.java            |   6 +
 ...rInterpretationForeignStandardService.java |   6 +-
 ...InterpretationNationalStandardService.java |   6 +-
 .../ISarStandardComplianceAssessResult.java   |  11 --
 ...tandardComplianceProductAssessService.java |   6 +-
 ...erpretationForeignStandardServiceImpl.java |  20 +++
 ...rpretationNationalStandardServiceImpl.java |  20 +++
 ...ardComplianceProductAssessServiceImpl.java |  20 +++
 .../SarStandardComplianceProductAssess.java   |  63 ---------
 ...ardComplianceProductAssessServiceImpl.java |  20 ---
 .../SarInterpretationStandardMapper.xml       |   5 +
 ...SarInterpretationForeignStandardMapper.xml |   5 +
 ...arInterpretationNationalStandardMapper.xml |   9 ++
 ...rStandardComplianceProductAssessMapper.xml |   7 +
 34 files changed, 566 insertions(+), 364 deletions(-)
 delete mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarInterpretationStandard/entity/SarInterpretationForeignStandard.java
 delete mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarInterpretationStandard/entity/SarInterpretationNationalStandard.java
 delete mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarInterpretationStandard/service/impl/SarInterpretationForeignStandardServiceImpl.java
 delete mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarInterpretationStandard/service/impl/SarInterpretationNationalStandardServiceImpl.java
 rename adc-da-slrs/src/main/java/com/adc/da/slrs/{sarInterpretationStandard => sarStandardComplianceAssessResult}/controller/SarInterpretationForeignStandardController.java (62%)
 rename adc-da-slrs/src/main/java/com/adc/da/slrs/{sarInterpretationStandard => sarStandardComplianceAssessResult}/controller/SarInterpretationNationalStandardController.java (62%)
 rename adc-da-slrs/src/main/java/com/adc/da/slrs/{sarStandardComplianceProductAssess => sarStandardComplianceAssessResult}/controller/SarStandardComplianceProductAssessController.java (62%)
 rename adc-da-slrs/src/main/java/com/adc/da/slrs/{sarInterpretationStandard => sarStandardComplianceAssessResult}/dao/SarInterpretationForeignStandardDao.java (55%)
 rename adc-da-slrs/src/main/java/com/adc/da/slrs/{sarInterpretationStandard => sarStandardComplianceAssessResult}/dao/SarInterpretationNationalStandardDao.java (55%)
 delete mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/dao/SarStandardComplianceAssessResultDao.java
 rename adc-da-slrs/src/main/java/com/adc/da/slrs/{sarStandardComplianceProductAssess => sarStandardComplianceAssessResult}/dao/SarStandardComplianceProductAssessDao.java (55%)
 create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/InterpretationEO.java
 create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarBaseStandardInfo.java
 create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationForeignStandard.java
 delete mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationForeignStandardEO.java
 create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationNationalStandard.java
 delete mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationNationalStandardEO.java
 create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java
 rename adc-da-slrs/src/main/java/com/adc/da/slrs/{sarInterpretationStandard => sarStandardComplianceAssessResult}/service/ISarInterpretationForeignStandardService.java (55%)
 rename adc-da-slrs/src/main/java/com/adc/da/slrs/{sarInterpretationStandard => sarStandardComplianceAssessResult}/service/ISarInterpretationNationalStandardService.java (55%)
 delete mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/ISarStandardComplianceAssessResult.java
 rename adc-da-slrs/src/main/java/com/adc/da/slrs/{sarStandardComplianceProductAssess => sarStandardComplianceAssessResult}/service/ISarStandardComplianceProductAssessService.java (55%)
 create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarInterpretationForeignStandardServiceImpl.java
 create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarInterpretationNationalStandardServiceImpl.java
 create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarStandardComplianceProductAssessServiceImpl.java
 delete mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceProductAssess/entity/SarStandardComplianceProductAssess.java
 delete mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceProductAssess/service/impl/SarStandardComplianceProductAssessServiceImpl.java
 create mode 100644 adc-da-slrs/src/main/resources/mybatis/mapper/sarInterpretationStandard/SarInterpretationStandardMapper.xml
 create mode 100644 adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationForeignStandardMapper.xml
 create mode 100644 adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml
 create mode 100644 adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarStandardComplianceProductAssessMapper.xml

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInterpretationStandard/entity/SarInterpretationForeignStandard.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInterpretationStandard/entity/SarInterpretationForeignStandard.java
deleted file mode 100644
index b3e186a6..00000000
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInterpretationStandard/entity/SarInterpretationForeignStandard.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.adc.da.slrs.sarInterpretationStandard.entity;
-
-import com.adc.da.base.entity.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyl
- * @since 2021-06-16
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-@ApiModel(value="SarInterpretationForeignStandard对象", description="")
-public class SarInterpretationForeignStandard extends BaseEntity {
-
-    private static final long serialVersionUID = 1L;
-
-    private String standardNum;
-
-    private String standardName;
-
-    private String correspondDomesticStandard;
-
-    private String specificItem;
-
-    private String coreTechnicalRequirement;
-
-    private String comparedDomesticStandard;
-
-    private String complianceState;
-
-
-}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInterpretationStandard/entity/SarInterpretationNationalStandard.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInterpretationStandard/entity/SarInterpretationNationalStandard.java
deleted file mode 100644
index e2b4cd3e..00000000
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInterpretationStandard/entity/SarInterpretationNationalStandard.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.adc.da.slrs.sarInterpretationStandard.entity;
-
-import com.adc.da.base.entity.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyl
- * @since 2021-06-16
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-@ApiModel(value="SarInterpretationNationalStandard对象", description="")
-public class SarInterpretationNationalStandard extends BaseEntity {
-
-    private static final long serialVersionUID = 1L;
-
-    private String standardNum;
-
-    private String standardName;
-
-    private Integer lastVersionNum;
-
-    private String specificItem;
-
-    private String coreTechnicalRequirement;
-
-    private String comparedWithPrevious;
-
-    private String complianceState;
-
-
-}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInterpretationStandard/service/impl/SarInterpretationForeignStandardServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInterpretationStandard/service/impl/SarInterpretationForeignStandardServiceImpl.java
deleted file mode 100644
index f809c650..00000000
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInterpretationStandard/service/impl/SarInterpretationForeignStandardServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.adc.da.slrs.sarInterpretationStandard.service.impl;
-
-import com.adc.da.slrs.sarInterpretationStandard.entity.SarInterpretationForeignStandard;
-import com.adc.da.slrs.sarInterpretationStandard.dao.SarInterpretationForeignStandardDao;
-import com.adc.da.slrs.sarInterpretationStandard.service.ISarInterpretationForeignStandardService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author zyl
- * @since 2021-06-16
- */
-@Service
-public class SarInterpretationForeignStandardServiceImpl extends ServiceImpl<SarInterpretationForeignStandardDao, SarInterpretationForeignStandard> implements ISarInterpretationForeignStandardService {
-
-}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInterpretationStandard/service/impl/SarInterpretationNationalStandardServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInterpretationStandard/service/impl/SarInterpretationNationalStandardServiceImpl.java
deleted file mode 100644
index 0fa0a2bf..00000000
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInterpretationStandard/service/impl/SarInterpretationNationalStandardServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.adc.da.slrs.sarInterpretationStandard.service.impl;
-
-import com.adc.da.slrs.sarInterpretationStandard.entity.SarInterpretationNationalStandard;
-import com.adc.da.slrs.sarInterpretationStandard.dao.SarInterpretationNationalStandardDao;
-import com.adc.da.slrs.sarInterpretationStandard.service.ISarInterpretationNationalStandardService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author zyl
- * @since 2021-06-16
- */
-@Service
-public class SarInterpretationNationalStandardServiceImpl extends ServiceImpl<SarInterpretationNationalStandardDao, SarInterpretationNationalStandard> implements ISarInterpretationNationalStandardService {
-
-}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInterpretationStandard/controller/SarInterpretationForeignStandardController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarInterpretationForeignStandardController.java
similarity index 62%
rename from adc-da-slrs/src/main/java/com/adc/da/slrs/sarInterpretationStandard/controller/SarInterpretationForeignStandardController.java
rename to adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarInterpretationForeignStandardController.java
index e09d97fe..2df7a33d 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInterpretationStandard/controller/SarInterpretationForeignStandardController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarInterpretationForeignStandardController.java
@@ -1,8 +1,8 @@
-package com.adc.da.slrs.sarInterpretationStandard.controller;
+package com.adc.da.slrs.sarStandardComplianceAssessResult.controller;
 
 
 import org.springframework.web.bind.annotation.RequestMapping;
-import com.adc.da.slrs.sarInterpretationStandard.entity.SarInterpretationForeignStandard;
+import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarInterpretationForeignStandard;
 import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RestController;
 import com.adc.da.base.web.BaseController;
@@ -13,11 +13,11 @@ import com.adc.da.base.web.BaseController;
     * </p>
 *
 * @author zyl
-* @since 2021-06-16
+* @since 2021-06-18
 */
 @RestController
 @Api(description = "|SarInterpretationForeignStandard|")
-@RequestMapping("/sarInterpretationStandard/sar-interpretation-foreign-standard")
+@RequestMapping("/sarStandardComplianceAssessResult/sar-interpretation-foreign-standard")
 public class SarInterpretationForeignStandardController extends BaseController<SarInterpretationForeignStandard> {
 
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInterpretationStandard/controller/SarInterpretationNationalStandardController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarInterpretationNationalStandardController.java
similarity index 62%
rename from adc-da-slrs/src/main/java/com/adc/da/slrs/sarInterpretationStandard/controller/SarInterpretationNationalStandardController.java
rename to adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarInterpretationNationalStandardController.java
index 50cbd956..c0d1a370 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInterpretationStandard/controller/SarInterpretationNationalStandardController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarInterpretationNationalStandardController.java
@@ -1,8 +1,8 @@
-package com.adc.da.slrs.sarInterpretationStandard.controller;
+package com.adc.da.slrs.sarStandardComplianceAssessResult.controller;
 
 
 import org.springframework.web.bind.annotation.RequestMapping;
-import com.adc.da.slrs.sarInterpretationStandard.entity.SarInterpretationNationalStandard;
+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;
@@ -13,11 +13,11 @@ import com.adc.da.base.web.BaseController;
     * </p>
 *
 * @author zyl
-* @since 2021-06-16
+* @since 2021-06-18
 */
 @RestController
 @Api(description = "|SarInterpretationNationalStandard|")
-@RequestMapping("/sarInterpretationStandard/sar-interpretation-national-standard")
+@RequestMapping("/sarStandardComplianceAssessResult/sar-interpretation-national-standard")
 public class SarInterpretationNationalStandardController extends BaseController<SarInterpretationNationalStandard> {
 
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java
index de342746..43ba106f 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java
@@ -4,22 +4,12 @@ package com.adc.da.slrs.sarStandardComplianceAssessResult.controller;
 import com.adc.da.base.web.BaseController;
 import com.adc.da.http.ResponseMessage;
 import com.adc.da.http.Result;
-import com.adc.da.slrs.sarInterpretationStandard.entity.SarInterpretationForeignStandard;
-import com.adc.da.slrs.sarInterpretationStandard.entity.SarInterpretationNationalStandard;
-import com.adc.da.slrs.sarInterpretationStandard.service.ISarInterpretationForeignStandardService;
-import com.adc.da.slrs.sarInterpretationStandard.service.ISarInterpretationNationalStandardService;
-import com.adc.da.slrs.sarProductStand.entity.SarProductStand;
-import com.adc.da.slrs.sarProductStand.service.ISarProductStandService;
 import com.adc.da.slrs.sarSarAccessInfo.entity.SarSarAccessInfo;
-import com.adc.da.slrs.sarSarAccessInfo.service.ISarSarAccessInfoService;
-import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarInterpretationForeignStandardEO;
-import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarInterpretationNationalStandardEO;
-import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarStandardComplianceProductAssessEO;
-import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarStandardsInfoEO;
-import com.adc.da.slrs.sarStandardComplianceProductAssess.entity.SarStandardComplianceProductAssess;
-import com.adc.da.slrs.sarStandardComplianceProductAssess.service.ISarStandardComplianceProductAssessService;
+import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.*;
+import com.adc.da.slrs.sarStandardComplianceAssessResult.service.ISarInterpretationForeignStandardService;
+import com.adc.da.slrs.sarStandardComplianceAssessResult.service.ISarInterpretationNationalStandardService;
+import com.adc.da.slrs.sarStandardComplianceAssessResult.service.ISarStandardComplianceProductAssessService;
 import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo;
-import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfoEOPage;
 import com.adc.da.slrs.sarStandardsInfo.service.ISarStandardsInfoService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -33,27 +23,21 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
 /**
-* <p>
-    * 标准法规准入清单详情表 前端控制器
-    * </p>
-*
-* @author super_liu
-* @since 2021-06-02
-*/
+ * <p>
+ * 标准法规准入清单详情表 前端控制器
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-06-02
+ */
 @RestController
 @Api(tags = "福田标准法规--标准法规库--标准合规评估结果")
 @RequestMapping("/${restPath}/sarStandardComplianceAssessResult")
-public class SarStandardComplianceAssessResultController extends BaseController<SarSarAccessInfo> {
+public class SarStandardComplianceAssessResultController {
 
     private static final Logger logger = LoggerFactory.getLogger(SarStandardComplianceAssessResultController.class);
 
-    @Autowired
-    private ISarStandardsInfoService iSarStandardsInfoService;
 
     @Autowired
     private ISarStandardComplianceProductAssessService iSarStandardComplianceProductAssessService;
@@ -65,48 +49,71 @@ public class SarStandardComplianceAssessResultController extends BaseController<
 
     @ApiOperation(value = "条件查询标准清单")
     @GetMapping("/standard")
-    public ResponseMessage<IPage<SarStandardsInfo>> selectStandard(SarStandardsInfoEO eo) throws Exception {
-        QueryWrapper<SarStandardsInfo> sarStandardsInfoQueryWrapper=new QueryWrapper<>();
+    public ResponseMessage<Object> selectStandard(SarStandardsInfoEO eo) throws Exception {
 
-        if (eo.getStandName() != null) {
-            sarStandardsInfoQueryWrapper.like("STAND_NAME",eo.getStandName());
+        if (eo.getStandApplicationType() == 1) {
+            QueryWrapper<SarStandardComplianceProductAssess> queryWrapper = new QueryWrapper<>();
+            IPage<SarStandardComplianceProductAssess> iPage = new Page<>(eo.getCurrent(), eo.getSize());
+            queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, INTERPRETATION_TIME");
+            if (eo.getStandName() != null && !eo.getStandName().trim().equals("")) {
+                queryWrapper.like("STAND_NAME",eo.getStandName().trim());
+            }
+            if (eo.getStandNumber() != null && !eo.getStandNumber().trim().equals("")) {
+                queryWrapper.like("STAND_NUMBER",eo.getStandNumber().trim());
+            }
+            return Result.success(iSarStandardComplianceProductAssessService.page(iPage,queryWrapper));
+        }else {
+            if(eo.getPosition()==1){
+                QueryWrapper<SarInterpretationNationalStandard> queryWrapper = new QueryWrapper<>();
+                IPage<SarInterpretationNationalStandard> iPage = new Page<>(eo.getCurrent(), eo.getSize());
+                queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, INTERPRETATION_TIME");
+                if (eo.getStandName() != null && !eo.getStandName().trim().equals("")) {
+                    queryWrapper.like("STAND_NAME",eo.getStandName().trim());
+                }
+                if (eo.getStandNumber() != null && !eo.getStandNumber().trim().equals("")) {
+                    queryWrapper.like("STAND_NUMBER",eo.getStandNumber().trim());
+                }
+                return Result.success(iSarInterpretationNationalStandardService.page(iPage,queryWrapper));
+            }else{
+                QueryWrapper<SarInterpretationForeignStandard> queryWrapper = new QueryWrapper<>();
+                IPage<SarInterpretationForeignStandard> iPage = new Page<>(eo.getCurrent(), eo.getSize());
+                queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, INTERPRETATION_TIME");
+                if (eo.getStandName() != null && !eo.getStandName().trim().equals("")) {
+                    queryWrapper.like("STAND_NAME",eo.getStandName().trim());
+                }
+                if (eo.getStandNumber() != null && !eo.getStandNumber().trim().equals("")) {
+                    queryWrapper.like("STAND_NUMBER",eo.getStandNumber().trim());
+                }
+                return Result.success(iSarInterpretationForeignStandardService.page(iPage,queryWrapper));
+            }
         }
-        if (eo.getStandNumber() != null) {
-            sarStandardsInfoQueryWrapper.like("STAND_NUMBER",eo.getStandNumber());
-        }
-
-        IPage<SarStandardsInfo> iPage=new Page<>(eo.getCurrent(), eo.getSize());
-
-        return Result.success(iSarStandardsInfoService.page(iPage,sarStandardsInfoQueryWrapper));
     }
-
     @ApiOperation(value = "条件查询标准涉及项目符合性清单")
     @GetMapping("/product")
     public ResponseMessage<IPage<SarStandardComplianceProductAssess>> selectProduct(SarStandardComplianceProductAssessEO eo) throws Exception {
-        IPage<SarStandardComplianceProductAssess> iPage=new Page<>(eo.getCurrent(), eo.getSize());
-        QueryWrapper<SarStandardComplianceProductAssess> queryWrapper=new QueryWrapper<>();
-        if(eo.getProductName()!=null)queryWrapper.like("product_name",eo.getProductName());
-        if(eo.getStandardId()!=null)queryWrapper.like("standard_id",eo.getStandardId());
-        return Result.success(iSarStandardComplianceProductAssessService.page(iPage,queryWrapper));
+        IPage<SarStandardComplianceProductAssess> iPage = new Page<>(eo.getCurrent(), eo.getSize());
+        QueryWrapper<SarStandardComplianceProductAssess> queryWrapper = new QueryWrapper<>();
+        if (eo.getProductName() != null) queryWrapper.like("product_name", eo.getProductName());
+        if (eo.getStandId() != null) queryWrapper.like("STAND_ID", eo.getStandId());
+        if (eo.getInterpretationTime() != null) queryWrapper.eq("INTERPRETATION_TIME", eo.getInterpretationTime());
+        return Result.success(iSarStandardComplianceProductAssessService.page(iPage, queryWrapper));
     }
 
-    @ApiOperation(value = "条件查询标准涉及国内标准符合性清单")
-    @GetMapping("/nationalStandard")
-    public ResponseMessage<IPage<SarInterpretationNationalStandard>> selectNationalStandard(SarInterpretationNationalStandardEO eo) throws Exception {
-        IPage<SarInterpretationNationalStandard> iPage=new Page<>(eo.getCurrent(), eo.getSize());
-        QueryWrapper<SarInterpretationNationalStandard> queryWrapper=new QueryWrapper<>();
-        if(eo.getStandardId()!=null)queryWrapper.like("standard_num",eo.getStandardId());
-        return Result.success(iSarInterpretationNationalStandardService.page(iPage,queryWrapper));
+    @ApiOperation(value = "条件查询技术审核符合性清单")
+    @GetMapping("/interpretation")
+    public ResponseMessage<Object> selectNationalStandard(InterpretationEO eo) throws Exception {
+        if (eo.getPosition()==1) {
+            IPage<SarInterpretationNationalStandard> iPage = new Page<>(eo.getCurrent(), eo.getSize());
+            QueryWrapper<SarInterpretationNationalStandard> queryWrapper = new QueryWrapper<>();
+            if (eo.getInterpretationTime() != null) queryWrapper.eq("INTERPRETATION_TIME", eo.getInterpretationTime());
+            if(eo.getStandId()!=null)queryWrapper.eq("STAND_ID",eo.getStandId());
+            return Result.success(iSarInterpretationNationalStandardService.page(iPage, queryWrapper));
+        } else {
+            IPage<SarInterpretationForeignStandard> iPage = new Page<>(eo.getCurrent(), eo.getSize());
+            QueryWrapper<SarInterpretationForeignStandard> queryWrapper = new QueryWrapper<>();
+            if (eo.getInterpretationTime() != null) queryWrapper.eq("INTERPRETATION_TIME", eo.getInterpretationTime());
+            if(eo.getStandId()!=null)queryWrapper.eq("STAND_ID",eo.getStandId());
+            return Result.success(iSarInterpretationForeignStandardService.page(iPage, queryWrapper));
+        }
     }
-    @ApiOperation(value = "条件查询标准涉及国内标准符合性清单")
-    @GetMapping("/foreignStandard")
-    public ResponseMessage<IPage<SarInterpretationForeignStandard>> selectForeignStandard(SarInterpretationForeignStandardEO eo) throws Exception {
-        IPage<SarInterpretationForeignStandard> iPage=new Page<>(eo.getCurrent(), eo.getSize());
-        QueryWrapper<SarInterpretationForeignStandard> queryWrapper=new QueryWrapper<>();
-        if(eo.getStandardId()!=null)queryWrapper.like("standard_num",eo.getStandardId());
-        return Result.success(iSarInterpretationForeignStandardService.page(iPage,queryWrapper));
-    }
-
-
-
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceProductAssess/controller/SarStandardComplianceProductAssessController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceProductAssessController.java
similarity index 62%
rename from adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceProductAssess/controller/SarStandardComplianceProductAssessController.java
rename to adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceProductAssessController.java
index 1b6f2dd0..6ed247de 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceProductAssess/controller/SarStandardComplianceProductAssessController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceProductAssessController.java
@@ -1,8 +1,8 @@
-package com.adc.da.slrs.sarStandardComplianceProductAssess.controller;
+package com.adc.da.slrs.sarStandardComplianceAssessResult.controller;
 
 
 import org.springframework.web.bind.annotation.RequestMapping;
-import com.adc.da.slrs.sarStandardComplianceProductAssess.entity.SarStandardComplianceProductAssess;
+import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarStandardComplianceProductAssess;
 import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RestController;
 import com.adc.da.base.web.BaseController;
@@ -13,11 +13,11 @@ import com.adc.da.base.web.BaseController;
     * </p>
 *
 * @author zyl
-* @since 2021-06-16
+* @since 2021-06-18
 */
 @RestController
 @Api(description = "|SarStandardComplianceProductAssess|")
-@RequestMapping("/sarStandardComplianceProductAssess/sar-standard-compliance-product-assess")
+@RequestMapping("/sarStandardComplianceAssessResult/sar-standard-compliance-product-assess")
 public class SarStandardComplianceProductAssessController extends BaseController<SarStandardComplianceProductAssess> {
 
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInterpretationStandard/dao/SarInterpretationForeignStandardDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/dao/SarInterpretationForeignStandardDao.java
similarity index 55%
rename from adc-da-slrs/src/main/java/com/adc/da/slrs/sarInterpretationStandard/dao/SarInterpretationForeignStandardDao.java
rename to adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/dao/SarInterpretationForeignStandardDao.java
index bcc60031..698cfcaa 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInterpretationStandard/dao/SarInterpretationForeignStandardDao.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/dao/SarInterpretationForeignStandardDao.java
@@ -1,6 +1,6 @@
-package com.adc.da.slrs.sarInterpretationStandard.dao;
+package com.adc.da.slrs.sarStandardComplianceAssessResult.dao;
 
-import com.adc.da.slrs.sarInterpretationStandard.entity.SarInterpretationForeignStandard;
+import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarInterpretationForeignStandard;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * </p>
  *
  * @author zyl
- * @since 2021-06-16
+ * @since 2021-06-18
  */
 public interface SarInterpretationForeignStandardDao extends BaseMapper<SarInterpretationForeignStandard> {
 
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInterpretationStandard/dao/SarInterpretationNationalStandardDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/dao/SarInterpretationNationalStandardDao.java
similarity index 55%
rename from adc-da-slrs/src/main/java/com/adc/da/slrs/sarInterpretationStandard/dao/SarInterpretationNationalStandardDao.java
rename to adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/dao/SarInterpretationNationalStandardDao.java
index 796a4e63..b01295a6 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInterpretationStandard/dao/SarInterpretationNationalStandardDao.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/dao/SarInterpretationNationalStandardDao.java
@@ -1,6 +1,6 @@
-package com.adc.da.slrs.sarInterpretationStandard.dao;
+package com.adc.da.slrs.sarStandardComplianceAssessResult.dao;
 
-import com.adc.da.slrs.sarInterpretationStandard.entity.SarInterpretationNationalStandard;
+import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarInterpretationNationalStandard;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * </p>
  *
  * @author zyl
- * @since 2021-06-16
+ * @since 2021-06-18
  */
 public interface SarInterpretationNationalStandardDao extends BaseMapper<SarInterpretationNationalStandard> {
 
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/dao/SarStandardComplianceAssessResultDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/dao/SarStandardComplianceAssessResultDao.java
deleted file mode 100644
index 8028b6be..00000000
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/dao/SarStandardComplianceAssessResultDao.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.adc.da.slrs.sarStandardComplianceAssessResult.dao;
-
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-@Repository
-@Mapper
-public interface SarStandardComplianceAssessResultDao {
-
-
-
-}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceProductAssess/dao/SarStandardComplianceProductAssessDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/dao/SarStandardComplianceProductAssessDao.java
similarity index 55%
rename from adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceProductAssess/dao/SarStandardComplianceProductAssessDao.java
rename to adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/dao/SarStandardComplianceProductAssessDao.java
index d1781c87..93e7b580 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceProductAssess/dao/SarStandardComplianceProductAssessDao.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/dao/SarStandardComplianceProductAssessDao.java
@@ -1,6 +1,6 @@
-package com.adc.da.slrs.sarStandardComplianceProductAssess.dao;
+package com.adc.da.slrs.sarStandardComplianceAssessResult.dao;
 
-import com.adc.da.slrs.sarStandardComplianceProductAssess.entity.SarStandardComplianceProductAssess;
+import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarStandardComplianceProductAssess;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * </p>
  *
  * @author zyl
- * @since 2021-06-16
+ * @since 2021-06-18
  */
 public interface SarStandardComplianceProductAssessDao extends BaseMapper<SarStandardComplianceProductAssess> {
 
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/InterpretationEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/InterpretationEO.java
new file mode 100644
index 00000000..2b92fb9a
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/InterpretationEO.java
@@ -0,0 +1,39 @@
+package com.adc.da.slrs.sarStandardComplianceAssessResult.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+@Data
+@ApiModel("条件查询")
+public class InterpretationEO {
+
+//    @ApiModelProperty(value = "'审核编号'")
+//    private String interpretation_id;
+
+
+    @ApiModelProperty(value = "标准ID")
+    @TableField("STAND_ID")
+    private String standId;
+
+    @ApiModelProperty(value = "评估时间")
+    @TableField("INTERPRETATION_TIME")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date interpretationTime;
+
+    @ApiModelProperty(value = "国内(1)/外(2)")
+    private Integer position=1;
+
+    @ApiModelProperty("页数")
+    private Integer current=1;
+
+    @ApiModelProperty("页内数量")
+    private Integer size=20;
+
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarBaseStandardInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarBaseStandardInfo.java
new file mode 100644
index 00000000..90cc88c3
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarBaseStandardInfo.java
@@ -0,0 +1,16 @@
+package com.adc.da.slrs.sarStandardComplianceAssessResult.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class SarBaseStandardInfo {
+    private String standard_id;
+    private String standard_number;
+    private String standard_name;
+    private String standard_type;
+    private LocalDateTime INTERPRETATION_TIME;
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationForeignStandard.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationForeignStandard.java
new file mode 100644
index 00000000..87930898
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationForeignStandard.java
@@ -0,0 +1,102 @@
+package com.adc.da.slrs.sarStandardComplianceAssessResult.entity;
+
+import com.adc.da.base.entity.BaseEntity;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zyl
+ * @since 2021-06-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ApiModel(value="SarInterpretationForeignStandard对象", description="")
+public class SarInterpretationForeignStandard extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "具体章条")
+    private String specificItem;
+
+    @ApiModelProperty(value = "核心技术要求")
+    private String coreTechnicalRequirement;
+
+    @ApiModelProperty(value = "相对于国行标差异点")
+    private String comparedDomesticStandard;
+
+    @ApiModelProperty(value = "对应国行版（仅国外有）")
+    private String correspondDomesticStandard;
+
+    private String complianceState;
+
+    @ApiModelProperty(value = "上一版本号")
+    @TableField("LAST_VERSION_NUMBER")
+    private String lastVersionNumber;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField("CREATION_TIME")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date creationTime;
+
+    @ApiModelProperty(value = "修改时间")
+    @TableField("MODIFY_TIME")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date modifyTime;
+
+    @ApiModelProperty(value = "标准ID")
+    @TableField("STAND_ID")
+    private String standId;
+
+    @ApiModelProperty(value = "标准分类")
+    @TableField("STAND_TYPE")
+    private String standType;
+
+    @ApiModelProperty(value = "标准类别")
+    @TableField("STAND_SORT")
+    private String standSort;
+
+    @ApiModelProperty(value = "标准编号")
+    @TableField("STAND_NUMBER")
+    private String standNumber;
+
+    @ApiModelProperty(value = "标准名称")
+    @TableField("STAND_NAME")
+    private String standName;
+
+
+
+    @TableField("CREATION_USER")
+    private String creationUser;
+
+    @ApiModelProperty(value = "是否有效")
+    @TableField("VALID_FLAG")
+    private String validFlag;
+
+    @ApiModelProperty(value = "评估状态")
+    @TableField("INTERPRETATION_STATE")
+    private String interpretationState;
+
+    @ApiModelProperty(value = "评估时间")
+    @TableField("INTERPRETATION_TIME")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date interpretationTime;
+
+
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationForeignStandardEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationForeignStandardEO.java
deleted file mode 100644
index b94c124d..00000000
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationForeignStandardEO.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.adc.da.slrs.sarStandardComplianceAssessResult.entity;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@Data
-@ApiModel("条件查询")
-public class SarInterpretationForeignStandardEO {
-
-    @ApiModelProperty(value = "'标准编号'")
-    private String standardId;
-
-    @ApiModelProperty("页数")
-    private Integer current=1;
-
-    @ApiModelProperty("页内数量")
-    private Integer size=20;
-
-}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationNationalStandard.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationNationalStandard.java
new file mode 100644
index 00000000..cf78fea2
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationNationalStandard.java
@@ -0,0 +1,90 @@
+package com.adc.da.slrs.sarStandardComplianceAssessResult.entity;
+
+import com.adc.da.base.entity.BaseEntity;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zyl
+ * @since 2021-06-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ApiModel(value="SarInterpretationNationalStandard对象", description="")
+public class SarInterpretationNationalStandard extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "具体章条")
+    private String specificItem;
+
+    @ApiModelProperty(value = "核心技术要求")
+    private String coreTechnicalRequirement;
+
+    @ApiModelProperty(value = "相对于上一版本变化点")
+    private String comparedWithPrevious;
+
+    @ApiModelProperty(value = "合规性分析")
+    private String complianceState;
+
+    @ApiModelProperty(value = "上一版本号")
+    @TableField("LAST_VERSION_NUMBER")
+    private String lastVersionNumber;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField("CREATION_TIME")
+    private Date creationTime;
+
+    @ApiModelProperty(value = "修改时间")
+    @TableField("MODIFY_TIME")
+    private Date modifyTime;
+
+    @ApiModelProperty(value = "标准ID")
+    @TableField("STAND_ID")
+    private String standId;
+
+    @ApiModelProperty(value = "标准分类")
+    @TableField("STAND_TYPE")
+    private String standType;
+
+    @ApiModelProperty(value = "标准类别")
+    @TableField("STAND_SORT")
+    private String standSort;
+
+    @ApiModelProperty(value = "标准编号")
+    @TableField("STAND_NUMBER")
+    private String standNumber;
+
+    @ApiModelProperty(value = "标准名称")
+    @TableField("STAND_NAME")
+    private String standName;
+
+    @TableField("CREATION_USER")
+    private String creationUser;
+
+    @ApiModelProperty(value = "是否有效")
+    @TableField("VALID_FLAG")
+    private String validFlag;
+
+    @ApiModelProperty(value = "评估状态")
+    @TableField("INTERPRETATION_STATE")
+    private String interpretationState;
+
+    @ApiModelProperty(value = "评估时间")
+    @TableField("INTERPRETATION_TIME")
+    private Date interpretationTime;
+
+
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationNationalStandardEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationNationalStandardEO.java
deleted file mode 100644
index f50ca55c..00000000
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationNationalStandardEO.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.adc.da.slrs.sarStandardComplianceAssessResult.entity;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@Data
-@ApiModel("条件查询")
-public class SarInterpretationNationalStandardEO {
-
-    @ApiModelProperty(value = "'标准编号'")
-    private String standardId;
-
-    @ApiModelProperty("页数")
-    private Integer current=1;
-
-    @ApiModelProperty("页内数量")
-    private Integer size=20;
-
-}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java
new file mode 100644
index 00000000..bfaa990b
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java
@@ -0,0 +1,112 @@
+package com.adc.da.slrs.sarStandardComplianceAssessResult.entity;
+
+import com.adc.da.base.entity.BaseEntity;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zyl
+ * @since 2021-06-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ApiModel(value="SarStandardComplianceProductAssess对象", description="")
+public class SarStandardComplianceProductAssess extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "'产品线'")
+    private String productLineId;
+
+    @ApiModelProperty(value = "'项目id'")
+    private String productId;
+
+    @ApiModelProperty(value = "'项目名称'")
+    private String productName;
+
+    @ApiModelProperty(value = "标准ID")
+    @TableField("STAND_ID")
+    private String standId;
+
+    @ApiModelProperty(value = "标准编号")
+    @TableField("STAND_NUMBER")
+    private String standNumber;
+
+    @ApiModelProperty(value = "'标准名称'")
+    @TableField("STAND_NAME")
+    private String standName;
+
+    @ApiModelProperty(value = "'标准章条'")
+    private String standardItem;
+
+    @ApiModelProperty(value = "标准类型")
+    @TableField("STAND_TYPE")
+    private String standType;
+
+    @ApiModelProperty(value = "标准主要内容")
+    private String standardInfo;
+
+    @ApiModelProperty(value = "1是在产，0是在研")
+    private Integer productType;
+
+    @ApiModelProperty(value = "在研产品实施时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date researchImplementationTime;
+
+    @ApiModelProperty(value = "在研产品合规信息")
+    private String researchCompliance;
+
+    @ApiModelProperty(value = "在研产品不合规项目")
+    private String researchNonCompliance;
+
+    @ApiModelProperty(value = "在研产品不合规应对措施")
+    private String researchCountermeasures;
+
+    @ApiModelProperty(value = "在研产品不合规完成时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date researchCompletionTime;
+
+    @ApiModelProperty(value = "在产产品实施时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date productionImplementationTime;
+
+    @ApiModelProperty(value = "在产产品合规信息")
+    private String productionCompliance;
+
+    @ApiModelProperty(value = "在产产品不合规应对措施")
+    private String productionCountermeasures;
+
+    @ApiModelProperty(value = "在产产品不合规完成时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date productionCompletionTime;
+
+    @ApiModelProperty(value = "审查状态")
+    @TableField("INTERPRETATION_STATE")
+    private String interpretationState;
+
+    @ApiModelProperty(value = "审查时间")
+    @TableField("INTERPRETATION_TIME")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date interpretationTime;
+
+
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssessEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssessEO.java
index d6cfa4f6..53b782b2 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssessEO.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssessEO.java
@@ -1,19 +1,31 @@
 package com.adc.da.slrs.sarStandardComplianceAssessResult.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
 
 @Data
 @ApiModel("条件查询")
-public class SarStandardComplianceProductAssessEO {
+public class SarStandardComplianceProductAssessEO{
+
+    @ApiModelProperty(value = "标准ID")
+    @TableField("STAND_ID")
+    private String standId;
 
     @ApiModelProperty(value = "'项目名称'")
     private String productName;
 
-    @ApiModelProperty(value = "'标准编号'")
-    private String standardId;
+    @ApiModelProperty(value = "评估时间")
+    @TableField("INTERPRETATION_TIME")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date interpretationTime;
 
     @ApiModelProperty("页数")
     private Integer current=1;
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardsInfoEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardsInfoEO.java
index 5231cca0..f4fee6c3 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardsInfoEO.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardsInfoEO.java
@@ -17,6 +17,12 @@ public class SarStandardsInfoEO {
     @ApiModelProperty(value = "标准名称")
     private String standName;
 
+    @ApiModelProperty(value = "应用类型")
+    private Integer standApplicationType=1;
+
+    @ApiModelProperty(value = "国内1，国外2")
+    private Integer position=1;
+
 
     @ApiModelProperty("页数")
     private Integer current=1;
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInterpretationStandard/service/ISarInterpretationForeignStandardService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/ISarInterpretationForeignStandardService.java
similarity index 55%
rename from adc-da-slrs/src/main/java/com/adc/da/slrs/sarInterpretationStandard/service/ISarInterpretationForeignStandardService.java
rename to adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/ISarInterpretationForeignStandardService.java
index d6013d4e..9ba49575 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInterpretationStandard/service/ISarInterpretationForeignStandardService.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/ISarInterpretationForeignStandardService.java
@@ -1,6 +1,6 @@
-package com.adc.da.slrs.sarInterpretationStandard.service;
+package com.adc.da.slrs.sarStandardComplianceAssessResult.service;
 
-import com.adc.da.slrs.sarInterpretationStandard.entity.SarInterpretationForeignStandard;
+import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarInterpretationForeignStandard;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * </p>
  *
  * @author zyl
- * @since 2021-06-16
+ * @since 2021-06-18
  */
 public interface ISarInterpretationForeignStandardService extends IService<SarInterpretationForeignStandard> {
 
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInterpretationStandard/service/ISarInterpretationNationalStandardService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/ISarInterpretationNationalStandardService.java
similarity index 55%
rename from adc-da-slrs/src/main/java/com/adc/da/slrs/sarInterpretationStandard/service/ISarInterpretationNationalStandardService.java
rename to adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/ISarInterpretationNationalStandardService.java
index d508a1a4..e51c76f4 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInterpretationStandard/service/ISarInterpretationNationalStandardService.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/ISarInterpretationNationalStandardService.java
@@ -1,6 +1,6 @@
-package com.adc.da.slrs.sarInterpretationStandard.service;
+package com.adc.da.slrs.sarStandardComplianceAssessResult.service;
 
-import com.adc.da.slrs.sarInterpretationStandard.entity.SarInterpretationNationalStandard;
+import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarInterpretationNationalStandard;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * </p>
  *
  * @author zyl
- * @since 2021-06-16
+ * @since 2021-06-18
  */
 public interface ISarInterpretationNationalStandardService extends IService<SarInterpretationNationalStandard> {
 
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/ISarStandardComplianceAssessResult.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/ISarStandardComplianceAssessResult.java
deleted file mode 100644
index e8ff1cc7..00000000
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/ISarStandardComplianceAssessResult.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.adc.da.slrs.sarStandardComplianceAssessResult.service;
-
-import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo;
-import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfoEOPage;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-
-public interface ISarStandardComplianceAssessResult {
-
-    IPage<SarStandardsInfo> getSarStandardsInfo();
-
-}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceProductAssess/service/ISarStandardComplianceProductAssessService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/ISarStandardComplianceProductAssessService.java
similarity index 55%
rename from adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceProductAssess/service/ISarStandardComplianceProductAssessService.java
rename to adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/ISarStandardComplianceProductAssessService.java
index 431fddce..f813e993 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceProductAssess/service/ISarStandardComplianceProductAssessService.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/ISarStandardComplianceProductAssessService.java
@@ -1,6 +1,6 @@
-package com.adc.da.slrs.sarStandardComplianceProductAssess.service;
+package com.adc.da.slrs.sarStandardComplianceAssessResult.service;
 
-import com.adc.da.slrs.sarStandardComplianceProductAssess.entity.SarStandardComplianceProductAssess;
+import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarStandardComplianceProductAssess;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * </p>
  *
  * @author zyl
- * @since 2021-06-16
+ * @since 2021-06-18
  */
 public interface ISarStandardComplianceProductAssessService extends IService<SarStandardComplianceProductAssess> {
 
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarInterpretationForeignStandardServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarInterpretationForeignStandardServiceImpl.java
new file mode 100644
index 00000000..f78c54e0
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarInterpretationForeignStandardServiceImpl.java
@@ -0,0 +1,20 @@
+package com.adc.da.slrs.sarStandardComplianceAssessResult.service.impl;
+
+import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarInterpretationForeignStandard;
+import com.adc.da.slrs.sarStandardComplianceAssessResult.dao.SarInterpretationForeignStandardDao;
+import com.adc.da.slrs.sarStandardComplianceAssessResult.service.ISarInterpretationForeignStandardService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author zyl
+ * @since 2021-06-18
+ */
+@Service
+public class SarInterpretationForeignStandardServiceImpl extends ServiceImpl<SarInterpretationForeignStandardDao, SarInterpretationForeignStandard> implements ISarInterpretationForeignStandardService {
+
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarInterpretationNationalStandardServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarInterpretationNationalStandardServiceImpl.java
new file mode 100644
index 00000000..9713ea5b
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarInterpretationNationalStandardServiceImpl.java
@@ -0,0 +1,20 @@
+package com.adc.da.slrs.sarStandardComplianceAssessResult.service.impl;
+
+import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarInterpretationNationalStandard;
+import com.adc.da.slrs.sarStandardComplianceAssessResult.dao.SarInterpretationNationalStandardDao;
+import com.adc.da.slrs.sarStandardComplianceAssessResult.service.ISarInterpretationNationalStandardService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author zyl
+ * @since 2021-06-18
+ */
+@Service
+public class SarInterpretationNationalStandardServiceImpl extends ServiceImpl<SarInterpretationNationalStandardDao, SarInterpretationNationalStandard> implements ISarInterpretationNationalStandardService {
+
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarStandardComplianceProductAssessServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarStandardComplianceProductAssessServiceImpl.java
new file mode 100644
index 00000000..ea8c9f44
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarStandardComplianceProductAssessServiceImpl.java
@@ -0,0 +1,20 @@
+package com.adc.da.slrs.sarStandardComplianceAssessResult.service.impl;
+
+import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarStandardComplianceProductAssess;
+import com.adc.da.slrs.sarStandardComplianceAssessResult.dao.SarStandardComplianceProductAssessDao;
+import com.adc.da.slrs.sarStandardComplianceAssessResult.service.ISarStandardComplianceProductAssessService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author zyl
+ * @since 2021-06-18
+ */
+@Service
+public class SarStandardComplianceProductAssessServiceImpl extends ServiceImpl<SarStandardComplianceProductAssessDao, SarStandardComplianceProductAssess> implements ISarStandardComplianceProductAssessService {
+
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceProductAssess/entity/SarStandardComplianceProductAssess.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceProductAssess/entity/SarStandardComplianceProductAssess.java
deleted file mode 100644
index 453376f2..00000000
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceProductAssess/entity/SarStandardComplianceProductAssess.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.adc.da.slrs.sarStandardComplianceProductAssess.entity;
-
-import com.adc.da.base.entity.BaseEntity;
-import java.time.LocalDateTime;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyl
- * @since 2021-06-16
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-@ApiModel(value="SarStandardComplianceProductAssess对象", description="")
-public class SarStandardComplianceProductAssess extends BaseEntity {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "'产品线'")
-    private String productLineId;
-
-    @ApiModelProperty(value = "'项目id'")
-    private String productId;
-
-    @ApiModelProperty(value = "'项目名称'")
-    private String productName;
-
-    @ApiModelProperty(value = "'标准编号'")
-    private String standardId;
-
-    @ApiModelProperty(value = "'标准章条'")
-    private String itemsId;
-
-    @ApiModelProperty(value = "'标准名称'")
-    private String standardName;
-
-    @ApiModelProperty(value = "1是在产，0是在研")
-    private Integer state;
-
-    @ApiModelProperty(value = "实施时间")
-    private LocalDateTime implementation_time;
-
-    @ApiModelProperty(value = "0是合规，1是不合规")
-    private Integer complianceState;
-
-    private String compliance;
-
-    private String nonCompliance;
-
-    private String countermeasures;
-
-    private LocalDateTime completionTime;
-
-
-}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceProductAssess/service/impl/SarStandardComplianceProductAssessServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceProductAssess/service/impl/SarStandardComplianceProductAssessServiceImpl.java
deleted file mode 100644
index 27ea4bc1..00000000
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceProductAssess/service/impl/SarStandardComplianceProductAssessServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.adc.da.slrs.sarStandardComplianceProductAssess.service.impl;
-
-import com.adc.da.slrs.sarStandardComplianceProductAssess.entity.SarStandardComplianceProductAssess;
-import com.adc.da.slrs.sarStandardComplianceProductAssess.dao.SarStandardComplianceProductAssessDao;
-import com.adc.da.slrs.sarStandardComplianceProductAssess.service.ISarStandardComplianceProductAssessService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author zyl
- * @since 2021-06-16
- */
-@Service
-public class SarStandardComplianceProductAssessServiceImpl extends ServiceImpl<SarStandardComplianceProductAssessDao, SarStandardComplianceProductAssess> implements ISarStandardComplianceProductAssessService {
-
-}
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarInterpretationStandard/SarInterpretationStandardMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarInterpretationStandard/SarInterpretationStandardMapper.xml
new file mode 100644
index 00000000..62001a87
--- /dev/null
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarInterpretationStandard/SarInterpretationStandardMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.adc.da.slrs.sarInterpretationStandard.dao.SarInterpretationStandardDao">
+
+</mapper>
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationForeignStandardMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationForeignStandardMapper.xml
new file mode 100644
index 00000000..9a345a83
--- /dev/null
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationForeignStandardMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.adc.da.slrs.sarStandardComplianceAssessResult.dao.SarInterpretationForeignStandardDao">
+
+</mapper>
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml
new file mode 100644
index 00000000..41097a19
--- /dev/null
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.adc.da.slrs.sarStandardComplianceAssessResult.dao.SarInterpretationNationalStandardDao">
+
+    <select id="getStandardItem"
+            resultType="com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarBaseStandardInfo">
+        select distinct STAND_ID as standard_id, STAND_NUMBER as standard_number, STAND_NAME as standard_name, STAND_TYPE as standard_type, INTERPRETATION_TIME from sar_interpretation_national_standard
+    </select>
+</mapper>
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarStandardComplianceProductAssessMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarStandardComplianceProductAssessMapper.xml
new file mode 100644
index 00000000..b82994ed
--- /dev/null
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarStandardComplianceProductAssessMapper.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.adc.da.slrs.sarStandardComplianceAssessResult.dao.SarStandardComplianceProductAssessDao">
+
+
+
+</mapper>