implements ISarInterpretationNationalStandardService {
+
+}
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
new file mode 100644
index 00000000..de342746
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java
@@ -0,0 +1,112 @@
+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.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;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+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;
+
+/**
+*
+ * 标准法规准入清单详情表 前端控制器
+ *
+*
+* @author super_liu
+* @since 2021-06-02
+*/
+@RestController
+@Api(tags = "福田标准法规--标准法规库--标准合规评估结果")
+@RequestMapping("/${restPath}/sarStandardComplianceAssessResult")
+public class SarStandardComplianceAssessResultController extends BaseController {
+
+ private static final Logger logger = LoggerFactory.getLogger(SarStandardComplianceAssessResultController.class);
+
+ @Autowired
+ private ISarStandardsInfoService iSarStandardsInfoService;
+
+ @Autowired
+ private ISarStandardComplianceProductAssessService iSarStandardComplianceProductAssessService;
+
+ @Autowired
+ private ISarInterpretationForeignStandardService iSarInterpretationForeignStandardService;
+ @Autowired
+ private ISarInterpretationNationalStandardService iSarInterpretationNationalStandardService;
+
+ @ApiOperation(value = "条件查询标准清单")
+ @GetMapping("/standard")
+ public ResponseMessage> selectStandard(SarStandardsInfoEO eo) throws Exception {
+ QueryWrapper sarStandardsInfoQueryWrapper=new QueryWrapper<>();
+
+ if (eo.getStandName() != null) {
+ sarStandardsInfoQueryWrapper.like("STAND_NAME",eo.getStandName());
+ }
+ if (eo.getStandNumber() != null) {
+ sarStandardsInfoQueryWrapper.like("STAND_NUMBER",eo.getStandNumber());
+ }
+
+ IPage iPage=new Page<>(eo.getCurrent(), eo.getSize());
+
+ return Result.success(iSarStandardsInfoService.page(iPage,sarStandardsInfoQueryWrapper));
+ }
+
+ @ApiOperation(value = "条件查询标准涉及项目符合性清单")
+ @GetMapping("/product")
+ public ResponseMessage> selectProduct(SarStandardComplianceProductAssessEO eo) throws Exception {
+ IPage iPage=new Page<>(eo.getCurrent(), eo.getSize());
+ QueryWrapper 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));
+ }
+
+ @ApiOperation(value = "条件查询标准涉及国内标准符合性清单")
+ @GetMapping("/nationalStandard")
+ public ResponseMessage> selectNationalStandard(SarInterpretationNationalStandardEO eo) throws Exception {
+ IPage iPage=new Page<>(eo.getCurrent(), eo.getSize());
+ QueryWrapper queryWrapper=new QueryWrapper<>();
+ if(eo.getStandardId()!=null)queryWrapper.like("standard_num",eo.getStandardId());
+ return Result.success(iSarInterpretationNationalStandardService.page(iPage,queryWrapper));
+ }
+ @ApiOperation(value = "条件查询标准涉及国内标准符合性清单")
+ @GetMapping("/foreignStandard")
+ public ResponseMessage> selectForeignStandard(SarInterpretationForeignStandardEO eo) throws Exception {
+ IPage iPage=new Page<>(eo.getCurrent(), eo.getSize());
+ QueryWrapper 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/sarStandardComplianceAssessResult/dao/SarStandardComplianceAssessResultDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/dao/SarStandardComplianceAssessResultDao.java
new file mode 100644
index 00000000..8028b6be
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/dao/SarStandardComplianceAssessResultDao.java
@@ -0,0 +1,12 @@
+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/sarStandardComplianceAssessResult/entity/SarInterpretationForeignStandardEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationForeignStandardEO.java
new file mode 100644
index 00000000..b94c124d
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationForeignStandardEO.java
@@ -0,0 +1,20 @@
+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/SarInterpretationNationalStandardEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationNationalStandardEO.java
new file mode 100644
index 00000000..f50ca55c
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationNationalStandardEO.java
@@ -0,0 +1,20 @@
+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/SarStandardComplianceProductAssessEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssessEO.java
new file mode 100644
index 00000000..d6cfa4f6
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssessEO.java
@@ -0,0 +1,24 @@
+package com.adc.da.slrs.sarStandardComplianceAssessResult.entity;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("条件查询")
+public class SarStandardComplianceProductAssessEO {
+
+ @ApiModelProperty(value = "'项目名称'")
+ private String productName;
+
+ @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/SarStandardsInfoEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardsInfoEO.java
new file mode 100644
index 00000000..5231cca0
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardsInfoEO.java
@@ -0,0 +1,27 @@
+package com.adc.da.slrs.sarStandardComplianceAssessResult.entity;
+
+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;
+
+@Data
+@Accessors(chain = true)
+@ApiModel(value="SarStandardsInfo对象", description="")
+public class SarStandardsInfoEO {
+ @ApiModelProperty(value = "标准编号")
+ private String standNumber;
+
+ @ApiModelProperty(value = "标准名称")
+ private String standName;
+
+
+ @ApiModelProperty("页数")
+ private Integer current=1;
+
+ @ApiModelProperty("页内数量")
+ private Integer size=20;
+
+}
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
new file mode 100644
index 00000000..e8ff1cc7
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/ISarStandardComplianceAssessResult.java
@@ -0,0 +1,11 @@
+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 getSarStandardsInfo();
+
+}
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/sarStandardComplianceProductAssess/controller/SarStandardComplianceProductAssessController.java
new file mode 100644
index 00000000..1b6f2dd0
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceProductAssess/controller/SarStandardComplianceProductAssessController.java
@@ -0,0 +1,23 @@
+package com.adc.da.slrs.sarStandardComplianceProductAssess.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import com.adc.da.slrs.sarStandardComplianceProductAssess.entity.SarStandardComplianceProductAssess;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.adc.da.base.web.BaseController;
+
+/**
+*
+ * 前端控制器
+ *
+*
+* @author zyl
+* @since 2021-06-16
+*/
+@RestController
+@Api(description = "|SarStandardComplianceProductAssess|")
+@RequestMapping("/sarStandardComplianceProductAssess/sar-standard-compliance-product-assess")
+public class SarStandardComplianceProductAssessController extends BaseController {
+
+}
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/sarStandardComplianceProductAssess/dao/SarStandardComplianceProductAssessDao.java
new file mode 100644
index 00000000..d1781c87
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceProductAssess/dao/SarStandardComplianceProductAssessDao.java
@@ -0,0 +1,16 @@
+package com.adc.da.slrs.sarStandardComplianceProductAssess.dao;
+
+import com.adc.da.slrs.sarStandardComplianceProductAssess.entity.SarStandardComplianceProductAssess;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ *
+ * Mapper 接口
+ *
+ *
+ * @author zyl
+ * @since 2021-06-16
+ */
+public interface SarStandardComplianceProductAssessDao extends BaseMapper {
+
+}
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
new file mode 100644
index 00000000..453376f2
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceProductAssess/entity/SarStandardComplianceProductAssess.java
@@ -0,0 +1,63 @@
+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;
+
+/**
+ *
+ *
+ *
+ *
+ * @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/ISarStandardComplianceProductAssessService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceProductAssess/service/ISarStandardComplianceProductAssessService.java
new file mode 100644
index 00000000..431fddce
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceProductAssess/service/ISarStandardComplianceProductAssessService.java
@@ -0,0 +1,16 @@
+package com.adc.da.slrs.sarStandardComplianceProductAssess.service;
+
+import com.adc.da.slrs.sarStandardComplianceProductAssess.entity.SarStandardComplianceProductAssess;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ *
+ * 服务类
+ *
+ *
+ * @author zyl
+ * @since 2021-06-16
+ */
+public interface ISarStandardComplianceProductAssessService extends IService {
+
+}
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
new file mode 100644
index 00000000..27ea4bc1
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceProductAssess/service/impl/SarStandardComplianceProductAssessServiceImpl.java
@@ -0,0 +1,20 @@
+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;
+
+/**
+ *
+ * 服务实现类
+ *
+ *
+ * @author zyl
+ * @since 2021-06-16
+ */
+@Service
+public class SarStandardComplianceProductAssessServiceImpl extends ServiceImpl implements ISarStandardComplianceProductAssessService {
+
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java
index eda60342..8cc07aef 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java
@@ -124,16 +124,6 @@ public class SarStandardsInfo extends BaseEntity {
@TableField("CITED_STAND")
private String citedStand;
- // 新添加字段
- @ApiModelProperty(value = "文本状态")
- @TableField("TEXT_STATUS")
- private String textStatus;
-
- @ApiModelProperty(value = "标准体系")
- @TableField("STAND_SYSTEM")
- private String standSystem;
-
-
// 以下为非表中字段
@TableField(exist = false)
private String collectId; // 收藏表ID
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarCompResAssess/SarCompResAssessMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarCompResAssess/SarCompResAssessMapper.xml
new file mode 100644
index 00000000..cd680440
--- /dev/null
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarCompResAssess/SarCompResAssessMapper.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarInterpretationStandard/SarInterpretationForeignStandardMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarInterpretationStandard/SarInterpretationForeignStandardMapper.xml
new file mode 100644
index 00000000..74978de9
--- /dev/null
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarInterpretationStandard/SarInterpretationForeignStandardMapper.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarInterpretationStandard/SarInterpretationNationalStandardMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarInterpretationStandard/SarInterpretationNationalStandardMapper.xml
new file mode 100644
index 00000000..2e56498d
--- /dev/null
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarInterpretationStandard/SarInterpretationNationalStandardMapper.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarMenu/SarMenuMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarMenu/SarMenuMapper.xml
index 1cfc68a6..02f47b42 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarMenu/SarMenuMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarMenu/SarMenuMapper.xml
@@ -221,7 +221,7 @@