Merge remote-tracking branch 'origin/develop_3' into develop_3

# Conflicts:
#	adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarItemVO.java
#	adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
#	adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml

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

@@ -1,6 +1,7 @@
 package com.adc.da.slrs.sarStandItems.controller;
 
 
+import com.adc.da.http.PageInfo;
 import com.adc.da.http.ResponseMessage;
 import com.adc.da.http.Result;
 
@@ -55,9 +56,11 @@ public class SarStandItemsController extends BaseController<SarStandItems> {
     @ApiOperation(value = "分解单查询")
     @GetMapping("/querySarItemAndInterpretation")
     public ResponseMessage querySarItemAndInterpretation(FindSarItemsPageReqDTO page){
-        List<SarItemVO> sarItemVOS = ServiceImpl.querySarItemAndInterpretation(page);
+        List<SarStandItems> rows = ServiceImpl.querySarItemAndInterpretation(page);
 
-        return Result.success("200",sarItemVOS);
+        PageInfo<SarStandItems> pageInfo = getPageInfo(page.getPager(), rows);
+
+        return Result.success(pageInfo);
     }
 
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java

@@ -24,7 +24,10 @@ import java.util.Set;
 @Repository
 public interface SarStandItemsDao extends BaseMapper<SarStandItems> {
 
-    List<SarItemVO> querySarItemAndInterpretation(FindSarItemsPageReqDTO page);
+    List<SarStandItems> querySarItemAndInterpretation(FindSarItemsPageReqDTO page);
+
+    Integer sarItemCount(FindSarItemsPageReqDTO page);
+
 
     List<SarStandItems> querySarStandItemsList(SarStandItemsEOPage page);
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindSarItemsPageReqDTO.java

@@ -10,7 +10,7 @@ import java.util.Date;
 
 
 @Data
-public class FindSarItemsPageReqDTO {
+public class FindSarItemsPageReqDTO extends BasePage {
 
     private static final long serialVersionUID = 1L;
     private Integer page = 1;

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarItemVO.java

@@ -27,8 +27,6 @@ public class SarItemVO extends BaseEntity {
     @ApiModelProperty(value = "条款名称")
     private String itemsName;
 
-    @ApiModelProperty(value = "条款内容(未使用)")
-    private String itemsTitle;
 
     @ApiModelProperty(value = "条款内容--条款要求")
     private String termsConditions;
@@ -67,6 +65,6 @@ public class SarItemVO extends BaseEntity {
     @ApiModelProperty(value = "解读内容--核心技术要点")
     private String interpretationContent;
 
-    @ApiModelProperty(value = "解读内容")
-    private String readContent;
+
+
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java

@@ -132,6 +132,15 @@ public class SarStandItems extends BaseEntity {
     @TableField("ZCCSSRQ")
     private Date zccssrq;
 
+
+    @ApiModelProperty(value = "符合性要求-符合性状态")
+    @TableField("COMPLIANCE_REQUIR")
+    private String complianceRequire;
+
+    @ApiModelProperty(value = "解读内容--核心技术要点")
+    @TableField("core_technical_requirement")
+    private String interpretationContent;
+
     @TableField(exist = false)
     private String emergyKindShow;
     @TableField(exist = false)

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

@@ -11,6 +11,7 @@ import com.adc.da.slrs.sarStandardsInfo.entity.ActSarItemsEO;
 import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo;
 import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfoEOPage;
 import com.adc.da.slrs.sysInfo.service.SysInfoEOService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -191,7 +192,15 @@ public class SarStandItemsServiceImpl extends ServiceImpl<SarStandItemsDao, SarS
     }
 
 
-    public List<SarItemVO> querySarItemAndInterpretation(FindSarItemsPageReqDTO page){
-        return dao.querySarItemAndInterpretation(page);
+    public List<SarStandItems> querySarItemAndInterpretation(FindSarItemsPageReqDTO page){
+
+
+
+        Integer count=dao.sarItemCount(page);
+        page.getPager().setRowCount(count);
+
+
+        List<SarStandItems> sarStandItems = dao.querySarItemAndInterpretation(page);
+        return sarStandItems;
     }
 }